diff --git a/flake.lock b/flake.lock
index 126ce78967ee39e2456771465612a1503e5dc271..d8ebd4543c9efd4809a1b41e93baa90b72c8d0fc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@ }
},
"nixpkgs": {
"locked": {
"lastModified": 1717681334,
"narHash": "sha256-HlvsMH8BNgdmQCwbBDmWp5/DfkEQYhXZHagJQCgbJU0=",
"lastModified": 1718276985,
"narHash": "sha256-u1fA0DYQYdeG+5kDm1bOoGcHtX0rtC7qs2YA2N1X++I=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "31f40991012489e858517ec20102f033e4653afb",
"rev": "3f84a279f1a6290ce154c5531378acc827836fbb",
"type": "github"
},
"original": {
diff --git a/pkgs/darwin/finch/default.nix b/pkgs/darwin/finch/default.nix
index 600e2b776ba1ed598f9d1377bad247d7a365a885..7b7baf8fd5c59113e89bda752c752d0942cfa744 100644
--- a/pkgs/darwin/finch/default.nix
+++ b/pkgs/darwin/finch/default.nix
@@ -82,7 +82,7 @@ '';
meta = {
description = "Client for container development";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.darwin;
diff --git a/pkgs/darwin/pinentry-touchid/default.nix b/pkgs/darwin/pinentry-touchid/default.nix
index 412a0db8a3b0243310704b392ca8c587802c2e3a..1ae40ad3ab1c63e4e23a18e6e0ebb4965d762b15 100644
--- a/pkgs/darwin/pinentry-touchid/default.nix
+++ b/pkgs/darwin/pinentry-touchid/default.nix
@@ -3,7 +3,7 @@ lib,
stdenv,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
@@ -21,13 +21,13 @@ vendorHash = "sha256-PJJoTnA9WXzH9Yv/oZfwyjjcbvJwpXxX81vpzTtXWxU=";
subPackages = [ "." ];
doCheck = false;
meta = {
description = "Custom GPG pinentry program for macOS that allows using Touch ID";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.darwin;
diff --git a/pkgs/darwin/qtcreator/bin.nix b/pkgs/darwin/qtcreator/bin.nix
index bdd8d43d7ccdc26228524ed9977b954a161e6777..afa81f556311d1774ba624baed99dc381ae1b764 100644
--- a/pkgs/darwin/qtcreator/bin.nix
+++ b/pkgs/darwin/qtcreator/bin.nix
@@ -9,13 +9,13 @@ }:
stdenv.mkDerivation (finalAttrs: {
pname = "qtcreator-bin";
src = fetchfromgh {
owner = "qt-creator";
repo = "qt-creator";
name = "qtcreator-macos-universal-${finalAttrs.version}.7z";
version = "v${finalAttrs.version}";
};
diff --git a/pkgs/data/dicts/it-sanasto/default.nix b/pkgs/data/dicts/it-sanasto/default.nix
index 23fac6ee7e42c74005efa9aa6c70dc1439aa8173..198e65b0986e0f9f146a5d49c8c170d42bc6634d 100644
--- a/pkgs/data/dicts/it-sanasto/default.nix
+++ b/pkgs/data/dicts/it-sanasto/default.nix
@@ -7,7 +7,7 @@ pandoc,
stardict-tools,
}:
-stdenvNoCC.mkDerivation (finalAttrs: {
+stdenvNoCC.mkDerivation {
pname = "it-sanasto";
version = "2020-02-27";
@@ -36,10 +36,10 @@ installPhase = "install -Dm644 .{dict,idx,ifo} -t $out";
meta = {
description = "IT-alan englanti-suomi -sanasto";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.all;
skip.ci = true;
};
-})
+}
diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix
index 32d064bb73bcec4bb0fb7764c36d09fc6d2b3542..bba777183f6bed06862cfe8f440347129759d6bc 100644
--- a/pkgs/data/dicts/tatoeba/default.nix
+++ b/pkgs/data/dicts/tatoeba/default.nix
@@ -45,7 +45,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 b90a1f3178fa955f7ec11c4f8dcf775b0cc65bb7..54268e4f948eed0302b07fd2f51410cfa3f878d1 100644
--- a/pkgs/data/dicts/tatoeba/tatoeba.json
+++ b/pkgs/data/dicts/tatoeba/tatoeba.json
@@ -5,35 +5,35 @@ "hash": "sha256-AwTCBmkxu6ZYMDJqzAqBVDC8kbq45u27nu/DM4aspgE="
},
"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",
},
"hye_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye_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",
},
"bel-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/bel/bel-eng_links.tsv.bz2",
@@ -45,15 +45,15 @@ "hash": "sha256-x50Dd/A/W+H3sR+ZkZuqQKkY6xh9S5QXfFrItKqpW5I="
},
"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-bel_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-bel_links.tsv.bz2",
@@ -61,51 +61,51 @@ "hash": "sha256-o8N91xkVHLMou98b/n+AGtTCIpdjPyM23o5TTbVnBUo="
},
"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-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-hye_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",
},
"hye-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-eng_links.tsv.bz2",
},
"hye-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-rus_links.tsv.bz2",
},
"rus-bel_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-bel_links.tsv.bz2",
@@ -113,23 +113,23 @@ "hash": "sha256-skiax/UczxF2QJN5iMlk1Ph8WwCnJ3NFN/3cH7LOtuQ="
},
"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",
},
"rus-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-hye_links.tsv.bz2",
},
"rus-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-swe_links.tsv.bz2",
@@ -137,11 +137,11 @@ "hash": "sha256-kB+alpNmfGrLFXktpwDyqaGxo1NVrXDxwFLgkeNM1fs="
},
"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",
@@ -149,10 +149,10 @@ "hash": "sha256-PgW7vF74Bd3VpwQycvg1JUcLFTpIL9J2fszlrWN+uxI="
},
"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/themes/qtpbfimageplugin-styles/default.nix b/pkgs/data/themes/qtpbfimageplugin-styles/default.nix
index db16ec1b6f8aa04c6334fee1e9afa7b34f01b53e..f1d7144dcb44e76f9166b3d21e1d8a3a3ba68f7e 100644
--- a/pkgs/data/themes/qtpbfimageplugin-styles/default.nix
+++ b/pkgs/data/themes/qtpbfimageplugin-styles/default.nix
@@ -4,7 +4,7 @@ stdenv,
fetchFromGitHub,
}:
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation {
pname = "qtpbfimageplugin-styles";
version = "2022-06-08";
@@ -22,9 +22,9 @@ '';
meta = {
description = "QtPBFImagePlugin styles";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.all;
};
-})
+}
diff --git a/pkgs/default.nix b/pkgs/default.nix
index ad31359544fd35f53fe46987daf538cb8ddec0a5..00368f0f9b24a2e0d2224e9b009412d203601d61 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -38,9 +38,7 @@ finch = callPackage ./darwin/finch { buildGoModule = pkgs.buildGo122Module; };
macpass = callPackage ./darwin/macpass { };
macsvg = callPackage ./darwin/macsvg { };
marta = callPackage ./darwin/marta { };
inherit (darwin.apple_sdk.frameworks) LocalAuthentication;
podman-desktop-bin = callPackage ./darwin/podman-desktop/bin.nix { };
qtcreator-bin = callPackage ./darwin/qtcreator/bin.nix { };
qutebrowser-bin = callPackage ./darwin/qutebrowser/bin.nix { };
@@ -157,16 +155,16 @@
agunua = callPackage ./gemini/agunua { };
astronaut = callPackage ./gemini/astronaut { };
comitium = callPackage ./gemini/comitium { };
gelim = callPackage ./gemini/gelim { };
gemcert = callPackage ./gemini/gemcert { };
gemgen = callPackage ./gemini/gemgen { };
gemini-ipfs-gateway = callPackage ./gemini/gemini-ipfs-gateway { };
geminid = callPackage ./gemini/geminid { };
gemreader = callPackage ./gemini/gemreader { };
gloggery = callPackage ./gemini/gloggery { };
gmnhg = callPackage ./gemini/gmnhg { };
gmnigit = callPackage ./gemini/gmnigit { };
gplaces = callPackage ./gemini/gplaces { };
@@ -199,7 +197,7 @@ geojson-pydantic = callPackage ./geospatial/geojson-pydantic { };
geowebcache = callPackage ./geospatial/geowebcache { };
go-pmtiles = callPackage ./geospatial/go-pmtiles { };
go-staticmaps = callPackage ./geospatial/go-staticmaps { };
kealib = callPackage ./geospatial/kealib { };
localtileserver = callPackage ./geospatial/localtileserver { };
mapsoft = callPackage ./geospatial/mapsoft { proj = pkgs.proj_7; };
@@ -312,7 +310,7 @@ pytorchtext = callPackage ./linguistics/pytorchtext { };
revtok = callPackage ./linguistics/revtok { };
stardict-tools = callPackage ./linguistics/stardict-tools { };
tatoebatools = callPackage ./linguistics/tatoebatools { };
wikitextprocessor = callPackage ./linguistics/wikitextprocessor { };
wiktextract = callPackage ./linguistics/wiktextract { };
wiktfinnish = callPackage ./linguistics/wiktfinnish { };
@@ -359,7 +357,7 @@ messenger-gtk = callPackage ./misc/messenger-gtk { };
miband4 = callPackage ./misc/miband4 { };
mitzasql = callPackage ./misc/mitzasql { };
mjs = callPackage ./misc/mjs { };
modbus_sim_cli = callPackage ./misc/modbus_sim_cli { python3Packages = pkgs.python310Packages; };
morse-talk = callPackage ./misc/morse-talk { };
musig = callPackage ./misc/musig { };
@@ -402,7 +400,7 @@ wik = callPackage ./misc/wik { };
#worm = callPackage ./misc/worm { };
wptools = callPackage ./misc/wptools { };
xfractint = callPackage ./misc/xfractint { };
youtimetrack = callPackage ./misc/youtimetrack { };
### MQTT
@@ -425,7 +423,7 @@ mqtt-shell = callPackage ./mqtt/mqtt-shell { };
mqtt-to-influxdb = callPackage ./mqtt/mqtt-to-influxdb { };
mqtt-to-influxdb-forwarder = callPackage ./mqtt/mqtt-to-influxdb-forwarder { };
nanosdk = callPackage ./mqtt/nanosdk { };
### NAKARTE
@@ -468,7 +466,7 @@ pyrobuf = callPackage ./osm/pyrobuf { };
pyrosm = callPackage ./osm/pyrosm { };
sdlmap = callPackage ./osm/sdlmap { };
smopy = callPackage ./osm/smopy { };
taginfo-tools = callPackage ./osm/taginfo-tools { };
tilelog = callPackage ./osm/tilelog { };
tirex = callPackage ./osm/tirex { };
@@ -481,9 +479,7 @@ adsb_deku = callPackage ./radio/adsb_deku { };
ais-catcher = callPackage ./radio/ais-catcher { };
aprsc = callPackage ./radio/aprsc { };
dumphfdl = callPackage ./radio/dumphfdl { };
inherit (darwin.apple_sdk.frameworks) AppKit Foundation;
fmreceiver = libsForQt5.callPackage ./radio/fmreceiver { };
goestools = callPackage ./radio/goestools { };
gqrx-scanner = callPackage ./radio/gqrx-scanner { };
diff --git a/pkgs/development/libraries/iso15765-canbus/default.nix b/pkgs/development/libraries/iso15765-canbus/default.nix
index ac24c5cf9382b01429397daacbcc1644d9212e6a..2cf54ee97fe3e30ab968878cff41a2a727b5a265 100644
--- a/pkgs/development/libraries/iso15765-canbus/default.nix
+++ b/pkgs/development/libraries/iso15765-canbus/default.nix
@@ -4,14 +4,14 @@ stdenv,
fetchFromGitHub,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "iso15765-canbus";
version = "0-unstable-2024-01-17";
src = fetchFromGitHub {
owner = "devcoons";
repo = "iso15765-canbus";
hash = "sha256-KdVw8JhJsqa+n3ELnTojHV/37Wfb1A2a7fSbBsTkJgI=";
};
@@ -27,10 +27,10 @@ '';
meta = {
description = "Implementation of ISO15765-2 in C";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/development/libraries/libgnunetchat/default.nix b/pkgs/development/libraries/libgnunetchat/default.nix
index 735ad11f9bb208a385ecf973df91cbec2cb284cf..dc39ccbbe710548a231b42d5c0246f9471fc7bf6 100644
--- a/pkgs/development/libraries/libgnunetchat/default.nix
+++ b/pkgs/development/libraries/libgnunetchat/default.nix
@@ -12,12 +12,12 @@ libgcrypt,
libsodium,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "libgnunetchat";
version = "0.3.1";
src = fetchurl {
hash = "sha256-IIyKQxaueFJQJ8+mt8Iz44S8FjZ/wIW7vFw/UYMzaA0=";
};
@@ -48,9 +48,9 @@
meta = {
description = "A client-side library for applications to utilize the Messenger service of GNUnet";
homepage = "https://www.gnunet.org/";
license = lib.licenses.agpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
};
-}
+})
diff --git a/pkgs/development/libraries/libshell/default.nix b/pkgs/development/libraries/libshell/default.nix
index 3e9f878b1a482e7c5c152ce8df22cef0512a10e2..bdd630c8912c879597692c8981faf6c5fbeb92ee 100644
--- a/pkgs/development/libraries/libshell/default.nix
+++ b/pkgs/development/libraries/libshell/default.nix
@@ -12,13 +12,13 @@ }:
stdenv.mkDerivation (finalAttrs: {
pname = "libshell";
src = fetchFromGitHub {
owner = "legionus";
repo = "libshell";
rev = "v${finalAttrs.version}";
};
nativeBuildInputs = [ help2man ];
@@ -29,7 +29,7 @@ substituteInPlace utils/Makefile --replace-fail "/usr" ""
substituteInPlace utils/cgrep.in --replace-fail "/bin/ash" "${dash}/bin/dash"
substituteInPlace shell-terminfo --replace-fail "tput" "${ncurses}/bin/tput"
for f in shell-* ; do
substituteInPlace $f --replace-fail "/bin/sh" "${bash}/bin/sh"
substituteInPlace $f --replace-warn "/bin/sh" "${bash}/bin/sh"
done
'';
@@ -43,7 +43,7 @@ doCheck = false;
meta = {
description = "A library of shell functions";
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.all;
diff --git a/pkgs/development/libraries/libsockcanpp/default.nix b/pkgs/development/libraries/libsockcanpp/default.nix
index 2d20823bcfb3fe67e12142200e8ac47c53a74cf2..73f2da54a9be4b1f89130acba1266c2e3448c62d 100644
--- a/pkgs/development/libraries/libsockcanpp/default.nix
+++ b/pkgs/development/libraries/libsockcanpp/default.nix
@@ -25,7 +25,7 @@ nativeBuildInputs = [ cmake ];
meta = {
description = "A C++ wrapper around Linux's socketcan featureset";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/development/libraries/microjson/default.nix b/pkgs/development/libraries/microjson/default.nix
index 571708f5dfb82e501b41250ac7650e68d0d4a793..e7475049e677da111601ebec5e6fe58b45979a37 100644
--- a/pkgs/development/libraries/microjson/default.nix
+++ b/pkgs/development/libraries/microjson/default.nix
@@ -35,7 +35,7 @@ doCheck = true;
meta = {
description = "Tiny streaming json deserializer";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/development/python-modules/contextily/default.nix b/pkgs/development/python-modules/contextily/default.nix
index ff91032879f8f46167e721bf1c292b9dd4e1d8d2..4e63e6384413819e20a24a145e96b2e80efd6b87 100644
--- a/pkgs/development/python-modules/contextily/default.nix
+++ b/pkgs/development/python-modules/contextily/default.nix
@@ -22,7 +22,7 @@ build-system = with python3Packages; [ setuptools-scm ];
SETUPTOOLS_SCM_PRETEND_VERSION = version;
geopy
matplotlib
mercantile
diff --git a/pkgs/development/python-modules/curses-menu/default.nix b/pkgs/development/python-modules/curses-menu/default.nix
index 43927f8cc45a2f2f40a3ba6d3dfae59f677b3a40..c0b2736a1cd6a0d1bb2b506e4c1541e75e2be4e2 100644
--- a/pkgs/development/python-modules/curses-menu/default.nix
+++ b/pkgs/development/python-modules/curses-menu/default.nix
@@ -18,7 +18,7 @@ };
build-system = with python3Packages; [ poetry-core ];
deprecated
pexpect
pyte
@@ -33,7 +33,7 @@ doCheck = false;
meta = {
description = "A simple console menu system using curses";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/development/python-modules/earthpy/default.nix b/pkgs/development/python-modules/earthpy/default.nix
index f4d36c358a1a8212ee93fd3edc673b0bc0693934..1a12ac9ea3b18322959dc922311705bdfc9b07cb 100644
--- a/pkgs/development/python-modules/earthpy/default.nix
+++ b/pkgs/development/python-modules/earthpy/default.nix
@@ -16,7 +16,7 @@ rev = "v${version}";
hash = "sha256-MCyeFXtjOqnVarSUk7Z/+Y5oNhYLlxznjWHQOCgUOIc=";
};
geopandas
matplotlib
numpy
@@ -29,7 +29,7 @@ doCheck = false;
meta = {
description = "A package built to support working with spatial data using open source python";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/development/python-modules/geotiler/default.nix b/pkgs/development/python-modules/geotiler/default.nix
index b3f4fa42fa80b742e5fe72c4d93326bbf1c3cb58..c5388f9f7aa1af944a256ac3dd275ba19708b432 100644
--- a/pkgs/development/python-modules/geotiler/default.nix
+++ b/pkgs/development/python-modules/geotiler/default.nix
@@ -16,7 +16,7 @@ rev = "geotiler-${version}";
hash = "sha256-xqAsjuUMODZvkSMyGXpP1/FTyqNKPfa8l4Zr2CUHaDY=";
};
aiohttp
cytoolz
numpy
diff --git a/pkgs/development/python-modules/gpxelevations/default.nix b/pkgs/development/python-modules/gpxelevations/default.nix
index 410462cada5a426b442e0ef01b7ada3d07c89d28..ecbc4cfcb31e5000f66d909a40dff9c45475c2d2 100644
--- a/pkgs/development/python-modules/gpxelevations/default.nix
+++ b/pkgs/development/python-modules/gpxelevations/default.nix
@@ -18,7 +18,7 @@ rev = "v${version}";
hash = "sha256-/AGvFE74sJTnn70VklQp0MG+7dsooavAdSTyV2oJM+I=";
};
requests
gpxpy
];
@@ -36,7 +36,7 @@ '';
meta = {
description = "Geo elevation data parser for \"The Shuttle Radar Topography Mission\" data";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/development/python-modules/jsonseq/default.nix b/pkgs/development/python-modules/jsonseq/default.nix
index 992047b0e16b449f65e9ed7034a5d78baca2e19a..60aee67b52fa67b9af8a75c6e3ff46975ab8598f 100644
--- a/pkgs/development/python-modules/jsonseq/default.nix
+++ b/pkgs/development/python-modules/jsonseq/default.nix
@@ -19,7 +19,7 @@ nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
meta = {
description = "Python implementation of RFC 7464";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/development/python-modules/modbus_tk/default.nix b/pkgs/development/python-modules/modbus_tk/default.nix
index cd60e9e92953257957e8bedf68fadbf3d3ef2b4e..07caf8ad2976b14824d4f10e230148f2132ecad6 100644
--- a/pkgs/development/python-modules/modbus_tk/default.nix
+++ b/pkgs/development/python-modules/modbus_tk/default.nix
@@ -15,11 +15,11 @@ rev = version;
hash = "sha256-zikfVMFdlOJvuKVQGEsK03i58X6BGFsGWGrGOJZGC0g=";
};
meta = {
description = "Implementation of modbus protocol in python";
license = lib.licenses.lgpl2;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/development/python-modules/portolan/default.nix b/pkgs/development/python-modules/portolan/default.nix
index 12c0924ecb777b04f6777a5bca1f3136505178fa..91220660f635be2824cd40a59a6eb480a4035c03 100644
--- a/pkgs/development/python-modules/portolan/default.nix
+++ b/pkgs/development/python-modules/portolan/default.nix
@@ -15,11 +15,13 @@ rev = "v${version}";
hash = "sha256-zKloFO7uCLkqgayxC11JRfMpNxIR+UkT/Xabb9AH8To=";
};
meta = {
description = "Convert between compass points and degrees";
license = lib.licenses.gpl3Only;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/development/python-modules/pyarrow_ops/default.nix b/pkgs/development/python-modules/pyarrow_ops/default.nix
index 3e26262bdb679ac132f5c8c174cf30803e4ecc83..028cb89eaa51b7d08513836f8d65e42280dedeab 100644
--- a/pkgs/development/python-modules/pyarrow_ops/default.nix
+++ b/pkgs/development/python-modules/pyarrow_ops/default.nix
@@ -5,7 +5,7 @@ python3Packages,
fetchFromGitHub,
}:
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonPackage {
pname = "pyarrow_ops";
version = "0-unstable-2022-01-30";
pyproject = true;
@@ -21,7 +21,7 @@ build-system = with python3Packages; [ setuptools ];
nativeBuildInputs = with python3Packages; [ cython ];
numpy
pyarrow
];
diff --git a/pkgs/development/python-modules/pymbtiles/default.nix b/pkgs/development/python-modules/pymbtiles/default.nix
index 0fde8e1fb019a34ea9796bcdf5653a74c1277dff..32ac6f332f4fd8164f2a09b6c31f83f0a31ce74e 100644
--- a/pkgs/development/python-modules/pymbtiles/default.nix
+++ b/pkgs/development/python-modules/pymbtiles/default.nix
@@ -4,7 +4,7 @@ fetchFromGitHub,
python3Packages,
}:
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonPackage {
pname = "pymbtiles";
version = "0.5.0-unstable-2021-02-16";
@@ -19,7 +19,7 @@ nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
meta = {
description = "Python utilities for Mapbox mbtiles files";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/development/python-modules/pytest-mp/default.nix b/pkgs/development/python-modules/pytest-mp/default.nix
index a0ad1a73de87da43e288d9ba4f1f4dde81502b99..ee7d9f374c7fa37e68a6e773cf95f2e77b7401eb 100644
--- a/pkgs/development/python-modules/pytest-mp/default.nix
+++ b/pkgs/development/python-modules/pytest-mp/default.nix
@@ -4,7 +4,7 @@ fetchFromGitHub,
python3Packages,
}:
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonPackage {
pname = "pytest-mp";
version = "2019-03-11";
@@ -24,7 +24,7 @@ '';
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
pytest
psutil
];
@@ -33,7 +33,7 @@ doCheck = false;
meta = {
description = "A test batcher for multiprocessed Pytest runs";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/development/python-modules/pytest-shell-utilities/default.nix b/pkgs/development/python-modules/pytest-shell-utilities/default.nix
index 9e069e5dc4919d4173df987b38702eaf84ce7dc0..b3739b34c7d1d454053adf02526511babc5831cb 100644
--- a/pkgs/development/python-modules/pytest-shell-utilities/default.nix
+++ b/pkgs/development/python-modules/pytest-shell-utilities/default.nix
@@ -20,12 +20,12 @@ };
SETUPTOOLS_SCM_PRETEND_VERSION = version;
setuptools-scm
setuptools-declarative-requirements
];
psutil
pytest-skip-markers
pytest-subtests
@@ -36,7 +36,7 @@ nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
meta = {
description = "Pytest Shell Utilities";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/development/python-modules/pytest-skip-markers/default.nix b/pkgs/development/python-modules/pytest-skip-markers/default.nix
index a33026469ae7d1655f2cbaee799be54ea8f3c1c5..77f5ca1dad4598831b7ba52ae78b857472c0edf1 100644
--- a/pkgs/development/python-modules/pytest-skip-markers/default.nix
+++ b/pkgs/development/python-modules/pytest-skip-markers/default.nix
@@ -19,12 +19,12 @@ };
SETUPTOOLS_SCM_PRETEND_VERSION = version;
setuptools-scm
setuptools-declarative-requirements
];
attrs
distro
pytest
@@ -34,7 +34,7 @@ doCheck = false;
meta = {
description = "A Pytest plugin which implements a few useful skip markers";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/development/python-modules/s2sphere/default.nix b/pkgs/development/python-modules/s2sphere/default.nix
index fe5ca261679407e86545e01c3be021eb7209ce66..4c3217e46d80c82cd7651ed289b87c36af17a970 100644
--- a/pkgs/development/python-modules/s2sphere/default.nix
+++ b/pkgs/development/python-modules/s2sphere/default.nix
@@ -4,7 +4,7 @@ fetchFromGitHub,
python3Packages,
}:
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonPackage {
pname = "s2sphere";
version = "0.2.5";
@@ -15,7 +15,7 @@ rev = "d1d067e8c06e5fbaf0cc0158bade947b4a03a438";
hash = "sha256-6hNIuyLTcGcXpLflw2ajCOjel0IaZSFRlPFi81Z5LUo=";
};
doCheck = false;
diff --git a/pkgs/garmin/garmin-uploader/default.nix b/pkgs/garmin/garmin-uploader/default.nix
index a2581671c9c5b2464573b14b923104b9aca7773c..1b255bd34df16f7f17ceed87e627776d03e5880b 100644
--- a/pkgs/garmin/garmin-uploader/default.nix
+++ b/pkgs/garmin/garmin-uploader/default.nix
@@ -15,7 +15,7 @@ rev = version;
hash = "sha256-OHY4f+0jfxKXiwRJRdSarlb2H+lEt2EVoAAsD4aEc9o=";
};
requests
six
];
@@ -26,7 +26,7 @@ doCheck = false;
meta = {
description = "Garmin Connect Python Uploader";
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/garmin/garminimg/default.nix b/pkgs/garmin/garminimg/default.nix
index 5ddc50de8cf794b8780f9122c89024c75a176236..8168c9895c8f5a17beb3e38cc8daadeb5102244a 100644
--- a/pkgs/garmin/garminimg/default.nix
+++ b/pkgs/garmin/garminimg/default.nix
@@ -8,7 +8,7 @@ proj,
wrapQtAppsHook,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "garminimg";
version = "0-unstable-2021-01-07";
@@ -46,7 +46,7 @@ '';
meta = {
description = "Encode/decode a Garmin IMG file";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/garmin/gimgtools/default.nix b/pkgs/garmin/gimgtools/default.nix
index 86b4c87c85e9b11c5e2b80e2a06a24d277404eda..92d6a7f1a2714b64b1571d6d3d24e43bbe463817 100644
--- a/pkgs/garmin/gimgtools/default.nix
+++ b/pkgs/garmin/gimgtools/default.nix
@@ -28,7 +28,7 @@ '';
meta = {
description = "Garmin Image Tools";
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/garmin/openmtbmap/default.nix b/pkgs/garmin/openmtbmap/default.nix
index ecb5618bcfc1a0590ca5940097da54a6617d9662..59df41409a88ebc9927e37838d6ed3b64e53bbb4 100644
--- a/pkgs/garmin/openmtbmap/default.nix
+++ b/pkgs/garmin/openmtbmap/default.nix
@@ -9,7 +9,7 @@ zsh,
substituteAll,
}:
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation {
pname = "openmtbmap";
version = "2020-06-10";
@@ -35,10 +35,10 @@ '';
meta = {
description = "Linux script to extract and compile garmin *.img map files from openmtbmap.org or openvelomap.org downloads";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.all;
skip.ci = true;
};
-})
+}
diff --git a/pkgs/garmin/osm2mp/default.nix b/pkgs/garmin/osm2mp/default.nix
index 345c2530d06d24b18c6bddd1c1251521ec948811..d2463731f8cdc06d3835fb9eff138f941ceaa8b4 100644
--- a/pkgs/garmin/osm2mp/default.nix
+++ b/pkgs/garmin/osm2mp/default.nix
@@ -20,7 +20,7 @@ TreeR,
YAML,
}:
-buildPerlPackage rec {
+buildPerlPackage {
pname = "osm2mp";
version = "0-unstable-2018-08-31";
@@ -76,7 +76,7 @@ '';
meta = {
description = "Convert Openstreetmap data to MP format";
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.sikmir ];
mainProgram = "osm2mp";
diff --git a/pkgs/gemini/agunua/default.nix b/pkgs/gemini/agunua/default.nix
index d7efaf7f00c3413ccb8657372acda3cba15141c4..6ccd85be95036c06b7e2974a619d5d9d21d42d60 100644
--- a/pkgs/gemini/agunua/default.nix
+++ b/pkgs/gemini/agunua/default.nix
@@ -16,7 +16,7 @@ rev = "release-${version}";
hash = "sha256-sVZ4HrFH3bL6FHn8B43rsya3vggIuCXdx6rPh+LG7MA=";
};
pyopenssl
pysocks
netaddr
@@ -35,7 +35,7 @@ ];
meta = {
description = "Python library for the development of Gemini clients";
license = lib.licenses.gpl2Only;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gemini/astronaut/default.nix b/pkgs/gemini/astronaut/default.nix
index b623eb16e2bdb11eb0b817222f5c96d8597cb80a..45de6e90aad6d2ca0f4f67a1cfdec1a7f5697a18 100644
--- a/pkgs/gemini/astronaut/default.nix
+++ b/pkgs/gemini/astronaut/default.nix
@@ -38,7 +38,7 @@ '';
meta = {
description = "A Gemini browser for the terminal";
license = lib.licenses.gpl3Only;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gemini/eva/default.nix b/pkgs/gemini/eva/default.nix
index ca35f57664801cdf76b5917c7dc87fe675b521ac..d4b564d03480522eb292dbdbd81c86c0c90ecff8 100644
--- a/pkgs/gemini/eva/default.nix
+++ b/pkgs/gemini/eva/default.nix
@@ -7,7 +7,7 @@ pkg-config,
gtk4,
openssl,
wrapGAppsHook,
}:
rustPlatform.buildRustPackage rec {
@@ -33,11 +33,11 @@
buildInputs = [
gtk4
openssl
meta = {
description = "Gemini protocol browser written in Rust using the gtk+ toolkit";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gemini/gelim/default.nix b/pkgs/gemini/gelim/default.nix
index fcd8ea3b34e1e6cefc0b6f2a3eca9e2d50204c5b..2c48c4c6987ac0021bbeddabc010e19737f84d93 100644
--- a/pkgs/gemini/gelim/default.nix
+++ b/pkgs/gemini/gelim/default.nix
@@ -37,7 +37,7 @@ '';
meta = {
description = "A minimalist line-mode smolnet client written in go";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gemini/gemgen/default.nix b/pkgs/gemini/gemgen/default.nix
index 27c060323d05980ef4ff17a9fd5c3ef9f7c85798..adf614e8ac643eef20f2542354db72ddce600d3e 100644
--- a/pkgs/gemini/gemgen/default.nix
+++ b/pkgs/gemini/gemgen/default.nix
@@ -22,7 +22,7 @@ nativeBuildInputs = [ scdoc ];
meta = {
description = "Markdown to Gemtext generator";
license = lib.licenses.gpl3Only;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gemini/gemini-ipfs-gateway/default.nix b/pkgs/gemini/gemini-ipfs-gateway/default.nix
index 1b810aef95d2839d3c88d28c5cb4699b52cc22f7..8c6417ea9790bead7d0077b85ff09d4146aa0a73 100644
--- a/pkgs/gemini/gemini-ipfs-gateway/default.nix
+++ b/pkgs/gemini/gemini-ipfs-gateway/default.nix
@@ -1,12 +1,10 @@
{
lib,
buildGoModule,
fetchFromSourcehut,
}:
-buildGoModule rec {
+buildGoModule {
pname = "gemini-ipfs-gateway";
version = "0-unstable-2023-10-19";
@@ -21,7 +19,7 @@ vendorHash = "sha256-Y7Hm5QbUMz+T68wlTlx5zMjJIQXOe2zhYQZc41Dwjb8=";
meta = {
description = "IPFS access over the Gemini protocol";
license = lib.licenses.agpl3Only;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gemini/geminid/default.nix b/pkgs/gemini/geminid/default.nix
index 7f58142caa3487694b91afd5e3e5e87793d246cb..3eccdbebe53067e3e5d7eef4953778561fb74db3 100644
--- a/pkgs/gemini/geminid/default.nix
+++ b/pkgs/gemini/geminid/default.nix
@@ -37,7 +37,7 @@ installPhase = "install -Dm755 geminid -t $out/bin";
meta = {
description = "Gemini Server in C";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/gemini/gemreader/default.nix b/pkgs/gemini/gemreader/default.nix
index 21291ca777ce6dbb2be1b332ec3d3bbf33e74e05..1eea269332b8b9be889a5a020d7ec6d8f4c3a525 100644
--- a/pkgs/gemini/gemreader/default.nix
+++ b/pkgs/gemini/gemreader/default.nix
@@ -4,9 +4,9 @@ buildGoModule,
fetchFromSourcehut,
}:
-buildGoModule rec {
+buildGoModule {
pname = "gemreader";
src = fetchFromSourcehut {
owner = "~sircmpwn";
@@ -19,7 +19,7 @@ vendorHash = "sha256-NzrZh2dePytF1vsXzfqoeLnzdlcDThjZIkfwuXTAfXM=";
meta = {
description = "Feed reader for the Geminispace";
license = lib.licenses.agpl3Only;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gemini/gemserv/default.nix b/pkgs/gemini/gemserv/default.nix
index 8bab9f19a9a78f3411fb83641a4aa9270104dab9..9239165eb70f7785462854bdb125d0869664c0b2 100644
--- a/pkgs/gemini/gemserv/default.nix
+++ b/pkgs/gemini/gemserv/default.nix
@@ -5,7 +5,7 @@ rustPlatform,
fetchFromSourcehut,
pkg-config,
openssl,
}:
rustPlatform.buildRustPackage rec {
@@ -23,7 +23,7 @@ cargoHash = "sha256-mGcZiSOwgRki3OfbbcNL/1avj6T5XD7ebjg9THIzUIQ=";
nativeBuildInputs = [ pkg-config ];
postInstall = ''
install -Dm644 config.toml -t $out/share/gemserv
@@ -31,7 +31,7 @@ '';
meta = {
description = "A gemini server written in rust";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gemini/gloggery/default.nix b/pkgs/gemini/gloggery/default.nix
index bffa5e2ef0b4f45124d8619781af6bc40064a387..079f46d68d086d58a1d612c8c7e62d1a01f137b5 100644
--- a/pkgs/gemini/gloggery/default.nix
+++ b/pkgs/gemini/gloggery/default.nix
@@ -29,7 +29,7 @@ postInstall = "mv $out/.gloggery $out/share/glogger";
meta = {
description = "Gemtext blog static site generator";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/gemini/gmi2html/default.nix b/pkgs/gemini/gmi2html/default.nix
index c81713ff1823b9b542fa22f6e8bd70d3c557d531..eb69ce2c6d24edfcdf002b5bb6b2813f5d256e67 100644
--- a/pkgs/gemini/gmi2html/default.nix
+++ b/pkgs/gemini/gmi2html/default.nix
@@ -9,13 +9,13 @@ }:
stdenv.mkDerivation (finalAttrs: {
pname = "gmi2html";
src = fetchFromGitHub {
owner = "shtanton";
repo = "gmi2html";
rev = "v${finalAttrs.version}";
};
nativeBuildInputs = [
@@ -43,7 +43,7 @@ '';
meta = {
description = "Translate text/gemini into HTML";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/gemini/gmnhg/default.nix b/pkgs/gemini/gmnhg/default.nix
index 6e76c0bbfae8ce9e7f4a0fb61de4b9ae6d374169..5cb39147b8a82c2b2320bd90bd9d28ee8302545d 100644
--- a/pkgs/gemini/gmnhg/default.nix
+++ b/pkgs/gemini/gmnhg/default.nix
@@ -19,7 +19,7 @@ vendorHash = "sha256-Jiud36qgjj7RlJ7LysTlhKQhHK7C116lxbw1Cj2hHmU=";
meta = {
description = "Hugo-to-Gemini Markdown converter";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gemini/gmnigit/default.nix b/pkgs/gemini/gmnigit/default.nix
index 934c7923d8325370af47fb67a5897bbf1484b81d..1a1b3bff7d03904edecf74073edf7486b7036c2f 100644
--- a/pkgs/gemini/gmnigit/default.nix
+++ b/pkgs/gemini/gmnigit/default.nix
@@ -4,7 +4,7 @@ buildGoModule,
fetchFromSourcehut,
}:
-buildGoModule rec {
+buildGoModule {
pname = "gmnigit";
version = "0-unstable-2022-01-10";
@@ -24,7 +24,7 @@ ];
meta = {
description = "Static git gemini viewer";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
mainProgram = "gmnigit";
diff --git a/pkgs/gemini/gplaces/default.nix b/pkgs/gemini/gplaces/default.nix
index 90cdfd090e869a11fdcd95d6285515040bb67633..304973065ede3c9a488bd5f17c949d4f4b736463 100644
--- a/pkgs/gemini/gplaces/default.nix
+++ b/pkgs/gemini/gplaces/default.nix
@@ -33,7 +33,7 @@ installFlags = [ "PREFIX=$(out)" ];
meta = {
description = "A simple terminal based Gemini client";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/gemini/gssg/default.nix b/pkgs/gemini/gssg/default.nix
index c4f6aa8d1892a17a31e7c15e198d10d9415bfa93..10da19b70d6ccc9d146aff9ebb722810be684b70 100644
--- a/pkgs/gemini/gssg/default.nix
+++ b/pkgs/gemini/gssg/default.nix
@@ -4,7 +4,7 @@ buildGoModule,
fetchFromSourcehut,
}:
-buildGoModule rec {
+buildGoModule {
pname = "gssg";
version = "0-unstable-2023-05-29";
@@ -19,7 +19,7 @@ vendorHash = "sha256-NxfZbwKo8SY0XfWivQ42cNqIbJQ1EBsxPFr70ZU9G6E=";
meta = {
description = "A gemini static site generator";
license = lib.licenses.gpl3Only;
maintainers = [ lib.maintainers.sikmir ];
mainProgram = "gssg";
diff --git a/pkgs/gemini/gurl/default.nix b/pkgs/gemini/gurl/default.nix
index d0d8c85de80bc99aa048126d1a2cc02bdfa024bc..40b1b43fa07fc2752b9982465673cc18e21071b1 100644
--- a/pkgs/gemini/gurl/default.nix
+++ b/pkgs/gemini/gurl/default.nix
@@ -7,14 +7,13 @@ }:
stdenv.mkDerivation (finalAttrs: {
pname = "gurl";
src = fetchFromGitHub {
repo = "gurl";
};
nativeBuildInputs = [ zig ];
@@ -30,7 +29,7 @@ '';
meta = {
description = "A curl-like cli application to interact with Gemini sites";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/gemini/kineto/default.nix b/pkgs/gemini/kineto/default.nix
index aaead843b6092b966997991c9e15e28f9ad6c428..393c0657b3f5c9e3a27717fbe441687b33e633dc 100644
--- a/pkgs/gemini/kineto/default.nix
+++ b/pkgs/gemini/kineto/default.nix
@@ -4,7 +4,7 @@ buildGoModule,
fetchFromSourcehut,
}:
-buildGoModule rec {
+buildGoModule {
pname = "kineto";
version = "0-unstable-2021-11-04";
@@ -19,7 +19,7 @@ vendorHash = "sha256-+CLJJ4najojIE/0gMlhZxb1P7owdY9+cTnRk+UmHogk=";
meta = {
description = "An HTTP to Gemini proxy";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.sikmir ];
mainProgram = "kineto";
diff --git a/pkgs/gemini/mdtohtml/default.nix b/pkgs/gemini/mdtohtml/default.nix
index 33df2e01ff75883b35bad6dad2e588d1a183fade..6df5eb156f6cc2e941a84bb108b728850bc254d3 100644
--- a/pkgs/gemini/mdtohtml/default.nix
+++ b/pkgs/gemini/mdtohtml/default.nix
@@ -34,7 +34,7 @@ '';
meta = {
description = "Markdown to HTML converter";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
mainProgram = "mdtohtml";
diff --git a/pkgs/gemini/py-gmi2html/default.nix b/pkgs/gemini/py-gmi2html/default.nix
index 987d846689fbf588c89ee0b02e6d36ad3a5e7d6b..605c9d222d6647bb497836b0a56b378d1b4f677c 100644
--- a/pkgs/gemini/py-gmi2html/default.nix
+++ b/pkgs/gemini/py-gmi2html/default.nix
@@ -4,7 +4,7 @@ fetchFromGitea,
python3Packages,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "gmi2html";
version = "1.0-unstable-2022-02-16";
@@ -18,7 +18,7 @@ };
meta = {
description = "A library and CLI tool for converting text/gemini to text/html";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gemini/qute-gemini/default.nix b/pkgs/gemini/qute-gemini/default.nix
index f815e20e28112eb6f0c34ea78c78102e74269675..321b6d36848ad72db4456d78bb8bf1c163bc3cd1 100644
--- a/pkgs/gemini/qute-gemini/default.nix
+++ b/pkgs/gemini/qute-gemini/default.nix
@@ -25,7 +25,7 @@ '';
meta = {
description = "A qutebrowser userscripts that allows viewing Gemini pages";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gemini/satellite/default.nix b/pkgs/gemini/satellite/default.nix
index 22a9fa881fa9219724c79ef4446e753fe69707df..f8a8121a89999237738aee08fd60e5cccbaa0c7c 100644
--- a/pkgs/gemini/satellite/default.nix
+++ b/pkgs/gemini/satellite/default.nix
@@ -19,7 +19,7 @@ vendorHash = "sha256-NxfZbwKo8SY0XfWivQ42cNqIbJQ1EBsxPFr70ZU9G6E=";
meta = {
description = "Small Gemini server for serving static files";
license = lib.licenses.agpl3Only;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gemini/shavit/default.nix b/pkgs/gemini/shavit/default.nix
index d3ac73bccd3c3b4e86015b5912a65af425bb907a..191954f60d21cd1f5526176b8a1ea8d02bf3bd61 100644
--- a/pkgs/gemini/shavit/default.nix
+++ b/pkgs/gemini/shavit/default.nix
@@ -4,9 +4,9 @@ buildGoModule,
fetchFromSourcehut,
}:
-buildGoModule rec {
+buildGoModule {
pname = "shavit";
src = fetchFromSourcehut {
owner = "~yotam";
@@ -19,7 +19,7 @@ vendorHash = "sha256-qsHmiYjj7jEDIEbU52NIdWtrUPzImm9u/4Q/aH/2WwE=";
meta = {
description = "Gemini server";
license = lib.licenses.agpl3Only;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gemini/stagit-gemini/sloum.nix b/pkgs/gemini/stagit-gemini/sloum.nix
index 8c24172206c0d17ede3da6ac3385d028be90f314..95099a1823a2fd304f93f1d2f985d64b04e8d1ff 100644
--- a/pkgs/gemini/stagit-gemini/sloum.nix
+++ b/pkgs/gemini/stagit-gemini/sloum.nix
@@ -5,7 +5,7 @@ libgit2,
fetchFromGitea,
}:
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation {
pname = "stagit-gemini";
version = "2020-01-18";
@@ -23,9 +23,9 @@ buildInputs = [ libgit2 ];
meta = {
description = "Fork of stagit-gopher that ports the output to gemini";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.sikmir ];
};
-})
+}
diff --git a/pkgs/gemini/tom/default.nix b/pkgs/gemini/tom/default.nix
index 6b3ffed7ef527e12db9310c2335c92e6fa712905..cefb0e8d8c22a7a7f0017dd10ed5bd6e761fdd92 100644
--- a/pkgs/gemini/tom/default.nix
+++ b/pkgs/gemini/tom/default.nix
@@ -9,7 +9,7 @@ memstreamHook,
zlib,
}:
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation {
pname = "tom";
version = "2021-10-21";
@@ -47,9 +47,9 @@ '';
meta = {
description = "Gemini frontend for git repositories";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
};
-})
+}
diff --git a/pkgs/geospatial/arcgis2geojson/default.nix b/pkgs/geospatial/arcgis2geojson/default.nix
index 6bc220ee04862d2189beb4f6d6dfe8baee10b273..703581ecc5ac96a658600aa7ae70d476138a54c0 100644
--- a/pkgs/geospatial/arcgis2geojson/default.nix
+++ b/pkgs/geospatial/arcgis2geojson/default.nix
@@ -25,7 +25,7 @@ build-system = with python3Packages; [ poetry-core ];
meta = {
description = "A Python library for converting ArcGIS JSON to GeoJSON";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
broken = true;
diff --git a/pkgs/geospatial/bbox/default.nix b/pkgs/geospatial/bbox/default.nix
index 92dd09b5891dc7278937c4c9d7b64007c2f72aa0..129f7319c43b683ddc72e1c002ee9a4243e47813 100644
--- a/pkgs/geospatial/bbox/default.nix
+++ b/pkgs/geospatial/bbox/default.nix
@@ -38,7 +38,7 @@ ];
meta = {
description = "BBOX services";
license = with lib.licenses; [
asl20
mit
diff --git a/pkgs/geospatial/c2cwsgiutils/default.nix b/pkgs/geospatial/c2cwsgiutils/default.nix
index 0c92a38a6de13efad4b60b6af153c062b3ce51a9..a4673a4bc85129f1e263532dcce20b2eef0c10ee 100644
--- a/pkgs/geospatial/c2cwsgiutils/default.nix
+++ b/pkgs/geospatial/c2cwsgiutils/default.nix
@@ -17,7 +17,7 @@ rev = version;
hash = "sha256-lPE21SLMgfnNu0qiM3e2qz6zJJ7u5YaNkqOSNTF1FVg=";
};
boltons
lxml
netifaces
@@ -33,7 +33,7 @@ pythonImportsCheck = [ "c2cwsgiutils" ];
meta = {
description = "Common utilities for Camptocamp WSGI applications";
license = lib.licenses.bsd2;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/geospatial/cogdumper/default.nix b/pkgs/geospatial/cogdumper/default.nix
index 8148158b903a533b840dbe830eaf3f95658b04dd..614d7d6b0c02fa3089bdfc876c3cc28794468ffb 100644
--- a/pkgs/geospatial/cogdumper/default.nix
+++ b/pkgs/geospatial/cogdumper/default.nix
@@ -1,11 +1,10 @@
{
lib,
fetchFromGitHub,
python3Packages,
}:
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonPackage {
pname = "cogdumper";
version = "0.5.0";
@@ -16,15 +15,11 @@ rev = "89a5f05fc0ed88c36f44e42dfe8d48e4c4ff389b";
hash = "sha256-gLBBGP2AMKP8biSbMtrxGs7vLDXbP+Y6Ct82FiNdNjs=";
};
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
meta = {
description = "Dumps tiles out of a cloud optimized geotiff";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/geospatial/cogeo-mosaic/default.nix b/pkgs/geospatial/cogeo-mosaic/default.nix
index 7dfa5776fa888bb59ab5fd69a0d305ed2d0b591b..3833c9bce3e10adde3edbf374b223b1dbfbd3f01 100644
--- a/pkgs/geospatial/cogeo-mosaic/default.nix
+++ b/pkgs/geospatial/cogeo-mosaic/default.nix
@@ -1,6 +1,5 @@
{
lib,
fetchFromGitHub,
python3Packages,
supermorecado,
@@ -18,12 +17,12 @@ rev = version;
hash = "sha256-FJJZvLGBEZpVyfXBqmz6r1obx4HrKmtK0dWusItX3j4=";
};
hatchling
hatch-fancy-pypi-readme
];
morecantile
shapely
pydantic
diff --git a/pkgs/geospatial/datamaps/default.nix b/pkgs/geospatial/datamaps/default.nix
index b50204f266d356cc81fb2c2e866bd351a481cc52..b11882c17eccc6278db2fcdd5a1f82464c673981 100644
--- a/pkgs/geospatial/datamaps/default.nix
+++ b/pkgs/geospatial/datamaps/default.nix
@@ -31,7 +31,7 @@ '';
meta = {
description = "Indexes points and lines and generates map tiles to display them";
license = lib.licenses.bsd2;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/geospatial/elevation/default.nix b/pkgs/geospatial/elevation/default.nix
index 443a245d7e49cfc9db86e142c0938cd8265c64cb..e94ae57039d39492498b218b2cca68c148e851ab 100644
--- a/pkgs/geospatial/elevation/default.nix
+++ b/pkgs/geospatial/elevation/default.nix
@@ -23,11 +23,11 @@ rev = version;
hash = "sha256-sZStJgToQtWYrBH1BjqxCUwQUT5dcAlyZwnb4aYga+4=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
fasteners
appdirs
click
diff --git a/pkgs/geospatial/geoarrow-c/default.nix b/pkgs/geospatial/geoarrow-c/default.nix
index 09ea1315e8103a4b9b57491d379deed6bd12f099..0c3b497b8e89ba009b72db26197cc23f72c43f5c 100644
--- a/pkgs/geospatial/geoarrow-c/default.nix
+++ b/pkgs/geospatial/geoarrow-c/default.nix
@@ -1,6 +1,5 @@
{
lib,
fetchFromGitHub,
python3Packages,
}:
diff --git a/pkgs/geospatial/geoarrow-pyarrow/default.nix b/pkgs/geospatial/geoarrow-pyarrow/default.nix
index 246f2dca9be9f1ee16abac9f9d4ec997f1161b34..064b1dc93221c68017bef0eb872d60ac3211b91a 100644
--- a/pkgs/geospatial/geoarrow-pyarrow/default.nix
+++ b/pkgs/geospatial/geoarrow-pyarrow/default.nix
@@ -1,6 +1,5 @@
{
lib,
fetchFromGitHub,
python3Packages,
geoarrow-c,
@@ -22,7 +21,7 @@ sourceRoot = "${src.name}/geoarrow-pyarrow";
build-system = with python3Packages; [ setuptools-scm ];
geoarrow-c
pyarrow
pyarrow-hotfix
diff --git a/pkgs/geospatial/geojson-pydantic/default.nix b/pkgs/geospatial/geojson-pydantic/default.nix
index de16dca5d7d1ca675f1a58038dd2e15214394227..360cfb4e28e361b65aad52c3cd25dc568b2d3617 100644
--- a/pkgs/geospatial/geojson-pydantic/default.nix
+++ b/pkgs/geospatial/geojson-pydantic/default.nix
@@ -1,6 +1,5 @@
{
lib,
fetchFromGitHub,
python3Packages,
}:
@@ -17,9 +16,9 @@ rev = version;
hash = "sha256-bNNLeHFIZYX34b0ceXPPMRIBR4MbMXpMO9gH2HBFKCY=";
};
pydantic
shapely
];
@@ -30,7 +29,7 @@ nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
meta = {
description = "Pydantic data models for the GeoJSON spec";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/geospatial/go-pmtiles/default.nix b/pkgs/geospatial/go-pmtiles/default.nix
index 16e58d92133fa6500fe9438db257496f1d804117..4e1585622953d0c25113e89c7bf33835c9c415ca 100644
--- a/pkgs/geospatial/go-pmtiles/default.nix
+++ b/pkgs/geospatial/go-pmtiles/default.nix
@@ -17,11 +17,15 @@ };
vendorHash = "sha256-gLFwGEUeH41bObG32MZznF7clct3h2GEvdZ2/KIiVb4=";
meta = {
description = "Read/write library & concurrent caching proxy for PMTiles archives";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/geospatial/go-staticmaps/default.nix b/pkgs/geospatial/go-staticmaps/default.nix
index 24ab80301385e6b9c9261ca0537b0fcd07d51210..f868978c800b12bd851f16e7f01411c1898be5c1 100644
--- a/pkgs/geospatial/go-staticmaps/default.nix
+++ b/pkgs/geospatial/go-staticmaps/default.nix
@@ -4,7 +4,7 @@ buildGoModule,
fetchFromGitHub,
}:
-buildGoModule rec {
+buildGoModule {
pname = "go-staticmaps";
version = "0-unstable-2021-12-31";
@@ -21,7 +21,7 @@ vendorHash = "sha256-VwdQsm7VghVtX2O41jNxILTuiLff4rTfXP41+IzUmMs=";
meta = {
description = "A go (golang) library and command line tool to render static map images using OpenStreetMap tiles";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/geospatial/hecate/default.nix b/pkgs/geospatial/hecate/default.nix
index bbeb4ddb44dd3431c8073c734e19ba4e0a0c44e7..8c2ba210b662acea79481aa19163529b393460df 100644
--- a/pkgs/geospatial/hecate/default.nix
+++ b/pkgs/geospatial/hecate/default.nix
@@ -5,7 +5,7 @@ rustPlatform,
fetchFromGitHub,
pkg-config,
openssl,
}:
rustPlatform.buildRustPackage rec {
@@ -23,13 +23,13 @@ cargoHash = "sha256-ROx90hWk9q5E/Yfy9luHbB1XyyLqw2KEl92niBNapBI=";
nativeBuildInputs = [ pkg-config ];
doCheck = false;
meta = {
description = "Fast Geospatial Feature Storage API";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
broken = true;
diff --git a/pkgs/geospatial/kealib/default.nix b/pkgs/geospatial/kealib/default.nix
index 50816f0fef3d09cfdb53034f459a1cd3e665b906..e7b2c6c032359951d644e91b4880f1c4366b0d47 100644
--- a/pkgs/geospatial/kealib/default.nix
+++ b/pkgs/geospatial/kealib/default.nix
@@ -6,14 +6,14 @@ cmake,
hdf5,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "kealib";
version = "1.5.3";
src = fetchFromGitHub {
owner = "ubarsc";
repo = "kealib";
hash = "sha256-s6sL8T1jRBmVCrFm00uCw9x6s43u9+GU3ihyMi7XSaQ=";
};
@@ -28,4 +28,4 @@ license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
};
-}
+})
diff --git a/pkgs/geospatial/localtileserver/default.nix b/pkgs/geospatial/localtileserver/default.nix
index 23b0227c681e46a106dc92fe46751185a37da49a..4d3aa68d7f435c4f07cf716a5f2bff6af32f8534 100644
--- a/pkgs/geospatial/localtileserver/default.nix
+++ b/pkgs/geospatial/localtileserver/default.nix
@@ -22,7 +22,7 @@ substituteInPlace setup.py \
--replace-fail "large-image[gdal]" "large-image-source-gdal"
'';
click
flask
flask-caching
diff --git a/pkgs/geospatial/mapsoft/default.nix b/pkgs/geospatial/mapsoft/default.nix
index ac119c967c167af54f4ab933053c9783a0d5cd42..f0e030d2abdc17ea18ffdeed68e35e6001954f91 100644
--- a/pkgs/geospatial/mapsoft/default.nix
+++ b/pkgs/geospatial/mapsoft/default.nix
@@ -108,7 +108,7 @@ '';
meta = {
description = "Mapping software for linux";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/geospatial/mbtiles2osmand/default.nix b/pkgs/geospatial/mbtiles2osmand/default.nix
index 31437cfb0e639eab4b6623a1783941e6fc95443e..ac061917f2d5c69147419f295151095ce3feb97a 100644
--- a/pkgs/geospatial/mbtiles2osmand/default.nix
+++ b/pkgs/geospatial/mbtiles2osmand/default.nix
@@ -4,7 +4,7 @@ fetchFromGitHub,
python3Packages,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "mbtiles2osmand";
version = "0-unstable-2021-01-01";
format = "other";
@@ -36,7 +36,7 @@ '';
meta = {
description = "Converts mbtiles format to sqlitedb format suitable for OsmAnd and RMaps";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/geospatial/mbutiles/default.nix b/pkgs/geospatial/mbutiles/default.nix
index 214f4eec651277bba4e3a1f755ce9de6ac42435b..369b741e9a1fb5a3fee9e125280d14dcd64c573d 100644
--- a/pkgs/geospatial/mbutiles/default.nix
+++ b/pkgs/geospatial/mbutiles/default.nix
@@ -1,13 +1,12 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
sqlite,
}:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
pname = "mbutiles";
version = "0.1.0-unstable-2024-04-12";
@@ -26,7 +25,7 @@ buildInputs = [ sqlite ];
meta = {
description = "mbtiles utility in Rust, generate MBTiles from tiles directories and extract tiles from MBTiles file";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/geospatial/mobroute/default.nix b/pkgs/geospatial/mobroute/default.nix
index 082773289f5bc4ac552d09829d12d645ee0deadc..dd9dfef8274d082f8a283d4f0e34c58ee0ca81ab 100644
--- a/pkgs/geospatial/mobroute/default.nix
+++ b/pkgs/geospatial/mobroute/default.nix
@@ -23,7 +23,7 @@ '';
meta = {
description = "Minimal FOSS Public Transportation Router";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
mainProgram = "mobroute";
diff --git a/pkgs/geospatial/mobsql/default.nix b/pkgs/geospatial/mobsql/default.nix
index 97805f2ceff74bfe981c4165eb8a8fca1bc25c18..0c7df041717f542fce4db44255424d3b160fb2a3 100644
--- a/pkgs/geospatial/mobsql/default.nix
+++ b/pkgs/geospatial/mobsql/default.nix
@@ -23,7 +23,7 @@ '';
meta = {
description = "GTFS to SQLite import tool";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
mainProgram = "mobsql";
diff --git a/pkgs/geospatial/pipfile/default.nix b/pkgs/geospatial/pipfile/default.nix
index 5d1997583db22cc6fb0c853edbc3dad63b13d165..c7da57408a19b799209f0785d5834cd75ebea439 100644
--- a/pkgs/geospatial/pipfile/default.nix
+++ b/pkgs/geospatial/pipfile/default.nix
@@ -15,14 +15,14 @@ rev = "v${version}";
hash = "sha256-GsDhxnvBvjJGQWk25cS9+HqLQ9YVSxujeX2iGivYl6Q=";
};
doCheck = false;
pythonImportsCheck = [ "pipfile" ];
meta = {
description = "Pipfile: the replacement for requirements.txt";
license = with lib.licenses; [
asl20
bsd2
diff --git a/pkgs/geospatial/pmtiles/default.nix b/pkgs/geospatial/pmtiles/default.nix
index ffec0f6e1fdb90aa8890b9b4dc2603a412bfdb62..4dbce09c3f20d5b5ec8e6249dcd005da0d0a6366 100644
--- a/pkgs/geospatial/pmtiles/default.nix
+++ b/pkgs/geospatial/pmtiles/default.nix
@@ -19,7 +19,7 @@ sourceRoot = "${src.name}/python";
meta = {
description = "Library and utilities to write and read PMTiles files - cloud-optimized archives of map tiles";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/geospatial/polyvectorization/default.nix b/pkgs/geospatial/polyvectorization/default.nix
index d51447e475038fc1d3d8442abdb1d5514fd2ae04..661b15b793e0aecc35e62f35217499c515a9b76e 100644
--- a/pkgs/geospatial/polyvectorization/default.nix
+++ b/pkgs/geospatial/polyvectorization/default.nix
@@ -9,7 +9,7 @@ opencv2,
wrapQtAppsHook,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "polyvectorization";
version = "0-unstable-2019-08-23";
@@ -46,7 +46,7 @@ '';
meta = {
description = "Reference implementation of Vectorization of Line Drawings via PolyVector Fields";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/geospatial/py-staticmaps/default.nix b/pkgs/geospatial/py-staticmaps/default.nix
index 31096924373f3929bfa2771dac207b8fa24a1899..d2f3f229a6bcec43e8218776e054eb23b3b13a9b 100644
--- a/pkgs/geospatial/py-staticmaps/default.nix
+++ b/pkgs/geospatial/py-staticmaps/default.nix
@@ -16,7 +16,7 @@ rev = "v${version}";
hash = "sha256-vW457HbdDDhfz8hsvEN3/HJmIHKdrRDVNuhSpZXoZ78=";
};
appdirs
geographiclib
pillow
@@ -31,7 +31,7 @@ nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
meta = {
description = "A python module to create static map images with markers, geodesic lines, etc";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/geospatial/pysheds/default.nix b/pkgs/geospatial/pysheds/default.nix
index d1f6b44846abb10fb192d46a67a7b7d241c535cb..2be02731e18c488b59dcdc4d8f9c6e1ba09c58a5 100644
--- a/pkgs/geospatial/pysheds/default.nix
+++ b/pkgs/geospatial/pysheds/default.nix
@@ -6,16 +6,16 @@ }:
python3Packages.buildPythonPackage rec {
pname = "pysheds";
src = fetchFromGitHub {
owner = "mdbartos";
repo = "pysheds";
rev = version;
};
scikitimage
affine
geojson
@@ -30,7 +30,7 @@ doCheck = false;
meta = {
description = "Simple and fast watershed delineation in python";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/geospatial/qlandkartegt/default.nix b/pkgs/geospatial/qlandkartegt/default.nix
index 4efaae2459e98cd74650dfe2007ab36810609cc2..32cdd364c5fb9d1afd742a89ed3aaca2b9905a8e 100644
--- a/pkgs/geospatial/qlandkartegt/default.nix
+++ b/pkgs/geospatial/qlandkartegt/default.nix
@@ -18,12 +18,12 @@ libGLU,
proj,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "qlandkartegt";
version = "1.8.1";
src = fetchurl {
sha256 = "1rwv5ar5jv15g1cc6pp0lk69q3ip10pjazsh3ds2ggaciymha1ly";
};
@@ -119,4 +119,4 @@ maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
skip.ci = true;
};
-}
+})
diff --git a/pkgs/geospatial/qlandkartegt/garmindev.nix b/pkgs/geospatial/qlandkartegt/garmindev.nix
index c58067302e4ae6be9e52891db5959c4a7dde0447..e3a0219ecbb399c03afd47336508b8a5579f5be6 100644
--- a/pkgs/geospatial/qlandkartegt/garmindev.nix
+++ b/pkgs/geospatial/qlandkartegt/garmindev.nix
@@ -6,12 +6,12 @@ cmake,
libusb-compat-0_1,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "garmindev";
version = "0.3.4";
src = fetchurl {
sha256 = "1mc7rxdn9790pgbvz02xzipxp2dp9h4hfq87xgawa18sp9jqzhw6";
};
@@ -29,4 +29,4 @@ maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
skip.ci = true;
};
-}
+})
diff --git a/pkgs/geospatial/render_geojson/default.nix b/pkgs/geospatial/render_geojson/default.nix
index 3809dfa80dd429ffe5cd818deb81fc76548e8154..41e159047a5b1fa06ff7972c4cadc4c42d33a16e 100644
--- a/pkgs/geospatial/render_geojson/default.nix
+++ b/pkgs/geospatial/render_geojson/default.nix
@@ -23,7 +23,7 @@ buildInputs = [ wxGTK ];
meta = {
description = "C++ geoJSON and topoJSON parser and rendering using the WxWidgets GUI library";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/geospatial/rio-cogeo/default.nix b/pkgs/geospatial/rio-cogeo/default.nix
index a4e5faeaad539d1a06f31b219b4efa877a8b3e32..be5452251cefee5a09d46edce517ba7397b80485 100644
--- a/pkgs/geospatial/rio-cogeo/default.nix
+++ b/pkgs/geospatial/rio-cogeo/default.nix
@@ -1,6 +1,5 @@
{
lib,
fetchFromGitHub,
python3Packages,
cogdumper,
@@ -8,19 +7,19 @@ }:
python3Packages.buildPythonPackage rec {
pname = "rio-cogeo";
pyproject = true;
src = fetchFromGitHub {
owner = "cogeotiff";
repo = "rio-cogeo";
rev = version;
};
click
rasterio
numpy
@@ -37,7 +36,7 @@ ];
meta = {
description = "Cloud Optimized GeoTIFF creation and validation plugin for rasterio";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/geospatial/rio-color/default.nix b/pkgs/geospatial/rio-color/default.nix
index 39ccd1399ea2281f0e119122ece8fb9759c6ec2b..39e8b02993371ede2558ec4064ec6246e22ed7d2 100644
--- a/pkgs/geospatial/rio-color/default.nix
+++ b/pkgs/geospatial/rio-color/default.nix
@@ -1,6 +1,5 @@
{
lib,
fetchFromGitHub,
python3Packages,
rio-mucho,
@@ -19,7 +18,7 @@ };
nativeBuildInputs = with python3Packages; [ cython ];
click
rasterio
rio-mucho
@@ -33,7 +32,7 @@ pythonImportsCheck = [ "rio_color" ];
meta = {
description = "Color correction plugin for rasterio";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/geospatial/rio-mbtiles/default.nix b/pkgs/geospatial/rio-mbtiles/default.nix
index 9715b7a76f56d146d176d7362c0495bcb1f505a0..4cdca25d41700f1be0c5f3799fc8f352b3bbbd00 100644
--- a/pkgs/geospatial/rio-mbtiles/default.nix
+++ b/pkgs/geospatial/rio-mbtiles/default.nix
@@ -1,6 +1,5 @@
{
lib,
fetchFromGitHub,
python3Packages,
supermercado,
@@ -22,7 +21,7 @@ substituteInPlace setup.py \
--replace-fail "shapely~=1.7.0" "shapely"
'';
click
cligj
mercantile
@@ -41,7 +40,7 @@ ];
meta = {
description = "A plugin command for the Rasterio CLI that exports a raster dataset to an MBTiles 1.1 SQLite file";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/geospatial/rio-mucho/default.nix b/pkgs/geospatial/rio-mucho/default.nix
index 86a694519a1158b6b85d97d282098c1d61703857..c7e9f7e80232b8a085ae5e9365a827e5eb2b370e 100644
--- a/pkgs/geospatial/rio-mucho/default.nix
+++ b/pkgs/geospatial/rio-mucho/default.nix
@@ -16,7 +16,7 @@ rev = version;
hash = "sha256-yr79Lb02vxp2CN+638S8CFxbtim+zrkjxhjwEkx0XsY=";
};
click
numpy
rasterio
@@ -26,7 +26,7 @@ nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
meta = {
description = "Parallel processing wrapper for rasterio";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/geospatial/rio-stac/default.nix b/pkgs/geospatial/rio-stac/default.nix
index 1d729e6d2b851e22a78306b8c5b2645fa389cf74..1244be7cb3ce5df9156291c79cadf6a79ac50023 100644
--- a/pkgs/geospatial/rio-stac/default.nix
+++ b/pkgs/geospatial/rio-stac/default.nix
@@ -17,9 +17,9 @@ rev = version;
hash = "sha256-ySgxzcd0mRffDGv6L0iaaE9VY7K4fnsyE6RTotgSuQ4=";
};
rasterio
pystac
];
diff --git a/pkgs/geospatial/rsgislib/default.nix b/pkgs/geospatial/rsgislib/default.nix
index e5c26daeedd1526ad193c7c194e20850ba26d71f..550061f58c341ee20f545e3c4371fd02f1bce469 100644
--- a/pkgs/geospatial/rsgislib/default.nix
+++ b/pkgs/geospatial/rsgislib/default.nix
@@ -12,14 +12,14 @@ muparser,
python3,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "rsgislib";
version = "5.1.3";
src = fetchFromGitHub {
owner = "remotesensinginfo";
repo = "rsgislib";
hash = "sha256-RE5i2ULlgHEWHJIqeWNdnxtREcHrmP4dS996onJrBFk=";
};
@@ -42,4 +42,4 @@ license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
};
-}
+})
diff --git a/pkgs/geospatial/server-thread/default.nix b/pkgs/geospatial/server-thread/default.nix
index 1f511a44c81cc78569c7a764e0d17f35c4a41197..5eaeb0b8d3648efc32803df177be0c4698d0f582 100644
--- a/pkgs/geospatial/server-thread/default.nix
+++ b/pkgs/geospatial/server-thread/default.nix
@@ -6,17 +6,19 @@ }:
python3Packages.buildPythonPackage rec {
pname = "server-thread";
src = fetchFromGitHub {
owner = "banesullivan";
repo = "server-thread";
rev = version;
};
scooby
werkzeug
];
@@ -28,7 +30,7 @@ ];
meta = {
description = "Launch a WSGIApplication in a background thread with werkzeug";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/geospatial/starlette-cramjam/default.nix b/pkgs/geospatial/starlette-cramjam/default.nix
index 12b1d478055d1615a524f770a2bb6a4d29154c50..7f9a46738fe46835cdfc089f0acfaffaf78380ce 100644
--- a/pkgs/geospatial/starlette-cramjam/default.nix
+++ b/pkgs/geospatial/starlette-cramjam/default.nix
@@ -1,30 +1,24 @@
{
lib,
fetchFromGitHub,
python3Packages,
}:
python3Packages.buildPythonPackage rec {
pname = "starlette-cramjam";
pyproject = true;
src = fetchFromGitHub {
owner = "developmentseed";
repo = "starlette-cramjam";
rev = version;
};
--replace-fail "cramjam>=2.4,<2.7" "cramjam"
httpx
starlette
cramjam
@@ -35,7 +29,7 @@ nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
meta = {
description = "Cramjam integration for Starlette ASGI framework";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/geospatial/supermercado/default.nix b/pkgs/geospatial/supermercado/default.nix
index 98c0e795bbb504500c2cb83bac039a9078bb51d1..edcdccd70e105651141e9ec41be3368e715c12c8 100644
--- a/pkgs/geospatial/supermercado/default.nix
+++ b/pkgs/geospatial/supermercado/default.nix
@@ -4,7 +4,7 @@ fetchFromGitHub,
python3Packages,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "supermercado";
version = "0.2.0";
@@ -15,7 +15,7 @@ rev = "44841a07adff32665fae736f9ba7df8c7b24ac44";
hash = "sha256-k2S1aOHQEJq//4mdWZ5GhJQJjKqJuDbBztoHi373s6w=";
};
click-plugins
rasterio
mercantile
@@ -26,7 +26,7 @@ nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
meta = {
description = "Supercharger for mercantile";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/geospatial/supermorecado/default.nix b/pkgs/geospatial/supermorecado/default.nix
index ebc3a73332cca1b9aa6a1c3566a756d6b0d7a277..4ac3c70e6f1cce5dae8c173ff8e84641f343b30f 100644
--- a/pkgs/geospatial/supermorecado/default.nix
+++ b/pkgs/geospatial/supermorecado/default.nix
@@ -16,9 +16,9 @@ rev = version;
hash = "sha256-CuuJ4B/f7JoGQuTo5LS3WqMD860tucZ6z/97atw94k0=";
};
morecantile
rasterio
];
@@ -27,7 +27,7 @@ nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
meta = {
description = "Extend the functionality of morecantile with additional commands";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/geospatial/terracotta/default.nix b/pkgs/geospatial/terracotta/default.nix
index 1e6edf51266897795afefb8cf5542f3232bf7061..79a3c4e9236ceb8bc262abdd581027718b0e6c58 100644
--- a/pkgs/geospatial/terracotta/default.nix
+++ b/pkgs/geospatial/terracotta/default.nix
@@ -19,14 +19,14 @@ postPatch = ''
substituteInPlace setup.py --replace-fail "\"setuptools_scm_git_archive\"," ""
'';
setuptools-scm
#setuptools-scm-git-archive
];
SETUPTOOLS_SCM_PRETEND_VERSION = version;
apispec
apispec-webframeworks
cachetools
@@ -52,7 +52,7 @@ nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
meta = {
description = "A light-weight, versatile XYZ tile server";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/geospatial/tile-stitch/default.nix b/pkgs/geospatial/tile-stitch/default.nix
index a8280312da098ed7423fbffbae594f7cb1f9435b..de4bad04d657bd1bf9eb419a4144035e8d25aaa7 100644
--- a/pkgs/geospatial/tile-stitch/default.nix
+++ b/pkgs/geospatial/tile-stitch/default.nix
@@ -35,7 +35,7 @@ installPhase = "install -Dm755 stitch -t $out/bin";
meta = {
description = "Stitch together and crop map tiles for a specified bounding box";
license = lib.licenses.bsd2;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/geospatial/tilecloud/default.nix b/pkgs/geospatial/tilecloud/default.nix
index 8b6cc6de867b31419b943cac24de9e3bc7a845d6..44d96fd9e8be180a81b34a7b5f7968536cec06c0 100644
--- a/pkgs/geospatial/tilecloud/default.nix
+++ b/pkgs/geospatial/tilecloud/default.nix
@@ -18,7 +18,7 @@ };
patches = [ ./set-tmpl-path.patch ];
azure-storage-blob
azure-identity
boto3
@@ -41,7 +41,7 @@ '';
meta = {
description = "Tools for managing tiles";
license = lib.licenses.bsd2;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/geospatial/tilekiln/default.nix b/pkgs/geospatial/tilekiln/default.nix
index 5419eb69e4efe0e14276f5a4ad78e54c4297494b..716c65f63c22a96f39fd0e23efa25ddd02dd58c3 100644
--- a/pkgs/geospatial/tilekiln/default.nix
+++ b/pkgs/geospatial/tilekiln/default.nix
@@ -24,7 +24,7 @@ + lib.optionalString stdenv.isDarwin ''
sed -i 's/len(os.sched_getaffinity(0))/4/' tilekiln/scripts/__init__.py
'';
click
pyyaml
fs
@@ -39,7 +39,7 @@ nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
meta = {
description = "A set of command-line utilities to generate and serve Mapbox Vector Tiles (MVTs)";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/geospatial/tilesets-cli/default.nix b/pkgs/geospatial/tilesets-cli/default.nix
index d8853caf1f573633af427c9583531304b108822a..52c856d2d176b9efdf2113a6739671562a09c1cb 100644
--- a/pkgs/geospatial/tilesets-cli/default.nix
+++ b/pkgs/geospatial/tilesets-cli/default.nix
@@ -21,7 +21,7 @@ };
postPatch = "sed -i 's/~=.*"/"/' setup.py";
boto3
click
cligj
diff --git a/pkgs/geospatial/titiler/default.nix b/pkgs/geospatial/titiler/default.nix
index 52ae4fcc915e8dede3f3fac8c63186b5c0bc978f..92f78ccd7cc3038e03970ed994370549bd3c356c 100644
--- a/pkgs/geospatial/titiler/default.nix
+++ b/pkgs/geospatial/titiler/default.nix
@@ -33,7 +33,7 @@ sourceRoot = "${src.name}/src/titiler/core";
pyproject = true;
nativeBuildInputs = with python3Packages; [ pdm-pep517 ];
fastapi
jinja2
rio-tiler
@@ -51,7 +51,7 @@ sourceRoot = "${src.name}/src/titiler/extensions";
pyproject = true;
nativeBuildInputs = with python3Packages; [ pdm-pep517 ];
rio-cogeo
rio-stac
titiler-core
@@ -71,7 +71,7 @@ sourceRoot = "${src.name}/src/titiler/mosaic";
pyproject = true;
nativeBuildInputs = with python3Packages; [ pdm-pep517 ];
cogeo-mosaic
titiler-core
];
@@ -90,7 +90,7 @@ sourceRoot = "${src.name}/src/titiler/application";
pyproject = true;
nativeBuildInputs = with python3Packages; [ pdm-pep517 ];
python-dotenv
rio-cogeo
starlette-cramjam
diff --git a/pkgs/geospatial/tpkutils/default.nix b/pkgs/geospatial/tpkutils/default.nix
index 281450f8bb387d1f7afaa07a46b862d7b0bce0ed..32bf8b4f5e61a0717a62d8982e9feea499a037fd 100644
--- a/pkgs/geospatial/tpkutils/default.nix
+++ b/pkgs/geospatial/tpkutils/default.nix
@@ -19,7 +19,7 @@ };
build-system = with python3Packages; [ poetry-core ];
mercantile
pymbtiles
six
@@ -30,7 +30,7 @@ nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
meta = {
description = "ArcGIS Tile Package Utilities";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.sikmir ];
mainProgram = "tpk";
diff --git a/pkgs/geospatial/vt2geojson/default.nix b/pkgs/geospatial/vt2geojson/default.nix
index d551584e67d1fba7ccaf1da61d1075dc7914b0e5..12e135e2e8399a4069cb0452b2c669401e7e1818 100644
--- a/pkgs/geospatial/vt2geojson/default.nix
+++ b/pkgs/geospatial/vt2geojson/default.nix
@@ -19,13 +19,17 @@ };
vendorHash = "sha256-FnLxhhytgNC4OIvh9pUM+cVDdNfqVOocjmkzFDU1fmA=";
passthru.tests.version = testers.testVersion { package = vt2geojson; };
meta = {
description = "Command line tool to dump Mapbox Vector Tiles to GeoJSON";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gnss/gnsstk-apps/default.nix b/pkgs/gnss/gnsstk-apps/default.nix
index f9fcfc22f02f6e8d14d72cf329e2f4b568e7bd9a..ba7b04d761e78a289d3ae742974d3318bc3a685b 100644
--- a/pkgs/gnss/gnsstk-apps/default.nix
+++ b/pkgs/gnss/gnsstk-apps/default.nix
@@ -28,7 +28,7 @@ ];
meta = {
description = "GNSSTk applications suite";
license = lib.licenses.lgpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/gnss/gnsstk/default.nix b/pkgs/gnss/gnsstk/default.nix
index c7999dfa94b29f7d0477a02c59ee8e8191d4541d..fa0d8e36bd39e7d1d0c0aee84ad04de947956c14 100644
--- a/pkgs/gnss/gnsstk/default.nix
+++ b/pkgs/gnss/gnsstk/default.nix
@@ -34,7 +34,7 @@ ];
meta = {
description = "GNSSTk libraries";
license = lib.licenses.lgpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/gnss/gps-sdr-sim/default.nix b/pkgs/gnss/gps-sdr-sim/default.nix
index febe58be5ad9135e0b1750fee5427b723c32f5a5..89df40233aa51b2377d7db2315fea6976a6a1d99 100644
--- a/pkgs/gnss/gps-sdr-sim/default.nix
+++ b/pkgs/gnss/gps-sdr-sim/default.nix
@@ -23,7 +23,7 @@ '';
meta = {
description = "Software-Defined GPS Signal Simulator";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/gnss/gpsdate/default.nix b/pkgs/gnss/gpsdate/default.nix
index 749ed33ba9585b235c390a9dc0010114c8d4813e..f284fc0252059d23fce9c4618cea83d007c60104 100644
--- a/pkgs/gnss/gpsdate/default.nix
+++ b/pkgs/gnss/gpsdate/default.nix
@@ -4,7 +4,7 @@ stdenv,
fetchFromGitHub,
}:
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation {
pname = "gpsdate";
version = "0-unstable-2019-12-02";
@@ -23,10 +23,10 @@ '';
meta = {
description = "Simple tool for fetching date and time from a GPS receiver and saving it as a local time";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
mainProgram = "gpsdate";
};
-})
+}
diff --git a/pkgs/gnss/pygnssutils/default.nix b/pkgs/gnss/pygnssutils/default.nix
index 094473556c2351c6c824f97b3ef5d5d1bd748c85..b5759096778cb5101f7be24044bb2721c0d66cb1 100644
--- a/pkgs/gnss/pygnssutils/default.nix
+++ b/pkgs/gnss/pygnssutils/default.nix
@@ -8,14 +8,14 @@ }:
python3Packages.buildPythonPackage rec {
pname = "pygnssutils";
pyproject = true;
src = fetchFromGitHub {
owner = "semuconsulting";
repo = "pygnssutils";
rev = "v${version}";
};
postPatch = ''
@@ -25,7 +25,7 @@ '';
build-system = with python3Packages; [ setuptools ];
certifi
paho-mqtt
pyserial
@@ -37,7 +37,7 @@ pythonImportsCheck = [ "pygnssutils" ];
meta = {
description = "GNSS Command Line Utilities";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gnss/pygpsclient/default.nix b/pkgs/gnss/pygpsclient/default.nix
index 27668e64eadec3490bf17320b09c272ac363fe8e..d363a3b9724a268801252fa5762ecb5a0a469d4c 100644
--- a/pkgs/gnss/pygpsclient/default.nix
+++ b/pkgs/gnss/pygpsclient/default.nix
@@ -7,19 +7,19 @@ }:
python3Packages.buildPythonApplication rec {
pname = "pygpsclient";
pyproject = true;
src = fetchFromGitHub {
owner = "semuconsulting";
repo = "PyGPSClient";
rev = "v${version}";
};
build-system = with python3Packages; [ setuptools ];
requests
pillow
pygnssutils
@@ -29,7 +29,7 @@ ];
meta = {
description = "GNSS Diagnostic and UBX Configuration GUI Application";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gnss/pyrtcm/default.nix b/pkgs/gnss/pyrtcm/default.nix
index 51bddc1810b560d755e442099286172853b09408..8bc8640d11aab8c3506417af0f01f8e3b132cab4 100644
--- a/pkgs/gnss/pyrtcm/default.nix
+++ b/pkgs/gnss/pyrtcm/default.nix
@@ -6,14 +6,14 @@ }:
python3Packages.buildPythonPackage rec {
pname = "pyrtcm";
pyproject = true;
src = fetchFromGitHub {
owner = "semuconsulting";
repo = "pyrtcm";
rev = "v${version}";
};
build-system = with python3Packages; [ setuptools ];
@@ -22,7 +22,7 @@ pythonImportsCheck = [ "pyrtcm" ];
meta = {
description = "RTCM3 protocol parser";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gnss/pyspartn/default.nix b/pkgs/gnss/pyspartn/default.nix
index 4c46646b2bbabe3c1c39b2251b32819bc191cde9..bde27e80e22de6987cace0b128c6a018dd34bf84 100644
--- a/pkgs/gnss/pyspartn/default.nix
+++ b/pkgs/gnss/pyspartn/default.nix
@@ -6,25 +6,25 @@ }:
python3Packages.buildPythonPackage rec {
pname = "pyspartn";
pyproject = true;
src = fetchFromGitHub {
owner = "semuconsulting";
repo = "pyspartn";
rev = "v${version}";
};
build-system = with python3Packages; [ setuptools ];
pythonImportsCheck = [ "pyspartn" ];
meta = {
description = "SPARTN protocol parser";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gnss/pyubx2/default.nix b/pkgs/gnss/pyubx2/default.nix
index f002e59270034817a8a56173db8faa01752abc9a..94d8b705bc0a566897e364eda8958e3d4ca4f80d 100644
--- a/pkgs/gnss/pyubx2/default.nix
+++ b/pkgs/gnss/pyubx2/default.nix
@@ -7,19 +7,19 @@ }:
python3Packages.buildPythonPackage rec {
pname = "pyubx2";
pyproject = true;
src = fetchFromGitHub {
owner = "semuconsulting";
repo = "pyubx2";
rev = "v${version}";
};
build-system = with python3Packages; [ setuptools ];
pynmeagps
pyrtcm
];
@@ -28,7 +28,7 @@ pythonImportsCheck = [ "pyubx2" ];
meta = {
description = "UBX protocol parser and generator";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gpx/cmpgpx/default.nix b/pkgs/gpx/cmpgpx/default.nix
index 38e7a37b9176128915dd84cd835df2fc07f9b567..9d8919356cb922ac527775689d0dd5c6726b6700 100644
--- a/pkgs/gpx/cmpgpx/default.nix
+++ b/pkgs/gpx/cmpgpx/default.nix
@@ -5,7 +5,7 @@ python3Packages,
geotiler,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "cmpgpx";
version = "0-unstable-2015-06-05";
format = "other";
@@ -17,7 +17,7 @@ rev = "ec3ff781da9b7bcbc2dee44a3bd641cbd5005efe";
hash = "sha256-iJajSbDDPkBmGKZp0QH03RK9VBMmLHWvHViojlQJArs=";
};
cairocffi
geotiler
gpxpy
@@ -35,7 +35,7 @@ '';
meta = {
description = "Show the differences between GPX files";
license = lib.licenses.unlicense;
maintainers = [ lib.maintainers.sikmir ];
mainProgram = "cmpgpx";
diff --git a/pkgs/gpx/garta/default.nix b/pkgs/gpx/garta/default.nix
index 123bd0e8620128d3552703866f927cc9c31674d7..b8dcf54cbe94b2115a655cf80df3ea44a85a138e 100644
--- a/pkgs/gpx/garta/default.nix
+++ b/pkgs/gpx/garta/default.nix
@@ -75,7 +75,7 @@ enableParallelBuilding = true;
meta = {
description = "Geo-bookmarking, GPX viewer, analyzer and editor for GTK3";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gpx/gps-whatsnew/default.nix b/pkgs/gpx/gps-whatsnew/default.nix
index 901dd7f430ccb3931cd366ef2b2f0ecc42857a0f..2d11fbe3f39a6a0dc58fc94f15a5b1f2c42e6242 100644
--- a/pkgs/gpx/gps-whatsnew/default.nix
+++ b/pkgs/gpx/gps-whatsnew/default.nix
@@ -32,7 +32,7 @@ '';
meta = {
description = "Compare gpx tracks to find new segments (places never traveled before)";
license = lib.licenses.gpl3Only;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/gpx/gpx-cmd-tools/default.nix b/pkgs/gpx/gpx-cmd-tools/default.nix
index b7fcad7473cd49f01cff43b774e2380adab00a8d..14d5c727e40056d26cfc5556b10eec36ed8b4c72 100644
--- a/pkgs/gpx/gpx-cmd-tools/default.nix
+++ b/pkgs/gpx/gpx-cmd-tools/default.nix
@@ -4,7 +4,7 @@ fetchFromGitHub,
python3Packages,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "gpx-cmd-tools";
version = "0-unstable-2020-08-08";
@@ -15,11 +15,11 @@ rev = "e042c4d65cc153ddf3589b4d8723bed5f71a9d0d";
hash = "sha256-x3/PNACBrT5XSlgpZj0WO27KW0DiF6Je2z3gX5g/Gz0=";
};
meta = {
description = "Set of GPX command-line utilities";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gpx/gpx-converter/default.nix b/pkgs/gpx/gpx-converter/default.nix
index 9c68b1f84d7e96b23c1a824c00ddc558e8ee2902..c89b1418a4507132ab559ce0eaa6a6b166cbe628 100644
--- a/pkgs/gpx/gpx-converter/default.nix
+++ b/pkgs/gpx/gpx-converter/default.nix
@@ -4,7 +4,7 @@ fetchFromGitHub,
python3Packages,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "gpx-converter";
version = "0-unstable-2023-04-07";
@@ -15,7 +15,7 @@ rev = "0dac5d7eaf83d7bb99631b52d4d210dc010e4b60";
hash = "sha256-bT94phfkJiOQ8rZn783qOmIph6ck27z18rQQby9uEeg=";
};
gpxpy
numpy
pandas
@@ -30,7 +30,7 @@ disabledTests = [ "test_gpx_to_dictionary" ];
meta = {
description = "Python package for manipulating gpx files and easily convert gpx to other different formats";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gpx/gpx-interpolate/default.nix b/pkgs/gpx/gpx-interpolate/default.nix
index fdaa83cfb7f9b47a63b4ec270e1fd51e38ee2327..0151c96ca236630d286c3615544510b78b105da6 100644
--- a/pkgs/gpx/gpx-interpolate/default.nix
+++ b/pkgs/gpx/gpx-interpolate/default.nix
@@ -4,7 +4,7 @@ fetchFromGitHub,
python3Packages,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "gpx-interpolate";
version = "0-unstable-2023-10-28";
format = "other";
@@ -16,7 +16,7 @@ rev = "00af3c636d566d049f6a140c093af4e91d0482d5";
hash = "sha256-cCiRXpX6qj2o+vPs3V0/+UwnnHKvDFOgTbCV347BKkc=";
};
gpxpy
scipy
numpy
@@ -35,7 +35,7 @@ '';
meta = {
description = "Python script to interpolate GPX files using piecewise cubic Hermite splines";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
mainProgram = "gpx-interpolate";
diff --git a/pkgs/gpx/gpx-layer/default.nix b/pkgs/gpx/gpx-layer/default.nix
index 967abff86e7b7946a89821c7ccacb5a1b18689f9..a26330111d38b5b7d0c3a3a30afb4f86965d9e20 100644
--- a/pkgs/gpx/gpx-layer/default.nix
+++ b/pkgs/gpx/gpx-layer/default.nix
@@ -7,7 +7,7 @@ shortenPerlShebang,
XMLParser,
}:
-buildPerlPackage rec {
+buildPerlPackage {
pname = "gpx-layer";
version = "0-unstable-2013-09-19";
@@ -39,7 +39,7 @@ '';
meta = {
description = "Tools to turn GPX files into a GPS map tracing layer";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gpx/gpxchart/default.nix b/pkgs/gpx/gpxchart/default.nix
index c831a0bc6350194dedbba79f3aa0749ee4fd4f7e..8ba1e70ad5b1c3c7870e44857727329ee9515b07 100644
--- a/pkgs/gpx/gpxchart/default.nix
+++ b/pkgs/gpx/gpxchart/default.nix
@@ -12,7 +12,7 @@ src = fetchFromGitHub {
owner = "tkrajina";
repo = "gpxchart";
rev = "v${version}";
};
vendorHash = null;
@@ -21,7 +21,7 @@ doCheck = false;
meta = {
description = "A command-line tool and library for elevation charts from GPX files";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/gpx/gpxtrackposter/default.nix b/pkgs/gpx/gpxtrackposter/default.nix
index cbe11c9295eab1b97c307d99adef9acecbe9dcd8..b3005389e8318484f1255bfb1e949446d44d6425 100644
--- a/pkgs/gpx/gpxtrackposter/default.nix
+++ b/pkgs/gpx/gpxtrackposter/default.nix
@@ -6,13 +6,13 @@ python3Packages,
s2sphere,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "gpxtrackposter";
version = "0-unstable-2023-02-19";
src = fetchFromGitHub {
owner = "flopp";
rev = "0b86e7223eaeea3e168f5b68ee7b8fe4ca8532b5";
hash = "sha256-pSMfHNpGt68Elgi4NGrBlnZxpsuS7WhqM6kBDcihLu8=";
};
@@ -34,7 +34,7 @@ --subst-var out
sed -i 's/~=.*//' requirements.txt
'';
appdirs
colour
geopy
@@ -67,7 +67,7 @@ postInstall = "rm -fr $out/requirements*.txt";
meta = {
description = "Create a visually appealing poster from your GPX tracks";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
broken = true; # https://github.com/stravalib/stravalib/pull/459
diff --git a/pkgs/gpx/trackanimation/default.nix b/pkgs/gpx/trackanimation/default.nix
index 23ca1eb2a59901f4920a1ab6f850a8497c5129b1..15af504f8672b29a015304f42d5f13826753276a 100644
--- a/pkgs/gpx/trackanimation/default.nix
+++ b/pkgs/gpx/trackanimation/default.nix
@@ -17,7 +17,7 @@ rev = "v${version}";
hash = "sha256-fLubRKq+3wQh16xSdqJmNMy4zw83RiSQj8C6jNV4fV8=";
};
geopy
gpxpy
pillow
@@ -32,7 +32,7 @@ pythonImportsCheck = [ "trackanimation" ];
meta = {
description = "GPS Track Animation Library";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/linguistics/dict2rest/default.nix b/pkgs/linguistics/dict2rest/default.nix
index 4771937cc76cd0ed5720ed78a627e90f4a77672e..cffe5c3bf0bc3f367db6ead0a005ba29e4e08315 100644
--- a/pkgs/linguistics/dict2rest/default.nix
+++ b/pkgs/linguistics/dict2rest/default.nix
@@ -4,7 +4,7 @@ fetchFromGitHub,
buildGoPackage,
}:
-buildGoPackage rec {
+buildGoPackage {
pname = "dict2rest";
version = "0-unstable-2016-12-05";
@@ -19,7 +19,7 @@ goPackagePath = "github.com/felix/go-dict2rest";
meta = {
description = "A simple proxy service providing an HTTP interface to a Dict protocol (RFC 2229) server";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/linguistics/distance/default.nix b/pkgs/linguistics/distance/default.nix
index 0e8a3c3288f6b8c149fd9c78eeefced6852a6219..d994321839e7c957bd9a171bc425491d57c2a96b 100644
--- a/pkgs/linguistics/distance/default.nix
+++ b/pkgs/linguistics/distance/default.nix
@@ -4,7 +4,7 @@ fetchFromGitHub,
python3Packages,
}:
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonPackage {
pname = "distance";
version = "2013-11-22";
@@ -23,7 +23,7 @@ pythonImportsCheck = [ "distance" ];
meta = {
description = "Utilities for comparing sequences";
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/linguistics/gdcv/default.nix b/pkgs/linguistics/gdcv/default.nix
index 29f254465af2b817a5c5cf7831c9ec4b501c1275..03667ebd062541712be5a568d90b11a7896c7222 100644
--- a/pkgs/linguistics/gdcv/default.nix
+++ b/pkgs/linguistics/gdcv/default.nix
@@ -43,13 +43,15 @@
env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-largp";
installPhase = ''
install -Dm755 gdcv -t $out/bin
install -Dm644 gdcv-elisp.so gdcv.el -t $out/share/emacs/site-lisp
'';
meta = {
description = "GoldenDict console version and emacs dynamic module";
license = lib.licenses.gpl3Only;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/linguistics/gt-bash-client/default.nix b/pkgs/linguistics/gt-bash-client/default.nix
index 6033ded57ccafef3ebbbdb6d16271b9c005352ec..fe211435087ebe80160377a3dd692b8b6f79060d 100644
--- a/pkgs/linguistics/gt-bash-client/default.nix
+++ b/pkgs/linguistics/gt-bash-client/default.nix
@@ -21,7 +21,7 @@ '';
meta = {
description = "Get translated text from your terminal! Console Google Translate Script (bash+curl+sed)";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.all;
diff --git a/pkgs/linguistics/gt4gd/default.nix b/pkgs/linguistics/gt4gd/default.nix
index d5609555603667a0e3c1ae89e7ae8abe2d84c355..361c04f9016cb3c4655d399307bdc4c548421d3e 100644
--- a/pkgs/linguistics/gt4gd/default.nix
+++ b/pkgs/linguistics/gt4gd/default.nix
@@ -16,7 +16,7 @@ rev = "v${version}";
hash = "sha256-zJq5dhmrd0k7bsw75xFECKmwZU4qjw+wwSzsYjg8zao=";
};
doCheck = false;
@@ -27,7 +27,7 @@ '';
meta = {
description = "Add Google translate to GoldenDict";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/linguistics/i18n-editor/default.nix b/pkgs/linguistics/i18n-editor/default.nix
index 3d7c78dd3948f13eac599911ca6b598071e429f2..be245b5739bda8644e438e13a182e9a2c396d67b 100644
--- a/pkgs/linguistics/i18n-editor/default.nix
+++ b/pkgs/linguistics/i18n-editor/default.nix
@@ -38,7 +38,7 @@ '';
meta = {
description = "GUI for editing your i18n translation files";
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
diff --git a/pkgs/linguistics/lsdreader/default.nix b/pkgs/linguistics/lsdreader/default.nix
index ea220ba20dbf2a0fda49623cf85e7d53dbe7f475..fc7a9d7daa6a93111b89edcfb795783ded5a1417 100644
--- a/pkgs/linguistics/lsdreader/default.nix
+++ b/pkgs/linguistics/lsdreader/default.nix
@@ -19,7 +19,7 @@ doCheck = false;
meta = {
description = "Decompile Lingvo LSD dictionary to DSL";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/linguistics/mikatools/default.nix b/pkgs/linguistics/mikatools/default.nix
index a008f73cb56d837ec5080205dad3217e482ec90c..9e1b4558896e318e66a41773d2a5c24a2542501d 100644
--- a/pkgs/linguistics/mikatools/default.nix
+++ b/pkgs/linguistics/mikatools/default.nix
@@ -15,7 +15,7 @@ rev = version;
hash = "sha256-2YpRTSZWJVXMoTLDBFS+tFkmA8pOBsqWF7Z85gtIfY0=";
};
requests
cryptography
tqdm
@@ -25,7 +25,7 @@ nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
meta = {
description = "Mikatools provides fast and easy methods for common Python coding tasks";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/linguistics/pytorchtext/default.nix b/pkgs/linguistics/pytorchtext/default.nix
index 3623e8b55ce0947881fdd237374687de1cbdea66..edf2195f906a704c2e91513b10c1ae4bd9fc0489 100644
--- a/pkgs/linguistics/pytorchtext/default.nix
+++ b/pkgs/linguistics/pytorchtext/default.nix
@@ -27,7 +27,7 @@ ];
buildInputs = with python3Packages; [ pybind11 ];
defusedxml
nltk
pytorch
@@ -48,7 +48,7 @@ pythonImportsCheck = [ "torchtext" ];
meta = {
description = "Text utilities and datasets for PyTorch";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.sikmir ];
#broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/94241
diff --git a/pkgs/linguistics/revtok/default.nix b/pkgs/linguistics/revtok/default.nix
index d66e982476b07137362d03096247a959cc6ad05f..1713365fdbbfd5588f5c8d48e7621af60792c0d1 100644
--- a/pkgs/linguistics/revtok/default.nix
+++ b/pkgs/linguistics/revtok/default.nix
@@ -4,7 +4,7 @@ fetchFromGitHub,
python3Packages,
}:
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonPackage {
pname = "revtok";
version = "2018-09-21";
@@ -15,13 +15,13 @@ rev = "f1998b72a941d1e5f9578a66dc1c20b01913caab";
hash = "sha256-o416UUnTMejCd57fGvZPSFQv0bT4PULdgNTXyAzMiMs=";
};
pythonImportsCheck = [ "revtok" ];
meta = {
description = "Reversible tokenization in Python";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/linguistics/tatoebatools/default.nix b/pkgs/linguistics/tatoebatools/default.nix
index e806b5cb6c4bea4995c6a7f38aaa1ac10d5fe3e0..526a98f433df49b17cb585e37274e4eabda2e1e0 100644
--- a/pkgs/linguistics/tatoebatools/default.nix
+++ b/pkgs/linguistics/tatoebatools/default.nix
@@ -1,6 +1,5 @@
{
lib,
python3Packages,
fetchFromGitHub,
withCli ? true,
@@ -24,7 +23,7 @@ ++ lib.optional withCli ./cli.patch;
postPatch = "sed -i 's/==."/"/;s/>=."/"/' setup.py";
with python3Packages;
[
beautifulsoup4
@@ -48,7 +47,7 @@ ];
meta = {
description = "A library for downloading, updating and iterating over data files from Tatoeba";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/linguistics/ttb/default.nix b/pkgs/linguistics/ttb/default.nix
index 2fcfb72766b46cf0f52228765ac6732b1b65c5ec..c7b8060469f7b9d7ef30906e3d5b2d2b5478d987 100644
--- a/pkgs/linguistics/ttb/default.nix
+++ b/pkgs/linguistics/ttb/default.nix
@@ -3,10 +3,10 @@ lib,
stdenv,
rustPlatform,
fetchFromGitHub,
}:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
pname = "ttb";
version = "0-unstable-2022-12-14";
@@ -23,11 +23,11 @@ postPatch = ''
ln -s ${./Cargo.lock} Cargo.lock
'';
meta = {
description = "A lightning-fast tool for querying Tatoebe from the command-line";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
mainProgram = "ttb";
diff --git a/pkgs/linguistics/wikitextprocessor/default.nix b/pkgs/linguistics/wikitextprocessor/default.nix
index f5e483b86f864fe9901759f5d7e6e210c2dec316..12c2b20b67689c16a9b8561ebb9f03dabc83de8c 100644
--- a/pkgs/linguistics/wikitextprocessor/default.nix
+++ b/pkgs/linguistics/wikitextprocessor/default.nix
@@ -5,7 +5,7 @@ python3Packages,
fetchFromGitHub,
}:
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonPackage {
pname = "wikitextprocessor";
version = "0.4.96";
@@ -16,7 +16,7 @@ rev = "3fa4cb9418e05d1d462a53d629848196b7ade492";
hash = "sha256-cjhKgzqsPwVO2/fwC62IDilMhz6fg6qQrnm0xLQ3KPk=";
};
lupa
dateparser
lru-dict
@@ -35,7 +35,7 @@ doCheck = false;
meta = {
description = "Parser and expander for Wikipedia, Wiktionary etc. dump files, with Lua execution support";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/linguistics/wiktextract/default.nix b/pkgs/linguistics/wiktextract/default.nix
index 677615cb743c445b2628971b89b1a7257780bb48..dda5018b36964c28ef9edbe2f95abf06d940d2f6 100644
--- a/pkgs/linguistics/wiktextract/default.nix
+++ b/pkgs/linguistics/wiktextract/default.nix
@@ -14,7 +14,7 @@ url = "https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/brown.zip";
hash = "sha256-mydfmzuV171mzPt80ln0RaE7vl0fQQeroJ/T6DZLr6Y=";
};
in
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "wiktextract";
version = "1.99.7";
@@ -30,7 +30,7 @@ substituteInPlace setup.py \
--replace-fail python-Levenshtein Levenshtein
'';
levenshtein
setuptools
wikitextprocessor
@@ -51,7 +51,7 @@ '';
meta = {
description = "Wiktionary dump file parser and multilingual data extractor";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/linguistics/wiktfinnish/default.nix b/pkgs/linguistics/wiktfinnish/default.nix
index deb45624d56a0fb786289708bac04a983a3404f2..6ef10d9496fef6dbf19b8cecc4588cf91a724ee8 100644
--- a/pkgs/linguistics/wiktfinnish/default.nix
+++ b/pkgs/linguistics/wiktfinnish/default.nix
@@ -1,11 +1,10 @@
{
lib,
python3Packages,
fetchFromGitHub,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "wiktfinnish";
version = "2020-02-27";
@@ -22,7 +21,7 @@ pythonImportsCheck = [ "wiktfinnish" ];
meta = {
description = "Finnish morphology (including verb forms, comparatives, cases, possessives, clitics)";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/linguistics/zdict/default.nix b/pkgs/linguistics/zdict/default.nix
index c330984987c54b8dbd1ef04745423088f4ba6d60..5d8e57b53ce553465ba44207afad16dfd6988f5b 100644
--- a/pkgs/linguistics/zdict/default.nix
+++ b/pkgs/linguistics/zdict/default.nix
@@ -1,22 +1,21 @@
{
lib,
fetchFromGitHub,
python3Packages,
}:
python3Packages.buildPythonApplication rec {
pname = "zdict";
src = fetchFromGitHub {
owner = "zdict";
repo = "zdict";
rev = version;
};
beautifulsoup4
peewee
requests
@@ -28,7 +27,7 @@ doCheck = false;
meta = {
description = "The last online dictionary framework you need";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/misc/acp/default.nix b/pkgs/misc/acp/default.nix
index 15ce7eb3217a47c99d357b90e781c7bcfe0b5cd1..29546fd489677cb930ef721798e09c351d62c905 100644
--- a/pkgs/misc/acp/default.nix
+++ b/pkgs/misc/acp/default.nix
@@ -17,11 +17,15 @@ };
vendorHash = "sha256-OCoghYUNznwBz7JN2MkHzdngA+mhHcfFIpw8ZMxeeMc=";
meta = {
description = "Make terminal personal file transfers as simple as `cp`";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
mainProgram = "acp";
diff --git a/pkgs/misc/apibackuper/default.nix b/pkgs/misc/apibackuper/default.nix
index a5977b26d7a6878a4b08bb79afe7532c378e5aed..78736ea975d053eb1f6278af5b58315bfba7de72 100644
--- a/pkgs/misc/apibackuper/default.nix
+++ b/pkgs/misc/apibackuper/default.nix
@@ -15,7 +15,7 @@ rev = version;
hash = "sha256-2vNuzQK6Wm6DBWRSLFuy6loCLAbcql3CqSktMjGE8JE=";
};
bson
click
lxml
@@ -27,7 +27,7 @@ doCheck = false;
meta = {
description = "Python library and cmd tool to backup API calls";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/misc/arduinojson/default.nix b/pkgs/misc/arduinojson/default.nix
index eafe1fe072e3d9e0fbb0823a040d410c3922fe2f..25a16ea9b7cd600b90ffb3efbf5657131031e4d9 100644
--- a/pkgs/misc/arduinojson/default.nix
+++ b/pkgs/misc/arduinojson/default.nix
@@ -5,14 +5,14 @@ fetchFromGitHub,
cmake,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "arduinojson";
version = "6.20.0";
src = fetchFromGitHub {
owner = "bblanchon";
repo = "ArduinoJson";
hash = "sha256-oRqQMc4FpX7bxVDfZhO6ZvwrWEAlY2T4tejIRfklTrs=";
};
@@ -25,4 +25,4 @@ license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
};
-}
+})
diff --git a/pkgs/misc/bash-completor/default.nix b/pkgs/misc/bash-completor/default.nix
index e601754a55f5a01468073340f8df85f263a0a6a5..2a5d5c051197339eff2681dd3923d34003062188 100644
--- a/pkgs/misc/bash-completor/default.nix
+++ b/pkgs/misc/bash-completor/default.nix
@@ -31,7 +31,7 @@ '';
meta = {
description = "Creating a bash completion script in a declarative way";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/misc/btpd/default.nix b/pkgs/misc/btpd/default.nix
index ef811417dfeff25f87f17a9d1c3a695e1e73ad24..bb8f6f6b5eb79d5667d74ec4c8e3d3b352653b37 100644
--- a/pkgs/misc/btpd/default.nix
+++ b/pkgs/misc/btpd/default.nix
@@ -5,7 +5,7 @@ fetchFromGitHub,
openssl,
}:
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation {
pname = "btpd";
version = "2020-04-07";
@@ -24,9 +24,9 @@ installFlags = [ "PREFIX=$(out)" ];
meta = {
description = "The BitTorrent Protocol Daemon";
license = lib.licenses.bsd2;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
};
-})
+}
diff --git a/pkgs/misc/bwh/default.nix b/pkgs/misc/bwh/default.nix
index 2f18be3d13b1c083441511495f583c714d54d914..50ae7ddd69b1da12539ea8ff54c88ffd803b1ab7 100644
--- a/pkgs/misc/bwh/default.nix
+++ b/pkgs/misc/bwh/default.nix
@@ -10,7 +10,7 @@ the-foundation,
AppKit,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "bwh";
version = "1.0.3";
@@ -18,7 +18,7 @@ src = fetchFromGitea {
domain = "git.skyjake.fi";
owner = "skyjake";
repo = "bwh";
hash = "sha256-POKjvUGFS3urc1aqOvfCAApUnRxoZhU725eYRAS4Z2w=";
};
@@ -49,4 +49,4 @@ maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
mainProgram = "bitwise-harmony";
};
-}
+})
diff --git a/pkgs/misc/cfiles/default.nix b/pkgs/misc/cfiles/default.nix
index 8921ef61dba261b7d53cfc6fef73eafa35a4ad5e..328ef64ed11820502f769797112174951a551efb 100644
--- a/pkgs/misc/cfiles/default.nix
+++ b/pkgs/misc/cfiles/default.nix
@@ -41,7 +41,7 @@ installFlags = [ "prefix=$(out)" ];
meta = {
description = "A ncurses file manager written in C with vim like keybindings";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/misc/chasquid/default.nix b/pkgs/misc/chasquid/default.nix
index 6eeb1162713a79e9fb78bf5ff92ab35f41467b5d..a4bc0b8b43900de93813e99c775690b7adf01cba 100644
--- a/pkgs/misc/chasquid/default.nix
+++ b/pkgs/misc/chasquid/default.nix
@@ -28,7 +28,11 @@ ];
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installManPage docs/man/*.{1,5}
diff --git a/pkgs/misc/csv2html/cargo-lock.patch b/pkgs/misc/csv2html/cargo-lock.patch
deleted file mode 100644
index 16ce47b371f63b65e3f07c17a8e5717f344d7515..0000000000000000000000000000000000000000
--- a/pkgs/misc/csv2html/cargo-lock.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git i/Cargo.lock w/Cargo.lock
-index 169efd7..2238953 100644
---- i/Cargo.lock
-+++ w/Cargo.lock
-@@ -1,5 +1,7 @@
-+version = 3
-+
-@@ -83,7 +85,7 @@ dependencies = [
--version = "3.0.0"
-+version = "3.0.1"
diff --git a/pkgs/misc/csv2html/default.nix b/pkgs/misc/csv2html/default.nix
index 571f3271052a90ce06d386595956204e08b85bdf..6d8e90afaa70db12e6055216fb73f122dda917cf 100644
--- a/pkgs/misc/csv2html/default.nix
+++ b/pkgs/misc/csv2html/default.nix
@@ -7,22 +7,22 @@ }:
rustPlatform.buildRustPackage rec {
pname = "csv2html";
src = fetchFromGitHub {
owner = "dbohdan";
repo = "csv2html";
rev = "v${version}";
};
meta = {
description = "Convert CSV files to HTML tables";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.sikmir ];
};
}
diff --git a/pkgs/misc/csvtools/default.nix b/pkgs/misc/csvtools/default.nix
index 46ba8a87ecc8e2433b028d0e3d1a2a079617a94d..d85fe5db7a7ba143f49cdbd2b3fd8144f6724392 100644
--- a/pkgs/misc/csvtools/default.nix
+++ b/pkgs/misc/csvtools/default.nix
@@ -31,7 +31,7 @@ preInstall = "mkdir -p $out/bin";
meta = {
description = "GNU-alike tools for parsing RFC 4180 CSVs at high speed";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/misc/diagon/default.nix b/pkgs/misc/diagon/default.nix
index c6ebed68a9d7ad57c46df31bf2d22b33312a46fd..14522d014ea98d6a187fc0b31e9e679695f6bed3 100644
--- a/pkgs/misc/diagon/default.nix
+++ b/pkgs/misc/diagon/default.nix
@@ -33,14 +33,14 @@ rev = "56c3f46cf286051096d9295118c048219fe0d776";
hash = "sha256-xH0htDZd2UihLn7PHKLjEYETzcBSeJFOMNredTqlCW8=";
};
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "diagon";
version = "1.1.158";
src = fetchFromGitHub {
owner = "ArthurSonzogni";
repo = "Diagon";
hash = "sha256-Qxk3+1T0IPmvB5v3jaqvBnESpss6L8bvoW+R1l5RXdQ=";
};
@@ -74,10 +74,10 @@ '';
meta = {
description = "Interactive ASCII art diagram generators";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
broken = true;
};
-}
+})
diff --git a/pkgs/misc/dns-filter/default.nix b/pkgs/misc/dns-filter/default.nix
index 55d5fb6bf820f567becaac0cb4f8191c6b530a56..02a975d3b6bb9641b022dff82e1feb496e84429e 100644
--- a/pkgs/misc/dns-filter/default.nix
+++ b/pkgs/misc/dns-filter/default.nix
@@ -4,7 +4,7 @@ stdenv,
fetchFromGitHub,
}:
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation {
pname = "dns-filter";
version = "0-unstable-2021-04-14";
@@ -32,9 +32,9 @@ '';
meta = {
description = "Tiny DNS server with filtering requests";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
};
-})
+}
diff --git a/pkgs/misc/docker-reg-tool/default.nix b/pkgs/misc/docker-reg-tool/default.nix
index 3e1a8d40065bdc9c12fc07d6d3eb2369fa756b1a..a3ccf4a97dfd4f1e903ba9b1e9e4d871c0f363fc 100644
--- a/pkgs/misc/docker-reg-tool/default.nix
+++ b/pkgs/misc/docker-reg-tool/default.nix
@@ -4,24 +4,26 @@ stdenv,
fetchFromGitHub,
}:
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation {
pname = "docker-reg-tool";
src = fetchFromGitHub {
owner = "byrnedo";
repo = "docker-reg-tool";
};
meta = {
description = "Docker registry cli tool, primarily for deleting images";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.all;
};
-})
+}
diff --git a/pkgs/misc/docx2csv/default.nix b/pkgs/misc/docx2csv/default.nix
index 750d9e604adddf56573759ef567de2c9a7ae9bc1..4f9170d224871b9b77e4ee7205cbd815a32bb5ac 100644
--- a/pkgs/misc/docx2csv/default.nix
+++ b/pkgs/misc/docx2csv/default.nix
@@ -4,7 +4,7 @@ fetchFromGitHub,
python3Packages,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "docx2csv";
version = "0-unstable-2023-10-11";
@@ -15,7 +15,7 @@ rev = "f0c0231876e2ab1210865ded80e4d6105816b0a3";
hash = "sha256-A7Y1zgM+9xIDXsAQN2tGGoWbe8u/kvGch6sBNKz0Nw4=";
};
click
openpyxl
python-docx
@@ -24,7 +24,7 @@ ];
meta = {
description = "Extracts tables from .docx files and saves them as .csv or .xls files";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/misc/finalcut/default.nix b/pkgs/misc/finalcut/default.nix
index 788996215a7a0983e6f9d7bf3d2bfcb501095d28..bb6e9723a7c908b105b6af1e46f052f8e3896f6a 100644
--- a/pkgs/misc/finalcut/default.nix
+++ b/pkgs/misc/finalcut/default.nix
@@ -29,7 +29,7 @@ buildInputs = [ ncurses ];
meta = {
description = "A text-based widget toolkit";
license = lib.licenses.lgpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/misc/freeopcua/default.nix b/pkgs/misc/freeopcua/default.nix
index d5cf2391021b963a2ed42e8871cb523aa4033d89..f0115625902b37f71d9c80044b73d2aaa07e1cf8 100644
--- a/pkgs/misc/freeopcua/default.nix
+++ b/pkgs/misc/freeopcua/default.nix
@@ -6,7 +6,7 @@ cmake,
boost,
}:
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation {
pname = "freeopcua";
version = "0-unstable-2023-05-30";
@@ -25,9 +25,9 @@ cmakeFlags = [ (lib.cmakeBool "SSL_SUPPORT_MBEDTLS" false) ];
meta = {
description = "Open Source C++ OPC-UA Server and Client Library";
license = lib.licenses.lgpl3;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
};
-})
+}
diff --git a/pkgs/misc/gaiagpsclient/default.nix b/pkgs/misc/gaiagpsclient/default.nix
index 5e97576f7d508780adcc914c1acaa11e6b42f057..ebf077d81795e582832bf14b30f517a9122def91 100644
--- a/pkgs/misc/gaiagpsclient/default.nix
+++ b/pkgs/misc/gaiagpsclient/default.nix
@@ -4,7 +4,7 @@ fetchFromGitHub,
python3Packages,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "gaiagpsclient";
version = "0-unstable-2023-08-26";
@@ -15,7 +15,7 @@ rev = "1ba0ea4266260ff979c7df483381d01d29fae25d";
hash = "sha256-qCpyJfa8TeMfawf1+wCFu04sYHfDejyStNl6Q6XEUeA=";
};
requests
prettytable
pytz
@@ -33,7 +33,7 @@ doCheck = false;
meta = {
description = "A python client for gaiagps.com";
license = lib.licenses.gpl3Only;
maintainers = [ lib.maintainers.sikmir ];
mainProgram = "gaiagps";
diff --git a/pkgs/misc/git-tui/default.nix b/pkgs/misc/git-tui/default.nix
index 4505ce514786017e8d1c3f950de7bdffb0df2dae..b77c16527bfa0b2be57565ace43e4988584e6299 100644
--- a/pkgs/misc/git-tui/default.nix
+++ b/pkgs/misc/git-tui/default.nix
@@ -7,14 +7,14 @@ ftxui,
subprocess,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "git-tui";
version = "1.1.0";
src = fetchFromGitHub {
owner = "ArthurSonzogni";
repo = "git-tui";
hash = "sha256-RogDZeDgC7HanPd0I+BuU9CShUzaIqvH1R7/I1tAtG4=";
};
@@ -29,9 +29,9 @@ ];
meta = {
description = "Collection of human friendly terminal interface for git";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
};
-}
+})
diff --git a/pkgs/misc/graphene/default.nix b/pkgs/misc/graphene/default.nix
index 0e52573727dcd3e4da4544863040a7b5c123b65c..ef2772932f274d25bc2fb0875dc2a74a05727316 100644
--- a/pkgs/misc/graphene/default.nix
+++ b/pkgs/misc/graphene/default.nix
@@ -47,7 +47,7 @@ ];
meta = {
description = "A simple time series database based on BerkleyDB";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/misc/heapusage/default.nix b/pkgs/misc/heapusage/default.nix
index 549dbdf7a70fcc7162f2ef35595315645752f4a1..43408f616c59f8fbcc97697ca718d89821ec4d6b 100644
--- a/pkgs/misc/heapusage/default.nix
+++ b/pkgs/misc/heapusage/default.nix
@@ -5,14 +5,14 @@ fetchFromGitHub,
cmake,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "heapusage";
version = "2.07";
src = fetchFromGitHub {
owner = "d99kris";
repo = "heapusage";
hash = "sha256-p7Yhx/w1I0+dxD7YH15Eojs4wh337/mZnXBwpiqlt4A=";
};
@@ -20,10 +20,10 @@ nativeBuildInputs = [ cmake ];
meta = {
description = "Light-weight tool for finding heap memory errors";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
mainProgram = "heapusage";
};
-}
+})
diff --git a/pkgs/misc/huami-token/default.nix b/pkgs/misc/huami-token/default.nix
index e81a7762f9c818924db99ae69079944938a313ef..4fc064ff6e42159515a61361008fff79481533f0 100644
--- a/pkgs/misc/huami-token/default.nix
+++ b/pkgs/misc/huami-token/default.nix
@@ -1,47 +1,38 @@
{
lib,
python3Packages,
}:
python3Packages.buildPythonApplication rec {
pname = "huami-token";
owner = "argrento";
repo = "huami-token";
};
pythonEnv = python3Packages.python.withPackages (
p: with p; [
requests
rich
]
);
site_packages=$out/lib/${python3Packages.python.libPrefix}/site-packages
mkdir -p $site_packages
cp *.py $site_packages
makeWrapper ${pythonEnv.interpreter} $out/bin/huami_token \
--add-flags "$site_packages/huami_token.py"
meta = {
description = "Script to obtain watch or band bluetooth token from Huami servers";
maintainers = [ lib.maintainers.sikmir ];
};
}
diff --git a/pkgs/misc/json-tui/default.nix b/pkgs/misc/json-tui/default.nix
index 3a3db450dd4c67ffabc0f178e87b08cd7caa9a6d..427074a63a83979b48c51720fa587fc366fc2183 100644
--- a/pkgs/misc/json-tui/default.nix
+++ b/pkgs/misc/json-tui/default.nix
@@ -8,14 +8,14 @@ nlohmann_json,
libargs,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "json-tui";
version = "1.3.0";
src = fetchFromGitHub {
owner = "ArthurSonzogni";
repo = "json-tui";
hash = "sha256-Rgan+Pki4kOFf4BiNmJV4mf/rgyIGgUVP1BcFCKG25w=";
};
@@ -31,9 +31,9 @@ ];
meta = {
description = "A JSON terminal UI made in C++";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
};
-}
+})
diff --git a/pkgs/misc/lazyscraper/default.nix b/pkgs/misc/lazyscraper/default.nix
index 7dc97f1d1d899b79c36a776dba57d27b7867e1db..21c9329fc89432352d6af40d88e1d9527eb3da0d 100644
--- a/pkgs/misc/lazyscraper/default.nix
+++ b/pkgs/misc/lazyscraper/default.nix
@@ -4,7 +4,7 @@ python3Packages,
fetchFromGitHub,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "lazyscraper";
version = "2020-05-19";
@@ -15,7 +15,7 @@ rev = "2e14bd829311cde19ef32d7f0e11c3c4a3c08e1b";
hash = "sha256-gnhJB+ZMKQIYZNHMeRrlICgz5UhyHy72Js/I4kbp8Qo=";
};
click
lxml
requests
@@ -25,7 +25,7 @@ postInstall = "mv $out/bin/lscraper.py $out/bin/lscraper";
meta = {
description = "Lazy helper tool to make easier scraping with simple tasks";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/misc/libmdbx/default.nix b/pkgs/misc/libmdbx/default.nix
index 18bf024909f67c7f99d5bfb5c7529f7d65259823..a2adcf0f5d47c764c08f5ea740155f6a0187a96a 100644
--- a/pkgs/misc/libmdbx/default.nix
+++ b/pkgs/misc/libmdbx/default.nix
@@ -5,12 +5,12 @@ fetchurl,
cmake,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "libmdbx";
version = "0.12.9";
src = fetchurl {
hash = "sha256-bMxSd7+xPOdE+20hKN4LEcj1jIHB/gYXnOqsXCgSWm4=";
};
@@ -28,4 +28,4 @@ maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
broken = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/misc/libnbcompat/default.nix b/pkgs/misc/libnbcompat/default.nix
index 41b23b8632ea1b383155ebaf14a67170dd182dfc..a6d5ac7b6fb37def2a38d688b77ecf0e67b558f2 100644
--- a/pkgs/misc/libnbcompat/default.nix
+++ b/pkgs/misc/libnbcompat/default.nix
@@ -20,7 +20,7 @@ nativeBuildInputs = [ autoreconfHook ];
meta = {
description = "Portable NetBSD-compatibility library";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/misc/md2html/default.nix b/pkgs/misc/md2html/default.nix
index ae0cd25307d599abfb5c0d115e06922ff0ff97b6..18fe1801a23d5aee7b16bd1f7d6a1339164b570b 100644
--- a/pkgs/misc/md2html/default.nix
+++ b/pkgs/misc/md2html/default.nix
@@ -6,20 +6,20 @@ }:
buildGoModule rec {
pname = "md2html";
src = fetchFromGitHub {
owner = "nocd5";
repo = "md2html";
rev = "v${version}";
};
vendorHash = "sha256-XO8WD/SC2Xii0bUiuOGL9V7XgTJDZjsPrpmyONFm+7U=";
meta = {
description = "Markdown to single HTML";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/misc/messenger-cli/default.nix b/pkgs/misc/messenger-cli/default.nix
index 0cb75ce7d8b6734d5d6cfe37cbed0e26b7876db0..6a33aacc585004a14b2c49ba83690a12b806afe4 100644
--- a/pkgs/misc/messenger-cli/default.nix
+++ b/pkgs/misc/messenger-cli/default.nix
@@ -13,12 +13,12 @@ libsodium,
ncurses,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "messenger-cli";
version = "0.2.0";
src = fetchurl {
hash = "sha256-ZuGflZsMzPZ430boN/LKtEthayyyrxY0uIIWQasU7vY=";
};
@@ -40,9 +40,9 @@
meta = {
description = "A CLI for the Messenger service of GNUnet";
homepage = "https://www.gnunet.org/";
license = lib.licenses.agpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
};
-}
+})
diff --git a/pkgs/misc/messenger-gtk/default.nix b/pkgs/misc/messenger-gtk/default.nix
index 1b2810b6b475647ec63879ef06820204e9d10672..796abc931a23389e4727125c0b5e8a6d233a38c6 100644
--- a/pkgs/misc/messenger-gtk/default.nix
+++ b/pkgs/misc/messenger-gtk/default.nix
@@ -23,12 +23,12 @@ pipewire,
qrencode,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "messenger-gtk";
version = "0.9.0";
src = fetchurl {
hash = "sha256-DqviYQ+zEy75mQEHKi90pkDgps4gM6YrjN9esrCmi0s=";
};
@@ -59,10 +59,10 @@
meta = {
description = "A GTK based GUI for the Messenger service of GNUnet";
homepage = "https://www.gnunet.org/";
license = lib.licenses.agpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/misc/miband4/default.nix b/pkgs/misc/miband4/default.nix
index 70f557ace81fc83b0b8742b2fd207e8366fb24e3..f0f1a21704e6d8069e31abf5b6398d9fc337006e 100644
--- a/pkgs/misc/miband4/default.nix
+++ b/pkgs/misc/miband4/default.nix
@@ -6,7 +6,7 @@ python3Packages,
curses-menu,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "miband4";
version = "0-unstable-2022-10-07";
format = "other";
@@ -42,7 +42,7 @@ '';
meta = {
description = "Access Xiaomi MiBand 4 from Linux using Bluetooth LE";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/misc/mitzasql/default.nix b/pkgs/misc/mitzasql/default.nix
index ec601db4acb2c924fd243272620381412396f959..2d3f35133d53a6241053e4d974ef8dbb929938e0 100644
--- a/pkgs/misc/mitzasql/default.nix
+++ b/pkgs/misc/mitzasql/default.nix
@@ -23,7 +23,7 @@ --replace-fail "urwid ==2.1.2" "urwid" \
--replace-fail "appdirs ==1.4.4" "appdirs"
'';
appdirs
pygments
mysql-connector
diff --git a/pkgs/misc/modbus-tools/default.nix b/pkgs/misc/modbus-tools/default.nix
index 7e26be8cbf841ce82cca497d0ebcd2b3926c8677..31bd463659e75dd471597e173e56fc3beb7d4fe8 100644
--- a/pkgs/misc/modbus-tools/default.nix
+++ b/pkgs/misc/modbus-tools/default.nix
@@ -3,7 +3,7 @@ lib,
stdenv,
rustPlatform,
fetchFromGitLab,
}:
rustPlatform.buildRustPackage rec {
@@ -23,11 +23,11 @@ postPatch = ''
ln -s ${./Cargo.lock} Cargo.lock
'';
meta = {
description = "Tool(s) for working with Modbus protocol";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/misc/modbus_sim_cli/default.nix b/pkgs/misc/modbus_sim_cli/default.nix
index 72ab21a5e8b5578c23c7bbf5020afca03fefa6a9..df9dc8f2e2e0aa67c582a1d3fbef599139e6967a 100644
--- a/pkgs/misc/modbus_sim_cli/default.nix
+++ b/pkgs/misc/modbus_sim_cli/default.nix
@@ -5,7 +5,7 @@ fetchFromGitHub,
modbus_tk,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "modbus_sim_cli";
version = "0-unstable-2019-02-27";
@@ -22,7 +22,7 @@ substituteInPlace modbus_sim/utils/config_parser.py \
--replace-fail "yaml.load(conffile.read())" "yaml.safe_load(conffile)"
'';
coloredlogs
modbus_tk
pyyaml
@@ -38,7 +38,7 @@ '';
meta = {
description = "Modbus simulation command line version";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/misc/morse-talk/default.nix b/pkgs/misc/morse-talk/default.nix
index deb7e2ef9c6f4b9c483285341ba1475e4bd8da41..e7d5b4acb12b04f72160236663cb10fcdc9b3c5e 100644
--- a/pkgs/misc/morse-talk/default.nix
+++ b/pkgs/misc/morse-talk/default.nix
@@ -5,7 +5,7 @@ fetchFromGitHub,
python3Packages,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "morse-talk";
version = "2016-12-25";
@@ -16,7 +16,7 @@ rev = "71e09ace0aa554d28cada5ee658e43758305b8fa";
hash = "sha256-fvQCETz0Lv0hyfKG7HC2Whm+xoZ9233hF/1ogsfZ10o=";
};
matplotlib
sounddevice
tkinter
@@ -27,7 +27,7 @@ checkPhase = "nosetests";
meta = {
description = "A Python library written for Morse Code";
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/misc/musig/default.nix b/pkgs/misc/musig/default.nix
index 402c24051475a0b5de7c6bf8db5cf5d0d31b56f1..bfddff4fab968f26d2df717f96cb49f60a066446 100644
--- a/pkgs/misc/musig/default.nix
+++ b/pkgs/misc/musig/default.nix
@@ -32,7 +32,7 @@ passthru.tests.version = testers.testVersion { package = musig; };
meta = {
description = "A shazam like tool to store songs fingerprints and retrieve them";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
broken = stdenv.isDarwin;
diff --git a/pkgs/misc/mysql-to-sqlite3/default.nix b/pkgs/misc/mysql-to-sqlite3/default.nix
index 98f58ef04bb1d5ee2b6f00773582a918edf7e884..3067a0deeef6adba9d95700c2e5f003d0aa031fb 100644
--- a/pkgs/misc/mysql-to-sqlite3/default.nix
+++ b/pkgs/misc/mysql-to-sqlite3/default.nix
@@ -18,7 +18,7 @@ };
build-system = with python3Packages; [ hatchling ];
click
mysql-connector
python-slugify
@@ -31,7 +31,7 @@ ];
meta = {
description = "Transfer data from MySQL to SQLite";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
mainProgram = "mysql2sqlite";
diff --git a/pkgs/misc/nanodns/default.nix b/pkgs/misc/nanodns/default.nix
index 5d7356333ffa6dc6f5ca13c1266958ad5d7649b2..c4ace828c519ded08afd20f6610d96422c732655 100644
--- a/pkgs/misc/nanodns/default.nix
+++ b/pkgs/misc/nanodns/default.nix
@@ -4,7 +4,7 @@ buildGoPackage,
fetchFromGitHub,
}:
-buildGoPackage rec {
+buildGoPackage {
pname = "nanodns";
version = "0-unstable-2021-10-29";
@@ -21,7 +21,7 @@ goDeps = ./deps.nix;
meta = {
description = "Simple dns forwarder/cache blocker server";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/misc/nmtree/default.nix b/pkgs/misc/nmtree/default.nix
index 422bac36cb01b4b64a38a711ca7ad9ffc892255f..23d4610676a241964e78a44bf84a97099bd22a4d 100644
--- a/pkgs/misc/nmtree/default.nix
+++ b/pkgs/misc/nmtree/default.nix
@@ -25,7 +25,7 @@ env.NIX_CFLAGS_COMPILE = "-Wno-format-security";
meta = {
description = "NetBSD's mtree(8) utility";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/misc/objlab/default.nix b/pkgs/misc/objlab/default.nix
index a5116f9b1153cd759bd03caad736cba5697e662f..2c4a3602d9b7c34e9ae7beb64dfc3259bcda5dd4 100644
--- a/pkgs/misc/objlab/default.nix
+++ b/pkgs/misc/objlab/default.nix
@@ -9,7 +9,7 @@ libglvnd,
libGLU,
}:
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation {
pname = "objlab";
version = "0-unstable-2019-11-23";
@@ -44,11 +44,11 @@ '';
meta = {
description = "Simple wavefront .obj viewer";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
skip.ci = stdenv.isDarwin;
mainProgram = "objlab";
};
-})
+}
diff --git a/pkgs/misc/ocelotgui/default.nix b/pkgs/misc/ocelotgui/default.nix
index 8dcff8b553c267d7d7a23c8da76e5520ebffbed6..b9b6874c7c3052e57cbe56646d5d25989aad82ce 100644
--- a/pkgs/misc/ocelotgui/default.nix
+++ b/pkgs/misc/ocelotgui/default.nix
@@ -37,7 +37,7 @@ env.NIX_LDFLAGS = "-L${mariadb-connector-c}/lib/mariadb -lmysqlclient";
meta = {
description = "GUI client for MySQL or MariaDB";
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/misc/opcua-stack/default.nix b/pkgs/misc/opcua-stack/default.nix
index 314141415cd79eb353028fc1c96803ed2d9c87d1..6d73e06fb9650858be636fc82d4af674c6938508 100644
--- a/pkgs/misc/opcua-stack/default.nix
+++ b/pkgs/misc/opcua-stack/default.nix
@@ -7,18 +7,18 @@ boost,
openssl,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "opcua-stack";
version = "3.8.1";
src = fetchFromGitHub {
owner = "ASNeG";
repo = "OpcUaStack";
hash = "sha256-czpuuT9DeZaYo2Q8Y/vW1kAsIiFhRDSKwVBUcFgb9iQ=";
};
postPatch = ''
substituteInPlace CMakeLists.txt --replace-fail "/usr" "$out"
@@ -39,4 +39,4 @@ maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/misc/plotjuggler/default.nix b/pkgs/misc/plotjuggler/default.nix
index 757be3322682bc1086d90936ad0afe08fece9c69..6850ea849f9384a27f7555d696ce63d38064db1a 100644
--- a/pkgs/misc/plotjuggler/default.nix
+++ b/pkgs/misc/plotjuggler/default.nix
@@ -15,14 +15,14 @@ zeromq,
zstd,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "plotjuggler";
version = "3.9.2";
src = fetchFromGitHub {
owner = "facontidavide";
repo = "PlotJuggler";
hash = "sha256-Dl2vE4iGhcGLH5lf1eCdybhfTG1bgI0Skw+AHKdvolQ=";
};
@@ -55,4 +55,4 @@ license = lib.licenses.mpl20;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
};
-}
+})
diff --git a/pkgs/misc/pnoise/default.nix b/pkgs/misc/pnoise/default.nix
index 1ad34f5e729a419d1d25e68de2c7a1300f424530..9f73cd9850ec9ee372ae4e82080b282e95639f0b 100644
--- a/pkgs/misc/pnoise/default.nix
+++ b/pkgs/misc/pnoise/default.nix
@@ -15,13 +15,13 @@ rev = version;
hash = "sha256-JwWzLvgCNSLRs/ToZNFH6fN6VLEsQTmsgxxkugwjA9k=";
};
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
meta = {
description = "Vectorized port of Processing noise() function";
license = lib.licenses.lgpl2Plus;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/misc/qasync/default.nix b/pkgs/misc/qasync/default.nix
index 5bd355e177c5b610307df2424fb30a686b53988b..0540fd2429a8c90d0d85da8c00d0af18a60c772f 100644
--- a/pkgs/misc/qasync/default.nix
+++ b/pkgs/misc/qasync/default.nix
@@ -19,7 +19,7 @@ doCheck = false;
meta = {
description = "Python library for using asyncio in Qt-based applications";
license = lib.licenses.bsd2;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/misc/qoiview/default.nix b/pkgs/misc/qoiview/default.nix
index 4debfcd02e64f6b254c237e04bfcd730cdfb2964..25a9fd943646256998ff4a16f6fd03efdcc44632 100644
--- a/pkgs/misc/qoiview/default.nix
+++ b/pkgs/misc/qoiview/default.nix
@@ -9,13 +9,13 @@ }:
stdenv.mkDerivation (finalAttrs: {
pname = "qoiview";
src = fetchFromGitHub {
owner = "floooh";
repo = "qoiview";
};
nativeBuildInputs = [ cmake ];
@@ -49,7 +49,7 @@ '';
meta = {
description = "QOI image viewer on top of the Sokol headers";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/misc/repolocli/default.nix b/pkgs/misc/repolocli/default.nix
index ce21fe8ab08b863c987db9cc4589d3bd85399907..ee1b17895c850b3fb7ba2001495e8c500a681982 100644
--- a/pkgs/misc/repolocli/default.nix
+++ b/pkgs/misc/repolocli/default.nix
@@ -10,7 +10,7 @@ pkg-config,
makeWrapper,
}:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
pname = "repolocli";
version = "0-unstable-2021-04-06";
@@ -45,7 +45,7 @@ '';
meta = {
description = "Repology commandline interface (and API)";
license = lib.licenses.gpl2Only;
maintainers = [ lib.maintainers.sikmir ];
broken = stdenv.isLinux;
diff --git a/pkgs/misc/rhttp/default.nix b/pkgs/misc/rhttp/default.nix
index f2c32691f1cd0c23ce217511ed86f6ee76501396..27cf0d8d3fbb12e49caa9c2a001ec1e1fa9f9aaa 100644
--- a/pkgs/misc/rhttp/default.nix
+++ b/pkgs/misc/rhttp/default.nix
@@ -4,7 +4,7 @@ fetchFromGitHub,
buildGoModule,
}:
-buildGoModule rec {
+buildGoModule {
pname = "rhttp";
version = "0-unstable-2024-04-22";
@@ -19,7 +19,7 @@ vendorHash = "sha256-NR1q44IUSME+x1EOcnXXRoIXw8Av0uH7iXhD+cdd99I=";
meta = {
description = "REPL for HTTP";
license = lib.licenses.agpl3Only;
maintainers = [ lib.maintainers.sikmir ];
mainProgram = "rhttp";
diff --git a/pkgs/misc/riffraff/default.nix b/pkgs/misc/riffraff/default.nix
index 820047de85ec4a8f7c5f21bf6af5a2b698073082..c9edbecf41e4212027d3ac8e1fc69529d28444e9 100644
--- a/pkgs/misc/riffraff/default.nix
+++ b/pkgs/misc/riffraff/default.nix
@@ -5,7 +5,7 @@ fetchFromGitHub,
installShellFiles,
}:
-buildGoModule rec {
+buildGoModule {
pname = "riffraff";
version = "0.5.0-unstable-2022-10-25";
@@ -29,7 +29,7 @@ '';
meta = {
description = "A commandline interface for Jenkins";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
mainProgram = "riffraff";
diff --git a/pkgs/misc/rst2txt/default.nix b/pkgs/misc/rst2txt/default.nix
index 994bc33090d196c5b70526ef873dbc29a13ddfa1..69087fd6115bff036568be523083ebd5f86dafa3 100644
--- a/pkgs/misc/rst2txt/default.nix
+++ b/pkgs/misc/rst2txt/default.nix
@@ -15,11 +15,11 @@ rev = version;
hash = "sha256-UqY+qD1S8tyRxvQ0GIzfBlHzsdVSaEJkmgw1WC0H/KA=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
docutils
pygments
setuptools # pkg_resources
@@ -29,7 +29,7 @@ doCheck = false;
meta = {
description = "Convert reStructuredText to plain text";
license = lib.licenses.bsd2;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/misc/sdorfehs/default.nix b/pkgs/misc/sdorfehs/default.nix
index 41b6da4202e700d960f99de112d0748369a483b6..d30b13593162fb5078b06d664dbefd38002dfdbd 100644
--- a/pkgs/misc/sdorfehs/default.nix
+++ b/pkgs/misc/sdorfehs/default.nix
@@ -31,7 +31,7 @@ installFlags = [ "PREFIX=$(out)" ];
meta = {
description = "A tiling window manager";
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/misc/serverpp/default.nix b/pkgs/misc/serverpp/default.nix
index 4696009bb9037095ba0fff0c5bd8cafa667b2310..ff1887acf6c41046c27cea18294f503e4c5ccf4f 100644
--- a/pkgs/misc/serverpp/default.nix
+++ b/pkgs/misc/serverpp/default.nix
@@ -27,7 +27,7 @@ ];
meta = {
description = "A C++ library for basic network server handling";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/misc/shellprof/default.nix b/pkgs/misc/shellprof/default.nix
index 03c6209fab47e1a21e253c7bf138c927a5dfafa4..9a99502bd97d9e9ba7708e699e838c0df534103e 100644
--- a/pkgs/misc/shellprof/default.nix
+++ b/pkgs/misc/shellprof/default.nix
@@ -5,7 +5,7 @@ fetchFromGitHub,
python3Packages,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "shellprof";
version = "0-unstable-2021-04-27";
format = "other";
@@ -26,7 +26,7 @@ '';
meta = {
description = "Profile a shell script based on its printouts";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/misc/socketcand/default.nix b/pkgs/misc/socketcand/default.nix
index ca07dc320a109ba43b1fe565b8bc8737697f485d..169689549e12f08ba9cda86dd0498ef4efd61145 100644
--- a/pkgs/misc/socketcand/default.nix
+++ b/pkgs/misc/socketcand/default.nix
@@ -7,7 +7,7 @@ installShellFiles,
libconfig,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "socketcand";
version = "0.6.1-unstable-2023-12-06";
@@ -34,7 +34,7 @@ '';
meta = {
description = "Server to access CAN sockets over ASCII protocol";
license = with lib.licenses; [
gpl2Only
bsd3
diff --git a/pkgs/misc/subprocess/default.nix b/pkgs/misc/subprocess/default.nix
index 1de46158316c504ae0489cb5f007bee638957c13..849e642dabdcb2fd986fce122941e2ad92e2713d 100644
--- a/pkgs/misc/subprocess/default.nix
+++ b/pkgs/misc/subprocess/default.nix
@@ -7,14 +7,14 @@ cxxtest,
python3,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "subprocess";
version = "0.4.0";
src = fetchFromGitHub {
owner = "benman64";
repo = "subprocess";
hash = "sha256-Tgmihv7SJfYpOYHvtuE8rgFzUHyl4bJh9W5CSqotVMg=";
};
@@ -33,9 +33,9 @@ '';
meta = {
description = "Cross platform subprocess library for c++ similar to design of python subprocess";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
};
-}
+})
diff --git a/pkgs/misc/tabiew/default.nix b/pkgs/misc/tabiew/default.nix
index 6eac4df790b35825dfce703f7609323ae474a373..1ac32a8a33555edebbedfb92917feb6d555974c7 100644
--- a/pkgs/misc/tabiew/default.nix
+++ b/pkgs/misc/tabiew/default.nix
@@ -1,6 +1,5 @@
{
lib,
rustPlatform,
fetchFromGitHub,
}:
@@ -20,7 +19,7 @@ cargoHash = "sha256-CMqMn29j70f/3YFWtWkW8J5dCxXf5HtaIrl2yudipTQ=";
meta = {
description = "A lightweight TUI app to view and query CSV files";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/misc/telegabber/default.nix b/pkgs/misc/telegabber/default.nix
index a45634cdfa5592f8c446e75fff56a1afee31e2e7..f5b1de6e898bdb022141c68f2bda482271fe2509 100644
--- a/pkgs/misc/telegabber/default.nix
+++ b/pkgs/misc/telegabber/default.nix
@@ -11,14 +11,14 @@ }:
buildGoModule rec {
pname = "telegabber";
src = fetchFromGitea {
domain = "dev.narayana.im";
owner = "narayana";
repo = "telegabber";
rev = "v${version}";
};
vendorHash = "sha256-3qSa6yJXSjrmTIBrulCnZMZzqNtpkzpzWeYAzHl8uUM=";
@@ -37,7 +37,7 @@ passthru.tests.version = testers.testVersion { package = telegabber; };
meta = {
description = "XMPP/Jabber transport to Telegram network";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/misc/telegram-send/default.nix b/pkgs/misc/telegram-send/default.nix
index 9fc787795059be1a1b8d6f55e5d562cfb546c71c..b704e4be80d2708e583f547ce60a0fac81383c19 100644
--- a/pkgs/misc/telegram-send/default.nix
+++ b/pkgs/misc/telegram-send/default.nix
@@ -5,7 +5,7 @@ fetchpatch,
python3Packages,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "telegram-send";
version = "0-unstable-2023-10-07";
@@ -23,7 +23,7 @@ '';
nativeBuildInputs = with python3Packages; [ pip ];
appdirs
colorama
python-telegram-bot
diff --git a/pkgs/misc/telnetpp/default.nix b/pkgs/misc/telnetpp/default.nix
index 3cf9545d41610350ec5f75c60bae9bcd69949a75..f665edf0b55fc4131af418f474411ef94f270e31 100644
--- a/pkgs/misc/telnetpp/default.nix
+++ b/pkgs/misc/telnetpp/default.nix
@@ -37,7 +37,7 @@ cmakeFlags = [ (lib.cmakeBool "TELNETPP_WITH_ZLIB" true) ];
meta = {
description = "A C++ library for interacting with Telnet streams";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/misc/tinyflux/default.nix b/pkgs/misc/tinyflux/default.nix
index 931d967ab5ff57b184b1dbf1d990c2fe5ac3059f..03bc105dc84f88436fb45a6db29b515df65fe7a0 100644
--- a/pkgs/misc/tinyflux/default.nix
+++ b/pkgs/misc/tinyflux/default.nix
@@ -6,27 +6,27 @@ }:
python3Packages.buildPythonApplication rec {
pname = "tinyflux";
pyproject = true;
src = fetchFromGitHub {
owner = "citrusvanilla";
repo = "tinyflux";
rev = "v${version}";
};
postPatch = ''
echo ${version} > version.txt
'';
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
meta = {
description = "The tiny time series database";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/misc/tlstunnel/default.nix b/pkgs/misc/tlstunnel/default.nix
index d355f20d4817178511426e69aecf4ee93ca89496..47f32fac155f3e84795b080de69d20d9f35f945d 100644
--- a/pkgs/misc/tlstunnel/default.nix
+++ b/pkgs/misc/tlstunnel/default.nix
@@ -30,7 +30,7 @@ ];
meta = {
description = "A TLS reverse proxy unikernel";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/misc/turbo/default.nix b/pkgs/misc/turbo/default.nix
index af84ea735c77c5d99853e550369acd3a9be41dbb..5085f3c99f8c14d585623d45279a2ae88ff4fde7 100644
--- a/pkgs/misc/turbo/default.nix
+++ b/pkgs/misc/turbo/default.nix
@@ -7,7 +7,7 @@ file,
tvision,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "turbo";
version = "0-unstable-2024-02-05";
@@ -29,7 +29,7 @@ cmakeFlags = [ (lib.cmakeBool "TURBO_USE_SYSTEM_TVISION" true) ];
meta = {
description = "An experimental text editor based on Scintilla and Turbo Vision";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/misc/tvision/default.nix b/pkgs/misc/tvision/default.nix
index 42fa603b684969f37a97028707692cc1011a6b0f..72b8225e8e22ad0355385dfdc071f74003f6d702 100644
--- a/pkgs/misc/tvision/default.nix
+++ b/pkgs/misc/tvision/default.nix
@@ -6,7 +6,7 @@ cmake,
ncurses,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "tvision";
version = "0-unstable-2024-02-28";
@@ -25,7 +25,7 @@ cmakeFlags = [ (lib.cmakeBool "TV_BUILD_EXAMPLES" false) ];
meta = {
description = "A modern port of Turbo Vision 2.0, the classical framework for text-based user interfaces";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/misc/wik/default.nix b/pkgs/misc/wik/default.nix
index 9c61e95db80af21108b6696db036410c8640d0b1..6d5ad528ad79dd0d3ec2f54e8011850b0e23b08f 100644
--- a/pkgs/misc/wik/default.nix
+++ b/pkgs/misc/wik/default.nix
@@ -5,7 +5,7 @@ fetchFromGitHub,
python3Packages,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "wik";
version = "1.4.0";
pyproject = true;
@@ -17,17 +17,18 @@ rev = "37207e7cf2955c494a55701cb81d388cc349b6ea";
hash = "sha256-oSHL3jYFuvJY1W7N9/CvFClFakz9f35RHg77AbMRfsI=";
};
beautifulsoup4
requests
];
meta = {
description = "wik is use to get information about anything on the shell using Wikipedia";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
}
diff --git a/pkgs/misc/worm/default.nix b/pkgs/misc/worm/default.nix
index 5291905f3a4dd52a05345548b72483f0e32dd2db..02db9112a1bc4326bff800bff5c1c118c4652cf0 100644
--- a/pkgs/misc/worm/default.nix
+++ b/pkgs/misc/worm/default.nix
@@ -41,7 +41,7 @@ '';
meta = {
description = "A dynamic, tag-based window manager written in Nim";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.sikmir ];
diff --git a/pkgs/misc/wptools/default.nix b/pkgs/misc/wptools/default.nix
index 30c853e1b13f393ec389703bcd002f851da3e8e9..f4f6d45c7bd971057df78813f6fdb4726fb87abf 100644
--- a/pkgs/misc/wptools/default.nix
+++ b/pkgs/misc/wptools/default.nix
@@ -4,7 +4,7 @@ fetchFromGitHub,
python3Packages,
}:
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonPackage {
pname = "wptools";
version = "0.4.17-unstable-2022-02-22";
@@ -15,7 +15,7 @@ rev = "a98a544f206a62c9f04fd34c0805825a8d531936";
hash = "sha256-l1sCEhveK9fefZY6tL/kh2bOcq4ids4HZu6pXvn17AA=";
};
certifi
html2text
lxml
@@ -26,7 +26,7 @@ doCheck = false;
meta = {
description = "Wikipedia tools (for Humans)";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/misc/xtr/default.nix b/pkgs/misc/xtr/default.nix
index eecd93046877808fbe89c1af3d7b832a1b108bee..ef0ebe0518ee2d61404098aa1b8d61dc835aed41 100644
--- a/pkgs/misc/xtr/default.nix
+++ b/pkgs/misc/xtr/default.nix
@@ -4,7 +4,7 @@ stdenv,
rustPlatform,
fetchFromGitHub,
libiconv,
}:
rustPlatform.buildRustPackage rec {
@@ -26,7 +26,7 @@ '';
buildInputs = lib.optionals stdenv.isDarwin [
libiconv
];
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-incompatible-function-pointer-types";
@@ -35,7 +35,7 @@ hardeningDisable = lib.optional stdenv.isDarwin "format";
meta = {
description = "Translation tools for rust";
license = with lib.licenses; [
agpl3Only
mit
diff --git a/pkgs/misc/youtimetrack/default.nix b/pkgs/misc/youtimetrack/default.nix
index d9f993a967fc6d18c0c5260e67eeb24cd211c8b7..88b7c851b799d1b190ee3f7ff3fc56c86614c5d6 100644
--- a/pkgs/misc/youtimetrack/default.nix
+++ b/pkgs/misc/youtimetrack/default.nix
@@ -1,5 +1,4 @@
{
lib,
fetchFromGitHub,
buildGoModule,
@@ -20,7 +19,7 @@ vendorHash = "sha256-HRyjdTTwDmu/5NVpjqCwatYuWN15j3rTgrhv76uMS7I=";
meta = {
description = "CLI tools for YouTrack time management";
license = lib.licenses.wtfpl;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/mqtt/go-mqtt-to-influxdb/default.nix b/pkgs/mqtt/go-mqtt-to-influxdb/default.nix
index 7f3b5e715edba2c3404b7ace6a77e20db047137b..609454151b21093357b0bee259ac8d0c644067f7 100644
--- a/pkgs/mqtt/go-mqtt-to-influxdb/default.nix
+++ b/pkgs/mqtt/go-mqtt-to-influxdb/default.nix
@@ -1,5 +1,4 @@
{
lib,
fetchFromGitHub,
buildGoModule,
@@ -21,7 +20,7 @@ doCheck = false;
meta = {
description = "Bridge to write MQTT to InfluxDB";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/mqtt/ioxy/default.nix b/pkgs/mqtt/ioxy/default.nix
index 7cc99713d573e712d05e0477917783a83869f233..1f91e404ec0dfbe18787fe64ead8382601a77c38 100644
--- a/pkgs/mqtt/ioxy/default.nix
+++ b/pkgs/mqtt/ioxy/default.nix
@@ -1,5 +1,4 @@
{
lib,
fetchFromGitHub,
buildGoModule,
@@ -22,7 +21,7 @@ vendorHash = "sha256-VWw9yuwNnJYvIvl6ov24An867koyzPPbqNg0VIXCJiM=";
meta = {
description = "MQTT intercepting proxy";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/mqtt/janus-mqtt-proxy/default.nix b/pkgs/mqtt/janus-mqtt-proxy/default.nix
index edb48f8360998a090a6fb0338669eaeb1c41ed5c..db2075e9c656f07af72d6a1b7935550de8db4104 100644
--- a/pkgs/mqtt/janus-mqtt-proxy/default.nix
+++ b/pkgs/mqtt/janus-mqtt-proxy/default.nix
@@ -4,7 +4,7 @@ fetchFromGitHub,
buildGoPackage,
}:
-buildGoPackage rec {
+buildGoPackage {
pname = "janus-mqtt-proxy";
version = "0-unstable-2022-02-19";
@@ -26,7 +26,7 @@ '';
meta = {
description = "MITM proxy which can filter and modify MQTT packets";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/mqtt/libumqtt/default.nix b/pkgs/mqtt/libumqtt/default.nix
index dd65b0b565c46c4d6d21c7b8702aac834247ff50..aa50511987c7e0f7a04bfb7d76a4c187d02a10a6 100644
--- a/pkgs/mqtt/libumqtt/default.nix
+++ b/pkgs/mqtt/libumqtt/default.nix
@@ -39,7 +39,7 @@ env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration -Wno-error=misleading-indentation";
meta = {
description = "A Lightweight and fully asynchronous MQTT client C library based on libev";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/mqtt/mproxy/default.nix b/pkgs/mqtt/mproxy/default.nix
index df25816521da9499a57a7f8fa318ff38f524fe50..ef32ecc85b428fe8dbd568e3d90091013f92735b 100644
--- a/pkgs/mqtt/mproxy/default.nix
+++ b/pkgs/mqtt/mproxy/default.nix
@@ -1,5 +1,4 @@
{
lib,
fetchFromGitHub,
buildGoModule,
@@ -25,7 +24,7 @@ '';
meta = {
description = "MQTT proxy";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/mqtt/mqcontrol/default.nix b/pkgs/mqtt/mqcontrol/default.nix
index 7fc394581b10bb451252f4b7ac0426c7a2c0c579..707c698eb0d630797284e6f24ce6f85038aa6f34 100644
--- a/pkgs/mqtt/mqcontrol/default.nix
+++ b/pkgs/mqtt/mqcontrol/default.nix
@@ -1,5 +1,4 @@
{
lib,
fetchFromGitHub,
buildGoModule,
@@ -20,7 +19,7 @@ vendorHash = "sha256-tuSrIq2DHMy2KY2z3ZMAwC28UGHrZifAWmOFx5Y4pKU=";
meta = {
description = "Cross-platform utility to execute commands remotely using MQTT";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/mqtt/mqtt-benchmark/default.nix b/pkgs/mqtt/mqtt-benchmark/default.nix
index 780632893e2aa4a2c503403c250b9812a7b5af4f..ae316d7be2704fda32421bc2e95c7175f12dd4c5 100644
--- a/pkgs/mqtt/mqtt-benchmark/default.nix
+++ b/pkgs/mqtt/mqtt-benchmark/default.nix
@@ -19,7 +19,7 @@ vendorHash = "sha256-ZN5tNDIisbhMMOA2bVJnE96GPdZ54HXTneFQewwJmHI=";
meta = {
description = "MQTT broker benchmarking tool";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/mqtt/mqtt-c/default.nix b/pkgs/mqtt/mqtt-c/default.nix
index 633446c79c8dd6379917709a64b49d84066bcc30..39aeab113abc6d54d44fbf25f294a8d39bf2b38c 100644
--- a/pkgs/mqtt/mqtt-c/default.nix
+++ b/pkgs/mqtt/mqtt-c/default.nix
@@ -34,7 +34,7 @@ '';
meta = {
description = "A portable MQTT C client for embedded systems and PCs alike";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/mqtt/mqtt-launcher/default.nix b/pkgs/mqtt/mqtt-launcher/default.nix
index 525f17443266b5be3ef81e5482efa87eded76739..11dca5ff53452555f66453417af2172330da2adb 100644
--- a/pkgs/mqtt/mqtt-launcher/default.nix
+++ b/pkgs/mqtt/mqtt-launcher/default.nix
@@ -1,11 +1,10 @@
{
lib,
fetchFromGitHub,
python3Packages,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "mqtt-launcher";
version = "0-unstable-2021-09-17";
format = "other";
@@ -17,7 +16,7 @@ rev = "bce7a5b320e7b81cfbb904d70033b9998f70e232";
hash = "sha256-FEKvlED/Sgcr7vBa8HW2N7mapmARiemcJ22zwuTwORw=";
};
dontUseSetuptoolsBuild = true;
dontUseSetuptoolsCheck = true;
@@ -28,7 +27,7 @@ '';
meta = {
description = "Execute shell commands triggered by published MQTT messages";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/mqtt/mqtt-proxy/default.nix b/pkgs/mqtt/mqtt-proxy/default.nix
index d580ed6ef3d0ae71941c47d7f9fb1f45cc0b2560..e49e9da9a1f61c763009724abeef28b3dae42913 100644
--- a/pkgs/mqtt/mqtt-proxy/default.nix
+++ b/pkgs/mqtt/mqtt-proxy/default.nix
@@ -1,5 +1,4 @@
{
lib,
fetchFromGitHub,
buildGoModule,
@@ -21,11 +20,15 @@ vendorHash = null;
buildInputs = [ cyrus_sasl ];
meta = {
description = "MQTT Proxy allows MQTT clients to send messages to other messaging systems";
#license = lib.licenses.cc-by-nc-nd-40;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/mqtt/mqtt-shell/default.nix b/pkgs/mqtt/mqtt-shell/default.nix
index dc05acbfc3b5747ffbe4ce53dcbbaab946008f2a..6dcc20589d8427cac9c54d4dba2505e7de40997c 100644
--- a/pkgs/mqtt/mqtt-shell/default.nix
+++ b/pkgs/mqtt/mqtt-shell/default.nix
@@ -1,5 +1,4 @@
{
lib,
fetchFromGitHub,
buildGoModule,
@@ -18,13 +17,17 @@ };
vendorHash = "sha256-kC/APQjdKPjV7ap/2QONX1Y/glqbElNiXsa2uzRLIm8=";
doCheck = false;
meta = {
description = "A interactive shell-like command line interface (CLI) for MQTT";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/mqtt/mqtt-to-influxdb-forwarder/default.nix b/pkgs/mqtt/mqtt-to-influxdb-forwarder/default.nix
index 3733500ad0ec0712e9c115e4ac51820a27967b00..53207875b344c82ee1b7ab98d264528e68488642 100644
--- a/pkgs/mqtt/mqtt-to-influxdb-forwarder/default.nix
+++ b/pkgs/mqtt/mqtt-to-influxdb-forwarder/default.nix
@@ -1,6 +1,5 @@
{
lib,
fetchFromGitHub,
python3Packages,
}:
@@ -24,7 +23,7 @@
dontUseSetuptoolsBuild = true;
dontUseSetuptoolsCheck = true;
paho-mqtt
influxdb
];
@@ -35,7 +34,7 @@ '';
meta = {
description = "IoT MQTT to InfluxDB forwarder";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/mqtt/mqtt-to-influxdb/default.nix b/pkgs/mqtt/mqtt-to-influxdb/default.nix
index f49d0b80cc10d269a7534dc21b9574d036909e0e..21215697b61a9c7b0df3cdea73c88fdc9c0ecc4b 100644
--- a/pkgs/mqtt/mqtt-to-influxdb/default.nix
+++ b/pkgs/mqtt/mqtt-to-influxdb/default.nix
@@ -65,7 +65,7 @@ ];
meta = {
description = "MQTT message parser for writing statistics into InfluxDB";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/mqtt/rumqtt/default.nix b/pkgs/mqtt/rumqtt/default.nix
index c2809fe52aae583e7ae5cb9c57d05db1946d51d6..92652c4b95c06470bdb71a39bbad32025a1c56a8 100644
--- a/pkgs/mqtt/rumqtt/default.nix
+++ b/pkgs/mqtt/rumqtt/default.nix
@@ -4,7 +4,7 @@ stdenv,
rustPlatform,
fetchFromGitHub,
cmake,
}:
rustPlatform.buildRustPackage rec {
@@ -22,7 +22,7 @@ cargoHash = "sha256-a6HVcaL6OKIK0h3yuUFDlPASNRciOdW09uXoewld4F8=";
nativeBuildInputs = [ cmake ];
meta = {
description = "The MQTT ecosystem in rust";
diff --git a/pkgs/nakarte/elevation_server/default.nix b/pkgs/nakarte/elevation_server/default.nix
index 2c3c269891afa82fb0f11e688835e5165fb6ae79..976e2b7b9f64283d99a0f51fd3677ad72d7fb4bd 100644
--- a/pkgs/nakarte/elevation_server/default.nix
+++ b/pkgs/nakarte/elevation_server/default.nix
@@ -30,7 +30,7 @@ goDeps = ./deps.nix;
meta = {
description = "The server providing elevation data";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/nakarte/map-tiler/default.nix b/pkgs/nakarte/map-tiler/default.nix
index 69ceb10ad4880c4fbefb9bb839a6e66ae89feef2..43359325b7c14f4a6fcf7b564ce8648aab4bbfb4 100644
--- a/pkgs/nakarte/map-tiler/default.nix
+++ b/pkgs/nakarte/map-tiler/default.nix
@@ -12,7 +12,7 @@ pyimagequant,
wrapGAppsHook,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "map-tiler";
version = "0-unstable-2022-08-06";
@@ -41,7 +41,7 @@ gobject-introspection
pango
];
pyyaml
pyproj
pypng
@@ -58,7 +58,7 @@ doCheck = false;
meta = {
description = "Raster maps to map tiles";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/nakarte/maprec/default.nix b/pkgs/nakarte/maprec/default.nix
index b173ee76972ead8569880cb1e715baaa72071776..42b5dddbdcb8e2a3c7fdac68d6cf41443034ec66 100644
--- a/pkgs/nakarte/maprec/default.nix
+++ b/pkgs/nakarte/maprec/default.nix
@@ -6,7 +6,7 @@ fetchFromGitHub,
thinplatespline,
}:
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonPackage {
pname = "maprec";
version = "0-unstable-2023-04-18";
@@ -22,7 +22,7 @@ substituteInPlace setup.py \
--replace-fail " @ git+https://github.com/wladich/thinplatespline.git" ""
'';
pyyaml
pyproj
thinplatespline
@@ -33,7 +33,7 @@
pythonImportsCheck = [ "maprec" ];
meta = {
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/nakarte/ozi_map/default.nix b/pkgs/nakarte/ozi_map/default.nix
index 6773f711fe03c57adc7791c954da3f8eb5db5cf1..a0e26a43422c7903324878bde107a52c8771bfa2 100644
--- a/pkgs/nakarte/ozi_map/default.nix
+++ b/pkgs/nakarte/ozi_map/default.nix
@@ -6,7 +6,7 @@ fetchFromGitHub,
maprec,
}:
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonPackage {
pname = "ozi_map";
version = "0-unstable-2022-08-05";
@@ -22,7 +22,7 @@ substituteInPlace setup.py \
--replace-fail " @ git+https://github.com/wladich/maprec.git" ""
'';
maprec
pyproj
];
@@ -33,7 +33,7 @@ pythonImportsCheck = [ "ozi_map" ];
meta = {
description = "Python module for reading OziExplorer .map files";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/nakarte/pyimagequant/default.nix b/pkgs/nakarte/pyimagequant/default.nix
index a1bf844b5a95a4eb112ee1d495db0e4b65ebf326..886afd5bb70b66f20fe5e283a7d3ab025fc74943 100644
--- a/pkgs/nakarte/pyimagequant/default.nix
+++ b/pkgs/nakarte/pyimagequant/default.nix
@@ -5,7 +5,7 @@ fetchFromGitHub,
python3Packages,
}:
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonPackage {
pname = "pyimagequant";
version = "0-unstable-2022-06-10";
@@ -28,7 +28,7 @@ pythonImportsCheck = [ "imagequant" ];
meta = {
description = "Python bindings for libimagequant (pngquant core)";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/nakarte/thinplatespline/default.nix b/pkgs/nakarte/thinplatespline/default.nix
index 9851dafcb33c9db0456038bb55ffed01e251aadc..1a8aeaaff8d32574255874bdb7e0834b9c924b1f 100644
--- a/pkgs/nakarte/thinplatespline/default.nix
+++ b/pkgs/nakarte/thinplatespline/default.nix
@@ -4,7 +4,7 @@ python3Packages,
fetchFromGitHub,
}:
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonPackage {
pname = "thinplatespline";
version = "0-unstable-2024-02-06";
@@ -21,7 +21,7 @@ pythonImportsCheck = [ "tps" ];
meta = {
description = "Python library for thin plate spline calculations";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/nakarte/tracks_storage_server/default.nix b/pkgs/nakarte/tracks_storage_server/default.nix
index f6839ad69e1f18f9a1734656e508f58e9d24e79e..818b0664191363d879f5a81e2ff523c859daa1ca 100644
--- a/pkgs/nakarte/tracks_storage_server/default.nix
+++ b/pkgs/nakarte/tracks_storage_server/default.nix
@@ -21,7 +21,7 @@ scripts=['init_db.py'],
)
'';
in
-buildPythonPackage rec {
+buildPythonPackage {
pname = "tracks_storage_server";
version = "2024-04-27";
@@ -37,7 +37,7 @@ cp ${setupPy} ${setupPy.name}
substitute config.py.example config.py --replace-fail "'password" "#'password"
'';
msgpack
protobuf
psycopg2
@@ -47,7 +47,7 @@ pythonImportsCheck = [ "server" ];
meta = {
description = "Tracks storage server";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/osm/cykhash/default.nix b/pkgs/osm/cykhash/default.nix
index 0faf5d841daab6333ce1818833e5607ac665e1d0..cfe1ba257c032ec2b9f164dc451e52e4a7e3b3e3 100644
--- a/pkgs/osm/cykhash/default.nix
+++ b/pkgs/osm/cykhash/default.nix
@@ -4,7 +4,7 @@ python3Packages,
fetchFromGitHub,
}:
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonPackage {
pname = "cykhash";
version = "2.0.1";
@@ -32,7 +32,7 @@ pytestFlagsArray = [ "tests/unit_tests" ];
meta = {
description = "cython wrapper for khash";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/osm/gcgn-converter/default.nix b/pkgs/osm/gcgn-converter/default.nix
index ed9a219022fe670c782d56fe604699d9d9d291a2..02e867cf8431a1e9a6651ecbba9b6efc7919dd27 100644
--- a/pkgs/osm/gcgn-converter/default.nix
+++ b/pkgs/osm/gcgn-converter/default.nix
@@ -43,7 +43,7 @@ '';
meta = {
description = "Ковертер ГКГН из PDF в GeoJSON";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/osm/level0/default.nix b/pkgs/osm/level0/default.nix
index 9fe5000d97a37618f3a8088af479306ba595f4c5..93022bdb4ee70710692ac9672e0c2496be9e49e6 100644
--- a/pkgs/osm/level0/default.nix
+++ b/pkgs/osm/level0/default.nix
@@ -33,7 +33,7 @@ '';
meta = {
description = "Web-based OpenStreetMap Editor";
license = lib.licenses.wtfpl;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/osm/map-machine/default.nix b/pkgs/osm/map-machine/default.nix
index 9fa8b6abd792679867d0bba2f7b4c299f7132aa4..269aad60cb7fb4afed3ae1f0be1614cdaf64de5c 100644
--- a/pkgs/osm/map-machine/default.nix
+++ b/pkgs/osm/map-machine/default.nix
@@ -17,7 +17,7 @@ rev = "v${version}";
hash = "sha256-aOfvVyTgDxh7T2oAc+S1eU9b/JjXAhfc3WfR27ECXcY=";
};
cairosvg
colour
numpy
@@ -36,7 +36,7 @@ disabledTests = [ "test_tile" ];
meta = {
description = "A simple renderer for OpenStreetMap with custom icons";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
mainProgram = "map-machine";
diff --git a/pkgs/osm/map-stylizer/default.nix b/pkgs/osm/map-stylizer/default.nix
index afea56c1bf049ba6f1266671dde884f5e73b7c7c..5d9077502ccf866c5f1dd375c019480b8fa5ab56 100644
--- a/pkgs/osm/map-stylizer/default.nix
+++ b/pkgs/osm/map-stylizer/default.nix
@@ -5,7 +5,7 @@ python3Packages,
qt5,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "map-stylizer";
version = "0-unstable-2020-06-30";
format = "other";
@@ -42,7 +42,7 @@ '';
meta = {
description = "GUI written in Python to parse OSM (OpenStreetMap) files and render them onscreen";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/osm/memphis/default.nix b/pkgs/osm/memphis/default.nix
index 8dc4cd9adc5eeee5bdac0b54bd670b682e5eddee..10dc54e3082ae2b0f75281fc7e07df8a98fe736f 100644
--- a/pkgs/osm/memphis/default.nix
+++ b/pkgs/osm/memphis/default.nix
@@ -35,7 +35,7 @@ ];
meta = {
description = "Map-rendering for OpenStreetMap";
license = lib.licenses.lgpl2Plus;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/osm/osm-python-tools/default.nix b/pkgs/osm/osm-python-tools/default.nix
index e9c3ff31f99c0c32595dbe15f0251118f18e3730..4c678dc1fd6de45df1b249c6f1e917b288f94bd9 100644
--- a/pkgs/osm/osm-python-tools/default.nix
+++ b/pkgs/osm/osm-python-tools/default.nix
@@ -21,7 +21,7 @@ substituteInPlace setup.py \
--replace-fail "'pytest" "#'pytest" \
'';
beautifulsoup4
geojson
lxml
@@ -43,7 +43,7 @@ ];
meta = {
description = "A library to access OpenStreetMap related services";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/osm/osm-tags-transform/default.nix b/pkgs/osm/osm-tags-transform/default.nix
index ccf4fc24532bc400f34f168bab4cb0ed242b3876..4fe9c1bde49242b0b8ff91a0a55bec72a37ed808 100644
--- a/pkgs/osm/osm-tags-transform/default.nix
+++ b/pkgs/osm/osm-tags-transform/default.nix
@@ -39,7 +39,7 @@ doCheck = true;
meta = {
description = "Transform tags in OSM files using Lua code";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/osm/osm2geojson/default.nix b/pkgs/osm/osm2geojson/default.nix
index 7a61c4bc2f4f4d8b2a889098a04f97cd0a0e43fe..b1b588130110253046071d46761aa6ec01bf534d 100644
--- a/pkgs/osm/osm2geojson/default.nix
+++ b/pkgs/osm/osm2geojson/default.nix
@@ -4,7 +4,7 @@ fetchFromGitHub,
python3Packages,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "osm2geojson";
version = "0.1.33";
@@ -16,7 +16,7 @@ hash = "sha256-9+xB/fd97HtnzdkJ2BawVW9AqDyArWUv6H1SZ7a8gkw=";
fetchSubmodules = true;
};
shapely
requests
];
@@ -25,7 +25,7 @@ doCheck = false;
meta = {
description = "Convert OSM and Overpass JSON to GeoJSON";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/osm/osmdbt/default.nix b/pkgs/osm/osmdbt/default.nix
index 02615dfca31df0ee406fcf0a5d8428f89de02986..45a026ab9ae5eb6a2388f02174b37419f958ad1a 100644
--- a/pkgs/osm/osmdbt/default.nix
+++ b/pkgs/osm/osmdbt/default.nix
@@ -45,7 +45,7 @@ cmakeFlags = [ (lib.cmakeBool "BUILD_PLUGIN" false) ];
meta = {
description = "OSM Database Replication Tools";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/osm/osmwalkthrough/default.nix b/pkgs/osm/osmwalkthrough/default.nix
index c6827a4e5478e7d47b30f8d2b0c7733a866c1823..61254e4afe260d32df8f223e5da5d82831d00113 100644
--- a/pkgs/osm/osmwalkthrough/default.nix
+++ b/pkgs/osm/osmwalkthrough/default.nix
@@ -4,7 +4,7 @@ fetchFromGitHub,
python3Packages,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "osmwalkthrough";
version = "0-unstable-2021-09-24";
format = "other";
@@ -40,7 +40,7 @@ '';
meta = {
description = "Draw ways you want to walk through";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/osm/overpassforge/default.nix b/pkgs/osm/overpassforge/default.nix
index ea742b788628800b628cad0f4d3f60ee820ab821..2f3395aff9115d6329bfc06b5d9d4eb8b441449f 100644
--- a/pkgs/osm/overpassforge/default.nix
+++ b/pkgs/osm/overpassforge/default.nix
@@ -26,7 +26,7 @@ pythonImportsCheck = [ "overpassforge" ];
meta = {
description = "A library for generating OpenStreetMap's Overpass QL queries from Python objects";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/osm/phyghtmap/default.nix b/pkgs/osm/phyghtmap/default.nix
index 3238b4043cf04db96dcab7c7874598153f8c274b..88649748e4a8fbc1cf9a0e95633d03778bc862d2 100644
--- a/pkgs/osm/phyghtmap/default.nix
+++ b/pkgs/osm/phyghtmap/default.nix
@@ -21,7 +21,7 @@ '';
nativeBuildInputs = [ installShellFiles ];
beautifulsoup4
lxml
matplotlib
diff --git a/pkgs/osm/planetiler/default.nix b/pkgs/osm/planetiler/default.nix
index eab148a29f62eb6eae88c113971c544a0be0e33f..93deb463d721e90c047318abc6d09edff40e08d2 100644
--- a/pkgs/osm/planetiler/default.nix
+++ b/pkgs/osm/planetiler/default.nix
@@ -35,7 +35,7 @@ '';
meta = {
description = "Flexible tool to build planet-scale vector tilesets from OpenStreetMap data";
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.sikmir ];
diff --git a/pkgs/osm/polytiles/default.nix b/pkgs/osm/polytiles/default.nix
index ac26bd7b516db81eed9874fea9b602756ab78175..55fbc98373e2d686cd49936f14fa8a286ceae3e2 100644
--- a/pkgs/osm/polytiles/default.nix
+++ b/pkgs/osm/polytiles/default.nix
@@ -5,9 +5,9 @@ python3Packages,
sqlite,
}:
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
pname = "polytiles";
src = fetchFromGitHub {
owner = "Zverik";
@@ -16,7 +16,7 @@ rev = "c0a057594de9041c7b3ac234a3590101e3825f2d";
hash = "sha256-7rsMx8sQgl8cRiUncP3/mPne6ARj3K2FICU+frUeEUs=";
};
psycopg2
python-mapnik
shapely
@@ -25,7 +25,7 @@ ];
meta = {
description = "A script to render tiles for an area with mapnik";
license = lib.licenses.wtfpl;
maintainers = [ lib.maintainers.sikmir ];
broken = true; # python-mapnik
diff --git a/pkgs/osm/prettymapp/default.nix b/pkgs/osm/prettymapp/default.nix
index 3bad533f27c521cfe64e16f1468bb9ccb707ff99..6ca8f012f62cf402a479b2a18aca31a0322efbf6 100644
--- a/pkgs/osm/prettymapp/default.nix
+++ b/pkgs/osm/prettymapp/default.nix
@@ -18,7 +18,7 @@ };
postPatch = "sed -i 's/==.*//' requirements.txt";
nativeCheckInputs = with python3Packages; [
pytestCheckHook
@@ -34,7 +34,7 @@ ];
meta = {
description = "Create beautiful maps from OpenStreetMap data in a webapp";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/osm/pyrobuf/default.nix b/pkgs/osm/pyrobuf/default.nix
index 2d4092343429718d4699465446b7d02d26fe07c0..d4ce204920f25e9ca647e3f2df54e5bc18d9b3af 100644
--- a/pkgs/osm/pyrobuf/default.nix
+++ b/pkgs/osm/pyrobuf/default.nix
@@ -4,7 +4,7 @@ python3Packages,
fetchFromGitHub,
}:
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonPackage {
pname = "pyrobuf";
version = "0.9.3";
@@ -20,7 +20,7 @@ cython
pytest-runner
];
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
@@ -28,7 +28,7 @@ doCheck = false;
meta = {
description = "A Cython based protobuf compiler";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/osm/pyrosm/default.nix b/pkgs/osm/pyrosm/default.nix
index 86979877ff48eb7d8e41f2839c234beeaeb3a1ed..596d11dfff19493e5f1fbd13f169350dd1169463 100644
--- a/pkgs/osm/pyrosm/default.nix
+++ b/pkgs/osm/pyrosm/default.nix
@@ -20,7 +20,7 @@ };
nativeBuildInputs = with python3Packages; [ cython ];
python-rapidjson
geopandas
shapely
@@ -36,7 +36,7 @@ pythonImportsCheck = [ "pyrosm" ];
meta = {
description = "A Python tool to parse OSM data from Protobuf format into GeoDataFrame";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/osm/sdlmap/default.nix b/pkgs/osm/sdlmap/default.nix
index 7df52ba92e51fe4399a4ff2a58ec6f7aa67fa826..15f9054dcd589c60edcd3f0ccf80fcd44d00aa26 100644
--- a/pkgs/osm/sdlmap/default.nix
+++ b/pkgs/osm/sdlmap/default.nix
@@ -8,7 +8,7 @@ SDL2,
SDL2_image,
}:
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation {
pname = "sdlmap";
version = "2014-02-09";
@@ -36,9 +36,9 @@ installPhase = "install -Dm755 sdlmap -t $out/bin";
meta = {
description = "A SDL + libcurl OpenStreetMap viewer";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
};
-})
+}
diff --git a/pkgs/osm/smopy/default.nix b/pkgs/osm/smopy/default.nix
index 6770600e0a82b80fdc7bea1637e0a7efca14edf5..51813c0843b4d7a4136a9a98f70000aff752eb35 100644
--- a/pkgs/osm/smopy/default.nix
+++ b/pkgs/osm/smopy/default.nix
@@ -15,7 +15,7 @@ rev = "v${version}";
hash = "sha256-QytanQQPIlQTog2tTMAwdFXWbXnU4NaA7Zqh4DXFubY=";
};
numpy
ipython
pillow
@@ -26,7 +26,7 @@ pythonImportsCheck = [ "smopy" ];
meta = {
description = "OpenStreetMap image tiles in Python";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/osm/smrender/default.nix b/pkgs/osm/smrender/default.nix
index 14e894d1d6585bb5da470b277f3b946c8178c6ff..772b6a929188abdc53fa21122292f0fa994c48fd 100644
--- a/pkgs/osm/smrender/default.nix
+++ b/pkgs/osm/smrender/default.nix
@@ -6,7 +6,7 @@ autoreconfHook,
pkg-config,
cairo,
librsvg,
memstreamHook,
testers,
}:
@@ -33,7 +33,7 @@ cairo
librsvg
]
++ lib.optionals stdenv.isDarwin [
Foundation
darwin.apple_sdk.frameworks.Foundation
memstreamHook
];
@@ -44,7 +44,7 @@ };
meta = {
description = "A powerful, flexible, and modular rule-based rendering engine for OSM data";
license = lib.licenses.gpl3Only;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/osm/tilelog/default.nix b/pkgs/osm/tilelog/default.nix
index aa28a7b43bd601e69390a894889f7f5929ba8d0b..1f0231280457621441525b99e7d48367092d40b3 100644
--- a/pkgs/osm/tilelog/default.nix
+++ b/pkgs/osm/tilelog/default.nix
@@ -17,7 +17,7 @@ };
nativeBuildInputs = with python3Packages; [ flake8 ];
click
publicsuffixlist
pyathena
@@ -28,7 +28,7 @@ doCheck = false;
meta = {
description = "Tilelog is used to generate tile logs for the OSMF Standard map layer";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
};
diff --git a/pkgs/radio/acarsdec/default.nix b/pkgs/radio/acarsdec/default.nix
index 49f24f2f03a3075585ccb3685ffcc90f2636db92..4e5c96cffbbd58ac559a9635c41f220d9bf5db43 100644
--- a/pkgs/radio/acarsdec/default.nix
+++ b/pkgs/radio/acarsdec/default.nix
@@ -41,7 +41,7 @@ ];
meta = {
description = "ACARS SDR decoder";
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/radio/adsb_deku/default.nix b/pkgs/radio/adsb_deku/default.nix
index d761b73eb1035b5d429680e8c71b4bef49910cef..9e99e1b59d8522c25603deb63c60b19c2386f41c 100644
--- a/pkgs/radio/adsb_deku/default.nix
+++ b/pkgs/radio/adsb_deku/default.nix
@@ -20,7 +20,7 @@ cargoHash = "sha256-0ur+GNJna56eM99nwJHJJlAaP60lgXSTBFHZ9NHIau8=";
meta = {
description = "Rust ADS-B decoder + tui radar application";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/radio/ais-catcher/default.nix b/pkgs/radio/ais-catcher/default.nix
index 4cc34cd5abaa5d8528763b548b4972d52e9bdee7..3f95a7fa1172608b86ec24fec4c9f04ad412cb41 100644
--- a/pkgs/radio/ais-catcher/default.nix
+++ b/pkgs/radio/ais-catcher/default.nix
@@ -45,7 +45,7 @@ ];
meta = {
description = "A multi-platform AIS Receiver";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/radio/dumphfdl/default.nix b/pkgs/radio/dumphfdl/default.nix
index cf8727f0bc7de9c424025949c6eb026e99240aa7..fa5f103e9762ced3d2f0cf03d1d07730c1cbc7fb 100644
--- a/pkgs/radio/dumphfdl/default.nix
+++ b/pkgs/radio/dumphfdl/default.nix
@@ -43,7 +43,7 @@ ];
meta = {
description = "Multichannel HFDL decoder";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/radio/dumpvdl2/default.nix b/pkgs/radio/dumpvdl2/default.nix
index 3733a5210df37399889fa911b9e7262cb6dfe802..fcc600be3f9634d84436f3bbdbb1ec569636c48a 100644
--- a/pkgs/radio/dumpvdl2/default.nix
+++ b/pkgs/radio/dumpvdl2/default.nix
@@ -11,8 +11,7 @@ rtl-sdr,
soapysdr,
sqlite,
zeromq,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -42,13 +41,13 @@ sqlite
zeromq
]
++ lib.optionals stdenv.isDarwin [
AppKit
Foundation
darwin.apple_sdk.frameworks.AppKit
darwin.apple_sdk.frameworks.Foundation
];
meta = {
description = "VDL Mode 2 message decoder and protocol analyzer";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/radio/fmreceiver/default.nix b/pkgs/radio/fmreceiver/default.nix
index ef05f723b1729c3f38df432bf38515408dd60142..e59f0c29f45484904747f67214cde22890f29ba1 100644
--- a/pkgs/radio/fmreceiver/default.nix
+++ b/pkgs/radio/fmreceiver/default.nix
@@ -14,14 +14,14 @@ 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=";
};
@@ -81,9 +81,9 @@ '';
meta = {
description = "A simple FM receiver";
license = lib.licenses.gpl2Plus;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
};
-}
+})
diff --git a/pkgs/radio/goestools/default.nix b/pkgs/radio/goestools/default.nix
index 601b0b9ad370b942c39cbb540a718013db511d50..03003ecefc9ebecbe08ab459b9fa2f4c3f9b0997 100644
--- a/pkgs/radio/goestools/default.nix
+++ b/pkgs/radio/goestools/default.nix
@@ -9,7 +9,7 @@ rtl-sdr,
zlib,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "goestools";
version = "0-unstable-2024-02-10";
diff --git a/pkgs/radio/gqrx-scanner/default.nix b/pkgs/radio/gqrx-scanner/default.nix
index 8b0737d5741b3efd32a297aba423c6ff1c6ae7cb..162a02c8b57ef48225bbaf316fc6a88458537ce7 100644
--- a/pkgs/radio/gqrx-scanner/default.nix
+++ b/pkgs/radio/gqrx-scanner/default.nix
@@ -22,7 +22,7 @@ env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DOSX";
meta = {
description = "A frequency scanner for Gqrx Software Defined Radio receiver";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/radio/libacars/default.nix b/pkgs/radio/libacars/default.nix
index 58c4914c56fb8299a34c344afd1cb051631c4812..9c5a02655b95bfea35a967e6ca459afaaab84e8d 100644
--- a/pkgs/radio/libacars/default.nix
+++ b/pkgs/radio/libacars/default.nix
@@ -29,7 +29,7 @@ cmakeFlags = [ (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") ];
meta = {
description = "A library for decoding various ACARS message payloads";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/radio/radiolib/default.nix b/pkgs/radio/radiolib/default.nix
index 533654f5276fc6a1ae4351a25343d7774cb7a06f..851f56b5186a9388f51310a68435f551bb1984bc 100644
--- a/pkgs/radio/radiolib/default.nix
+++ b/pkgs/radio/radiolib/default.nix
@@ -21,7 +21,7 @@ nativeBuildInputs = [ cmake ];
meta = {
description = "Universal wireless communication library for embedded devices";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/radio/rtlsdr-airband/default.nix b/pkgs/radio/rtlsdr-airband/default.nix
index 9db2e9f90b6c6b75dfddad9a20387e4873379159..9e2b520ae09a40145c6a368f25a7ce67b267f770 100644
--- a/pkgs/radio/rtlsdr-airband/default.nix
+++ b/pkgs/radio/rtlsdr-airband/default.nix
@@ -43,7 +43,7 @@ cmakeFlags = [ (lib.cmakeBool "NFM" true) ];
meta = {
description = "Multichannel AM/NFM demodulator";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/radio/rtltcp/default.nix b/pkgs/radio/rtltcp/default.nix
index 4b8195d266bb34d5457525b7ffaef9e35afa6b1a..15cc72a3e886b90f999b7c694bfaf2fdd04c1df1 100644
--- a/pkgs/radio/rtltcp/default.nix
+++ b/pkgs/radio/rtltcp/default.nix
@@ -31,7 +31,7 @@ ];
meta = {
description = "A rust implementation of rtl-tcp";
license = with lib.licenses; [
asl20
mit
diff --git a/pkgs/radio/sdr-modem/default.nix b/pkgs/radio/sdr-modem/default.nix
index 25776a883ec21b1c2d027efe0c6f5d315f42a48d..dec60421f81238f74ed41a5c79cbd587e10fc295 100644
--- a/pkgs/radio/sdr-modem/default.nix
+++ b/pkgs/radio/sdr-modem/default.nix
@@ -42,7 +42,7 @@ '';
meta = {
description = "Modem based on software defined radios";
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/radio/sdr-server/default.nix b/pkgs/radio/sdr-server/default.nix
index 22ecd3ca90ab9236e9047a829966681a5f75adc8..55d519b4af79f91fbded17b725eb34b3ebb06924 100644
--- a/pkgs/radio/sdr-server/default.nix
+++ b/pkgs/radio/sdr-server/default.nix
@@ -42,7 +42,7 @@ '';
meta = {
description = "High performant TCP server for rtl-sdr";
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/radio/smallrx/default.nix b/pkgs/radio/smallrx/default.nix
index ceab2e80947d25130a1985eab898e7a74aedb1a9..afd37541745e972b0aeefd5254cd959f61ac22fd 100644
--- a/pkgs/radio/smallrx/default.nix
+++ b/pkgs/radio/smallrx/default.nix
@@ -24,7 +24,7 @@ installPhase = "install -Dm755 rx -t $out/bin";
meta = {
description = "amateur radio receiver in <100 code lines";
license = lib.licenses.agpl3Only;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/suckless/amused/default.nix b/pkgs/suckless/amused/default.nix
index e7fc5e57f6d6d0e61f62bfda708ae792b9dea0b1..e1dbadc25bd8145598725f6597d7c696ac077d91 100644
--- a/pkgs/suckless/amused/default.nix
+++ b/pkgs/suckless/amused/default.nix
@@ -41,7 +41,7 @@ ];
meta = {
description = "music player daemon NIH";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/suckless/chibicc/default.nix b/pkgs/suckless/chibicc/default.nix
index e793dd8bb8cd49e04d109257fa1ef29900f1cf3d..b7bf4f6a03dde97143020966a90bd0f0351433b3 100644
--- a/pkgs/suckless/chibicc/default.nix
+++ b/pkgs/suckless/chibicc/default.nix
@@ -24,7 +24,7 @@ '';
meta = {
description = "A small C compiler";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.sikmir ];
diff --git a/pkgs/suckless/cproc/default.nix b/pkgs/suckless/cproc/default.nix
index a7672d1c55694f3a7e1347f81b74ce90bd644d9c..767b833d7f8bdfcc5a04c3106549b217cd58a548 100644
--- a/pkgs/suckless/cproc/default.nix
+++ b/pkgs/suckless/cproc/default.nix
@@ -22,7 +22,7 @@ doCheck = true;
meta = {
description = "C11 compiler using QBE as a backend";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/suckless/dragon/default.nix b/pkgs/suckless/dragon/default.nix
index 6c18c4321d8e0dd5c003a7f6be44edb37358138a..ed7666cb3de9edcc7b36a6a5a948a5731bfd0f59 100644
--- a/pkgs/suckless/dragon/default.nix
+++ b/pkgs/suckless/dragon/default.nix
@@ -27,7 +27,7 @@ installFlags = [ "PREFIX=$(out)" ];
meta = {
description = "Drag and drop source/target for X";
license = lib.licenses.gpl3Plus;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/suckless/edit/default.nix b/pkgs/suckless/edit/default.nix
index 7b339d4865a19fd607833aba3f8e6be54c7ad37a..21759f6a371f05aea01a3fde90367227ef796ec5 100644
--- a/pkgs/suckless/edit/default.nix
+++ b/pkgs/suckless/edit/default.nix
@@ -23,7 +23,7 @@ ];
meta = {
description = "A suckless, simple, featured text editor";
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/suckless/ff-tools/default.nix b/pkgs/suckless/ff-tools/default.nix
index bdfbf5f45c55348d37c6021248f058359ff0faad..c1d7edc62cb2fb0647443831b339efe4b0652e41 100644
--- a/pkgs/suckless/ff-tools/default.nix
+++ b/pkgs/suckless/ff-tools/default.nix
@@ -23,7 +23,7 @@ preInstall = "mkdir -p $out/bin";
meta = {
description = "A collection of farbfeld tools";
license = lib.licenses.free;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/suckless/ffshot/default.nix b/pkgs/suckless/ffshot/default.nix
index f8a1ea3d496e317709551979276581d837b6e735..b1edc4d7f35c7550f066167471500aa800ed9457 100644
--- a/pkgs/suckless/ffshot/default.nix
+++ b/pkgs/suckless/ffshot/default.nix
@@ -25,7 +25,7 @@ installFlags = [ "PREFIX=$(out)" ];
meta = {
description = "farbfeld screenshot utility";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/suckless/imsg-compat/default.nix b/pkgs/suckless/imsg-compat/default.nix
index 5f01e5007570d360e85cb9cceab457a7694d0a07..9f20d9d0ed2da9458ad8dd7762e3fe4feb1265a1 100644
--- a/pkgs/suckless/imsg-compat/default.nix
+++ b/pkgs/suckless/imsg-compat/default.nix
@@ -17,8 +17,7 @@ hash = "sha256-t1nEdsqRtcXWBkkspUb/lQ0PXd2ziaTutnqgwSaxAR4=";
};
postPatch = ''
--subst-var-by LIBDIR "lib"
'';
nativeBuildInputs = [ validatePkgConfig ];
@@ -27,7 +26,7 @@ makeFlags = [ "PREFIX=$(out)" ];
meta = {
description = "Unofficial port of OpenBSD's imsg utilities";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/suckless/kilo/default.nix b/pkgs/suckless/kilo/default.nix
index e04b5a2f5fbc1122d8d3f75c074a7f462a10e0d5..75fc93a5a9bbcc0be56945b331ff0485fe11a868 100644
--- a/pkgs/suckless/kilo/default.nix
+++ b/pkgs/suckless/kilo/default.nix
@@ -16,12 +16,14 @@ hash = "sha256-6zPzaUzBQCIciuzBp4W6pT4bvhWbC8t6bSVec5LBRiU=";
};
installPhase = ''
install -Dm755 kilo -t $out/bin
'';
meta = {
description = "A text editor in less than 1000 LOC with syntax highlight and search";
license = lib.licenses.bsd2;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/suckless/lacc/default.nix b/pkgs/suckless/lacc/default.nix
index d6cbac50ada12923d68e35c15ba40907d0bcafac..9b27845c44b6756add9a827676222965b12001f8 100644
--- a/pkgs/suckless/lacc/default.nix
+++ b/pkgs/suckless/lacc/default.nix
@@ -23,7 +23,7 @@ checkTarget = "all";
meta = {
description = "A simple, self-hosting C compiler";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.sikmir ];
diff --git a/pkgs/suckless/lbm/default.nix b/pkgs/suckless/lbm/default.nix
index 0df9cb67d69ce9f3482532c7acb2b890539425cc..50c2112afb613a34b5dba85fbaae755fea821871 100644
--- a/pkgs/suckless/lbm/default.nix
+++ b/pkgs/suckless/lbm/default.nix
@@ -35,7 +35,7 @@ installFlags = [ "PREFIX=$(out)" ];
meta = {
description = "A simple Bluetooth manager";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/suckless/lchat/default.nix b/pkgs/suckless/lchat/default.nix
index 8a174a2037dc41c7b79be0ea45bafd3fef4102ee..c43687d5c57dcecd58ee9c772beb8ba2bf40a73e 100644
--- a/pkgs/suckless/lchat/default.nix
+++ b/pkgs/suckless/lchat/default.nix
@@ -26,7 +26,7 @@ preInstall = "mkdir -p $out/bin $out/man/man1";
meta = {
description = "line chat is a simple and elegant front end for ii-like chat programs";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/suckless/libst/default.nix b/pkgs/suckless/libst/default.nix
index 54c3e83534f69bf6955016a44f886a0daed4b365..47596b16eb69613586079ee3e6a320e24aac4f0b 100644
--- a/pkgs/suckless/libst/default.nix
+++ b/pkgs/suckless/libst/default.nix
@@ -42,7 +42,7 @@ '';
meta = {
description = "Suckless Terminal ANSI parser";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.sikmir ];
diff --git a/pkgs/suckless/libutf/default.nix b/pkgs/suckless/libutf/default.nix
index b665bdf67507c6954e8d776d89ba505e219d673d..0ba20a083a4543e434fdf46f8c95148ad99c41b7 100644
--- a/pkgs/suckless/libutf/default.nix
+++ b/pkgs/suckless/libutf/default.nix
@@ -23,7 +23,7 @@ installFlags = [ "PREFIX=$(out)" ];
meta = {
description = "Plan 9 compatible UTF-8 C library";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/suckless/mage/default.nix b/pkgs/suckless/mage/default.nix
index a8ca90ae7f919c8f12b51a7cce5638d096a8ba21..20e90d2d9bfa06ebc510d915b85731e3c60b23f0 100644
--- a/pkgs/suckless/mage/default.nix
+++ b/pkgs/suckless/mage/default.nix
@@ -34,7 +34,7 @@ installFlags = [ "PREFIX=$(out)" ];
meta = {
description = "iMAGE viewer";
license = lib.licenses.gpl2Only;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/suckless/makel/default.nix b/pkgs/suckless/makel/default.nix
index 834f1aa431e56ab5e9935c613e2140370070be3c..94a9fc9cafffcb16223ba3e57f463bde51582013 100644
--- a/pkgs/suckless/makel/default.nix
+++ b/pkgs/suckless/makel/default.nix
@@ -28,7 +28,7 @@ '';
meta = {
description = "Makefile linter";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/suckless/nextvi/default.nix b/pkgs/suckless/nextvi/default.nix
index aad8ba535012284caa761e9f78081947b51d58e4..e573d37e4db532f6df5483a53bbf2fa33c7ab1cf 100644
--- a/pkgs/suckless/nextvi/default.nix
+++ b/pkgs/suckless/nextvi/default.nix
@@ -22,12 +22,14 @@ runHook postBuild
'';
installPhase = ''
PREFIX=$out sh ./build.sh install
'';
meta = {
description = "Next version of neatvi (a small vi/ex editor)";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.sikmir ];
diff --git a/pkgs/suckless/pista/default.nix b/pkgs/suckless/pista/default.nix
index 4ed5d28fa7f0aac85ab3a68788505644e89498bd..f36f94c0dc2d66aec80851c15a45c8384568b7d8 100644
--- a/pkgs/suckless/pista/default.nix
+++ b/pkgs/suckless/pista/default.nix
@@ -24,7 +24,7 @@ '';
meta = {
description = "Piped status: the ii of status bars!";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
diff --git a/pkgs/suckless/saait/default.nix b/pkgs/suckless/saait/default.nix
index c2f2966490c8d9412252c10a3282719ab3c8cd46..f37593a19e0a6cbc6301fd9a7f5cd251e5921313 100644
--- a/pkgs/suckless/saait/default.nix
+++ b/pkgs/suckless/saait/default.nix
@@ -4,13 +4,13 @@ stdenv,
fetchgit,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "saait";
version = "0.8";
src = fetchgit {
url = "git://git.codemadness.org/saait";
hash = "sha256-W86JAYUsyvOWt/YTqXfqMA/CwQq7uVIV1F6+AeRB/8s=";
};
@@ -24,4 +24,4 @@ maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.linux;
skip.ci = stdenv.isDarwin;
};
-}
+})
diff --git a/pkgs/suckless/se/default.nix b/pkgs/suckless/se/default.nix
index 32323ed496b9744b451b853316248de4c81d998f..1331466d9773efc419642fa0028947e860b22ae3 100644
--- a/pkgs/suckless/se/default.nix
+++ b/pkgs/suckless/se/default.nix
@@ -23,7 +23,7 @@ buildInputs = [ ncurses ];
meta = {
description = "screen oriented version of the classic UNIX text editor ed";
license = lib.licenses.publicDomain;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.sikmir ];
diff --git a/pkgs/suckless/sthkd/default.nix b/pkgs/suckless/sthkd/default.nix
index 10fd70b51be3e6a4face8777022d1b1cd5dd3803..c055a4f4050808cec9fd16ff5b5d94cc3e0ccb5e 100644
--- a/pkgs/suckless/sthkd/default.nix
+++ b/pkgs/suckless/sthkd/default.nix
@@ -19,7 +19,7 @@ installFlags = [ "PREFIX=$(out)" ];
meta = {
description = "Simple Terminal Hotkey Daemon";
license = lib.licenses.isc;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.sikmir ];
diff --git a/pkgs/suckless/svtm/default.nix b/pkgs/suckless/svtm/default.nix
index d545b8c9be96a02e4b5bc2cb73af786e43f34dfe..547b47e29cb63f73aae39f3328d526d521246b77 100644
--- a/pkgs/suckless/svtm/default.nix
+++ b/pkgs/suckless/svtm/default.nix
@@ -42,7 +42,7 @@ '';
meta = {
description = "Simple Virtual Terminal Manager";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.sikmir ];
application/octet-streamThis content has been proxied by September (3851b).