commit e44a0d4da46d3a584143f261c44cdc7f561435e2 parent f6b26ba0ed9eba88a10db80aea45f9356fc6655e Author: Nikolay Korotkiy <sikmir@disroot.org> Date: Mon, 17 Jun 2024 02:14:03 +0400 Up Diffstat:
285 files changed, 683 insertions(+), 717 deletions(-)
diff --git 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 @@ -82,7 +82,7 @@ buildGoModule rec { meta = { description = "Client for container development"; - inherit (src.meta) homepage; + homepage = "https://github.com/runfinch/finch"; 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 @@ -3,7 +3,7 @@ stdenv, buildGoModule, fetchFromGitHub, - LocalAuthentication, + darwin, }: buildGoModule rec { @@ -21,13 +21,13 @@ buildGoModule rec { subPackages = [ "." ]; - buildInputs = [ LocalAuthentication ]; + buildInputs = [ darwin.apple_sdk.frameworks.LocalAuthentication ]; doCheck = false; meta = { description = "Custom GPG pinentry program for macOS that allows using Touch ID"; - inherit (src.meta) homepage; + homepage = "https://github.com/jorgelbg/pinentry-touchid"; 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 @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qtcreator-bin"; - version = "13.0.0"; + version = "14.0.0"; src = fetchfromgh { owner = "qt-creator"; repo = "qt-creator"; name = "qtcreator-macos-universal-${finalAttrs.version}.7z"; - hash = "sha256-iwLj/Hw7ktpudCdraMSv4p5fMEGjSA87Hv0FSFCgU/o="; + hash = "sha256-+I4HqyTRY/1GtTYJ+4kJpXbIOnm6zkaYrOFexWDVBDM="; version = "v${finalAttrs.version}"; }; diff --git a/pkgs/data/dicts/it-sanasto/default.nix b/pkgs/data/dicts/it-sanasto/default.nix @@ -7,7 +7,7 @@ stardict-tools, }: -stdenvNoCC.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation { pname = "it-sanasto"; version = "2020-02-27"; @@ -36,10 +36,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "IT-alan englanti-suomi -sanasto"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/TimoSalomaki/IT-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 @@ -45,7 +45,7 @@ let in stdenvNoCC.mkDerivation rec { pname = "tatoeba"; - version = "2024-06-08"; + version = "2024-06-15"; srcs = lib.mapAttrsToList (name: spec: fetchurl spec) tatoeba; diff --git a/pkgs/data/dicts/tatoeba/tatoeba.json b/pkgs/data/dicts/tatoeba/tatoeba.json @@ -5,35 +5,35 @@ }, "deu_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2", - "hash": "sha256-0EiQcN1rjaX1oSbjROxJ8xfGGZQpfWVXgdHV2aT5GJY=" + "hash": "sha256-OE2Ppml6mEvpxi6ohBJ26JdMigxmuLVb0A4BPSkc2oQ=" }, "eng_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2", - "hash": "sha256-WPgij3TJosxnKJ2EB9a06IzsEUtMe/3pQLF9jeXWVlk=" + "hash": "sha256-6ROlMuHRsXyYfdJgZ6KQWJGl8pehynur+7Ch2Mn7wb0=" }, "epo_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2", - "hash": "sha256-JuBncQD02pjxVQYDrKmCRXfdMWrw8UBqvo321O0/Rgs=" + "hash": "sha256-ZoG4J+gjPyM6hTUOrOp/cOW60A30ahD/3971miMkdDU=" }, "fin_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2", - "hash": "sha256-U8ncUopCeZNy/fo3JQ64gZ+v7Pw1pUuSVfLwp3RR/hw=" + "hash": "sha256-O2JtXJGR19KJm98X3DLqdXV3YSgDshRL+QBgu34CRvk=" }, "hye_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/hye/hye_sentences_detailed.tsv.bz2", - "hash": "sha256-Am3VjCYKeIuC1xQuIgFxegrvrl9davu6AKZwgMCA6Ws=" + "hash": "sha256-2whxynLTLClSv/DOwLwqNudDAKYZZQI1c+sgSVf6LmI=" }, "rus_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2", - "hash": "sha256-QoLd01sXpBNfimSQ0YQKcc7RYNyqpf7d9QDvVKckNac=" + "hash": "sha256-JTOW8Byo9Y64a5mOwLgcfxaMxg7ijGcIyuQQTsJEPvw=" }, "swe_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2", - "hash": "sha256-Q5gCPp4Iz9fqOOAjQ2p1W1TxfFkM1mu9XJXrUCM3fRc=" + "hash": "sha256-h5ba6eqS1QdRFamfYOQoCsDbMogoqdFpU8pnt2It4bk=" }, "ukr_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2", - "hash": "sha256-4odailKhQe/+OQgGtisCIW2Jw2QH1o4bOayZnXy2FdU=" + "hash": "sha256-NduhNRwFb2xvfePuyxQ6Xb2UnpsUcUH7FQBM9uyVINM=" }, "bel-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/bel/bel-eng_links.tsv.bz2", @@ -45,15 +45,15 @@ }, "deu-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2", - "hash": "sha256-5NT1bDrSfVRFWj2d4k/RPy3pomiEjecxWVctBc9rJ0E=" + "hash": "sha256-f09nR/0Vff9vTI6iHDomKzungEf2jGWjaT55Y2AHDnE=" }, "deu-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2", - "hash": "sha256-14CAKbkbTeBDPwivkEYLdML3ijBRYDHURVyIDdsh4IY=" + "hash": "sha256-Im/UV1Us4Yk5fJfHWsBZzoObjvATvp1OtbkPOvx+Kc8=" }, "eng-epo_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2", - "hash": "sha256-wm1ZdZbLK8mY4w4R9X2fRp56cipkbWAy0831M0zl4f8=" + "hash": "sha256-Rig+FuYM0nke7hN/mfdisQvXyRJv/hBPzWJ4BlZBhr0=" }, "eng-bel_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-bel_links.tsv.bz2", @@ -61,51 +61,51 @@ }, "eng-deu_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2", - "hash": "sha256-9nsU84uckIyBlRffauB3wnH0kHPRuG55Ke4M1KLW6Ew=" + "hash": "sha256-C980x1rrVdBNLCE+UExaFYi1hvLtig2x+ESGRMa+8i4=" }, "eng-fin_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2", - "hash": "sha256-VN4Na7Tz9EFyayeu741PFfQemxwlHgRfb735FpATO/M=" + "hash": "sha256-QDTeF8T+WuQmZgJoC7afEjlv1J4REeD1dNfvKcQPea8=" }, "eng-hye_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-hye_links.tsv.bz2", - "hash": "sha256-8VlN+Rl8M36FubbNLNgUIyknVJHSHcEspWbeKHMKjMs=" + "hash": "sha256-ki5u5QS+Q3oBoRvovQV9+GgEpUTLkJTrCMNbyrw9JJM=" }, "eng-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2", - "hash": "sha256-JHH0sNB4W2Fg5Sk0vglTk4wXZvtsMITa8BMTckth/ng=" + "hash": "sha256-afzgBoPe4y8hwMwJBbvjyMttgEmoUHK2Uj8fH7KHQPE=" }, "eng-swe_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2", - "hash": "sha256-0SWqy/JcLotAqHmf4bNM2Cn1SHL+7hZh1MeQbAnQYiU=" + "hash": "sha256-qBZfKnZfcyRjNZdbel7NUiMc/MGQrl8bbelON8F9PBM=" }, "eng-ukr_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2", - "hash": "sha256-nTdijfzaHHfUPiLF9ncgoBDAJDSUFQJohdR1FiD5jow=" + "hash": "sha256-FitM+ZMb/d+ih9AGQdKx0oe7IW2zkXMaBC1YwyC3BAM=" }, "epo-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2", - "hash": "sha256-DCOO5wVi6WseT7VGdLTrtx6fk+IbbP5DDwbe7CbRfnA=" + "hash": "sha256-UU60WQkaFZZtIuy96yDiQZv8ERYdU1HqVD+4ZSyXFv8=" }, "epo-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2", - "hash": "sha256-sdh2tjFUCWHKU3rk6gZaRd1/wRV6bA9n+cUG0kH/pjI=" + "hash": "sha256-I67MpHIFvls334TDsZoSau9NdgEUCvMfAY5MeKyLBBo=" }, "fin-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2", - "hash": "sha256-dVmYwvHjJ8oE823HtEUdKiJ8VfY4idooExuiA95tSAQ=" + "hash": "sha256-4m40AMqWO5afd6/SILuowSq8TnUqPQFI+R6u6EaeDHU=" }, "fin-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2", - "hash": "sha256-RutBOgw7uJQIZrnyGpSRfYTFjKtfVg422wibhj5A8o0=" + "hash": "sha256-kalk4lSV44Q0MIfYpUxWy8/pL6vh4OOL5NRvAnKaoI0=" }, "hye-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-eng_links.tsv.bz2", - "hash": "sha256-0kuBpQ0KA1V3bYWC4oHZ9OP8PqZS7bg8cvkVPFJXU/I=" + "hash": "sha256-65PSpvnThpkdqFbeR5UDWXdQ//TYi0GE7IIne6X52Zo=" }, "hye-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-rus_links.tsv.bz2", - "hash": "sha256-m+rHuq1IX9cNt1x695CB9wn19sc5rI0gtNXuhQcwW/U=" + "hash": "sha256-oj4T3mOi9gCv5oNWXkH5gK/27or/gHIEfUvZkfhHfQo=" }, "rus-bel_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-bel_links.tsv.bz2", @@ -113,23 +113,23 @@ }, "rus-deu_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2", - "hash": "sha256-QSdTba+8RhMuPbPtk4GB97QAUyOq1S8Oo7InSqV60s4=" + "hash": "sha256-xbrgnYDAm3cH3zJkMYTzRmbEr5UD8Fc1F5k/vY3qCC0=" }, "rus-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2", - "hash": "sha256-Xehc6jFSeYa+URQtkq71yqtbIBMPKNSVBHfPBQvHMyo=" + "hash": "sha256-D9BF3oMZBoFUadj0X6PuUTO1Pkqt8wgeHx7SXXPJfF4=" }, "rus-epo_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2", - "hash": "sha256-+8QkjgeB7U9fypjyoq5IWkD2uJ5AanM5+Cn7UFMZ/TQ=" + "hash": "sha256-7hTPXxAxTTccFY7Uu6nm+rabvkwo1TJjW/pgfCeRloY=" }, "rus-fin_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2", - "hash": "sha256-57H5bz/3lVjKI3RbdZA2HOaKXJtMdj6DIYeSqp1TOVo=" + "hash": "sha256-+Kfn6Ukp2uy2WxRyZ6kGzbrEpmghW82UG9tmw6dJzvM=" }, "rus-hye_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-hye_links.tsv.bz2", - "hash": "sha256-DzEPZtKifuPyrzgCnPd1jv+/hu7RZ1yh/rNZKCqnvkg=" + "hash": "sha256-zy7RnXn1NKV1eovGIpypvT9eflhrmjIDyW/MrZ4rIP0=" }, "rus-swe_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-swe_links.tsv.bz2", @@ -137,11 +137,11 @@ }, "rus-ukr_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2", - "hash": "sha256-V4rgtRkJNHSa+2xOU703rl4KSQed5SGENl16kr/P154=" + "hash": "sha256-8bZX5decLbcb2VPJdSUy7z22ueg8WC0JJoWdzuK3LXk=" }, "swe-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2", - "hash": "sha256-MPBIndiOLghndy14OZ9VJEAAg9Cg3BOjz1JjG50YywA=" + "hash": "sha256-I4oWaUMqBWCORd4KgK3FBt+s/BIJaOudtXU7RKu+kHo=" }, "swe-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-rus_links.tsv.bz2", @@ -149,10 +149,10 @@ }, "ukr-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2", - "hash": "sha256-lq0H8LL0+WSDUy7YdTPM2eyX8DUB8YiDM2h6CjaRJc4=" + "hash": "sha256-XJlO8Jbz/mAhNHPecJjMP8UGLLlvstaZUMKkVs4kaec=" }, "ukr-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2", - "hash": "sha256-Rq2bM5y7ldj5sGvI9IsiEQT6Ig3nqONyaNEHcGSuZSw=" + "hash": "sha256-tkk8ox0UL6YHb2R7tIu6psL438AknHUY8/b1QrlXkTM=" } } diff --git a/pkgs/data/themes/qtpbfimageplugin-styles/default.nix b/pkgs/data/themes/qtpbfimageplugin-styles/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "qtpbfimageplugin-styles"; version = "2022-06-08"; @@ -22,9 +22,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "QtPBFImagePlugin styles"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/tumic0/qtpbfimageplugin-styles"; license = lib.licenses.free; maintainers = [ lib.maintainers.sikmir ]; platforms = lib.platforms.all; }; -}) +} diff --git a/pkgs/default.nix b/pkgs/default.nix @@ -38,9 +38,7 @@ lib.makeScope newScope ( macpass = callPackage ./darwin/macpass { }; macsvg = callPackage ./darwin/macsvg { }; marta = callPackage ./darwin/marta { }; - pinentry-touchid = callPackage ./darwin/pinentry-touchid { - inherit (darwin.apple_sdk.frameworks) LocalAuthentication; - }; + pinentry-touchid = callPackage ./darwin/pinentry-touchid { }; 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 @@ lib.makeScope newScope ( agunua = callPackage ./gemini/agunua { }; astronaut = callPackage ./gemini/astronaut { }; comitium = callPackage ./gemini/comitium { }; - eva = callPackage ./gemini/eva { inherit (darwin.apple_sdk.frameworks) Security; }; + eva = callPackage ./gemini/eva { }; 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 { }; - gemserv = callPackage ./gemini/gemserv { inherit (darwin.apple_sdk.frameworks) Security; }; + gemserv = callPackage ./gemini/gemserv { }; gloggery = callPackage ./gemini/gloggery { }; - gmi2html = callPackage ./gemini/gmi2html { zig = pkgs.zig_0_9; }; + gmi2html = callPackage ./gemini/gmi2html { }; gmnhg = callPackage ./gemini/gmnhg { }; gmnigit = callPackage ./gemini/gmnigit { }; gplaces = callPackage ./gemini/gplaces { }; @@ -199,7 +197,7 @@ lib.makeScope newScope ( geowebcache = callPackage ./geospatial/geowebcache { }; go-pmtiles = callPackage ./geospatial/go-pmtiles { }; go-staticmaps = callPackage ./geospatial/go-staticmaps { }; - hecate = callPackage ./geospatial/hecate { inherit (darwin.apple_sdk.frameworks) Security; }; + hecate = callPackage ./geospatial/hecate { }; kealib = callPackage ./geospatial/kealib { }; localtileserver = callPackage ./geospatial/localtileserver { }; mapsoft = callPackage ./geospatial/mapsoft { proj = pkgs.proj_7; }; @@ -312,7 +310,7 @@ lib.makeScope newScope ( revtok = callPackage ./linguistics/revtok { }; stardict-tools = callPackage ./linguistics/stardict-tools { }; tatoebatools = callPackage ./linguistics/tatoebatools { }; - ttb = callPackage ./linguistics/ttb { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; }; + ttb = callPackage ./linguistics/ttb { }; wikitextprocessor = callPackage ./linguistics/wikitextprocessor { }; wiktextract = callPackage ./linguistics/wiktextract { }; wiktfinnish = callPackage ./linguistics/wiktfinnish { }; @@ -359,7 +357,7 @@ lib.makeScope newScope ( miband4 = callPackage ./misc/miband4 { }; mitzasql = callPackage ./misc/mitzasql { }; mjs = callPackage ./misc/mjs { }; - modbus-tools = callPackage ./misc/modbus-tools { inherit (darwin.apple_sdk.frameworks) IOKit; }; + modbus-tools = callPackage ./misc/modbus-tools { }; 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 @@ lib.makeScope newScope ( #worm = callPackage ./misc/worm { }; wptools = callPackage ./misc/wptools { }; xfractint = callPackage ./misc/xfractint { }; - xtr = callPackage ./misc/xtr { inherit (darwin.apple_sdk.frameworks) Foundation; }; + xtr = callPackage ./misc/xtr { }; youtimetrack = callPackage ./misc/youtimetrack { }; ### MQTT @@ -425,7 +423,7 @@ lib.makeScope newScope ( mqtt-to-influxdb = callPackage ./mqtt/mqtt-to-influxdb { }; mqtt-to-influxdb-forwarder = callPackage ./mqtt/mqtt-to-influxdb-forwarder { }; nanosdk = callPackage ./mqtt/nanosdk { }; - rumqtt = callPackage ./mqtt/rumqtt { inherit (darwin.apple_sdk.frameworks) Security; }; + rumqtt = callPackage ./mqtt/rumqtt { }; ### NAKARTE @@ -468,7 +466,7 @@ lib.makeScope newScope ( pyrosm = callPackage ./osm/pyrosm { }; sdlmap = callPackage ./osm/sdlmap { }; smopy = callPackage ./osm/smopy { }; - smrender = callPackage ./osm/smrender { inherit (darwin.apple_sdk.frameworks) Foundation; }; + smrender = callPackage ./osm/smrender { }; taginfo-tools = callPackage ./osm/taginfo-tools { }; tilelog = callPackage ./osm/tilelog { }; tirex = callPackage ./osm/tirex { }; @@ -481,9 +479,7 @@ lib.makeScope newScope ( ais-catcher = callPackage ./radio/ais-catcher { }; aprsc = callPackage ./radio/aprsc { }; dumphfdl = callPackage ./radio/dumphfdl { }; - dumpvdl2 = callPackage ./radio/dumpvdl2 { - inherit (darwin.apple_sdk.frameworks) AppKit Foundation; - }; + dumpvdl2 = callPackage ./radio/dumpvdl2 { }; 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 @@ -4,14 +4,14 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "iso15765-canbus"; version = "0-unstable-2024-01-17"; src = fetchFromGitHub { owner = "devcoons"; repo = "iso15765-canbus"; - rev = version; + rev = finalAttrs.version; hash = "sha256-KdVw8JhJsqa+n3ELnTojHV/37Wfb1A2a7fSbBsTkJgI="; }; @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { meta = { description = "Implementation of ISO15765-2 in C"; - inherit (src.meta) homepage; + homepage = "https://github.com/devcoons/iso15765-canbus"; 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 @@ -12,12 +12,12 @@ libsodium, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgnunetchat"; version = "0.3.1"; src = fetchurl { - url = "mirror://gnu/gnunet/libgnunetchat-${version}.tar.gz"; + url = "mirror://gnu/gnunet/libgnunetchat-${finalAttrs.version}.tar.gz"; hash = "sha256-IIyKQxaueFJQJ8+mt8Iz44S8FjZ/wIW7vFw/UYMzaA0="; }; @@ -48,9 +48,9 @@ stdenv.mkDerivation rec { meta = { description = "A client-side library for applications to utilize the Messenger service of GNUnet"; homepage = "https://www.gnunet.org/"; - changelog = "https://git.gnunet.org/libgnunetchat.git/tree/ChangeLog?h=v${version}"; + changelog = "https://git.gnunet.org/libgnunetchat.git/tree/ChangeLog?h=v${finalAttrs.version}"; 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 @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libshell"; - version = "0.4.11"; + version = "0.4.13"; src = fetchFromGitHub { owner = "legionus"; repo = "libshell"; rev = "v${finalAttrs.version}"; - hash = "sha256-ZUsCuian4FaSg4wa2fHbNiGnjvy5BpPveXX/5GihsQY="; + hash = "sha256-jolr55qNG3224IWRE9PueeRbO5RIhFmFiPe0g0wO9c4="; }; nativeBuildInputs = [ help2man ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { 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 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A library of shell functions"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/legionus/libshell"; 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 @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A C++ wrapper around Linux's socketcan featureset"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/SimonCahill/libsockcanpp"; 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 @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Tiny streaming json deserializer"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/semlanik/microjson"; 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 @@ -22,7 +22,7 @@ python3Packages.buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ geopy matplotlib mercantile diff --git a/pkgs/development/python-modules/curses-menu/default.nix b/pkgs/development/python-modules/curses-menu/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonPackage rec { build-system = with python3Packages; [ poetry-core ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ deprecated pexpect pyte @@ -33,7 +33,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "A simple console menu system using curses"; - inherit (src.meta) homepage; + homepage = "https://github.com/pmbarrett314/curses-menu"; 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 @@ -16,7 +16,7 @@ python3Packages.buildPythonPackage rec { hash = "sha256-MCyeFXtjOqnVarSUk7Z/+Y5oNhYLlxznjWHQOCgUOIc="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ geopandas matplotlib numpy @@ -29,7 +29,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "A package built to support working with spatial data using open source python"; - inherit (src.meta) homepage; + homepage = "https://github.com/earthlab/earthpy"; 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 @@ -16,7 +16,7 @@ python3Packages.buildPythonPackage rec { hash = "sha256-xqAsjuUMODZvkSMyGXpP1/FTyqNKPfa8l4Zr2CUHaDY="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ aiohttp cytoolz numpy diff --git a/pkgs/development/python-modules/gpxelevations/default.nix b/pkgs/development/python-modules/gpxelevations/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-/AGvFE74sJTnn70VklQp0MG+7dsooavAdSTyV2oJM+I="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ requests gpxpy ]; @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Geo elevation data parser for \"The Shuttle Radar Topography Mission\" data"; - inherit (src.meta) homepage; + homepage = "https://github.com/tkrajina/srtm.py"; 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 @@ -19,7 +19,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Python implementation of RFC 7464"; - inherit (src.meta) homepage; + homepage = "https://github.com/sgillies/jsonseq"; 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 @@ -15,11 +15,11 @@ python3Packages.buildPythonPackage rec { hash = "sha256-zikfVMFdlOJvuKVQGEsK03i58X6BGFsGWGrGOJZGC0g="; }; - propagatedBuildInputs = with python3Packages; [ pyserial ]; + dependencies = with python3Packages; [ pyserial ]; meta = { description = "Implementation of modbus protocol in python"; - inherit (src.meta) homepage; + homepage = "https://github.com/ljean/modbus-tk"; 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 @@ -15,11 +15,13 @@ python3Packages.buildPythonPackage rec { hash = "sha256-zKloFO7uCLkqgayxC11JRfMpNxIR+UkT/Xabb9AH8To="; }; - propagatedBuildInputs = with python3Packages; [ setuptools ]; + build-system = with python3Packages; [ setuptools ]; + + pythonImportsCheck = [ "portolan" ]; meta = { description = "Convert between compass points and degrees"; - inherit (src.meta) homepage; + homepage = "https://github.com/fitnr/portolan"; 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 @@ -5,7 +5,7 @@ fetchFromGitHub, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage { pname = "pyarrow_ops"; version = "0-unstable-2022-01-30"; pyproject = true; @@ -21,7 +21,7 @@ python3Packages.buildPythonPackage rec { nativeBuildInputs = with python3Packages; [ cython ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ numpy pyarrow ]; diff --git a/pkgs/development/python-modules/pymbtiles/default.nix b/pkgs/development/python-modules/pymbtiles/default.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage { pname = "pymbtiles"; version = "0.5.0-unstable-2021-02-16"; @@ -19,7 +19,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Python utilities for Mapbox mbtiles files"; - inherit (src.meta) homepage; + homepage = "https://github.com/consbio/pymbtiles"; 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 @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage { pname = "pytest-mp"; version = "2019-03-11"; @@ -24,7 +24,7 @@ python3Packages.buildPythonPackage rec { nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ pytest psutil ]; @@ -33,7 +33,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "A test batcher for multiprocessed Pytest runs"; - inherit (src.meta) homepage; + homepage = "https://github.com/ansible/pytest-mp"; 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 @@ -20,12 +20,12 @@ python3Packages.buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools-scm setuptools-declarative-requirements ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ psutil pytest-skip-markers pytest-subtests @@ -36,7 +36,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Pytest Shell Utilities"; - inherit (src.meta) homepage; + homepage = "https://github.com/saltstack/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 @@ -19,12 +19,12 @@ python3Packages.buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools-scm setuptools-declarative-requirements ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ attrs distro pytest @@ -34,7 +34,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "A Pytest plugin which implements a few useful skip markers"; - inherit (src.meta) homepage; + homepage = "https://github.com/saltstack/pytest-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 @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage { pname = "s2sphere"; version = "0.2.5"; @@ -15,7 +15,7 @@ python3Packages.buildPythonPackage rec { hash = "sha256-6hNIuyLTcGcXpLflw2ajCOjel0IaZSFRlPFi81Z5LUo="; }; - propagatedBuildInputs = with python3Packages; [ future ]; + dependencies = with python3Packages; [ future ]; doCheck = false; diff --git a/pkgs/garmin/garmin-uploader/default.nix b/pkgs/garmin/garmin-uploader/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-OHY4f+0jfxKXiwRJRdSarlb2H+lEt2EVoAAsD4aEc9o="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ requests six ]; @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Garmin Connect Python Uploader"; - inherit (src.meta) homepage; + homepage = "https://github.com/La0/garmin-uploader"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/garmin/garminimg/default.nix b/pkgs/garmin/garminimg/default.nix @@ -8,7 +8,7 @@ wrapQtAppsHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "garminimg"; version = "0-unstable-2021-01-07"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = { description = "Encode/decode a Garmin IMG file"; - inherit (src.meta) homepage; + homepage = "https://github.com/kiozen/GarminImg"; 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 @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Garmin Image Tools"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/wuyongzheng/gimgtools"; 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 @@ -9,7 +9,7 @@ substituteAll, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "openmtbmap"; version = "2020-06-10"; @@ -35,10 +35,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Linux script to extract and compile garmin *.img map files from openmtbmap.org or openvelomap.org downloads"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/btittelbach/openmtbmap_openvelomap_linux"; 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 @@ -20,7 +20,7 @@ YAML, }: -buildPerlPackage rec { +buildPerlPackage { pname = "osm2mp"; version = "0-unstable-2018-08-31"; @@ -76,7 +76,7 @@ buildPerlPackage rec { meta = { description = "Convert Openstreetmap data to MP format"; - inherit (src.meta) homepage; + homepage = "https://github.com/liosha/osm2mp"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.sikmir ]; mainProgram = "osm2mp"; diff --git a/pkgs/gemini/agunua/default.nix b/pkgs/gemini/agunua/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-sVZ4HrFH3bL6FHn8B43rsya3vggIuCXdx6rPh+LG7MA="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ pyopenssl pysocks netaddr @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Python library for the development of Gemini clients"; - inherit (src.meta) homepage; + homepage = "https://framagit.org/bortzmeyer/agunua"; license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gemini/astronaut/default.nix b/pkgs/gemini/astronaut/default.nix @@ -38,7 +38,7 @@ buildGoModule rec { meta = { description = "A Gemini browser for the terminal"; - inherit (src.meta) homepage; + homepage = "https://sr.ht/~adnano/astronaut"; license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gemini/eva/default.nix b/pkgs/gemini/eva/default.nix @@ -7,7 +7,7 @@ gtk4, openssl, wrapGAppsHook, - Security, + darwin, }: rustPlatform.buildRustPackage rec { @@ -33,11 +33,11 @@ rustPlatform.buildRustPackage rec { buildInputs = [ gtk4 openssl - ] ++ lib.optional stdenv.isDarwin Security; + ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameforks.Security; meta = { description = "Gemini protocol browser written in Rust using the gtk+ toolkit"; - inherit (src.meta) homepage; + homepage = "https://codeberg.org/jeang3nie/eva"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gemini/gelim/default.nix b/pkgs/gemini/gelim/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { meta = { description = "A minimalist line-mode smolnet client written in go"; - inherit (src.meta) homepage; + homepage = "https://sr.ht/~hedy/gelim/"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gemini/gemgen/default.nix b/pkgs/gemini/gemgen/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { meta = { description = "Markdown to Gemtext generator"; - inherit (src.meta) homepage; + homepage = "https://sr.ht/~kota/gemgen"; 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 @@ -1,12 +1,10 @@ { lib, - stdenv, buildGoModule, fetchFromSourcehut, - scdoc, }: -buildGoModule rec { +buildGoModule { pname = "gemini-ipfs-gateway"; version = "0-unstable-2023-10-19"; @@ -21,7 +19,7 @@ buildGoModule rec { meta = { description = "IPFS access over the Gemini protocol"; - inherit (src.meta) homepage; + homepage = "https://git.sr.ht/~hsanjuan/gemini-ipfs-gateway"; license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gemini/geminid/default.nix b/pkgs/gemini/geminid/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Gemini Server in C"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/jovoro/geminid"; 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 @@ -4,9 +4,9 @@ fetchFromSourcehut, }: -buildGoModule rec { +buildGoModule { pname = "gemreader"; - version = "2021-03-08"; + version = "0-unstable-2021-03-08"; src = fetchFromSourcehut { owner = "~sircmpwn"; @@ -19,7 +19,7 @@ buildGoModule rec { meta = { description = "Feed reader for the Geminispace"; - inherit (src.meta) homepage; + homepage = "https://git.sr.ht/~sircmpwn/gemreader"; license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gemini/gemserv/default.nix b/pkgs/gemini/gemserv/default.nix @@ -5,7 +5,7 @@ fetchFromSourcehut, pkg-config, openssl, - Security, + darwin, }: rustPlatform.buildRustPackage rec { @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; postInstall = '' install -Dm644 config.toml -t $out/share/gemserv @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "A gemini server written in rust"; - inherit (src.meta) homepage; + homepage = "https://git.sr.ht/~int80h/gemserv"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gemini/gloggery/default.nix b/pkgs/gemini/gloggery/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Gemtext blog static site generator"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/kconner/gloggery"; 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 @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gmi2html"; - version = "0.4.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "shtanton"; repo = "gmi2html"; rev = "v${finalAttrs.version}"; - hash = "sha256-5m3erToDFkYOV1xoM+BLWbUOgP0A7TXthzQ0Sk1Qj+U="; + hash = "sha256-J71QThRwV8lpGJndqVT+tsekO+CVU8piSpjAn9jwfDI="; }; nativeBuildInputs = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Translate text/gemini into HTML"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/shtanton/gmi2html"; 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 @@ -19,7 +19,7 @@ buildGoModule rec { meta = { description = "Hugo-to-Gemini Markdown converter"; - inherit (src.meta) homepage; + homepage = "https://github.com/tdemin/gmnhg"; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gemini/gmnigit/default.nix b/pkgs/gemini/gmnigit/default.nix @@ -4,7 +4,7 @@ fetchFromSourcehut, }: -buildGoModule rec { +buildGoModule { pname = "gmnigit"; version = "0-unstable-2022-01-10"; @@ -24,7 +24,7 @@ buildGoModule rec { meta = { description = "Static git gemini viewer"; - homepage = "https://git.sr.ht/~kornellapacz/gmnigit"; + homepage = "https://sr.ht/~kornellapacz/gmnigit"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; mainProgram = "gmnigit"; diff --git a/pkgs/gemini/gplaces/default.nix b/pkgs/gemini/gplaces/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A simple terminal based Gemini client"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/dimkr/gplaces"; 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 @@ -4,7 +4,7 @@ fetchFromSourcehut, }: -buildGoModule rec { +buildGoModule { pname = "gssg"; version = "0-unstable-2023-05-29"; @@ -19,7 +19,7 @@ buildGoModule rec { meta = { description = "A gemini static site generator"; - inherit (src.meta) homepage; + homepage = "https://git.sr.ht/~gsthnz/gssg"; license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.sikmir ]; mainProgram = "gssg"; diff --git a/pkgs/gemini/gurl/default.nix b/pkgs/gemini/gurl/default.nix @@ -7,14 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gurl"; - version = "2021-03-06"; + version = "0.1-unstable-2023-08-23"; src = fetchFromGitHub { - owner = "MasterQ32"; + owner = "ikskuh"; repo = "gurl"; - rev = "c6491a0760c125ca50d86860f77b544f729d8885"; - hash = "sha256-l7WasR1rdD6DV3JWDIGcUlVkypnIKLNoKaVbibdibQc="; - fetchSubmodules = true; + rev = "c1f2b106a73019a145c0f1548d02e0ea8d7a1a50"; + hash = "sha256-DMyON1+EAFcqnVI03bgk7iYOgGTLMEuCNbmWHp80K0k="; }; nativeBuildInputs = [ zig ]; @@ -30,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A curl-like cli application to interact with Gemini sites"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/ikskuh/gurl"; 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 @@ -4,7 +4,7 @@ fetchFromSourcehut, }: -buildGoModule rec { +buildGoModule { pname = "kineto"; version = "0-unstable-2021-11-04"; @@ -19,7 +19,7 @@ buildGoModule rec { meta = { description = "An HTTP to Gemini proxy"; - inherit (src.meta) homepage; + homepage = "https://sr.ht/~sircmpwn/kineto"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.sikmir ]; mainProgram = "kineto"; diff --git a/pkgs/gemini/mdtohtml/default.nix b/pkgs/gemini/mdtohtml/default.nix @@ -34,7 +34,7 @@ buildGoModule rec { meta = { description = "Markdown to HTML converter"; - inherit (src.meta) homepage; + homepage = "https://git.sr.ht/~adnano/mdtohtml"; 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 @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "gmi2html"; version = "1.0-unstable-2022-02-16"; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A library and CLI tool for converting text/gemini to text/html"; - inherit (src.meta) homepage; + homepage = "https://notabug.org/tinyrabbit/gmi2html"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gemini/qute-gemini/default.nix b/pkgs/gemini/qute-gemini/default.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A qutebrowser userscripts that allows viewing Gemini pages"; - inherit (src.meta) homepage; + homepage = "https://git.sr.ht/~sotirisp/qute-gemini"; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gemini/satellite/default.nix b/pkgs/gemini/satellite/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { meta = { description = "Small Gemini server for serving static files"; - inherit (src.meta) homepage; + homepage = "https://sr.ht/~gsthnz/satellite"; license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gemini/shavit/default.nix b/pkgs/gemini/shavit/default.nix @@ -4,9 +4,9 @@ fetchFromSourcehut, }: -buildGoModule rec { +buildGoModule { pname = "shavit"; - version = "2020-03-14"; + version = "0-unstable-2020-03-14"; src = fetchFromSourcehut { owner = "~yotam"; @@ -19,7 +19,7 @@ buildGoModule rec { meta = { description = "Gemini server"; - inherit (src.meta) homepage; + homepage = "https://git.sr.ht/~yotam/shavit"; license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gemini/stagit-gemini/sloum.nix b/pkgs/gemini/stagit-gemini/sloum.nix @@ -5,7 +5,7 @@ fetchFromGitea, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "stagit-gemini"; version = "2020-01-18"; @@ -23,9 +23,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Fork of stagit-gopher that ports the output to gemini"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://git.rawtext.club/sloum/stagit-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 @@ -9,7 +9,7 @@ zlib, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "tom"; version = "2021-10-21"; @@ -47,9 +47,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Gemini frontend for git repositories"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/omar-polo/tom"; 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 @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A Python library for converting ArcGIS JSON to GeoJSON"; - inherit (src.meta) homepage; + homepage = "https://github.com/chris48s/arcgis2geojson"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; broken = true; diff --git a/pkgs/geospatial/bbox/default.nix b/pkgs/geospatial/bbox/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "BBOX services"; - inherit (src.meta) homepage; + homepage = "https://github.com/bbox-services/bbox"; license = with lib.licenses; [ asl20 mit diff --git a/pkgs/geospatial/c2cwsgiutils/default.nix b/pkgs/geospatial/c2cwsgiutils/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec { hash = "sha256-lPE21SLMgfnNu0qiM3e2qz6zJJ7u5YaNkqOSNTF1FVg="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ boltons lxml netifaces @@ -33,7 +33,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Common utilities for Camptocamp WSGI applications"; - inherit (src.meta) homepage; + homepage = "https://github.com/camptocamp/c2cwsgiutils"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/geospatial/cogdumper/default.nix b/pkgs/geospatial/cogdumper/default.nix @@ -1,11 +1,10 @@ { lib, - stdenv, fetchFromGitHub, python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage { pname = "cogdumper"; version = "0.5.0"; @@ -16,15 +15,11 @@ python3Packages.buildPythonPackage rec { hash = "sha256-gLBBGP2AMKP8biSbMtrxGs7vLDXbP+Y6Ct82FiNdNjs="; }; - nativeBuildInputs = with python3Packages; [ ]; - - propagatedBuildInputs = with python3Packages; [ ]; - nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; meta = { description = "Dumps tiles out of a cloud optimized geotiff"; - inherit (src.meta) homepage; + homepage = "https://github.com/mapbox/COGDumper"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/geospatial/cogeo-mosaic/default.nix b/pkgs/geospatial/cogeo-mosaic/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, python3Packages, supermorecado, @@ -18,12 +17,12 @@ python3Packages.buildPythonPackage rec { hash = "sha256-FJJZvLGBEZpVyfXBqmz6r1obx4HrKmtK0dWusItX3j4="; }; - nativeBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ hatchling hatch-fancy-pypi-readme ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ morecantile shapely pydantic diff --git a/pkgs/geospatial/datamaps/default.nix b/pkgs/geospatial/datamaps/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Indexes points and lines and generates map tiles to display them"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/e-n-f/datamaps"; 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 @@ -23,11 +23,11 @@ python3Packages.buildPythonApplication rec { hash = "sha256-sZStJgToQtWYrBH1BjqxCUwQUT5dcAlyZwnb4aYga+4="; }; - nativeBuildInputs = with python3Packages; [ setuptools-scm ]; + build-system = with python3Packages; [ setuptools-scm ]; SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ fasteners appdirs click diff --git a/pkgs/geospatial/geoarrow-c/default.nix b/pkgs/geospatial/geoarrow-c/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, python3Packages, }: diff --git a/pkgs/geospatial/geoarrow-pyarrow/default.nix b/pkgs/geospatial/geoarrow-pyarrow/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, python3Packages, geoarrow-c, @@ -22,7 +21,7 @@ python3Packages.buildPythonPackage rec { build-system = with python3Packages; [ setuptools-scm ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ geoarrow-c pyarrow pyarrow-hotfix diff --git a/pkgs/geospatial/geojson-pydantic/default.nix b/pkgs/geospatial/geojson-pydantic/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, python3Packages, }: @@ -17,9 +16,9 @@ python3Packages.buildPythonPackage rec { hash = "sha256-bNNLeHFIZYX34b0ceXPPMRIBR4MbMXpMO9gH2HBFKCY="; }; - nativeBuildInputs = with python3Packages; [ flit ]; + build-system = with python3Packages; [ flit ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ pydantic shapely ]; @@ -30,7 +29,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Pydantic data models for the GeoJSON spec"; - inherit (src.meta) homepage; + homepage = "https://github.com/developmentseed/geojson-pydantic"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/geospatial/go-pmtiles/default.nix b/pkgs/geospatial/go-pmtiles/default.nix @@ -17,11 +17,15 @@ buildGoModule rec { vendorHash = "sha256-gLFwGEUeH41bObG32MZznF7clct3h2GEvdZ2/KIiVb4="; - ldflags = [ "-X main.version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; meta = { description = "Read/write library & concurrent caching proxy for PMTiles archives"; - inherit (src.meta) homepage; + homepage = "https://github.com/protomaps/go-pmtiles"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/geospatial/go-staticmaps/default.nix b/pkgs/geospatial/go-staticmaps/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule { pname = "go-staticmaps"; version = "0-unstable-2021-12-31"; @@ -21,7 +21,7 @@ buildGoModule rec { meta = { description = "A go (golang) library and command line tool to render static map images using OpenStreetMap tiles"; - inherit (src.meta) homepage; + homepage = "https://github.com/flopp/go-staticmaps"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/geospatial/hecate/default.nix b/pkgs/geospatial/hecate/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, pkg-config, openssl, - Security, + darwin, }: rustPlatform.buildRustPackage rec { @@ -23,13 +23,13 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; doCheck = false; meta = { description = "Fast Geospatial Feature Storage API"; - inherit (src.meta) homepage; + homepage = "https://github.com/Hecate/Hecate"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; broken = true; diff --git a/pkgs/geospatial/kealib/default.nix b/pkgs/geospatial/kealib/default.nix @@ -6,14 +6,14 @@ hdf5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kealib"; version = "1.5.3"; src = fetchFromGitHub { owner = "ubarsc"; repo = "kealib"; - rev = "kealib-${version}"; + rev = "kealib-${finalAttrs.version}"; hash = "sha256-s6sL8T1jRBmVCrFm00uCw9x6s43u9+GU3ihyMi7XSaQ="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.sikmir ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/geospatial/localtileserver/default.nix b/pkgs/geospatial/localtileserver/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { --replace-fail "large-image[gdal]" "large-image-source-gdal" ''; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ click flask flask-caching diff --git a/pkgs/geospatial/mapsoft/default.nix b/pkgs/geospatial/mapsoft/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Mapping software for linux"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/ushakov/mapsoft"; 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 @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "mbtiles2osmand"; version = "0-unstable-2021-01-01"; format = "other"; @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Converts mbtiles format to sqlitedb format suitable for OsmAnd and RMaps"; - inherit (src.meta) homepage; + homepage = "https://github.com/tarwirdur/mbtiles2osmand"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/geospatial/mbutiles/default.nix b/pkgs/geospatial/mbutiles/default.nix @@ -1,13 +1,12 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, pkg-config, sqlite, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "mbutiles"; version = "0.1.0-unstable-2024-04-12"; @@ -26,7 +25,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "mbtiles utility in Rust, generate MBTiles from tiles directories and extract tiles from MBTiles file"; - inherit (src.meta) homepage; + homepage = "https://github.com/amarant/mbutiles"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/geospatial/mobroute/default.nix b/pkgs/geospatial/mobroute/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { meta = { description = "Minimal FOSS Public Transportation Router"; - inherit (src.meta) homepage; + homepage = "https://sr.ht/~mil/mobroute"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; mainProgram = "mobroute"; diff --git a/pkgs/geospatial/mobsql/default.nix b/pkgs/geospatial/mobsql/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { meta = { description = "GTFS to SQLite import tool"; - inherit (src.meta) homepage; + homepage = "https://sr.ht/~mil/mobsql"; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.sikmir ]; mainProgram = "mobsql"; diff --git a/pkgs/geospatial/pipfile/default.nix b/pkgs/geospatial/pipfile/default.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonPackage rec { hash = "sha256-GsDhxnvBvjJGQWk25cS9+HqLQ9YVSxujeX2iGivYl6Q="; }; - propagatedBuildInputs = with python3Packages; [ toml ]; + dependencies = with python3Packages; [ toml ]; doCheck = false; pythonImportsCheck = [ "pipfile" ]; meta = { description = "Pipfile: the replacement for requirements.txt"; - inherit (src.meta) homepage; + homepage = "https://github.com/pypa/pipfile"; license = with lib.licenses; [ asl20 bsd2 diff --git a/pkgs/geospatial/pmtiles/default.nix b/pkgs/geospatial/pmtiles/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Library and utilities to write and read PMTiles files - cloud-optimized archives of map tiles"; - inherit (src.meta) homepage; + homepage = "https://github.com/protomaps/PMTiles"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/geospatial/polyvectorization/default.nix b/pkgs/geospatial/polyvectorization/default.nix @@ -9,7 +9,7 @@ wrapQtAppsHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "polyvectorization"; version = "0-unstable-2019-08-23"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = { description = "Reference implementation of Vectorization of Line Drawings via PolyVector Fields"; - inherit (src.meta) homepage; + homepage = "https://github.com/bmpix/PolyVectorization"; 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 @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-vW457HbdDDhfz8hsvEN3/HJmIHKdrRDVNuhSpZXoZ78="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ appdirs geographiclib pillow @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A python module to create static map images with markers, geodesic lines, etc"; - inherit (src.meta) homepage; + homepage = "https://github.com/flopp/py-staticmaps"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/geospatial/pysheds/default.nix b/pkgs/geospatial/pysheds/default.nix @@ -6,16 +6,16 @@ python3Packages.buildPythonPackage rec { pname = "pysheds"; - version = "0.3.5"; + version = "0.4"; src = fetchFromGitHub { owner = "mdbartos"; repo = "pysheds"; rev = version; - hash = "sha256-OAc/OxqEvASpRNJL/KcE+exHGJie0oVv4fS+XXhtRcI="; + hash = "sha256-cIx/TPPLYsHEgvHtyZY5psRwqtvKQkJ/SnafT2btLBI="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ scikitimage affine geojson @@ -30,7 +30,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Simple and fast watershed delineation in python"; - inherit (src.meta) homepage; + homepage = "https://github.com/mdbartos/pysheds"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/geospatial/qlandkartegt/default.nix b/pkgs/geospatial/qlandkartegt/default.nix @@ -18,12 +18,12 @@ proj, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qlandkartegt"; version = "1.8.1"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/qlandkartegt/qlandkartegt-${finalAttrs.version}.tar.gz"; sha256 = "1rwv5ar5jv15g1cc6pp0lk69q3ip10pjazsh3ds2ggaciymha1ly"; }; @@ -119,4 +119,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; skip.ci = true; }; -} +}) diff --git a/pkgs/geospatial/qlandkartegt/garmindev.nix b/pkgs/geospatial/qlandkartegt/garmindev.nix @@ -6,12 +6,12 @@ libusb-compat-0_1, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "garmindev"; version = "0.3.4"; src = fetchurl { - url = "mirror://sourceforge/qlandkartegt/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/qlandkartegt/garmindev-${finalAttrs.version}.tar.gz"; sha256 = "1mc7rxdn9790pgbvz02xzipxp2dp9h4hfq87xgawa18sp9jqzhw6"; }; @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; skip.ci = true; }; -} +}) diff --git a/pkgs/geospatial/render_geojson/default.nix b/pkgs/geospatial/render_geojson/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "C++ geoJSON and topoJSON parser and rendering using the WxWidgets GUI library"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/pedro-vicente/render_geojson"; 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 @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, python3Packages, cogdumper, @@ -8,19 +7,19 @@ python3Packages.buildPythonPackage rec { pname = "rio-cogeo"; - version = "5.3.0"; + version = "5.3.2"; pyproject = true; src = fetchFromGitHub { owner = "cogeotiff"; repo = "rio-cogeo"; rev = version; - hash = "sha256-4zye0JksG9YCc+eyWbYFEW0k8eqqiSlY1uv0M+8qZwA="; + hash = "sha256-PzhUlip2LYO6DhC9O2aeoQGE59QXKq2e0v6/yxeFvjM="; }; - nativeBuildInputs = with python3Packages; [ flit ]; + build-system = with python3Packages; [ flit ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ click rasterio numpy @@ -37,7 +36,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Cloud Optimized GeoTIFF creation and validation plugin for rasterio"; - inherit (src.meta) homepage; + homepage = "https://github.com/cogeotiff/rio-cogeo"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/geospatial/rio-color/default.nix b/pkgs/geospatial/rio-color/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, python3Packages, rio-mucho, @@ -19,7 +18,7 @@ python3Packages.buildPythonPackage rec { nativeBuildInputs = with python3Packages; [ cython ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ click rasterio rio-mucho @@ -33,7 +32,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Color correction plugin for rasterio"; - inherit (src.meta) homepage; + homepage = "https://github.com/mapbox/rio-color"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/geospatial/rio-mbtiles/default.nix b/pkgs/geospatial/rio-mbtiles/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, python3Packages, supermercado, @@ -22,7 +21,7 @@ python3Packages.buildPythonApplication rec { --replace-fail "shapely~=1.7.0" "shapely" ''; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ click cligj mercantile @@ -41,7 +40,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A plugin command for the Rasterio CLI that exports a raster dataset to an MBTiles 1.1 SQLite file"; - inherit (src.meta) homepage; + homepage = "https://github.com/mapbox/rio-mbtiles"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/geospatial/rio-mucho/default.nix b/pkgs/geospatial/rio-mucho/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonPackage rec { hash = "sha256-yr79Lb02vxp2CN+638S8CFxbtim+zrkjxhjwEkx0XsY="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ click numpy rasterio @@ -26,7 +26,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Parallel processing wrapper for rasterio"; - inherit (src.meta) homepage; + homepage = "https://github.com/mapbox/rio-mucho"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/geospatial/rio-stac/default.nix b/pkgs/geospatial/rio-stac/default.nix @@ -17,9 +17,9 @@ python3Packages.buildPythonPackage rec { hash = "sha256-ySgxzcd0mRffDGv6L0iaaE9VY7K4fnsyE6RTotgSuQ4="; }; - nativeBuildInputs = with python3Packages; [ flit ]; + build-system = with python3Packages; [ flit ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ rasterio pystac ]; diff --git a/pkgs/geospatial/rsgislib/default.nix b/pkgs/geospatial/rsgislib/default.nix @@ -12,14 +12,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rsgislib"; version = "5.1.3"; src = fetchFromGitHub { owner = "remotesensinginfo"; repo = "rsgislib"; - rev = version; + rev = finalAttrs.version; hash = "sha256-RE5i2ULlgHEWHJIqeWNdnxtREcHrmP4dS996onJrBFk="; }; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.sikmir ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/geospatial/server-thread/default.nix b/pkgs/geospatial/server-thread/default.nix @@ -6,17 +6,19 @@ python3Packages.buildPythonPackage rec { pname = "server-thread"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "banesullivan"; repo = "server-thread"; rev = version; - hash = "sha256-EAL/moz3AIPBRLfAVI2zcCstjLsssKqBrxIDvq9CV3g="; + hash = "sha256-/ddMaXIIl9GC9RCZ3JuPL5pX8YQuPCCfjHg3i5ecWDY="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ + fastapi scooby + uvicorn werkzeug ]; @@ -28,7 +30,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Launch a WSGIApplication in a background thread with werkzeug"; - inherit (src.meta) homepage; + homepage = "https://github.com/banesullivan/server-thread"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/geospatial/starlette-cramjam/default.nix b/pkgs/geospatial/starlette-cramjam/default.nix @@ -1,30 +1,24 @@ { lib, - stdenv, fetchFromGitHub, python3Packages, }: python3Packages.buildPythonPackage rec { pname = "starlette-cramjam"; - version = "0.3.2"; + version = "0.3.3"; pyproject = true; src = fetchFromGitHub { owner = "developmentseed"; repo = "starlette-cramjam"; rev = version; - hash = "sha256-InxnMpyYg0m92oJfn7YbHECTQE9WMB9MwpoN3slxK7M="; + hash = "sha256-4LWn0qePRadyEsoLVSLOPRQ6tP6EG1YnVZzDsZH0+0I="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "cramjam>=2.4,<2.7" "cramjam" - ''; + build-system = with python3Packages; [ flit ]; - nativeBuildInputs = with python3Packages; [ flit ]; - - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ httpx starlette cramjam @@ -35,7 +29,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Cramjam integration for Starlette ASGI framework"; - inherit (src.meta) homepage; + homepage = "https://github.com/developmentseed/starlette-cramjam"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/geospatial/supermercado/default.nix b/pkgs/geospatial/supermercado/default.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "supermercado"; version = "0.2.0"; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-k2S1aOHQEJq//4mdWZ5GhJQJjKqJuDbBztoHi373s6w="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ click-plugins rasterio mercantile @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Supercharger for mercantile"; - inherit (src.meta) homepage; + homepage = "https://github.com/mapbox/supermercado"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/geospatial/supermorecado/default.nix b/pkgs/geospatial/supermorecado/default.nix @@ -16,9 +16,9 @@ python3Packages.buildPythonApplication rec { hash = "sha256-CuuJ4B/f7JoGQuTo5LS3WqMD860tucZ6z/97atw94k0="; }; - nativeBuildInputs = with python3Packages; [ flit ]; + build-system = with python3Packages; [ flit ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ morecantile rasterio ]; @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Extend the functionality of morecantile with additional commands"; - inherit (src.meta) homepage; + homepage = "https://github.com/developmentseed/supermorecado"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/geospatial/terracotta/default.nix b/pkgs/geospatial/terracotta/default.nix @@ -19,14 +19,14 @@ python3Packages.buildPythonApplication rec { substituteInPlace setup.py --replace-fail "\"setuptools_scm_git_archive\"," "" ''; - nativeBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools-scm #setuptools-scm-git-archive ]; SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ apispec apispec-webframeworks cachetools @@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A light-weight, versatile XYZ tile server"; - inherit (src.meta) homepage; + homepage = "https://github.com/DHI-GRAS/terracotta"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/geospatial/tile-stitch/default.nix b/pkgs/geospatial/tile-stitch/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Stitch together and crop map tiles for a specified bounding box"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/e-n-f/tile-stitch"; 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 @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { patches = [ ./set-tmpl-path.patch ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ azure-storage-blob azure-identity boto3 @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Tools for managing tiles"; - inherit (src.meta) homepage; + homepage = "https://github.com/camptocamp/tilecloud"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/geospatial/tilekiln/default.nix b/pkgs/geospatial/tilekiln/default.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { sed -i 's/len(os.sched_getaffinity(0))/4/' tilekiln/scripts/__init__.py ''; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ click pyyaml fs @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A set of command-line utilities to generate and serve Mapbox Vector Tiles (MVTs)"; - inherit (src.meta) homepage; + homepage = "https://github.com/pnorman/tilekiln"; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/geospatial/tilesets-cli/default.nix b/pkgs/geospatial/tilesets-cli/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { postPatch = "sed -i 's/~=.*\"/\"/' setup.py"; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ boto3 click cligj diff --git a/pkgs/geospatial/titiler/default.nix b/pkgs/geospatial/titiler/default.nix @@ -33,7 +33,7 @@ let pyproject = true; nativeBuildInputs = with python3Packages; [ pdm-pep517 ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ fastapi jinja2 rio-tiler @@ -51,7 +51,7 @@ let pyproject = true; nativeBuildInputs = with python3Packages; [ pdm-pep517 ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ rio-cogeo rio-stac titiler-core @@ -71,7 +71,7 @@ let pyproject = true; nativeBuildInputs = with python3Packages; [ pdm-pep517 ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ cogeo-mosaic titiler-core ]; @@ -90,7 +90,7 @@ python3Packages.buildPythonPackage { pyproject = true; nativeBuildInputs = with python3Packages; [ pdm-pep517 ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ python-dotenv rio-cogeo starlette-cramjam diff --git a/pkgs/geospatial/tpkutils/default.nix b/pkgs/geospatial/tpkutils/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { build-system = with python3Packages; [ poetry-core ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ mercantile pymbtiles six @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "ArcGIS Tile Package Utilities"; - inherit (src.meta) homepage; + homepage = "https://github.com/consbio/tpkutils"; license = lib.licenses.isc; maintainers = [ lib.maintainers.sikmir ]; mainProgram = "tpk"; diff --git a/pkgs/geospatial/vt2geojson/default.nix b/pkgs/geospatial/vt2geojson/default.nix @@ -19,13 +19,17 @@ buildGoModule rec { vendorHash = "sha256-FnLxhhytgNC4OIvh9pUM+cVDdNfqVOocjmkzFDU1fmA="; - ldflags = [ "-X main.appVersion=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X main.appVersion=${version}" + ]; passthru.tests.version = testers.testVersion { package = vt2geojson; }; meta = { description = "Command line tool to dump Mapbox Vector Tiles to GeoJSON"; - inherit (src.meta) homepage; + homepage = "https://github.com/wangyoucao577/vt2geojson"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gnss/gnsstk-apps/default.nix b/pkgs/gnss/gnsstk-apps/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "GNSSTk applications suite"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/SGL-UT/gnsstk-apps"; 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 @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "GNSSTk libraries"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/SGL-UT/gnsstk"; 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 @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Software-Defined GPS Signal Simulator"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/osqzss/gps-sdr-sim"; 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 @@ -4,7 +4,7 @@ fetchFromGitHub, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "gpsdate"; version = "0-unstable-2019-12-02"; @@ -23,10 +23,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Simple tool for fetching date and time from a GPS receiver and saving it as a local time"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/adamheinrich/gpsdate"; 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 @@ -8,14 +8,14 @@ python3Packages.buildPythonPackage rec { pname = "pygnssutils"; - version = "1.0.26"; + version = "1.0.28"; pyproject = true; src = fetchFromGitHub { owner = "semuconsulting"; repo = "pygnssutils"; rev = "v${version}"; - hash = "sha256-wIYSBuB0sXuVu3/WUBWyod+OccXPamhXUtb1T4EiclQ="; + hash = "sha256-y2t/dyp2i7Y8XPNNqqMFSUp57Ze24kVQquv+COec1Uk="; }; postPatch = '' @@ -25,7 +25,7 @@ python3Packages.buildPythonPackage rec { build-system = with python3Packages; [ setuptools ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ certifi paho-mqtt pyserial @@ -37,7 +37,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "GNSS Command Line Utilities"; - inherit (src.meta) homepage; + homepage = "https://github.com/semuconsulting/pygnssutils"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gnss/pygpsclient/default.nix b/pkgs/gnss/pygpsclient/default.nix @@ -7,19 +7,19 @@ python3Packages.buildPythonApplication rec { pname = "pygpsclient"; - version = "1.4.12"; + version = "1.4.17"; pyproject = true; src = fetchFromGitHub { owner = "semuconsulting"; repo = "PyGPSClient"; rev = "v${version}"; - hash = "sha256-/TOEI0l/FJx8yENxFhruKp+I4N+vDS80oGdTSrNdsDU="; + hash = "sha256-kDdicLzjqfFAMU2SxMToBXmIqfRvQ3r/2ACi/cvVIcU="; }; build-system = with python3Packages; [ setuptools ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ requests pillow pygnssutils @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "GNSS Diagnostic and UBX Configuration GUI Application"; - inherit (src.meta) homepage; + homepage = "https://github.com/semuconsulting/PyGPSClient"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gnss/pyrtcm/default.nix b/pkgs/gnss/pyrtcm/default.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonPackage rec { pname = "pyrtcm"; - version = "1.0.19"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "semuconsulting"; repo = "pyrtcm"; rev = "v${version}"; - hash = "sha256-GKSh/lM5Bhmqw26ZfLQyRJMWfI8I9dGTkqDdr2CXZTs="; + hash = "sha256-YD/ewNEv0iPwKk606Q1Mg4qFAUb9Jse5z5S1QZvq/kY="; }; build-system = with python3Packages; [ setuptools ]; @@ -22,7 +22,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "RTCM3 protocol parser"; - inherit (src.meta) homepage; + homepage = "https://github.com/semuconsulting/pyrtcm"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gnss/pyspartn/default.nix b/pkgs/gnss/pyspartn/default.nix @@ -6,25 +6,25 @@ python3Packages.buildPythonPackage rec { pname = "pyspartn"; - version = "0.4.0-beta"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "semuconsulting"; repo = "pyspartn"; rev = "v${version}"; - hash = "sha256-5PpCUWOCD8GyOx/9tA3eSKYxCWT2xopqJaV429VSK8M="; + hash = "sha256-YfsC9mErwsIiy1udmR7GFRJBzVLHkQL3Uy2RTBGIyxs="; }; build-system = with python3Packages; [ setuptools ]; - propagatedBuildInputs = with python3Packages; [ cryptography ]; + dependencies = with python3Packages; [ cryptography ]; pythonImportsCheck = [ "pyspartn" ]; meta = { description = "SPARTN protocol parser"; - inherit (src.meta) homepage; + homepage = "https://github.com/semuconsulting/pyspartn"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gnss/pyubx2/default.nix b/pkgs/gnss/pyubx2/default.nix @@ -7,19 +7,19 @@ python3Packages.buildPythonPackage rec { pname = "pyubx2"; - version = "1.2.39"; + version = "1.2.43"; pyproject = true; src = fetchFromGitHub { owner = "semuconsulting"; repo = "pyubx2"; rev = "v${version}"; - hash = "sha256-qtfAW6KMJjITugPHxddVlwS9FeoUxIEQBwknR0hhZXE="; + hash = "sha256-X/mnPHdxOGhQclIQklDuQtggSD/sjGh2O7XkKx1WPbU="; }; build-system = with python3Packages; [ setuptools ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ pynmeagps pyrtcm ]; @@ -28,7 +28,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "UBX protocol parser and generator"; - inherit (src.meta) homepage; + homepage = "https://github.com/semuconsulting/pyubx2"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gpx/cmpgpx/default.nix b/pkgs/gpx/cmpgpx/default.nix @@ -5,7 +5,7 @@ geotiler, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "cmpgpx"; version = "0-unstable-2015-06-05"; format = "other"; @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-iJajSbDDPkBmGKZp0QH03RK9VBMmLHWvHViojlQJArs="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ cairocffi geotiler gpxpy @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Show the differences between GPX files"; - inherit (src.meta) homepage; + homepage = "https://github.com/jonblack/cmpgpx"; license = lib.licenses.unlicense; maintainers = [ lib.maintainers.sikmir ]; mainProgram = "cmpgpx"; diff --git a/pkgs/gpx/garta/default.nix b/pkgs/gpx/garta/default.nix @@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Geo-bookmarking, GPX viewer, analyzer and editor for GTK3"; - inherit (src.meta) homepage; + homepage = "https://gitlab.com/timosaarinen/garta"; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gpx/gps-whatsnew/default.nix b/pkgs/gpx/gps-whatsnew/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Compare gpx tracks to find new segments (places never traveled before)"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/centurn/gps-whatsnew"; 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 @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "gpx-cmd-tools"; version = "0-unstable-2020-08-08"; @@ -15,11 +15,11 @@ python3Packages.buildPythonApplication rec { hash = "sha256-x3/PNACBrT5XSlgpZj0WO27KW0DiF6Je2z3gX5g/Gz0="; }; - propagatedBuildInputs = with python3Packages; [ gpxpy ]; + dependencies = with python3Packages; [ gpxpy ]; meta = { description = "Set of GPX command-line utilities"; - inherit (src.meta) homepage; + homepage = "https://github.com/tkrajina/gpx-cmd-tools"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gpx/gpx-converter/default.nix b/pkgs/gpx/gpx-converter/default.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "gpx-converter"; version = "0-unstable-2023-04-07"; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-bT94phfkJiOQ8rZn783qOmIph6ck27z18rQQby9uEeg="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ gpxpy numpy pandas @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Python package for manipulating gpx files and easily convert gpx to other different formats"; - inherit (src.meta) homepage; + homepage = "https://github.com/nidhaloff/gpx-converter"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gpx/gpx-interpolate/default.nix b/pkgs/gpx/gpx-interpolate/default.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "gpx-interpolate"; version = "0-unstable-2023-10-28"; format = "other"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-cCiRXpX6qj2o+vPs3V0/+UwnnHKvDFOgTbCV347BKkc="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ gpxpy scipy numpy @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Python script to interpolate GPX files using piecewise cubic Hermite splines"; - inherit (src.meta) homepage; + homepage = "https://github.com/remisalmon/gpx-interpolate"; 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 @@ -7,7 +7,7 @@ XMLParser, }: -buildPerlPackage rec { +buildPerlPackage { pname = "gpx-layer"; version = "0-unstable-2013-09-19"; @@ -39,7 +39,7 @@ buildPerlPackage rec { meta = { description = "Tools to turn GPX files into a GPS map tracing layer"; - inherit (src.meta) homepage; + homepage = "https://github.com/e-n-f/gpx-layer"; license = lib.licenses.free; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gpx/gpxchart/default.nix b/pkgs/gpx/gpxchart/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { owner = "tkrajina"; repo = "gpxchart"; rev = "v${version}"; - hash = "sha256-3HDj4k5mSUrJOxN2DrsHjMtX8PylxHExJeMc5CuaPP8"; + hash = "sha256-3HDj4k5mSUrJOxN2DrsHjMtX8PylxHExJeMc5CuaPP8="; }; vendorHash = null; @@ -21,7 +21,7 @@ buildGoModule rec { meta = { description = "A command-line tool and library for elevation charts from GPX files"; - inherit (src.meta) homepage; + homepage = "https://github.com/tkrajina/gpxchart"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/gpx/gpxtrackposter/default.nix b/pkgs/gpx/gpxtrackposter/default.nix @@ -6,13 +6,13 @@ s2sphere, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "gpxtrackposter"; version = "0-unstable-2023-02-19"; src = fetchFromGitHub { owner = "flopp"; - repo = "gpxtrackposter"; + repo = "GpxTrackPoster"; rev = "0b86e7223eaeea3e168f5b68ee7b8fe4ca8532b5"; hash = "sha256-pSMfHNpGt68Elgi4NGrBlnZxpsuS7WhqM6kBDcihLu8="; }; @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec { sed -i 's/~=.*//' requirements.txt ''; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ appdirs colour geopy @@ -67,7 +67,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Create a visually appealing poster from your GPX tracks"; - inherit (src.meta) homepage; + homepage = "https://github.com/flopp/GpxTrackPoster"; 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 @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-fLubRKq+3wQh16xSdqJmNMy4zw83RiSQj8C6jNV4fV8="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ geopy gpxpy pillow @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "GPS Track Animation Library"; - inherit (src.meta) homepage; + homepage = "https://github.com/JoanMartin/trackanimation"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/linguistics/dict2rest/default.nix b/pkgs/linguistics/dict2rest/default.nix @@ -4,7 +4,7 @@ buildGoPackage, }: -buildGoPackage rec { +buildGoPackage { pname = "dict2rest"; version = "0-unstable-2016-12-05"; @@ -19,7 +19,7 @@ buildGoPackage rec { meta = { description = "A simple proxy service providing an HTTP interface to a Dict protocol (RFC 2229) server"; - inherit (src.meta) homepage; + homepage = "https://github.com/felix/go-dict2rest"; 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 @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage { pname = "distance"; version = "2013-11-22"; @@ -23,7 +23,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Utilities for comparing sequences"; - inherit (src.meta) homepage; + homepage = "https://github.com/doukremt/distance"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/linguistics/gdcv/default.nix b/pkgs/linguistics/gdcv/default.nix @@ -43,13 +43,15 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-largp"; installPhase = '' + runHook preInstall install -Dm755 gdcv -t $out/bin install -Dm644 gdcv-elisp.so gdcv.el -t $out/share/emacs/site-lisp + runHook postInstall ''; meta = { description = "GoldenDict console version and emacs dynamic module"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/konstare/gdcv"; 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 @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Get translated text from your terminal! Console Google Translate Script (bash+curl+sed)"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/OPHoperHPO/GT-bash-client"; 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 @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-zJq5dhmrd0k7bsw75xFECKmwZU4qjw+wwSzsYjg8zao="; }; - propagatedBuildInputs = with python3Packages; [ requests ] ++ lib.optional withUI tkinter; + dependencies = with python3Packages; [ requests ] ++ lib.optional withUI tkinter; doCheck = false; @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Add Google translate to GoldenDict"; - inherit (src.meta) homepage; + homepage = "https://github.com/xinebf/google-translate-for-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 @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "GUI for editing your i18n translation files"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/jcbvm/i18n-editor"; 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 @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Decompile Lingvo LSD dictionary to DSL"; - inherit (src.meta) homepage; + homepage = "https://github.com/sv99/lsdreader"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/linguistics/mikatools/default.nix b/pkgs/linguistics/mikatools/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonPackage rec { hash = "sha256-2YpRTSZWJVXMoTLDBFS+tFkmA8pOBsqWF7Z85gtIfY0="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ requests cryptography tqdm @@ -25,7 +25,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Mikatools provides fast and easy methods for common Python coding tasks"; - inherit (src.meta) homepage; + homepage = "https://github.com/mikahama/mikatools"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/linguistics/pytorchtext/default.nix b/pkgs/linguistics/pytorchtext/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonPackage rec { buildInputs = with python3Packages; [ pybind11 ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ defusedxml nltk pytorch @@ -48,7 +48,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Text utilities and datasets for PyTorch"; - inherit (src.meta) homepage; + homepage = "https://github.com/pytorch/text"; 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 @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage { pname = "revtok"; version = "2018-09-21"; @@ -15,13 +15,13 @@ python3Packages.buildPythonPackage rec { hash = "sha256-o416UUnTMejCd57fGvZPSFQv0bT4PULdgNTXyAzMiMs="; }; - propagatedBuildInputs = with python3Packages; [ tqdm ]; + dependencies = with python3Packages; [ tqdm ]; pythonImportsCheck = [ "revtok" ]; meta = { description = "Reversible tokenization in Python"; - inherit (src.meta) homepage; + homepage = "https://github.com/jekbradbury/revtok"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/linguistics/tatoebatools/default.nix b/pkgs/linguistics/tatoebatools/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, python3Packages, fetchFromGitHub, withCli ? true, @@ -24,7 +23,7 @@ python3Packages.buildPythonApplication rec { postPatch = "sed -i 's/==.*\"/\"/;s/>=.*\"/\"/' setup.py"; - propagatedBuildInputs = + dependencies = with python3Packages; [ beautifulsoup4 @@ -48,7 +47,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A library for downloading, updating and iterating over data files from Tatoeba"; - inherit (src.meta) homepage; + homepage = "https://github.com/LBeaudoux/tatoebatools"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/linguistics/ttb/default.nix b/pkgs/linguistics/ttb/default.nix @@ -3,10 +3,10 @@ stdenv, rustPlatform, fetchFromGitHub, - SystemConfiguration, + darwin, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "ttb"; version = "0-unstable-2022-12-14"; @@ -23,11 +23,11 @@ rustPlatform.buildRustPackage rec { ln -s ${./Cargo.lock} Cargo.lock ''; - buildInputs = lib.optional stdenv.isDarwin SystemConfiguration; + buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; meta = { description = "A lightning-fast tool for querying Tatoebe from the command-line"; - inherit (src.meta) homepage; + homepage = "https://github.com/TheOpenDictionary/ttb"; license = lib.licenses.free; maintainers = [ lib.maintainers.sikmir ]; mainProgram = "ttb"; diff --git a/pkgs/linguistics/wikitextprocessor/default.nix b/pkgs/linguistics/wikitextprocessor/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage { pname = "wikitextprocessor"; version = "0.4.96"; @@ -16,7 +16,7 @@ python3Packages.buildPythonPackage rec { hash = "sha256-cjhKgzqsPwVO2/fwC62IDilMhz6fg6qQrnm0xLQ3KPk="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ lupa dateparser lru-dict @@ -35,7 +35,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Parser and expander for Wikipedia, Wiktionary etc. dump files, with Lua execution support"; - inherit (src.meta) homepage; + homepage = "https://github.com/tatuylonen/wikitextprocessor"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/linguistics/wiktextract/default.nix b/pkgs/linguistics/wiktextract/default.nix @@ -14,7 +14,7 @@ let hash = "sha256-mydfmzuV171mzPt80ln0RaE7vl0fQQeroJ/T6DZLr6Y="; }; in -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "wiktextract"; version = "1.99.7"; @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { --replace-fail python-Levenshtein Levenshtein ''; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ levenshtein setuptools wikitextprocessor @@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Wiktionary dump file parser and multilingual data extractor"; - inherit (src.meta) homepage; + homepage = "https://github.com/tatuylonen/wiktextract"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/linguistics/wiktfinnish/default.nix b/pkgs/linguistics/wiktfinnish/default.nix @@ -1,11 +1,10 @@ { lib, - stdenv, python3Packages, fetchFromGitHub, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "wiktfinnish"; version = "2020-02-27"; @@ -22,7 +21,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Finnish morphology (including verb forms, comparatives, cases, possessives, clitics)"; - inherit (src.meta) homepage; + homepage = "https://github.com/tatuylonen/wiktfinnish"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/linguistics/zdict/default.nix b/pkgs/linguistics/zdict/default.nix @@ -1,22 +1,21 @@ { lib, - stdenv, fetchFromGitHub, python3Packages, }: python3Packages.buildPythonApplication rec { pname = "zdict"; - version = "4.0.5"; + version = "5.0.1"; src = fetchFromGitHub { owner = "zdict"; repo = "zdict"; rev = version; - hash = "sha256-uiCD2ZuVP1Pu7r/uOEctjMhsupxm++i0kiHxU9DNp9M="; + hash = "sha256-vZpxJkKBHo9fO7xNN9Is7BumZhAkepVK0dpk+Y/1YBM="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ beautifulsoup4 peewee requests @@ -28,7 +27,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "The last online dictionary framework you need"; - inherit (src.meta) homepage; + homepage = "https://github.com/zdict/zdict"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/misc/acp/default.nix b/pkgs/misc/acp/default.nix @@ -17,11 +17,15 @@ buildGoModule rec { vendorHash = "sha256-OCoghYUNznwBz7JN2MkHzdngA+mhHcfFIpw8ZMxeeMc="; - ldflags = [ "-X main.buildTag=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X main.buildTag=${version}" + ]; meta = { description = "Make terminal personal file transfers as simple as `cp`"; - inherit (src.meta) homepage; + homepage = "https://github.com/Contextualist/acp"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; mainProgram = "acp"; diff --git a/pkgs/misc/apibackuper/default.nix b/pkgs/misc/apibackuper/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-2vNuzQK6Wm6DBWRSLFuy6loCLAbcql3CqSktMjGE8JE="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ bson click lxml @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Python library and cmd tool to backup API calls"; - inherit (src.meta) homepage; + homepage = "https://github.com/ruarxive/apibackuper"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/misc/arduinojson/default.nix b/pkgs/misc/arduinojson/default.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "arduinojson"; version = "6.20.0"; src = fetchFromGitHub { owner = "bblanchon"; repo = "ArduinoJson"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-oRqQMc4FpX7bxVDfZhO6ZvwrWEAlY2T4tejIRfklTrs="; }; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.sikmir ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/misc/bash-completor/default.nix b/pkgs/misc/bash-completor/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Creating a bash completion script in a declarative way"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/adoyle-h/bash-completor"; 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 @@ -5,7 +5,7 @@ openssl, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "btpd"; version = "2020-04-07"; @@ -24,9 +24,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "The BitTorrent Protocol Daemon"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/btpd/btpd"; 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 @@ -10,7 +10,7 @@ AppKit, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bwh"; version = "1.0.3"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { domain = "git.skyjake.fi"; owner = "skyjake"; repo = "bwh"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-POKjvUGFS3urc1aqOvfCAApUnRxoZhU725eYRAS4Z2w="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; mainProgram = "bitwise-harmony"; }; -} +}) diff --git a/pkgs/misc/cfiles/default.nix b/pkgs/misc/cfiles/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A ncurses file manager written in C with vim like keybindings"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/mananapr/cfiles"; 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 @@ -28,7 +28,11 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - ldflags = [ "-X main.version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; postInstall = '' installManPage docs/man/*.{1,5} diff --git a/pkgs/misc/csv2html/cargo-lock.patch b/pkgs/misc/csv2html/cargo-lock.patch @@ -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 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. -+version = 3 -+ - [[package]] - name = "ansi_term" - version = "0.11.0" -@@ -83,7 +85,7 @@ dependencies = [ - - [[package]] - name = "csv2html" --version = "3.0.0" -+version = "3.0.1" - dependencies = [ - "clap", - "csv", diff --git a/pkgs/misc/csv2html/default.nix b/pkgs/misc/csv2html/default.nix @@ -7,22 +7,22 @@ rustPlatform.buildRustPackage rec { pname = "csv2html"; - version = "3.0.1"; + version = "3.1.1"; src = fetchFromGitHub { owner = "dbohdan"; repo = "csv2html"; rev = "v${version}"; - hash = "sha256-7pEVMdF7rUXKsDrxGFfqwQDIVykgG/x4kh0En1D9VxU="; + hash = "sha256-H8nUwK72opUohBN2exZURRAPr1RXLa87exYaGigly0Q="; }; - cargoPatches = [ ./cargo-lock.patch ]; - cargoHash = "sha256-2Qhu+7Lb6Pvs1a9qH5WmcakxeQVB2bm4fPGZXwh3cgA="; + cargoHash = "sha256-axvgAXstJU9J7fzez3qfEuxzPs6eCvlyjV8OsxBSg7A="; meta = { description = "Convert CSV files to HTML tables"; - inherit (src.meta) homepage; + homepage = "https://github.com/dbohdan/csv2html"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; + mainProgram = "csv2html"; }; } diff --git a/pkgs/misc/csvtools/default.nix b/pkgs/misc/csvtools/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "GNU-alike tools for parsing RFC 4180 CSVs at high speed"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/DavyLandman/csvtools"; 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 @@ -33,14 +33,14 @@ let hash = "sha256-xH0htDZd2UihLn7PHKLjEYETzcBSeJFOMNredTqlCW8="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "diagon"; version = "1.1.158"; src = fetchFromGitHub { owner = "ArthurSonzogni"; repo = "Diagon"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Qxk3+1T0IPmvB5v3jaqvBnESpss6L8bvoW+R1l5RXdQ="; }; @@ -74,10 +74,10 @@ stdenv.mkDerivation rec { meta = { description = "Interactive ASCII art diagram generators"; - inherit (src.meta) homepage; + homepage = "https://github.com/ArthurSonzogni/Diagon"; 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 @@ -4,7 +4,7 @@ fetchFromGitHub, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "dns-filter"; version = "0-unstable-2021-04-14"; @@ -32,9 +32,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Tiny DNS server with filtering requests"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/depler/dns-filter"; 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 @@ -4,24 +4,26 @@ fetchFromGitHub, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "docker-reg-tool"; - version = "2021-02-15"; + version = "0-unstable-2023-10-26"; src = fetchFromGitHub { owner = "byrnedo"; repo = "docker-reg-tool"; - rev = "23292d234289b1fd114b53786c9e4f9fece3674b"; - hash = "sha256-o2ug69zM1lfG+vgHAcOKxJxDp5UMag8ZbOWU5/tsjG8="; + rev = "ff27e94d2cf97dfd078d37aa156ab720aa32da29"; + hash = "sha256-Tcdu7GwmV/kAe4yxzGFr05wC0DpAjkbUNPXG8EhBU2E="; }; - installPhase = "install -Dm755 docker_reg_tool -t $out/bin"; + installPhase = '' + install -Dm755 docker_reg_tool -t $out/bin + ''; meta = { description = "Docker registry cli tool, primarily for deleting images"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/byrnedo/docker-reg-tool"; 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 @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "docx2csv"; version = "0-unstable-2023-10-11"; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-A7Y1zgM+9xIDXsAQN2tGGoWbe8u/kvGch6sBNKz0Nw4="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ click openpyxl python-docx @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Extracts tables from .docx files and saves them as .csv or .xls files"; - inherit (src.meta) homepage; + homepage = "https://github.com/ivbeg/docx2csv"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/misc/finalcut/default.nix b/pkgs/misc/finalcut/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A text-based widget toolkit"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/gansm/finalcut"; 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 @@ -6,7 +6,7 @@ boost, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "freeopcua"; version = "0-unstable-2023-05-30"; @@ -25,9 +25,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Open Source C++ OPC-UA Server and Client Library"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/FreeOpcUa/freeopcua"; 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 @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "gaiagpsclient"; version = "0-unstable-2023-08-26"; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-qCpyJfa8TeMfawf1+wCFu04sYHfDejyStNl6Q6XEUeA="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ requests prettytable pytz @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A python client for gaiagps.com"; - inherit (src.meta) homepage; + homepage = "https://github.com/kk7ds/gaiagpsclient"; 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 @@ -7,14 +7,14 @@ subprocess, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "git-tui"; version = "1.1.0"; src = fetchFromGitHub { owner = "ArthurSonzogni"; repo = "git-tui"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-RogDZeDgC7HanPd0I+BuU9CShUzaIqvH1R7/I1tAtG4="; }; @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { meta = { description = "Collection of human friendly terminal interface for git"; - inherit (src.meta) homepage; + homepage = "https://github.com/ArthurSonzogni/git-tui"; 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 @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A simple time series database based on BerkleyDB"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/slazav/graphene"; 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 @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "heapusage"; version = "2.07"; src = fetchFromGitHub { owner = "d99kris"; repo = "heapusage"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-p7Yhx/w1I0+dxD7YH15Eojs4wh337/mZnXBwpiqlt4A="; }; @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { meta = { description = "Light-weight tool for finding heap memory errors"; - inherit (src.meta) homepage; + homepage = "https://github.com/d99kris/heapusage"; 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 @@ -1,47 +1,38 @@ { lib, - stdenv, - fetchFromGitHub, + fetchFromGitea, python3Packages, }: python3Packages.buildPythonApplication rec { pname = "huami-token"; - version = "2021-10-30"; - format = "other"; + version = "0.7.0"; + pyproject = true; - src = fetchFromGitHub { + src = fetchFromGitea { + domain = "codeberg.org"; owner = "argrento"; repo = "huami-token"; - rev = "c88162682dd16671ea22ea0e8e6f913494b3bd78"; - hash = "sha256-LMVFlpMueQV8jfX2A968AYftIT2pAe+FTOS7X21ml8w="; + rev = "v${version}"; + hash = "sha256-nQiz1vrZz0sOoZFQaN9ZtzfDY3zn3Gk0jMdqORDDW3w="; }; - dontUseSetuptoolsBuild = true; - dontUseSetuptoolsCheck = true; + postPatch = '' + substituteInPlace pyproject.toml --replace "requests == 2.25.1" "requests" + ''; - installPhase = - let - pythonEnv = python3Packages.python.withPackages ( - p: with p; [ - requests - rich - ] - ); - in - '' - site_packages=$out/lib/${python3Packages.python.libPrefix}/site-packages - mkdir -p $site_packages - cp *.py $site_packages + build-system = with python3Packages; [ flit ]; - makeWrapper ${pythonEnv.interpreter} $out/bin/huami_token \ - --add-flags "$site_packages/huami_token.py" - ''; + dependencies = with python3Packages; [ + requests + types-requests + ]; meta = { description = "Script to obtain watch or band bluetooth token from Huami servers"; - inherit (src.meta) homepage; - license = lib.licenses.free; + homepage = "https://github.com/argrento/huami-token"; + license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; + mainProgram = "huami_token"; }; } diff --git a/pkgs/misc/json-tui/default.nix b/pkgs/misc/json-tui/default.nix @@ -8,14 +8,14 @@ libargs, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "json-tui"; version = "1.3.0"; src = fetchFromGitHub { owner = "ArthurSonzogni"; repo = "json-tui"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Rgan+Pki4kOFf4BiNmJV4mf/rgyIGgUVP1BcFCKG25w="; }; @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { meta = { description = "A JSON terminal UI made in C++"; - inherit (src.meta) homepage; + homepage = "https://github.com/ArthurSonzogni/json-tui"; 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 @@ -4,7 +4,7 @@ fetchFromGitHub, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "lazyscraper"; version = "2020-05-19"; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-gnhJB+ZMKQIYZNHMeRrlICgz5UhyHy72Js/I4kbp8Qo="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ click lxml requests @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Lazy helper tool to make easier scraping with simple tasks"; - inherit (src.meta) homepage; + homepage = "https://github.com/ivbeg/lazyscraper"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/misc/libmdbx/default.nix b/pkgs/misc/libmdbx/default.nix @@ -5,12 +5,12 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libmdbx"; version = "0.12.9"; src = fetchurl { - url = "https://libmdbx.dqdkfa.ru/release/libmdbx-amalgamated-${version}.tar.xz"; + url = "https://libmdbx.dqdkfa.ru/release/libmdbx-amalgamated-${finalAttrs.version}.tar.xz"; hash = "sha256-bMxSd7+xPOdE+20hKN4LEcj1jIHB/gYXnOqsXCgSWm4="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/misc/libnbcompat/default.nix b/pkgs/misc/libnbcompat/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Portable NetBSD-compatibility library"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/archiecobbs/libnbcompat"; 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 @@ -6,20 +6,20 @@ buildGoModule rec { pname = "md2html"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "nocd5"; repo = "md2html"; rev = "v${version}"; - hash = "sha256-RVTKLueo9yY/rgSoHW4ILmDeGfw3O6TcAZh3ydHnAto="; + hash = "sha256-3DnCLoX0x872zB90Z172iGwc6kQk9tpG1drw4s7LI0o="; }; vendorHash = "sha256-XO8WD/SC2Xii0bUiuOGL9V7XgTJDZjsPrpmyONFm+7U="; meta = { description = "Markdown to single HTML"; - inherit (src.meta) homepage; + homepage = "https://github.com/nocd5/md2html"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/misc/messenger-cli/default.nix b/pkgs/misc/messenger-cli/default.nix @@ -13,12 +13,12 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "messenger-cli"; version = "0.2.0"; src = fetchurl { - url = "mirror://gnu/gnunet/messenger-cli-${version}.tar.gz"; + url = "mirror://gnu/gnunet/messenger-cli-${finalAttrs.version}.tar.gz"; hash = "sha256-ZuGflZsMzPZ430boN/LKtEthayyyrxY0uIIWQasU7vY="; }; @@ -40,9 +40,9 @@ stdenv.mkDerivation rec { meta = { description = "A CLI for the Messenger service of GNUnet"; homepage = "https://www.gnunet.org/"; - changelog = "https://git.gnunet.org/messenger-cli.git/tree/ChangeLog?h=v${version}"; + changelog = "https://git.gnunet.org/messenger-cli.git/tree/ChangeLog?h=v${finalAttrs.version}"; 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 @@ -23,12 +23,12 @@ qrencode, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "messenger-gtk"; version = "0.9.0"; src = fetchurl { - url = "mirror://gnu/gnunet/messenger-gtk-${version}.tar.gz"; + url = "mirror://gnu/gnunet/messenger-gtk-${finalAttrs.version}.tar.gz"; hash = "sha256-DqviYQ+zEy75mQEHKi90pkDgps4gM6YrjN9esrCmi0s="; }; @@ -59,10 +59,10 @@ stdenv.mkDerivation rec { meta = { description = "A GTK based GUI for the Messenger service of GNUnet"; homepage = "https://www.gnunet.org/"; - changelog = "https://git.gnunet.org/messenger-gtk.git/tree/ChangeLog?h=v${version}"; + changelog = "https://git.gnunet.org/messenger-gtk.git/tree/ChangeLog?h=v${finalAttrs.version}"; 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 @@ -6,7 +6,7 @@ curses-menu, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "miband4"; version = "0-unstable-2022-10-07"; format = "other"; @@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Access Xiaomi MiBand 4 from Linux using Bluetooth LE"; - inherit (src.meta) homepage; + homepage = "https://github.com/satcar77/miband4"; 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 @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { --replace-fail "appdirs ==1.4.4" "appdirs" ''; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ appdirs pygments mysql-connector diff --git a/pkgs/misc/modbus-tools/default.nix b/pkgs/misc/modbus-tools/default.nix @@ -3,7 +3,7 @@ stdenv, rustPlatform, fetchFromGitLab, - IOKit, + darwin, }: rustPlatform.buildRustPackage rec { @@ -23,11 +23,11 @@ rustPlatform.buildRustPackage rec { ln -s ${./Cargo.lock} Cargo.lock ''; - buildInputs = lib.optional stdenv.isDarwin IOKit; + buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.IOKit; meta = { description = "Tool(s) for working with Modbus protocol"; - inherit (src.meta) homepage; + homepage = "https://github.com/alexs-sh/modbus-tools"; 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 @@ -5,7 +5,7 @@ modbus_tk, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "modbus_sim_cli"; version = "0-unstable-2019-02-27"; @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { --replace-fail "yaml.load(conffile.read())" "yaml.safe_load(conffile)" ''; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ coloredlogs modbus_tk pyyaml @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Modbus simulation command line version"; - inherit (src.meta) homepage; + homepage = "https://github.com/dhoomakethu/modbus_sim_cli"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/misc/morse-talk/default.nix b/pkgs/misc/morse-talk/default.nix @@ -5,7 +5,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "morse-talk"; version = "2016-12-25"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-fvQCETz0Lv0hyfKG7HC2Whm+xoZ9233hF/1ogsfZ10o="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ matplotlib sounddevice tkinter @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A Python library written for Morse Code"; - inherit (src.meta) homepage; + homepage = "https://github.com/morse-talk/morse-talk"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/misc/musig/default.nix b/pkgs/misc/musig/default.nix @@ -32,7 +32,7 @@ buildGoModule rec { meta = { description = "A shazam like tool to store songs fingerprints and retrieve them"; - inherit (src.meta) homepage; + homepage = "https://github.com/sfluor/musig"; 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 @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { build-system = with python3Packages; [ hatchling ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ click mysql-connector python-slugify @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Transfer data from MySQL to SQLite"; - inherit (src.meta) homepage; + homepage = "https://github.com/techouse/mysql-to-sqlite3"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; mainProgram = "mysql2sqlite"; diff --git a/pkgs/misc/nanodns/default.nix b/pkgs/misc/nanodns/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -buildGoPackage rec { +buildGoPackage { pname = "nanodns"; version = "0-unstable-2021-10-29"; @@ -21,7 +21,7 @@ buildGoPackage rec { meta = { description = "Simple dns forwarder/cache blocker server"; - inherit (src.meta) homepage; + homepage = "https://github.com/Sina-Ghaderi/nanodns"; 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 @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "NetBSD's mtree(8) utility"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/archiecobbs/nmtree"; 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 @@ -9,7 +9,7 @@ libGLU, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "objlab"; version = "0-unstable-2019-11-23"; @@ -44,11 +44,11 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Simple wavefront .obj viewer"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/lighttransport/objlab"; 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 @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "GUI client for MySQL or MariaDB"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/ocelot-inc/ocelotgui"; 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 @@ -7,18 +7,18 @@ openssl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opcua-stack"; version = "3.8.1"; src = fetchFromGitHub { owner = "ASNeG"; repo = "OpcUaStack"; - rev = version; + rev = finalAttrs.version; hash = "sha256-czpuuT9DeZaYo2Q8Y/vW1kAsIiFhRDSKwVBUcFgb9iQ="; }; - sourceRoot = "${src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; postPatch = '' substituteInPlace CMakeLists.txt --replace-fail "/usr" "$out" @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/misc/plotjuggler/default.nix b/pkgs/misc/plotjuggler/default.nix @@ -15,14 +15,14 @@ zstd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "plotjuggler"; version = "3.9.2"; src = fetchFromGitHub { owner = "facontidavide"; repo = "PlotJuggler"; - rev = version; + rev = finalAttrs.version; hash = "sha256-Dl2vE4iGhcGLH5lf1eCdybhfTG1bgI0Skw+AHKdvolQ="; }; @@ -55,4 +55,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.sikmir ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/misc/pnoise/default.nix b/pkgs/misc/pnoise/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { hash = "sha256-JwWzLvgCNSLRs/ToZNFH6fN6VLEsQTmsgxxkugwjA9k="; }; - propagatedBuildInputs = with python3Packages; [ numpy ]; + dependencies = with python3Packages; [ numpy ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; meta = { description = "Vectorized port of Processing noise() function"; - inherit (src.meta) homepage; + homepage = "https://github.com/plottertools/pnoise"; license = lib.licenses.lgpl2Plus; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/misc/qasync/default.nix b/pkgs/misc/qasync/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Python library for using asyncio in Qt-based applications"; - inherit (src.meta) homepage; + homepage = "https://github.com/CabbageDevelopment/qasync"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/misc/qoiview/default.nix b/pkgs/misc/qoiview/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qoiview"; - version = "2021-12-22"; + version = "0-unstable-2024-05-10"; src = fetchFromGitHub { owner = "floooh"; repo = "qoiview"; - rev = "ccc7ae1fa1b80716f243115d3855aba7a49aa6b8"; - hash = "sha256-8QIDEBlzUSKPdOhmzbSwhfgy/A2QceWeinIQQe3J7h4="; + rev = "7a371020708b71d414c85977ea233d721f91d937"; + hash = "sha256-V4NdhTzTGd62pNkKhk1vo1vZa/z24r+zKbojI0ziG/E="; }; nativeBuildInputs = [ cmake ]; @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "QOI image viewer on top of the Sokol headers"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/floooh/qoiview"; 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 @@ -10,7 +10,7 @@ makeWrapper, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "repolocli"; version = "0-unstable-2021-04-06"; @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Repology commandline interface (and API)"; - inherit (src.meta) homepage; + homepage = "https://git.sr.ht/~matthiasbeyer/repolocli"; 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 @@ -4,7 +4,7 @@ buildGoModule, }: -buildGoModule rec { +buildGoModule { pname = "rhttp"; version = "0-unstable-2024-04-22"; @@ -19,7 +19,7 @@ buildGoModule rec { meta = { description = "REPL for HTTP"; - inherit (src.meta) homepage; + homepage = "https://github.com/1buran/rHttp"; license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.sikmir ]; mainProgram = "rhttp"; diff --git a/pkgs/misc/riffraff/default.nix b/pkgs/misc/riffraff/default.nix @@ -5,7 +5,7 @@ installShellFiles, }: -buildGoModule rec { +buildGoModule { pname = "riffraff"; version = "0.5.0-unstable-2022-10-25"; @@ -29,7 +29,7 @@ buildGoModule rec { meta = { description = "A commandline interface for Jenkins"; - inherit (src.meta) homepage; + homepage = "https://github.com/mre/riffraff"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; mainProgram = "riffraff"; diff --git a/pkgs/misc/rst2txt/default.nix b/pkgs/misc/rst2txt/default.nix @@ -15,11 +15,11 @@ python3Packages.buildPythonApplication rec { hash = "sha256-UqY+qD1S8tyRxvQ0GIzfBlHzsdVSaEJkmgw1WC0H/KA="; }; - nativeBuildInputs = with python3Packages; [ setuptools-scm ]; + build-system = with python3Packages; [ setuptools-scm ]; SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ docutils pygments setuptools # pkg_resources @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Convert reStructuredText to plain text"; - inherit (src.meta) homepage; + homepage = "https://github.com/stephenfin/rst2txt"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/misc/sdorfehs/default.nix b/pkgs/misc/sdorfehs/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A tiling window manager"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/jcs/sdorfehs"; 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 @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A C++ library for basic network server handling"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/KazDragon/serverpp"; 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 @@ -5,7 +5,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "shellprof"; version = "0-unstable-2021-04-27"; format = "other"; @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Profile a shell script based on its printouts"; - inherit (src.meta) homepage; + homepage = "https://github.com/walles/shellprof"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/misc/socketcand/default.nix b/pkgs/misc/socketcand/default.nix @@ -7,7 +7,7 @@ libconfig, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "socketcand"; version = "0.6.1-unstable-2023-12-06"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Server to access CAN sockets over ASCII protocol"; - inherit (src.meta) homepage; + homepage = "https://github.com/linux-can/socketcand"; license = with lib.licenses; [ gpl2Only bsd3 diff --git a/pkgs/misc/subprocess/default.nix b/pkgs/misc/subprocess/default.nix @@ -7,14 +7,14 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "subprocess"; version = "0.4.0"; src = fetchFromGitHub { owner = "benman64"; repo = "subprocess"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Tgmihv7SJfYpOYHvtuE8rgFzUHyl4bJh9W5CSqotVMg="; }; @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { meta = { description = "Cross platform subprocess library for c++ similar to design of python subprocess"; - inherit (src.meta) homepage; + homepage = "https://github.com/benman64/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 @@ -1,6 +1,5 @@ { lib, - stdenv, rustPlatform, fetchFromGitHub, }: @@ -20,7 +19,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "A lightweight TUI app to view and query CSV files"; - inherit (src.meta) homepage; + homepage = "https://github.com/shshemi/tabiew"; 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 @@ -11,14 +11,14 @@ buildGoModule rec { pname = "telegabber"; - version = "1.9.5"; + version = "1.9.6"; src = fetchFromGitea { domain = "dev.narayana.im"; owner = "narayana"; repo = "telegabber"; rev = "v${version}"; - hash = "sha256-PCCo271B/SIF9n/6ohG5sA8fQeLDtTIoovs09CXdRm0="; + hash = "sha256-UkVuEgrRHDtC5Rkci87ecmvK4JyACFBplzecoIXM8vk="; }; vendorHash = "sha256-3qSa6yJXSjrmTIBrulCnZMZzqNtpkzpzWeYAzHl8uUM="; @@ -37,7 +37,7 @@ buildGoModule rec { meta = { description = "XMPP/Jabber transport to Telegram network"; - inherit (src.meta) homepage; + homepage = "https://dev.narayana.im/narayana/telegabber"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/misc/telegram-send/default.nix b/pkgs/misc/telegram-send/default.nix @@ -5,7 +5,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "telegram-send"; version = "0-unstable-2023-10-07"; @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ pip ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ appdirs colorama python-telegram-bot diff --git a/pkgs/misc/telnetpp/default.nix b/pkgs/misc/telnetpp/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A C++ library for interacting with Telnet streams"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/KazDragon/telnetpp"; 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 @@ -6,27 +6,27 @@ python3Packages.buildPythonApplication rec { pname = "tinyflux"; - version = "0.2.4"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "citrusvanilla"; repo = "tinyflux"; rev = "v${version}"; - hash = "sha256-mDbkKTFln0fYJW0DhLxdQu8ubjsjzJtJW9a+AD1NOU8="; + hash = "sha256-WgNkYFWZvZJ8MYMqfnqXH8YgjzRemMxAkyN9On+5PQI="; }; postPatch = '' echo ${version} > version.txt ''; - propagatedBuildInputs = with python3Packages; [ setuptools ]; + build-system = with python3Packages; [ setuptools ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; meta = { description = "The tiny time series database"; - inherit (src.meta) homepage; + homepage = "https://github.com/citrusvanilla/tinyflux"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/misc/tlstunnel/default.nix b/pkgs/misc/tlstunnel/default.nix @@ -30,7 +30,7 @@ ocamlPackages.buildDunePackage rec { meta = { description = "A TLS reverse proxy unikernel"; - inherit (src.meta) homepage; + homepage = "https://github.com/robur-coop/tlstunnel"; license = lib.licenses.free; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/misc/turbo/default.nix b/pkgs/misc/turbo/default.nix @@ -7,7 +7,7 @@ tvision, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "turbo"; version = "0-unstable-2024-02-05"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "An experimental text editor based on Scintilla and Turbo Vision"; - inherit (src.meta) homepage; + homepage = "https://github.com/magiblot/turbo"; 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 @@ -6,7 +6,7 @@ ncurses, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tvision"; version = "0-unstable-2024-02-28"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A modern port of Turbo Vision 2.0, the classical framework for text-based user interfaces"; - inherit (src.meta) homepage; + homepage = "https://github.com/magiblot/tvision"; 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 @@ -5,7 +5,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "wik"; version = "1.4.0"; pyproject = true; @@ -17,17 +17,18 @@ python3Packages.buildPythonApplication rec { hash = "sha256-oSHL3jYFuvJY1W7N9/CvFClFakz9f35RHg77AbMRfsI="; }; - nativeBuildInputs = with python3Packages; [ flit ]; + build-system = with python3Packages; [ flit ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ beautifulsoup4 requests ]; meta = { description = "wik is use to get information about anything on the shell using Wikipedia"; - inherit (src.meta) homepage; + homepage = "https://github.com/yashsinghcodes/wik"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; + mainProgram = "wik"; }; } diff --git a/pkgs/misc/worm/default.nix b/pkgs/misc/worm/default.nix @@ -41,7 +41,7 @@ nimPackages.buildNimPackage rec { meta = { description = "A dynamic, tag-based window manager written in Nim"; - inherit (src.meta) homepage; + homepage = "https://github.com/codic12/worm"; 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 @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage { pname = "wptools"; version = "0.4.17-unstable-2022-02-22"; @@ -15,7 +15,7 @@ python3Packages.buildPythonPackage rec { hash = "sha256-l1sCEhveK9fefZY6tL/kh2bOcq4ids4HZu6pXvn17AA="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ certifi html2text lxml @@ -26,7 +26,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Wikipedia tools (for Humans)"; - inherit (src.meta) homepage; + homepage = "https://github.com/siznax/wptools"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/misc/xtr/default.nix b/pkgs/misc/xtr/default.nix @@ -4,7 +4,7 @@ rustPlatform, fetchFromGitHub, libiconv, - Foundation, + darwin, }: rustPlatform.buildRustPackage rec { @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ libiconv - Foundation + darwin.apple_sdk.frameworks.Foundation ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-incompatible-function-pointer-types"; @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Translation tools for rust"; - inherit (src.meta) homepage; + homepage = "https://github.com/woboq/tr"; license = with lib.licenses; [ agpl3Only mit diff --git a/pkgs/misc/youtimetrack/default.nix b/pkgs/misc/youtimetrack/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, fetchFromGitHub, buildGoModule, @@ -20,7 +19,7 @@ buildGoModule rec { meta = { description = "CLI tools for YouTrack time management"; - inherit (src.meta) homepage; + homepage = "https://github.com/bullshitsoftware/youtimetrack"; 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 @@ -1,5 +1,4 @@ { - stdenv, lib, fetchFromGitHub, buildGoModule, @@ -21,7 +20,7 @@ buildGoModule rec { meta = { description = "Bridge to write MQTT to InfluxDB"; - inherit (src.meta) homepage; + homepage = "https://github.com/elgohr/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 @@ -1,5 +1,4 @@ { - stdenv, lib, fetchFromGitHub, buildGoModule, @@ -22,7 +21,7 @@ buildGoModule rec { meta = { description = "MQTT intercepting proxy"; - inherit (src.meta) homepage; + homepage = "https://github.com/NVISOsecurity/IOXY"; 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 @@ -4,7 +4,7 @@ buildGoPackage, }: -buildGoPackage rec { +buildGoPackage { pname = "janus-mqtt-proxy"; version = "0-unstable-2022-02-19"; @@ -26,7 +26,7 @@ buildGoPackage rec { meta = { description = "MITM proxy which can filter and modify MQTT packets"; - inherit (src.meta) homepage; + homepage = "https://github.com/phoenix-mstu/janus-mqtt-proxy"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/mqtt/libumqtt/default.nix b/pkgs/mqtt/libumqtt/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A Lightweight and fully asynchronous MQTT client C library based on libev"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/zhaojh329/libumqtt"; 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 @@ -1,5 +1,4 @@ { - stdenv, lib, fetchFromGitHub, buildGoModule, @@ -25,7 +24,7 @@ buildGoModule rec { meta = { description = "MQTT proxy"; - inherit (src.meta) homepage; + homepage = "https://github.com/mainflux/mproxy"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/mqtt/mqcontrol/default.nix b/pkgs/mqtt/mqcontrol/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, fetchFromGitHub, buildGoModule, @@ -20,7 +19,7 @@ buildGoModule rec { meta = { description = "Cross-platform utility to execute commands remotely using MQTT"; - inherit (src.meta) homepage; + homepage = "https://github.com/albertnis/mqcontrol"; license = lib.licenses.free; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/mqtt/mqtt-benchmark/default.nix b/pkgs/mqtt/mqtt-benchmark/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { meta = { description = "MQTT broker benchmarking tool"; - inherit (src.meta) homepage; + homepage = "https://github.com/krylovsk/mqtt-benchmark"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/mqtt/mqtt-c/default.nix b/pkgs/mqtt/mqtt-c/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A portable MQTT C client for embedded systems and PCs alike"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/LiamBindle/MQTT-C"; 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 @@ -1,11 +1,10 @@ { lib, - stdenv, fetchFromGitHub, python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "mqtt-launcher"; version = "0-unstable-2021-09-17"; format = "other"; @@ -17,7 +16,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-FEKvlED/Sgcr7vBa8HW2N7mapmARiemcJ22zwuTwORw="; }; - propagatedBuildInputs = with python3Packages; [ paho-mqtt ]; + dependencies = with python3Packages; [ paho-mqtt ]; dontUseSetuptoolsBuild = true; dontUseSetuptoolsCheck = true; @@ -28,7 +27,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Execute shell commands triggered by published MQTT messages"; - inherit (src.meta) homepage; + homepage = "https://github.com/jpmens/mqtt-launcher"; license = lib.licenses.free; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/mqtt/mqtt-proxy/default.nix b/pkgs/mqtt/mqtt-proxy/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, fetchFromGitHub, buildGoModule, @@ -21,11 +20,15 @@ buildGoModule rec { buildInputs = [ cyrus_sasl ]; - ldflags = [ "-X github.com/prometheus/common/version.Version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/prometheus/common/version.Version=${version}" + ]; meta = { description = "MQTT Proxy allows MQTT clients to send messages to other messaging systems"; - inherit (src.meta) homepage; + homepage = "https://github.com/grepplabs/mqtt-proxy"; #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 @@ -1,5 +1,4 @@ { - stdenv, lib, fetchFromGitHub, buildGoModule, @@ -18,13 +17,17 @@ buildGoModule rec { vendorHash = "sha256-kC/APQjdKPjV7ap/2QONX1Y/glqbElNiXsa2uzRLIm8="; - ldflags = [ "-X main.ApplicationVersion=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X main.ApplicationVersion=${version}" + ]; doCheck = false; meta = { description = "A interactive shell-like command line interface (CLI) for MQTT"; - inherit (src.meta) homepage; + homepage = "https://github.com/rainu/mqtt-shell"; 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 @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, python3Packages, }: @@ -24,7 +23,7 @@ python3Packages.buildPythonApplication rec { dontUseSetuptoolsBuild = true; dontUseSetuptoolsCheck = true; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ paho-mqtt influxdb ]; @@ -35,7 +34,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "IoT MQTT to InfluxDB forwarder"; - inherit (src.meta) homepage; + homepage = "https://github.com/mhaas/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 @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "MQTT message parser for writing statistics into InfluxDB"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/DavidHamburg/mqtt-to-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 @@ -4,7 +4,7 @@ rustPlatform, fetchFromGitHub, cmake, - Security, + darwin, }: rustPlatform.buildRustPackage rec { @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; meta = { description = "The MQTT ecosystem in rust"; diff --git a/pkgs/nakarte/elevation_server/default.nix b/pkgs/nakarte/elevation_server/default.nix @@ -30,7 +30,7 @@ buildGoPackage rec { meta = { description = "The server providing elevation data"; - inherit (src.meta) homepage; + homepage = "https://github.com/wladich/elevation_server"; 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 @@ -12,7 +12,7 @@ wrapGAppsHook, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "map-tiler"; version = "0-unstable-2022-08-06"; @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { pango ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ pyyaml pyproj pypng @@ -58,7 +58,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Raster maps to map tiles"; - inherit (src.meta) homepage; + homepage = "https://github.com/wladich/map-tiler"; license = lib.licenses.free; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/nakarte/maprec/default.nix b/pkgs/nakarte/maprec/default.nix @@ -6,7 +6,7 @@ thinplatespline, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage { pname = "maprec"; version = "0-unstable-2023-04-18"; @@ -22,7 +22,7 @@ python3Packages.buildPythonPackage rec { --replace-fail " @ git+https://github.com/wladich/thinplatespline.git" "" ''; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ pyyaml pyproj thinplatespline @@ -33,7 +33,7 @@ python3Packages.buildPythonPackage rec { pythonImportsCheck = [ "maprec" ]; meta = { - inherit (src.meta) homepage; + homepage = "https://github.com/wladich/maprec"; license = lib.licenses.free; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/nakarte/ozi_map/default.nix b/pkgs/nakarte/ozi_map/default.nix @@ -6,7 +6,7 @@ maprec, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage { pname = "ozi_map"; version = "0-unstable-2022-08-05"; @@ -22,7 +22,7 @@ python3Packages.buildPythonPackage rec { --replace-fail " @ git+https://github.com/wladich/maprec.git" "" ''; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ maprec pyproj ]; @@ -33,7 +33,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Python module for reading OziExplorer .map files"; - inherit (src.meta) homepage; + homepage = "https://github.com/wladich/ozi_map"; license = lib.licenses.free; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/nakarte/pyimagequant/default.nix b/pkgs/nakarte/pyimagequant/default.nix @@ -5,7 +5,7 @@ python3Packages, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage { pname = "pyimagequant"; version = "0-unstable-2022-06-10"; @@ -28,7 +28,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Python bindings for libimagequant (pngquant core)"; - inherit (src.meta) homepage; + homepage = "https://github.com/wladich/pyimagequant"; license = lib.licenses.free; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/nakarte/thinplatespline/default.nix b/pkgs/nakarte/thinplatespline/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage { pname = "thinplatespline"; version = "0-unstable-2024-02-06"; @@ -21,7 +21,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Python library for thin plate spline calculations"; - inherit (src.meta) homepage; + homepage = "https://github.com/wladich/thinplatespline"; 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 @@ -21,7 +21,7 @@ let ) ''; in -buildPythonPackage rec { +buildPythonPackage { pname = "tracks_storage_server"; version = "2024-04-27"; @@ -37,7 +37,7 @@ buildPythonPackage rec { substitute config.py.example config.py --replace-fail "'password" "#'password" ''; - propagatedBuildInputs = [ + dependencies = [ msgpack protobuf psycopg2 @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = { description = "Tracks storage server"; - inherit (src.meta) homepage; + homepage = "https://github.com/wladich/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 @@ -4,7 +4,7 @@ fetchFromGitHub, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage { pname = "cykhash"; version = "2.0.1"; @@ -32,7 +32,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "cython wrapper for khash"; - inherit (src.meta) homepage; + homepage = "https://github.com/realead/cykhash"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/osm/gcgn-converter/default.nix b/pkgs/osm/gcgn-converter/default.nix @@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Ковертер ГКГН из PDF в GeoJSON"; - inherit (src.meta) homepage; + homepage = "https://github.com/Miroff/gcgn-converter"; license = lib.licenses.free; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/osm/level0/default.nix b/pkgs/osm/level0/default.nix @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation rec { meta = { description = "Web-based OpenStreetMap Editor"; - inherit (src.meta) homepage; + homepage = "https://github.com/Zverik/Level0"; license = lib.licenses.wtfpl; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/osm/map-machine/default.nix b/pkgs/osm/map-machine/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-aOfvVyTgDxh7T2oAc+S1eU9b/JjXAhfc3WfR27ECXcY="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ cairosvg colour numpy @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A simple renderer for OpenStreetMap with custom icons"; - inherit (src.meta) homepage; + homepage = "https://github.com/enzet/map-machine"; 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 @@ -5,7 +5,7 @@ qt5, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "map-stylizer"; version = "0-unstable-2020-06-30"; format = "other"; @@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "GUI written in Python to parse OSM (OpenStreetMap) files and render them onscreen"; - inherit (src.meta) homepage; + homepage = "https://github.com/Absolute-Tinkerer/map-stylizer"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/osm/memphis/default.nix b/pkgs/osm/memphis/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Map-rendering for OpenStreetMap"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/jiuka/memphis"; 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 @@ -21,7 +21,7 @@ python3Packages.buildPythonPackage rec { --replace-fail "'pytest" "#'pytest" \ ''; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ beautifulsoup4 geojson lxml @@ -43,7 +43,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "A library to access OpenStreetMap related services"; - inherit (src.meta) homepage; + homepage = "https://github.com/mocnik-science/osm-python-tools"; 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 @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Transform tags in OSM files using Lua code"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/osmcode/osm-tags-transform"; 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 @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "osm2geojson"; version = "0.1.33"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { fetchSubmodules = true; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ shapely requests ]; @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Convert OSM and Overpass JSON to GeoJSON"; - inherit (src.meta) homepage; + homepage = "https://github.com/aspectumapp/osm2geojson"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/osm/osmdbt/default.nix b/pkgs/osm/osmdbt/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "OSM Database Replication Tools"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/openstreetmap/osmdbt"; 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 @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "osmwalkthrough"; version = "0-unstable-2021-09-24"; format = "other"; @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Draw ways you want to walk through"; - inherit (src.meta) homepage; + homepage = "https://github.com/leotrubach/osmwalkthrough"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/osm/overpassforge/default.nix b/pkgs/osm/overpassforge/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "A library for generating OpenStreetMap's Overpass QL queries from Python objects"; - inherit (src.meta) homepage; + homepage = "https://github.com/Krafpy/Overpass-Forge"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/osm/phyghtmap/default.nix b/pkgs/osm/phyghtmap/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ beautifulsoup4 lxml matplotlib diff --git a/pkgs/osm/planetiler/default.nix b/pkgs/osm/planetiler/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Flexible tool to build planet-scale vector tilesets from OpenStreetMap data"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/onthegomap/planetiler"; 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 @@ -5,9 +5,9 @@ sqlite, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "polytiles"; - version = "2017-06-09"; + version = "0-unstable-2017-06-09"; src = fetchFromGitHub { owner = "Zverik"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-7rsMx8sQgl8cRiUncP3/mPne6ARj3K2FICU+frUeEUs="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ psycopg2 python-mapnik shapely @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A script to render tiles for an area with mapnik"; - inherit (src.meta) homepage; + homepage = "https://github.com/Zverik/polytiles"; 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 @@ -18,7 +18,7 @@ python3Packages.buildPythonPackage rec { postPatch = "sed -i 's/==.*//' requirements.txt"; - propagatedBuildInputs = with python3Packages; [ osmnx ]; + dependencies = with python3Packages; [ osmnx ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook @@ -34,7 +34,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Create beautiful maps from OpenStreetMap data in a webapp"; - inherit (src.meta) homepage; + homepage = "https://github.com/chrieke/prettymapp"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/osm/pyrobuf/default.nix b/pkgs/osm/pyrobuf/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonPackage { pname = "pyrobuf"; version = "0.9.3"; @@ -20,7 +20,7 @@ python3Packages.buildPythonPackage rec { pytest-runner ]; - propagatedBuildInputs = with python3Packages; [ jinja2 ]; + dependencies = with python3Packages; [ jinja2 ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; @@ -28,7 +28,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "A Cython based protobuf compiler"; - inherit (src.meta) homepage; + homepage = "https://github.com/appnexus/pyrobuf"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/osm/pyrosm/default.nix b/pkgs/osm/pyrosm/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonPackage rec { nativeBuildInputs = with python3Packages; [ cython ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ python-rapidjson geopandas shapely @@ -36,7 +36,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "A Python tool to parse OSM data from Protobuf format into GeoDataFrame"; - inherit (src.meta) homepage; + homepage = "https://github.com/HTenkanen/pyrosm"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/osm/sdlmap/default.nix b/pkgs/osm/sdlmap/default.nix @@ -8,7 +8,7 @@ SDL2_image, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "sdlmap"; version = "2014-02-09"; @@ -36,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A SDL + libcurl OpenStreetMap viewer"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/jhawthorn/sdlmap"; 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 @@ -15,7 +15,7 @@ python3Packages.buildPythonPackage rec { hash = "sha256-QytanQQPIlQTog2tTMAwdFXWbXnU4NaA7Zqh4DXFubY="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ numpy ipython pillow @@ -26,7 +26,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "OpenStreetMap image tiles in Python"; - inherit (src.meta) homepage; + homepage = "https://github.com/rossant/smopy"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/osm/smrender/default.nix b/pkgs/osm/smrender/default.nix @@ -6,7 +6,7 @@ pkg-config, cairo, librsvg, - Foundation, + darwin, memstreamHook, testers, }: @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { librsvg ] ++ lib.optionals stdenv.isDarwin [ - Foundation + darwin.apple_sdk.frameworks.Foundation memstreamHook ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A powerful, flexible, and modular rule-based rendering engine for OSM data"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/rahra/smrender"; 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 @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ flake8 ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ click publicsuffixlist pyathena @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Tilelog is used to generate tile logs for the OSMF Standard map layer"; - inherit (src.meta) homepage; + homepage = "https://github.com/openstreetmap/tilelog"; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.sikmir ]; }; diff --git a/pkgs/radio/acarsdec/default.nix b/pkgs/radio/acarsdec/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "ACARS SDR decoder"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/TLeconte/acarsdec"; 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 @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Rust ADS-B decoder + tui radar application"; - inherit (src.meta) homepage; + homepage = "https://github.com/rsadsb/adsb_deku"; 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 @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A multi-platform AIS Receiver"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/jvde-github/AIS-catcher"; 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 @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Multichannel HFDL decoder"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/szpajder/dumphfdl"; 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 @@ -11,8 +11,7 @@ soapysdr, sqlite, zeromq, - AppKit, - Foundation, + darwin, }: stdenv.mkDerivation (finalAttrs: { @@ -42,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { 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"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/szpajder/dumpvdl2"; 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 @@ -14,14 +14,14 @@ 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="; }; @@ -81,9 +81,9 @@ stdenv.mkDerivation rec { meta = { description = "A simple FM receiver"; - inherit (src.meta) homepage; + homepage = "https://github.com/JvanKatwijk/sdr-j-fm"; 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 @@ -9,7 +9,7 @@ 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 @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A frequency scanner for Gqrx Software Defined Radio receiver"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/neural75/gqrx-scanner"; 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 @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A library for decoding various ACARS message payloads"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/szpajder/libacars"; 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 @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Universal wireless communication library for embedded devices"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/jgromes/RadioLib"; 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 @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Multichannel AM/NFM demodulator"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/charlie-foxtrot/RTLSDR-Airband"; 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 @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "A rust implementation of rtl-tcp"; - inherit (src.meta) homepage; + homepage = "https://github.com/niclashoyer/rtltcp"; license = with lib.licenses; [ asl20 mit diff --git a/pkgs/radio/sdr-modem/default.nix b/pkgs/radio/sdr-modem/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Modem based on software defined radios"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/dernasherbrezon/sdr-modem"; 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 @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "High performant TCP server for rtl-sdr"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/dernasherbrezon/sdr-server"; 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 @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "amateur radio receiver in <100 code lines"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/ha7ilm/smallrx"; 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 @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "music player daemon NIH"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/omar-polo/amused"; 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 @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A small C compiler"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/rui314/chibicc"; 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 @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "C11 compiler using QBE as a backend"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://sr.ht/~mcf/cproc"; 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 @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Drag and drop source/target for X"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/mwh/dragon"; 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 @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A suckless, simple, featured text editor"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/arthur-jacquin/edit"; 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 @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A collection of farbfeld tools"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/sirjofri/ff-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 @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "farbfeld screenshot utility"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/shinyblink/ffshot"; 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 @@ -17,8 +17,7 @@ stdenv.mkDerivation (finalAttrs: { }; postPatch = '' - substituteInPlace libimsg.pc.in \ - --subst-var-by LIBDIR "lib" + substituteInPlace libimsg.pc.in --subst-var-by LIBDIR "lib" ''; nativeBuildInputs = [ validatePkgConfig ]; @@ -27,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Unofficial port of OpenBSD's imsg utilities"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/bsd-ac/imsg-compat"; 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 @@ -16,12 +16,14 @@ stdenv.mkDerivation (finalAttrs: { }; installPhase = '' + runHook preInstall install -Dm755 kilo -t $out/bin + runHook postInstall ''; meta = { description = "A text editor in less than 1000 LOC with syntax highlight and search"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/antirez/kilo"; 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 @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A simple, self-hosting C compiler"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/larmel/lacc"; 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 @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A simple Bluetooth manager"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://git.weitnahbei.de/nullmark/little_blue_man"; 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 @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "line chat is a simple and elegant front end for ii-like chat programs"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/younix/lchat"; 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 @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Suckless Terminal ANSI parser"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/jeremybobbin/libst"; 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 @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Plan 9 compatible UTF-8 C library"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/cls/libutf"; 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 @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "iMAGE viewer"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/explosion-mental/mage"; 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 @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Makefile linter"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/maandree/makel"; 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 @@ -22,12 +22,14 @@ stdenv.mkDerivation (finalAttrs: { ''; installPhase = '' + runHook preInstall PREFIX=$out sh ./build.sh install + runHook postInstall ''; meta = { description = "Next version of neatvi (a small vi/ex editor)"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/kyx0r/nextvi"; 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 @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Piped status: the ii of status bars!"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/xandkar/pista"; 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 @@ -4,13 +4,13 @@ fetchgit, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "saait"; version = "0.8"; src = fetchgit { url = "git://git.codemadness.org/saait"; - rev = version; + rev = finalAttrs.version; hash = "sha256-W86JAYUsyvOWt/YTqXfqMA/CwQq7uVIV1F6+AeRB/8s="; }; @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; skip.ci = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/suckless/se/default.nix b/pkgs/suckless/se/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "screen oriented version of the classic UNIX text editor ed"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/screen-editor/se"; 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 @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Simple Terminal Hotkey Daemon"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/jeremybobbin/sthkd"; 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 @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Simple Virtual Terminal Manager"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/jeremybobbin/svtm"; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sikmir ];