diff --git a/flake.lock b/flake.lock
index aa1e3907f5bd34073b973987a0e76762db98e4f5..e8755219280c26bb943347bc31b2336cd33c5410 100644
--- a/flake.lock
+++ b/flake.lock
@@ -17,11 +17,11 @@ }
},
"nixpkgs": {
"locked": {
"lastModified": 1668882784,
"narHash": "sha256-L1mHACWrG83j8U/jDtAdQHmVZu+JwVUxRPf5mhuzr2s=",
"lastModified": 1669443273,
"narHash": "sha256-/Ow9P6dWfkQF/9NKD7+OnMnz5DJr2pVCAUMjU9SwFoo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a1b4a562216eba8df3053bd869155dde4b5bca12",
"rev": "6b86759692b80e2b563e7f6c608f753de4aad3a7",
"type": "github"
},
"original": {
diff --git a/pkgs/darwin/amethyst/bin.nix b/pkgs/darwin/amethyst/bin.nix
index f3f3c9055e704c11c36fb878a0756278e026cc07..66ccad44369d35e4ce2fd78147801e9a16308d38 100644
--- a/pkgs/darwin/amethyst/bin.nix
+++ b/pkgs/darwin/amethyst/bin.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchfromgh, unzip }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "Amethyst-bin";
version = "0.16.0";
src = fetchfromgh {
owner = "ianyh";
repo = "Amethyst";
name = "Amethyst.zip";
hash = "sha256-pghX74T0JsAWkxAaAaQ5NIhYqj89fo0ZqRtxPThJZ/M=";
};
@@ -31,4 +31,4 @@ maintainers = [ maintainers.sikmir ];
platforms = [ "x86_64-darwin" ];
skip.ci = true;
};
-}
+})
diff --git a/pkgs/darwin/cudatext/bin.nix b/pkgs/darwin/cudatext/bin.nix
index 1c394710c6994885813ca42739c2847d89c5c724..3569ea2b9ab67f40c3d51aec54e00994ba344191 100644
--- a/pkgs/darwin/cudatext/bin.nix
+++ b/pkgs/darwin/cudatext/bin.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, undmg, cudatext }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "cudatext-bin";
version = "1.176.0.0";
src = fetchurl {
hash = "sha256-w5hAxkqopNMzeIQFvCBn8+50CtOB15PGjtAzPBuL3MI=";
};
@@ -24,4 +24,4 @@ platforms = [ "x86_64-darwin" ];
maintainers = [ maintainers.sikmir ];
skip.ci = true;
};
-}
+})
diff --git a/pkgs/darwin/macpass/bin.nix b/pkgs/darwin/macpass/bin.nix
index 81099de04c42e44369c6c3ac57c9092278afbd18..f64b1045f52f34b45612fd609a668256c5b9fa4f 100644
--- a/pkgs/darwin/macpass/bin.nix
+++ b/pkgs/darwin/macpass/bin.nix
@@ -1,15 +1,15 @@
{ lib, stdenv, fetchfromgh, unzip }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "MacPass-bin";
version = "0.8.1";
src = fetchfromgh {
owner = "MacPass";
repo = "MacPass";
hash = "sha256-LQ073JRbQsDB/nmx63Tllptfdo/8VqoobXPTSShzsXM=";
};
sourceRoot = ".";
@@ -31,4 +31,4 @@ maintainers = [ maintainers.sikmir ];
platforms = [ "x86_64-darwin" ];
skip.ci = true;
};
-}
+})
diff --git a/pkgs/darwin/marta/default.nix b/pkgs/darwin/marta/default.nix
index 82f6ae3808acb716d59071b00e82e0342cbc8a8d..085cbafb833118d578bfaf72bae6492c01a78e1d 100644
--- a/pkgs/darwin/marta/default.nix
+++ b/pkgs/darwin/marta/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, undmg }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "marta-bin";
version = "0.8.1";
src = fetchurl {
hash = "sha256-DbNkvLCy6q0CN8b4+8oheM4EaaLAQvH3O5zWVYxEyh8=";
};
@@ -26,4 +26,4 @@ maintainers = [ maintainers.sikmir ];
platforms = [ "x86_64-darwin" ];
skip.ci = true;
};
-}
+})
diff --git a/pkgs/data/dicts/it-sanasto/default.nix b/pkgs/data/dicts/it-sanasto/default.nix
index 0a6e296ac1ef5074b1b875137cf4dad72d969dc6..6ccffba2343d448a9babb9c840d501232f5a892f 100644
--- a/pkgs/data/dicts/it-sanasto/default.nix
+++ b/pkgs/data/dicts/it-sanasto/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenvNoCC, fetchFromGitHub, dict, pandoc, stardict-tools }:
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
pname = "it-sanasto";
version = "2020-02-27";
@@ -25,10 +25,10 @@ installPhase = "install -Dm644 .{dict,idx,ifo} -t $out";
meta = with lib; {
description = "IT-alan englanti-suomi -sanasto";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.all;
skip.ci = true;
};
-}
+})
diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix
index c91d36a1efb42ab3b519da55f1f53132070580b7..a2009504576a6f17398206d778e45aed19d3325b 100644
--- a/pkgs/data/dicts/tatoeba/default.nix
+++ b/pkgs/data/dicts/tatoeba/default.nix
@@ -28,7 +28,7 @@ tatoeba = builtins.fromJSON (builtins.readFile ./tatoeba.json);
in
stdenvNoCC.mkDerivation rec {
pname = "tatoeba";
srcs = lib.mapAttrsToList (name: spec: fetchurl spec) tatoeba;
diff --git a/pkgs/data/dicts/tatoeba/tatoeba.json b/pkgs/data/dicts/tatoeba/tatoeba.json
index d766c9388385a5e6948f1aaf50a54c3f679e6257..d8f926db74c13d7fc12bcc5a1ca9970c0fff80e3 100644
--- a/pkgs/data/dicts/tatoeba/tatoeba.json
+++ b/pkgs/data/dicts/tatoeba/tatoeba.json
@@ -1,75 +1,75 @@
{
"deu_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",
},
"eng_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",
},
"epo_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",
},
"fin_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
},
"swe_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2",
},
"ukr_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",
},
"deu-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
},
"deu-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",
},
"eng-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
},
"eng-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
},
"eng-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
},
"eng-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2",
},
"eng-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",
},
"epo-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",
},
"epo-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",
},
"fin-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",
},
"fin-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2",
@@ -77,15 +77,15 @@ "hash": "sha256-u9cvFVUHjl+/Rrw416ebnqP4Cp7L02La6wQB7VKdkiM="
},
"rus-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",
},
"rus-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",
},
"rus-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",
},
"rus-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",
@@ -93,26 +93,26 @@ "hash": "sha256-Wuai4+BwwYR9ab6QGD+QgHhjpPaDInqwx/PgdXI70PM="
},
"rus-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-swe_links.tsv.bz2",
},
"rus-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2",
},
"swe-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2",
},
"swe-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-rus_links.tsv.bz2",
},
"ukr-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2",
},
"ukr-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",
}
}
diff --git a/pkgs/data/maps/mtk-suomi/default.nix b/pkgs/data/maps/mtk-suomi/default.nix
index c34b97f08e9e718db5f0591f262aa200082378a3..c5b034c73da8e8bd9ffbb7eebbbdc39cae99ef34 100644
--- a/pkgs/data/maps/mtk-suomi/default.nix
+++ b/pkgs/data/maps/mtk-suomi/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenvNoCC, fetchurl }:
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
pname = "mtk-suomi";
version = "2022-03-15";
src = fetchurl {
hash = "sha256-s5pk+CvbrWQfC4SGQwGtDY8gg0K5ilZbYOC2lB+c7I8=";
};
@@ -23,4 +23,4 @@ maintainers = [ maintainers.sikmir ];
platforms = platforms.all;
skip.ci = true;
};
-}
+})
diff --git a/pkgs/data/maps/opentopomap/default.nix b/pkgs/data/maps/opentopomap/default.nix
index 8e930e2623af019e968b1369af09e3bfc88a5bb3..728567b2a35bc7d20e9e4381be8b8a1b1ae197e7 100644
--- a/pkgs/data/maps/opentopomap/default.nix
+++ b/pkgs/data/maps/opentopomap/default.nix
@@ -9,7 +9,7 @@ url = "http://osm.thkukuk.de/data/sea-20220914001527.zip";
hash = "sha256-ntafRbfMMnHy2IlhqKE/DaMinsu9NaXA41HhXb6YVf4=";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "opentopomap";
inherit (osm-extracts) version;
@@ -20,7 +20,7 @@ rev = "e4467cfc2064afc379b0f8e8360db1740099cca3";
hash = "sha256-3fymFZHFnivdgIWaJiRK6bvIRIay4+AnN1ns67lvq5I=";
};
nativeBuildInputs = [ mkgmap mkgmap-splitter unzip ];
@@ -56,4 +56,4 @@ maintainers = [ maintainers.sikmir ];
platforms = platforms.all;
skip.ci = true;
};
-}
+})
diff --git a/pkgs/data/osm/overpassdb/default.nix b/pkgs/data/osm/overpassdb/default.nix
index 1383a1d9df5e24a64782fa20709a1fe21db11053..875c4369d3c13eaef949fb546d2dab79797418d5 100644
--- a/pkgs/data/osm/overpassdb/default.nix
+++ b/pkgs/data/osm/overpassdb/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, osmctools, osm-3s, osm-extracts }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "overpassdb";
inherit (osm-extracts) version;
diff --git a/pkgs/data/osm/routinodb/default.nix b/pkgs/data/osm/routinodb/default.nix
index 9dbad2dcaef2a84985578be9d06817517d781b09..380bc9645aff000959d9c8245f66bd09bf528889 100644
--- a/pkgs/data/osm/routinodb/default.nix
+++ b/pkgs/data/osm/routinodb/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, routino, osm-extracts, prefix ? "Russia-NWFD" }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "routinodb";
inherit (osm-extracts) version;
diff --git a/pkgs/data/themes/qtpbfimageplugin-styles/default.nix b/pkgs/data/themes/qtpbfimageplugin-styles/default.nix
index bb5e589f1030c7ea2f34489d5758ccda453d09bc..b7cf05ddc51e544519a786c680eac3cd34a7ade5 100644
--- a/pkgs/data/themes/qtpbfimageplugin-styles/default.nix
+++ b/pkgs/data/themes/qtpbfimageplugin-styles/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "qtpbfimageplugin-styles";
version = "2022-06-08";
@@ -18,9 +18,9 @@ '';
meta = with lib; {
description = "QtPBFImagePlugin styles";
license = licenses.free;
maintainers = [ maintainers.sikmir ];
platforms = platforms.all;
};
-}
+})
diff --git a/pkgs/default.nix b/pkgs/default.nix
index a8f724bf6df031731fdb59540b93e4e43fc1b3cc..17275234cbe17af93a421a404d3a2b7f86e6bca0 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -309,7 +309,6 @@ graphene = callPackage ./misc/graphene { };
gsl-lite = callPackage ./misc/gsl-lite { };
how-to-use-pvs-studio-free = callPackage ./misc/pvs-studio/how-to-use-pvs-studio-free.nix { };
huami-token = callPackage ./misc/huami-token { };
ish = callPackage ./misc/ish { };
jenkins-cli = callPackage ./misc/jenkins-cli { };
lazyscraper = callPackage ./misc/lazyscraper { };
@@ -438,6 +437,7 @@ ff-tools = callPackage ./suckless/ff-tools { };
ffshot = callPackage ./suckless/ffshot { };
hurl = callPackage ./suckless/hurl { };
imscript = callPackage ./suckless/imscript { };
kilo = callPackage ./suckless/kilo { };
lacc = callPackage ./suckless/lacc { };
lbm = callPackage ./suckless/lbm { };
diff --git a/pkgs/development/libraries/libshell/default.nix b/pkgs/development/libraries/libshell/default.nix
index 4cee3d77e6101efc63d75f2a91f4702d2e762ec3..ebda23fd98cf86bdde917bc87626ce65789eecce 100644
--- a/pkgs/development/libraries/libshell/default.nix
+++ b/pkgs/development/libraries/libshell/default.nix
@@ -9,14 +9,14 @@ , withDoc ? false
, scdoc
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "libshell";
version = "0.4.9";
src = fetchFromGitHub {
owner = "legionus";
repo = "libshell";
hash = "sha256-BkKBmKzmL3O+BQi4VZm3agRLpQ8nIZ2ZhQBL40oeCy4=";
};
@@ -42,9 +42,9 @@ doCheck = false;
meta = with lib; {
description = "A library of shell functions";
license = licenses.gpl2;
maintainers = [ maintainers.sikmir ];
platforms = platforms.all;
};
-}
+})
diff --git a/pkgs/development/libraries/microjson/default.nix b/pkgs/development/libraries/microjson/default.nix
index 35254887e105c828e32bf11e0508724d33a2909b..57802ce533524960b2b3c8d67176f642d4d2d78f 100644
--- a/pkgs/development/libraries/microjson/default.nix
+++ b/pkgs/development/libraries/microjson/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, cmake, gtest }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "microjson";
version = "0.1.0";
src = fetchFromGitHub {
owner = "semlanik";
repo = "microjson";
hash = "sha256-6kGshpy0CDg/8z3unZvGs0Uh1gglZ7yrIGc9/X+M0i8=";
};
@@ -24,9 +24,9 @@ doCheck = true;
meta = with lib; {
description = "Tiny streaming json deserializer";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/embedded/chdk/default.nix b/pkgs/embedded/chdk/default.nix
index b752042e5e80292d427e770cca563745459ed59b..b83e1a1e5344af7f34d2e89582d4c8e6744ef29d 100644
--- a/pkgs/embedded/chdk/default.nix
+++ b/pkgs/embedded/chdk/default.nix
@@ -10,7 +10,7 @@ branch = "release-${lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor version)}";
optFI2 = fi2key != null && fi2iv != null;
batchBuild = platform == null || platformsub == null;
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "chdk";
inherit version;
diff --git a/pkgs/embedded/embox/default.nix b/pkgs/embedded/embox/default.nix
index 18bc285f4cac832f316f359fe508c6c66ea753e9..fbc7f40730746a7a4edad9934152b108853f81f6 100644
--- a/pkgs/embedded/embox/default.nix
+++ b/pkgs/embedded/embox/default.nix
@@ -20,14 +20,14 @@ third-party = lib.mapAttrs
(name: spec: fetchurl spec)
(builtins.fromJSON (builtins.readFile ./third-party.json));
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "embox-${arch}-qemu";
version = "0.5.7";
src = fetchFromGitHub {
owner = "embox";
repo = "embox";
hash = "sha256-w0xK5NXrLIq47pHEyM+luFmJKFzz+NUgFN/xs1tjf9I=";
};
@@ -100,4 +100,4 @@ maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
skip.ci = true;
};
-}
+})
diff --git a/pkgs/garmin/garminimg/default.nix b/pkgs/garmin/garminimg/default.nix
index 6895d6473b6124ed78cc5afd9688ad6097098364..41087bf04b1cec0d14f41f5cfe2bf8ad822b58bc 100644
--- a/pkgs/garmin/garminimg/default.nix
+++ b/pkgs/garmin/garminimg/default.nix
@@ -1,6 +1,6 @@
{ lib, mkDerivation, fetchFromGitHub, cmake, gdal, proj }:
-mkDerivation rec {
+mkDerivation (finalAttrs: {
pname = "garminimg";
version = "2021-01-07";
@@ -30,9 +30,9 @@ installPhase = "install -Dm755 bin/* -t $out/bin";
meta = with lib; {
description = "Encode/decode a Garmin IMG file";
license = licenses.gpl3Plus;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/garmin/gimgtools/default.nix b/pkgs/garmin/gimgtools/default.nix
index bdaf8e0e50f7aac31cfa096166802c74d6b0cf5e..6e223a38126b17bb9da2d56aa94e60944b5951f4 100644
--- a/pkgs/garmin/gimgtools/default.nix
+++ b/pkgs/garmin/gimgtools/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, libiconv }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "gimgtools";
version = "2013-09-19";
@@ -26,9 +26,9 @@ '';
meta = with lib; {
description = "Garmin Image Tools";
license = licenses.free;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/garmin/imgdecode/default.nix b/pkgs/garmin/imgdecode/default.nix
index edaed06ce682e7819a7866804a066fe28f218626..6b63c202205b7db5eb09ecf88238c48c580a1ce7 100644
--- a/pkgs/garmin/imgdecode/default.nix
+++ b/pkgs/garmin/imgdecode/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "imgdecode";
version = "1.1";
src = fetchurl {
hash = "sha256-VQC9o/QOti6jTCYi4ktH6UKZLPLwLOUAfosZftf+uWc=";
};
@@ -26,4 +26,4 @@ maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/garmin/openmtbmap/default.nix b/pkgs/garmin/openmtbmap/default.nix
index 49ffcef381eca15668b0c8e60a4993e7e55f69ba..207b01c3b4bc582be5fc9d5e7a4b37cc24c8889f 100644
--- a/pkgs/garmin/openmtbmap/default.nix
+++ b/pkgs/garmin/openmtbmap/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, gmaptool, mkgmap, p7zip, zsh, substituteAll }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "openmtbmap";
version = "2020-06-10";
@@ -24,10 +24,10 @@ '';
meta = with lib; {
description = "Linux script to extract and compile garmin *.img map files from openmtbmap.org or openvelomap.org downloads";
license = licenses.free;
maintainers = [ maintainers.sikmir ];
platforms = platforms.all;
skip.ci = true;
};
-}
+})
diff --git a/pkgs/gemini/geminid/default.nix b/pkgs/gemini/geminid/default.nix
index 28a827171d954960a7308e2469c78ddd2e5da7b3..8392d9169bc3d2bc8389396d2670195fa500a2a3 100644
--- a/pkgs/gemini/geminid/default.nix
+++ b/pkgs/gemini/geminid/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, libconfig, file, openssl, flex }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "geminid";
version = "2021-04-11";
@@ -21,9 +21,9 @@ installPhase = "install -Dm755 geminid -t $out/bin";
meta = with lib; {
description = "Gemini Server in C";
license = licenses.bsd3;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/gemini/gloggery/default.nix b/pkgs/gemini/gloggery/default.nix
index c63b4631b07d72fc6b647a264942cd148b22657b..d627a3fd1b5ca2b598003dbfedae370a8c85baa0 100644
--- a/pkgs/gemini/gloggery/default.nix
+++ b/pkgs/gemini/gloggery/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, go }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "gloggery";
version = "1.0";
src = fetchFromGitHub {
owner = "kconner";
repo = "gloggery";
hash = "sha256-tWTJXRtm/8cSEbK40fi9PVOg9w/qC0CBFZWyT7vSo80=";
};
@@ -21,9 +21,9 @@ postInstall = "mv $out/.gloggery $out/share/glogger";
meta = with lib; {
description = "Gemtext blog static site generator";
license = licenses.free;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/gemini/gmi2html/default.nix b/pkgs/gemini/gmi2html/default.nix
index 5558d13c186a4b632081cacfd57b3317ae08acc2..db6c1d365af4b69a3d3562e3b9fc4685890ce774 100644
--- a/pkgs/gemini/gmi2html/default.nix
+++ b/pkgs/gemini/gmi2html/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, zig, scdoc, installShellFiles }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "gmi2html";
version = "0.4.1";
src = fetchFromGitHub {
owner = "shtanton";
repo = "gmi2html";
hash = "sha256-5m3erToDFkYOV1xoM+BLWbUOgP0A7TXthzQ0Sk1Qj+U=";
};
@@ -32,10 +32,10 @@ '';
meta = with lib; {
description = "Translate text/gemini into HTML";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/86299
};
-}
+})
diff --git a/pkgs/gemini/gplaces/default.nix b/pkgs/gemini/gplaces/default.nix
index adda9a386fa95d9323a2db6db8175e9bb1d7e2f3..06ea2f4d10b9949b67f2335cfe9c907d9259ee54 100644
--- a/pkgs/gemini/gplaces/default.nix
+++ b/pkgs/gemini/gplaces/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, curl, openssl, memstreamHook }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "gplaces";
version = "0.16.30";
src = fetchFromGitHub {
owner = "dimkr";
repo = "gplaces";
hash = "sha256-W/tXwxJ4j7q3ka36TI7y/Psf9VHGXL/F2rNRGGkBKo0=";
fetchSubmodules = true;
};
@@ -22,10 +22,10 @@ installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "A simple terminal based Gemini client";
license = licenses.gpl3Plus;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
broken = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/gemini/gurl/default.nix b/pkgs/gemini/gurl/default.nix
index 3c6faa71d9f5e744eede12852dc3182dac9e42d6..4ff78a67f7ef443bf78d43cab2267ea848395ba3 100644
--- a/pkgs/gemini/gurl/default.nix
+++ b/pkgs/gemini/gurl/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, zig }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "gurl";
version = "2021-03-06";
@@ -25,10 +25,10 @@ '';
meta = with lib; {
description = "A curl-like cli application to interact with Gemini sites";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
broken = true; # https://github.com/MasterQ32/gurl/issues/5
};
-}
+})
diff --git a/pkgs/gemini/stagit-gemini/milotier.nix b/pkgs/gemini/stagit-gemini/milotier.nix
index 529f779c71697bb6213416fd6caf12d97eac3c54..9d06e28aabac7836d6d42e18a0daa23292da814e 100644
--- a/pkgs/gemini/stagit-gemini/milotier.nix
+++ b/pkgs/gemini/stagit-gemini/milotier.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, libgit2, fetchgit }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "stagit-gemini";
version = "2022-07-08";
diff --git a/pkgs/gemini/stagit-gemini/sloum.nix b/pkgs/gemini/stagit-gemini/sloum.nix
index 3e92d6328061287e1b74c8d116d2bad440f99ea9..b11cbc515a7f3f9d0caabb8e74a9b17a700c1862 100644
--- a/pkgs/gemini/stagit-gemini/sloum.nix
+++ b/pkgs/gemini/stagit-gemini/sloum.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, libgit2, fetchFromGitea }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "stagit-gemini";
version = "2020-01-18";
@@ -18,9 +18,9 @@ buildInputs = [ libgit2 ];
meta = with lib; {
description = "Fork of stagit-gopher that ports the output to gemini";
license = licenses.mit;
platforms = platforms.unix;
maintainers = [ maintainers.sikmir ];
};
-}
+})
diff --git a/pkgs/gemini/tom/default.nix b/pkgs/gemini/tom/default.nix
index 85b99ff75d1c32e5c3ec516214e64128c3b5c3bf..882d7158730b12ca1c6eb49c70a4585f24b0fb81 100644
--- a/pkgs/gemini/tom/default.nix
+++ b/pkgs/gemini/tom/default.nix
@@ -2,7 +2,7 @@ { lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper
, lua5_3, memstreamHook, zlib
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "tom";
version = "2021-10-21";
@@ -34,9 +34,9 @@ '';
meta = with lib; {
description = "Gemini frontend for git repositories";
license = licenses.isc;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/geospatial/datamaps/default.nix b/pkgs/geospatial/datamaps/default.nix
index e438b205a8a5493878731514450189af4b5c846a..fe5626040e2fcfa943fc0cd22b1bbfecf0ea8600 100644
--- a/pkgs/geospatial/datamaps/default.nix
+++ b/pkgs/geospatial/datamaps/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, libpng, pkg-config }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "datamaps";
version = "2014-08-19";
@@ -25,9 +25,9 @@ '';
meta = with lib; {
description = "Indexes points and lines and generates map tiles to display them";
license = licenses.bsd2;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/geospatial/deegree/default.nix b/pkgs/geospatial/deegree/default.nix
index 6ad6d502cd49f9ee9a4df9530bdb4f2f657ca347..9215a75b93e2c0f6187a516336fc0175d0955ddd 100644
--- a/pkgs/geospatial/deegree/default.nix
+++ b/pkgs/geospatial/deegree/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "deegree";
version = "3.4.31";
src = fetchurl {
hash = "sha256-CUmn+bAyaUARlJuwVJ2AMRqj/fejVjHtYnbYCUAOeYQ=";
};
@@ -23,4 +23,4 @@ platforms = platforms.all;
maintainers = with maintainers; [ sikmir ];
skip.ci = true;
};
-}
+})
diff --git a/pkgs/geospatial/geowebcache/default.nix b/pkgs/geospatial/geowebcache/default.nix
index 7f9ad6b19e8a11097f0f1fa8ad1e7388a6fe7bcd..78fda8ae0d18244894d0d166bc48fe39a8c1623c 100644
--- a/pkgs/geospatial/geowebcache/default.nix
+++ b/pkgs/geospatial/geowebcache/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, unzip }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "geowebcache";
version = "1.21.0";
src = fetchurl {
hash = "sha256-hiXXlBC6fNLR/+N18qPN5kzwsnbWMIE9kkEn2Y8qIVo=";
};
@@ -25,4 +25,4 @@ platforms = platforms.all;
maintainers = with maintainers; [ sikmir ];
skip.ci = true;
};
-}
+})
diff --git a/pkgs/geospatial/mapsoft/2.nix b/pkgs/geospatial/mapsoft/2.nix
index 8022baab315f44a45a3abe82a87f962dcbedc754..6f5c82b513a9eacc0945eec3c8a4e45b4d6d2d10 100644
--- a/pkgs/geospatial/mapsoft/2.nix
+++ b/pkgs/geospatial/mapsoft/2.nix
@@ -22,14 +22,14 @@ , unzip
, wrapGAppsHook
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "mapsoft2";
version = "1.8";
src = fetchFromGitHub {
owner = "slazav";
repo = "mapsoft2";
hash = "sha256-RWY+rFVwPTZOyAZt1Bytcer4KiriGGfgke5s+qAydx8=";
fetchSubmodules = true;
};
@@ -92,4 +92,4 @@ maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = true;
};
-}
+})
diff --git a/pkgs/geospatial/mapsoft/default.nix b/pkgs/geospatial/mapsoft/default.nix
index 2df175ddf6099c2adc4b768b91c92a5a001d44de..4a9b71d284cbb574af77fd9dee3a70f996db0621 100644
--- a/pkgs/geospatial/mapsoft/default.nix
+++ b/pkgs/geospatial/mapsoft/default.nix
@@ -30,7 +30,7 @@ , zlib
, getopt
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "mapsoft";
version = "20220624-alt1";
@@ -100,10 +100,10 @@ '';
meta = with lib; {
description = "Mapping software for linux";
license = licenses.gpl3;
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = true;
};
-}
+})
diff --git a/pkgs/geospatial/orbisgis/bin.nix b/pkgs/geospatial/orbisgis/bin.nix
index badfb82e1494276d3e675bcd0e035a19f3828cf0..96aa8c83a540081fa00f854518a73f616273ab3f 100644
--- a/pkgs/geospatial/orbisgis/bin.nix
+++ b/pkgs/geospatial/orbisgis/bin.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchfromgh, unzip, rsync, makeWrapper, jre }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "orbisgis-bin";
version = "5.1.0";
@@ -8,7 +8,7 @@ src = fetchfromgh {
owner = "orbisgis";
repo = "orbisgis";
name = "orbisgis-bin.zip";
hash = "sha256-e7SSn+P8rF5eSbl4Z/zp1mHNN2rAi4ZoMvkoy360hGM=";
};
@@ -38,4 +38,4 @@ maintainers = [ maintainers.sikmir ];
platforms = jre.meta.platforms;
skip.ci = true;
};
-}
+})
diff --git a/pkgs/geospatial/ossim/default.nix b/pkgs/geospatial/ossim/default.nix
index 6d87e4833ff7c6e9a103341f5d3d76cf8a95548a..c093a417decd2aebb80252d17a31e156a1507970 100644
--- a/pkgs/geospatial/ossim/default.nix
+++ b/pkgs/geospatial/ossim/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, cmake, geos, jsoncpp, libgeotiff, libjpeg, libtiff }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "ossim";
version = "2.12.0";
src = fetchFromGitHub {
owner = "ossimlabs";
repo = "ossim";
hash = "sha256-zmyzHEhf/JPBBP7yJyxyKHkJH5psRSl3h8ZcOJ7dr7o=";
};
@@ -27,4 +27,4 @@ license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/geospatial/polyvectorization/default.nix b/pkgs/geospatial/polyvectorization/default.nix
index 33b881c1c5b1f144c20fa158cdb1849be6e6416c..b60ee35d0b8161be6139cd4bedb12db5bfd80f0a 100644
--- a/pkgs/geospatial/polyvectorization/default.nix
+++ b/pkgs/geospatial/polyvectorization/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, boost165, eigen, opencv2 }:
-mkDerivation rec {
+mkDerivation (finalAttrs: {
pname = "polyvectorization";
version = "2019-08-23";
@@ -28,11 +28,11 @@ installPhase = "install -Dm755 polyvector_thing -t $out/bin";
meta = with lib; {
description = "Reference implementation of Vectorization of Line Drawings via PolyVector Fields";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
mainProgram = "polyvector_thing";
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/geospatial/render_geojson/default.nix b/pkgs/geospatial/render_geojson/default.nix
index e708279397fe32946d8de17fe6de0144af45d10c..69376759f997a619a57bd53303c133374244ecff 100644
--- a/pkgs/geospatial/render_geojson/default.nix
+++ b/pkgs/geospatial/render_geojson/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30-gtk3 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "render_geojson";
version = "2018-07-11";
@@ -17,10 +17,10 @@ buildInputs = [ wxGTK30-gtk3 ];
meta = with lib; {
description = "C++ geoJSON and topoJSON parser and rendering using the WxWidgets GUI library";
license = licenses.asl20;
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/geospatial/sasplanet/bin.nix b/pkgs/geospatial/sasplanet/bin.nix
index 5a31f4c59f1d90fed3b25a6ad2a21a8e7c366278..8638d158986946a1b51a5990046882dc6d31f00e 100644
--- a/pkgs/geospatial/sasplanet/bin.nix
+++ b/pkgs/geospatial/sasplanet/bin.nix
@@ -21,12 +21,12 @@ hash = "sha256-6ZF4PsEFEGYt85umWJ/ToBW3JdeKEF4n6uU73hU8oLs=";
name = "Extremum.zip";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "sasplanet-bin";
version = "201212";
src = fetchurl {
hash = "sha256-IHJjamzGMy/iSfvQmWU58rYE3AZToz+YB1cR6cp53Sg=";
};
@@ -59,4 +59,4 @@ maintainers = [ maintainers.sikmir ];
platforms = platforms.all;
skip.ci = true;
};
-}
+})
diff --git a/pkgs/geospatial/tile-stitch/default.nix b/pkgs/geospatial/tile-stitch/default.nix
index e3300e2cc63000ac933958492d078c79ffc8d0cb..863e7d6509fc2b8892bf6df49f3d057f2b870ad6 100644
--- a/pkgs/geospatial/tile-stitch/default.nix
+++ b/pkgs/geospatial/tile-stitch/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, curl, libjpeg, libpng, libtiff, libgeotiff, pkg-config }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "tile-stitch";
version = "2019-07-11";
@@ -19,9 +19,9 @@ installPhase = "install -Dm755 stitch -t $out/bin";
meta = with lib; {
description = "Stitch together and crop map tiles for a specified bounding box";
license = licenses.bsd2;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/gnss/gps-sdr-sim/default.nix b/pkgs/gnss/gps-sdr-sim/default.nix
index 4b81a6fcff9fd398b18fdac5bae7ac0dc8ea0614..70d837dbd1794676234cba27a028fa2de79cba4a 100644
--- a/pkgs/gnss/gps-sdr-sim/default.nix
+++ b/pkgs/gnss/gps-sdr-sim/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "gps-sdr-sim";
version = "2022-01-14";
@@ -19,9 +19,9 @@ '';
meta = with lib; {
description = "Software-Defined GPS Signal Simulator";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/gnss/gpstk/default.nix b/pkgs/gnss/gpstk/default.nix
index 24b6124671d67826f8a6ee7a4db091b2a95da9d5..aa2fbcc9d6683da96972b6dd0737ba4f14014f1b 100644
--- a/pkgs/gnss/gpstk/default.nix
+++ b/pkgs/gnss/gpstk/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "gpstk";
version = "8.0.0";
src = fetchFromGitHub {
owner = "SGL-UT";
repo = "GPSTk";
hash = "sha256-kauRkx7KjVFdjl3JPiCxeuuVGVJ69e87RZQhepRrsWY=";
};
@@ -17,9 +17,9 @@ cmakeFlags = [ "-DBUILD_EXT=ON" ];
meta = with lib; {
description = "Toolkit for developing GPS applications";
license = licenses.lgpl3Plus;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/gnss/rtklib/default.nix b/pkgs/gnss/rtklib/default.nix
index b77cf0781fb2d5c55237e10c65b1bbfe58268fb2..35f5f0c98792f20cb983e7ae444b677bb5b1bdf6 100644
--- a/pkgs/gnss/rtklib/default.nix
+++ b/pkgs/gnss/rtklib/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, gfortran }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "rtklib";
version = "2.4.3-b34";
src = fetchFromGitHub {
owner = "tomojitakasu";
repo = "rtklib";
hash = "sha256-d9hpvmIdSZ3BervVZVvfRTc+q7wUWoWLF81TAsMGe68=";
};
@@ -36,4 +36,4 @@ maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/gnss/visualgps/default.nix b/pkgs/gnss/visualgps/default.nix
index 59a3169c85ddc768a3c8347576bda2da7c81796f..e8f8d9decaad4dcd2fdf44bd6d13976e189573cf 100644
--- a/pkgs/gnss/visualgps/default.nix
+++ b/pkgs/gnss/visualgps/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, qmake, qtserialport, wrapQtAppsHook }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "visualgps";
version = "2020-03-29";
diff --git a/pkgs/gpx/geojson2dm/default.nix b/pkgs/gpx/geojson2dm/default.nix
index 99239f5a214480dd151ab5952caa3bfda31bd473..1c9913ea6ddc9640c357bcefdd4d70915b765bc0 100644
--- a/pkgs/gpx/geojson2dm/default.nix
+++ b/pkgs/gpx/geojson2dm/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromSourcehut }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "geojson2dm";
version = "2021-08-25";
diff --git a/pkgs/gpx/gps-whatsnew/default.nix b/pkgs/gpx/gps-whatsnew/default.nix
index b5ef54d6161cba0243f44a5e8202942d5991adbf..5539e04d6c46fd1adcce80ce62844bdd861969d1 100644
--- a/pkgs/gpx/gps-whatsnew/default.nix
+++ b/pkgs/gpx/gps-whatsnew/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, boost, qt5 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "gps-whatsnew";
version = "2017-01-23";
@@ -26,9 +26,9 @@ '';
meta = with lib; {
description = "Compare gpx tracks to find new segments (places never traveled before)";
license = licenses.gpl3Only;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/gpx/gpx-animator/default.nix b/pkgs/gpx/gpx-animator/default.nix
index a819a7a26839d7b66a0e9dfd5c3924fee0b66f4a..337a2a4574658ce3ded7a1c3fced98147bfdb75c 100644
--- a/pkgs/gpx/gpx-animator/default.nix
+++ b/pkgs/gpx/gpx-animator/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, jre, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "gpx-animator";
version = "1.7.0";
src = fetchurl {
hash = "sha256-SiYaHFMHKbEA8whio3MeCq8QZ6bQGWU4i/ok8I28TpA=";
};
@@ -20,7 +20,7 @@ install -dm755 $out/bin
install -Dm644 $src $out/share/java/${src.name}
makeWrapper ${jre}/bin/java $out/bin/gpx-animator \
--add-flags "-jar $out/share/java/gpx-animator-${version}-all.jar"
--add-flags "-jar $out/share/java/gpx-animator-${finalAttrs.version}-all.jar"
'';
meta = with lib; {
@@ -31,4 +31,4 @@ license = licenses.asl20;
maintainers = [ maintainers.sikmir ];
platforms = jre.meta.platforms;
};
-}
+})
diff --git a/pkgs/gpx/gpx2yaml/default.nix b/pkgs/gpx/gpx2yaml/default.nix
index af2f4e80afda0f311d18456bbb63e709961f50b2..74dfb80527d553bdae9be882beff495a831df975 100644
--- a/pkgs/gpx/gpx2yaml/default.nix
+++ b/pkgs/gpx/gpx2yaml/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromSourcehut }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gpx2yaml";
version = "2021-08-19";
diff --git a/pkgs/gpx/gpxeditor/default.nix b/pkgs/gpx/gpxeditor/default.nix
index 17c982e9a460144b823db779c2dbf210a6c15382..46ad0cb9f53272249fa052670447016c565e0087 100644
--- a/pkgs/gpx/gpxeditor/default.nix
+++ b/pkgs/gpx/gpxeditor/default.nix
@@ -5,12 +5,12 @@ export WINEDEBUG=warn+all
${wine}/bin/wine @out@/GPX_Editor.exe
'';
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "gpxeditor";
version = "1.7.15";
src = fetchurl {
hash = "sha256-laGJU8LHNNoUoVyHY2IaCXGpFmgOLSrWe/lCz5Tzjj4=";
};
@@ -34,4 +34,4 @@ maintainers = [ maintainers.sikmir ];
platforms = platforms.all;
skip.ci = true;
};
-}
+})
diff --git a/pkgs/gpx/gpxlib/default.nix b/pkgs/gpx/gpxlib/default.nix
index 318df00af57cf0b4ed51daeea9523deb05de1022..c0be57411f76eccdd35f85ee2c1af92b07ad1e4c 100644
--- a/pkgs/gpx/gpxlib/default.nix
+++ b/pkgs/gpx/gpxlib/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, expat }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "gpxlib";
version = "2021-02-16";
diff --git a/pkgs/linguistics/gdcv/default.nix b/pkgs/linguistics/gdcv/default.nix
index 9de68adeb1cb4cc7a3d05b635c89a7472a1b38d4..deedc1c179ee4390dc18e9d89d0f767dec1c2a0f 100644
--- a/pkgs/linguistics/gdcv/default.nix
+++ b/pkgs/linguistics/gdcv/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, argp-standalone, emacs, zlib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "gdcv";
version = "2020-05-14";
@@ -37,10 +37,10 @@ '';
meta = with lib; {
description = "GoldenDict console version and emacs dynamic module";
license = licenses.gpl3Only;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/linguistics/gt-bash-client/default.nix b/pkgs/linguistics/gt-bash-client/default.nix
index ffcb2a8d31970c935018b999b83cc1bc5eb0d31d..f19c2b5e0090eb83506011793c673d73de10b1ee 100644
--- a/pkgs/linguistics/gt-bash-client/default.nix
+++ b/pkgs/linguistics/gt-bash-client/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "gt-bash-client";
version = "1.2";
src = fetchFromGitHub {
owner = "OPHoperHPO";
repo = "GT-bash-client";
hash = "sha256-dVtwuZsF9ExH6qadUO2MJiWmQ/elTKaVZAp+o3b6XUg=";
};
@@ -17,10 +17,10 @@ '';
meta = with lib; {
description = "Get translated text from your terminal! Console Google Translate Script (bash+curl+sed)";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.all;
skip.ci = true;
};
-}
+})
diff --git a/pkgs/linguistics/hfst/default.nix b/pkgs/linguistics/hfst/default.nix
index e9230438d08c52b91f556486007a39bc652f5280..e7de1fd0b2ab43944e77843216cee1db81b47e31 100644
--- a/pkgs/linguistics/hfst/default.nix
+++ b/pkgs/linguistics/hfst/default.nix
@@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook
, bison, flex, foma, pkg-config, icu, zlib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "hfst";
version = "3.16.0";
src = fetchFromGitHub {
owner = "hfst";
repo = "hfst";
hash = "sha256-2ST0s08Pcp+hTn7rUTgPE1QkH6PPWtiuFezXV3QW0kU=";
};
@@ -29,4 +29,4 @@ license = licenses.gpl3Plus;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/linguistics/i18n-editor/default.nix b/pkgs/linguistics/i18n-editor/default.nix
index f4bc58be1b6afa6b5049b79989bdbbc0a0888fcf..a0ed5def595d111e1c98942bbbde3a0b7d60969e 100644
--- a/pkgs/linguistics/i18n-editor/default.nix
+++ b/pkgs/linguistics/i18n-editor/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchfromgh, unzip, jre, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "i18n-editor-bin";
version = "2.0.0-beta.1";
src = fetchfromgh {
owner = "jcbvm";
repo = "i18n-editor";
hash = "sha256-koJdCmcM9mH4D4JSyyi0i/zRCUeI6pYdMmS7SaC56aY=";
inherit version;
};
@@ -28,10 +28,10 @@ '';
meta = with lib; {
description = "GUI for editing your i18n translation files";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = jre.meta.platforms;
};
-}
+})
diff --git a/pkgs/linguistics/redict/default.nix b/pkgs/linguistics/redict/default.nix
index 5df7cad26e36e39bf925a73c56b7904a63af875c..c4b793fb42f559bda429f58cda0a3135e7c7dcf2 100644
--- a/pkgs/linguistics/redict/default.nix
+++ b/pkgs/linguistics/redict/default.nix
@@ -15,7 +15,7 @@ , libXtst
, withI18n ? true
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "redict";
version = "2019-06-21";
@@ -50,10 +50,10 @@ ];
meta = with lib; {
description = "A dictionary for Linux, based on C++/Qt development";
license = licenses.gpl3;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
broken = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/linguistics/stardict-tools/default.nix b/pkgs/linguistics/stardict-tools/default.nix
index 782ba1640554c78224404ad1d51a608e50fc286d..b51994ff7da7f9aa560312cefbee1d800fc53396 100644
--- a/pkgs/linguistics/stardict-tools/default.nix
+++ b/pkgs/linguistics/stardict-tools/default.nix
@@ -11,7 +11,7 @@ , libxml2
, pcre
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "stardict-tools";
version = "2021-04-05";
@@ -57,9 +57,9 @@ enableParallelBuilding = true;
meta = with lib; {
description = "Stardict tools";
license = licenses.gpl3Plus;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/misc/aamath/default.nix b/pkgs/misc/aamath/default.nix
index a6fa2467e7d52d5c174246949c82cff8f906e1b9..f4e5e286a7038ecb793054b8b20f524aa7a08e56 100644
--- a/pkgs/misc/aamath/default.nix
+++ b/pkgs/misc/aamath/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchwebarchive, fetchpatch, readline, ncurses, bison, flex, installShellFiles }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "aamath";
version = "0.3";
src = fetchwebarchive {
timestamp = "20190303013301";
hash = "sha256-mEP0WIaV4s1Vzl2PWJIdTyVeDmXtlWnh3N3z9o93tjE=";
};
@@ -40,4 +40,4 @@ maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/misc/ascii-dash/default.nix b/pkgs/misc/ascii-dash/default.nix
index b4f40c842fb5ce1b24ad9fc00124ef7853cd9e73..0e99b330b0217fcd2acf0920bff84792b1c61d47 100644
--- a/pkgs/misc/ascii-dash/default.nix
+++ b/pkgs/misc/ascii-dash/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, cmake, unzip, ncurses5, SDL, SDL_mixer }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "ascii-dash";
version = "1.2.1";
src = fetchurl {
hash = "sha256-MMkhsmWMtK606lWuuvtl2bq3ub9uWl24tqbCdnb8Da8=";
};
@@ -40,4 +40,4 @@ homepage = "https://ascii-dash.sourceforge.io/";
license = licenses.mit;
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/misc/btpd/default.nix b/pkgs/misc/btpd/default.nix
index b80ad4efaa853e14731805cc6d9f520b8a5bf436..80ff8ce4e8f45adf2725b9db0a61d57970f447ee 100644
--- a/pkgs/misc/btpd/default.nix
+++ b/pkgs/misc/btpd/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, openssl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "btpd";
version = "2020-04-07";
@@ -19,9 +19,9 @@ installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "The BitTorrent Protocol Daemon";
license = licenses.bsd2;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/misc/capture2text/default.nix b/pkgs/misc/capture2text/default.nix
index 07c4052c4603a7648a280efc76e3a4017acdb5c8..a4a6bdda96a9b36851571b4923987f1f9d3e7203 100644
--- a/pkgs/misc/capture2text/default.nix
+++ b/pkgs/misc/capture2text/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, qmake, unzip, leptonica, tesseract4, wrapQtAppsHook }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "capture2text";
version = "4.6.2";
src = fetchurl {
hash = "sha256-FeQ5E2lW+QOcg6Qi1I75W4BkQmfDiZtJ7+U2K08Ji2U=";
};
@@ -59,4 +59,4 @@ license = licenses.gpl3Plus;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/misc/cfiles/default.nix b/pkgs/misc/cfiles/default.nix
index 21d74479f545144459265fdd51f1f5407c2b5670..b602d206320524c0b6510441c9680a85914f5ed9 100644
--- a/pkgs/misc/cfiles/default.nix
+++ b/pkgs/misc/cfiles/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, w3m, ueberzug }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "cfiles";
version = "1.8";
src = fetchFromGitHub {
owner = "mananapr";
repo = "cfiles";
hash = "sha256-Y5OOA0GGnjl4614zicuS00Wz2x5lLzhEHVioNFADQto=";
};
@@ -29,9 +29,9 @@ installFlags = [ "prefix=$(out)" ];
meta = with lib; {
description = "A ncurses file manager written in C with vim like keybindings";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/misc/csvquote/default.nix b/pkgs/misc/csvquote/default.nix
index 584254815d06aee3eb55d3f2825ec95c078cef80..8c60a9d9e748c008701a1bfe71c420890a262f12 100644
--- a/pkgs/misc/csvquote/default.nix
+++ b/pkgs/misc/csvquote/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "csvquote";
version = "2018-05-28";
@@ -17,9 +17,9 @@ preInstall = "mkdir -p $out/bin";
meta = with lib; {
description = "Enables common unix utlities like cut, awk, wc, head to work correctly with csv data containing delimiters and newlines";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/misc/csvtools/default.nix b/pkgs/misc/csvtools/default.nix
index 212297591f3d77667a431788c6d3a4254bb6db7f..0d1563832c29a4fa9d4fdfb6ec865b24bc1c43df 100644
--- a/pkgs/misc/csvtools/default.nix
+++ b/pkgs/misc/csvtools/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, pcre, openssl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "csvtools";
version = "2019-08-03";
@@ -25,9 +25,9 @@ preInstall = "mkdir -p $out/bin";
meta = with lib; {
description = "GNU-alike tools for parsing RFC 4180 CSVs at high speed";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/misc/dns-filter/default.nix b/pkgs/misc/dns-filter/default.nix
index c0963ab17a2ede93b97e882a0b63d6e195780336..06386047e5ec28d2796dab431d36e185e0626a3c 100644
--- a/pkgs/misc/dns-filter/default.nix
+++ b/pkgs/misc/dns-filter/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "dns-filter";
version = "2021-04-14";
@@ -26,9 +26,9 @@ '';
meta = with lib; {
description = "Tiny DNS server with filtering requests";
license = licenses.free;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/misc/docker-reg-tool/default.nix b/pkgs/misc/docker-reg-tool/default.nix
index 72efacc8305e94225bd5332fbce7ffea50b1d2de..d7f0d7ba8855b5721b66dad6954cdf5e468df65e 100644
--- a/pkgs/misc/docker-reg-tool/default.nix
+++ b/pkgs/misc/docker-reg-tool/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "docker-reg-tool";
version = "2021-02-15";
@@ -15,9 +15,9 @@ installPhase = "install -Dm755 docker_reg_tool -t $out/bin";
meta = with lib; {
description = "Docker registry cli tool, primarily for deleting images";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.all;
};
-}
+})
diff --git a/pkgs/misc/finalcut/default.nix b/pkgs/misc/finalcut/default.nix
index 0beecda6796fb8bc4c105e1cef2622ccd3f00eb9..e1b47b8039fb907e39a7fd6b134b1a65d3737f4d 100644
--- a/pkgs/misc/finalcut/default.nix
+++ b/pkgs/misc/finalcut/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, ncurses, pkg-config }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "finalcut";
version = "0.8.0";
src = fetchFromGitHub {
owner = "gansm";
repo = "finalcut";
hash = "sha256-FaloxuRx9p9oMyuKyJhYZve/WyQoMSGTYwY6A2uE0F0=";
};
@@ -17,9 +17,9 @@ buildInputs = [ ncurses ];
meta = with lib; {
description = "A text-based widget toolkit";
license = licenses.lgpl3Plus;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/misc/graphene/default.nix b/pkgs/misc/graphene/default.nix
index a3cf9f6eb2fd43c9969006549364d41fe0296d8a..00d6418ebc4d0ff124b282222a144cc24b9a9c35 100644
--- a/pkgs/misc/graphene/default.nix
+++ b/pkgs/misc/graphene/default.nix
@@ -2,14 +2,14 @@ { lib, stdenv, fetchFromGitHub, perl, pkg-config, wget
, db, libmicrohttpd, jansson, tcl
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "graphene";
version = "2.10";
src = fetchFromGitHub {
owner = "slazav";
repo = "graphene";
hash = "sha256-F2C7Ni+D8hWap2szoTFEPMRcWKXpizFWzqqyaDLbrac=";
fetchSubmodules = true;
};
@@ -26,10 +26,10 @@ installFlags = [ "prefix=$(out)" "sysconfdir=$(out)/etc" ];
meta = with lib; {
description = "A simple time series database based on BerkleyDB";
license = licenses.gpl3;
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/misc/gsl-lite/default.nix b/pkgs/misc/gsl-lite/default.nix
index 13733ce7c55c7a3d2e371b5a6e0070072dc02012..90d8ad1ff2c7e8ffe9f8f0e832f52497a88e234c 100644
--- a/pkgs/misc/gsl-lite/default.nix
+++ b/pkgs/misc/gsl-lite/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, cmake, doxygen, boost }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "gsl-lite";
version = "0.40.0";
src = fetchFromGitHub {
owner = "gsl-lite";
repo = "gsl-lite";
hash = "sha256-80ksT8XFn2LLMr63gKGZD/0+FDLnAtFyMpuuSjtoBlk=";
};
@@ -15,9 +15,9 @@ nativeBuildInputs = [ cmake ];
meta = with lib; {
description = "Guidelines Support Library for C++98, C++11 up";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/misc/imsg-compat/default.nix b/pkgs/suckless/imsg-compat/default.nix
rename from pkgs/misc/imsg-compat/default.nix
rename to pkgs/suckless/imsg-compat/default.nix
index 7465a9fb6e0176df3e1907fadffa86b89ff1e321..ecb988a064dfa46ff2b7b5973ec47a900f482355 100644
--- a/pkgs/misc/imsg-compat/default.nix
+++ b/pkgs/suckless/imsg-compat/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, validatePkgConfig }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "imsg-compat";
version = "6.8.2";
src = fetchFromGitHub {
owner = "bsd-ac";
repo = "imsg-compat";
hash = "sha256-TFwww3HnTuURVCSMWyaMfwjEWcgGQr1pyPkop6EoHIY=";
};
@@ -22,10 +22,10 @@ makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "Unofficial port of OpenBSD's imsg utilities";
license = licenses.isc;
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/misc/ish/default.nix b/pkgs/misc/ish/default.nix
index 58488d5e853ae47ac2fd67b53e699a00e078f8e3..111fbe6b420b96f698d89a4c22545b5f03016540 100644
--- a/pkgs/misc/ish/default.nix
+++ b/pkgs/misc/ish/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "ish";
version = "0.2";
src = fetchurl {
hash = "sha256-C4vE8pWBay9RdL+q0PwzjaNMgqrTD8TyLTYkGwE9V4I=";
};
@@ -27,4 +27,4 @@ maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/misc/libnbcompat/default.nix b/pkgs/misc/libnbcompat/default.nix
index 4dea3a0a2e6ec7632a342eb10d4fe4978ce1e627..fb539757f2f4230f986a293dee78938df94c20c3 100644
--- a/pkgs/misc/libnbcompat/default.nix
+++ b/pkgs/misc/libnbcompat/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "libnbcompat";
version = "1.0.1";
src = fetchFromGitHub {
owner = "archiecobbs";
repo = "libnbcompat";
hash = "sha256-DyBLEp5dNYSQgTzdQkGfLdCtX618EbnVy5FmL75BMdU=";
};
@@ -15,9 +15,9 @@ nativeBuildInputs = [ autoreconfHook ];
meta = with lib; {
description = "Portable NetBSD-compatibility library";
license = licenses.free;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/misc/nmtree/default.nix b/pkgs/misc/nmtree/default.nix
index d3329fc009529ef4734c6d22a5f630d081f1dde6..a5ab3e53932dc4a73e46d40aac12704fe161af5b 100644
--- a/pkgs/misc/nmtree/default.nix
+++ b/pkgs/misc/nmtree/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, libnbcompat }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "nmtree";
version = "1.0.0";
src = fetchFromGitHub {
owner = "archiecobbs";
repo = "nmtree";
hash = "sha256-0NlrWnSi0Eyz9WlTX1OpU3dHpgZMOF0rtf9cY5mLDkc=";
};
@@ -19,10 +19,10 @@ NIX_CFLAGS_COMPILE = "-Wno-format-security";
meta = with lib; {
description = "NetBSD's mtree(8) utility";
license = licenses.free;
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = true;
};
-}
+})
diff --git a/pkgs/misc/objlab/default.nix b/pkgs/misc/objlab/default.nix
index 40d36035bbf5ef79378e371fc5c332fe63547c6b..86ab3ebb3c4bc4453972e878a6acb872c30a9f71 100644
--- a/pkgs/misc/objlab/default.nix
+++ b/pkgs/misc/objlab/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, ghc_filesystem, glfw, libglvnd, libGLU }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "objlab";
version = "2019-11-23";
@@ -35,10 +35,10 @@ '';
meta = with lib; {
description = "Simple wavefront .obj viewer";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/misc/ptunnel/default.nix b/pkgs/misc/ptunnel/default.nix
index f7f9d5d8e3a0d2e877915ee7e5a5c72094b528a6..3172a2a674d1a07fe43ae0922daecaa2d26ea600 100644
--- a/pkgs/misc/ptunnel/default.nix
+++ b/pkgs/misc/ptunnel/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, libpcap }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "ptunnel";
version = "0.72";
src = fetchurl {
hash = "sha256-sxj3qn2IkYtiadBUp+JvBPl9iHD0e9Sadsssmcc0B6Q=";
};
@@ -21,4 +21,4 @@ maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/misc/pvs-studio/default.nix b/pkgs/misc/pvs-studio/default.nix
index a6dae87c6e653c25f7cb569103f22358b8dd6705..2c25c64504b151009c51dc77ebf8075c0739ceb0 100644
--- a/pkgs/misc/pvs-studio/default.nix
+++ b/pkgs/misc/pvs-studio/default.nix
@@ -8,12 +8,12 @@ x86_64-linux = "x86_64";
x86_64-darwin = "macos";
}.${system} or throwSystem;
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "pvs-studio";
version = "7.21.64848.262";
src = fetchurl {
hash = {
x86_64-linux = "sha256-oOi7xQxv3I8hEnF62TSeA+ZIjIpabTN+ulMNImURECM=";
x86_64-darwin = "sha256-BgONtKPE3Osd8g6ElebEyYUs9qFcuIU0HvsrdYSZEzc=";
@@ -30,4 +30,4 @@ maintainers = [ maintainers.sikmir ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
skip.ci = true;
};
-}
+})
diff --git a/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix b/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix
index 0eb82d6103c70a50af2d90033c5eb453b9150f90..ecd7e31639547d1d1dbba625d5b003b9b2934bf6 100644
--- a/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix
+++ b/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "how-to-use-pvs-studio-free";
version = "2.1";
src = fetchFromGitHub {
owner = "viva64";
repo = "how-to-use-pvs-studio-free";
hash = "sha256-aFqk0WsMylRQqvlb+M5IfDHVwMBuKNQpCiiGPrj+jEw=";
};
@@ -32,4 +32,4 @@ license = licenses.asl20;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/misc/qoiview/default.nix b/pkgs/misc/qoiview/default.nix
index 161664e4ca1208b7e69f7f3f6aeb9e698eef012b..e89a61a73d1a2b46821e8b1439312b05ba2a5c90 100644
--- a/pkgs/misc/qoiview/default.nix
+++ b/pkgs/misc/qoiview/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, xorg, libglvnd }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "qoiview";
version = "2021-12-22";
@@ -36,10 +36,10 @@ '';
meta = with lib; {
description = "QOI image viewer on top of the Sokol headers";
license = licenses.free;
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/misc/sdorfehs/default.nix b/pkgs/misc/sdorfehs/default.nix
index 1a07969fb55954778d0ca26fd23e6e936ab42894..a7d8ac0e2a7eddeba66f02a508e4d29c6eb6118d 100644
--- a/pkgs/misc/sdorfehs/default.nix
+++ b/pkgs/misc/sdorfehs/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, xorg }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "sdorfehs";
version = "1.1";
src = fetchFromGitHub {
owner = "jcs";
repo = "sdorfehs";
hash = "sha256-efid6lRa8CTD+xObbop68hti5WRJReyKW57AmN7DS90=";
};
@@ -19,10 +19,10 @@ installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "A tiling window manager";
license = licenses.gpl2Plus;
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/misc/serverpp/default.nix b/pkgs/misc/serverpp/default.nix
index 8c5202755dcf555ec72deb9a4975c2e13bc65697..a6f4fb815aa0e3b2796b19f32d6a75622182fe30 100644
--- a/pkgs/misc/serverpp/default.nix
+++ b/pkgs/misc/serverpp/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, cmake, boost, gsl-lite }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "serverpp";
version = "0.2.0";
src = fetchFromGitHub {
owner = "KazDragon";
repo = "serverpp";
hash = "sha256-z7aLE7RyRGwUCpnJr0NS6yXUBPtHTnd81JOI/tGHDo0=";
};
@@ -17,9 +17,9 @@ buildInputs = [ boost gsl-lite ];
meta = with lib; {
description = "A C++ library for basic network server handling";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/misc/tcvt/default.nix b/pkgs/misc/tcvt/default.nix
index b2346a6572faf3e8a9bf0a5a0253efd76fffdd13..4a18756cf6dec2043e57beb0a5f1d04812076c00 100644
--- a/pkgs/misc/tcvt/default.nix
+++ b/pkgs/misc/tcvt/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchgit, python3 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "tcvt";
version = "2021-01-22";
diff --git a/pkgs/misc/telnetpp/default.nix b/pkgs/misc/telnetpp/default.nix
index a1d33d32d43612c3a3166d79ab36c1c34825f499..384768556493ce18fa9f57762b196a102d449715 100644
--- a/pkgs/misc/telnetpp/default.nix
+++ b/pkgs/misc/telnetpp/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, cmake, doxygen, boost, gsl-lite, gtest, zlib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "telnetpp";
version = "3.0.0";
src = fetchFromGitHub {
owner = "KazDragon";
repo = "telnetpp";
hash = "sha256-BfRu0dv2d7qwz2jTdaQczOQQBO3qmO1E754hWqxT66g=";
};
@@ -19,9 +19,9 @@ cmakeFlags = [ "-DTELNETPP_WITH_ZLIB=True" ];
meta = with lib; {
description = "A C++ library for interacting with Telnet streams";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/misc/xfractint/default.nix b/pkgs/misc/xfractint/default.nix
index 8421d78839c928f4341fed819d2d1d7ce241ce33..799ed6b7328f79229e1dc9ae337c63d29d9fc765 100644
--- a/pkgs/misc/xfractint/default.nix
+++ b/pkgs/misc/xfractint/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, xlibsWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "xfractint";
version = "20.04p16";
src = fetchurl {
hash = "sha256-TlQBz+wOb/odqzjjwXfhRFdyCWy+VUIAxRLt7qI8R60=";
};
@@ -27,4 +27,4 @@ maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = true;
};
-}
+})
diff --git a/pkgs/osm/maperitive/bin.nix b/pkgs/osm/maperitive/bin.nix
index 2d7dcf6810d0f6a681a677a2b8a0dce2ed063110..87e57d706132a1fd98eadacac0e0a14593d593f9 100644
--- a/pkgs/osm/maperitive/bin.nix
+++ b/pkgs/osm/maperitive/bin.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, unzip, mono, gtk2, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "maperitive-bin";
version = "2.4.3";
src = fetchurl {
hash = "sha256-yhslRj4CjUY0kviQTI7z8LvSiWvjf7K8+tDMeA9zNEk=";
};
@@ -30,4 +30,4 @@ maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = true;
};
-}
+})
diff --git a/pkgs/osm/memphis/default.nix b/pkgs/osm/memphis/default.nix
index 1bbc544aff99d2c73c3ecf6e2658e7a0d7a6b311..280ad5dcf9d2e0e0f8b0f3e3d147aaa821edb1e6 100644
--- a/pkgs/osm/memphis/default.nix
+++ b/pkgs/osm/memphis/default.nix
@@ -2,14 +2,14 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, gtk-doc, pkg-config
, cairo, expat, glib
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "memphis";
version = "0.2.3";
src = fetchFromGitHub {
owner = "jiuka";
repo = "memphis";
hash = "sha256-mBRu2EHEuoHz3scoVaYqAMBZXbG7XkKwdHe9O0gaDBk=";
};
@@ -27,10 +27,10 @@ ];
meta = with lib; {
description = "Map-rendering for OpenStreetMap";
license = licenses.lgpl2Plus;
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/osm/osm-3s/default.nix b/pkgs/osm/osm-3s/default.nix
index e4ee42bd01923230d5007537a32d04ba9271693d..fe0a7a2e5db04d93f30c9ef9496f81b14db22f0e 100644
--- a/pkgs/osm/osm-3s/default.nix
+++ b/pkgs/osm/osm-3s/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, expat, lz4, zlib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "osm-3s";
version = "0.7.58.5";
src = fetchurl {
hash = "sha256-Ij2Qf5JLjDUzGMAKBM2KGXo3KpuPNdoOhfaIMTh48cY=";
};
@@ -23,4 +23,4 @@ maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/osm/osm-area-tools/default.nix b/pkgs/osm/osm-area-tools/default.nix
index 355463f73988ffad3be2dca366ca7a232aacb6f0..42390f72d1f8ab3cda54b2618a18b02f8a82bc92 100644
--- a/pkgs/osm/osm-area-tools/default.nix
+++ b/pkgs/osm/osm-area-tools/default.nix
@@ -12,7 +12,7 @@ , sqlite
, zlib
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "osm-area-tools";
version = "2021-01-04";
diff --git a/pkgs/osm/osm-tags-transform/default.nix b/pkgs/osm/osm-tags-transform/default.nix
index c005a99be190126ff3ca2cccbf51554e1812ca3f..8998c1e5aa96e60e13b846ce30173c5e3a79cf51 100644
--- a/pkgs/osm/osm-tags-transform/default.nix
+++ b/pkgs/osm/osm-tags-transform/default.nix
@@ -2,7 +2,7 @@ { lib, stdenv, fetchFromGitHub, cmake
, bzip2, expat, libosmium, lua, protozero, zlib
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "osm-tags-transform";
version = "2022-02-19";
@@ -25,9 +25,9 @@ doCheck = true;
meta = with lib; {
description = "Transform tags in OSM files using Lua code";
license = licenses.gpl3Plus;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/osm/osmcoastline/default.nix b/pkgs/osm/osmcoastline/default.nix
index 90ba02173582c4dff4fca2735a0911631eeda54b..39212cd248d8ef3a9ec0bf910c67738e68eb15a0 100644
--- a/pkgs/osm/osmcoastline/default.nix
+++ b/pkgs/osm/osmcoastline/default.nix
@@ -12,14 +12,14 @@ , sqlite
, zlib
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "osmcoastline";
version = "2.3.1";
src = fetchFromGitHub {
owner = "osmcode";
repo = "osmcoastline";
hash = "sha256-z72xDag3CDik/zGhQjlmE/Yfz/KEwK/A1clyP3AY7Uo=";
};
@@ -43,4 +43,4 @@ license = licenses.boost;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/osm/osmdbt/default.nix b/pkgs/osm/osmdbt/default.nix
index ce7451ed4f00cb1bc75aab5057daa48678bab2b4..f2d8962ee52529c9d598f03d1f8ed4f4cbefbbb2 100644
--- a/pkgs/osm/osmdbt/default.nix
+++ b/pkgs/osm/osmdbt/default.nix
@@ -13,14 +13,14 @@ , protozero
, zlib
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "osmdbt";
version = "0.6";
src = fetchFromGitHub {
owner = "openstreetmap";
repo = "osmdbt";
hash = "sha256-hXwWOOfvBrJqjMXsG/59J83PHwZqIKm+2B00QYoJD80=";
};
@@ -41,9 +41,9 @@ cmakeFlags = [ "-DBUILD_PLUGIN=OFF" ];
meta = with lib; {
description = "OSM Database Replication Tools";
license = licenses.gpl3Plus;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/osm/osmium-surplus/default.nix b/pkgs/osm/osmium-surplus/default.nix
index 511270cd34e892efeda96f0770067a6afab145b7..edee15cf5faf50440d36122e5af59b56baba083e 100644
--- a/pkgs/osm/osmium-surplus/default.nix
+++ b/pkgs/osm/osmium-surplus/default.nix
@@ -13,7 +13,7 @@ , sqlite
, zlib
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "osmium-surplus";
version = "2022-08-28";
diff --git a/pkgs/osm/osmosis/default.nix b/pkgs/osm/osmosis/default.nix
index ae80c370873ef580569e04f0ed119826af3655ae..09355ff5704e638bf24a3dee95dc556cd7e0c948 100644
--- a/pkgs/osm/osmosis/default.nix
+++ b/pkgs/osm/osmosis/default.nix
@@ -1,15 +1,15 @@
{ lib, stdenv, fetchfromgh, jre }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "osmosis";
version = "0.48.3";
src = fetchfromgh {
owner = "openstreetmap";
repo = "osmosis";
hash = "sha256-skxgFXjqTLDKiDAr5naP0GAr3obCVKDguQUTWB26Z/8=";
};
sourceRoot = ".";
@@ -29,4 +29,4 @@ license = licenses.gpl2;
maintainers = [ maintainers.sikmir ];
platforms = jre.meta.platforms;
};
-}
+})
diff --git a/pkgs/osm/planetiler/default.nix b/pkgs/osm/planetiler/default.nix
index ac468c888fe8b4a60f27c4fc7ca006be4957c480..404c8ad7587ba4c45bb303be077bbe15fcad8140 100644
--- a/pkgs/osm/planetiler/default.nix
+++ b/pkgs/osm/planetiler/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchfromgh, unzip, jre, makeWrapper }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "planetiler";
version = "0.5.0";
src = fetchfromgh {
owner = "onthegomap";
repo = "planetiler";
name = "planetiler.jar";
hash = "sha256-XwjY81F1E3MISxwqvSG7OMv2Y1fdKgLSaS01YfFttws=";
};
@@ -28,11 +28,11 @@ '';
meta = with lib; {
description = "Flexible tool to build planet-scale vector tilesets from OpenStreetMap data";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.asl20;
maintainers = [ maintainers.sikmir ];
platforms = jre.meta.platforms;
skip.ci = true;
};
-}
+})
diff --git a/pkgs/osm/sdlmap/default.nix b/pkgs/osm/sdlmap/default.nix
index 241083b04117ae7e3809fadaa29877a3a6add00f..47c5692cbde07074a48d014571c4287955e606db 100644
--- a/pkgs/osm/sdlmap/default.nix
+++ b/pkgs/osm/sdlmap/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, curl, SDL2, SDL2_image }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "sdlmap";
version = "2014-02-09";
@@ -21,9 +21,9 @@ installPhase = "install -Dm755 sdlmap -t $out/bin";
meta = with lib; {
description = "A SDL + libcurl OpenStreetMap viewer";
license = licenses.free;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/osm/taginfo-tools/default.nix b/pkgs/osm/taginfo-tools/default.nix
index c050236447fdbb253e97f8681d17eae5a1713e01..718dfa66c619f4eee83cce91b084b91046aeabaf 100644
--- a/pkgs/osm/taginfo-tools/default.nix
+++ b/pkgs/osm/taginfo-tools/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, bzip2, expat, gd, icu, libosmium, protozero, sqlite, zlib }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "taginfo-tools";
version = "2022-05-04";
diff --git a/pkgs/osm/tirex/default.nix b/pkgs/osm/tirex/default.nix
index d20e3537f2e6f12b3ee42f8c8ee01732d3a4b1ab..116253003d0d2ea7f1bbc10ec82f77798c043d06 100644
--- a/pkgs/osm/tirex/default.nix
+++ b/pkgs/osm/tirex/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, cairo, mapnik, perl, perlPackages }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "tirex";
version = "0.7.0";
src = fetchFromGitHub {
owner = "openstreetmap";
repo = "tirex";
hash = "sha256-0QbPfCPBdNBbUiZ8Ppg2zao98+Ddl3l+yX6y1/J50rg=";
};
@@ -54,5 +54,5 @@ license = licenses.gpl2;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/osm/vectiler/default.nix b/pkgs/osm/vectiler/default.nix
index 11003647516b646d9a60bccded3577b64a6440ec..968348aab042a85ae8adb95e0a3f0f6e83578154 100644
--- a/pkgs/osm/vectiler/default.nix
+++ b/pkgs/osm/vectiler/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, curl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "vectiler";
version = "2021-06-30";
diff --git a/pkgs/radio/fmreceiver/default.nix b/pkgs/radio/fmreceiver/default.nix
index ad920f272444a5622f419f4ae3a5cf3bdeec88f1..52d9bc15ca721726a6abc1cc9ae570e9dd689081 100644
--- a/pkgs/radio/fmreceiver/default.nix
+++ b/pkgs/radio/fmreceiver/default.nix
@@ -2,14 +2,14 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, fftwFloat, libsamplerate, libsndfile, libusb1
, portaudio, rtl-sdr, qmake, qwt, wrapQtAppsHook
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "fmreceiver";
version = "2.1";
src = fetchFromGitHub {
owner = "JvanKatwijk";
repo = "sdr-j-fm";
hash = "sha256-U0m9PIB+X+TBoz5FfXMvR/tZjkNIy7B613I7eLT5UIs=";
};
@@ -51,9 +51,9 @@ '';
meta = with lib; {
description = "A simple FM receiver";
license = licenses.gpl2Plus;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/radio/gqrx-scanner/default.nix b/pkgs/radio/gqrx-scanner/default.nix
index 0b7c4c9d9de9f0635a9225cc61bbfabeb7f93951..a415e833e7f5c488e5db3ee72a4a7adfc4fd0a23 100644
--- a/pkgs/radio/gqrx-scanner/default.nix
+++ b/pkgs/radio/gqrx-scanner/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "gqrx-scanner";
version = "1.0.2";
src = fetchFromGitHub {
owner = "neural75";
repo = "gqrx-scanner";
hash = "sha256-CHM1Q54ephZA4vNUPnaLCncgnfSiNeUq6u+X6PhhxD8=";
};
@@ -17,9 +17,9 @@ NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-DOSX";
meta = with lib; {
description = "A frequency scanner for Gqrx Software Defined Radio receiver";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/radio/linrad/default.nix b/pkgs/radio/linrad/default.nix
index 3bc66e05b1b221ef6fa3c7950981b561cbd12fd9..8a338e7dbc7c20659d208ccca230de4ce1ccf476 100644
--- a/pkgs/radio/linrad/default.nix
+++ b/pkgs/radio/linrad/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchsvn, cmake, nasm, libX11 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "linrad";
version = "2021-09-05";
diff --git a/pkgs/radio/rtlsdr-airband/default.nix b/pkgs/radio/rtlsdr-airband/default.nix
index 4592eb89d6b299f528cd9dcf2befe17c06b829e0..db70088281f064c6f74376f883208e9f20e33111 100644
--- a/pkgs/radio/rtlsdr-airband/default.nix
+++ b/pkgs/radio/rtlsdr-airband/default.nix
@@ -2,14 +2,14 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config
, fftwFloat, lame, libconfig, libshout, pulseaudio, rtl-sdr, soapysdr
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "rtlsdr-airband";
version = "4.0.1";
src = fetchFromGitHub {
owner = "szpajder";
repo = "rtlsdr-airband";
hash = "sha256-KWuhffRUaCRvJgJWOBbSkqKDXtBsZ8Gln0sIp7bZqw0=";
};
@@ -21,10 +21,10 @@ cmakeFlags = [ "-DNFM=ON" ];
meta = with lib; {
description = "Multichannel AM/NFM demodulator";
license = licenses.gpl3Plus;
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/radio/sigdigger/default.nix b/pkgs/radio/sigdigger/default.nix
index 5172ed3377673396f3e45ca8c02f42a9bfb9807c..022cf463ff1157f58b89682e819a8ccdda2de54d 100644
--- a/pkgs/radio/sigdigger/default.nix
+++ b/pkgs/radio/sigdigger/default.nix
@@ -3,14 +3,14 @@ , curl, fftw, fftwFloat, libsndfile, portaudio
, sigutils, soapysdr, suscan, suwidgets, volk
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "sigdigger";
version = "0.3.0";
src = fetchFromGitHub {
owner = "BatchDrake";
repo = "SigDigger";
hash = "sha256-dS+Fc0iQz7GIlGaR556Ur/EQh3Uzhqm9uBW42IuEqoE=";
};
@@ -38,9 +38,9 @@ '';
meta = with lib; {
description = "Qt-based digital signal analyzer, using Suscan core and Sigutils DSP library";
license = licenses.gpl3Plus;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/radio/sigutils/default.nix b/pkgs/radio/sigutils/default.nix
index 5f548447bcc16db96caef732076fe03778b6e0a5..2cede3d3eb37e2a34aee518f7ca6453cbad40679 100644
--- a/pkgs/radio/sigutils/default.nix
+++ b/pkgs/radio/sigutils/default.nix
@@ -2,7 +2,7 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config
, fftwFloat, libsndfile, volk
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "sigutils";
version = "2022-07-05";
@@ -19,9 +19,9 @@ buildInputs = [ fftwFloat libsndfile volk ];
meta = with lib; {
description = "Small signal processing utility library";
license = licenses.gpl3Plus;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/radio/smallrx/default.nix b/pkgs/radio/smallrx/default.nix
index efba5ecb4b1fa442eda39b0161cddc06a059e086..ffc0371c8a636c4d5e4506f079fc3d26342db17b 100644
--- a/pkgs/radio/smallrx/default.nix
+++ b/pkgs/radio/smallrx/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "smallrx";
version = "2018-12-18";
@@ -20,10 +20,10 @@ installPhase = "install -Dm755 rx -t $out/bin";
meta = with lib; {
description = "amateur radio receiver in <100 code lines";
license = licenses.agpl3Only;
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/radio/suscan/default.nix b/pkgs/radio/suscan/default.nix
index 8ebd343cdcd65f568fc5389c703b3e53e41c161b..589b3a0d4ae2389871ec05942c3a024c2ed09b6c 100644
--- a/pkgs/radio/suscan/default.nix
+++ b/pkgs/radio/suscan/default.nix
@@ -2,7 +2,7 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config
, fftwFloat, libsndfile, libxml2, sigutils, soapysdr, volk
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "suscan";
version = "2022-07-05";
@@ -19,9 +19,9 @@ buildInputs = [ fftwFloat libsndfile libxml2 sigutils soapysdr volk ];
meta = with lib; {
description = "Channel scanner based on sigutils library";
license = licenses.gpl3Plus;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/radio/suwidgets/default.nix b/pkgs/radio/suwidgets/default.nix
index 9d30aa56f8674ebeb6de8ed2bb9b7c5260066b49..974009c2aa395501bc9b8b6fd0cfe8604f460f52 100644
--- a/pkgs/radio/suwidgets/default.nix
+++ b/pkgs/radio/suwidgets/default.nix
@@ -2,7 +2,7 @@ { lib, stdenv, fetchFromGitHub, qmake, pkg-config
, fftw, sigutils
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "suwidgets";
version = "2022-04-03";
@@ -25,9 +25,9 @@ dontWrapQtApps = true;
meta = with lib; {
description = "Sigutils-related widgets";
license = licenses.gpl3Plus;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/suckless/amused/default.nix b/pkgs/suckless/amused/default.nix
index 787caa64f03b23d7ad9a4a11d983988c470b301e..5b6e1ac20e3c0f3e61f3005c593f39daee1c1f6b 100644
--- a/pkgs/suckless/amused/default.nix
+++ b/pkgs/suckless/amused/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, bmake, pkg-config, libbsd, imsg-compat, sndio, libevent, flac, mpg123, libvorbis, opusfile }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "amused";
version = "0.10";
src = fetchFromGitHub {
owner = "omar-polo";
repo = "amused";
hash = "sha256-A2f37oI3BT30bqRYgoWy4B1dvPeZBoE4F3lkmET0td8=";
};
@@ -17,10 +17,10 @@ buildInputs = [ libbsd libevent imsg-compat sndio flac mpg123 libvorbis opusfile ];
meta = with lib; {
description = "music player daemon NIH";
license = licenses.isc;
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/suckless/blind/default.nix b/pkgs/suckless/blind/default.nix
index fb0d1acf170a3e2fc6b1aa4454a970dfbbc815a2..2f57bfbbe70c4b247f57fcdace384ffcf213fcf5 100644
--- a/pkgs/suckless/blind/default.nix
+++ b/pkgs/suckless/blind/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "blind";
version = "1.1";
src = fetchurl {
hash = "sha256-JPkDzLXhGNdfONOuDYX+2Ql0n5eL/0f/aXPuG/3fzFo=";
};
@@ -19,4 +19,4 @@ platforms = platforms.linux;
maintainers = [ maintainers.sikmir ];
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/suckless/chibicc/default.nix b/pkgs/suckless/chibicc/default.nix
index 897b9f906d078f236dc6ea3c090e4632a17962fa..ce4b62e449af633375d017f12ef3de961c437449 100644
--- a/pkgs/suckless/chibicc/default.nix
+++ b/pkgs/suckless/chibicc/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, memstreamHook }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "chibicc";
version = "2020-12-07";
@@ -19,9 +19,9 @@ '';
meta = with lib; {
description = "A small C compiler";
license = licenses.mit;
platforms = platforms.unix;
maintainers = [ maintainers.sikmir ];
};
-}
+})
diff --git a/pkgs/suckless/cproc/default.nix b/pkgs/suckless/cproc/default.nix
index 337513638a0896b9d8090a01418ccf6dd0192d2b..6be28e5ffa54176401b53f1227b82b6f87107023 100644
--- a/pkgs/suckless/cproc/default.nix
+++ b/pkgs/suckless/cproc/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromSourcehut, qbe }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "cproc";
version = "2022-08-05";
@@ -17,10 +17,10 @@ doCheck = true;
meta = with lib; {
description = "C11 compiler using QBE as a backend";
license = licenses.isc;
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/suckless/dragon/default.nix b/pkgs/suckless/dragon/default.nix
index 08e0b399fa30442030162ef37db42ba1a599c3c0..6ad1fd126afbae1d611ed174a1dc14db4445c1b3 100644
--- a/pkgs/suckless/dragon/default.nix
+++ b/pkgs/suckless/dragon/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, gtk3 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "dragon";
version = "1.2.0";
src = fetchFromGitHub {
owner = "mwh";
repo = "dragon";
hash = "sha256-wqG6idlVvdN+sPwYgWu3UL0la5ssvymZibiak3KeV7M=";
};
@@ -21,10 +21,10 @@ installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "Drag and drop source/target for X";
license = licenses.gpl3Plus;
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/suckless/ff-tools/default.nix b/pkgs/suckless/ff-tools/default.nix
index 9b9cff0419003eb353c88e21a6b04ea68678f85f..bc2203a8091faa88bd05681c750fc00ac76c0be0 100644
--- a/pkgs/suckless/ff-tools/default.nix
+++ b/pkgs/suckless/ff-tools/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "ff-tools";
version = "2019-06-08";
@@ -19,9 +19,9 @@ preInstall = "mkdir -p $out/bin";
meta = with lib; {
description = "A collection of farbfeld tools";
license = licenses.free;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/suckless/ffshot/default.nix b/pkgs/suckless/ffshot/default.nix
index cd6d2e62aab63c04eb4f4fef10d27db04941bdcd..18f735bcf90a4b99b92da06470286aa8af832fc6 100644
--- a/pkgs/suckless/ffshot/default.nix
+++ b/pkgs/suckless/ffshot/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, xorg }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "ffshot";
version = "2022-05-29";
@@ -17,10 +17,10 @@ installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "farbfeld screenshot utility";
license = licenses.isc;
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/suckless/hurl/default.nix b/pkgs/suckless/hurl/default.nix
index 1598644b4cec2b922a8662d4759a0ab0f9e8419f..d0ea9f85649d14addd7e3925965d2726a3c3391c 100644
--- a/pkgs/suckless/hurl/default.nix
+++ b/pkgs/suckless/hurl/default.nix
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchgit, libressl, libbsd }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "hurl";
version = "0.7";
src = fetchgit {
url = "git://git.codemadness.org/hurl";
hash = "sha256-OXzt5sc1sZesKY1YmeGc3zuo9GxMYfYDvovCSt/kIdE=";
};
@@ -24,4 +24,4 @@ maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/suckless/imscript/default.nix b/pkgs/suckless/imscript/default.nix
index 1ae0199e6546fccdb6deb410798804e6eaf871c9..9b19592f926e061b3fa1200e94a01bad99024882 100644
--- a/pkgs/suckless/imscript/default.nix
+++ b/pkgs/suckless/imscript/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromSourcehut, installShellFiles
, libpng, libjpeg, libtiff, libwebp, fftwFloat, libX11, gsl }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "imscript";
version = "2022-10-17";
@@ -27,9 +27,9 @@ '';
meta = with lib; {
description = "A collection of small and standalone utilities for image processing";
license = licenses.agpl3;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/suckless/kilo/default.nix b/pkgs/suckless/kilo/default.nix
index c1e77b349962dfc6d1a6f15724afd70199bbccbe..a2624abdcf8d8ac117c423aa442feeeb6f1237f5 100644
--- a/pkgs/suckless/kilo/default.nix
+++ b/pkgs/suckless/kilo/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "kilo";
version = "2020-07-05";
@@ -17,9 +17,9 @@ '';
meta = with lib; {
description = "A text editor in less than 1000 LOC with syntax highlight and search";
license = licenses.bsd2;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/suckless/lacc/default.nix b/pkgs/suckless/lacc/default.nix
index 3beb655c9697e154de953228096324a3d995993c..ed25dedacd30b0183d68ebfbb3d8405d115bf49f 100644
--- a/pkgs/suckless/lacc/default.nix
+++ b/pkgs/suckless/lacc/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "lacc";
version = "2022-05-21";
@@ -19,9 +19,9 @@ checkTarget = "all";
meta = with lib; {
description = "A simple, self-hosting C compiler";
license = licenses.mit;
platforms = platforms.unix;
maintainers = [ maintainers.sikmir ];
};
-}
+})
diff --git a/pkgs/suckless/lbm/default.nix b/pkgs/suckless/lbm/default.nix
index 07d0f88d423cfabb4d4fec47778c78cae257cd55..2b6199e36c90aaa715edf9f1ba899b4fd2b7aff7 100644
--- a/pkgs/suckless/lbm/default.nix
+++ b/pkgs/suckless/lbm/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitLab, pkg-config, dbus, xorg }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "lbm";
version = "2022-03-13";
@@ -23,10 +23,10 @@ installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "A simple Bluetooth manager";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/suckless/lchat/default.nix b/pkgs/suckless/lchat/default.nix
index c6c7454dc3c4495aef7f21daa98643cbc9288421..03efbe7652fc6e99a51ee21b3e0bebf2733ebe90 100644
--- a/pkgs/suckless/lchat/default.nix
+++ b/pkgs/suckless/lchat/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, libutf, ncurses }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "lchat";
version = "2022-09-07";
@@ -21,9 +21,9 @@ preInstall = "mkdir -p $out/bin $out/share/man/man1";
meta = with lib; {
description = "line chat is a simple and elegant front end for ii-like chat programs";
license = licenses.isc;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/suckless/lel/default.nix b/pkgs/suckless/lel/default.nix
index 93f5ed39d87712e6b3e038dd5aadffe89a7d8945..705c98941c03fab0c45d537d6db22a9ecde3d9f1 100644
--- a/pkgs/suckless/lel/default.nix
+++ b/pkgs/suckless/lel/default.nix
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchgit, libX11, farbfeld, farbfeld-utils }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "lel";
version = "0.2";
src = fetchgit {
url = "git://git.codemadness.org/lel";
hash = "sha256-p0lgzSgNyXUAMo/LXhbQZW8LRUGg+Iz+KEQiNYeaL7E=";
};
@@ -29,4 +29,4 @@ license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/suckless/libgrapheme/default.nix b/pkgs/suckless/libgrapheme/default.nix
index f7fac00aebb089ac2ce4aeacd6c08ef23d23af35..55c57845edb798723268d437253b28c3e9a49b80 100644
--- a/pkgs/suckless/libgrapheme/default.nix
+++ b/pkgs/suckless/libgrapheme/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchgit }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "libgrapheme";
version = "2.0.1";
diff --git a/pkgs/suckless/libst/default.nix b/pkgs/suckless/libst/default.nix
index 0b39a91e0f342b3e5f6dc2b84049ede7c88d0481..73fabcdbeb639cc7cb0eb3df9de864b70d363c72 100644
--- a/pkgs/suckless/libst/default.nix
+++ b/pkgs/suckless/libst/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, ncurses }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "libst";
version = "2021-06-06";
@@ -37,10 +37,10 @@ '';
meta = with lib; {
description = "Suckless Terminal ANSI parser";
license = licenses.mit;
platforms = platforms.linux;
maintainers = [ maintainers.sikmir ];
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/suckless/libutf/default.nix b/pkgs/suckless/libutf/default.nix
index 84dedb6ba8a24b7e4e95cc62bab2b2a36308a8ae..a5b615b7fc855db7f1e28c98b1fb204865343aa4 100644
--- a/pkgs/suckless/libutf/default.nix
+++ b/pkgs/suckless/libutf/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, libutf, ncurses }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "libutf";
version = "2018-11-13";
@@ -17,9 +17,9 @@ installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "Plan 9 compatible UTF-8 C library";
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/suckless/mage/default.nix b/pkgs/suckless/mage/default.nix
index 4b6f238d9c9010ad9febe7620bd3d7ab8021ce44..471aac0e10f8f6580434c6c9a00f21365329081a 100644
--- a/pkgs/suckless/mage/default.nix
+++ b/pkgs/suckless/mage/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, fontconfig, imlib2, libXft, conf ? null }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "mage";
version = "2022-08-28";
@@ -22,10 +22,10 @@ installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "iMAGE viewer";
license = licenses.gpl2Only;
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/suckless/makel/default.nix b/pkgs/suckless/makel/default.nix
index 58d6e1eb0bbb497fa904126a0167965c39bc9842..6c69d4ee4541ec06899e0bcd8569ccb2e06393b7 100644
--- a/pkgs/suckless/makel/default.nix
+++ b/pkgs/suckless/makel/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, libgrapheme }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "makel";
version = "2022-01-24";
@@ -23,9 +23,9 @@ '';
meta = with lib; {
description = "Makefile linter";
license = licenses.isc;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/suckless/nextvi/default.nix b/pkgs/suckless/nextvi/default.nix
index 9f53b7c3d70cf292fc0176ff915ffab5b4bb8238..4b738366519595a7c5b6ca899dcfd7cf2ccf94f5 100644
--- a/pkgs/suckless/nextvi/default.nix
+++ b/pkgs/suckless/nextvi/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "nextvi";
version = "2022-09-05";
@@ -23,9 +23,9 @@ '';
meta = with lib; {
description = "Next version of neatvi (a small vi/ex editor)";
license = licenses.mit;
platforms = platforms.unix;
maintainers = [ maintainers.sikmir ];
};
-}
+})
diff --git a/pkgs/suckless/pista/default.nix b/pkgs/suckless/pista/default.nix
index 12db459dec04f3b55ca4cfe8e1a017ffc969c541..76cfafb8993ebd8947a7db99fdd0aa23896e3f72 100644
--- a/pkgs/suckless/pista/default.nix
+++ b/pkgs/suckless/pista/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, libX11 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "pista";
version = "0.2.0";
src = fetchFromGitHub {
owner = "xandkar";
repo = "pista";
hash = "sha256-lre6SIVyxCwEohLlvSfYs+JnHS1VXTbl3FlUNZ3TGy4=";
};
@@ -19,10 +19,10 @@ '';
meta = with lib; {
description = "Piped status: the ii of status bars!";
license = licenses.bsd3;
maintainers = [ maintainers.sikmir ];
platforms = platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/suckless/sbase/default.nix b/pkgs/suckless/sbase/default.nix
index 9c3d58212a247570e69ccfbb13562d5a165c11d9..b55e1e2a47d180e928bda0124d3950274808c5c3 100644
--- a/pkgs/suckless/sbase/default.nix
+++ b/pkgs/suckless/sbase/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchgit }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "sbase";
version = "2021-09-11";
diff --git a/pkgs/suckless/scroll/default.nix b/pkgs/suckless/scroll/default.nix
index 559b125f5c4287f5cf1436dd8d68548a6776512e..ecdad0902c52c4e92fb609d271fc134445fc2707 100644
--- a/pkgs/suckless/scroll/default.nix
+++ b/pkgs/suckless/scroll/default.nix
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchgit }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "scroll";
version = "0.1";
src = fetchgit {
url = "git://git.suckless.org/scroll";
hash = "sha256-dr1s1K13BigfGSFvfBuOOy+yhuAcN1fb/4AEZPj9C48=";
};
@@ -19,4 +19,4 @@ license = licenses.isc;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/suckless/se/default.nix b/pkgs/suckless/se/default.nix
index e7f30a2aa89725ecf8b8111dd0289b5904b8731b..6192ed53c96ec2527a18127dcb7224fa1f402b62 100644
--- a/pkgs/suckless/se/default.nix
+++ b/pkgs/suckless/se/default.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "se";
version = "3.0.1";
src = fetchFromGitHub {
owner = "screen-editor";
repo = "se";
hash = "sha256-2LyYZXaL/Q3G/StCUiY6MUXG55g2YQvkpoF/lcsifD8=";
};
@@ -17,9 +17,9 @@ buildInputs = [ ncurses ];
meta = with lib; {
description = "screen oriented version of the classic UNIX text editor ed";
license = licenses.publicDomain;
platforms = platforms.unix;
maintainers = [ maintainers.sikmir ];
};
-}
+})
diff --git a/pkgs/suckless/sthkd/default.nix b/pkgs/suckless/sthkd/default.nix
index aac3e977e09465903a857ef4372876cb4367f2ed..819d313275a408e69070f9e377426c7d69546049 100644
--- a/pkgs/suckless/sthkd/default.nix
+++ b/pkgs/suckless/sthkd/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "sthkd";
version = "2020-11-15";
@@ -15,10 +15,10 @@ installFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "Simple Terminal Hotkey Daemon";
license = licenses.isc;
platforms = platforms.linux;
maintainers = [ maintainers.sikmir ];
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/suckless/svtm/default.nix b/pkgs/suckless/svtm/default.nix
index dbce5e13724162ee52e127bbde9f4740e1b8d0cc..b0d421dc4a404c72422fb1f72142983449dada8c 100644
--- a/pkgs/suckless/svtm/default.nix
+++ b/pkgs/suckless/svtm/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, abduco, sthkd, libst }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "svtm";
version = "2021-04-28";
@@ -28,10 +28,10 @@ '';
meta = with lib; {
description = "Simple Virtual Terminal Manager";
license = licenses.mit;
platforms = platforms.linux;
maintainers = [ maintainers.sikmir ];
skip.ci = stdenv.isDarwin;
};
-}
+})
application/octet-streamThis content has been proxied by September (3851b).