commit 01f73dee2036bd61f73f54fd0f667690023e2488 parent 423e922b25201948cf8341159a48fa5e1989e785 Author: Nikolay Korotkiy <sikmir@disroot.org> Date: Sat, 26 Nov 2022 20:40:54 +0300 Up Diffstat:
133 files changed, 443 insertions(+), 443 deletions(-)
diff --git a/flake.lock b/flake.lock @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1668882784, - "narHash": "sha256-L1mHACWrG83j8U/jDtAdQHmVZu+JwVUxRPf5mhuzr2s=", + "lastModified": 1669443273, + "narHash": "sha256-/Ow9P6dWfkQF/9NKD7+OnMnz5DJr2pVCAUMjU9SwFoo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1b4a562216eba8df3053bd869155dde4b5bca12", + "rev": "6b86759692b80e2b563e7f6c608f753de4aad3a7", "type": "github" }, "original": { diff --git a/pkgs/darwin/amethyst/bin.nix b/pkgs/darwin/amethyst/bin.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchfromgh, unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "Amethyst-bin"; version = "0.16.0"; src = fetchfromgh { owner = "ianyh"; repo = "Amethyst"; - version = "v${version}"; + version = "v${finalAttrs.version}"; name = "Amethyst.zip"; hash = "sha256-pghX74T0JsAWkxAaAaQ5NIhYqj89fo0ZqRtxPThJZ/M="; }; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-darwin" ]; skip.ci = true; }; -} +}) diff --git a/pkgs/darwin/cudatext/bin.nix b/pkgs/darwin/cudatext/bin.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, undmg, cudatext }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cudatext-bin"; version = "1.176.0.0"; src = fetchurl { - url = "mirror://sourceforge/cudatext/cudatext-macos-cocoa-amd64-${version}.dmg"; + url = "mirror://sourceforge/cudatext/cudatext-macos-cocoa-amd64-${finalAttrs.version}.dmg"; hash = "sha256-w5hAxkqopNMzeIQFvCBn8+50CtOB15PGjtAzPBuL3MI="; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.sikmir ]; skip.ci = true; }; -} +}) diff --git a/pkgs/darwin/macpass/bin.nix b/pkgs/darwin/macpass/bin.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchfromgh, unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "MacPass-bin"; version = "0.8.1"; src = fetchfromgh { owner = "MacPass"; repo = "MacPass"; - name = "MacPass-${version}.zip"; + name = "MacPass-${finalAttrs.version}.zip"; hash = "sha256-LQ073JRbQsDB/nmx63Tllptfdo/8VqoobXPTSShzsXM="; - inherit version; + inherit (finalAttrs) version; }; sourceRoot = "."; @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-darwin" ]; skip.ci = true; }; -} +}) diff --git a/pkgs/darwin/marta/default.nix b/pkgs/darwin/marta/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, undmg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "marta-bin"; version = "0.8.1"; src = fetchurl { - url = "https://updates.marta.sh/release/Marta-${version}.dmg"; + url = "https://updates.marta.sh/release/Marta-${finalAttrs.version}.dmg"; hash = "sha256-DbNkvLCy6q0CN8b4+8oheM4EaaLAQvH3O5zWVYxEyh8="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-darwin" ]; skip.ci = true; }; -} +}) diff --git a/pkgs/data/dicts/it-sanasto/default.nix b/pkgs/data/dicts/it-sanasto/default.nix @@ -1,6 +1,6 @@ { lib, stdenvNoCC, fetchFromGitHub, dict, pandoc, stardict-tools }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "it-sanasto"; version = "2020-02-27"; @@ -25,10 +25,10 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "IT-alan englanti-suomi -sanasto"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.all; skip.ci = true; }; -} +}) diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix @@ -28,7 +28,7 @@ let in stdenvNoCC.mkDerivation rec { pname = "tatoeba"; - version = "2022-11-12"; + version = "2022-11-26"; srcs = lib.mapAttrsToList (name: spec: fetchurl spec) tatoeba; diff --git a/pkgs/data/dicts/tatoeba/tatoeba.json b/pkgs/data/dicts/tatoeba/tatoeba.json @@ -1,75 +1,75 @@ { "deu_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2", - "hash": "sha256-wqsuHS9MEdERX9A9S/9goFqeTDX0mR2V9ul+MzsUiqk=" + "hash": "sha256-PKWbcFcmKmACAFOMOjK/fLEbmC+1pcI7Aph5Cvxl/mI=" }, "eng_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2", - "hash": "sha256-mAsvQCwnbTPZfnL7wd4u/xI24ol9RSBc71fIiO6cXJU=" + "hash": "sha256-Etl9wLga+wtx3t51dIzrDAT62ROTao59Iba4B2DCl/A=" }, "epo_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2", - "hash": "sha256-A3TGbxbWToxgI/U93ISP9G/EWj8skBSXSDJIW6B6j/Y=" + "hash": "sha256-yBhIF4atIAxAwLIkikybx0Q92eMgfc4lVpNcUaEGdNU=" }, "fin_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2", - "hash": "sha256-e0vXRz+VVRdzLEh70+LCwnYVTvoXz3GLbMzjpoJ8wkg=" + "hash": "sha256-8AYG1NI7MCHLPYMtJeQW+o2sXNECgvlPvz7rc+iUqz4=" }, "rus_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2", - "hash": "sha256-9YAA2vDQsYoy3QXkX5g2njRCFlTzwm3JRICeARR1d+I=" + "hash": "sha256-jiUw8WknwiKvINl6BC2oOmhg+2tZMI44g0tUEBdiGeg=" }, "swe_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2", - "hash": "sha256-SYRMQt2VVtGEJW745FKZWqpMtCywL7Jln5ji2qt+4tw=" + "hash": "sha256-qVbyqboGXsBhb7/1Po/42DYYOJjkT2MeRyR8o/k40wo=" }, "ukr_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2", - "hash": "sha256-h7T0a59OQnDiNIqkUf1+qW5xCVXXTbCXX13kGU/w4eA=" + "hash": "sha256-+HIyz5yUtdwx4JXZhMXXGdFc5lACrHpydy8zOo6jL+I=" }, "deu-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2", - "hash": "sha256-bmosKzpho3c3Nh5LTUObMH3UE057JkQUsKGR0GFhnM0=" + "hash": "sha256-Au3S+ufvFjAOEjI+ghRXlI4c+hLw+EeUfsWjE81hFHM=" }, "deu-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2", - "hash": "sha256-fmEVHfL+ZZSqyGfgOEWAfGMgvt157S+WPvnzG5jiiDM=" + "hash": "sha256-TQ1ugyAu/xDJD8/GqOi/sOvas982HFaSf0FD7g0+BiE=" }, "eng-epo_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2", - "hash": "sha256-3bIhnobuO+g/sjKmUAOn6e8C5yJBZL5ZxKA0IeK2/T4=" + "hash": "sha256-vlCAW32z4/uOl81y+R4DM3AXbaTz5IBf2zIBoxP0AZk=" }, "eng-deu_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2", - "hash": "sha256-HIviYbonMNj/j9p23L2rtzI8AF+8Xoag5FyX+dN5n+k=" + "hash": "sha256-1eiUBimEQO8BbzUp3qi5Kax15v31Ru5XKKnyFQeoNWw=" }, "eng-fin_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2", - "hash": "sha256-5HEA9la4oTEFvuVbsISuzX1xyAvW8vNFfzD5+ps2O1s=" + "hash": "sha256-SSwJV1Y4yPBPKJN7RFC9ocN82DPE4C/17vuHq04h1bQ=" }, "eng-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2", - "hash": "sha256-XX/aklGUAV3prB5qtpgMh2ackziN1Hv5tSbcq9WBJ3U=" + "hash": "sha256-jOp8VRRm0AqhMT9c32/nJlscgOxZpBSp/WR7ewTMACI=" }, "eng-swe_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2", - "hash": "sha256-TyR7P2wNlxDZs2nhJM+E3htzvuMGMzubY/JFk1SjYBA=" + "hash": "sha256-BVpjb04frldYGoNh4+WRE1HHZ2WkA4Km8sURkVek/xM=" }, "eng-ukr_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2", - "hash": "sha256-tcJmRzsbDMxz4oaZfvcgb8ue+0UqNCo+ZZb+hcZgq+o=" + "hash": "sha256-Zg/gymmlnz+VIWtn7Kgp4lCudYieELuHYkDUpcqmugk=" }, "epo-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2", - "hash": "sha256-swSXLPyAH8jke8PGPF56flXqChAQHfkrv94c/Rw1t8w=" + "hash": "sha256-FSm13LNddEs9OQF+JfscdGs9v8fY3lAlsFznH0ArxC4=" }, "epo-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2", - "hash": "sha256-zQkmuCbTT4Xqdy39slpAeXGyOrUd1zy9rzU7zXyNX5E=" + "hash": "sha256-fAq4NIiPg0fkoR/XwxNCoTMG4bqtOiuTJlrDSfFlVaI=" }, "fin-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2", - "hash": "sha256-mTz98VxALFye8antPJf6+/Cy9rMAUVTXrZax7lC7g50=" + "hash": "sha256-MZigTighKVYz7WsRCSyL7oJlujRTF1wUxk644TNlwD4=" }, "fin-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2", @@ -77,15 +77,15 @@ }, "rus-deu_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2", - "hash": "sha256-BKiR55ftsuJviRAsp/JEAM7vRc+XA6+tHIKLO6g8X7U=" + "hash": "sha256-dc+g/xx5n6xNiMYu0txr+Q1jDbNHMRHsIc5ApvMkrrg=" }, "rus-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2", - "hash": "sha256-gensTBm/ppKA43Nwq2aKnHKgEHv7ZzHTs06MCNXKzlI=" + "hash": "sha256-kgOBiE5L03t2NA2UyRxINTxGW8GLSY1BsRnaT3fXulU=" }, "rus-epo_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2", - "hash": "sha256-/t3vl6vH1O19y1TiGoJ645Rl/++dGvQ6qMF6Xd87b8E=" + "hash": "sha256-H++CoyhJBIkxNuctC2KvTmEqKa0r4N/rku42jj2q/9Y=" }, "rus-fin_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2", @@ -93,26 +93,26 @@ }, "rus-swe_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-swe_links.tsv.bz2", - "hash": "sha256-NyDqFEBYRg3g5VYFvapekJki0QPcqqDwf8XjHYigtUA=" + "hash": "sha256-Mt4hvvdfFVB6vm8uh2ktSrF6yzCvk7tfpCZNcamtT88=" }, "rus-ukr_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2", - "hash": "sha256-gwTNa27puXW4IWSnthvQRhUpQp6SxIf6uIuLsmhE5uk=" + "hash": "sha256-/nmPsMKRMF3lSwso42w9diKC4uVID2sP8Ms0aI6OVyc=" }, "swe-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2", - "hash": "sha256-6dVmkkXGSLolGzO1KFJTpNSzeqKQhI40342PPjQyub4=" + "hash": "sha256-VrV1BX5R7XMMREn4sEJIY8qccYYAV7HYrhd5EmTK588=" }, "swe-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-rus_links.tsv.bz2", - "hash": "sha256-5d47lOmkHYllWAFaGb++L+jgKqcuLn3NPq3pLUJpeUQ=" + "hash": "sha256-Yzn/XNxqh44GwOKhG9rNCeN9sYuPOUzmmw9s6kfXHXU=" }, "ukr-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2", - "hash": "sha256-6UST8G05//j1v+fz5HD+dADp9vtMZpd3fp1hjpQQ2Z0=" + "hash": "sha256-uKKqv/Ayu4kegm6I/FDeD9enI0fjpDMH6TJjZScMCfc=" }, "ukr-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2", - "hash": "sha256-W6A2MqRqJUAcK4dXeYGRyi7UBP5pdZ7yJZFfc7UW8fE=" + "hash": "sha256-11ML+EJHNnQci4nu4SFyay1HnsVPg4Ar7gsIDDgYLuY=" } } diff --git a/pkgs/data/maps/mtk-suomi/default.nix b/pkgs/data/maps/mtk-suomi/default.nix @@ -1,11 +1,11 @@ { lib, stdenvNoCC, fetchurl }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "mtk-suomi"; version = "2022-03-15"; src = fetchurl { - url = "https://kartat-dl.hylly.org/${version}/mtk_suomi.img"; + url = "https://kartat-dl.hylly.org/${finalAttrs.version}/mtk_suomi.img"; hash = "sha256-s5pk+CvbrWQfC4SGQwGtDY8gg0K5ilZbYOC2lB+c7I8="; }; @@ -23,4 +23,4 @@ stdenvNoCC.mkDerivation rec { platforms = platforms.all; skip.ci = true; }; -} +}) diff --git a/pkgs/data/maps/opentopomap/default.nix b/pkgs/data/maps/opentopomap/default.nix @@ -9,7 +9,7 @@ let hash = "sha256-ntafRbfMMnHy2IlhqKE/DaMinsu9NaXA41HhXb6YVf4="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opentopomap"; inherit (osm-extracts) version; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { hash = "sha256-3fymFZHFnivdgIWaJiRK6bvIRIay4+AnN1ns67lvq5I="; }; - sourceRoot = "${src.name}/garmin"; + sourceRoot = "${finalAttrs.src.name}/garmin"; nativeBuildInputs = [ mkgmap mkgmap-splitter unzip ]; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; skip.ci = true; }; -} +}) diff --git a/pkgs/data/osm/overpassdb/default.nix b/pkgs/data/osm/overpassdb/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, osmctools, osm-3s, osm-extracts }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "overpassdb"; inherit (osm-extracts) version; diff --git a/pkgs/data/osm/routinodb/default.nix b/pkgs/data/osm/routinodb/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, routino, osm-extracts, prefix ? "Russia-NWFD" }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "routinodb"; inherit (osm-extracts) version; diff --git a/pkgs/data/themes/qtpbfimageplugin-styles/default.nix b/pkgs/data/themes/qtpbfimageplugin-styles/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qtpbfimageplugin-styles"; version = "2022-06-08"; @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "QtPBFImagePlugin styles"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.free; maintainers = [ maintainers.sikmir ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/default.nix b/pkgs/default.nix @@ -309,7 +309,6 @@ lib.makeScope newScope ( gsl-lite = callPackage ./misc/gsl-lite { }; how-to-use-pvs-studio-free = callPackage ./misc/pvs-studio/how-to-use-pvs-studio-free.nix { }; huami-token = callPackage ./misc/huami-token { }; - imsg-compat = callPackage ./misc/imsg-compat { }; ish = callPackage ./misc/ish { }; jenkins-cli = callPackage ./misc/jenkins-cli { }; lazyscraper = callPackage ./misc/lazyscraper { }; @@ -438,6 +437,7 @@ lib.makeScope newScope ( ffshot = callPackage ./suckless/ffshot { }; hurl = callPackage ./suckless/hurl { }; imscript = callPackage ./suckless/imscript { }; + imsg-compat = callPackage ./suckless/imsg-compat { }; kilo = callPackage ./suckless/kilo { }; lacc = callPackage ./suckless/lacc { }; lbm = callPackage ./suckless/lbm { }; diff --git a/pkgs/development/libraries/libshell/default.nix b/pkgs/development/libraries/libshell/default.nix @@ -9,14 +9,14 @@ , scdoc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libshell"; version = "0.4.9"; src = fetchFromGitHub { owner = "legionus"; repo = "libshell"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-BkKBmKzmL3O+BQi4VZm3agRLpQ8nIZ2ZhQBL40oeCy4="; }; @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library of shell functions"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.gpl2; maintainers = [ maintainers.sikmir ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/libraries/microjson/default.nix b/pkgs/development/libraries/microjson/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake, gtest }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "microjson"; version = "0.1.0"; src = fetchFromGitHub { owner = "semlanik"; repo = "microjson"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-6kGshpy0CDg/8z3unZvGs0Uh1gglZ7yrIGc9/X+M0i8="; }; @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tiny streaming json deserializer"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/embedded/chdk/default.nix b/pkgs/embedded/chdk/default.nix @@ -10,7 +10,7 @@ let optFI2 = fi2key != null && fi2iv != null; batchBuild = platform == null || platformsub == null; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "chdk"; inherit version; diff --git a/pkgs/embedded/embox/default.nix b/pkgs/embedded/embox/default.nix @@ -20,14 +20,14 @@ let (name: spec: fetchurl spec) (builtins.fromJSON (builtins.readFile ./third-party.json)); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "embox-${arch}-qemu"; version = "0.5.7"; src = fetchFromGitHub { owner = "embox"; repo = "embox"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-w0xK5NXrLIq47pHEyM+luFmJKFzz+NUgFN/xs1tjf9I="; }; @@ -100,4 +100,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; skip.ci = true; }; -} +}) diff --git a/pkgs/garmin/garminimg/default.nix b/pkgs/garmin/garminimg/default.nix @@ -1,6 +1,6 @@ { lib, mkDerivation, fetchFromGitHub, cmake, gdal, proj }: -mkDerivation rec { +mkDerivation (finalAttrs: { pname = "garminimg"; version = "2021-01-07"; @@ -30,9 +30,9 @@ mkDerivation rec { meta = with lib; { description = "Encode/decode a Garmin IMG file"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.gpl3Plus; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/garmin/gimgtools/default.nix b/pkgs/garmin/gimgtools/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, libiconv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gimgtools"; version = "2013-09-19"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Garmin Image Tools"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.free; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/garmin/imgdecode/default.nix b/pkgs/garmin/imgdecode/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imgdecode"; version = "1.1"; src = fetchurl { - url = "mirror://sourceforge/garmin-img/imgdecode-${version}.tar.gz"; + url = "mirror://sourceforge/garmin-img/imgdecode-${finalAttrs.version}.tar.gz"; hash = "sha256-VQC9o/QOti6jTCYi4ktH6UKZLPLwLOUAfosZftf+uWc="; }; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/garmin/openmtbmap/default.nix b/pkgs/garmin/openmtbmap/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, gmaptool, mkgmap, p7zip, zsh, substituteAll }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openmtbmap"; version = "2020-06-10"; @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux script to extract and compile garmin *.img map files from openmtbmap.org or openvelomap.org downloads"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.free; maintainers = [ maintainers.sikmir ]; platforms = platforms.all; skip.ci = true; }; -} +}) diff --git a/pkgs/gemini/geminid/default.nix b/pkgs/gemini/geminid/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, libconfig, file, openssl, flex }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "geminid"; version = "2021-04-11"; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Gemini Server in C"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.bsd3; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/gemini/gloggery/default.nix b/pkgs/gemini/gloggery/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, go }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gloggery"; version = "1.0"; src = fetchFromGitHub { owner = "kconner"; repo = "gloggery"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-tWTJXRtm/8cSEbK40fi9PVOg9w/qC0CBFZWyT7vSo80="; }; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Gemtext blog static site generator"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.free; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/gemini/gmi2html/default.nix b/pkgs/gemini/gmi2html/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, zig, scdoc, installShellFiles }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gmi2html"; version = "0.4.1"; src = fetchFromGitHub { owner = "shtanton"; repo = "gmi2html"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-5m3erToDFkYOV1xoM+BLWbUOgP0A7TXthzQ0Sk1Qj+U="; }; @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Translate text/gemini into HTML"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/86299 }; -} +}) diff --git a/pkgs/gemini/gplaces/default.nix b/pkgs/gemini/gplaces/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, pkg-config, curl, openssl, memstreamHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gplaces"; version = "0.16.30"; src = fetchFromGitHub { owner = "dimkr"; repo = "gplaces"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-W/tXwxJ4j7q3ka36TI7y/Psf9VHGXL/F2rNRGGkBKo0="; fetchSubmodules = true; }; @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple terminal based Gemini client"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.gpl3Plus; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/gemini/gurl/default.nix b/pkgs/gemini/gurl/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, zig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gurl"; version = "2021-03-06"; @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A curl-like cli application to interact with Gemini sites"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; broken = true; # https://github.com/MasterQ32/gurl/issues/5 }; -} +}) diff --git a/pkgs/gemini/stagit-gemini/milotier.nix b/pkgs/gemini/stagit-gemini/milotier.nix @@ -1,6 +1,6 @@ { lib, stdenv, libgit2, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "stagit-gemini"; version = "2022-07-08"; diff --git a/pkgs/gemini/stagit-gemini/sloum.nix b/pkgs/gemini/stagit-gemini/sloum.nix @@ -1,6 +1,6 @@ { lib, stdenv, libgit2, fetchFromGitea }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stagit-gemini"; version = "2020-01-18"; @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fork of stagit-gopher that ports the output to gemini"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/gemini/tom/default.nix b/pkgs/gemini/tom/default.nix @@ -2,7 +2,7 @@ , lua5_3, memstreamHook, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tom"; version = "2021-10-21"; @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Gemini frontend for git repositories"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.isc; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/geospatial/datamaps/default.nix b/pkgs/geospatial/datamaps/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, libpng, pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "datamaps"; version = "2014-08-19"; @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Indexes points and lines and generates map tiles to display them"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.bsd2; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/geospatial/deegree/default.nix b/pkgs/geospatial/deegree/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "deegree"; version = "3.4.31"; src = fetchurl { - url = "https://repo.deegree.org/content/repositories/public/org/deegree/deegree-webservices/${version}/deegree-webservices-${version}.war"; + url = "https://repo.deegree.org/content/repositories/public/org/deegree/deegree-webservices/${finalAttrs.version}/deegree-webservices-${finalAttrs.version}.war"; hash = "sha256-CUmn+bAyaUARlJuwVJ2AMRqj/fejVjHtYnbYCUAOeYQ="; }; @@ -23,4 +23,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ sikmir ]; skip.ci = true; }; -} +}) diff --git a/pkgs/geospatial/geowebcache/default.nix b/pkgs/geospatial/geowebcache/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, unzip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "geowebcache"; version = "1.21.0"; src = fetchurl { - url = "mirror://sourceforge/geowebcache/geowebcache/${version}/geowebcache-${version}-war.zip"; + url = "mirror://sourceforge/geowebcache/geowebcache/${finalAttrs.version}/geowebcache-${finalAttrs.version}-war.zip"; hash = "sha256-hiXXlBC6fNLR/+N18qPN5kzwsnbWMIE9kkEn2Y8qIVo="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ sikmir ]; skip.ci = true; }; -} +}) diff --git a/pkgs/geospatial/mapsoft/2.nix b/pkgs/geospatial/mapsoft/2.nix @@ -22,14 +22,14 @@ , wrapGAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mapsoft2"; version = "1.8"; src = fetchFromGitHub { owner = "slazav"; repo = "mapsoft2"; - rev = "${version}-alt1"; + rev = "${finalAttrs.version}-alt1"; hash = "sha256-RWY+rFVwPTZOyAZt1Bytcer4KiriGGfgke5s+qAydx8="; fetchSubmodules = true; }; @@ -92,4 +92,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; skip.ci = true; }; -} +}) diff --git a/pkgs/geospatial/mapsoft/default.nix b/pkgs/geospatial/mapsoft/default.nix @@ -30,7 +30,7 @@ , getopt }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mapsoft"; version = "20220624-alt1"; @@ -100,10 +100,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mapping software for linux"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.gpl3; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; skip.ci = true; }; -} +}) diff --git a/pkgs/geospatial/orbisgis/bin.nix b/pkgs/geospatial/orbisgis/bin.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchfromgh, unzip, rsync, makeWrapper, jre }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "orbisgis-bin"; version = "5.1.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "orbisgis"; repo = "orbisgis"; name = "orbisgis-bin.zip"; - version = "${version}-SNAPSHOT"; + version = "${finalAttrs.version}-SNAPSHOT"; hash = "sha256-e7SSn+P8rF5eSbl4Z/zp1mHNN2rAi4ZoMvkoy360hGM="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = jre.meta.platforms; skip.ci = true; }; -} +}) diff --git a/pkgs/geospatial/ossim/default.nix b/pkgs/geospatial/ossim/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake, geos, jsoncpp, libgeotiff, libjpeg, libtiff }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ossim"; version = "2.12.0"; src = fetchFromGitHub { owner = "ossimlabs"; repo = "ossim"; - rev = version; + rev = finalAttrs.version; hash = "sha256-zmyzHEhf/JPBBP7yJyxyKHkJH5psRSl3h8ZcOJ7dr7o="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/geospatial/polyvectorization/default.nix b/pkgs/geospatial/polyvectorization/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, mkDerivation, fetchFromGitHub, cmake, boost165, eigen, opencv2 }: -mkDerivation rec { +mkDerivation (finalAttrs: { pname = "polyvectorization"; version = "2019-08-23"; @@ -28,11 +28,11 @@ mkDerivation rec { meta = with lib; { description = "Reference implementation of Vectorization of Line Drawings via PolyVector Fields"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; mainProgram = "polyvector_thing"; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/geospatial/render_geojson/default.nix b/pkgs/geospatial/render_geojson/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30-gtk3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "render_geojson"; version = "2018-07-11"; @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ geoJSON and topoJSON parser and rendering using the WxWidgets GUI library"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.asl20; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/geospatial/sasplanet/bin.nix b/pkgs/geospatial/sasplanet/bin.nix @@ -21,12 +21,12 @@ let name = "Extremum.zip"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sasplanet-bin"; version = "201212"; src = fetchurl { - url = "http://www.sasgis.org/programs/sasplanet/SASPlanet_${version}.zip"; + url = "http://www.sasgis.org/programs/sasplanet/SASPlanet_${finalAttrs.version}.zip"; hash = "sha256-IHJjamzGMy/iSfvQmWU58rYE3AZToz+YB1cR6cp53Sg="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; skip.ci = true; }; -} +}) diff --git a/pkgs/geospatial/tile-stitch/default.nix b/pkgs/geospatial/tile-stitch/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, curl, libjpeg, libpng, libtiff, libgeotiff, pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tile-stitch"; version = "2019-07-11"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Stitch together and crop map tiles for a specified bounding box"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.bsd2; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/gnss/gps-sdr-sim/default.nix b/pkgs/gnss/gps-sdr-sim/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gps-sdr-sim"; version = "2022-01-14"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Software-Defined GPS Signal Simulator"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/gnss/gpstk/default.nix b/pkgs/gnss/gpstk/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gpstk"; version = "8.0.0"; src = fetchFromGitHub { owner = "SGL-UT"; repo = "GPSTk"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-kauRkx7KjVFdjl3JPiCxeuuVGVJ69e87RZQhepRrsWY="; }; @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Toolkit for developing GPS applications"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.lgpl3Plus; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/gnss/rtklib/default.nix b/pkgs/gnss/rtklib/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, gfortran }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rtklib"; version = "2.4.3-b34"; src = fetchFromGitHub { owner = "tomojitakasu"; repo = "rtklib"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-d9hpvmIdSZ3BervVZVvfRTc+q7wUWoWLF81TAsMGe68="; }; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/gnss/visualgps/default.nix b/pkgs/gnss/visualgps/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, qmake, qtserialport, wrapQtAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "visualgps"; version = "2020-03-29"; diff --git a/pkgs/gpx/geojson2dm/default.nix b/pkgs/gpx/geojson2dm/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromSourcehut }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "geojson2dm"; version = "2021-08-25"; diff --git a/pkgs/gpx/gps-whatsnew/default.nix b/pkgs/gpx/gps-whatsnew/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, boost, qt5 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gps-whatsnew"; version = "2017-01-23"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Compare gpx tracks to find new segments (places never traveled before)"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.gpl3Only; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/gpx/gpx-animator/default.nix b/pkgs/gpx/gpx-animator/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gpx-animator"; version = "1.7.0"; src = fetchurl { - url = "https://download.gpx-animator.app/gpx-animator-${version}-all.jar"; + url = "https://download.gpx-animator.app/gpx-animator-${finalAttrs.version}-all.jar"; hash = "sha256-SiYaHFMHKbEA8whio3MeCq8QZ6bQGWU4i/ok8I28TpA="; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -Dm644 $src $out/share/java/${src.name} makeWrapper ${jre}/bin/java $out/bin/gpx-animator \ - --add-flags "-jar $out/share/java/gpx-animator-${version}-all.jar" + --add-flags "-jar $out/share/java/gpx-animator-${finalAttrs.version}-all.jar" ''; meta = with lib; { @@ -31,4 +31,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.sikmir ]; platforms = jre.meta.platforms; }; -} +}) diff --git a/pkgs/gpx/gpx2yaml/default.nix b/pkgs/gpx/gpx2yaml/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromSourcehut }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gpx2yaml"; version = "2021-08-19"; diff --git a/pkgs/gpx/gpxeditor/default.nix b/pkgs/gpx/gpxeditor/default.nix @@ -5,12 +5,12 @@ let ${wine}/bin/wine @out@/GPX_Editor.exe ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gpxeditor"; version = "1.7.15"; src = fetchurl { - url = "mirror://sourceforge/gpxeditor/GPX%20Editor/Version%20${version}/GPX_Editor_${lib.replaceStrings [ "." ] [ "_" ] version}.zip"; + url = "mirror://sourceforge/gpxeditor/GPX%20Editor/Version%20${finalAttrs.version}/GPX_Editor_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}.zip"; hash = "sha256-laGJU8LHNNoUoVyHY2IaCXGpFmgOLSrWe/lCz5Tzjj4="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; skip.ci = true; }; -} +}) diff --git a/pkgs/gpx/gpxlib/default.nix b/pkgs/gpx/gpxlib/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, expat }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gpxlib"; version = "2021-02-16"; diff --git a/pkgs/linguistics/gdcv/default.nix b/pkgs/linguistics/gdcv/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, argp-standalone, emacs, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gdcv"; version = "2020-05-14"; @@ -37,10 +37,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GoldenDict console version and emacs dynamic module"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.gpl3Only; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/linguistics/gt-bash-client/default.nix b/pkgs/linguistics/gt-bash-client/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gt-bash-client"; version = "1.2"; src = fetchFromGitHub { owner = "OPHoperHPO"; repo = "GT-bash-client"; - rev = version; + rev = finalAttrs.version; hash = "sha256-dVtwuZsF9ExH6qadUO2MJiWmQ/elTKaVZAp+o3b6XUg="; }; @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Get translated text from your terminal! Console Google Translate Script (bash+curl+sed)"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.all; skip.ci = true; }; -} +}) diff --git a/pkgs/linguistics/hfst/default.nix b/pkgs/linguistics/hfst/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook , bison, flex, foma, pkg-config, icu, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hfst"; version = "3.16.0"; src = fetchFromGitHub { owner = "hfst"; repo = "hfst"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-2ST0s08Pcp+hTn7rUTgPE1QkH6PPWtiuFezXV3QW0kU="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/linguistics/i18n-editor/default.nix b/pkgs/linguistics/i18n-editor/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchfromgh, unzip, jre, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "i18n-editor-bin"; version = "2.0.0-beta.1"; src = fetchfromgh { owner = "jcbvm"; repo = "i18n-editor"; - name = "i18n-editor-${version}.zip"; + name = "i18n-editor-${finalAttrs.version}.zip"; hash = "sha256-koJdCmcM9mH4D4JSyyi0i/zRCUeI6pYdMmS7SaC56aY="; inherit version; }; @@ -28,10 +28,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GUI for editing your i18n translation files"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = jre.meta.platforms; }; -} +}) diff --git a/pkgs/linguistics/redict/default.nix b/pkgs/linguistics/redict/default.nix @@ -15,7 +15,7 @@ , withI18n ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "redict"; version = "2019-06-21"; @@ -50,10 +50,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A dictionary for Linux, based on C++/Qt development"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.gpl3; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/linguistics/stardict-tools/default.nix b/pkgs/linguistics/stardict-tools/default.nix @@ -11,7 +11,7 @@ , pcre }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stardict-tools"; version = "2021-04-05"; @@ -57,9 +57,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Stardict tools"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.gpl3Plus; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/misc/aamath/default.nix b/pkgs/misc/aamath/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchwebarchive, fetchpatch, readline, ncurses, bison, flex, installShellFiles }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aamath"; version = "0.3"; src = fetchwebarchive { - url = "http://fuse.superglue.se/aamath/aamath-${version}.tar.gz"; + url = "http://fuse.superglue.se/aamath/aamath-${finalAttrs.version}.tar.gz"; timestamp = "20190303013301"; hash = "sha256-mEP0WIaV4s1Vzl2PWJIdTyVeDmXtlWnh3N3z9o93tjE="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/misc/ascii-dash/default.nix b/pkgs/misc/ascii-dash/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, cmake, unzip, ncurses5, SDL, SDL_mixer }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ascii-dash"; version = "1.2.1"; src = fetchurl { - url = "mirror://sourceforge/ascii-dash/ASCII-DASH-${version}.zip"; + url = "mirror://sourceforge/ascii-dash/ASCII-DASH-${finalAttrs.version}.zip"; hash = "sha256-MMkhsmWMtK606lWuuvtl2bq3ub9uWl24tqbCdnb8Da8="; }; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/misc/btpd/default.nix b/pkgs/misc/btpd/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "btpd"; version = "2020-04-07"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The BitTorrent Protocol Daemon"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.bsd2; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/misc/capture2text/default.nix b/pkgs/misc/capture2text/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, qmake, unzip, leptonica, tesseract4, wrapQtAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "capture2text"; version = "4.6.2"; src = fetchurl { - url = "mirror://sourceforge/capture2text/SourceCode/Capture2Text_v${version}/Capture2Text_v${version}_Source_Code.zip"; + url = "mirror://sourceforge/capture2text/SourceCode/Capture2Text_v${finalAttrs.version}/Capture2Text_v${finalAttrs.version}_Source_Code.zip"; hash = "sha256-FeQ5E2lW+QOcg6Qi1I75W4BkQmfDiZtJ7+U2K08Ji2U="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/misc/cfiles/default.nix b/pkgs/misc/cfiles/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, pkg-config, ncurses, w3m, ueberzug }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cfiles"; version = "1.8"; src = fetchFromGitHub { owner = "mananapr"; repo = "cfiles"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Y5OOA0GGnjl4614zicuS00Wz2x5lLzhEHVioNFADQto="; }; @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A ncurses file manager written in C with vim like keybindings"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/misc/csvquote/default.nix b/pkgs/misc/csvquote/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "csvquote"; version = "2018-05-28"; @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Enables common unix utlities like cut, awk, wc, head to work correctly with csv data containing delimiters and newlines"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/misc/csvtools/default.nix b/pkgs/misc/csvtools/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pcre, openssl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "csvtools"; version = "2019-08-03"; @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GNU-alike tools for parsing RFC 4180 CSVs at high speed"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/misc/dns-filter/default.nix b/pkgs/misc/dns-filter/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dns-filter"; version = "2021-04-14"; @@ -26,9 +26,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tiny DNS server with filtering requests"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.free; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/misc/docker-reg-tool/default.nix b/pkgs/misc/docker-reg-tool/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "docker-reg-tool"; version = "2021-02-15"; @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Docker registry cli tool, primarily for deleting images"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/misc/finalcut/default.nix b/pkgs/misc/finalcut/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, ncurses, pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "finalcut"; version = "0.8.0"; src = fetchFromGitHub { owner = "gansm"; repo = "finalcut"; - rev = version; + rev = finalAttrs.version; hash = "sha256-FaloxuRx9p9oMyuKyJhYZve/WyQoMSGTYwY6A2uE0F0="; }; @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A text-based widget toolkit"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.lgpl3Plus; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/misc/graphene/default.nix b/pkgs/misc/graphene/default.nix @@ -2,14 +2,14 @@ , db, libmicrohttpd, jansson, tcl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "graphene"; version = "2.10"; src = fetchFromGitHub { owner = "slazav"; repo = "graphene"; - rev = version; + rev = finalAttrs.version; hash = "sha256-F2C7Ni+D8hWap2szoTFEPMRcWKXpizFWzqqyaDLbrac="; fetchSubmodules = true; }; @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple time series database based on BerkleyDB"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.gpl3; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/misc/gsl-lite/default.nix b/pkgs/misc/gsl-lite/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake, doxygen, boost }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gsl-lite"; version = "0.40.0"; src = fetchFromGitHub { owner = "gsl-lite"; repo = "gsl-lite"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-80ksT8XFn2LLMr63gKGZD/0+FDLnAtFyMpuuSjtoBlk="; }; @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Guidelines Support Library for C++98, C++11 up"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/misc/imsg-compat/default.nix b/pkgs/misc/imsg-compat/default.nix @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, validatePkgConfig }: - -stdenv.mkDerivation rec { - pname = "imsg-compat"; - version = "6.8.2"; - - src = fetchFromGitHub { - owner = "bsd-ac"; - repo = "imsg-compat"; - rev = version; - hash = "sha256-TFwww3HnTuURVCSMWyaMfwjEWcgGQr1pyPkop6EoHIY="; - }; - - postPatch = '' - substituteInPlace libimsg.pc.in \ - --subst-var-by LIBDIR "lib" - ''; - - nativeBuildInputs = [ validatePkgConfig ]; - - makeFlags = [ "PREFIX=$(out)" ]; - - meta = with lib; { - description = "Unofficial port of OpenBSD's imsg utilities"; - inherit (src.meta) homepage; - license = licenses.isc; - maintainers = [ maintainers.sikmir ]; - platforms = platforms.linux; - skip.ci = stdenv.isDarwin; - }; -} diff --git a/pkgs/misc/ish/default.nix b/pkgs/misc/ish/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ish"; version = "0.2"; src = fetchurl { - url = "mirror://sourceforge/icmpshell/ish-v${version}.tar.gz"; + url = "mirror://sourceforge/icmpshell/ish-v${finalAttrs.version}.tar.gz"; hash = "sha256-C4vE8pWBay9RdL+q0PwzjaNMgqrTD8TyLTYkGwE9V4I="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/misc/libnbcompat/default.nix b/pkgs/misc/libnbcompat/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libnbcompat"; version = "1.0.1"; src = fetchFromGitHub { owner = "archiecobbs"; repo = "libnbcompat"; - rev = version; + rev = finalAttrs.version; hash = "sha256-DyBLEp5dNYSQgTzdQkGfLdCtX618EbnVy5FmL75BMdU="; }; @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Portable NetBSD-compatibility library"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.free; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/misc/nmtree/default.nix b/pkgs/misc/nmtree/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, libnbcompat }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nmtree"; version = "1.0.0"; src = fetchFromGitHub { owner = "archiecobbs"; repo = "nmtree"; - rev = version; + rev = finalAttrs.version; hash = "sha256-0NlrWnSi0Eyz9WlTX1OpU3dHpgZMOF0rtf9cY5mLDkc="; }; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "NetBSD's mtree(8) utility"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.free; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; skip.ci = true; }; -} +}) diff --git a/pkgs/misc/objlab/default.nix b/pkgs/misc/objlab/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, ghc_filesystem, glfw, libglvnd, libGLU }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "objlab"; version = "2019-11-23"; @@ -35,10 +35,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple wavefront .obj viewer"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/misc/ptunnel/default.nix b/pkgs/misc/ptunnel/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, libpcap }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ptunnel"; version = "0.72"; src = fetchurl { - url = "https://www.cs.uit.no/~daniels/PingTunnel/PingTunnel-${version}.tar.gz"; + url = "https://www.cs.uit.no/~daniels/PingTunnel/PingTunnel-${finalAttrs.version}.tar.gz"; hash = "sha256-sxj3qn2IkYtiadBUp+JvBPl9iHD0e9Sadsssmcc0B6Q="; }; @@ -21,4 +21,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/misc/pvs-studio/default.nix b/pkgs/misc/pvs-studio/default.nix @@ -8,12 +8,12 @@ let x86_64-darwin = "macos"; }.${system} or throwSystem; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pvs-studio"; version = "7.21.64848.262"; src = fetchurl { - url = "https://cdn.pvs-studio.com/pvs-studio-${version}-${suffix}.tgz"; + url = "https://cdn.pvs-studio.com/pvs-studio-${finalAttrs.version}-${suffix}.tgz"; hash = { x86_64-linux = "sha256-oOi7xQxv3I8hEnF62TSeA+ZIjIpabTN+ulMNImURECM="; x86_64-darwin = "sha256-BgONtKPE3Osd8g6ElebEyYUs9qFcuIU0HvsrdYSZEzc="; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "x86_64-darwin" ]; skip.ci = true; }; -} +}) diff --git a/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix b/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "how-to-use-pvs-studio-free"; version = "2.1"; src = fetchFromGitHub { owner = "viva64"; repo = "how-to-use-pvs-studio-free"; - rev = version; + rev = finalAttrs.version; hash = "sha256-aFqk0WsMylRQqvlb+M5IfDHVwMBuKNQpCiiGPrj+jEw="; }; @@ -32,4 +32,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/misc/qoiview/default.nix b/pkgs/misc/qoiview/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, xorg, libglvnd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qoiview"; version = "2021-12-22"; @@ -36,10 +36,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "QOI image viewer on top of the Sokol headers"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.free; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/misc/sdorfehs/default.nix b/pkgs/misc/sdorfehs/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, pkg-config, xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sdorfehs"; version = "1.1"; src = fetchFromGitHub { owner = "jcs"; repo = "sdorfehs"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-efid6lRa8CTD+xObbop68hti5WRJReyKW57AmN7DS90="; }; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tiling window manager"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.gpl2Plus; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/misc/serverpp/default.nix b/pkgs/misc/serverpp/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake, boost, gsl-lite }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "serverpp"; version = "0.2.0"; src = fetchFromGitHub { owner = "KazDragon"; repo = "serverpp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-z7aLE7RyRGwUCpnJr0NS6yXUBPtHTnd81JOI/tGHDo0="; }; @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A C++ library for basic network server handling"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/misc/tcvt/default.nix b/pkgs/misc/tcvt/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit, python3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tcvt"; version = "2021-01-22"; diff --git a/pkgs/misc/telnetpp/default.nix b/pkgs/misc/telnetpp/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake, doxygen, boost, gsl-lite, gtest, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "telnetpp"; version = "3.0.0"; src = fetchFromGitHub { owner = "KazDragon"; repo = "telnetpp"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-BfRu0dv2d7qwz2jTdaQczOQQBO3qmO1E754hWqxT66g="; }; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A C++ library for interacting with Telnet streams"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/misc/xfractint/default.nix b/pkgs/misc/xfractint/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, xlibsWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xfractint"; version = "20.04p16"; src = fetchurl { - url = "https://fractint.org/ftp/current/linux/xfractint-${version}.tar.gz"; + url = "https://fractint.org/ftp/current/linux/xfractint-${finalAttrs.version}.tar.gz"; hash = "sha256-TlQBz+wOb/odqzjjwXfhRFdyCWy+VUIAxRLt7qI8R60="; }; @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; skip.ci = true; }; -} +}) diff --git a/pkgs/osm/maperitive/bin.nix b/pkgs/osm/maperitive/bin.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, unzip, mono, gtk2, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "maperitive-bin"; version = "2.4.3"; src = fetchurl { - url = "http://maperitive.net/download/Maperitive-${version}.zip"; + url = "http://maperitive.net/download/Maperitive-${finalAttrs.version}.zip"; hash = "sha256-yhslRj4CjUY0kviQTI7z8LvSiWvjf7K8+tDMeA9zNEk="; }; @@ -30,4 +30,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; skip.ci = true; }; -} +}) diff --git a/pkgs/osm/memphis/default.nix b/pkgs/osm/memphis/default.nix @@ -2,14 +2,14 @@ , cairo, expat, glib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "memphis"; version = "0.2.3"; src = fetchFromGitHub { owner = "jiuka"; repo = "memphis"; - rev = version; + rev = finalAttrs.version; hash = "sha256-mBRu2EHEuoHz3scoVaYqAMBZXbG7XkKwdHe9O0gaDBk="; }; @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Map-rendering for OpenStreetMap"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.lgpl2Plus; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/osm/osm-3s/default.nix b/pkgs/osm/osm-3s/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, expat, lz4, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osm-3s"; version = "0.7.58.5"; src = fetchurl { - url = "http://dev.overpass-api.de/releases/osm-3s_v${version}.tar.gz"; + url = "http://dev.overpass-api.de/releases/osm-3s_v${finalAttrs.version}.tar.gz"; hash = "sha256-Ij2Qf5JLjDUzGMAKBM2KGXo3KpuPNdoOhfaIMTh48cY="; }; @@ -23,4 +23,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/osm/osm-area-tools/default.nix b/pkgs/osm/osm-area-tools/default.nix @@ -12,7 +12,7 @@ , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "osm-area-tools"; version = "2021-01-04"; diff --git a/pkgs/osm/osm-tags-transform/default.nix b/pkgs/osm/osm-tags-transform/default.nix @@ -2,7 +2,7 @@ , bzip2, expat, libosmium, lua, protozero, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osm-tags-transform"; version = "2022-02-19"; @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Transform tags in OSM files using Lua code"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.gpl3Plus; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/osm/osmcoastline/default.nix b/pkgs/osm/osmcoastline/default.nix @@ -12,14 +12,14 @@ , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osmcoastline"; version = "2.3.1"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmcoastline"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-z72xDag3CDik/zGhQjlmE/Yfz/KEwK/A1clyP3AY7Uo="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/osm/osmdbt/default.nix b/pkgs/osm/osmdbt/default.nix @@ -13,14 +13,14 @@ , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osmdbt"; version = "0.6"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "osmdbt"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-hXwWOOfvBrJqjMXsG/59J83PHwZqIKm+2B00QYoJD80="; }; @@ -41,9 +41,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "OSM Database Replication Tools"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.gpl3Plus; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/osm/osmium-surplus/default.nix b/pkgs/osm/osmium-surplus/default.nix @@ -13,7 +13,7 @@ , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "osmium-surplus"; version = "2022-08-28"; diff --git a/pkgs/osm/osmosis/default.nix b/pkgs/osm/osmosis/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchfromgh, jre }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osmosis"; version = "0.48.3"; src = fetchfromgh { owner = "openstreetmap"; repo = "osmosis"; - name = "osmosis-${version}.tgz"; + name = "osmosis-${finalAttrs.version}.tgz"; hash = "sha256-skxgFXjqTLDKiDAr5naP0GAr3obCVKDguQUTWB26Z/8="; - inherit version; + inherit (finalAttrs) version; }; sourceRoot = "."; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.sikmir ]; platforms = jre.meta.platforms; }; -} +}) diff --git a/pkgs/osm/planetiler/default.nix b/pkgs/osm/planetiler/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchfromgh, unzip, jre, makeWrapper }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "planetiler"; version = "0.5.0"; src = fetchfromgh { owner = "onthegomap"; repo = "planetiler"; - version = "v${version}"; + version = "v${finalAttrs.version}"; name = "planetiler.jar"; hash = "sha256-XwjY81F1E3MISxwqvSG7OMv2Y1fdKgLSaS01YfFttws="; }; @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Flexible tool to build planet-scale vector tilesets from OpenStreetMap data"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = [ maintainers.sikmir ]; platforms = jre.meta.platforms; skip.ci = true; }; -} +}) diff --git a/pkgs/osm/sdlmap/default.nix b/pkgs/osm/sdlmap/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, curl, SDL2, SDL2_image }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sdlmap"; version = "2014-02-09"; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A SDL + libcurl OpenStreetMap viewer"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.free; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/osm/taginfo-tools/default.nix b/pkgs/osm/taginfo-tools/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, bzip2, expat, gd, icu, libosmium, protozero, sqlite, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "taginfo-tools"; version = "2022-05-04"; diff --git a/pkgs/osm/tirex/default.nix b/pkgs/osm/tirex/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, cairo, mapnik, perl, perlPackages }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tirex"; version = "0.7.0"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "tirex"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-0QbPfCPBdNBbUiZ8Ppg2zao98+Ddl3l+yX6y1/J50rg="; }; @@ -54,5 +54,5 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/osm/vectiler/default.nix b/pkgs/osm/vectiler/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, curl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "vectiler"; version = "2021-06-30"; diff --git a/pkgs/radio/fmreceiver/default.nix b/pkgs/radio/fmreceiver/default.nix @@ -2,14 +2,14 @@ , portaudio, rtl-sdr, qmake, qwt, wrapQtAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fmreceiver"; version = "2.1"; src = fetchFromGitHub { owner = "JvanKatwijk"; repo = "sdr-j-fm"; - rev = version; + rev = finalAttrs.version; hash = "sha256-U0m9PIB+X+TBoz5FfXMvR/tZjkNIy7B613I7eLT5UIs="; }; @@ -51,9 +51,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple FM receiver"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.gpl2Plus; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/radio/gqrx-scanner/default.nix b/pkgs/radio/gqrx-scanner/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gqrx-scanner"; version = "1.0.2"; src = fetchFromGitHub { owner = "neural75"; repo = "gqrx-scanner"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-CHM1Q54ephZA4vNUPnaLCncgnfSiNeUq6u+X6PhhxD8="; }; @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A frequency scanner for Gqrx Software Defined Radio receiver"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/radio/linrad/default.nix b/pkgs/radio/linrad/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchsvn, cmake, nasm, libX11 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "linrad"; version = "2021-09-05"; diff --git a/pkgs/radio/rtlsdr-airband/default.nix b/pkgs/radio/rtlsdr-airband/default.nix @@ -2,14 +2,14 @@ , fftwFloat, lame, libconfig, libshout, pulseaudio, rtl-sdr, soapysdr }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rtlsdr-airband"; version = "4.0.1"; src = fetchFromGitHub { owner = "szpajder"; repo = "rtlsdr-airband"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-KWuhffRUaCRvJgJWOBbSkqKDXtBsZ8Gln0sIp7bZqw0="; }; @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Multichannel AM/NFM demodulator"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.gpl3Plus; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/radio/sigdigger/default.nix b/pkgs/radio/sigdigger/default.nix @@ -3,14 +3,14 @@ , sigutils, soapysdr, suscan, suwidgets, volk }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sigdigger"; version = "0.3.0"; src = fetchFromGitHub { owner = "BatchDrake"; repo = "SigDigger"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-dS+Fc0iQz7GIlGaR556Ur/EQh3Uzhqm9uBW42IuEqoE="; }; @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Qt-based digital signal analyzer, using Suscan core and Sigutils DSP library"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.gpl3Plus; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/radio/sigutils/default.nix b/pkgs/radio/sigutils/default.nix @@ -2,7 +2,7 @@ , fftwFloat, libsndfile, volk }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sigutils"; version = "2022-07-05"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Small signal processing utility library"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.gpl3Plus; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/radio/smallrx/default.nix b/pkgs/radio/smallrx/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "smallrx"; version = "2018-12-18"; @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "amateur radio receiver in <100 code lines"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.agpl3Only; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/radio/suscan/default.nix b/pkgs/radio/suscan/default.nix @@ -2,7 +2,7 @@ , fftwFloat, libsndfile, libxml2, sigutils, soapysdr, volk }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "suscan"; version = "2022-07-05"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Channel scanner based on sigutils library"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.gpl3Plus; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/radio/suwidgets/default.nix b/pkgs/radio/suwidgets/default.nix @@ -2,7 +2,7 @@ , fftw, sigutils }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "suwidgets"; version = "2022-04-03"; @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Sigutils-related widgets"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.gpl3Plus; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/suckless/amused/default.nix b/pkgs/suckless/amused/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, bmake, pkg-config, libbsd, imsg-compat, sndio, libevent, flac, mpg123, libvorbis, opusfile }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "amused"; version = "0.10"; src = fetchFromGitHub { owner = "omar-polo"; repo = "amused"; - rev = version; + rev = finalAttrs.version; hash = "sha256-A2f37oI3BT30bqRYgoWy4B1dvPeZBoE4F3lkmET0td8="; }; @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "music player daemon NIH"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.isc; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/suckless/blind/default.nix b/pkgs/suckless/blind/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "blind"; version = "1.1"; src = fetchurl { - url = "https://dl.suckless.org/tools/blind-${version}.tar.gz"; + url = "https://dl.suckless.org/tools/blind-${finalAttrs.version}.tar.gz"; hash = "sha256-JPkDzLXhGNdfONOuDYX+2Ql0n5eL/0f/aXPuG/3fzFo="; }; @@ -19,4 +19,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.sikmir ]; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/suckless/chibicc/default.nix b/pkgs/suckless/chibicc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, memstreamHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "chibicc"; version = "2020-12-07"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A small C compiler"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/suckless/cproc/default.nix b/pkgs/suckless/cproc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromSourcehut, qbe }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cproc"; version = "2022-08-05"; @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C11 compiler using QBE as a backend"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.isc; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/suckless/dragon/default.nix b/pkgs/suckless/dragon/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, pkg-config, gtk3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dragon"; version = "1.2.0"; src = fetchFromGitHub { owner = "mwh"; repo = "dragon"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-wqG6idlVvdN+sPwYgWu3UL0la5ssvymZibiak3KeV7M="; }; @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Drag and drop source/target for X"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.gpl3Plus; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/suckless/ff-tools/default.nix b/pkgs/suckless/ff-tools/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ff-tools"; version = "2019-06-08"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A collection of farbfeld tools"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.free; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/suckless/ffshot/default.nix b/pkgs/suckless/ffshot/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ffshot"; version = "2022-05-29"; @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "farbfeld screenshot utility"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.isc; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/suckless/hurl/default.nix b/pkgs/suckless/hurl/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchgit, libressl, libbsd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hurl"; version = "0.7"; src = fetchgit { url = "git://git.codemadness.org/hurl"; - rev = version; + rev = finalAttrs.version; hash = "sha256-OXzt5sc1sZesKY1YmeGc3zuo9GxMYfYDvovCSt/kIdE="; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/suckless/imscript/default.nix b/pkgs/suckless/imscript/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromSourcehut, installShellFiles , libpng, libjpeg, libtiff, libwebp, fftwFloat, libX11, gsl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imscript"; version = "2022-10-17"; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A collection of small and standalone utilities for image processing"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.agpl3; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/suckless/imsg-compat/default.nix b/pkgs/suckless/imsg-compat/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, validatePkgConfig }: + +stdenv.mkDerivation (finalAttrs: { + pname = "imsg-compat"; + version = "6.8.2"; + + src = fetchFromGitHub { + owner = "bsd-ac"; + repo = "imsg-compat"; + rev = finalAttrs.version; + hash = "sha256-TFwww3HnTuURVCSMWyaMfwjEWcgGQr1pyPkop6EoHIY="; + }; + + postPatch = '' + substituteInPlace libimsg.pc.in \ + --subst-var-by LIBDIR "lib" + ''; + + nativeBuildInputs = [ validatePkgConfig ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Unofficial port of OpenBSD's imsg utilities"; + inherit (finalAttrs.src.meta) homepage; + license = licenses.isc; + maintainers = [ maintainers.sikmir ]; + platforms = platforms.linux; + skip.ci = stdenv.isDarwin; + }; +}) diff --git a/pkgs/suckless/kilo/default.nix b/pkgs/suckless/kilo/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kilo"; version = "2020-07-05"; @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A text editor in less than 1000 LOC with syntax highlight and search"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.bsd2; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/suckless/lacc/default.nix b/pkgs/suckless/lacc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lacc"; version = "2022-05-21"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple, self-hosting C compiler"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/suckless/lbm/default.nix b/pkgs/suckless/lbm/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitLab, pkg-config, dbus, xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lbm"; version = "2022-03-13"; @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple Bluetooth manager"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/suckless/lchat/default.nix b/pkgs/suckless/lchat/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, libutf, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lchat"; version = "2022-09-07"; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "line chat is a simple and elegant front end for ii-like chat programs"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.isc; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/suckless/lel/default.nix b/pkgs/suckless/lel/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchgit, libX11, farbfeld, farbfeld-utils }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lel"; version = "0.2"; src = fetchgit { url = "git://git.codemadness.org/lel"; - rev = version; + rev = finalAttrs.version; hash = "sha256-p0lgzSgNyXUAMo/LXhbQZW8LRUGg+Iz+KEQiNYeaL7E="; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/suckless/libgrapheme/default.nix b/pkgs/suckless/libgrapheme/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libgrapheme"; version = "2.0.1"; diff --git a/pkgs/suckless/libst/default.nix b/pkgs/suckless/libst/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libst"; version = "2021-06-06"; @@ -37,10 +37,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Suckless Terminal ANSI parser"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.sikmir ]; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/suckless/libutf/default.nix b/pkgs/suckless/libutf/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, libutf, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libutf"; version = "2018-11-13"; @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Plan 9 compatible UTF-8 C library"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/suckless/mage/default.nix b/pkgs/suckless/mage/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fontconfig, imlib2, libXft, conf ? null }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mage"; version = "2022-08-28"; @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "iMAGE viewer"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.gpl2Only; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/suckless/makel/default.nix b/pkgs/suckless/makel/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, libgrapheme }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "makel"; version = "2022-01-24"; @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Makefile linter"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.isc; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/suckless/nextvi/default.nix b/pkgs/suckless/nextvi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nextvi"; version = "2022-09-05"; @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Next version of neatvi (a small vi/ex editor)"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/suckless/pista/default.nix b/pkgs/suckless/pista/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, libX11 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pista"; version = "0.2.0"; src = fetchFromGitHub { owner = "xandkar"; repo = "pista"; - rev = version; + rev = finalAttrs.version; hash = "sha256-lre6SIVyxCwEohLlvSfYs+JnHS1VXTbl3FlUNZ3TGy4="; }; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Piped status: the ii of status bars!"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.bsd3; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/suckless/sbase/default.nix b/pkgs/suckless/sbase/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "sbase"; version = "2021-09-11"; diff --git a/pkgs/suckless/scroll/default.nix b/pkgs/suckless/scroll/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchgit }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "scroll"; version = "0.1"; src = fetchgit { url = "git://git.suckless.org/scroll"; - rev = version; + rev = finalAttrs.version; hash = "sha256-dr1s1K13BigfGSFvfBuOOy+yhuAcN1fb/4AEZPj9C48="; }; @@ -19,4 +19,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/suckless/se/default.nix b/pkgs/suckless/se/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "se"; version = "3.0.1"; src = fetchFromGitHub { owner = "screen-editor"; repo = "se"; - rev = "se-${version}"; + rev = "se-${finalAttrs.version}"; hash = "sha256-2LyYZXaL/Q3G/StCUiY6MUXG55g2YQvkpoF/lcsifD8="; }; @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "screen oriented version of the classic UNIX text editor ed"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.publicDomain; platforms = platforms.unix; maintainers = [ maintainers.sikmir ]; }; -} +}) diff --git a/pkgs/suckless/sthkd/default.nix b/pkgs/suckless/sthkd/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sthkd"; version = "2020-11-15"; @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple Terminal Hotkey Daemon"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.isc; platforms = platforms.linux; maintainers = [ maintainers.sikmir ]; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/suckless/svtm/default.nix b/pkgs/suckless/svtm/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, abduco, sthkd, libst }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "svtm"; version = "2021-04-28"; @@ -28,10 +28,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple Virtual Terminal Manager"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.sikmir ]; skip.ci = stdenv.isDarwin; }; -} +})