diff --git a/ci/OWNERS b/ci/OWNERS index 19100d11b58e..d75b4b22cabf 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -115,9 +115,9 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza /nixos/modules/system/activation/bootspec.cue @grahamc @cole-h @raitobezarius # NixOS Render Docs -/pkgs/by-name/ni/nixos-render-docs @fricklerhandwerk @GetPsyched @hsjobeki -/doc/redirects.json @fricklerhandwerk @GetPsyched @hsjobeki -/nixos/doc/manual/redirects.json @fricklerhandwerk @GetPsyched @hsjobeki +/pkgs/by-name/ni/nixos-render-docs @GetPsyched @hsjobeki +/doc/redirects.json @GetPsyched +/nixos/doc/manual/redirects.json @GetPsyched # NixOS integration test driver /nixos/lib/test-driver @tfc diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index d09e35c3a84b..d84b5fd80a1c 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -21,7 +21,7 @@ pkgs.mkShell { nativeBuildInputs = with ocamlPackages; [ ocaml findlib - dune_2 + pkgs.dune ocaml-lsp ]; # dependencies diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bc1aa8990ef0..55f3378293a1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12777,6 +12777,12 @@ github = "jonocodes"; githubId = 1310468; }; + joostn = { + name = "Joost Nieuwenhuijse"; + email = "joost@newhouse.nl"; + github = "joostn"; + githubId = 1309157; + }; jopejoe1 = { email = "nixpkgs@missing.ninja"; matrix = "@jopejoe1:matrix.org"; @@ -18262,6 +18268,12 @@ githubId = 18604892; name = "Nathan Ruiz"; }; + nathanscully = { + email = "nath@nscully.com"; + github = "nathanscully"; + githubId = 3359816; + name = "Nathan Scully"; + }; nathyong = { github = "nathyong"; githubId = 818502; diff --git a/nixos/tests/bitcoind.nix b/nixos/tests/bitcoind.nix index a4ec0beb51b5..f00f18011ec6 100644 --- a/nixos/tests/bitcoind.nix +++ b/nixos/tests/bitcoind.nix @@ -1,8 +1,8 @@ -{ pkgs, ... }: +{ lib, ... }: { name = "bitcoind"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ _1000101 ]; + meta = { + maintainers = with lib.maintainers; [ _1000101 ]; }; nodes.machine = diff --git a/nixos/tests/blockbook-frontend.nix b/nixos/tests/blockbook-frontend.nix index bf6d6bb458c4..2851bf97650f 100644 --- a/nixos/tests/blockbook-frontend.nix +++ b/nixos/tests/blockbook-frontend.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { name = "blockbook-frontend"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ _1000101 ]; + meta = { + maintainers = with pkgs.lib.maintainers; [ _1000101 ]; }; nodes.machine = diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix index ed965600d277..d26ad166de5d 100644 --- a/nixos/tests/borgbackup.nix +++ b/nixos/tests/borgbackup.nix @@ -42,8 +42,8 @@ let in { name = "borgbackup"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ dotlambda ]; + meta = { + maintainers = with pkgs.lib.maintainers; [ dotlambda ]; }; nodes = { diff --git a/nixos/tests/btrbk-doas.nix b/nixos/tests/btrbk-doas.nix index 326998b16b49..4443cf43523f 100644 --- a/nixos/tests/btrbk-doas.nix +++ b/nixos/tests/btrbk-doas.nix @@ -16,8 +16,8 @@ let in { name = "btrbk-doas"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ + meta = { + maintainers = with pkgs.lib.maintainers; [ symphorien tu-maurice ]; diff --git a/nixos/tests/btrbk.nix b/nixos/tests/btrbk.nix index 10ca8c3ca95e..b7f3ee1da5e6 100644 --- a/nixos/tests/btrbk.nix +++ b/nixos/tests/btrbk.nix @@ -16,8 +16,8 @@ let in { name = "btrbk"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ symphorien ]; + meta = { + maintainers = with pkgs.lib.maintainers; [ symphorien ]; }; nodes = { diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix index 8307c443f16d..2e30ab269c22 100644 --- a/nixos/tests/dokuwiki.nix +++ b/nixos/tests/dokuwiki.nix @@ -102,8 +102,8 @@ let in { name = "dokuwiki"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ + meta = { + maintainers = with pkgs.lib.maintainers; [ _1000101 onny e1mo diff --git a/nixos/tests/geth.nix b/nixos/tests/geth.nix index 49a2c4f11701..37d55cfe697e 100644 --- a/nixos/tests/geth.nix +++ b/nixos/tests/geth.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { name = "geth"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ bachp ]; + meta = { + maintainers = with pkgs.lib.maintainers; [ bachp ]; }; nodes.machine = diff --git a/nixos/tests/jibri.nix b/nixos/tests/jibri.nix index 2bfc41ed188d..9199f347fb2c 100644 --- a/nixos/tests/jibri.nix +++ b/nixos/tests/jibri.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { name = "jibri"; - meta = with pkgs.lib; { - maintainers = teams.jitsi.members; + meta = { + maintainers = pkgs.lib.teams.jitsi.members; }; nodes.machine = diff --git a/nixos/tests/jitsi-meet.nix b/nixos/tests/jitsi-meet.nix index 2181ed863a88..1237f442c24e 100644 --- a/nixos/tests/jitsi-meet.nix +++ b/nixos/tests/jitsi-meet.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { name = "jitsi-meet"; - meta = with pkgs.lib; { - maintainers = teams.jitsi.members; + meta = { + maintainers = pkgs.lib.teams.jitsi.members; }; nodes = { diff --git a/nixos/tests/matrix/dendrite.nix b/nixos/tests/matrix/dendrite.nix index 4477f522a37b..0540cb3b7f3c 100644 --- a/nixos/tests/matrix/dendrite.nix +++ b/nixos/tests/matrix/dendrite.nix @@ -8,8 +8,8 @@ let in { name = "dendrite"; - meta = with pkgs.lib; { - maintainers = teams.matrix.members; + meta = { + maintainers = pkgs.lib.teams.matrix.members; }; nodes = { diff --git a/nixos/tests/matrix/pantalaimon.nix b/nixos/tests/matrix/pantalaimon.nix index eb2123ee3ca6..b2538ca17dfb 100644 --- a/nixos/tests/matrix/pantalaimon.nix +++ b/nixos/tests/matrix/pantalaimon.nix @@ -31,8 +31,8 @@ let in { name = "pantalaimon"; - meta = with pkgs.lib; { - maintainers = teams.matrix.members; + meta = { + maintainers = pkgs.lib.teams.matrix.members; }; nodes.machine = diff --git a/nixos/tests/mosquitto.nix b/nixos/tests/mosquitto.nix index e4bdb106b8e0..bb21c4b1a5ad 100644 --- a/nixos/tests/mosquitto.nix +++ b/nixos/tests/mosquitto.nix @@ -58,8 +58,8 @@ let in { name = "mosquitto"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ peterhoeg ]; + meta = { + maintainers = with pkgs.lib.maintainers; [ peterhoeg ]; }; nodes = diff --git a/nixos/tests/nats.nix b/nixos/tests/nats.nix index 2ed97ee86b09..ea9dcf34e4d8 100644 --- a/nixos/tests/nats.nix +++ b/nixos/tests/nats.nix @@ -6,11 +6,11 @@ let topic = "foo.bar"; in -{ pkgs, lib, ... }: +{ lib, ... }: { name = "nats"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ c0deaddict ]; + meta = { + maintainers = with lib.maintainers; [ c0deaddict ]; }; nodes = diff --git a/nixos/tests/retroarch.nix b/nixos/tests/retroarch.nix index 5f4fe101b46d..08661a0ed0bf 100644 --- a/nixos/tests/retroarch.nix +++ b/nixos/tests/retroarch.nix @@ -2,8 +2,8 @@ { name = "retroarch"; - meta = with pkgs.lib; { - maintainers = teams.libretro.members ++ [ maintainers.j0hax ]; + meta = { + maintainers = pkgs.lib.teams.libretro.members ++ [ pkgs.lib.maintainers.j0hax ]; }; nodes.machine = diff --git a/nixos/tests/trezord.nix b/nixos/tests/trezord.nix index 4955ecb9c714..3d7658754bc8 100644 --- a/nixos/tests/trezord.nix +++ b/nixos/tests/trezord.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { name = "trezord"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ + meta = { + maintainers = with pkgs.lib.maintainers; [ mmahut _1000101 ]; diff --git a/nixos/tests/trickster.nix b/nixos/tests/trickster.nix index e987341bc7de..6710af753c7c 100644 --- a/nixos/tests/trickster.nix +++ b/nixos/tests/trickster.nix @@ -1,8 +1,8 @@ { pkgs, ... }: { name = "trickster"; - meta = with pkgs.lib; { - maintainers = with maintainers; [ _1000101 ]; + meta = { + maintainers = with pkgs.lib.maintainers; [ _1000101 ]; }; nodes = { diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json index 2bf80fffcf31..105dec49dd4e 100644 --- a/pkgs/applications/editors/jetbrains/bin/versions.json +++ b/pkgs/applications/editors/jetbrains/bin/versions.json @@ -56,7 +56,7 @@ "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.5.tar.gz", "build_number": "252.28238.7" }, - "idea-ultimate": { + "idea": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", "version": "2025.2.5", @@ -89,12 +89,12 @@ "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.5.tar.gz", "build_number": "252.28238.29" }, - "pycharm-professional": { + "pycharm": { "update-channel": "PyCharm RELEASE", - "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", + "url-template": "https://download.jetbrains.com/python/pycharm-{version}.tar.gz", "version": "2025.2.5", "sha256": "b1e47419e5844c38e7a7a9be9e5260c75cea6aa8423f2584dc1727f792d5feb4", - "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.5.tar.gz", + "url": "https://download.jetbrains.com/python/pycharm-2025.2.5.tar.gz", "build_number": "252.28238.29" }, "rider": { @@ -195,7 +195,7 @@ "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.5-aarch64.tar.gz", "build_number": "252.28238.7" }, - "idea-ultimate": { + "idea": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", "version": "2025.2.5", @@ -228,12 +228,12 @@ "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.5-aarch64.tar.gz", "build_number": "252.28238.29" }, - "pycharm-professional": { + "pycharm": { "update-channel": "PyCharm RELEASE", - "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz", + "url-template": "https://download.jetbrains.com/python/pycharm-{version}-aarch64.tar.gz", "version": "2025.2.5", "sha256": "7037672c6913f643ec4979ca5f16791588e001ffd39f830d874587f79e358be2", - "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.5-aarch64.tar.gz", + "url": "https://download.jetbrains.com/python/pycharm-2025.2.5-aarch64.tar.gz", "build_number": "252.28238.29" }, "rider": { @@ -334,7 +334,7 @@ "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.5.dmg", "build_number": "252.28238.7" }, - "idea-ultimate": { + "idea": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", "version": "2025.2.5", @@ -367,12 +367,12 @@ "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.5.dmg", "build_number": "252.28238.29" }, - "pycharm-professional": { + "pycharm": { "update-channel": "PyCharm RELEASE", - "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", + "url-template": "https://download.jetbrains.com/python/pycharm-{version}.dmg", "version": "2025.2.5", "sha256": "00eccdeb39bd8eeaed1b98ad99f542fbc3851389f9e7d19355d05dfd979eb669", - "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.5.dmg", + "url": "https://download.jetbrains.com/python/pycharm-2025.2.5.dmg", "build_number": "252.28238.29" }, "rider": { @@ -473,7 +473,7 @@ "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.5-aarch64.dmg", "build_number": "252.28238.7" }, - "idea-ultimate": { + "idea": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", "version": "2025.2.5", @@ -506,12 +506,12 @@ "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.5-aarch64.dmg", "build_number": "252.28238.29" }, - "pycharm-professional": { + "pycharm": { "update-channel": "PyCharm RELEASE", - "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", + "url-template": "https://download.jetbrains.com/python/pycharm-{version}-aarch64.dmg", "version": "2025.2.5", "sha256": "71da1283259bc59897e5bb43c6c3771a72d026419ed4d79192889ea3885ac0de", - "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.5-aarch64.dmg", + "url": "https://download.jetbrains.com/python/pycharm-2025.2.5-aarch64.dmg", "build_number": "252.28238.29" }, "rider": { diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index ccf66339bb76..a1230f66d418 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,11 +1,12 @@ let # `ides.json` is handwritten and contains information that doesn't change across updates, like maintainers and other metadata # `versions.json` contains everything generated/needed by the update script version numbers, build numbers and tarball hashes - ideInfo = builtins.fromJSON (builtins.readFile ./bin/ides.json); + ideInfo = builtins.fromJSON (builtins.readFile ./ides.json); versions = builtins.fromJSON (builtins.readFile ./bin/versions.json); in { + config, lib, stdenv, callPackage, @@ -116,16 +117,8 @@ let passthru.tests = extraTests // { plugins = callPackage ./plugins/tests.nix { ideName = pname; }; }; - libdbm = - if ideInfo."${pname}".meta.isOpenSource then - communitySources."${pname}".libdbm - else - communitySources.idea-community.libdbm; - fsnotifier = - if ideInfo."${pname}".meta.isOpenSource then - communitySources."${pname}".fsnotifier - else - communitySources.idea-community.fsnotifier; + libdbm = communitySources."${pname}".libdbm or communitySources.idea-oss.libdbm; + fsnotifier = communitySources."${pname}".fsnotifier or communitySources.idea-oss.fsnotifier; }; communitySources = callPackage ./source { }; @@ -181,16 +174,30 @@ let --replace-needed libcrypt.so.1 libcrypt.so \ ${lib.optionalString stdenv.hostPlatform.isAarch "--replace-needed libxml2.so.2 libxml2.so"} ''; -in -rec { - # Sorted alphabetically - aqua = mkJetBrainsProduct { - pname = "aqua"; + # TODO: These can be moved down again when we don't need the aliases anymore: + _idea = buildIdea { + pname = "idea"; extraBuildInputs = [ lldb + musl ]; }; + _idea-oss = buildIdea { + pname = "idea-oss"; + fromSource = true; + }; + _pycharm = buildPycharm { + pname = "pycharm"; + extraBuildInputs = [ musl ]; + }; + _pycharm-oss = buildPycharm { + pname = "pycharm-oss"; + fromSource = true; + }; +in +{ + # Sorted alphabetically. Deprecated products and aliases are at the very end. clion = (mkJetBrainsProduct { @@ -270,28 +277,9 @@ rec { ''; }); - idea-community-bin = buildIdea { - pname = "idea-community"; - }; + idea = _idea; - idea-community-src = buildIdea { - pname = "idea-community"; - fromSource = true; - }; - - idea-community = - if stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64 then - idea-community-bin - else - idea-community-src; - - idea-ultimate = buildIdea { - pname = "idea-ultimate"; - extraBuildInputs = [ - lldb - musl - ]; - }; + idea-oss = _idea-oss; mps = mkJetBrainsProduct { pname = "mps"; }; @@ -302,20 +290,9 @@ rec { ]; }; - pycharm-community-bin = buildPycharm { pname = "pycharm-community"; }; + pycharm = _pycharm; - pycharm-community-src = buildPycharm { - pname = "pycharm-community"; - fromSource = true; - }; - - pycharm-community = - if stdenv.hostPlatform.isDarwin then pycharm-community-bin else pycharm-community-src; - - pycharm-professional = buildPycharm { - pname = "pycharm-professional"; - extraBuildInputs = [ musl ]; - }; + pycharm-oss = _pycharm-oss; rider = (mkJetBrainsProduct { @@ -390,13 +367,70 @@ rec { ]; }; - writerside = mkJetBrainsProduct { - pname = "writerside"; - extraBuildInputs = [ - musl - ]; - }; + # Plugins plugins = callPackage ./plugins { }; } + +// lib.optionalAttrs config.allowAliases rec { + + # Deprecated products and aliases. + + aqua = + lib.warnOnInstantiate + "jetbrains.aqua: Aqua has been discontinued by Jetbrains and is not receiving updates. It will be removed in NixOS 26.05." + (mkJetBrainsProduct { + pname = "aqua"; + extraBuildInputs = [ + lldb + ]; + }); + + idea-community = + lib.warnOnInstantiate + "jetbrains.idea-community: IntelliJ IDEA Community has been discontinued by Jetbrains. This deprecated alias uses the, no longer updated, binary build on Darwin & Linux aarch64. On other platforms it uses IDEA Open Source, built from source. Either switch to 'jetbrains.idea-oss' or 'jetbrains.idea'. See: https://blog.jetbrains.com/idea/2025/07/intellij-idea-unified-distribution-plan/" + ( + if stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64 then + idea-community-bin + else + _idea-oss + ); + + idea-community-bin = + lib.warnOnInstantiate + "jetbrains.idea-community-bin: IntelliJ IDEA Community has been discontinued by Jetbrains. This binary build is no longer updated. Switch to 'jetbrains.idea-oss' for open source builds (from source) or 'jetbrains.idea' for commercial builds (binary, unfree). See: https://blog.jetbrains.com/idea/2025/07/intellij-idea-unified-distribution-plan/" + (buildIdea { + pname = "idea-community"; + }); + + idea-ultimate = lib.warnOnInstantiate "'jetbrains.idea-ultimate' has been renamed to/replaced by 'jetbrains.idea'" _idea; + + idea-community-src = lib.warnOnInstantiate "jetbrains.idea-community-src: IntelliJ IDEA Community has been discontinued by Jetbrains. This is now an alias for 'jetbrains.idea-oss', the Open Source build of IntelliJ. See: https://blog.jetbrains.com/idea/2025/07/intellij-idea-unified-distribution-plan/" _idea-oss; + + pycharm-community = + lib.warnOnInstantiate + "pycharm-comminity: PyCharm Community has been discontinued by Jetbrains. This deprecated alias uses the, no longer updated, binary build on Darwin. On Linux it uses PyCharm Open Source, built from source. Either switch to 'jetbrains.pycharm-oss' or 'jetbrains.pycharm'. See: https://blog.jetbrains.com/pycharm/2025/04/pycharm-2025" + (if stdenv.hostPlatform.isDarwin then pycharm-community-bin else _pycharm-oss); + + pycharm-community-bin = + lib.warnOnInstantiate + "pycharm-comminity-bin: PyCharm Community has been discontinued by Jetbrains. This binary build is no longer updated. Switch to 'jetbrains.pycharm-oss' for open source builds (from source) or 'jetbrains.pycharm' for commercial builds (binary, unfree). See: https://blog.jetbrains.com/pycharm/2025/04/pycharm-2025" + (buildPycharm { + pname = "pycharm-community"; + }); + + pycharm-community-src = lib.warnOnInstantiate "jetbrains.idea-community-src: PyCharm Community has been discontinued by Jetbrains. This is now an alias for 'jetbrains.pycharm-oss', the Open Source build of PyCharm. See: https://blog.jetbrains.com/pycharm/2025/04/pycharm-2025" _pycharm-oss; + + pycharm-professional = lib.warnOnInstantiate "'jetbrains.pycharm-professional' has been renamed to/replaced by 'jetbrains.pycharm'" _pycharm; + + writerside = + lib.warnOnInstantiate + "jetbrains.writerside: Writerside has been discontinued by Jetbrains and is not receiving updates. It will be removed in NixOS 26.05." + (mkJetBrainsProduct { + pname = "writerside"; + extraBuildInputs = [ + musl + ]; + }); +} diff --git a/pkgs/applications/editors/jetbrains/bin/ides.json b/pkgs/applications/editors/jetbrains/ides.json similarity index 83% rename from pkgs/applications/editors/jetbrains/bin/ides.json rename to pkgs/applications/editors/jetbrains/ides.json index a4ec3d82583f..49f2710ede97 100644 --- a/pkgs/applications/editors/jetbrains/bin/ides.json +++ b/pkgs/applications/editors/jetbrains/ides.json @@ -66,25 +66,37 @@ "homepage": "https://www.jetbrains.com/go/" } }, + "idea": { + "product": "IntelliJ IDEA", + "productShort": "IDEA", + "wmClass": "jetbrains-idea", + "meta": { + "isOpenSource": false, + "description": "Java, Kotlin, Groovy and Scala IDE from Jetbrains", + "maintainers": [ "gytis-ivaskevicius", "tymscar" ], + "longDescription": "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ.", + "homepage": "https://www.jetbrains.com/idea/" + } + }, "idea-community": { "product": "IntelliJ IDEA CE", "productShort": "IDEA", "wmClass": "jetbrains-idea-ce", "meta": { "isOpenSource": true, - "description": "Free Java, Kotlin, Groovy and Scala IDE from jetbrains", + "description": "Free Java, Kotlin, Groovy and Scala IDE from Jetbrains", "maintainers": [ "gytis-ivaskevicius", "tymscar" ], "longDescription": "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ.", "homepage": "https://www.jetbrains.com/idea/" } }, - "idea-ultimate": { - "product": "IntelliJ IDEA", + "idea-oss": { + "product": "IntelliJ IDEA Open Source", "productShort": "IDEA", - "wmClass": "jetbrains-idea", + "wmClass": "jetbrains-idea-ce", "meta": { - "isOpenSource": false, - "description": "Paid-for Java, Kotlin, Groovy and Scala IDE from jetbrains", + "isOpenSource": true, + "description": "Free Java, Kotlin, Groovy and Scala IDE from Jetbrains", "maintainers": [ "gytis-ivaskevicius", "tymscar" ], "longDescription": "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ.", "homepage": "https://www.jetbrains.com/idea/" @@ -112,6 +124,18 @@ "homepage": "https://www.jetbrains.com/phpstorm/" } }, + "pycharm": { + "product": "PyCharm", + "productShort": "PyCharm", + "wmClass": "jetbrains-pycharm", + "meta": { + "isOpenSource": false, + "description": "Python IDE from JetBrains", + "maintainers": [ "genericnerdyusername", "tymscar" ], + "longDescription": "Python IDE with complete set of tools for productive development with Python programming language. In addition, the IDE provides high-class capabilities for professional Web development with Django framework and Google App Engine. It has powerful coding assistance, navigation, a lot of refactoring features, tight integration with various Version Control Systems, Unit testing, powerful all-singing all-dancing Debugger and entire customization. PyCharm is developer driven IDE. It was developed with the aim of providing you almost everything you need for your comfortable and productive development!", + "homepage": "https://www.jetbrains.com/pycharm/" + } + }, "pycharm-community": { "product": "PyCharm CE", "productShort": "PyCharm", @@ -124,13 +148,13 @@ "homepage": "https://www.jetbrains.com/pycharm/" } }, - "pycharm-professional": { - "product": "PyCharm", + "pycharm-oss": { + "product": "PyCharm Open Source", "productShort": "PyCharm", - "wmClass": "jetbrains-pycharm", + "wmClass": "jetbrains-pycharm-ce", "meta": { - "isOpenSource": false, - "description": "Paid-for Python IDE from JetBrains", + "isOpenSource": true, + "description": "Free Python IDE from JetBrains", "maintainers": [ "genericnerdyusername", "tymscar" ], "longDescription": "Python IDE with complete set of tools for productive development with Python programming language. In addition, the IDE provides high-class capabilities for professional Web development with Django framework and Google App Engine. It has powerful coding assistance, navigation, a lot of refactoring features, tight integration with various Version Control Systems, Unit testing, powerful all-singing all-dancing Debugger and entire customization. PyCharm is developer driven IDE. It was developed with the aim of providing you almost everything you need for your comfortable and productive development!", "homepage": "https://www.jetbrains.com/pycharm/" diff --git a/pkgs/applications/editors/jetbrains/plugins/default.nix b/pkgs/applications/editors/jetbrains/plugins/default.nix index 86efec069f95..ad52ccb06a8b 100644 --- a/pkgs/applications/editors/jetbrains/plugins/default.nix +++ b/pkgs/applications/editors/jetbrains/plugins/default.nix @@ -45,7 +45,14 @@ let selectFile = id: ide: build: - if !builtins.elem ide pluginsJson.plugins."${id}".compatible then + let + # Allow all PyCharm/IDEA plugins for PyCharm/IDEA Community + # - TODO: Remove this special case once PyCharm/IDEA Community is removed + communityCheck = + (id != "pycharm-community" || builtins.elem ide pluginsJson.plugins.pycharm.compatible) + || (id != "idea-community" || builtins.elem ide pluginsJson.plugins.idea.compatible); + in + if !communityCheck && !builtins.elem ide pluginsJson.plugins."${id}".compatible then throw "Plugin with id ${id} does not support IDE ${ide}" else if !pluginsJson.plugins."${id}".builds ? "${build}" then throw "Jetbrains IDEs with build ${build} are not in nixpkgs. Try update_plugins.py with --with-build?" diff --git a/pkgs/applications/editors/jetbrains/plugins/tests.nix b/pkgs/applications/editors/jetbrains/plugins/tests.nix index f260a8560287..53cec1c28147 100644 --- a/pkgs/applications/editors/jetbrains/plugins/tests.nix +++ b/pkgs/applications/editors/jetbrains/plugins/tests.nix @@ -25,12 +25,14 @@ let goland idea-community-src idea-community-bin - idea-ultimate + idea-oss + idea mps phpstorm pycharm-community-src pycharm-community-bin - pycharm-professional + pycharm-oss + pycharm rider ruby-mine rust-rover @@ -62,11 +64,17 @@ in map (plugin: plugin.name) ( builtins.filter ( plugin: + let + # Allow all PyCharm/IDEA plugins for PyCharm/IDEA Community - TODO: Remove this special case once PyCharm/IDEA Community is removed + communityCheck = + (ide.pname == "pycharm-community" && builtins.elem "pycharm" plugin.compatible) + || (ide.pname == "idea-community" && builtins.elem "idea" plugin.compatible); + in ( # Plugin has to not be broken (!builtins.elem plugin.name broken-plugins) # IDE has to be compatible - && (builtins.elem ide.pname plugin.compatible) + && (communityCheck || builtins.elem ide.pname plugin.compatible) # Assert: The build number needs to be included (if marked compatible) && (assertMsg (builtins.elem ide.buildNumber (builtins.attrNames plugin.builds)) "For plugin ${plugin.name} no entry for IDE build ${ide.buildNumber} is defined, even though ${ide.pname} is on that build.") # The plugin has to exist for the build diff --git a/pkgs/applications/editors/jetbrains/plugins/update_plugins.py b/pkgs/applications/editors/jetbrains/plugins/update_plugins.py index c2a132cd07b0..ff31cec97e1b 100755 --- a/pkgs/applications/editors/jetbrains/plugins/update_plugins.py +++ b/pkgs/applications/editors/jetbrains/plugins/update_plugins.py @@ -22,19 +22,19 @@ TOKENS = { SNAPSHOT_VALUE = 99999 PLUGINS_FILE = Path(__file__).parent.joinpath("plugins.json").resolve() IDES_BIN_FILE = Path(__file__).parent.joinpath("../bin/versions.json").resolve() -IDES_SOURCE_FILE = Path(__file__).parent.joinpath("../source/ides.json").resolve() +IDES_SOURCE_FILE = Path(__file__).parent.joinpath("../source/sources.json").resolve() # The plugin compatibility system uses a different naming scheme to the ide update system. # These dicts convert between them FRIENDLY_TO_PLUGIN = { "clion": "CLION", "datagrip": "DBE", "goland": "GOLAND", - "idea-community": "IDEA_COMMUNITY", - "idea-ultimate": "IDEA", + "idea-oss": "IDEA", # This was "IDEA_COMMUNITY" before, but this product doesn't exist anymore. + "idea": "IDEA", "mps": "MPS", "phpstorm": "PHPSTORM", - "pycharm-community": "PYCHARM_COMMUNITY", - "pycharm-professional": "PYCHARM", + "pycharm-oss": "PYCHARM", # This was "PYCHARM_COMMUNITY" before, but this product doesn't exist anymore. + "pycharm": "PYCHARM", "rider": "RIDER", "ruby-mine": "RUBYMINE", "rust-rover": "RUST", @@ -172,7 +172,17 @@ def make_plugin_files(plugin_infos: dict, ide_versions: dict, quiet: bool, extra "builds": {}, "name": names[pid] } - relevant_builds = [builds for ide, builds in ide_versions.items() if ide in plugin_versions["compatible"]] + [extra_builds] + relevant_builds = [ + builds for ide, builds + in ide_versions.items() + if ( + ide in plugin_versions["compatible"] + # TODO: Remove this once we removed pycharm-community + or (ide == "pycharm-community" and "pycharm" in plugin_versions["compatible"]) + # TODO: Remove this once we removed idea-community + or (ide == "idea-community" and "idea" in plugin_versions["compatible"]) + ) + ] + [extra_builds] relevant_builds = sorted(list(set(flatten(relevant_builds)))) # Flatten, remove duplicates and sort for build in relevant_builds: plugin_versions["builds"][build] = get_newest_compatible(pid, build, plugin_infos[pid], quiet) diff --git a/pkgs/applications/editors/jetbrains/readme.md b/pkgs/applications/editors/jetbrains/readme.md index 92db4228cdde..3d322bdec91f 100644 --- a/pkgs/applications/editors/jetbrains/readme.md +++ b/pkgs/applications/editors/jetbrains/readme.md @@ -24,10 +24,10 @@ The jdk is in `pkgs/development/compilers/jetbrains-jdk`. ## How to update stuff: - Run ./bin/update_bin.py, this will update binary IDEs and plugins, and automatically commit them - Source builds need a bit more effort, as they **aren't automated at the moment**: - - Run ./source/update.py ./source/ides.json ./bin/versions.json. This will update the source version to the version of their corresponding binary packages. + - Run ./source/update.py ./source/sources.json ./bin/versions.json. This will update the source version to the version of their corresponding binary packages. - Run these commands respectively: - - `nix build .#jetbrains.idea-community-src.src.src && ./source/build_maven.py source/idea_maven_artefacts.json result/` for IDEA - - `nix build .#jetbrains.pycharm-community-src.src.src && ./source/build_maven.py source/pycharm_maven_artefacts.json result/` for PyCharm + - `nix build .#jetbrains.idea-oss.src.src && ./source/build_maven.py source/idea_maven_artefacts.json result/` for IDEA + - `nix build .#jetbrains.pycharm-oss.src.src && ./source/build_maven.py source/pycharm_maven_artefacts.json result/` for PyCharm - Update `brokenPlugins` timestamp and hash (from https://web.archive.org/web/*/https://plugins.jetbrains.com/files/brokenPlugins.json) - Do a test build - Notice that sometimes a newer Kotlin version is required to build from source, if build fails, first check the recommended Kotlin version in `.idea/kotlinc.xml` in the IDEA source root @@ -40,7 +40,7 @@ The jdk is in `pkgs/development/compilers/jetbrains-jdk`. ## How to add an IDE: - Make dummy entries in `bin/versions.json` (make sure to set the version to something older than the real one) - Run `bin/update_bin.py` - - Add an entry in `bin/ides.json` + - Add an entry in `ides.json` - Add an entry in `default.nix` ### TODO: diff --git a/pkgs/applications/editors/jetbrains/source/build.nix b/pkgs/applications/editors/jetbrains/source/build.nix index 2052025ba3a9..ffa2ab584616 100644 --- a/pkgs/applications/editors/jetbrains/source/build.nix +++ b/pkgs/applications/editors/jetbrains/source/build.nix @@ -244,7 +244,7 @@ let in stdenvNoCC.mkDerivation rec { - pname = "${buildType}-community"; + pname = "${buildType}-oss"; inherit version buildNumber; name = "${pname}-${version}.tar.gz"; inherit src; diff --git a/pkgs/applications/editors/jetbrains/source/default.nix b/pkgs/applications/editors/jetbrains/source/default.nix index a3efd444038d..84a27ee60135 100644 --- a/pkgs/applications/editors/jetbrains/source/default.nix +++ b/pkgs/applications/editors/jetbrains/source/default.nix @@ -1,5 +1,5 @@ let - ides = builtins.fromJSON (builtins.readFile ./ides.json); + ides = builtins.fromJSON (builtins.readFile ./sources.json); in { callPackage, diff --git a/pkgs/applications/editors/jetbrains/source/ides.json b/pkgs/applications/editors/jetbrains/source/sources.json similarity index 98% rename from pkgs/applications/editors/jetbrains/source/ides.json rename to pkgs/applications/editors/jetbrains/source/sources.json index 2f93c7965db9..9f5e6d8618f7 100644 --- a/pkgs/applications/editors/jetbrains/source/ides.json +++ b/pkgs/applications/editors/jetbrains/source/sources.json @@ -1,5 +1,5 @@ { - "idea-community": { + "idea-oss": { "version": "2025.1.1.1", "buildNumber": "251.25410.129", "buildType": "idea", @@ -24,7 +24,7 @@ "hash": "sha256-Bu5eCHxls6EoIgzadiEY31plAcxZ6DA2a10CXAtPqV4=" } }, - "pycharm-community": { + "pycharm-oss": { "version": "2025.1.1.1", "buildNumber": "251.25410.159", "buildType": "pycharm", diff --git a/pkgs/applications/editors/jetbrains/source/update.py b/pkgs/applications/editors/jetbrains/source/update.py index e98e92e751fe..08358f8c7c77 100755 --- a/pkgs/applications/editors/jetbrains/source/update.py +++ b/pkgs/applications/editors/jetbrains/source/update.py @@ -93,38 +93,38 @@ def get_args() -> (str, str): def main(): versions_path, out = get_args() versions = loads(open(versions_path).read()) - idea_data = versions['x86_64-linux']['idea-community'] - pycharm_data = versions['x86_64-linux']['pycharm-community'] + idea_data = versions['x86_64-linux']['idea-oss'] + pycharm_data = versions['x86_64-linux']['pycharm-oss'] - result = { 'idea-community': {}, 'pycharm-community': {} } - result['idea-community']['version'] = idea_data['version'] - result['idea-community']['buildNumber'] = idea_data['build_number'] - result['idea-community']['buildType'] = 'idea' - result['pycharm-community']['version'] = pycharm_data['version'] - result['pycharm-community']['buildNumber'] = pycharm_data['build_number'] - result['pycharm-community']['buildType'] = 'pycharm' + result = { 'idea-oss': {}, 'pycharm-oss': {} } + result['idea-oss']['version'] = idea_data['version'] + result['idea-oss']['buildNumber'] = idea_data['build_number'] + result['idea-oss']['buildType'] = 'idea' + result['pycharm-oss']['version'] = pycharm_data['version'] + result['pycharm-oss']['buildNumber'] = pycharm_data['build_number'] + result['pycharm-oss']['buildType'] = 'pycharm' print('Fetching IDEA info...') - result['idea-community']['ideaHash'], ideaOutPath = prefetch_intellij_community('idea', result['idea-community']['buildNumber']) - result['idea-community']['androidHash'] = prefetch_android('idea', result['idea-community']['buildNumber']) - result['idea-community']['jpsHash'] = '' - result['idea-community']['restarterHash'] = '' - result['idea-community']['mvnDeps'] = 'idea_maven_artefacts.json' - result['idea-community']['repositories'] = jar_repositories(ideaOutPath) - result['idea-community']['kotlin-jps-plugin'] = {} - result['idea-community']['kotlin-jps-plugin']['version'], result['idea-community']['kotlin-jps-plugin']['hash'] = kotlin_jps_plugin_info(ideaOutPath) + result['idea-oss']['ideaHash'], ideaOutPath = prefetch_intellij_community('idea', result['idea-oss']['buildNumber']) + result['idea-oss']['androidHash'] = prefetch_android('idea', result['idea-oss']['buildNumber']) + result['idea-oss']['jpsHash'] = '' + result['idea-oss']['restarterHash'] = '' + result['idea-oss']['mvnDeps'] = 'idea_maven_artefacts.json' + result['idea-oss']['repositories'] = jar_repositories(ideaOutPath) + result['idea-oss']['kotlin-jps-plugin'] = {} + result['idea-oss']['kotlin-jps-plugin']['version'], result['idea-oss']['kotlin-jps-plugin']['hash'] = kotlin_jps_plugin_info(ideaOutPath) kotlinc_version = requested_kotlinc_version(ideaOutPath) - print(f"* Prefetched IDEA Community requested Kotlin compiler {kotlinc_version}") + print(f"* Prefetched IDEA Open Source requested Kotlin compiler {kotlinc_version}") print('Fetching PyCharm info...') - result['pycharm-community']['ideaHash'], pycharmOutPath = prefetch_intellij_community('pycharm', result['pycharm-community']['buildNumber']) - result['pycharm-community']['androidHash'] = prefetch_android('pycharm', result['pycharm-community']['buildNumber']) - result['pycharm-community']['jpsHash'] = '' - result['pycharm-community']['restarterHash'] = '' - result['pycharm-community']['mvnDeps'] = 'pycharm_maven_artefacts.json' - result['pycharm-community']['repositories'] = jar_repositories(pycharmOutPath) - result['pycharm-community']['kotlin-jps-plugin'] = {} - result['pycharm-community']['kotlin-jps-plugin']['version'], result['pycharm-community']['kotlin-jps-plugin']['hash'] = kotlin_jps_plugin_info(pycharmOutPath) + result['pycharm-oss']['ideaHash'], pycharmOutPath = prefetch_intellij_community('pycharm', result['pycharm-oss']['buildNumber']) + result['pycharm-oss']['androidHash'] = prefetch_android('pycharm', result['pycharm-oss']['buildNumber']) + result['pycharm-oss']['jpsHash'] = '' + result['pycharm-oss']['restarterHash'] = '' + result['pycharm-oss']['mvnDeps'] = 'pycharm_maven_artefacts.json' + result['pycharm-oss']['repositories'] = jar_repositories(pycharmOutPath) + result['pycharm-oss']['kotlin-jps-plugin'] = {} + result['pycharm-oss']['kotlin-jps-plugin']['version'], result['pycharm-oss']['kotlin-jps-plugin']['hash'] = kotlin_jps_plugin_info(pycharmOutPath) kotlinc_version = requested_kotlinc_version(pycharmOutPath) - print(f"* Prefetched PyCharm Community requested Kotlin compiler {kotlinc_version}") + print(f"* Prefetched PyCharm Open Source requested Kotlin compiler {kotlinc_version}") if out == "stdout": dump(result, stdout, indent=2) diff --git a/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix b/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix index e2f36e392fdb..984df3844b19 100644 --- a/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix +++ b/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix @@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-sqlite3-editor"; publisher = "yy0931"; - version = "1.0.210"; - hash = "sha256-SuLGdTDZssXu5NeBhdFyT1+MIWo9B7BohG7YfB0SX7I="; + version = "1.0.211"; + hash = "sha256-tU+JVFFGbL6uRMAHsc6/B+C7ZHYlEi5Bg8DMzIuL0DY="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/yy0931.vscode-sqlite3-editor/changelog"; diff --git a/pkgs/applications/emulators/libretro/cores/prboom.nix b/pkgs/applications/emulators/libretro/cores/prboom.nix index 30bc6ad2f30a..f98dcda1f74d 100644 --- a/pkgs/applications/emulators/libretro/cores/prboom.nix +++ b/pkgs/applications/emulators/libretro/cores/prboom.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "prboom"; - version = "0-unstable-2024-12-27"; + version = "0-unstable-2025-12-13"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-prboom"; - rev = "b3e5f8b2e8855f9c6fc7ff7a0036e4e61379177d"; - hash = "sha256-FtPn54s/QUu8fjeUBaAQMZ6EWAixV+gawuCv2eM+qrs="; + rev = "93c8e7a2074e4fd8410398e3d571c6d9afec1d84"; + hash = "sha256-O1C6CJ0MM21I69AtoAMx7ZX4U041hNrMXx22fEgshRI="; }; makefile = "Makefile"; diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 6ee360b9e226..fc0ff2a6b9f9 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -16,7 +16,7 @@ version = "4.0.2"; format = "setuptools"; - meta = with lib; { + meta = { broken = stdenv.hostPlatform.isDarwin; description = "OpenSteno Plover stenography software"; maintainers = with lib.maintainers; [ diff --git a/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix b/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix index 21b39a5d06d2..22026b9d4aa7 100644 --- a/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix +++ b/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { mv target/usr/local/bin $out/ ''; - meta = with lib; { + meta = { homepage = "https://hadoop.apache.org/"; description = "Framework for distributed processing of large data sets across clusters of computers"; license = lib.licenses.asl20; @@ -45,6 +45,6 @@ stdenv.mkDerivation (finalAttrs: { ''; maintainers = with lib.maintainers; [ illustris ]; - platforms = filter (strings.hasSuffix "linux") (attrNames platformAttrs); + platforms = lib.filter (lib.strings.hasSuffix "linux") (lib.attrNames platformAttrs); }; }) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 5d564fc2bb94..57e0ff7ee8c6 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -312,13 +312,13 @@ stdenv.mkDerivation rec { $out/opt/citrix-icaclient/util/ctx_rehash ''; - meta = with lib; { + meta = { # webkitgtk_4_0 was removed broken = true; license = lib.licenses.unfree; description = "Citrix Workspace"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - platforms = [ "x86_64-linux" ] ++ optional (versionOlder version "24") "i686-linux"; + platforms = [ "x86_64-linux" ] ++ lib.optional (lib.versionOlder version "24") "i686-linux"; maintainers = with lib.maintainers; [ flacks ]; inherit homepage; }; diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix index b8557f9e7bf3..9e3592b44445 100644 --- a/pkgs/applications/science/logic/abella/default.nix +++ b/pkgs/applications/science/logic/abella/default.nix @@ -4,6 +4,7 @@ fetchurl, rsync, ocamlPackages, + dune, }: stdenv.mkDerivation (finalAttrs: { @@ -19,10 +20,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ rsync + dune ] ++ (with ocamlPackages; [ ocaml - dune_3 menhir findlib ]); diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index c0275c97eafd..e3f5f7619fd6 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -13,6 +13,7 @@ writeText, pkg-config, gnumake42, + dune, customOCamlPackages ? null, ocamlPackages_4_09, ocamlPackages_4_10, @@ -130,7 +131,7 @@ let ocamlPackages.ocaml ocamlPackages.findlib ] - ++ lib.optional (coqAtLeast "8.14") ocamlPackages.dune_3; + ++ lib.optional (coqAtLeast "8.14") dune; ocamlPropagatedBuildInputs = [ ] ++ lib.optional (!coqAtLeast "8.10") ocamlPackages.camlp5 diff --git a/pkgs/applications/science/logic/easycrypt/default.nix b/pkgs/applications/science/logic/easycrypt/default.nix index 27b39fd790c5..bbc37bb7dcd5 100644 --- a/pkgs/applications/science/logic/easycrypt/default.nix +++ b/pkgs/applications/science/logic/easycrypt/default.nix @@ -4,6 +4,7 @@ darwin, fetchFromGitHub, ocamlPackages, + dune, why3, python3, }: @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = with ocamlPackages; [ - dune_3 + dune findlib menhir ocaml diff --git a/pkgs/applications/science/logic/rocq-core/default.nix b/pkgs/applications/science/logic/rocq-core/default.nix index 2a8a3d7be023..3d76ff2d0fda 100644 --- a/pkgs/applications/science/logic/rocq-core/default.nix +++ b/pkgs/applications/science/logic/rocq-core/default.nix @@ -11,6 +11,7 @@ fetchurl, writeText, pkg-config, + dune, customOCamlPackages ? null, ocamlPackages_4_14, ncurses, @@ -56,7 +57,7 @@ let ocamlNativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib - ocamlPackages.dune_3 + dune ]; ocamlPropagatedBuildInputs = [ ocamlPackages.zarith ]; self = stdenv.mkDerivation { diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index a7c265341a3b..9692b6f0877b 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -197,7 +197,7 @@ mkDerivation rec { enableParallelBuilding = false; # XXX: -j44 tried linking befoire librecoll had been created - meta = with lib; { + meta = { description = "Full-text search tool"; longDescription = '' Recoll is an Xapian frontend that can search through files, archive diff --git a/pkgs/applications/video/vdr/wrapper.nix b/pkgs/applications/video/vdr/wrapper.nix index 9680d4ad3c2e..7c57fc5098f3 100644 --- a/pkgs/applications/video/vdr/wrapper.nix +++ b/pkgs/applications/video/vdr/wrapper.nix @@ -26,9 +26,12 @@ symlinkJoin { --prefix XINE_PLUGIN_PATH ":" ${lib.escapeShellArg (makeXinePluginPath requiredXinePlugins)} ''; - meta = with vdr.meta; { - inherit license homepage; + meta = { + inherit (vdr.meta) license homepage; description = - description + " (with plugins: " + lib.concatStringsSep ", " (map (x: "" + x.name) plugins) + ")"; + vdr.meta.description + + " (with plugins: " + + lib.concatStringsSep ", " (map (x: "" + x.name) plugins) + + ")"; }; } diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix index 01719ce243a1..6bbd01da9d2d 100644 --- a/pkgs/build-support/coq/default.nix +++ b/pkgs/build-support/coq/default.nix @@ -6,6 +6,7 @@ which, fetchzip, fetchurl, + dune, }@args: let @@ -190,7 +191,7 @@ stdenv.mkDerivation ( nativeBuildInputs = args.overrideNativeBuildInputs or ( [ which ] - ++ optional useDune coq.ocamlPackages.dune_3 + ++ optional useDune dune ++ optionals (useDune || mlPlugin) [ coq.ocamlPackages.ocaml coq.ocamlPackages.findlib diff --git a/pkgs/build-support/rocq/default.nix b/pkgs/build-support/rocq/default.nix index d9429f0b23b5..8b86867d67d4 100644 --- a/pkgs/build-support/rocq/default.nix +++ b/pkgs/build-support/rocq/default.nix @@ -6,6 +6,7 @@ which, fetchzip, fetchurl, + dune, }@args: let @@ -174,7 +175,7 @@ stdenv.mkDerivation ( nativeBuildInputs = args.overrideNativeBuildInputs or ( [ which ] - ++ optional useDune rocq-core.ocamlPackages.dune_3 + ++ optional useDune dune ++ optionals (useDune || mlPlugin) [ rocq-core.ocamlPackages.ocaml rocq-core.ocamlPackages.findlib diff --git a/pkgs/by-name/ac/acgtk/package.nix b/pkgs/by-name/ac/acgtk/package.nix index 38c494ae8301..ba2b29b42281 100644 --- a/pkgs/by-name/ac/acgtk/package.nix +++ b/pkgs/by-name/ac/acgtk/package.nix @@ -4,6 +4,7 @@ fetchFromGitLab, fetchpatch, ocamlPackages, + dune, }: stdenv.mkDerivation { @@ -39,7 +40,7 @@ stdenv.mkDerivation { menhir ocaml findlib - dune_3 + dune ]; buildInputs = with ocamlPackages; [ diff --git a/pkgs/by-name/ba/babl/package.nix b/pkgs/by-name/ba/babl/package.nix index e8f013ea168d..fe499cb872b5 100644 --- a/pkgs/by-name/ba/babl/package.nix +++ b/pkgs/by-name/ba/babl/package.nix @@ -58,12 +58,12 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/doc" "$devdoc" ''; - meta = with lib; { + meta = { description = "Image pixel format conversion library"; mainProgram = "babl"; homepage = "https://gegl.org/babl/"; changelog = "https://gitlab.gnome.org/GNOME/babl/-/blob/BABL_${ - replaceStrings [ "." ] [ "_" ] finalAttrs.version + lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version }/NEWS"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ jtojnar ]; diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix index 0c2104ae9cb7..11930e228c08 100644 --- a/pkgs/by-name/ba/balena-cli/package.nix +++ b/pkgs/by-name/ba/balena-cli/package.nix @@ -21,16 +21,16 @@ let in buildNpmPackage' rec { pname = "balena-cli"; - version = "23.2.8"; + version = "23.2.10"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-qczkG1+6sn/n+Ew/HD5Ki8epZW3UEpREc3fjS2VS1go="; + hash = "sha256-pmzXrywlNU8/jevBo/cyym6vA6/XrNc5vz66BwkLd5o="; }; - npmDepsHash = "sha256-b5LNCOai6DyJx5VDaNHWFq9rvj5g9kwXqnUoS7fb8z4="; + npmDepsHash = "sha256-a3AU4UIlXRswBPya+e2AY3Yv21A2AQoWfGAJ7iDz740="; makeCacheWritable = true; diff --git a/pkgs/by-name/be/bencode/package.nix b/pkgs/by-name/be/bencode/package.nix index d4e2257c6665..6ef2f15debc5 100644 --- a/pkgs/by-name/be/bencode/package.nix +++ b/pkgs/by-name/be/bencode/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { rm -rf $out/lib64 ''; - meta = with lib; { + meta = { description = "Header-only C++20 bencode serialization/deserialization library"; homepage = "https://github.com/fbdtemme/bencode"; changelog = "https://github.com/fbdtemme/bencode/blob/${src.rev}/CHANGELOG.md"; diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix index 0c313295410f..b3c1cb7f7210 100644 --- a/pkgs/by-name/bu/burpsuite/package.nix +++ b/pkgs/by-name/bu/burpsuite/package.nix @@ -93,7 +93,7 @@ buildFHSEnv { passthru.updateScript = ./update.sh; - meta = with lib; { + meta = { inherit description; longDescription = '' Burp Suite is an integrated platform for performing security testing of web applications. @@ -104,7 +104,7 @@ buildFHSEnv { homepage = "https://portswigger.net/burp/"; changelog = "https://portswigger.net/burp/releases/professional-community-" - + replaceStrings [ "." ] [ "-" ] version; + + lib.replaceStrings [ "." ] [ "-" ] version; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.unfree; platforms = jdk.meta.platforms; diff --git a/pkgs/by-name/ca/camunda-modeler/package.nix b/pkgs/by-name/ca/camunda-modeler/package.nix index 35836de9ef3f..00aa7a67da2e 100644 --- a/pkgs/by-name/ca/camunda-modeler/package.nix +++ b/pkgs/by-name/ca/camunda-modeler/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation rec { pname = "camunda-modeler"; - version = "5.39.0"; + version = "5.42.0"; src = fetchurl { url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; - hash = "sha256-aDuJQWhgyQ0Aoh40Uyo4HPfNQDAhIg8Cd+veKEUynjs="; + hash = "sha256-6P3b9qcYOfKzJCsDc5K09fKklu/9jFYwoeLMbC8JR64="; }; sourceRoot = "camunda-modeler-${version}-linux-x64"; @@ -77,6 +77,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/camunda/camunda-modeler"; description = "Integrated modeling solution for BPMN, DMN and Forms based on bpmn.io"; teams = [ lib.teams.wdz ]; + maintainers = with lib.maintainers; [ vringar ]; license = lib.licenses.mit; inherit (electron.meta) platforms; mainProgram = "camunda-modeler"; diff --git a/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix b/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix index 7605ab4f08e6..a0ed56b85888 100644 --- a/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix +++ b/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix @@ -121,7 +121,7 @@ buildPythonPackage rec { "tests/hazmat/backends/test_openssl_memleak.py" ]; - meta = with lib; { + meta = { description = "Package which provides cryptographic recipes and primitives"; longDescription = '' Cryptography includes both high level recipes and low level interfaces to @@ -132,7 +132,7 @@ buildPythonPackage rec { ''; homepage = "https://github.com/pyca/cryptography"; changelog = - "https://cryptography.io/en/latest/changelog/#v" + replaceStrings [ "." ] [ "-" ] version; + "https://cryptography.io/en/latest/changelog/#v" + lib.replaceStrings [ "." ] [ "-" ] version; license = with lib.licenses; [ asl20 bsd3 diff --git a/pkgs/by-name/ch/chawan/package.nix b/pkgs/by-name/ch/chawan/package.nix index feab2ad327be..34bfcc8f10cf 100644 --- a/pkgs/by-name/ch/chawan/package.nix +++ b/pkgs/by-name/ch/chawan/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "chawan"; - version = "0.3.0"; + version = "0.3.2"; src = fetchFromSourcehut { owner = "~bptato"; repo = "chawan"; tag = "v${finalAttrs.version}"; - hash = "sha256-y1z1MlwbKGpvtgt4OZtfvxvsOSE6RhnsWUeaRvu7etU="; + hash = "sha256-JPFQsu5vLSesgpbX79Z5e0GGFIsC4PUJuZQS8a5Oq2c="; }; env.NIX_CFLAGS_COMPILE = toString ( diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index 416c8d3d99b3..9a11293dd73e 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -1,12 +1,12 @@ { "name": "@anthropic-ai/claude-code", - "version": "2.0.67", + "version": "2.0.69", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@anthropic-ai/claude-code", - "version": "2.0.67", + "version": "2.0.69", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index c29bc7ceb2c8..f029ae51f674 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -11,14 +11,14 @@ }: buildNpmPackage (finalAttrs: { pname = "claude-code"; - version = "2.0.67"; + version = "2.0.69"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz"; - hash = "sha256-a1i8N6LZYA3XJx7AqDDOoyO5pf+t9WZ6vBQVZkUbpxM="; + hash = "sha256-iQ+iVv3sY0oxGCZuuatcl2LSWvBfqSA+/RmeFgiMDDY="; }; - npmDepsHash = "sha256-DNdRkN/rpCsN8fnZbz18r2KRUTl5HCur+GyrofH+T/Y="; + npmDepsHash = "sha256-jb6AWGbnW5n9P9V8crR25ql0gFsAFY0z0EBnWJodnd4="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix index 5c4040d02b6a..c187385c2384 100644 --- a/pkgs/by-name/cn/cnspec/package.nix +++ b/pkgs/by-name/cn/cnspec/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "12.12.1"; + version = "12.13.2"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${version}"; - hash = "sha256-EhO8lLnIAgp2OKgM4yWhUsM0XtxzsadHaXUnnp5BO98="; + hash = "sha256-i/vHKFvlHjTRPo2btOuc6vql7D5FSP7PvAsnIf7zEe0="; }; proxyVendor = true; - vendorHash = "sha256-UGqwsRS4GUpqmcPXasIsU9hZ4Qd76wUtc1EXt1jLpbA="; + vendorHash = "sha256-JIG+KV+5na6QdfT4lxUEzvE6HejzxthBRtmYAnsV+ko="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/by-name/co/comixcursors/package.nix b/pkgs/by-name/co/comixcursors/package.nix index ea73cc5e5615..1a0b6e9a546e 100644 --- a/pkgs/by-name/co/comixcursors/package.nix +++ b/pkgs/by-name/co/comixcursors/package.nix @@ -116,10 +116,10 @@ stdenvNoCC.mkDerivation rec { # attributes are used to choose which variant(s) to have. outputsToInstall = [ ]; - meta = with lib; { + meta = { description = "Comix Cursors mouse themes"; longDescription = '' - There are many (${toString ((length outputs) - 1)}) variants of color, + There are many (${toString ((lib.length outputs) - 1)}) variants of color, opacity, edge thickness, and right- or left-handedness, for this cursor theme. This package's derivation has an output for each of these variants, named following the upstream convention, and the attribute for diff --git a/pkgs/by-name/co/cosmic-ext-applet-external-monitor-brightness/package.nix b/pkgs/by-name/co/cosmic-ext-applet-external-monitor-brightness/package.nix index 15a2e929283b..0dae2047bbd5 100644 --- a/pkgs/by-name/co/cosmic-ext-applet-external-monitor-brightness/package.nix +++ b/pkgs/by-name/co/cosmic-ext-applet-external-monitor-brightness/package.nix @@ -11,13 +11,13 @@ }: rustPlatform.buildRustPackage { pname = "cosmic-ext-applet-external-monitor-brightness"; - version = "0.0.1-unstable-2025-11-27"; + version = "0.0.1-unstable-2025-12-10"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "cosmic-ext-applet-external-monitor-brightness"; - rev = "3cfba2bbe5e622f887b8236304823fda67c33b46"; - hash = "sha256-UNfIH0Itm1fbRGfh8NdSGeOrm+H8t42yawcZmTjQLQ0="; + rev = "1d63ebe422428ae73fd9b7e2eafbb2649539b923"; + hash = "sha256-ytZvjwqroIU5Sx65LPvAmHlcmKrInIyo6psCZjuHYK0="; }; cargoHash = "sha256-ou7iukl1pHMfcJNemwLdZYYxugbJJQ53XpCYowUTj90="; diff --git a/pkgs/by-name/dm/dmtcp/package.nix b/pkgs/by-name/dm/dmtcp/package.nix index 3ef7253cb9da..4d2cecc48dcf 100644 --- a/pkgs/by-name/dm/dmtcp/package.nix +++ b/pkgs/by-name/dm/dmtcp/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { --replace "os.getenv('USER')" "\"nixbld1\"" ''; - meta = with lib; { + meta = { description = "Distributed MultiThreaded Checkpointing"; longDescription = '' DMTCP (Distributed MultiThreaded Checkpointing) is a tool to @@ -50,6 +50,6 @@ stdenv.mkDerivation { ''; homepage = "http://dmtcp.sourceforge.net/"; license = lib.licenses.lgpl3Plus; # most files seem this or LGPL-2.1+ - platforms = intersectLists lib.platforms.linux lib.platforms.x86; # broken on ARM and Darwin + platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86; # broken on ARM and Darwin }; } diff --git a/pkgs/by-name/do/docfd/package.nix b/pkgs/by-name/do/docfd/package.nix index ed37a05fdd39..98d49517c486 100644 --- a/pkgs/by-name/do/docfd/package.nix +++ b/pkgs/by-name/do/docfd/package.nix @@ -4,7 +4,7 @@ stdenv, fetchFromGitHub, python3, - dune_3, + dune, makeWrapper, pandoc, poppler-utils, @@ -30,7 +30,7 @@ ocamlPackages.buildDunePackage rec { nativeBuildInputs = [ python3 - dune_3 + dune makeWrapper ]; diff --git a/pkgs/by-name/du/dune/package.nix b/pkgs/by-name/du/dune/package.nix new file mode 100644 index 000000000000..9dfc90173f12 --- /dev/null +++ b/pkgs/by-name/du/dune/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + fetchurl, + ocamlPackages, + version ? "3.20.2", +}: + +stdenv.mkDerivation { + pname = "dune"; + inherit version; + + src = fetchurl { + url = + let + sfx = lib.optionalString (lib.versions.major version == "2") "site-"; + in + "https://github.com/ocaml/dune/releases/download/${version}/dune-${sfx}${version}.tbz"; + hash = + { + "3.20.2" = "sha256-sahrLWC9tKi5u2hhvfL58opufLXYM86Br+zOue+cpUk="; + "2.9.3" = "sha256:1ml8bxym8sdfz25bx947al7cvsi2zg5lcv7x9w6xb01cmdryqr9y"; + } + ."${version}"; + }; + + nativeBuildInputs = with ocamlPackages; [ + ocaml + findlib + ]; + + strictDeps = true; + + buildFlags = [ "release" ]; + + dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = [ ]; + + installFlags = [ + "PREFIX=${placeholder "out"}" + "LIBDIR=$(OCAMLFIND_DESTDIR)" + ]; + + passthru.tests = { + inherit (ocamlPackages) ocaml-lsp dune-release; + }; + + meta = { + homepage = "https://dune.build/"; + description = "Composable build system"; + mainProgram = "dune"; + changelog = "https://github.com/ocaml/dune/raw/${version}/CHANGES.md"; + maintainers = [ lib.maintainers.vbgl ]; + license = lib.licenses.mit; + inherit (ocamlPackages.ocaml.meta) platforms; + }; +} diff --git a/pkgs/by-name/fa/fasmg/package.nix b/pkgs/by-name/fa/fasmg/package.nix index 6f582704f94a..546eb5a43f6d 100644 --- a/pkgs/by-name/fa/fasmg/package.nix +++ b/pkgs/by-name/fa/fasmg/package.nix @@ -85,12 +85,12 @@ stdenv.mkDerivation rec { nix-update fasmg --version "$version" ''; - meta = with lib; { + meta = { description = "x86(-64) macro assembler to binary, MZ, PE, COFF, and ELF"; mainProgram = "fasmg"; homepage = "https://flatassembler.net"; license = lib.licenses.bsd3; maintainers = [ ]; - platforms = with lib.platforms; intersectLists (linux ++ darwin) x86; + platforms = with lib.platforms; lib.intersectLists (linux ++ darwin) x86; }; } diff --git a/pkgs/by-name/fr/framac/package.nix b/pkgs/by-name/fr/framac/package.nix index b3ef7520555c..2aa780e9df47 100644 --- a/pkgs/by-name/fr/framac/package.nix +++ b/pkgs/by-name/fr/framac/package.nix @@ -8,6 +8,7 @@ ocamlPackages, ltl2ba, coq, + dune, why3, gdk-pixbuf, wrapGAppsHook3, @@ -64,11 +65,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook3 + dune ] ++ (with ocamlPackages; [ ocaml findlib - dune_3 menhir ]); diff --git a/pkgs/by-name/gi/giac/package.nix b/pkgs/by-name/gi/giac/package.nix index 2f839d7ed2c7..c6b89f93fa4a 100644 --- a/pkgs/by-name/gi/giac/package.nix +++ b/pkgs/by-name/gi/giac/package.nix @@ -220,11 +220,11 @@ stdenv.mkDerivation rec { done; ''; - meta = with lib; { + meta = { description = "Free computer algebra system (CAS)"; homepage = "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux ++ (optionals (!enableGUI) lib.platforms.darwin); + platforms = lib.platforms.linux ++ (lib.optionals (!enableGUI) lib.platforms.darwin); maintainers = [ lib.maintainers.symphorien ]; }; } diff --git a/pkgs/by-name/gi/git-cliff/package.nix b/pkgs/by-name/gi/git-cliff/package.nix index 36d11de597c9..a707879b85f9 100644 --- a/pkgs/by-name/gi/git-cliff/package.nix +++ b/pkgs/by-name/gi/git-cliff/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "2.10.1"; + version = "2.11.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-AFNOnFX/U0HkVypzrt1LELMiXshgVJ6q52ga74V9J9w="; + hash = "sha256-sXcDNt8aaruppH7rEn5EpVTkfKZVrFZdI8mnLrIxC44="; }; - cargoHash = "sha256-6B65R/6VVUm7OZs/8UmJTEQ0htWBas1kxQj0qQ0QW+4="; + cargoHash = "sha256-d7oEkoQB8+wbyYK4DE+pXIiiHzfU67UDpKbWrHMFyBQ="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/by-name/gl/glide-media-player/package.nix b/pkgs/by-name/gl/glide-media-player/package.nix index 59773d9f34b2..73576c51d564 100644 --- a/pkgs/by-name/gl/glide-media-player/package.nix +++ b/pkgs/by-name/gl/glide-media-player/package.nix @@ -63,13 +63,13 @@ stdenv.mkDerivation rec { glib-networking ]; - meta = with lib; { + meta = { description = "Linux/macOS media player based on GStreamer and GTK"; homepage = "https://philn.github.io/glide"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ aleksana ]; mainProgram = "glide"; # Required gdk4-{wayland,x11} and gstreamer-gl not available on darwin - platforms = subtractLists lib.platforms.darwin lib.platforms.unix; + platforms = lib.subtractLists lib.platforms.darwin lib.platforms.unix; }; } diff --git a/pkgs/by-name/gr/grass-sass/package.nix b/pkgs/by-name/gr/grass-sass/package.nix index 61487926bab5..a2f3bb0e9bbc 100644 --- a/pkgs/by-name/gr/grass-sass/package.nix +++ b/pkgs/by-name/gr/grass-sass/package.nix @@ -18,11 +18,11 @@ rustPlatform.buildRustPackage rec { # tests require rust nightly doCheck = false; - meta = with lib; { + meta = { description = "Sass compiler written purely in Rust"; homepage = "https://github.com/connorskees/grass"; changelog = "https://github.com/connorskees/grass/blob/master/CHANGELOG.md#${ - replaceStrings [ "." ] [ "" ] version + lib.replaceStrings [ "." ] [ "" ] version }"; license = lib.licenses.mit; maintainers = [ ]; diff --git a/pkgs/by-name/gv/gvfs/package.nix b/pkgs/by-name/gv/gvfs/package.nix index 3e13d55a4682..0869a9d9e359 100644 --- a/pkgs/by-name/gv/gvfs/package.nix +++ b/pkgs/by-name/gv/gvfs/package.nix @@ -159,9 +159,9 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { description = - "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)"; + "Virtual Filesystem support library" + lib.optionalString gnomeSupport " (full GNOME support)"; license = lib.licenses.lgpl2Plus; platforms = lib.platforms.unix; teams = [ lib.teams.gnome ]; diff --git a/pkgs/by-name/gv/gvm-libs/package.nix b/pkgs/by-name/gv/gvm-libs/package.nix index 1abbe69d55b6..fd3dce4a8a77 100644 --- a/pkgs/by-name/gv/gvm-libs/package.nix +++ b/pkgs/by-name/gv/gvm-libs/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gvm-libs"; - version = "22.34.0"; + version = "22.34.1"; src = fetchFromGitHub { owner = "greenbone"; repo = "gvm-libs"; tag = "v${version}"; - hash = "sha256-MCriCweaB2UbQzW/ojsyJgh/bn9l5XHqSicGYTnfQrw="; + hash = "sha256-qvcQml3XnGraCwa2iY+QGshzdsNUwQH3+HXLPwq6+M4="; }; postPatch = '' diff --git a/pkgs/by-name/ha/hatchet/package.nix b/pkgs/by-name/ha/hatchet/package.nix index 2ce6d5ecab85..694c00080ea1 100644 --- a/pkgs/by-name/ha/hatchet/package.nix +++ b/pkgs/by-name/ha/hatchet/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "hatchet"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "simagix"; repo = "hatchet"; tag = "v${finalAttrs.version}"; - hash = "sha256-m/TuO5Z4Pc2Hruxb2uRwKcccUQjExnGOt3A0fqXVt5s="; + hash = "sha256-cpS46HR6hbjDEBeSYsnnumMzkXUYsEU5CAShoIfu8vo="; }; - vendorHash = "sha256-FbwwAeK9L6yIVZEBN1Ay5PB2D89vQNjbtMG5pI5jAAw="; + vendorHash = "sha256-5YzrxSB/3tKxE1ObAnx1lbIc+Zlufc6wIJuDQqCcRKc="; ldflags = [ "-s" diff --git a/pkgs/by-name/hl/hledger-fmt/package.nix b/pkgs/by-name/hl/hledger-fmt/package.nix index 89a52f4b51d5..87302a9fe664 100644 --- a/pkgs/by-name/hl/hledger-fmt/package.nix +++ b/pkgs/by-name/hl/hledger-fmt/package.nix @@ -9,20 +9,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hledger-fmt"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "mondeja"; repo = "hledger-fmt"; tag = "v${finalAttrs.version}"; - hash = "sha256-u3J5wBEbxEBSr54+WxR0zkR2MGsjhkaebCMOh8+jOZk="; + hash = "sha256-GbDZ6fvzd6/flASqy86km1LZ+B+loy0odmRQRfdkcCs="; }; nativeBuildInputs = [ installShellFiles ]; - cargoHash = "sha256-qVJ2qAqNSwqVLwyln2caHd9ncQvUGgwlg/fj3dSo6Ks="; + cargoHash = "sha256-LN9D7EVbDUjNa/eCmuBT2kghzDqoXhMB5ihx40ixS1E="; # Tests try to invoke the binary from "target/debug/hledger-fmt" # https://github.com/mondeja/hledger-fmt/blob/783abdb32eefb20195c7e9562858552935bb9c8e/src/cli/tests.rs#L5 diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix index eddb9fc819a1..8b27815ad65b 100644 --- a/pkgs/by-name/ho/hoppscotch/package.nix +++ b/pkgs/by-name/ho/hoppscotch/package.nix @@ -8,22 +8,22 @@ let pname = "hoppscotch"; - version = "25.11.1-0"; + version = "25.11.2-0"; src = fetchurl { aarch64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; - hash = "sha256-twEBbr00uUYQq6fGcywb/L3SdCwMyT9ChoY7I7ytcuE="; + hash = "sha256-XJNoSrmnlSajzCahac9+IsQ2cIkCiF0sGvdMKKT2mYw="; }; x86_64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; - hash = "sha256-TcEp+xJRPmQd8yR5OQelhd5KiDZd7IYxb8ZVnpKmYso="; + hash = "sha256-cfPWC/mF/KCThIRJlGLpz/L5ZsI+P0bI0OZ7bL1dofg="; }; x86_64-linux = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; - hash = "sha256-QnGoMnPhynVBWrfWb6GUiUG1C49d0FgtSHigNpxMGXs="; + hash = "sha256-x79q24oTmj8Z54/g7w6DxTl3+91NUJf8Ago6mVUmILY="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/im/imake/package.nix b/pkgs/by-name/im/imake/package.nix index 1c9aaf45ee93..94f2860963ad 100644 --- a/pkgs/by-name/im/imake/package.nix +++ b/pkgs/by-name/im/imake/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, fetchpatch, + replaceVars, tradcpp, xorg-cf-files, pkg-config, @@ -60,19 +61,18 @@ stdenv.mkDerivation (finalAttrs: { "ac_cv_path_RAWCPP=${stdenv.cc.targetPrefix}cpp" ]; - env = { - CFLAGS = "-DIMAKE_COMPILETIME_CPP='\"${ - if stdenv.hostPlatform.isDarwin then "${tradcpp}/bin/cpp" else "gcc" - }\"'"; - }; + env.CFLAGS = "-DIMAKE_COMPILETIME_CPP='\"${ + if stdenv.hostPlatform.isDarwin then "${tradcpp}/bin/cpp" else "gcc" + }\"'"; preInstall = '' mkdir -p $out/lib/X11/config ln -s ${xorg-cf-files}/lib/X11/config/* $out/lib/X11/config ''; - inherit tradcpp xorg-cf-files; - setupHook = ./setup-hook.sh; + setupHook = replaceVars ./setup-hook.sh { + inherit tradcpp; + }; passthru = { updateScript = writeScript "update-${finalAttrs.pname}" '' diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix index da2cc5032946..e79e56572ff5 100644 --- a/pkgs/by-name/in/infrastructure-agent/package.nix +++ b/pkgs/by-name/in/infrastructure-agent/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "infrastructure-agent"; - version = "1.71.2"; + version = "1.71.3"; src = fetchFromGitHub { owner = "newrelic"; repo = "infrastructure-agent"; rev = version; - hash = "sha256-DnS6C2Fiah1jaInX2xS3R0UKrHa0IAagKOPB0QBCR5Y="; + hash = "sha256-OWd1GNH+23nBL6uvWwL71rT2KPyzNVVTrK7nDlk8T3U="; }; vendorHash = "sha256-H41FxeJLrlaL/KbcBAS1WuMfVn6d+4So3egXb6E46/o="; diff --git a/pkgs/by-name/ja/jasmin-compiler/package.nix b/pkgs/by-name/ja/jasmin-compiler/package.nix index ea4c89f30ad7..81c386202ce9 100644 --- a/pkgs/by-name/ja/jasmin-compiler/package.nix +++ b/pkgs/by-name/ja/jasmin-compiler/package.nix @@ -2,8 +2,8 @@ stdenv, lib, fetchurl, - dune_3, ocamlPackages, + dune, mpfr, ppl, }: @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = with ocamlPackages; [ ocaml findlib - dune_3 + dune menhir camlidl cmdliner diff --git a/pkgs/by-name/jo/joypixels/package.nix b/pkgs/by-name/jo/joypixels/package.nix index ab7d9d37e7e6..b8c15b6675d6 100644 --- a/pkgs/by-name/jo/joypixels/package.nix +++ b/pkgs/by-name/jo/joypixels/package.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Finest emoji you can use legally (formerly EmojiOne)"; longDescription = '' Updated for 2024! JoyPixels 9.0 includes 3,820 originally crafted icon diff --git a/pkgs/by-name/ka/kaidan/package.nix b/pkgs/by-name/ka/kaidan/package.nix index fb85455a5ebc..531c1b50bff1 100644 --- a/pkgs/by-name/ka/kaidan/package.nix +++ b/pkgs/by-name/ka/kaidan/package.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "kaidan"; - version = "0.13.0-unstable-2025-12-09"; + version = "0.13.0-unstable-2025-12-13"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "network"; repo = "kaidan"; - rev = "d160f34ce1fecb39f4c71530cf2d4ba57bfbd6f4"; - hash = "sha256-/Nt6XjauaVKdLSZglk3qfd0wxW/VpwzMnVwuF/jGP0s="; + rev = "eb43bd732997f52c630dc94d45682713c2bb5c75"; + hash = "sha256-YIK6te7pjD28M/5bkPnYojGeaBNk8j8pt1VPlh+OnXE="; }; patches = [ diff --git a/pkgs/by-name/ka/kazumi/git-hashes.json b/pkgs/by-name/ka/kazumi/git-hashes.json index f6050f9912b9..f007ae4e6982 100644 --- a/pkgs/by-name/ka/kazumi/git-hashes.json +++ b/pkgs/by-name/ka/kazumi/git-hashes.json @@ -1,12 +1,12 @@ { "desktop_webview_window": "sha256-FSI/R9HvAJWQttY8oaAmBYygUliv/bw3hmwty7PRUjE=", - "media_kit": "sha256-XP1Oh9Vignk5XTAiITg9MfdFXH/SZzyMNtnpuHFb2Q8=", - "media_kit_libs_android_video": "sha256-XP1Oh9Vignk5XTAiITg9MfdFXH/SZzyMNtnpuHFb2Q8=", - "media_kit_libs_ios_video": "sha256-XP1Oh9Vignk5XTAiITg9MfdFXH/SZzyMNtnpuHFb2Q8=", - "media_kit_libs_linux": "sha256-XP1Oh9Vignk5XTAiITg9MfdFXH/SZzyMNtnpuHFb2Q8=", - "media_kit_libs_macos_video": "sha256-XP1Oh9Vignk5XTAiITg9MfdFXH/SZzyMNtnpuHFb2Q8=", - "media_kit_libs_video": "sha256-XP1Oh9Vignk5XTAiITg9MfdFXH/SZzyMNtnpuHFb2Q8=", - "media_kit_libs_windows_video": "sha256-XP1Oh9Vignk5XTAiITg9MfdFXH/SZzyMNtnpuHFb2Q8=", - "media_kit_video": "sha256-XP1Oh9Vignk5XTAiITg9MfdFXH/SZzyMNtnpuHFb2Q8=", + "media_kit": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=", + "media_kit_libs_android_video": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=", + "media_kit_libs_ios_video": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=", + "media_kit_libs_linux": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=", + "media_kit_libs_macos_video": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=", + "media_kit_libs_video": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=", + "media_kit_libs_windows_video": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=", + "media_kit_video": "sha256-czcPlptRiyxdLzRVICnkg08IBAElAY0qRf3hs5jTbKM=", "webview_windows": "sha256-6Uk4H2SYhjrs1+/27FmlWopDyM09Mc7SqFJ4syg3dDU=" } diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix index 8b4b09c5d3d9..30fa64a74b72 100644 --- a/pkgs/by-name/ka/kazumi/package.nix +++ b/pkgs/by-name/ka/kazumi/package.nix @@ -18,13 +18,13 @@ }: let - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "Predidit"; repo = "Kazumi"; tag = version; - hash = "sha256-PrXgYp0WAbR/b6nSmcQDfJXkuYqtWD7QB1RIiVRFFY0="; + hash = "sha256-ZAc8i7nsJ00rzrOevVd4apb+CJ43rnsTkWGXhsDvrdc="; }; in flutter338.buildFlutterApplication { diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json index 5feadbea6d01..30ac5f119445 100644 --- a/pkgs/by-name/ka/kazumi/pubspec.lock.json +++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json @@ -969,8 +969,8 @@ "dependency": "direct main", "description": { "path": "media_kit", - "ref": "480c1e182fdb300ba975b2160765965f79a9b955", - "resolved-ref": "480c1e182fdb300ba975b2160765965f79a9b955", + "ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f", + "resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -980,8 +980,8 @@ "dependency": "direct overridden", "description": { "path": "libs/android/media_kit_libs_android_video", - "ref": "480c1e182fdb300ba975b2160765965f79a9b955", - "resolved-ref": "480c1e182fdb300ba975b2160765965f79a9b955", + "ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f", + "resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -991,8 +991,8 @@ "dependency": "direct overridden", "description": { "path": "libs/ios/media_kit_libs_ios_video", - "ref": "480c1e182fdb300ba975b2160765965f79a9b955", - "resolved-ref": "480c1e182fdb300ba975b2160765965f79a9b955", + "ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f", + "resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1002,8 +1002,8 @@ "dependency": "direct overridden", "description": { "path": "libs/linux/media_kit_libs_linux", - "ref": "480c1e182fdb300ba975b2160765965f79a9b955", - "resolved-ref": "480c1e182fdb300ba975b2160765965f79a9b955", + "ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f", + "resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1013,8 +1013,8 @@ "dependency": "direct overridden", "description": { "path": "libs/macos/media_kit_libs_macos_video", - "ref": "480c1e182fdb300ba975b2160765965f79a9b955", - "resolved-ref": "480c1e182fdb300ba975b2160765965f79a9b955", + "ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f", + "resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1024,8 +1024,8 @@ "dependency": "direct main", "description": { "path": "libs/universal/media_kit_libs_video", - "ref": "480c1e182fdb300ba975b2160765965f79a9b955", - "resolved-ref": "480c1e182fdb300ba975b2160765965f79a9b955", + "ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f", + "resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1035,8 +1035,8 @@ "dependency": "direct overridden", "description": { "path": "libs/windows/media_kit_libs_windows_video", - "ref": "480c1e182fdb300ba975b2160765965f79a9b955", - "resolved-ref": "480c1e182fdb300ba975b2160765965f79a9b955", + "ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f", + "resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1046,8 +1046,8 @@ "dependency": "direct main", "description": { "path": "media_kit_video", - "ref": "480c1e182fdb300ba975b2160765965f79a9b955", - "resolved-ref": "480c1e182fdb300ba975b2160765965f79a9b955", + "ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f", + "resolved-ref": "66d46c3d77ee15684e0c5c6ed51ac78d819d5e6f", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", diff --git a/pkgs/by-name/le/leanify/package.nix b/pkgs/by-name/le/leanify/package.nix index f136400c0496..9e7bed6792ec 100644 --- a/pkgs/by-name/le/leanify/package.nix +++ b/pkgs/by-name/le/leanify/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "leanify"; - version = "unstable-2025-05-15"; + version = "0.4.3-unstable-2025-12-12"; src = fetchFromGitHub { owner = "JayXon"; repo = "Leanify"; - rev = "42770e600b32962e7110c24b5fcaa8c7c2144b17"; - hash = "sha256-njfMR2DSKeVh+ZUewall7837E9JY3nhrTxO4LOY1pEo="; + rev = "d2ba1671056e022623e8445f5700670bc05204bf"; + hash = "sha256-MXQnJyA6z01lodes6CINV7mzbRr6GnZaMAsjloGJzeg="; }; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index eb2e9b728e0e..f9ca65329200 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -47,14 +47,14 @@ in # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation (finalAttrs: { pname = "limine"; - version = "10.4.0"; + version = "10.5.0"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-yCNYjGG5B+G+8liJVZc+VW2ZqSbucC55YfExQkeMv6Q="; + hash = "sha256-2hTBjv9L2lYsxExpx+KuvZQZrB8ci+MtdiMuqjZ1A9I="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/na/nail-parquet/package.nix b/pkgs/by-name/na/nail-parquet/package.nix new file mode 100644 index 000000000000..c0e2a035c5e0 --- /dev/null +++ b/pkgs/by-name/na/nail-parquet/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + testers, + nail-parquet, + stdenv, + pkg-config, + openssl, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "nail-parquet"; + version = "1.6.5"; + + src = fetchFromGitHub { + owner = "Vitruves"; + repo = "nail-parquet"; + tag = "v${finalAttrs.version}"; + hash = "sha256-CPiOeaESerQj+nV0hQIGv06/MFP8s7p9olpmhnWpAAg="; + }; + + cargoHash = "sha256-x4BJZcQkisw9hA/TBzSSdkxh7oUNL0OD3H/v67otYj8="; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + pkg-config + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + openssl + ]; + + passthru.tests = { + version = testers.testVersion { + package = nail-parquet; + command = "nail --version"; + }; + }; + + meta = { + description = "High-performance command-line utility for working with Parquet files"; + homepage = "https://github.com/Vitruves/nail-parquet"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nathanscully ]; + mainProgram = "nail"; + }; +}) diff --git a/pkgs/by-name/nr/nrf-command-line-tools/package.nix b/pkgs/by-name/nr/nrf-command-line-tools/package.nix index 87c751641be1..d8ff63ef5727 100644 --- a/pkgs/by-name/nr/nrf-command-line-tools/package.nix +++ b/pkgs/by-name/nr/nrf-command-line-tools/package.nix @@ -70,11 +70,11 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { description = "Nordic Semiconductor nRF Command Line Tools"; homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Command-Line-Tools"; license = lib.licenses.unfree; - platforms = attrNames supported; + platforms = lib.attrNames supported; maintainers = with lib.maintainers; [ stargate01 ]; }; } diff --git a/pkgs/by-name/nv/nvpy/package.nix b/pkgs/by-name/nv/nvpy/package.nix index d17d640701a7..e1dda170ce99 100644 --- a/pkgs/by-name/nv/nvpy/package.nix +++ b/pkgs/by-name/nv/nvpy/package.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, fetchFromGitHub, python3Packages, }: @@ -41,11 +41,11 @@ pythonPackages.buildPythonApplication rec { pythonImportsCheck = [ "nvpy" ]; - meta = with pkgs.lib; { + meta = { description = "Simplenote-syncing note-taking tool inspired by Notational Velocity"; homepage = "https://github.com/cpbotha/nvpy"; - platforms = platforms.linux; - license = licenses.bsd3; + platforms = lib.platforms.linux; + license = lib.licenses.bsd3; mainProgram = "nvpy"; }; } diff --git a/pkgs/by-name/ow/owi/package.nix b/pkgs/by-name/ow/owi/package.nix index 696d58b7ad2b..83c2ae8f4d13 100644 --- a/pkgs/by-name/ow/owi/package.nix +++ b/pkgs/by-name/ow/owi/package.nix @@ -15,14 +15,14 @@ let in ocamlPackages.buildDunePackage { pname = "owi"; - version = "0.2-unstable-2025-12-08"; + version = "0.2-unstable-2025-12-13"; src = fetchFromGitHub { owner = "ocamlpro"; repo = "owi"; - rev = "b35dafd51853b40f6b403cc5c460bed8dd2c8027"; + rev = "0ce0a3136bfeaca01bbf9c596d79c093282cff3f"; fetchSubmodules = true; - hash = "sha256-qYSn47I6slnJ6brXGc5KcbR2rlSwuTyqdPyNKs1uTsQ="; + hash = "sha256-2WrUbrwi3dSXf/eEdZCK1SnYzo52aJeTfqtN65bjW60="; }; nativeBuildInputs = with ocamlPackages; [ diff --git a/pkgs/by-name/pg/pgbouncer/package.nix b/pkgs/by-name/pg/pgbouncer/package.nix index ae9c9b08ceb7..5bab21bf1d99 100644 --- a/pkgs/by-name/pg/pgbouncer/package.nix +++ b/pkgs/by-name/pg/pgbouncer/package.nix @@ -33,12 +33,12 @@ stdenv.mkDerivation rec { pgbouncer = nixosTests.pgbouncer; }; - meta = with lib; { + meta = { homepage = "https://www.pgbouncer.org/"; mainProgram = "pgbouncer"; description = "Lightweight connection pooler for PostgreSQL"; changelog = "https://github.com/pgbouncer/pgbouncer/releases/tag/pgbouncer_${ - replaceStrings [ "." ] [ "_" ] version + lib.replaceStrings [ "." ] [ "_" ] version }"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ _1000101 ]; diff --git a/pkgs/by-name/po/polkadot/package.nix b/pkgs/by-name/po/polkadot/package.nix index abdafaf9b41c..d0d4227fd0d8 100644 --- a/pkgs/by-name/po/polkadot/package.nix +++ b/pkgs/by-name/po/polkadot/package.nix @@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec { PROTOC = "${protobuf}/bin/protoc"; ROCKSDB_LIB_DIR = "${rocksdb}/lib"; - meta = with lib; { + meta = { description = "Implementation of a https://polkadot.network node in Rust based on the Substrate framework"; homepage = "https://github.com/paritytech/polkadot-sdk"; license = lib.licenses.gpl3Only; @@ -83,7 +83,7 @@ rustPlatform.buildRustPackage rec { RaghavSood ]; # See Iso::from_arch in src/isa/mod.rs in cranelift-codegen-meta. - platforms = intersectLists lib.platforms.unix ( + platforms = lib.intersectLists lib.platforms.unix ( lib.platforms.aarch64 ++ lib.platforms.s390x ++ lib.platforms.riscv64 ++ lib.platforms.x86 ); }; diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index fd6bf34a994d..2df6654df9c5 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-pass"; - version = "1.32.10"; + version = "1.33.0"; src = fetchurl { url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb"; - hash = "sha256-FeU7ubjT1WqtviCPA78SW8zZi1h6gnj7erFebg2mgg4="; + hash = "sha256-ELA+YV+abjQWhb1EcGe4Of06dw6bsREMoE0EGNa+rKg="; }; dontConfigure = true; diff --git a/pkgs/by-name/re/redocly/package.nix b/pkgs/by-name/re/redocly/package.nix index dab28d7d866b..9bbd8c74c8c1 100644 --- a/pkgs/by-name/re/redocly/package.nix +++ b/pkgs/by-name/re/redocly/package.nix @@ -9,16 +9,16 @@ buildNpmPackage rec { pname = "redocly"; - version = "2.11.1"; + version = "2.12.6"; src = fetchFromGitHub { owner = "Redocly"; repo = "redocly-cli"; rev = "@redocly/cli@${version}"; - hash = "sha256-jP2Sdde8PyhBJ8cxDG4IOiGRRSy6+/IX77fq6S9vQbs="; + hash = "sha256-HpHbqWX9NewfLxsWhPezzSLRz7jj8oZesiyGm+Uhyiw="; }; - npmDepsHash = "sha256-lSZvkhLmSYuuEI6F9wuqPGtyK9yVregagTa9qci8IfA="; + npmDepsHash = "sha256-XCLwEmjMXNcG5/QFCAkWdA3pvRuzclzP4Akp8WroAdk="; npmBuildScript = "prepare"; diff --git a/pkgs/by-name/ro/root/tests/test-thisroot.nix b/pkgs/by-name/ro/root/tests/test-thisroot.nix index 9a7b7446d5ec..be72dea14444 100644 --- a/pkgs/by-name/ro/root/tests/test-thisroot.nix +++ b/pkgs/by-name/ro/root/tests/test-thisroot.nix @@ -9,9 +9,9 @@ }: runCommand "test-thisroot" { - meta = with lib; { + meta = { description = "Test for root thisroot.* sourcing"; - maintainers = unique ((with lib.maintainers; [ ShamrockLee ]) ++ root.meta.maintainers); + maintainers = lib.unique ((with lib.maintainers; [ ShamrockLee ]) ++ root.meta.maintainers); }; } '' diff --git a/pkgs/by-name/sa/saleae-logic/package.nix b/pkgs/by-name/sa/saleae-logic/package.nix index 09bd65981b32..4a6c6a36aac9 100644 --- a/pkgs/by-name/sa/saleae-logic/package.nix +++ b/pkgs/by-name/sa/saleae-logic/package.nix @@ -126,12 +126,12 @@ stdenv.mkDerivation rec { cp Drivers/99-SaleaeLogic.rules "$out/etc/udev/rules.d/" ''; - meta = with lib; { + meta = { description = "Software for Saleae logic analyzers"; homepage = "https://www.saleae.com/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - platforms = intersectLists lib.platforms.x86_64 lib.platforms.linux; + platforms = lib.intersectLists lib.platforms.x86_64 lib.platforms.linux; maintainers = [ lib.maintainers.bjornfor ]; }; } diff --git a/pkgs/by-name/sf/sfizz-ui/package.nix b/pkgs/by-name/sf/sfizz-ui/package.nix new file mode 100644 index 000000000000..68b30ee36caa --- /dev/null +++ b/pkgs/by-name/sf/sfizz-ui/package.nix @@ -0,0 +1,104 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libjack2, + libsndfile, + xorg, + freetype, + libxkbcommon, + cairo, + glib, + zenity, + flac, + libogg, + libvorbis, + libopus, + cmake, + pango, + pkg-config, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sfizz-ui"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "sfztools"; + repo = "sfizz-ui"; + rev = finalAttrs.version; + # Upstream requires submodules: + # VST3_SDK, vstgui4, sfzt_auwrapper and sfizz + fetchSubmodules = true; + hash = "sha256-Rf1i+tu91bqzO1wWJi7mw2BvbX9K0mDNPqsTUoqPd4U="; + }; + + buildInputs = [ + cairo + flac + freetype + glib + libjack2 + libogg + libopus + libsndfile + libvorbis + libxkbcommon + pango + xorg.libX11 + xorg.libXau + xorg.libxcb + xorg.libXdmcp + xorg.xcbutil + xorg.xcbutilcursor + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + zenity + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + cmakeFlags = [ + (lib.cmakeBool "SFIZZ_TESTS" true) + ]; + + doCheck = true; + + postPatch = '' + # Hard code zenity path (1/2): + substituteInPlace plugins/editor/src/editor/NativeHelpers.cpp \ + --replace-fail \ + 'auto glibPath = g_find_program_in_path("zenity");' \ + 'auto glibPath = g_strdup("${lib.getExe zenity}");' + + # Hard code zenity path (2/2): + substituteInPlace plugins/editor/external/vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp \ + --replace-fail \ + 'zenitypath = "zenity"' \ + 'zenitypath = "${lib.getExe zenity}"' + + # Fix compilation error in GCC 14: + # https://github.com/sfztools/vstgui/pull/5 + # https://github.com/steinbergmedia/vstgui/issues/324 + # This has been upstreamed into master, remove when we switch to a newer upstream version. + substituteInPlace plugins/editor/external/vstgui4/vstgui/lib/finally.h \ + --replace-fail \ + "other.invoke (false);" \ + "other.invoke = false;" + ''; + + meta = { + description = "SFZ based sampler, providing AU / LV2 / PD / VST3 plugins using the sfizz library"; + homepage = "https://github.com/sfztools/sfizz-ui/"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ + joostn + magnetophon + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/si/sigil/package.nix b/pkgs/by-name/si/sigil/package.nix index 5e4cedcb7d21..c4621c07690c 100644 --- a/pkgs/by-name/si/sigil/package.nix +++ b/pkgs/by-name/si/sigil/package.nix @@ -21,7 +21,10 @@ stdenv.mkDerivation rec { hash = "sha256-cKnWAVLScPZYNAFOiXaoHSXMl3YNOh6zmEryILaOR4w="; }; - pythonPath = with python3Packages; [ lxml ]; + pythonPath = with python3Packages; [ + lxml + dulwich + ]; nativeBuildInputs = [ cmake @@ -37,6 +40,7 @@ stdenv.mkDerivation rec { qt6.qtwebengine qt6.qtsvg python3Packages.lxml + python3Packages.dulwich ]; prePatch = '' diff --git a/pkgs/by-name/si/simde/package.nix b/pkgs/by-name/si/simde/package.nix index fd143c46533e..1cf764508965 100644 --- a/pkgs/by-name/si/simde/package.nix +++ b/pkgs/by-name/si/simde/package.nix @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { ninja ]; - meta = with lib; { + meta = { homepage = "https://simd-everywhere.github.io"; description = "Implementations of SIMD instruction sets for systems which don't natively support them"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ whiteley ]; - platforms = flatten ( + platforms = lib.flatten ( with lib.platforms; [ arm diff --git a/pkgs/by-name/si/singular/package.nix b/pkgs/by-name/si/singular/package.nix index d731ae09168f..916a48e81297 100644 --- a/pkgs/by-name/si/singular/package.nix +++ b/pkgs/by-name/si/singular/package.nix @@ -190,12 +190,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "CAS for polynomial computations"; teams = [ lib.teams.sage ]; # 32 bit x86 fails with some link error: `undefined reference to `__divmoddi4@GCC_7.0.0'` # https://www.singular.uni-kl.de:8002/trac/ticket/837 - platforms = subtractLists lib.platforms.i686 lib.platforms.unix; + platforms = lib.subtractLists lib.platforms.i686 lib.platforms.unix; license = lib.licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 homepage = "https://www.singular.uni-kl.de"; downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/"; diff --git a/pkgs/by-name/so/solana-cli/package.nix b/pkgs/by-name/so/solana-cli/package.nix index b24e934164cb..a74d92b29a99 100644 --- a/pkgs/by-name/so/solana-cli/package.nix +++ b/pkgs/by-name/so/solana-cli/package.nix @@ -108,17 +108,17 @@ rustPlatform.buildRustPackage rec { # If set, always finds OpenSSL in the system, even if the vendored feature is enabled. OPENSSL_NO_VENDOR = 1; - meta = with lib; { + meta = { description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces"; homepage = "https://solana.com"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ netfox happysalada aikooo7 JacoMalan1 ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/so/solo5/package.nix b/pkgs/by-name/so/solo5/package.nix index 746ac6dfc8df..8c544a6de5ea 100644 --- a/pkgs/by-name/so/solo5/package.nix +++ b/pkgs/by-name/so/solo5/package.nix @@ -89,11 +89,11 @@ stdenv.mkDerivation { runHook postCheck ''; - meta = with lib; { + meta = { description = "Sandboxed execution environment"; homepage = "https://github.com/solo5/solo5"; license = lib.licenses.isc; - platforms = mapCartesianProduct ({ arch, os }: "${arch}-${os}") { + platforms = lib.mapCartesianProduct ({ arch, os }: "${arch}-${os}") { arch = [ "aarch64" "x86_64" diff --git a/pkgs/by-name/st/string-machine/package.nix b/pkgs/by-name/st/string-machine/package.nix index dafbf697a4d9..78072442c382 100644 --- a/pkgs/by-name/st/string-machine/package.nix +++ b/pkgs/by-name/st/string-machine/package.nix @@ -49,11 +49,11 @@ stdenv.mkDerivation { "PREFIX=$(out)" ]; - meta = with lib; { + meta = { homepage = "https://github.com/jpcima/string-machine"; description = "Digital model of electronic string ensemble instrument"; maintainers = [ lib.maintainers.magnetophon ]; - platforms = intersectLists lib.platforms.linux lib.platforms.x86; + platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86; license = lib.licenses.boost; }; } diff --git a/pkgs/by-name/ta/tabnine/package.nix b/pkgs/by-name/ta/tabnine/package.nix index 52074f76ef45..0d95b9d19724 100644 --- a/pkgs/by-name/ta/tabnine/package.nix +++ b/pkgs/by-name/ta/tabnine/package.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation { updateScript = ./update.sh; }; - meta = with lib; { + meta = { homepage = "https://tabnine.com"; description = "Smart Compose for code that uses deep learning to help you write code faster"; license = lib.licenses.unfree; - platforms = attrNames sources.platforms; + platforms = lib.attrNames sources.platforms; maintainers = with lib.maintainers; [ lovesegfault ]; }; } diff --git a/pkgs/by-name/ta/tana/package.nix b/pkgs/by-name/ta/tana/package.nix index 2159a2d98c30..e83ec371dd6f 100644 --- a/pkgs/by-name/ta/tana/package.nix +++ b/pkgs/by-name/ta/tana/package.nix @@ -62,7 +62,7 @@ let stdenv.cc.cc stdenv.cc.libc ]; - version = "1.0.48"; + version = "1.0.51"; in stdenv.mkDerivation { pname = "tana"; @@ -70,7 +70,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/tanainc/tana-desktop-releases/releases/download/v${version}/tana_${version}_amd64.deb"; - hash = "sha256-IQ7KRqPvLiUzNU279IirHq21Q9DeFfkQ+B3i9rTgYR0="; + hash = "sha256-ApRfy+aD4lp53HtShDTQGKuAsQnKdwFMDd19Np9/b9g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/tc/tcb/package.nix b/pkgs/by-name/tc/tcb/package.nix index 366c5b4c1617..1f1f5e986ec1 100644 --- a/pkgs/by-name/tc/tcb/package.nix +++ b/pkgs/by-name/tc/tcb/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { makeFlagsArray+=("CC=$CC") ''; - meta = with lib; { + meta = { description = "Alternative password shadowing scheme"; longDescription = '' The tcb package contains core components of our tcb suite implementing the alternative @@ -61,7 +61,7 @@ stdenv.mkDerivation { ''; homepage = "https://www.openwall.com/tcb/"; license = lib.licenses.bsd3; - platforms = systems.inspect.patterns.isGnu; + platforms = lib.systems.inspect.patterns.isGnu; maintainers = with lib.maintainers; [ izorkin ]; }; } diff --git a/pkgs/by-name/te/tela-icon-theme/package.nix b/pkgs/by-name/te/tela-icon-theme/package.nix index 9d652a537255..7af830eb456b 100644 --- a/pkgs/by-name/te/tela-icon-theme/package.nix +++ b/pkgs/by-name/te/tela-icon-theme/package.nix @@ -49,13 +49,13 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Flat colorful Design icon theme"; homepage = "https://github.com/vinceliuice/tela-icon-theme"; changelog = "https://github.com/vinceliuice/Tela-icon-theme/releases/tag/${src.rev}"; license = lib.licenses.gpl3Only; # darwin systems use case-insensitive filesystems that cause hash mismatches - platforms = subtractLists lib.platforms.darwin lib.platforms.unix; + platforms = lib.subtractLists lib.platforms.darwin lib.platforms.unix; maintainers = [ ]; }; } diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix index 1ec99d8b4bfd..1a7bc4e655ba 100644 --- a/pkgs/by-name/to/tombi/package.nix +++ b/pkgs/by-name/to/tombi/package.nix @@ -9,19 +9,19 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tombi"; - version = "0.7.4"; + version = "0.7.7"; src = fetchFromGitHub { owner = "tombi-toml"; repo = "tombi"; tag = "v${finalAttrs.version}"; - hash = "sha256-KbXrqnPadztw7uNmaqWNKWZR3YMysRmNfg7A2XlhE4E="; + hash = "sha256-l0h6J0xJBVviizYIuW7tkj9Hn4P72n9ivtyWmlKcG+4="; }; # Tests relies on the presence of network doCheck = false; cargoBuildFlags = [ "--package tombi-cli" ]; - cargoHash = "sha256-dpOQsaUzd1n/yBVVVp/mAVvJNLKzvOAjos0tgkzvF44="; + cargoHash = "sha256-anKKNX43rfvBSrurW8TbvYZHhkfGKussiFUtiLFBlW8="; postPatch = '' substituteInPlace Cargo.toml \ diff --git a/pkgs/by-name/ty/typesetter/package.nix b/pkgs/by-name/ty/typesetter/package.nix index e5b0291eaa71..9b02751eb273 100644 --- a/pkgs/by-name/ty/typesetter/package.nix +++ b/pkgs/by-name/ty/typesetter/package.nix @@ -30,19 +30,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "typesetter"; - version = "0.7.0"; + version = "0.8.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "haydn"; repo = "typesetter"; tag = "v${finalAttrs.version}"; - hash = "sha256-PFqMV5ofEg5Va08ssD6en5YXCpYrRjG7pSVD34l/QQY="; + hash = "sha256-ialZTGhzLGLybOSP+cBsV4GzftVzEMYZEoRlAbBQRvY="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-RBDb0+6bD7K+FZ+Qg9vV1LDn/LT2xfPh/XsPfQWfwJQ="; + hash = "sha256-ohcJds29nDZ/OYb3L7n7QVkXuX32P8ExbtwEvgVoLag="; }; strictDeps = true; diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix index fe6b947c92dd..28f6e08c72d6 100644 --- a/pkgs/by-name/ut/ut1999/package.nix +++ b/pkgs/by-name/ut/ut1999/package.nix @@ -197,10 +197,10 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - meta = with lib; { + meta = { description = "Unreal Tournament GOTY (1999) with the OldUnreal patch"; license = lib.licenses.unfree; - platforms = attrNames srcs; + platforms = lib.attrNames srcs; maintainers = with lib.maintainers; [ eliandoran dwt diff --git a/pkgs/by-name/vg/vgmstream/package.nix b/pkgs/by-name/vg/vgmstream/package.nix index 441419ea5872..39569ac7b4f1 100644 --- a/pkgs/by-name/vg/vgmstream/package.nix +++ b/pkgs/by-name/vg/vgmstream/package.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { description = "Library for playback of various streamed audio formats used in video games"; homepage = "https://vgmstream.org"; maintainers = with lib.maintainers; [ zane ]; @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { isc # vgmstream itself mit # atrac9 ] - ++ optional (stdenv.system == "x86_64-linux") bsd2; + ++ lib.optional (stdenv.system == "x86_64-linux") bsd2; platforms = with lib.platforms; unix; }; }) diff --git a/pkgs/by-name/wa/wayfarer/package.nix b/pkgs/by-name/wa/wayfarer/package.nix index 2063c6c3495d..7cd100a454e8 100644 --- a/pkgs/by-name/wa/wayfarer/package.nix +++ b/pkgs/by-name/wa/wayfarer/package.nix @@ -55,12 +55,12 @@ stdenv.mkDerivation (finalAttrs: { pipewire ]; - meta = with lib; { + meta = { description = "Screen recorder for GNOME / Wayland / pipewire"; homepage = "https://github.com/stronnag/wayfarer"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fgaz ]; mainProgram = "wayfarer"; - platforms = subtractLists lib.platforms.darwin lib.platforms.unix; + platforms = lib.subtractLists lib.platforms.darwin lib.platforms.unix; }; }) diff --git a/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix b/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix index cdc2323f5392..05e763932fcc 100644 --- a/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix +++ b/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix @@ -58,13 +58,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "More Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = lib.licenses.bsd3; # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/v0.3.1/webrtc/typedefs.h # + our patches - platforms = intersectLists lib.platforms.unix ( + platforms = lib.intersectLists lib.platforms.unix ( lib.platforms.arm ++ lib.platforms.aarch64 ++ lib.platforms.mips diff --git a/pkgs/by-name/we/webrtc-audio-processing_1/package.nix b/pkgs/by-name/we/webrtc-audio-processing_1/package.nix index 1c8333831071..cf4191c2ad10 100644 --- a/pkgs/by-name/we/webrtc-audio-processing_1/package.nix +++ b/pkgs/by-name/we/webrtc-audio-processing_1/package.nix @@ -60,12 +60,12 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-msse2"; }; - meta = with lib; { + meta = { homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "More Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = lib.licenses.bsd3; platforms = - intersectLists + lib.intersectLists # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/meson.build (lib.platforms.darwin ++ lib.platforms.linux ++ lib.platforms.windows) # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/webrtc/rtc_base/system/arch.h diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index 365ef0679e13..89fc7f8ed08b 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -10,17 +10,17 @@ }: buildGoModule (finalAttrs: { pname = "werf"; - version = "2.55.4"; + version = "2.56.1"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; tag = "v${finalAttrs.version}"; - hash = "sha256-bfz9mjvvqT6jA9CGLNGox8IaE0QzVGWRc5I/vaB6e5M="; + hash = "sha256-Kj5tFt4WWWc7VOsncIPwRz/YHm1Sv4dIeC5LugqdJzo="; }; proxyVendor = true; - vendorHash = "sha256-V7mNRUrKQ2BdjbhCe+aAF5LAeRaAiaRyGaEZs+MaS+k="; + vendorHash = "sha256-qFfX7V3Zl9QQt6E7gURorW02dbE0a4gUQ4XwAL4Hg5s="; subPackages = [ "cmd/werf" ]; diff --git a/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix b/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix index 7dcafb56609b..fd8567b9af43 100644 --- a/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix +++ b/pkgs/by-name/wi/wireguard-vanity-keygen/package.nix @@ -23,10 +23,10 @@ buildGoModule rec { "-X main.appVersion=${version}" ]; - meta = with lib; { + meta = { changelog = let - versionWithoutDots = concatStrings (splitString "." version); + versionWithoutDots = lib.concatStrings (lib.splitString "." version); in "https://github.com/axllent/wireguard-vanity-keygen/blob/develop/CHANGELOG.md#${versionWithoutDots}"; description = "WireGuard vanity key generator"; diff --git a/pkgs/by-name/wl/wlr-layout-ui/package.nix b/pkgs/by-name/wl/wlr-layout-ui/package.nix index 54db15657f56..6ecb98ac9090 100644 --- a/pkgs/by-name/wl/wlr-layout-ui/package.nix +++ b/pkgs/by-name/wl/wlr-layout-ui/package.nix @@ -30,12 +30,12 @@ python3.pkgs.buildPythonApplication rec { install -Dm644 files/wlr-layout-ui.desktop $out/share/applications/wlr-layout-ui.desktop ''; - meta = with lib; { + meta = { description = "Simple GUI to setup the screens layout on wlroots based systems"; homepage = "https://github.com/fdev31/wlr-layout-ui/"; maintainers = with lib.maintainers; [ bnlrnz ]; license = lib.licenses.mit; mainProgram = "wlrlui"; - platforms = subtractLists lib.platforms.darwin lib.platforms.unix; + platforms = lib.subtractLists lib.platforms.darwin lib.platforms.unix; }; } diff --git a/pkgs/by-name/xd/xdgmenumaker/package.nix b/pkgs/by-name/xd/xdgmenumaker/package.nix index 184609c6f4d2..a13c78010d09 100644 --- a/pkgs/by-name/xd/xdgmenumaker/package.nix +++ b/pkgs/by-name/xd/xdgmenumaker/package.nix @@ -55,13 +55,13 @@ python3Packages.buildPythonApplication rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "Command line tool that generates XDG menus for several window managers"; mainProgram = "xdgmenumaker"; homepage = "https://github.com/gapan/xdgmenumaker"; license = lib.licenses.gpl3Plus; # NOTE: exclude darwin from platforms because Travis reports hash mismatch - platforms = with lib.platforms; filter (x: !(elem x darwin)) unix; + platforms = with lib.platforms; lib.filter (x: !(lib.elem x darwin)) unix; maintainers = [ lib.maintainers.romildo ]; }; } diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix index 147c0847caa3..03c634a84b7a 100644 --- a/pkgs/by-name/xe/xen/package.nix +++ b/pkgs/by-name/xe/xen/package.nix @@ -89,7 +89,7 @@ let ; # Mark versions older than minSupportedVersion as EOL. - minSupportedVersion = "4.17"; + minSupportedVersion = "4.18"; scriptDeps = let diff --git a/pkgs/by-name/yo/yourkit-java/package.nix b/pkgs/by-name/yo/yourkit-java/package.nix index 082cf804ae02..72ba039eb3e7 100644 --- a/pkgs/by-name/yo/yourkit-java/package.nix +++ b/pkgs/by-name/yo/yourkit-java/package.nix @@ -91,13 +91,13 @@ stdenvNoCC.mkDerivation { passthru.updateScript = ./update.sh; - meta = with lib; { + meta = { description = "Award winning, fully featured low overhead profiler for Java EE and Java SE platforms"; homepage = "https://www.yourkit.com"; changelog = "https://www.yourkit.com/changes/"; license = lib.licenses.unfree; mainProgram = "yourkit-java-profiler"; - platforms = attrNames arches; + platforms = lib.attrNames arches; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; maintainers = with lib.maintainers; [ herberteuler ]; }; diff --git a/pkgs/by-name/ze/zeroad-unwrapped/package.nix b/pkgs/by-name/ze/zeroad-unwrapped/package.nix index b41db187955c..3a16aaf5c3b6 100644 --- a/pkgs/by-name/ze/zeroad-unwrapped/package.nix +++ b/pkgs/by-name/ze/zeroad-unwrapped/package.nix @@ -162,7 +162,7 @@ stdenv.mkDerivation rec { install -D build/resources/0ad.desktop $out/share/applications/0ad.desktop ''; - meta = with lib; { + meta = { description = "Free, open-source game of ancient warfare"; homepage = "https://play0ad.com/"; license = with lib.licenses; [ @@ -173,7 +173,7 @@ stdenv.mkDerivation rec { lib.licenses.zlib # otherwise masked by pkgs.zlib ]; maintainers = with lib.maintainers; [ chvp ]; - platforms = subtractLists lib.platforms.i686 lib.platforms.linux; + platforms = lib.subtractLists lib.platforms.i686 lib.platforms.linux; mainProgram = "0ad"; }; } diff --git a/pkgs/by-name/zl/zlequalizer/package.nix b/pkgs/by-name/zl/zlequalizer/package.nix index b06f590b9b89..6beeec3a47df 100644 --- a/pkgs/by-name/zl/zlequalizer/package.nix +++ b/pkgs/by-name/zl/zlequalizer/package.nix @@ -29,13 +29,13 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "zlequalizer"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "ZL-Audio"; repo = "ZLEqualizer"; tag = "${finalAttrs.version}"; - hash = "sha256-9TmvjBXTrvR0+qnGDFhCczanxiry3d43QVn/pJLUREY="; + hash = "sha256-ix3UcTs9CEJ2TCJLdpvZOaoB0wgNDrvSQhZzer8yMRw="; fetchSubmodules = true; }; @@ -87,6 +87,8 @@ clangStdenv.mkDerivation (finalAttrs: { if clangStdenv.hostPlatform.isAarch64 then "neon64" else "sse2;avx;avx2" )) (lib.cmakeBool "ZL_JUCE_COPY_PLUGIN" false) + # set the version for in the settings screen. + (lib.cmakeFeature "FOOBAR_VERSION" "${finalAttrs.version}") ]; installPhase = '' diff --git a/pkgs/desktops/gnome/extensions/clock-override/default.nix b/pkgs/desktops/gnome/extensions/clock-override/default.nix index 7b4b20b31ad0..2092cd7f1713 100644 --- a/pkgs/desktops/gnome/extensions/clock-override/default.nix +++ b/pkgs/desktops/gnome/extensions/clock-override/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Customize the date and time format displayed in clock in the top bar in GNOME Shell"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ rhoriguchi ]; homepage = "https://github.com/stuartlangridge/gnome-shell-clock-override"; - broken = versionOlder gnome-shell.version "3.18"; + broken = lib.versionOlder gnome-shell.version "3.18"; }; } diff --git a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix index 4af167bdb70e..4a21f6c48c88 100644 --- a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix +++ b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix @@ -34,12 +34,12 @@ stdenv.mkDerivation rec { extensionPortalSlug = "pidgin-im-integration"; }; - meta = with lib; { + meta = { homepage = "https://github.com/muffinmad/pidgin-im-gnome-shell-extension"; description = "Make Pidgin IM conversations appear in the Gnome Shell message tray"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = [ ]; - broken = versionAtLeast gnome-shell.version "3.32"; # Doesn't support 3.34 + broken = lib.versionAtLeast gnome-shell.version "3.32"; # Doesn't support 3.34 }; } diff --git a/pkgs/desktops/gnome/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix index 46e5979bb93e..03529846c871 100644 --- a/pkgs/desktops/gnome/extensions/unite/default.nix +++ b/pkgs/desktops/gnome/extensions/unite/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Unite is a GNOME Shell extension which makes a few layout tweaks to the top panel and removes window decorations to make it look like Ubuntu Unity Shell"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ rhoriguchi ]; homepage = "https://github.com/hardpixel/unite-shell"; - broken = versionOlder gnome-shell.version "3.32"; + broken = lib.versionOlder gnome-shell.version "3.32"; }; } diff --git a/pkgs/desktops/xfce/core/thunar/wrapper.nix b/pkgs/desktops/xfce/core/thunar/wrapper.nix index 009710ea353e..79d1b236af28 100644 --- a/pkgs/desktops/xfce/core/thunar/wrapper.nix +++ b/pkgs/desktops/xfce/core/thunar/wrapper.nix @@ -45,7 +45,7 @@ else done ''; - meta = with lib; { + meta = { inherit (thunar.meta) homepage license @@ -56,7 +56,7 @@ else description = thunar.meta.description + - optionalString (0 != length thunarPlugins) - " (with plugins: ${concatStringsSep ", " (map (x: x.name) thunarPlugins)})"; + lib.optionalString (0 != lib.length thunarPlugins) + " (with plugins: ${lib.concatStringsSep ", " (map (x: x.name) thunarPlugins)})"; }; } diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 0881446f1e2d..c5f4418e7c62 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = with lib; { + meta = { # assembler failures during build, x86_64-darwin broken since 2020-10-14 broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); description = "Clozure Common Lisp"; @@ -116,6 +116,6 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; mainProgram = "ccl"; teams = [ lib.teams.lisp ]; - platforms = attrNames options; + platforms = lib.attrNames options; }; } diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 6b921250bae9..b2d636fd488b 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, coreutils, ocaml-ng, + dune, zlib, pcre, pcre2, @@ -23,7 +24,6 @@ let ptmap camlp5 sha - dune_3 luv extlib ] @@ -37,7 +37,6 @@ let ptmap camlp5 sha - dune_3 luv extlib-1-7-7 ]; @@ -61,6 +60,7 @@ let buildInputs = [ zlib neko + dune ] ++ (if lib.versionAtLeast version "4.3" then [ pcre2 ] else [ pcre ]) ++ lib.optional (lib.versionAtLeast version "4.1") mbedtls_2 diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index b6c7f2693c07..0d8f1156db4b 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -27,9 +27,9 @@ let "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw="; "21.1.7".officialRelease.sha256 = "sha256-SaRJ7+iZMhhBdcUDuJpMAY4REQVhrvYMqI2aq3Kz08o="; "22.0.0-git".gitRelease = { - rev = "fc92e4dec9a6dfcb4fb77d863d0bf1dbc53033e5"; - rev-version = "22.0.0-unstable-2025-12-07"; - sha256 = "sha256-ntcaJgSG22tIDTBUVEwx+6ksQrWR6YHDwbUOls06JEE="; + rev = "8f51da369e6e7f13bea941e61b4b2c5fa81216f5"; + rev-version = "22.0.0-unstable-2025-12-14"; + sha256 = "sha256-9om/PWp+cjMRP+2LVhC1xCczmabNenebEMDbOytyhUA="; }; } // llvmVersions; diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index 8ff2f062e439..a19aac53d5de 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation { patchShebangs $out ''; - meta = with lib; { + meta = { homepage = "https://www.mozart-oz.org/"; description = "Multiplatform implementation of the Oz programming language"; longDescription = '' @@ -83,7 +83,7 @@ stdenv.mkDerivation { ''; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.mit; - platforms = attrNames binaries; + platforms = lib.attrNames binaries; hydraPlatforms = [ ]; }; } diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index a82660eb217f..5787748f3cba 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -315,13 +315,13 @@ stdenv.mkDerivation (self: { __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Common Lisp compiler"; homepage = "https://sbcl.org"; license = lib.licenses.publicDomain; # and FreeBSD mainProgram = "sbcl"; teams = [ lib.teams.lisp ]; - platforms = attrNames bootstrapBinaries ++ [ + platforms = lib.attrNames bootstrapBinaries ++ [ # These aren’t bootstrapped using the binary distribution but compiled # using a separate (lisp) host "x86_64-darwin" diff --git a/pkgs/development/compilers/scala/2.x.nix b/pkgs/development/compilers/scala/2.x.nix index 7ca4c3800baa..eaf5ef0e0f31 100644 --- a/pkgs/development/compilers/scala/2.x.nix +++ b/pkgs/development/compilers/scala/2.x.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { ''; }; - meta = with lib; { + meta = { description = "General purpose programming language"; longDescription = '' Scala is a general purpose programming language designed to express @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { homepage = "https://www.scala-lang.org/"; license = lib.licenses.bsd3; platforms = lib.platforms.all; - branch = versions.majorMinor version; + branch = lib.versions.majorMinor version; maintainers = with lib.maintainers; [ kashw2 ]; diff --git a/pkgs/development/coq-modules/itauto/default.nix b/pkgs/development/coq-modules/itauto/default.nix index b7d9e74c9805..da5b40c2923a 100644 --- a/pkgs/development/coq-modules/itauto/default.nix +++ b/pkgs/development/coq-modules/itauto/default.nix @@ -4,6 +4,7 @@ mkCoqDerivation, coq, stdlib, + dune, version ? null, }: @@ -60,7 +61,7 @@ nativeBuildInputs = with coq.ocamlPackages; [ ocaml findlib - dune_3 + dune ]; } ) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix index 7dc391912154..ca028a636478 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -90,4 +90,8 @@ in # call-stack = dontCheck super.call-stack; # https://github.com/sol/call-stack/issues/19 monad-dijkstra = dontCheck super.monad-dijkstra; # needs hlint 3.10 + + # Workaround https://github.com/haskell/haskell-language-server/issues/4674 + haskell-language-server = haskellLib.disableCabalFlag "hlint" super.haskell-language-server; + } diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 08a4c836190b..0b900710c785 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -146,7 +146,7 @@ stdenv.mkDerivation rec { rm -rf $out/share/${pname}/books ''; - meta = with lib; { + meta = { description = "Interpreter and prover for a Lisp dialect"; mainProgram = "acl2"; longDescription = '' @@ -182,7 +182,7 @@ stdenv.mkDerivation rec { # ACL2 itself is bsd3 bsd3 ] - ++ optionals certifyBooks [ + ++ lib.optionals certifyBooks [ # The community books are mostly bsd3 or mit but with a few # other things thrown in. mit diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 235f17533a2d..13ede05bf2b7 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -828,12 +828,12 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://www.python.org"; changelog = let - majorMinor = versions.majorMinor version; - dashedVersion = replaceStrings [ "." "a" "b" ] [ "-" "-alpha-" "-beta-" ] version; + majorMinor = lib.versions.majorMinor version; + dashedVersion = lib.replaceStrings [ "." "a" "b" ] [ "-" "-alpha-" "-beta-" ] version; in if sourceVersion.suffix == "" then "https://docs.python.org/release/${version}/whatsnew/changelog.html" diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 3413bc948139..5efd402f1f02 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = with lib; { + meta = { description = "OpenGL extension loading library for C/C++"; homepage = "https://glew.sourceforge.net/"; license = with lib.licenses; [ @@ -94,7 +94,9 @@ stdenv.mkDerivation (finalAttrs: { ]; # For full details, see https://github.com/nigels-com/glew#copyright-and-licensing pkgConfigModules = [ "glew" ]; platforms = - with lib.platforms; - if enableEGL then subtractLists darwin mesa.meta.platforms else mesa.meta.platforms; + if enableEGL then + lib.subtractLists lib.platforms.darwin mesa.meta.platforms + else + mesa.meta.platforms; }; }) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 16f8feb1710f..37252077c6df 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -438,7 +438,7 @@ qtModule ( requiredSystemFeatures = [ "big-parallel" ]; - meta = with lib; { + meta = { description = "Web engine based on the Chromium web browser"; mainProgram = "qwebengine_convert_dict"; maintainers = [ ]; @@ -450,7 +450,7 @@ qtModule ( let inherit (lib.systems.inspect) patternLogicalAnd; in - concatMap (patternLogicalAnd isUnix) ( + lib.concatMap (patternLogicalAnd isUnix) ( lib.concatMap lib.toList [ isx86_32 isx86_64 diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 1e89de29f05b..f3eaef61b82c 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -342,11 +342,11 @@ stdenv.mkDerivation rec { ; }; - meta = with lib; { + meta = { description = "Basic Linear Algebra Subprograms"; license = lib.licenses.bsd3; homepage = "https://github.com/OpenMathLib/OpenBLAS"; - platforms = attrNames configs; + platforms = lib.attrNames configs; maintainers = with lib.maintainers; [ ttuegel ]; }; } diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index 33332ea8386d..cce2f31a2797 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -14,7 +14,7 @@ let # Coerces a string to an int. coerceInt = val: if lib.isInt val then val else lib.toIntBase10 val; - coerceIntVersion = v: coerceInt (lib.versions.major v); + coerceIntVersion = v: coerceInt (lib.versions.major (toString v)); # Parses a single version, substituting "latest" with the latest version. parseVersion = @@ -144,7 +144,7 @@ in let # Resolve all the platform versions. - platformVersions' = map coerceInt (parseVersions repo "platforms" platformVersions); + platformVersions' = map coerceIntVersion (parseVersions repo "platforms" platformVersions); # Determine the Android os identifier from Nix's system identifier os = @@ -220,6 +220,28 @@ let extras = fetchArchives repo.extras; }; + # Latest packages that are typically keyed by the API level. + archivesByApiLevel = + let + # Transforms the given attrset mapping API levels (with possible suffixes and minor versions) + # into the latest API level for each major version. + mkLatestByApiLevel = + packages: + lib.filterAttrs (_: value: value != null) ( + lib.mapAttrs ( + _: value: + (lib.findFirst (x: x.name == lib.versions.majorMinor x.name) { value = null; } ( + lib.lists.sort (x: y: lib.strings.versionOlder y.name x.name) value + )).value + ) (lib.groupBy (x: lib.versions.major x.name) (lib.attrsToList packages)) + ); + in + { + platforms = mkLatestByApiLevel allArchives.packages.platforms; + sources = mkLatestByApiLevel allArchives.packages.sources; + system-images = mkLatestByApiLevel allArchives.system-images; + }; + # Lift the archives to the package level for easy search, # and add recurseIntoAttrs to all of them. allPackages = @@ -284,17 +306,28 @@ let lib.hasAttrByPath [ package (toString version) ] packages; # Displays a nice error message that includes the available options if a version doesn't exist. + # Note that allPackages can be a list of package sets, or a single package set. Pass a list if + # you want to prioritize elements to the left (e.g. for passing a platform major version). checkVersion = - packages: package: version: - if hasVersion packages package version then - packages.${package}.${toString version} - else + allPackages: package: version: + let + # Convert the package sets to a list. + allPackages' = if lib.isList allPackages then allPackages else lib.singleton allPackages; + + # Pick the first package set where we have the version. + packageSet = lib.findFirst (packages: hasVersion packages package version) null allPackages'; + in + if packageSet == null then throw '' The version ${toString version} is missing in package ${package}. The only available versions are ${ - builtins.concatStringsSep ", " (builtins.attrNames packages.${package}) + lib.concatStringsSep ", " ( + lib.attrNames (lib.foldl (s: x: s // (x.${package} or { })) { } allPackages') + ) }. - ''; + '' + else + packageSet.${package}.${toString version}; # Returns true if we should link the specified plugins. shouldLink = @@ -508,19 +541,23 @@ lib.recurseIntoAttrs rec { ''; }; + # This is a list of the chosen API levels, as integers. platformVersions = platformVersions'; platforms = map ( version: deployAndroidPackage { - package = checkVersion allArchives.packages "platforms" version; + package = checkVersion [ archivesByApiLevel allArchives.packages ] "platforms" version; } ) platformVersions'; + # This exposes the version strings (e.g. "36.1" for API 36). + platformVersionStrings = map (platform: platform.version) platforms; + sources = map ( version: deployAndroidPackage { - package = checkVersion allArchives.packages "sources" version; + package = checkVersion [ archivesByApiLevel allArchives.packages ] "sources" version; } ) platformVersions'; @@ -539,14 +576,19 @@ lib.recurseIntoAttrs rec { # ``` let availablePackages = - map (abiVersion: allArchives.system-images.${toString apiVersion}.${type}.${abiVersion}) + map + ( + abiVersion: + archivesByApiLevel.system-images.${toString apiVersion}.${type}.${abiVersion} + or allArchives.system-images.${toString apiVersion}.${type}.${abiVersion} + ) ( builtins.filter ( abiVersion: lib.hasAttrByPath [ (toString apiVersion) type abiVersion ] allArchives.system-images ) abiVersions ); - instructions = builtins.listToAttrs ( + instructions = lib.listToAttrs ( map (package: { name = package.name; value = lib.optionalString (lib.hasPrefix "google_apis" type) '' diff --git a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix index fbb52d65a23b..9c6d9ec60902 100644 --- a/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix +++ b/pkgs/development/mobile/androidenv/examples/shell-with-emulator.nix @@ -78,6 +78,9 @@ let androidSdk = androidComposition.androidsdk; platformTools = androidComposition.platform-tools; latestSdk = pkgs.lib.foldl' pkgs.lib.max 0 androidComposition.platformVersions; + latestSdkVersion = pkgs.lib.foldl' ( + s: x: if pkgs.lib.strings.compareVersions x s > 0 then x else s + ) "0" androidComposition.platformVersionStrings; jdk = pkgs.jdk; in pkgs.mkShell rec { @@ -123,8 +126,8 @@ pkgs.mkShell rec { packages=( "build-tools" "cmdline-tools" \ - "platform-tools" "platforms;android-${toString latestSdk}" \ - "system-images;android-${toString latestSdk};google_apis;x86_64" + "platform-tools" "platforms;android-${toString latestSdkVersion}" \ + "system-images;android-${toString latestSdkVersion};google_apis;x86_64" ) ${pkgs.lib.optionalString emulatorSupported ''packages+=("emulator")''} @@ -184,7 +187,7 @@ pkgs.mkShell rec { mkdir -p $ANDROID_USER_HOME avdmanager delete avd -n testAVD || true - echo "" | avdmanager create avd --force --name testAVD --package 'system-images;android-${toString latestSdk};google_apis;x86_64' + echo "" | avdmanager create avd --force --name testAVD --package 'system-images;android-${toString latestSdkVersion};google_apis;x86_64' result=$(avdmanager list avd) if [[ ! $result =~ "Name: testAVD" ]]; then diff --git a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix index ead2c48aaf26..58e7879dc3ee 100644 --- a/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix +++ b/pkgs/development/mobile/androidenv/examples/shell-without-emulator.nix @@ -48,6 +48,8 @@ let includeSystemImages = false; includeEmulator = false; + platformVersions = [ "latest" ]; + # Accepting more licenses declaratively: extraLicenses = [ # Already accepted for you with the global accept_license = true or diff --git a/pkgs/development/ocaml-modules/dream-html/default.nix b/pkgs/development/ocaml-modules/dream-html/default.nix index d46990d44847..c5bdb34013a4 100644 --- a/pkgs/development/ocaml-modules/dream-html/default.nix +++ b/pkgs/development/ocaml-modules/dream-html/default.nix @@ -9,6 +9,8 @@ buildDunePackage { pname = "dream-html"; inherit (pure-html) src version meta; + minimalOCamlVersion = "5.3"; + buildInputs = [ ppxlib ]; diff --git a/pkgs/development/ocaml-modules/markdown/default.nix b/pkgs/development/ocaml-modules/markdown/default.nix new file mode 100644 index 000000000000..728f23a58c8a --- /dev/null +++ b/pkgs/development/ocaml-modules/markdown/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildDunePackage, + fetchurl, + batteries, + tyxml, + ounit2, +}: + +buildDunePackage (finalAttrs: { + pname = "markdown"; + version = "0.2.1"; + + src = fetchurl { + url = "https://github.com/gildor478/ocaml-markdown/releases/download/v${finalAttrs.version}/markdown-v${finalAttrs.version}.tbz"; + hash = "sha256-nFdbdK0UIpqwiYGaNIoaj0UwI7/PHCDrxfxHNDYj3l4="; + }; + + propagatedBuildInputs = [ + batteries + tyxml + ]; + + doCheck = true; + + checkInputs = [ ounit2 ]; + + meta = { + homepage = "https://github.com/gildor478/ocaml-markdown"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + description = "Markdown parser and printer"; + }; + +}) diff --git a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix index 2940bac18f50..a1e2906f1310 100644 --- a/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-freestanding/default.nix @@ -64,14 +64,14 @@ else runHook postInstall ''; - meta = with lib; { + meta = { broken = true; # Not compatible with solo5 ≥ 0.7 description = "Freestanding OCaml runtime"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sternenseemann ]; homepage = "https://github.com/mirage/ocaml-freestanding"; platforms = map ({ arch, os }: "${arch}-${os}") ( - cartesianProduct { + lib.cartesianProduct { arch = [ "aarch64" "x86_64" diff --git a/pkgs/development/ocaml-modules/ocamlc-loc/default.nix b/pkgs/development/ocaml-modules/ocamlc-loc/default.nix index d5ac0d14796d..623291093305 100644 --- a/pkgs/development/ocaml-modules/ocamlc-loc/default.nix +++ b/pkgs/development/ocaml-modules/ocamlc-loc/default.nix @@ -1,14 +1,13 @@ { lib, buildDunePackage, - dune_3, + dune, dyn, }: buildDunePackage { pname = "ocamlc-loc"; - inherit (dune_3) src version; - duneVersion = "3"; + inherit (dune) src version; dontAddPrefix = true; @@ -17,8 +16,6 @@ buildDunePackage { rm -rf vendor/pp ''; - minimalOCamlVersion = "4.08"; - propagatedBuildInputs = [ dyn ]; meta = { diff --git a/pkgs/development/ocaml-modules/ordering/default.nix b/pkgs/development/ocaml-modules/ordering/default.nix index 7776c0462d05..e34d0b6ce948 100644 --- a/pkgs/development/ocaml-modules/ordering/default.nix +++ b/pkgs/development/ocaml-modules/ordering/default.nix @@ -1,14 +1,12 @@ -{ buildDunePackage, dune_3 }: +{ buildDunePackage, dune }: buildDunePackage { pname = "ordering"; - inherit (dune_3) version src; - duneVersion = "3"; - minimalOCamlVersion = "4.08"; + inherit (dune) version src; dontAddPrefix = true; - meta = dune_3.meta // { + meta = dune.meta // { description = "Element ordering"; }; } diff --git a/pkgs/development/ocaml-modules/stdune/default.nix b/pkgs/development/ocaml-modules/stdune/default.nix index bc880cf2125f..985462643b91 100644 --- a/pkgs/development/ocaml-modules/stdune/default.nix +++ b/pkgs/development/ocaml-modules/stdune/default.nix @@ -1,6 +1,6 @@ { buildDunePackage, - dune_3, + dune, dyn, ordering, csexp, @@ -8,8 +8,7 @@ buildDunePackage { pname = "stdune"; - inherit (dune_3) version src; - duneVersion = "3"; + inherit (dune) version src; dontAddPrefix = true; @@ -23,7 +22,7 @@ buildDunePackage { rm -r vendor/csexp ''; - meta = dune_3.meta // { + meta = dune.meta // { description = "Dune's unstable standard library"; }; } diff --git a/pkgs/development/ocaml-modules/xdg/default.nix b/pkgs/development/ocaml-modules/xdg/default.nix index c88f2695e7f4..97bb3a99d98d 100644 --- a/pkgs/development/ocaml-modules/xdg/default.nix +++ b/pkgs/development/ocaml-modules/xdg/default.nix @@ -1,22 +1,18 @@ { lib, buildDunePackage, - dune_3, + dune, }: buildDunePackage { pname = "xdg"; - inherit (dune_3) src version; - - duneVersion = "3"; - minimalOCamlVersion = "4.08"; + inherit (dune) src version; dontAddPrefix = true; meta = { description = "XDG Base Directory Specification"; - inherit (dune_3.meta) homepage; - maintainers = [ ]; + inherit (dune.meta) homepage maintainers; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix index 580163fa440c..2e61b502e665 100644 --- a/pkgs/development/python-modules/atenpdu/default.nix +++ b/pkgs/development/python-modules/atenpdu/default.nix @@ -32,13 +32,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "atenpdu" ]; - meta = with lib; { + meta = { description = "Python interface to control ATEN PE PDUs"; homepage = "https://github.com/mtdcr/pductl"; changelog = "https://github.com/mtdcr/pductl/releases/tag/${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "pductl"; - broken = versionAtLeast pysnmp.version "7"; + broken = lib.versionAtLeast pysnmp.version "7"; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-common/default.nix b/pkgs/development/python-modules/azure-mgmt-common/default.nix index cecaf2dd2bd4..c928a10ae30d 100644 --- a/pkgs/development/python-modules/azure-mgmt-common/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-common/default.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, buildPythonPackage, fetchPypi, python, @@ -28,18 +28,18 @@ buildPythonPackage rec { msrestazure ]; - postInstall = pkgs.lib.optionalString (!isPy3k) '' + postInstall = lib.optionalString (!isPy3k) '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/${python.sitePackages}"/azure/mgmt/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/${python.sitePackages}"/azure/__init__.py ''; doCheck = false; - meta = with pkgs.lib; { + meta = { description = "This is the Microsoft Azure Resource Management common code"; homepage = "https://github.com/Azure/azure-sdk-for-python"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ olcai maxwilson ]; diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix index e9e2eb34c9c2..db00dd7143b8 100644 --- a/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, buildPythonPackage, fetchPypi, azure-core, @@ -33,10 +33,10 @@ buildPythonPackage rec { "azure.core" ]; - meta = with pkgs.lib; { + meta = { description = "Microsoft Azure Management Core Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix index 27fa690bb52e..6ea9b152364d 100644 --- a/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-nspkg/default.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, buildPythonPackage, fetchPypi, azure-nspkg, @@ -20,11 +20,11 @@ buildPythonPackage rec { doCheck = false; - meta = with pkgs.lib; { + meta = { description = "Microsoft Azure SDK for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ olcai maxwilson ]; diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix index 28db0b8cb0ed..cfe36674911a 100644 --- a/pkgs/development/python-modules/breezy/default.nix +++ b/pkgs/development/python-modules/breezy/default.nix @@ -114,10 +114,10 @@ buildPythonPackage rec { }; }; - meta = with lib; { + meta = { description = "Friendly distributed version control system"; homepage = "https://www.breezy-vcs.org/"; - changelog = "https://github.com/breezy-team/breezy/blob/${src.rev}/doc/en/release-notes/brz-${versions.majorMinor version}.txt"; + changelog = "https://github.com/breezy-team/breezy/blob/${src.rev}/doc/en/release-notes/brz-${lib.versions.majorMinor version}.txt"; license = lib.licenses.gpl2Only; maintainers = [ ]; mainProgram = "brz"; diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix index 3c43bd7d5a24..48d6fff862cd 100644 --- a/pkgs/development/python-modules/clifford/default.nix +++ b/pkgs/development/python-modules/clifford/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "clifford" ]; - meta = with lib; { + meta = { description = "Numerical Geometric Algebra Module"; homepage = "https://clifford.readthedocs.io"; changelog = "https://github.com/pygae/clifford/releases/tag/v${version}"; @@ -71,6 +71,6 @@ buildPythonPackage rec { maintainers = [ ]; # Broken with numba >= 0.54 # see https://github.com/pygae/clifford/issues/430 - broken = versionAtLeast numba.version "0.58"; + broken = lib.versionAtLeast numba.version "0.58"; }; } diff --git a/pkgs/development/python-modules/deepwave/default.nix b/pkgs/development/python-modules/deepwave/default.nix index 4366843b565c..bae0ccdb6b50 100644 --- a/pkgs/development/python-modules/deepwave/default.nix +++ b/pkgs/development/python-modules/deepwave/default.nix @@ -63,11 +63,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "deepwave" ]; - meta = with lib; { + meta = { description = "Wave propagation modules for PyTorch"; homepage = "https://github.com/ar4/deepwave"; license = lib.licenses.mit; - platforms = intersectLists lib.platforms.x86_64 lib.platforms.linux; + platforms = lib.intersectLists lib.platforms.x86_64 lib.platforms.linux; maintainers = with lib.maintainers; [ atila ]; }; } diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index da5fdfe1e102..2896754e476e 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -61,13 +61,13 @@ buildPythonPackage rec { "tests/unit/providers/configuration/test_pydantic_settings_in_init_py36.py" ]; - meta = with lib; { + meta = { description = "Dependency injection microframework for Python"; homepage = "https://github.com/ets-labs/python-dependency-injector"; changelog = "https://github.com/ets-labs/python-dependency-injector/blob/${src.tag}/docs/main/changelog.rst"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ gerschtli ]; # https://github.com/ets-labs/python-dependency-injector/issues/726 - broken = versionAtLeast pydantic.version "2"; + broken = lib.versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/dirigera/default.nix b/pkgs/development/python-modules/dirigera/default.nix index 25a03cbad94d..2f5faa833929 100644 --- a/pkgs/development/python-modules/dirigera/default.nix +++ b/pkgs/development/python-modules/dirigera/default.nix @@ -36,13 +36,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "dirigera" ]; - meta = with lib; { + meta = { description = "Module for controlling the IKEA Dirigera Smart Home Hub"; homepage = "https://github.com/Leggin/dirigera"; changelog = "https://github.com/Leggin/dirigera/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "generate-token"; - broken = versionOlder pydantic.version "2"; + broken = lib.versionOlder pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/django-leaflet/default.nix b/pkgs/development/python-modules/django-leaflet/default.nix index d68a6f15d084..b43f0c721ffd 100644 --- a/pkgs/development/python-modules/django-leaflet/default.nix +++ b/pkgs/development/python-modules/django-leaflet/default.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, buildPythonPackage, django, fetchPypi, @@ -32,11 +32,11 @@ buildPythonPackage rec { # This dosn't work either because of the same exception as above # pythonImportsCheck = [ "leaflet" ]; - meta = with pkgs.lib; { + meta = { description = "Allows you to use Leaflet in your Django projects"; homepage = "https://github.com/makinacorpus/django-leaflet"; changelog = "https://github.com/makinacorpus/django-leaflet/blob/${version}/CHANGES"; - license = licenses.lgpl3Only; + license = lib.licenses.lgpl3Only; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-pydantic-field/default.nix b/pkgs/development/python-modules/django-pydantic-field/default.nix index 32abe0b1db8d..f6c5919adf76 100644 --- a/pkgs/development/python-modules/django-pydantic-field/default.nix +++ b/pkgs/development/python-modules/django-pydantic-field/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "django-pydantic-field"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; src = fetchFromGitHub { owner = "surenkov"; repo = "django-pydantic-field"; tag = "v${version}"; - hash = "sha256-A3P8s6XiMWE3Ob/w/PDiO7ppJG6ACXSX/fAEYCWper4="; + hash = "sha256-AyI58ij6bMs0i1bwgpBTpEqjYxVo0qC6xBz43iJiHrc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/dopy/default.nix b/pkgs/development/python-modules/dopy/default.nix index 684f4c17ad45..68c64292d683 100644 --- a/pkgs/development/python-modules/dopy/default.nix +++ b/pkgs/development/python-modules/dopy/default.nix @@ -1,4 +1,5 @@ { + lib, pkgs, buildPythonPackage, requests, @@ -26,10 +27,10 @@ buildPythonPackage { doCheck = false; pythonImportsCheck = [ "dopy" ]; - meta = with pkgs.lib; { + meta = { description = "Digital Ocean API python wrapper"; homepage = "https://github.com/Wiredcraft/dopy"; - license = licenses.mit; - maintainers = with maintainers; [ lihop ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lihop ]; }; } diff --git a/pkgs/development/python-modules/dtschema/default.nix b/pkgs/development/python-modules/dtschema/default.nix index dbeeb2f726fc..5208c1754c3d 100644 --- a/pkgs/development/python-modules/dtschema/default.nix +++ b/pkgs/development/python-modules/dtschema/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "dtschema" ]; - meta = with lib; { + meta = { description = "Tooling for devicetree validation using YAML and jsonschema"; homepage = "https://github.com/devicetree-org/dt-schema/"; changelog = "https://github.com/devicetree-org/dt-schema/releases/tag/v${version}"; @@ -55,7 +55,7 @@ buildPythonPackage rec { || # see https://github.com/devicetree-org/dt-schema/issues/108 - versionAtLeast jsonschema.version "4.18" + lib.versionAtLeast jsonschema.version "4.18" ); }; } diff --git a/pkgs/development/python-modules/escapism/default.nix b/pkgs/development/python-modules/escapism/default.nix index 1146c3cb67d9..80b754aaf3ab 100644 --- a/pkgs/development/python-modules/escapism/default.nix +++ b/pkgs/development/python-modules/escapism/default.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, buildPythonPackage, fetchPypi, }: @@ -17,10 +17,10 @@ buildPythonPackage rec { # No tests distributed doCheck = false; - meta = with pkgs.lib; { + meta = { description = "Simple, generic API for escaping strings"; homepage = "https://github.com/minrk/escapism"; - license = licenses.mit; - maintainers = with maintainers; [ bzizou ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bzizou ]; }; } diff --git a/pkgs/development/python-modules/facebook-sdk/default.nix b/pkgs/development/python-modules/facebook-sdk/default.nix index 7ef73d1a1fa6..35ce112fd918 100644 --- a/pkgs/development/python-modules/facebook-sdk/default.nix +++ b/pkgs/development/python-modules/facebook-sdk/default.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, buildPythonPackage, fetchPypi, requests, @@ -25,10 +25,10 @@ buildPythonPackage rec { ${python.interpreter} test/test_facebook.py ''; - meta = with pkgs.lib; { + meta = { description = "Client library that supports the Facebook Graph API and the official Facebook JavaScript SDK"; homepage = "https://github.com/pythonforfacebook/facebook-sdk"; - license = licenses.asl20; + license = lib.licenses.asl20; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/haystack-ai/default.nix b/pkgs/development/python-modules/haystack-ai/default.nix index 015372fc0c5f..f64753da6dda 100644 --- a/pkgs/development/python-modules/haystack-ai/default.nix +++ b/pkgs/development/python-modules/haystack-ai/default.nix @@ -257,7 +257,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "haystack" ]; - meta = with lib; { + meta = { description = "LLM orchestration framework to build customizable, production-ready LLM applications"; longDescription = '' LLM orchestration framework to build customizable, production-ready LLM applications. Connect components (models, vector DBs, file converters) to pipelines or agents that can interact with your data. With advanced retrieval methods, it's best suited for building RAG, question answering, semantic search or conversational agent chatbots @@ -267,6 +267,6 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ happysalada ]; # https://github.com/deepset-ai/haystack/issues/5304 - broken = versionAtLeast pydantic.version "2"; + broken = lib.versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/impacket/default.nix b/pkgs/development/python-modules/impacket/default.nix index 15ff73ee42d6..e7282ace1c1e 100644 --- a/pkgs/development/python-modules/impacket/default.nix +++ b/pkgs/development/python-modules/impacket/default.nix @@ -54,12 +54,12 @@ buildPythonPackage rec { "tests/SMB_RPC/" ]; - meta = with lib; { + meta = { description = "Network protocols Constructors and Dissectors"; homepage = "https://github.com/SecureAuthCorp/impacket"; changelog = "https://github.com/fortra/impacket/releases/tag/impacket_" - + replaceStrings [ "." ] [ "_" ] version; + + lib.replaceStrings [ "." ] [ "_" ] version; # Modified Apache Software License, Version 1.1 license = lib.licenses.free; maintainers = with lib.maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/llama-index-workflows/default.nix b/pkgs/development/python-modules/llama-index-workflows/default.nix index 1f9beeb3e353..e618a8843b19 100644 --- a/pkgs/development/python-modules/llama-index-workflows/default.nix +++ b/pkgs/development/python-modules/llama-index-workflows/default.nix @@ -3,25 +3,28 @@ buildPythonPackage, eval-type-backport, fetchPypi, - hatchling, + uv-build, llama-index-instrumentation, pydantic, }: buildPythonPackage rec { pname = "llama-index-workflows"; - version = "2.11.1"; + version = "2.11.5"; pyproject = true; src = fetchPypi { pname = "llama_index_workflows"; inherit version; - hash = "sha256-BG9BRshG9UFl91B8XkZsL1lINJ9UElyUUFY0OgC/pCs="; + hash = "sha256-3vumxRaanJhv4G3Z8+5eGmzF9Yx3ZgXARYuqClXwdkM="; }; - pythonRelaxDeps = [ "pydantic" ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build>=0.9.10,<0.10.0" "uv_build" + ''; - build-system = [ hatchling ]; + build-system = [ uv-build ]; dependencies = [ eval-type-backport diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 10a7f11e7e43..dc14012dc06b 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -39,12 +39,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pygments ]; - meta = with lib; { + meta = { homepage = "https://github.com/miyakogi/m2r"; description = "Markdown to reStructuredText converter"; license = lib.licenses.mit; maintainers = [ ]; # https://github.com/miyakogi/m2r/issues/66 - broken = versionAtLeast mistune.version "2"; + broken = lib.versionAtLeast mistune.version "2"; }; } diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index ff05a550813d..cdb90dd781ac 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -46,9 +46,9 @@ buildPythonPackage rec { ; }; - meta = with lib; { + meta = { changelog = "https://markupsafe.palletsprojects.com/page/changes/#version-${ - replaceStrings [ "." ] [ "-" ] version + lib.replaceStrings [ "." ] [ "-" ] version }"; description = "Implements a XML/HTML/XHTML Markup safe string"; homepage = "https://palletsprojects.com/p/markupsafe/"; diff --git a/pkgs/development/python-modules/md2gemini/default.nix b/pkgs/development/python-modules/md2gemini/default.nix index af493efa63a0..d61a70778851 100644 --- a/pkgs/development/python-modules/md2gemini/default.nix +++ b/pkgs/development/python-modules/md2gemini/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { hash = "sha256-XreDqqzH3UQ+RIBOrvHpaBb7PXcPPptjQx5cjpI+VzQ="; }; - meta = with lib; { + meta = { description = "Markdown to Gemini text format conversion library"; homepage = "https://github.com/makeworld-the-better-one/md2gemini"; license = lib.licenses.lgpl3Plus; maintainers = [ lib.maintainers.kaction ]; - broken = versionAtLeast mistune.version "3"; + broken = lib.versionAtLeast mistune.version "3"; }; } diff --git a/pkgs/development/python-modules/modelcif/default.nix b/pkgs/development/python-modules/modelcif/default.nix index a0180ce04ec0..5910f0283467 100644 --- a/pkgs/development/python-modules/modelcif/default.nix +++ b/pkgs/development/python-modules/modelcif/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "modelcif"; - version = "1.5"; + version = "1.6"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-modelcif"; tag = version; - hash = "sha256-NVsADYEemnhuFwvM4lMebkU5WrqF+gL/3i6LoZ/Alt8="; + hash = "sha256-01tCE7uClUEpCFkdAvvjG18SwKypJ+oeQ9SbJZF3RVU="; }; build-system = [ diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix index 0a9c8457e96d..f2f244118236 100644 --- a/pkgs/development/python-modules/netaddr/default.nix +++ b/pkgs/development/python-modules/netaddr/default.nix @@ -1,8 +1,8 @@ { lib, + stdenv, buildPythonPackage, fetchPypi, - pythonOlder, setuptools, pytestCheckHook, }: @@ -12,14 +12,24 @@ buildPythonPackage rec { version = "1.3.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { inherit pname version; hash = "sha256-XDw9mJW1Ubdjd5un23oDSH3B+OOzha+BmvNBrp725Io="; }; - nativeBuildInputs = [ setuptools ]; + # Test suite uses internal packaging._musllinux module to detect libc flavor. The module assumes + # the python executable is dynamically linked - it then attempts to parse linked library name to + # detect musl. It won't work on a static build. + postPatch = + if (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isStatic) then + '' + substituteInPlace netaddr/tests/__init__.py \ + --replace-fail "IS_MUSL = _get_musl_version(sys.executable) is not None" "IS_MUSL = True" + '' + else + null; + + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/opcua-widgets/default.nix b/pkgs/development/python-modules/opcua-widgets/default.nix index f12d7140ea62..1d35bf820fe6 100644 --- a/pkgs/development/python-modules/opcua-widgets/default.nix +++ b/pkgs/development/python-modules/opcua-widgets/default.nix @@ -1,5 +1,5 @@ { - pkgs, + lib, buildPythonPackage, pythonOlder, fetchFromGitHub, @@ -31,10 +31,10 @@ buildPythonPackage rec { #This test is broken, when updating this package check if the test was fixed. doCheck = false; - meta = with pkgs.lib; { + meta = { description = "Common widgets for opcua-modeler og opcua-client-gui"; homepage = "https://github.com/FreeOpcUa/opcua-widgets"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/powerapi/default.nix b/pkgs/development/python-modules/powerapi/default.nix index aeae78b3f09f..5cf9d0aa5104 100644 --- a/pkgs/development/python-modules/powerapi/default.nix +++ b/pkgs/development/python-modules/powerapi/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, influxdb-client, @@ -10,7 +11,6 @@ pytest-cov-stub, pytest-timeout, pytestCheckHook, - pythonOlder, pyzmq, setproctitle, setuptools, @@ -21,8 +21,6 @@ buildPythonPackage rec { version = "2.10.0"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "powerapi-ng"; repo = "powerapi"; @@ -30,6 +28,8 @@ buildPythonPackage rec { hash = "sha256-rn1qe0RwYuUR23CgzOOeiwe1wuFihnhQ9a6ALgSP/cQ="; }; + __darwinAllowLocalNetworking = true; + build-system = [ setuptools ]; dependencies = [ @@ -55,10 +55,17 @@ buildPythonPackage rec { pythonImportsCheck = [ "powerapi" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + "test_puller" + "TestDispatcher" + "TestK8sProcessor" + "TestPusher" + ]; + meta = { description = "Python framework for building software-defined power meters"; homepage = "https://github.com/powerapi-ng/powerapi"; - changelog = "https://github.com/powerapi-ng/powerapi/releases/tag/v${version}"; + changelog = "https://github.com/powerapi-ng/powerapi/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/prometrix/default.nix b/pkgs/development/python-modules/prometrix/default.nix index 0e6ff0dff720..649602bd5069 100644 --- a/pkgs/development/python-modules/prometrix/default.nix +++ b/pkgs/development/python-modules/prometrix/default.nix @@ -52,7 +52,7 @@ buildPythonPackage { pythonImportsCheck = [ "prometrix" ]; - meta = with lib; { + meta = { description = "Unified Prometheus client"; longDescription = '' This Python package provides a unified Prometheus client that can be used @@ -63,6 +63,6 @@ buildPythonPackage { maintainers = [ ]; # prometheus-api-client 0.5.5 is not working # https://github.com/robusta-dev/prometrix/issues/14 - broken = versionAtLeast prometheus-api-client.version "0.5.3"; + broken = lib.versionAtLeast prometheus-api-client.version "0.5.3"; }; } diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 55c5face0b1e..49be840bf8f9 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -108,12 +108,12 @@ buildPythonPackage rec { "tests/multi_test.py" ]; - meta = with lib; { + meta = { description = "Python Interface To The cURL library"; homepage = "http://pycurl.io/"; changelog = "https://github.com/pycurl/pycurl/blob/REL_" - + replaceStrings [ "." ] [ "_" ] version + + lib.replaceStrings [ "." ] [ "_" ] version + "/ChangeLog"; license = with lib.licenses; [ lgpl2Only diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 5d814928f844..7db13609e186 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "3.13.1"; + version = "3.16.1"; pyproject = true; src = fetchFromGitHub { owner = "Python-roborock"; repo = "python-roborock"; tag = "v${version}"; - hash = "sha256-EHIpKIZ8cGzVvc897AhHOwbe5Z+3fAiM9HatcP+M9+w="; + hash = "sha256-fg5dWPW3z7PxFdLIVRvmnOS0FndAm5gMyUFZPXjEn00="; }; pythonRelaxDeps = [ "pycryptodome" ]; diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix index a10b445c719d..06b1f608c579 100644 --- a/pkgs/development/python-modules/python-smarttub/default.nix +++ b/pkgs/development/python-modules/python-smarttub/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-smarttub"; - version = "0.0.45"; + version = "0.0.46"; pyproject = true; src = fetchFromGitHub { owner = "mdz"; repo = "python-smarttub"; tag = "v${version}"; - hash = "sha256-r9Ww3isCbgKSWkQPKWzLagPK8+OFeb+zr8Wydft0jJU="; + hash = "sha256-Hx5WVQWB5zk22jExFeka3fzfexBFC/ZWjM7S5WWxxXU="; }; build-system = [ diff --git a/pkgs/development/python-modules/repoze-sphinx-autointerface/default.nix b/pkgs/development/python-modules/repoze-sphinx-autointerface/default.nix index bebd9ace09f6..37b255755d60 100644 --- a/pkgs/development/python-modules/repoze-sphinx-autointerface/default.nix +++ b/pkgs/development/python-modules/repoze-sphinx-autointerface/default.nix @@ -42,13 +42,13 @@ buildPythonPackage rec { "repoze.sphinx" ]; - meta = with lib; { + meta = { homepage = "https://github.com/repoze/repoze.sphinx.autointerface"; description = "Auto-generate Sphinx API docs from Zope interfaces"; changelog = "https://github.com/repoze/repoze.sphinx.autointerface/blob/${version}/CHANGES.rst"; license = lib.licenses.bsd0; maintainers = [ ]; # https://github.com/repoze/repoze.sphinx.autointerface/issues/21 - broken = versionAtLeast sphinx.version "7.2"; + broken = lib.versionAtLeast sphinx.version "7.2"; }; } diff --git a/pkgs/development/python-modules/selenium-wire/default.nix b/pkgs/development/python-modules/selenium-wire/default.nix index 3219692516f4..31a8f8a43caf 100644 --- a/pkgs/development/python-modules/selenium-wire/default.nix +++ b/pkgs/development/python-modules/selenium-wire/default.nix @@ -67,12 +67,12 @@ buildPythonPackage rec { "tests/end2end/test_end2end.py" ]; - meta = with lib; { + meta = { description = "Extends Selenium's Python bindings to give you the ability to inspect requests made by the browser"; homepage = "https://github.com/wkeeling/selenium-wire"; changelog = "https://github.com/wkeeling/selenium-wire/blob/${version}/HISTORY.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; - broken = versionAtLeast blinker.version "1.8"; + broken = lib.versionAtLeast blinker.version "1.8"; }; } diff --git a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix index 9ab25d05ad37..20454b070e80 100644 --- a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix +++ b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix @@ -29,12 +29,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "setuptools_scm_git_archive" ]; - meta = with lib; { + meta = { description = "setuptools_scm plugin for git archives"; homepage = "https://github.com/Changaco/setuptools_scm_git_archive"; license = lib.licenses.mit; maintainers = [ ]; # https://github.com/Changaco/setuptools_scm_git_archive/pull/22 - broken = versionAtLeast setuptools-scm.version "8"; + broken = lib.versionAtLeast setuptools-scm.version "8"; }; } diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index a8cb29116308..9dae458a8dcb 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -39,11 +39,11 @@ buildPythonPackage rec { inherit distutils; }; - meta = with lib; { + meta = { description = "Utilities to facilitate the installation of Python packages"; homepage = "https://github.com/pypa/setuptools"; changelog = "https://setuptools.pypa.io/en/stable/history.html#v${ - replaceStrings [ "." ] [ "-" ] version + lib.replaceStrings [ "." ] [ "-" ] version }"; license = with lib.licenses; [ mit ]; platforms = python.meta.platforms; diff --git a/pkgs/development/python-modules/shazamio/default.nix b/pkgs/development/python-modules/shazamio/default.nix index f1434dc56e0b..10c7301e4990 100644 --- a/pkgs/development/python-modules/shazamio/default.nix +++ b/pkgs/development/python-modules/shazamio/default.nix @@ -67,13 +67,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "shazamio" ]; - meta = with lib; { + meta = { description = "Free asynchronous library from reverse engineered Shazam API"; homepage = "https://github.com/dotX12/ShazamIO"; changelog = "https://github.com/dotX12/ShazamIO/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = [ ]; # https://github.com/shazamio/ShazamIO/issues/80 - broken = versionAtLeast pydantic.version "2"; + broken = lib.versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix index 905f6c02a17d..30f7c9b90e78 100644 --- a/pkgs/development/python-modules/solo-python/default.nix +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { "solo.operations" ]; - meta = with lib; { + meta = { description = "Python tool and library for SoloKeys Solo 1"; homepage = "https://github.com/solokeys/solo1-cli"; maintainers = with lib.maintainers; [ wucke13 ]; @@ -63,6 +63,6 @@ buildPythonPackage rec { ]; # not compatible with fido2 >= 1.0.0 # https://github.com/solokeys/solo1-cli/issues/157 - broken = versionAtLeast fido2.version "1.0.0"; + broken = lib.versionAtLeast fido2.version "1.0.0"; }; } diff --git a/pkgs/development/python-modules/steamship/default.nix b/pkgs/development/python-modules/steamship/default.nix index 2c8a15e3a511..304bca446d71 100644 --- a/pkgs/development/python-modules/steamship/default.nix +++ b/pkgs/development/python-modules/steamship/default.nix @@ -47,13 +47,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "steamship" ]; - meta = with lib; { + meta = { description = "Fastest way to add language AI to your product"; homepage = "https://www.steamship.com/"; changelog = "https://github.com/steamship-core/python-client/releases/tag/${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; # https://github.com/steamship-core/python-client/issues/503 - broken = versionAtLeast pydantic.version "2"; + broken = lib.versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix index 9486f7ed9aaf..5e50ffe45720 100644 --- a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { # No tests available doCheck = false; - meta = with lib; { + meta = { homepage = "https://github.com/tulir/telethon-session-sqlalchemy"; description = "SQLAlchemy backend for Telethon session storage"; license = lib.licenses.mit; @@ -33,6 +33,6 @@ buildPythonPackage rec { # https://github.com/tulir/telethon-session-sqlalchemy/blob/d498503ddde332e190bfa47e70f0bfa59fe6b5ef/setup.py#L17 # Repo is archived and so this is unlikely to change unless someone forks # and takes over development - broken = versionAtLeast sqlalchemy.version "2"; + broken = lib.versionAtLeast sqlalchemy.version "2"; }; } diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index fdfd847f639e..0f389179a102 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -37,14 +37,14 @@ buildPythonPackage rec { pname = "textual"; - version = "6.8.0"; + version = "6.9.0"; pyproject = true; src = fetchFromGitHub { owner = "Textualize"; repo = "textual"; tag = "v${version}"; - hash = "sha256-2SIh7HeWQAd6bHVGzbIRDxkiQy5g0FFq0PjY21NcQEI="; + hash = "sha256-ZuQFsxTYFjmPeSspjqElr+PNX77Gq5gC4dceKWIx0h0="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/tree-sitter-languages/default.nix b/pkgs/development/python-modules/tree-sitter-languages/default.nix index 2c8d1706f555..ce0ce2ee1e20 100644 --- a/pkgs/development/python-modules/tree-sitter-languages/default.nix +++ b/pkgs/development/python-modules/tree-sitter-languages/default.nix @@ -53,12 +53,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "tree_sitter_languages" ]; - meta = with lib; { + meta = { description = "Binary Python wheels for all tree sitter languages"; homepage = "https://github.com/grantjenks/py-tree-sitter-languages"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ doronbehar ]; # https://github.com/grantjenks/py-tree-sitter-languages/issues/67 - broken = versionAtLeast tree-sitter.version "0.22"; + broken = lib.versionAtLeast tree-sitter.version "0.22"; }; } diff --git a/pkgs/development/python-modules/ward/default.nix b/pkgs/development/python-modules/ward/default.nix index e01741ea3bdf..56c465fa3cb4 100644 --- a/pkgs/development/python-modules/ward/default.nix +++ b/pkgs/development/python-modules/ward/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ward" ]; - meta = with lib; { + meta = { description = "Test framework for Python"; homepage = "https://github.com/darrenburns/ward"; changelog = "https://github.com/darrenburns/ward/releases/tag/release%2F${version}"; @@ -55,6 +55,6 @@ buildPythonPackage rec { mainProgram = "ward"; # Old requirements (cucumber-tag-expressions and rich) # https://github.com/darrenburns/ward/issues/380 - broken = versionAtLeast rich.version "13.0.0"; + broken = lib.versionAtLeast rich.version "13.0.0"; }; } diff --git a/pkgs/development/python-modules/withings-api/default.nix b/pkgs/development/python-modules/withings-api/default.nix index 0dcc33b27bfa..1c184dfcff33 100644 --- a/pkgs/development/python-modules/withings-api/default.nix +++ b/pkgs/development/python-modules/withings-api/default.nix @@ -49,12 +49,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "withings_api" ]; - meta = with lib; { + meta = { description = "Library for the Withings Health API"; homepage = "https://github.com/vangorra/python_withings_api"; changelog = "https://github.com/vangorra/python_withings_api/releases/tag/${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ kittywitch ]; - broken = versionAtLeast pydantic.version "2"; + broken = lib.versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 0ead2df091d8..0fb442737540 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, ocamlPackages, + dune, }: stdenv.mkDerivation rec { @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = with ocamlPackages; [ ocaml - dune_3 + dune findlib ocamlbuild ]; diff --git a/pkgs/development/tools/analysis/rr/zen_workaround.nix b/pkgs/development/tools/analysis/rr/zen_workaround.nix index 739691b7d723..91b5036d82f2 100644 --- a/pkgs/development/tools/analysis/rr/zen_workaround.nix +++ b/pkgs/development/tools/analysis/rr/zen_workaround.nix @@ -48,12 +48,12 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { description = "Kernel module supporting the rr debugger on (some) AMD Zen-based CPUs"; homepage = "https://github.com/rr-debugger/rr/wiki/Zen#kernel-module"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.vcunat ]; platforms = [ "x86_64-linux" ]; - broken = versionOlder kernel.version "4.19"; # 4.14 breaks and 4.19 works + broken = lib.versionOlder kernel.version "4.19"; # 4.14 breaks and 4.19 works }; } diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 9f14ac48d435..419d835e24cd 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -39,7 +39,7 @@ version: hashes: let pname = "electron"; - meta = with lib; { + meta = { description = "Cross platform desktop application shell"; homepage = "https://github.com/electron/electron"; license = lib.licenses.mit; @@ -54,7 +54,7 @@ let ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; # https://www.electronjs.org/docs/latest/tutorial/electron-timelines - knownVulnerabilities = optional (versionOlder version "37.0.0") "Electron version ${version} is EOL"; + knownVulnerabilities = lib.optional (lib.versionOlder version "37.0.0") "Electron version ${version} is EOL"; }; fetcher = diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index e68d07f5c18f..128dc4c2cc32 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -318,7 +318,7 @@ in inherit info; }; - meta = with lib; { + meta = { description = "Cross platform desktop application shell"; homepage = "https://github.com/electron/electron"; platforms = lib.platforms.linux; @@ -326,7 +326,7 @@ in teams = [ lib.teams.electron ]; mainProgram = "electron"; hydraPlatforms = - lib.optionals (!(hasInfix "alpha" info.version) && !(hasInfix "beta" info.version)) + lib.optionals (!(lib.hasInfix "alpha" info.version) && !(lib.hasInfix "beta" info.version)) [ "aarch64-linux" "x86_64-linux" diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix deleted file mode 100644 index 57963e140391..000000000000 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - ocaml, - findlib, -}: - -if lib.versionOlder ocaml.version "4.08" then - throw "dune 2 is not available for OCaml ${ocaml.version}" -else - - stdenv.mkDerivation rec { - pname = "dune"; - version = "2.9.3"; - - src = fetchurl { - url = "https://github.com/ocaml/dune/releases/download/${version}/dune-site-${version}.tbz"; - sha256 = "sha256:1ml8bxym8sdfz25bx947al7cvsi2zg5lcv7x9w6xb01cmdryqr9y"; - }; - - nativeBuildInputs = [ - ocaml - findlib - ]; - strictDeps = true; - - buildFlags = [ "release" ]; - - dontAddPrefix = true; - dontAddStaticConfigureFlags = true; - configurePlatforms = [ ]; - - installFlags = [ - "PREFIX=${placeholder "out"}" - "LIBDIR=$(OCAMLFIND_DESTDIR)" - ]; - - meta = { - homepage = "https://dune.build/"; - description = "Composable build system"; - mainProgram = "dune"; - changelog = "https://github.com/ocaml/dune/raw/${version}/CHANGES.md"; - maintainers = [ lib.maintainers.vbgl ]; - license = lib.licenses.mit; - inherit (ocaml.meta) platforms; - }; - } diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix deleted file mode 100644 index 40c6b589ec03..000000000000 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - ocaml, - findlib, - ocaml-lsp, - dune-release, -}: - -if lib.versionOlder ocaml.version "4.08" then - throw "dune 3 is not available for OCaml ${ocaml.version}" -else - - stdenv.mkDerivation rec { - pname = "dune"; - version = "3.20.2"; - - src = fetchurl { - url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - hash = "sha256-sahrLWC9tKi5u2hhvfL58opufLXYM86Br+zOue+cpUk="; - }; - - nativeBuildInputs = [ - ocaml - findlib - ]; - - strictDeps = true; - - buildFlags = [ "release" ]; - - dontAddPrefix = true; - dontAddStaticConfigureFlags = true; - configurePlatforms = [ ]; - - installFlags = [ - "PREFIX=${placeholder "out"}" - "LIBDIR=$(OCAMLFIND_DESTDIR)" - ]; - - passthru.tests = { - inherit ocaml-lsp dune-release; - }; - - meta = { - homepage = "https://dune.build/"; - description = "Composable build system"; - mainProgram = "dune"; - changelog = "https://github.com/ocaml/dune/raw/${version}/CHANGES.md"; - maintainers = [ lib.maintainers.vbgl ]; - license = lib.licenses.mit; - inherit (ocaml.meta) platforms; - }; - } diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index 530c9c6ac829..51d46b00b681 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -3,7 +3,7 @@ replaceVars, fetchurl, ocaml, - dune_3, + dune, buildDunePackage, yojson, csexp, @@ -69,7 +69,7 @@ buildDunePackage { [ (replaceVars (if old-patch then ./fix-paths.patch else ./fix-paths2.patch) { dot-merlin-reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; - dune = "${dune_3}/bin/dune"; + dune = "${dune}/bin/dune"; }) ]; diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index d11aafdb1713..80451e726d51 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -550,7 +550,7 @@ let inherit majorVersion; }; - meta = with lib; { + meta = { description = "Event-driven I/O framework for the V8 JavaScript engine"; homepage = "https://nodejs.org"; changelog = "https://github.com/nodejs/node/releases/tag/v${version}"; @@ -561,7 +561,7 @@ let broken = !canExecute && !canEmulate && (stdenv.buildPlatform.parsed.cpu != stdenv.hostPlatform.parsed.cpu); mainProgram = "node"; - knownVulnerabilities = optional (versionOlder version "18") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/."; + knownVulnerabilities = lib.optional (lib.versionOlder version "18") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/."; }; passthru.python = python; # to ensure nodeEnv uses the same version diff --git a/pkgs/os-specific/linux/gasket/default.nix b/pkgs/os-specific/linux/gasket/default.nix index 7091e9cedcd9..223fc0e9376b 100644 --- a/pkgs/os-specific/linux/gasket/default.nix +++ b/pkgs/os-specific/linux/gasket/default.nix @@ -55,12 +55,12 @@ stdenv.mkDerivation { ]; nativeBuildInputs = kernel.moduleBuildDependencies; - meta = with lib; { + meta = { description = "Coral Gasket Driver allows usage of the Coral EdgeTPU on Linux systems"; homepage = "https://github.com/google/gasket-driver"; license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.kylehendricks ]; platforms = lib.platforms.linux; - broken = versionOlder kernel.version "5.15"; + broken = lib.versionOlder kernel.version "5.15"; }; } diff --git a/pkgs/os-specific/linux/ixgbevf/default.nix b/pkgs/os-specific/linux/ixgbevf/default.nix index c69dd60f3c6a..6a299d97dea5 100644 --- a/pkgs/os-specific/linux/ixgbevf/default.nix +++ b/pkgs/os-specific/linux/ixgbevf/default.nix @@ -29,12 +29,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Intel 82599 Virtual Function Driver"; homepage = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/"; license = lib.licenses.gpl2Only; priority = 20; # kernels ship ixgbevf driver for a long time already, maybe switch to a newest kernel? - broken = versionAtLeast kernel.version "5.2"; + broken = lib.versionAtLeast kernel.version "5.2"; }; } diff --git a/pkgs/os-specific/linux/zenpower/default.nix b/pkgs/os-specific/linux/zenpower/default.nix index d8d062ac8976..31081446ef2d 100644 --- a/pkgs/os-specific/linux/zenpower/default.nix +++ b/pkgs/os-specific/linux/zenpower/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { install -D zenpower.ko -t "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/hwmon/zenpower/" ''; - meta = with lib; { + meta = { inherit (src.meta) homepage; description = "Linux kernel driver for reading temperature, voltage(SVI2), current(SVI2) and power(SVI2) for AMD Zen family CPUs"; license = lib.licenses.gpl2Plus; @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { artturin ]; platforms = [ "x86_64-linux" ]; - broken = versionOlder kernel.version "4.14"; + broken = lib.versionOlder kernel.version "4.14"; }; } diff --git a/pkgs/servers/home-assistant/custom-components/README.md b/pkgs/servers/home-assistant/custom-components/README.md index fc6f90dd95d2..3820328e2ed4 100644 --- a/pkgs/servers/home-assistant/custom-components/README.md +++ b/pkgs/servers/home-assistant/custom-components/README.md @@ -36,7 +36,7 @@ buildHomeAssistantComponent { # python requirements, as specified in manifest.json ]; - meta = with lib; { + meta = { # changelog, description, homepage, license, maintainers }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix index 0dd94721b924..594465af314a 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix @@ -9,11 +9,11 @@ grafanaPlugin rec { x86_64-darwin = "sha256-zS9LfvSOWCKQIv5GsRS48taM31ZN4i2REY+IIQbqisk="; aarch64-darwin = "sha256-0QfTdgOkfs27EW1VB+AgHPwF1GRcFBxMPBZ9nRyovrs="; }; - meta = with lib; { + meta = { description = "Connects Grafana to ClickHouse"; license = lib.licenses.asl20; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ moody ]; - platforms = attrNames zipHash; + platforms = lib.attrNames zipHash; }; } diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py index c859394bf11f..fd774b902274 100755 --- a/pkgs/servers/web-apps/discourse/update.py +++ b/pkgs/servers/web-apps/discourse/update.py @@ -347,10 +347,10 @@ def update_plugins(): rev = "replace-with-git-rev"; sha256 = "replace-with-sha256"; }}; - meta = with lib; {{ + meta = {{ homepage = ""; - maintainers = with maintainers; [ ]; - license = licenses.mit; # change to the correct license! + maintainers = with lib.maintainers; [ ]; + license = lib.licenses.mit; # change to the correct license! description = ""; }}; }}""")) diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 9e1d921b3541..54ffcc4e3540 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -10,6 +10,7 @@ awscli2, bubblewrap, curl, + dune, ffmpeg, yt-dlp, runtimePackages ? [ @@ -78,7 +79,7 @@ stdenv.mkDerivation { pkg-config which ocamlPackages.ocaml - ocamlPackages.dune_3 + dune ocamlPackages.findlib ocamlPackages.menhir ]; diff --git a/pkgs/tools/package-management/nix/common-meson.nix b/pkgs/tools/package-management/nix/common-meson.nix index f9a8f2574e90..19d3f30fc654 100644 --- a/pkgs/tools/package-management/nix/common-meson.nix +++ b/pkgs/tools/package-management/nix/common-meson.nix @@ -261,7 +261,7 @@ stdenv.mkDerivation (finalAttrs: { # point 'nix edit' and ofborg at the file that defines the attribute, # not this common file. pos = builtins.unsafeGetAttrPos "version" args; - meta = with lib; { + meta = { description = "Powerful package manager that makes package management reliable and reproducible"; longDescription = '' Nix is a powerful package manager for Linux and other Unix systems that @@ -278,7 +278,7 @@ stdenv.mkDerivation (finalAttrs: { # https://hydra.nixos.org/build/298175022 # probably https://github.com/NixOS/nix/issues/13042 broken = stdenv.hostPlatform.system == "i686-linux" && stdenv.buildPlatform != stdenv.hostPlatform; - outputsToInstall = [ "out" ] ++ optional enableDocumentation "man"; + outputsToInstall = [ "out" ] ++ lib.optional enableDocumentation "man"; mainProgram = "nix"; }; }) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index a1ee8907459d..577602cfca9e 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -334,11 +334,11 @@ stdenv.mkDerivation ( tests.netdata = nixosTests.netdata; }; - meta = with lib; { + meta = { broken = stdenv.buildPlatform != stdenv.hostPlatform || withEbpf; description = "Real-time performance monitoring tool"; homepage = "https://www.netdata.cloud/"; - changelog = "https://github.com/netdata/netdata/releases/tag/v${version}"; + changelog = "https://github.com/netdata/netdata/releases/tag/v${finalAttrs.version}"; license = [ lib.licenses.gpl3Plus ] ++ lib.optionals withCloudUi [ lib.licenses.ncul1 ]; mainProgram = "netdata"; platforms = lib.platforms.unix; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40ade79b8bca..d7641bba436a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1868,7 +1868,13 @@ with pkgs; inherit (ocamlPackages) dot-merlin-reader; - inherit (ocamlPackages) dune_2 dune_3 dune-release; + inherit (ocamlPackages) dune-release; + + dune_2 = callPackage ../by-name/du/dune/package.nix { + version = "2.9.3"; + }; + + dune_3 = callPackage ../by-name/du/dune/package.nix { }; dvc = with python3.pkgs; toPythonApplication dvc; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 1d8c79728cfe..cd43baf5471b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -464,10 +464,6 @@ let dum = callPackage ../development/ocaml-modules/dum { }; - dune_2 = callPackage ../development/tools/ocaml/dune/2.nix { }; - - dune_3 = callPackage ../development/tools/ocaml/dune/3.nix { }; - dune-action-plugin = callPackage ../development/ocaml-modules/dune-action-plugin { }; dune-build-info = callPackage ../development/ocaml-modules/dune-build-info { }; @@ -1136,6 +1132,8 @@ let inherit (pkgs) mariadb; }; + markdown = callPackage ../development/ocaml-modules/markdown { }; + markup = callPackage ../development/ocaml-modules/markup { }; mccs = callPackage ../development/ocaml-modules/mccs { }; @@ -2249,6 +2247,8 @@ let // lib.optionalAttrs config.allowAliases { biocaml = throw "biocaml has been removed"; # 2025-06-04 chacha = throw "chacha has been removed because it has been marked as broken since at least November 2024. It is now vendored inside mirage-crypto, consider using that instead."; # Added 2025-10-11 + dune_2 = pkgs.dune_2; # Added 2025-12-08 + dune_3 = pkgs.dune_3; # Added 2025-12-08 gd4o = throw "ocamlPackages.gd4o is not maintained, use ocamlPackages.gd instead"; ocaml-vdom = throw "2023-10-09: ocamlPackages.ocaml-vdom was renamed to ocamlPackages.vdom"; ocaml_lwt = throw "ocamlPackages.ocaml_lwt has been renamed to ocamlPackages.lwt"; # Added 2025-12-05