replace "pkgs" arguments with individual packages

This commit is contained in:
rhiannon morris 2025-04-20 09:57:40 +02:00
parent b32e181094
commit 428b2430ef
11 changed files with 35 additions and 39 deletions

View file

@ -1,15 +1,15 @@
{ pkgs ? import <nixpkgs> {} }: { buildFHSEnv, fetchzip }:
let let
version = "20250220145130"; version = "20250220145130";
sha256 = "sha256-DAlBmfBdkv8wwghykxJ4H5TSlGBhmdLaWzv35rNTDzE="; sha256 = "sha256-DAlBmfBdkv8wwghykxJ4H5TSlGBhmdLaWzv35rNTDzE=";
basilisk = pkgs.fetchzip { basilisk = fetchzip {
url = "https://dl.basilisk-browser.org/" + url = "https://dl.basilisk-browser.org/" +
"basilisk-${version}.linux-x86_64-gtk3.tar.xz"; "basilisk-${version}.linux-x86_64-gtk3.tar.xz";
inherit sha256; inherit sha256;
}; };
in in
pkgs.buildFHSEnv { buildFHSEnv {
pname = "basilisk"; pname = "basilisk";
inherit version; inherit version;
targetPkgs = pkgs: targetPkgs = pkgs:

View file

@ -1,5 +1,4 @@
{ pkgs ? import <nixpkgs> {} }: { stdenv, firefox-esr }:
let inherit (pkgs) stdenv firefox-esr; in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "firefox-esr-alias"; pname = "firefox-esr-alias";
inherit (firefox-esr) version; inherit (firefox-esr) version;

View file

@ -1,13 +1,13 @@
{ pkgs ? import <nixpkgs> {}, { fetchzip, buildFHSEnv,
version ? "2024", version ? "2024",
}: }:
let let
isabelle = pkgs.fetchzip { isabelle = fetchzip {
url = "https://isabelle.in.tum.de/dist/Isabelle${version}_linux.tar.gz"; url = "https://isabelle.in.tum.de/dist/Isabelle${version}_linux.tar.gz";
sha256 = "08d0zg4j12rya0qphdjfvxmy02mhrbzc6i1wy0hjfklpk2x1ml2s"; sha256 = "08d0zg4j12rya0qphdjfvxmy02mhrbzc6i1wy0hjfklpk2x1ml2s";
}; };
in in
pkgs.buildFHSEnv { buildFHSEnv {
pname = "isabelle"; pname = "isabelle";
inherit version; inherit version;
targetPkgs = pkgs: targetPkgs = pkgs:

View file

@ -1,9 +1,8 @@
{ pkgs ? import <nixpkgs> {}, { haskell, lib, stdenv,
versions ? [ "8.10" "9.0" "9.2" "9.4" "9.6" "9.8" "9.10" "9.12" ], versions ? [ "8.10" "9.0" "9.2" "9.4" "9.6" "9.8" "9.10" "9.12" ],
}: }:
let let
inherit (builtins) attrValues replaceStrings; inherit (builtins) attrValues replaceStrings;
inherit (pkgs) lib stdenv haskell;
toPkg = version: toPkg = version:
"ghc" + replaceStrings ["."] [""] version; "ghc" + replaceStrings ["."] [""] version;

View file

@ -1,9 +1,9 @@
{ pkgs ? import <nixpkgs> {} }: { stdenv, fetchzip, lib }:
pkgs.stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "constructium"; pname = "constructium";
version = "2024-06-01"; version = "2024-06-01";
src = pkgs.fetchzip { src = fetchzip {
url = "https://github.com/kreativekorp/open-relay/releases/download" + url = "https://github.com/kreativekorp/open-relay/releases/download" +
"/2024-06-01/Constructium.zip"; "/2024-06-01/Constructium.zip";
hash = "sha256-W4MLyUq70igpN03557vS4s9nTTQC/2JT5ObA6ctj4wA="; hash = "sha256-W4MLyUq70igpN03557vS4s9nTTQC/2JT5ObA6ctj4wA=";
@ -29,6 +29,6 @@ pkgs.stdenv.mkDerivation rec {
[ucsur]: https://www.kreativekorp.com/ucsur [ucsur]: https://www.kreativekorp.com/ucsur
''; '';
platforms = pkgs.lib.platforms.all; platforms = lib.platforms.all;
}; };
} }

View file

@ -1,9 +1,9 @@
{ pkgs ? import <nixpkgs> {} }: { stdenv, fetchzip, lib }:
pkgs.stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fairfax-hd"; pname = "fairfax-hd";
version = "2024-06-01"; version = "2024-06-01";
src = pkgs.fetchzip { src = fetchzip {
url = "https://github.com/kreativekorp/open-relay/releases/download" + url = "https://github.com/kreativekorp/open-relay/releases/download" +
"/2024-06-01/FairfaxHD.zip"; "/2024-06-01/FairfaxHD.zip";
hash = "sha256-kwdpWFOYhXt0HNqfWP3EeKYhJWgKsRs7cAbzHEasM80="; hash = "sha256-kwdpWFOYhXt0HNqfWP3EeKYhJWgKsRs7cAbzHEasM80=";
@ -31,6 +31,6 @@ pkgs.stdenv.mkDerivation rec {
[ucsur]: https://www.kreativekorp.com/ucsur [ucsur]: https://www.kreativekorp.com/ucsur
''; '';
platforms = pkgs.lib.platforms.all; platforms = lib.platforms.all;
}; };
} }

View file

@ -1,9 +1,9 @@
{ pkgs ? import <nixpkgs> {} }: { stdenv, fetchzip, lib }:
pkgs.stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kreative-square"; pname = "kreative-square";
version = "2024-06-01"; version = "2024-06-01";
src = pkgs.fetchzip { src = fetchzip {
url = "https://github.com/kreativekorp/open-relay/releases/download" + url = "https://github.com/kreativekorp/open-relay/releases/download" +
"/2024-06-01/KreativeSquare.zip"; "/2024-06-01/KreativeSquare.zip";
hash = "sha256-Ftr3/SWyUahNeX9d/Yddkltf9W4GIN3rXGLO6TTubSA="; hash = "sha256-Ftr3/SWyUahNeX9d/Yddkltf9W4GIN3rXGLO6TTubSA=";
@ -27,6 +27,6 @@ pkgs.stdenv.mkDerivation rec {
specifically to support pseudographics, semigraphics, and private use specifically to support pseudographics, semigraphics, and private use
characters. characters.
''; '';
platforms = pkgs.lib.platforms.all; platforms = lib.platforms.all;
}; };
} }

View file

@ -1,10 +1,10 @@
{ pkgs ? import <nixpkgs> {} }: { stdenv, unzip, requireFile }:
pkgs.stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "muller"; pname = "muller";
version = "2015"; version = "2015";
buildInputs = [ pkgs.unzip ]; buildInputs = [ unzip ];
src = pkgs.requireFile { src = requireFile {
name = "Muller.zip"; name = "Muller.zip";
url = "https://cloud.niss.website"; url = "https://cloud.niss.website";
hash = "sha256-TfVk4El8geTSTsMko1Ej91it/OitXFloihpAAMcGAlg="; hash = "sha256-TfVk4El8geTSTsMko1Ej91it/OitXFloihpAAMcGAlg=";

View file

@ -1,10 +1,10 @@
{ pkgs ? import <nixpkgs> {} }: { stdenv, woff2, unzip, requireFile }:
pkgs.stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pragmatapro"; pname = "pragmatapro";
version = "0.9"; version = "0.9";
buildInputs = [ pkgs.woff2 pkgs.unzip ]; buildInputs = [ woff2 unzip ];
src = pkgs.requireFile { src = requireFile {
name = "PragmataPro0.9W.zip"; name = "PragmataPro0.9W.zip";
url = "https://fsd.it/shop/fonts/pragmatapro"; url = "https://fsd.it/shop/fonts/pragmatapro";
hash = "sha256-Hcthk7twaxRty4E1PvA3fX9XuLvLceuDFrrALehWIsU="; hash = "sha256-Hcthk7twaxRty4E1PvA3fX9XuLvLceuDFrrALehWIsU=";
@ -15,7 +15,7 @@ pkgs.stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
subdir="PragmataPro${version}W" subdir="PragmataPro${version}W"
for font in $subdir/*.woff2; do for font in $subdir/*.woff2; do
${pkgs.woff2}/bin/woff2_decompress $font ${woff2}/bin/woff2_decompress $font
done done
mkdir -p $out/share/fonts/truetype mkdir -p $out/share/fonts/truetype
cp $subdir/*.ttf $out/share/fonts/truetype cp $subdir/*.ttf $out/share/fonts/truetype

View file

@ -1,9 +1,9 @@
{ pkgs ? import <nixpkgs> {} }: { stdenv, fetchzip, lib }:
pkgs.stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "teranoptia"; pname = "teranoptia";
version = "0.2"; version = "0.2";
src = pkgs.fetchzip { src = fetchzip {
url = "https://gitlab.com/arielmartinperez/teranoptia/" + url = "https://gitlab.com/arielmartinperez/teranoptia/" +
"-/archive/main/teranoptia-main.zip"; "-/archive/main/teranoptia-main.zip";
hash = "sha256-kvjsf8Y98Fx5SPAQ2i/vJoSlJJLqcgt3pJHc8MkrG14="; hash = "sha256-kvjsf8Y98Fx5SPAQ2i/vJoSlJJLqcgt3pJHc8MkrG14=";
@ -29,6 +29,6 @@ pkgs.stdenv.mkDerivation rec {
create border ornaments, to daydream about monsters or just to spice your create border ornaments, to daydream about monsters or just to spice your
layouts with marginalia. layouts with marginalia.
''; '';
platforms = pkgs.lib.platforms.all; platforms = lib.platforms.all;
}; };
} }

View file

@ -1,4 +1,4 @@
{ pkgs ? import <nixpkgs> {}, { lib, stdenv, rakudo, execline,
charFilters ? true, charFilters ? true,
find-parent ? true, find-parent ? true,
galleryHelpers ? true, galleryHelpers ? true,
@ -6,9 +6,7 @@
}@inputs: }@inputs:
let let
inherit (pkgs) lib stdenv; deps =
deps = with pkgs;
(lib.filterAttrs (k: v: inputs.${k} or true) { (lib.filterAttrs (k: v: inputs.${k} or true) {
galleryHelpers = [ rakudo ]; galleryHelpers = [ rakudo ];
charFilters = [ rakudo ]; charFilters = [ rakudo ];