diff --git a/apps/basilisk.nix b/apps/basilisk.nix index 348919c..6ed8daa 100644 --- a/apps/basilisk.nix +++ b/apps/basilisk.nix @@ -1,15 +1,15 @@ -{ pkgs ? import {} }: +{ buildFHSEnv, fetchzip }: let version = "20250220145130"; sha256 = "sha256-DAlBmfBdkv8wwghykxJ4H5TSlGBhmdLaWzv35rNTDzE="; - basilisk = pkgs.fetchzip { + basilisk = fetchzip { url = "https://dl.basilisk-browser.org/" + "basilisk-${version}.linux-x86_64-gtk3.tar.xz"; inherit sha256; }; in -pkgs.buildFHSEnv { +buildFHSEnv { pname = "basilisk"; inherit version; targetPkgs = pkgs: diff --git a/apps/firefox-esr-alias.nix b/apps/firefox-esr-alias.nix index 8749c92..a5973d8 100644 --- a/apps/firefox-esr-alias.nix +++ b/apps/firefox-esr-alias.nix @@ -1,5 +1,4 @@ -{ pkgs ? import {} }: -let inherit (pkgs) stdenv firefox-esr; in +{ stdenv, firefox-esr }: stdenv.mkDerivation { pname = "firefox-esr-alias"; inherit (firefox-esr) version; diff --git a/apps/isabelle.nix b/apps/isabelle.nix index 58740d9..186b49f 100644 --- a/apps/isabelle.nix +++ b/apps/isabelle.nix @@ -1,13 +1,13 @@ -{ pkgs ? import {}, +{ fetchzip, buildFHSEnv, version ? "2024", }: let - isabelle = pkgs.fetchzip { + isabelle = fetchzip { url = "https://isabelle.in.tum.de/dist/Isabelle${version}_linux.tar.gz"; sha256 = "08d0zg4j12rya0qphdjfvxmy02mhrbzc6i1wy0hjfklpk2x1ml2s"; }; in -pkgs.buildFHSEnv { +buildFHSEnv { pname = "isabelle"; inherit version; targetPkgs = pkgs: diff --git a/apps/multi-ghc.nix b/apps/multi-ghc.nix index a93302f..3f105f7 100644 --- a/apps/multi-ghc.nix +++ b/apps/multi-ghc.nix @@ -1,9 +1,8 @@ -{ pkgs ? import {}, +{ haskell, lib, stdenv, versions ? [ "8.10" "9.0" "9.2" "9.4" "9.6" "9.8" "9.10" "9.12" ], }: let inherit (builtins) attrValues replaceStrings; - inherit (pkgs) lib stdenv haskell; toPkg = version: "ghc" + replaceStrings ["."] [""] version; diff --git a/fonts/constructium.nix b/fonts/constructium.nix index 3d5ee6a..503efd1 100644 --- a/fonts/constructium.nix +++ b/fonts/constructium.nix @@ -1,9 +1,9 @@ -{ pkgs ? import {} }: -pkgs.stdenv.mkDerivation rec { +{ stdenv, fetchzip, lib }: +stdenv.mkDerivation rec { pname = "constructium"; version = "2024-06-01"; - src = pkgs.fetchzip { + src = fetchzip { url = "https://github.com/kreativekorp/open-relay/releases/download" + "/2024-06-01/Constructium.zip"; hash = "sha256-W4MLyUq70igpN03557vS4s9nTTQC/2JT5ObA6ctj4wA="; @@ -29,6 +29,6 @@ pkgs.stdenv.mkDerivation rec { [ucsur]: https://www.kreativekorp.com/ucsur ''; - platforms = pkgs.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/fonts/fairfax-hd.nix b/fonts/fairfax-hd.nix index bce8bd9..fdc643d 100644 --- a/fonts/fairfax-hd.nix +++ b/fonts/fairfax-hd.nix @@ -1,9 +1,9 @@ -{ pkgs ? import {} }: -pkgs.stdenv.mkDerivation rec { +{ stdenv, fetchzip, lib }: +stdenv.mkDerivation rec { pname = "fairfax-hd"; version = "2024-06-01"; - src = pkgs.fetchzip { + src = fetchzip { url = "https://github.com/kreativekorp/open-relay/releases/download" + "/2024-06-01/FairfaxHD.zip"; hash = "sha256-kwdpWFOYhXt0HNqfWP3EeKYhJWgKsRs7cAbzHEasM80="; @@ -31,6 +31,6 @@ pkgs.stdenv.mkDerivation rec { [ucsur]: https://www.kreativekorp.com/ucsur ''; - platforms = pkgs.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/fonts/kreative-square.nix b/fonts/kreative-square.nix index 9f65ed0..cb078df 100644 --- a/fonts/kreative-square.nix +++ b/fonts/kreative-square.nix @@ -1,9 +1,9 @@ -{ pkgs ? import {} }: -pkgs.stdenv.mkDerivation rec { +{ stdenv, fetchzip, lib }: +stdenv.mkDerivation rec { pname = "kreative-square"; version = "2024-06-01"; - src = pkgs.fetchzip { + src = fetchzip { url = "https://github.com/kreativekorp/open-relay/releases/download" + "/2024-06-01/KreativeSquare.zip"; hash = "sha256-Ftr3/SWyUahNeX9d/Yddkltf9W4GIN3rXGLO6TTubSA="; @@ -27,6 +27,6 @@ pkgs.stdenv.mkDerivation rec { specifically to support pseudographics, semigraphics, and private use characters. ''; - platforms = pkgs.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/fonts/muller.nix b/fonts/muller.nix index 0e5b2c3..e5c3e06 100644 --- a/fonts/muller.nix +++ b/fonts/muller.nix @@ -1,10 +1,10 @@ -{ pkgs ? import {} }: -pkgs.stdenv.mkDerivation rec { +{ stdenv, unzip, requireFile }: +stdenv.mkDerivation rec { pname = "muller"; version = "2015"; - buildInputs = [ pkgs.unzip ]; - src = pkgs.requireFile { + buildInputs = [ unzip ]; + src = requireFile { name = "Muller.zip"; url = "https://cloud.niss.website"; hash = "sha256-TfVk4El8geTSTsMko1Ej91it/OitXFloihpAAMcGAlg="; diff --git a/fonts/pragmatapro.nix b/fonts/pragmatapro.nix index 70794b6..e01d890 100644 --- a/fonts/pragmatapro.nix +++ b/fonts/pragmatapro.nix @@ -1,10 +1,10 @@ -{ pkgs ? import {} }: -pkgs.stdenv.mkDerivation rec { +{ stdenv, woff2, unzip, requireFile }: +stdenv.mkDerivation rec { pname = "pragmatapro"; version = "0.9"; - buildInputs = [ pkgs.woff2 pkgs.unzip ]; - src = pkgs.requireFile { + buildInputs = [ woff2 unzip ]; + src = requireFile { name = "PragmataPro0.9W.zip"; url = "https://fsd.it/shop/fonts/pragmatapro"; hash = "sha256-Hcthk7twaxRty4E1PvA3fX9XuLvLceuDFrrALehWIsU="; @@ -15,7 +15,7 @@ pkgs.stdenv.mkDerivation rec { installPhase = '' subdir="PragmataPro${version}W" for font in $subdir/*.woff2; do - ${pkgs.woff2}/bin/woff2_decompress $font + ${woff2}/bin/woff2_decompress $font done mkdir -p $out/share/fonts/truetype cp $subdir/*.ttf $out/share/fonts/truetype diff --git a/fonts/teranoptia.nix b/fonts/teranoptia.nix index fc0c5e5..155d5b3 100644 --- a/fonts/teranoptia.nix +++ b/fonts/teranoptia.nix @@ -1,9 +1,9 @@ -{ pkgs ? import {} }: -pkgs.stdenv.mkDerivation rec { +{ stdenv, fetchzip, lib }: +stdenv.mkDerivation rec { pname = "teranoptia"; version = "0.2"; - src = pkgs.fetchzip { + src = fetchzip { url = "https://gitlab.com/arielmartinperez/teranoptia/" + "-/archive/main/teranoptia-main.zip"; hash = "sha256-kvjsf8Y98Fx5SPAQ2i/vJoSlJJLqcgt3pJHc8MkrG14="; @@ -29,6 +29,6 @@ pkgs.stdenv.mkDerivation rec { create border ornaments, to daydream about monsters or just to spice your layouts with marginalia. ''; - platforms = pkgs.lib.platforms.all; + platforms = lib.platforms.all; }; } diff --git a/scripts/niss-misc.nix b/scripts/niss-misc.nix index 9129a2e..84540d9 100644 --- a/scripts/niss-misc.nix +++ b/scripts/niss-misc.nix @@ -1,4 +1,4 @@ -{ pkgs ? import {}, +{ lib, stdenv, rakudo, execline, charFilters ? true, find-parent ? true, galleryHelpers ? true, @@ -6,9 +6,7 @@ }@inputs: let - inherit (pkgs) lib stdenv; - - deps = with pkgs; + deps = (lib.filterAttrs (k: v: inputs.${k} or true) { galleryHelpers = [ rakudo ]; charFilters = [ rakudo ];