rhi/nisspkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace "pkgs" arguments with individual packages

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

6
apps/basilisk.nix
View file

@ -1,15 +1,15 @@
{ pkgs ? import <nixpkgs> {} }:
{ 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:

3
apps/firefox-esr-alias.nix
View file

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

6
apps/isabelle.nix
View file

@ -1,13 +1,13 @@
{ pkgs ? import <nixpkgs> {},
{ 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:

3
apps/multi-ghc.nix
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" ],
}:
let
inherit (builtins) attrValues replaceStrings;
inherit (pkgs) lib stdenv haskell;
toPkg = version:
"ghc" + replaceStrings ["."] [""] version;

8
fonts/constructium.nix
View file

@ -1,9 +1,9 @@
{ pkgs ? import <nixpkgs> {} }:
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;
};
}

8
fonts/fairfax-hd.nix
View file

@ -1,9 +1,9 @@
{ pkgs ? import <nixpkgs> {} }:
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;
};
}

8
fonts/kreative-square.nix
View file

@ -1,9 +1,9 @@
{ pkgs ? import <nixpkgs> {} }:
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;
};
}

8
fonts/muller.nix
View file

@ -1,10 +1,10 @@
{ pkgs ? import <nixpkgs> {} }:
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=";

10
fonts/pragmatapro.nix
View file

@ -1,10 +1,10 @@
{ pkgs ? import <nixpkgs> {} }:
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

8
fonts/teranoptia.nix
View file

@ -1,9 +1,9 @@
{ pkgs ? import <nixpkgs> {} }:
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;
};
}

6
scripts/niss-misc.nix
View file

@ -1,4 +1,4 @@
{ pkgs ? import <nixpkgs> {},
{ 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 ];