diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b7e174930deb..68e0b4005299 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3829,6 +3829,13 @@ github = "brancz"; githubId = 4546722; }; + brantes = { + name = "Pedro Brantes"; + email = "contact@brantes.simplelogin.com"; + github = "pedrobrantes"; + githubId = 58346706; + matrix = "@brantes:matrix.org"; + }; braydenjw = { email = "nixpkgs@willenborg.ca"; github = "braydenjw"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 8e13906fb6f7..22fcde08a0d4 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -32,7 +32,7 @@ http,,,,0.4-0,,vcunat image.nvim,,,,,,teto inspect,,,,,, jsregexp,,,,,, -ldbus,,,http://luarocks.org/dev,,, +ldbus,,,https://luarocks.org/dev,,, ldoc,,,,,, lgi,,,,,, linenoise,https://raw.githubusercontent.com/hoelzro/lua-linenoise/master/linenoise-0.9-1.rockspec,,,,, @@ -80,10 +80,10 @@ luadbi-sqlite3,,,,,, luaepnf,,,,,, luaevent,,,,,, luaexpat,,,,1.4.1-1,,arobyn flosse -luaffi,,,http://luarocks.org/dev,,, +luaffi,,,https://luarocks.org/dev,,, luafilesystem,,,,1.8.0-1,,flosse lualdap,,,,,,aanderse -lualine.nvim,,,http://luarocks.org/dev,,, +lualine.nvim,,,https://luarocks.org/dev,,, lualogging,,,,,, luaossl,,,,,5.1, luaposix,,,,34.1.1-1,,lblasc diff --git a/nixos/modules/services/networking/knot-resolver.nix b/nixos/modules/services/networking/knot-resolver.nix index 96b39745a02f..9574859293d1 100644 --- a/nixos/modules/services/networking/knot-resolver.nix +++ b/nixos/modules/services/networking/knot-resolver.nix @@ -7,17 +7,28 @@ let cfg = config.services.knot-resolver; # pkgs.writers.yaml_1_1.generate with additional kresctl validate - configFile = - pkgs.runCommandLocal "knot-resolver.yaml" + configFile = pkgs.callPackage ( + { + runCommandLocal, + remarshal_0_17, + stdenv, + }: + runCommandLocal "knot-resolver.yaml" { - nativeBuildInputs = [ pkgs.remarshal_0_17 ]; + nativeBuildInputs = [ remarshal_0_17 ]; value = builtins.toJSON cfg.settings; passAsFile = [ "value" ]; } '' json2yaml "$valuePath" "$out" - ${cfg.managerPackage}/bin/kresctl validate "$out" - ''; + ${ + # We skip validation if the build platform cannot execute # the binary targeting the host platform. + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + ${cfg.managerPackage}/bin/kresctl validate "$out" + '' + } + '' + ) { }; in { meta.maintainers = [ diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 7cba6ef57d6c..fccd11198d26 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -127,6 +127,7 @@ sad, # tv.nvim dependency television, + tree-sitter, }: self: super: let @@ -1558,21 +1559,34 @@ assertNoAdditions { ]; }; - kulala-nvim = super.kulala-nvim.overrideAttrs { - dependencies = with self; [ - nvim-treesitter - nvim-treesitter-parsers.http - ]; - buildInputs = [ curl ]; - postPatch = '' - substituteInPlace lua/kulala/config/defaults.lua \ - --replace-fail 'curl_path = "curl"' 'curl_path = "${lib.getExe curl}"' - ''; - nvimSkipModules = [ - # Requires some extra work to get CLI working in nixpkgs - "cli.kulala_cli" - ]; - }; + kulala-nvim = super.kulala-nvim.overrideAttrs ( + old: + let + kulala-http-grammar = neovimUtils.grammarToPlugin ( + tree-sitter.buildGrammar { + inherit (old) version src meta; + language = "kulala_http"; + location = "lua/tree-sitter"; + generate = false; + } + ); + in + { + dependencies = [ kulala-http-grammar ]; + buildInputs = [ curl ]; + + patches = [ ./patches/kulala-nvim/do-not-install-grammar.patch ]; + postPatch = '' + substituteInPlace lua/kulala/config/defaults.lua \ + --replace-fail 'curl_path = "curl"' 'curl_path = "${lib.getExe curl}"' + ''; + + nvimSkipModules = [ + # Requires some extra work to get CLI working in nixpkgs + "cli.kulala_cli" + ]; + } + ); lazydocker-nvim = super.lazydocker-nvim.overrideAttrs { runtimeDeps = [ diff --git a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/do-not-install-grammar.patch b/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/do-not-install-grammar.patch new file mode 100644 index 000000000000..00a76f9c0492 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/do-not-install-grammar.patch @@ -0,0 +1,15 @@ +diff --git a/lua/kulala/config/init.lua b/lua/kulala/config/init.lua +index 7298f95..d781a12 100644 +--- a/lua/kulala/config/init.lua ++++ b/lua/kulala/config/init.lua +@@ -122,6 +122,10 @@ local function setup_treesitter_master() + end + + local function set_kulala_parser() ++ assert(vim.treesitter.language.add("kulala_http")) ++ vim.treesitter.language.register("kulala_http", { "http", "rest" }) ++ do return end ++ + local parsers = vim.F.npcall(require, "nvim-treesitter.parsers") + + if not parsers then diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 73042a843e02..df1344a5b3a8 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3462,8 +3462,8 @@ let mktplcRef = { name = "veriloghdl"; publisher = "mshr-h"; - version = "1.16.1"; - hash = "sha256-GsUNvBUlGZ5gRk6GnAfT0eUKHK+D+cPtdAhuYtxe3w8="; + version = "1.22.0"; + hash = "sha256-8c8uLcVmOoNpibW29h6Jguim4Sx8KvSKuPWKiQ4tSiM="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/mshr-h.VerilogHDL/changelog"; diff --git a/pkgs/applications/emulators/cdemu/libmirage.nix b/pkgs/applications/emulators/cdemu/libmirage.nix index 257ce5ea44ac..e2017be9616c 100644 --- a/pkgs/applications/emulators/cdemu/libmirage.nix +++ b/pkgs/applications/emulators/cdemu/libmirage.nix @@ -34,8 +34,11 @@ in stdenv.mkDerivation { inherit pname version src; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0"; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + env = { + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + }; + buildInputs = [ glib libsndfile diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-discord/default.nix index 2e0202a2cc7b..90c4f10d6ded 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-discord/default.nix @@ -28,8 +28,10 @@ stdenv.mkDerivation { json-glib ]; - PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; - PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; + env = { + PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; + PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; + }; meta = { homepage = "https://github.com/EionRobb/purple-discord"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix index 274cc6dafcc2..5a52ce1fe8ab 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix @@ -28,8 +28,10 @@ stdenv.mkDerivation { protobuf ]; - PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; - PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; + env = { + PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; + PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; + }; meta = { homepage = "https://github.com/EionRobb/purple-googlechat"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-slack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-slack/default.nix index 89716495a135..e492c1f4ef9e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-slack/default.nix @@ -20,8 +20,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin ]; - PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; - PKG_CONFIG_PURPLE_DATAROOTDIR = "${placeholder "out"}/share"; + env = { + PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; + PKG_CONFIG_PURPLE_DATAROOTDIR = "${placeholder "out"}/share"; + }; meta = { homepage = "https://github.com/dylex/slack-libpurple"; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 8b1b9a3a83c5..1459a12b3712 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -144,8 +144,10 @@ stdenv.mkDerivation rec { }; }; - PKG_CONFIG_CAMEL_1_2_CAMEL_PROVIDERDIR = "${placeholder "out"}/lib/evolution-data-server/camel-providers"; - PKG_CONFIG_LIBEDATASERVERUI_1_2_UIMODULEDIR = "${placeholder "out"}/lib/evolution-data-server/ui-modules"; + env = { + PKG_CONFIG_CAMEL_1_2_CAMEL_PROVIDERDIR = "${placeholder "out"}/lib/evolution-data-server/camel-providers"; + PKG_CONFIG_LIBEDATASERVERUI_1_2_UIMODULEDIR = "${placeholder "out"}/lib/evolution-data-server/ui-modules"; + }; meta = { homepage = "https://gitlab.gnome.org/GNOME/evolution"; diff --git a/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix b/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix index 9fdb15eb24cd..f26d709f554a 100644 --- a/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix +++ b/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "amazon-ecr-credential-helper"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "amazon-ecr-credential-helper"; tag = "v${version}"; - sha256 = "sha256-ZlGXcU3oh/90lP6AjeaFvroZGHUIm0TPoKiKaYMGifA="; + sha256 = "sha256-rsAhDX10eGnmWy6HYoIWn1k64yiC3AcWjCDancBe/VA="; }; vendorHash = null; diff --git a/pkgs/by-name/bb/bbot/package.nix b/pkgs/by-name/bb/bbot/package.nix new file mode 100644 index 000000000000..967bd75d2a17 --- /dev/null +++ b/pkgs/by-name/bb/bbot/package.nix @@ -0,0 +1,75 @@ +{ + lib, + python3, + fetchPypi, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "bbot"; + version = "2.7.2"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-vpKezG1nJVxQE4Qijf8feeRFD4hjy98HznVDXL+MBkE="; + }; + + pythonRelaxDeps = [ + "dnspython" + "radixtarget" + "regex" + "tabulate" + ]; + + build-system = with python3.pkgs; [ + poetry-core + poetry-dynamic-versioning + ]; + + dependencies = with python3.pkgs; [ + ansible-core + ansible-runner + beautifulsoup4 + cachetools + cloudcheck + deepdiff + dnspython + httpx + idna + jinja2 + lxml + mmh3 + omegaconf + orjson + psutil + puremagic + pycryptodome + pydantic + pyjwt + pyzmq + radixtarget + regex + setproctitle + socksio + tabulate + tldextract + unidecode + websockets + wordninja + xmltojson + xxhash + yara-python + + ]; + + # Project has no tests + doCheck = false; + + meta = { + description = "OSINT automation for hackers"; + homepage = "https://pypi.org/project/bbot/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "bbot"; + }; +} diff --git a/pkgs/by-name/bi/bitcrook/package.nix b/pkgs/by-name/bi/bitcrook/package.nix new file mode 100644 index 000000000000..3dcf27e3ba5f --- /dev/null +++ b/pkgs/by-name/bi/bitcrook/package.nix @@ -0,0 +1,41 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, +}: + +buildGoModule rec { + pname = "bitcrook"; + version = "2.3.2"; + + src = fetchFromGitHub { + owner = "ax-i-om"; + repo = "bitcrook"; + tag = "v${version}"; + hash = "sha256-O2u5e6LmfrxsfrBY3OPFTottheGO+ue8qMLqbDVMBhA="; + }; + + vendorHash = "sha256-19uN+jTqZDqIu/rqS/U9JSnZWowTlLAgHG7+YhXaOd4="; + + ldflags = [ + "-s" + "-w" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + doInstallCheck = true; + + # Tests require network access + doCheck = false; + + meta = { + description = "Tool to do OSINT"; + homepage = "https://github.com/ax-i-om/bitcrook"; + changelog = "https://github.com/ax-i-om/bitcrook/releases/tag/${src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "bitcrook"; + }; +} diff --git a/pkgs/by-name/bo/bolt/package.nix b/pkgs/by-name/bo/bolt/package.nix index ed2ac1fb71b9..c13efed9e5bb 100644 --- a/pkgs/by-name/bo/bolt/package.nix +++ b/pkgs/by-name/bo/bolt/package.nix @@ -90,8 +90,10 @@ stdenv.mkDerivation rec { doInstallCheck = true; - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; - PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + env = { + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + }; meta = { description = "Thunderbolt 3 device management daemon"; diff --git a/pkgs/by-name/ca/casync/package.nix b/pkgs/by-name/ca/casync/package.nix index 21c62cc44db6..9a1c009ab9b3 100644 --- a/pkgs/by-name/ca/casync/package.nix +++ b/pkgs/by-name/ca/casync/package.nix @@ -64,7 +64,8 @@ stdenv.mkDerivation { patchShebangs test/http-server.py ''; - PKG_CONFIG_UDEV_UDEVDIR = "lib/udev"; + env.PKG_CONFIG_UDEV_UDEVDIR = "lib/udev"; + mesonFlags = lib.optionals (!fuseSupport) [ "-Dfuse=false" ] ++ lib.optionals (!udevSupport) [ "-Dudev=false" ] diff --git a/pkgs/by-name/cd/cdk8s-cli/package.nix b/pkgs/by-name/cd/cdk8s-cli/package.nix index ae7f8862a9d5..59c758d0fa1c 100644 --- a/pkgs/by-name/cd/cdk8s-cli/package.nix +++ b/pkgs/by-name/cd/cdk8s-cli/package.nix @@ -12,18 +12,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdk8s-cli"; - version = "2.203.10"; + version = "2.203.14"; src = fetchFromGitHub { owner = "cdk8s-team"; repo = "cdk8s-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-bH7OQm8In9Njq/MDyfKyWrvbS+ggqWnLgPXMtsjC+qQ="; + hash = "sha256-QjW2elwUUABtTDOA/J/S3icG0Fv2sDiFQliWCSWoE80="; }; yarnOfflineCache = fetchYarnDeps { inherit (finalAttrs) src; - hash = "sha256-HmZtKcrwhpEmgA1P+ilRq38k6CzJPL2pfBUqa3Kab6I="; + hash = "sha256-n6CjFp3kJ/dLYN4JRS+wIOU9FDDUnSy+Q4glOuDWdLw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/conan/package.nix b/pkgs/by-name/co/conan/package.nix index 8596a49c3735..66adaa95851b 100644 --- a/pkgs/by-name/co/conan/package.nix +++ b/pkgs/by-name/co/conan/package.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonApplication rec { pname = "conan"; - version = "2.21.0"; + version = "2.22.2"; pyproject = true; src = fetchFromGitHub { owner = "conan-io"; repo = "conan"; tag = version; - hash = "sha256-D76K7s6zUy3hMOwkKXbsF4asrr7tGwC28MW5VaJvFBY="; + hash = "sha256-4OKrAfhHgtAS606P88JFYCjgYYlSAH8RReqFs6N2V5s="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/cr/crengine-ng/package.nix b/pkgs/by-name/cr/crengine-ng/package.nix index 13746edacd89..d2f785ddf280 100644 --- a/pkgs/by-name/cr/crengine-ng/package.nix +++ b/pkgs/by-name/cr/crengine-ng/package.nix @@ -17,13 +17,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "crengine-ng"; - version = "0.9.12"; + version = "0.9.13"; src = fetchFromGitLab { owner = "coolreader-ng"; repo = "crengine-ng"; tag = finalAttrs.version; - hash = "sha256-sNExFNnUKfl+4VCWeqK/Pt2Qy6DtYn7GYnwz5hHkjZw="; + hash = "sha256-0/exAqEs//tUlGpiBqeKkZ4LJeY7u0W4j4V9G5lL5cg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cw/cwtch-ui/git-hashes.json b/pkgs/by-name/cw/cwtch-ui/git-hashes.json new file mode 100644 index 000000000000..348d620ef116 --- /dev/null +++ b/pkgs/by-name/cw/cwtch-ui/git-hashes.json @@ -0,0 +1,3 @@ +{ + "flutter_gherkin": "sha256-Y8tR84kkczQPBwh7cGhPFAAqrMZKRfGp/02huPaaQZg=" +} diff --git a/pkgs/by-name/cw/cwtch-ui/package.nix b/pkgs/by-name/cw/cwtch-ui/package.nix index b4adced87422..cfd59016c7be 100644 --- a/pkgs/by-name/cw/cwtch-ui/package.nix +++ b/pkgs/by-name/cw/cwtch-ui/package.nix @@ -4,26 +4,29 @@ flutter329, lib, tor, + _experimental-update-script-combinators, + nix-update-script, + runCommand, + yq-go, + dart, }: + let - runtimeBinDependencies = [ - tor - ]; -in -flutter329.buildFlutterApplication rec { - pname = "cwtch-ui"; - version = "1.16.1"; + version = "1.16.3"; # This Gitea instance has archive downloads disabled, so: fetchgit src = fetchgit { url = "https://git.openprivacy.ca/cwtch.im/cwtch-ui"; - rev = "v${version}"; - hash = "sha256-VKR02cRcjEapiIo+bQqeJOenmv0Rmzg6qfkI1LtWF10="; + tag = "v${version}"; + hash = "sha256-w1bIT9EIwpmJ4fkOGKo6iI3HdkcYgrGlW0xeecpUn7g="; }; +in +flutter329.buildFlutterApplication { + pname = "cwtch-ui"; + inherit version src; - pubspecLock = lib.importJSON ./pubspec.json; - gitHashes = { - flutter_gherkin = "sha256-Y8tR84kkczQPBwh7cGhPFAAqrMZKRfGp/02huPaaQZg="; - }; + pubspecLock = lib.importJSON ./pubspec.lock.json; + + gitHashes = lib.importJSON ./git-hashes.json; flutterBuildFlags = [ "--dart-define" @@ -35,7 +38,7 @@ flutter329.buildFlutterApplication rec { # These things are added to LD_LIBRARY_PATH, but not PATH runtimeDependencies = [ cwtch ]; - extraWrapProgramArgs = "--prefix PATH : ${lib.makeBinPath runtimeBinDependencies}"; + extraWrapProgramArgs = "--prefix PATH : ${lib.makeBinPath [ tor ]}"; postInstall = '' mkdir -p $out/share/applications @@ -43,6 +46,37 @@ flutter329.buildFlutterApplication rec { --replace-fail PREFIX "$out" ''; + passthru = { + pubspecSource = + runCommand "pubspec.lock.json" + { + inherit src; + nativeBuildInputs = [ yq-go ]; + } + '' + yq eval --output-format=json --prettyPrint $src/pubspec.lock > "$out" + ''; + updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { }) + ( + (_experimental-update-script-combinators.copyAttrOutputToFile "cwtch-ui.pubspecSource" ./pubspec.lock.json) + // { + supportedFeatures = [ ]; + } + ) + { + command = [ + dart.fetchGitHashesScript + "--input" + ./pubspec.lock.json + "--output" + ./git-hashes.json + ]; + supportedFeatures = [ ]; + } + ]; + }; + meta = { description = "Messaging app built on the cwtch decentralized, privacy-preserving, multi-party messaging protocol"; homepage = "https://cwtch.im/"; diff --git a/pkgs/by-name/cw/cwtch-ui/pubspec.json b/pkgs/by-name/cw/cwtch-ui/pubspec.lock.json similarity index 100% rename from pkgs/by-name/cw/cwtch-ui/pubspec.json rename to pkgs/by-name/cw/cwtch-ui/pubspec.lock.json diff --git a/pkgs/by-name/cw/cwtch/package.nix b/pkgs/by-name/cw/cwtch/package.nix index 83d3c210d8bf..993cc88b9e17 100644 --- a/pkgs/by-name/cw/cwtch/package.nix +++ b/pkgs/by-name/cw/cwtch/package.nix @@ -1,26 +1,21 @@ { buildGoModule, fetchgit, + nix-update-script, lib, }: buildGoModule rec { pname = "libcwtch"; - version = "0.1.7"; + version = "0.2.1"; # This Gitea instance has archive downloads disabled, so: fetchgit src = fetchgit { url = "https://git.openprivacy.ca/cwtch.im/autobindings.git"; rev = "v${version}"; - hash = "sha256-QHEaf3xm6SIHLnQamf0cUrKJ/A1v0iFaaGsMg33uIBs="; + hash = "sha256-Il4jADldw/tnRRiecCUrddKEvJ8WHvyT4s4zxSXqrnM="; }; - vendorHash = "sha256-pnAdUFG1G0Bi/e9KNVX0WwloJy8xQ25YVFnGerRGy9A="; - overrideModAttrs = ( - old: { - preBuild = '' - make lib.go - ''; - } - ); + proxyVendor = true; + vendorHash = "sha256-2Bs4cBQ+z5fqEvQ3xu31EngzdUZzZIl0sFsSjD60n2A="; postPatch = '' substituteInPlace Makefile \ @@ -42,6 +37,8 @@ buildGoModule rec { runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Decentralized, privacy-preserving, multi-party messaging protocol"; homepage = "https://cwtch.im/"; diff --git a/pkgs/by-name/da/darkman/go-mod.patch b/pkgs/by-name/da/darkman/go-mod.patch deleted file mode 100644 index 8fbb26dfc5a0..000000000000 --- a/pkgs/by-name/da/darkman/go-mod.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/go.mod b/go.mod -index 2d396a4..c4fea4b 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,14 +1,19 @@ - module gitlab.com/WhyNotHugo/darkman - --go 1.16 -+go 1.18 - - require ( - github.com/adrg/xdg v0.3.3 - github.com/godbus/dbus/v5 v5.0.4 -- github.com/kr/pretty v0.2.0 // indirect - github.com/rxwycdh/rxhash v0.0.0-20230131062142-10b7a38b400d - github.com/sj14/astral v0.1.2 -- github.com/spf13/cobra v1.7.0 // indirect -- gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect -+ github.com/spf13/cobra v1.7.0 - gopkg.in/yaml.v3 v3.0.1 - ) -+ -+require ( -+ github.com/inconshreveable/mousetrap v1.1.0 // indirect -+ github.com/kr/pretty v0.2.0 // indirect -+ github.com/spf13/pflag v1.0.5 // indirect -+ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect -+) diff --git a/pkgs/by-name/da/darkman/makefile.patch b/pkgs/by-name/da/darkman/makefile.patch index 1374c37cf061..627162eaa477 100644 --- a/pkgs/by-name/da/darkman/makefile.patch +++ b/pkgs/by-name/da/darkman/makefile.patch @@ -1,12 +1,21 @@ diff --git a/Makefile b/Makefile -index 9048e45..0fb1f5a 100644 +index ab6997b..c3687ef 100644 --- a/Makefile +++ b/Makefile -@@ -26,7 +26,6 @@ site/index.html: darkman.1 +@@ -30,7 +30,6 @@ site/index.html: darkman.1 mandoc -T html -O style=man-style.css < darkman.1 > site/index.html install: build - @install -Dm755 darkman ${DESTDIR}${PREFIX}/bin/darkman - @install -Dm644 darkman.service ${DESTDIR}${PREFIX}/lib/systemd/user/darkman.service @install -Dm644 darkman.1 ${DESTDIR}${PREFIX}/share/man/man1/darkman.1 @install -Dm644 LICENCE ${DESTDIR}${PREFIX}/share/licenses/darkman/LICENCE + @install -Dm644 _darkman.zsh ${DESTDIR}${PREFIX}/share/zsh/site-functions/_darkman +@@ -38,8 +37,6 @@ install: build + @install -Dm644 darkman.fish ${DESTDIR}${PREFIX}/share/fish/vendor_completions.d/darkman.fish + @install -Dm644 contrib/darkman.service \ + ${DESTDIR}${PREFIX}/lib/systemd/user/darkman.service +- @install -Dm755 contrib/darkman.openrc \ +- ${DESTDIR}/etc/user/init.d/darkman + @install -Dm644 contrib/dbus/nl.whynothugo.darkman.service \ + ${DESTDIR}${PREFIX}/share/dbus-1/services/nl.whynothugo.darkman.service + @install -Dm644 contrib/dbus/org.freedesktop.impl.portal.desktop.darkman.service \ diff --git a/pkgs/by-name/da/darkman/package.nix b/pkgs/by-name/da/darkman/package.nix index 624ca2bcc7f8..780698e44a3c 100644 --- a/pkgs/by-name/da/darkman/package.nix +++ b/pkgs/by-name/da/darkman/package.nix @@ -8,22 +8,21 @@ buildGoModule rec { pname = "darkman"; - version = "2.0.1"; + version = "2.2.0"; src = fetchFromGitLab { owner = "WhyNotHugo"; repo = "darkman"; rev = "v${version}"; - hash = "sha256-FaEpVy/0PqY5Bmw00hMyFZb9wcwYwEuCKMatYN8Xk3o="; + hash = "sha256-Kpuuxxwn/huA5WwmnVGG0HowNBGyexDRpdUc3bNmB18="; }; patches = [ - ./go-mod.patch ./makefile.patch ]; postPatch = '' - substituteInPlace darkman.service \ + substituteInPlace contrib/darkman.service \ --replace-fail /usr/bin/darkman $out/bin/darkman substituteInPlace contrib/dbus/nl.whynothugo.darkman.service \ --replace-fail /usr/bin/darkman $out/bin/darkman @@ -31,7 +30,7 @@ buildGoModule rec { --replace-fail /usr/bin/darkman $out/bin/darkman ''; - vendorHash = "sha256-3lILSVm7mtquCdR7+cDMuDpHihG+gDJTcQa1cM2o7ZU="; + vendorHash = "sha256-QO+fz8m2rILKTokimf+v4x0lon5lZy7zC+5qjTMdcs0="; nativeBuildInputs = [ scdoc ]; buildPhase = '' diff --git a/pkgs/by-name/db/dbus-broker/package.nix b/pkgs/by-name/db/dbus-broker/package.nix index 2bd074dd7c17..88e40e8d455c 100644 --- a/pkgs/by-name/db/dbus-broker/package.nix +++ b/pkgs/by-name/db/dbus-broker/package.nix @@ -155,9 +155,11 @@ stdenv.mkDerivation (finalAttrs: { "-D=system-console-users=gdm,sddm,lightdm" ]; - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; - PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; - PKG_CONFIG_SYSTEMD_CATALOGDIR = "${placeholder "out"}/lib/systemd/catalog"; + env = { + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + PKG_CONFIG_SYSTEMD_CATALOGDIR = "${placeholder "out"}/lib/systemd/catalog"; + }; postInstall = '' install -Dm444 $src/README.md $out/share/doc/dbus-broker/README diff --git a/pkgs/by-name/do/doitlive/package.nix b/pkgs/by-name/do/doitlive/package.nix index 135609b55139..8ee85c2d2137 100644 --- a/pkgs/by-name/do/doitlive/package.nix +++ b/pkgs/by-name/do/doitlive/package.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonApplication rec { pname = "doitlive"; - version = "5.1.0"; + version = "5.2.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-trzSX58De36W401oVJMGrbPoyD9uksUewrIlq8BbJcU="; + hash = "sha256-BBu98ZfDaypJfE0KadrFOnd6d1ZLV6wC1Hd9YFjRcPo="; }; build-system = with python3Packages; [ flit-core ]; diff --git a/pkgs/by-name/do/dopamine/package.nix b/pkgs/by-name/do/dopamine/package.nix index dfe44b9574d4..8ac7f7bf4593 100644 --- a/pkgs/by-name/do/dopamine/package.nix +++ b/pkgs/by-name/do/dopamine/package.nix @@ -7,11 +7,11 @@ }: appimageTools.wrapType2 rec { pname = "dopamine"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { url = "https://github.com/digimezzo/dopamine/releases/download/v${version}/Dopamine-${version}.AppImage"; - hash = "sha256-kvXan5J+rxJ/ugcEz9xytq3eQG0saWrYZjF7O1d6rTA="; + hash = "sha256-crOW1I8YN7+OyolgeiVvBZ8Zsw0RNUjozmvGgQO1ymA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/dr/dragonfly-reverb/package.nix b/pkgs/by-name/dr/dragonfly-reverb/package.nix index f1d9c6bb9f10..305854d58ad9 100644 --- a/pkgs/by-name/dr/dragonfly-reverb/package.nix +++ b/pkgs/by-name/dr/dragonfly-reverb/package.nix @@ -36,10 +36,14 @@ stdenv.mkDerivation rec { mkdir -p $out/bin mkdir -p $out/lib/lv2/ mkdir -p $out/lib/vst/ + mkdir -p $out/lib/vst3/ + mkdir -p $out/lib/clap/ cd bin for bin in DragonflyEarlyReflections DragonflyPlateReverb DragonflyHallReverb DragonflyRoomReverb; do cp -a $bin $out/bin/ cp -a $bin-vst.so $out/lib/vst/ + cp -a $bin.vst3 $out/lib/vst3/ + cp -a $bin.clap $out/lib/clap/ cp -a $bin.lv2/ $out/lib/lv2/ ; done runHook postInstall diff --git a/pkgs/by-name/e-/e-imzo-manager/package.nix b/pkgs/by-name/e-/e-imzo-manager/package.nix index 98b565dabda9..0f44d22a597c 100644 --- a/pkgs/by-name/e-/e-imzo-manager/package.nix +++ b/pkgs/by-name/e-/e-imzo-manager/package.nix @@ -22,18 +22,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "e-imzo-manager"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "xinux-org"; repo = "e-imzo-manager"; tag = finalAttrs.version; - hash = "sha256-JXALTSgxIULDHdw90RjxlNQiLT+GKrzpkqPlMY0h+8c="; + hash = "sha256-8olOo67dxanmUj+NcGwGs7rnpZRMlPjNi28UIEf/Azg="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-x9V0FHrSpM1pIWjDjcTuhPz4p0blXxKDJVvT0I0Op9M="; + hash = "sha256-K9crHcYCDRknK53bB6NH5TnsU9dpgWbPqSWhFvnAWa8="; }; strictDeps = true; diff --git a/pkgs/by-name/eo/eos-installer/package.nix b/pkgs/by-name/eo/eos-installer/package.nix index 2190424793c4..548611c96f3a 100644 --- a/pkgs/by-name/eo/eos-installer/package.nix +++ b/pkgs/by-name/eo/eos-installer/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''}" ]; - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + env.PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; doCheck = true; diff --git a/pkgs/by-name/es/espeakup/package.nix b/pkgs/by-name/es/espeakup/package.nix index 7701a3475ee1..3fe87c511371 100644 --- a/pkgs/by-name/es/espeakup/package.nix +++ b/pkgs/by-name/es/espeakup/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { systemd ]; - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + env.PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; meta = { homepage = "https://github.com/linux-speakup/espeakup"; diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index a6f65997f6f4..25c1d8516041 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "exploitdb"; - version = "2025-12-17"; + version = "2025-12-26"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; tag = finalAttrs.version; - hash = "sha256-hjUjdRXsHLCJJU8ObASXVM1aZchOWtfQ5W9wBr57PHc="; + hash = "sha256-7it08Z2n1Wl4GaVTLxBIlejwPEsmyv+j142/HAndLO0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/fl/flix/package.nix b/pkgs/by-name/fl/flix/package.nix index 09e3f92005f4..bb12d69db7af 100644 --- a/pkgs/by-name/fl/flix/package.nix +++ b/pkgs/by-name/fl/flix/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.65.0"; + version = "0.67.2"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-XKsA6bXTD0jNkF9JcVYuciYh4bwtE1B3xn6G/wLHyxM="; + sha256 = "sha256-MWK6Az135IHIzXMUQeHyeb2PROXyeLKyFjIUnDD47T8="; }; dontUnpack = true; diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index 4e3c9b0e3cec..d68d7cfca833 100644 --- a/pkgs/by-name/fl/fluent-bit/package.nix +++ b/pkgs/by-name/fl/fluent-bit/package.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { # We fix this by setting the systemd package's `systemdsystemunitdir` pkg-config variable. # # https://man.openbsd.org/pkg-config.1#PKG_CONFIG_$PACKAGE_$VARIABLE - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + env.PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; outputs = [ "out" diff --git a/pkgs/by-name/fl/flyway/package.nix b/pkgs/by-name/fl/flyway/package.nix index 9f8da8fe2360..0c73ad9a4543 100644 --- a/pkgs/by-name/fl/flyway/package.nix +++ b/pkgs/by-name/fl/flyway/package.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation (finalAttrs: { pname = "flyway"; - version = "11.14.1"; + version = "11.19.1"; src = fetchurl { url = "https://github.com/flyway/flyway/releases/download/flyway-${finalAttrs.version}/flyway-commandline-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-NWxt7qOiANk847cHbs916jNaZlUZynRlrVP321MkqOs="; + sha256 = "sha256-nI3eiVcCcMT9FF8gUCTzmOwjltUCGFwduEgreHCYpL4="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/by-name/fn/fnott/package.nix b/pkgs/by-name/fn/fnott/package.nix index ca8176bbc6c9..ff0a1cd1259d 100644 --- a/pkgs/by-name/fn/fnott/package.nix +++ b/pkgs/by-name/fn/fnott/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-II8fij64ufwXg71VoSayVpSFim9+2w3j4gdTRDBrYQE="; }; - PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/services"; + env.PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/services"; strictDeps = true; depsBuildBuild = [ diff --git a/pkgs/by-name/fp/fprintd/package.nix b/pkgs/by-name/fp/fprintd/package.nix index 8f30b1437c8b..7682e45f07b2 100644 --- a/pkgs/by-name/fp/fprintd/package.nix +++ b/pkgs/by-name/fp/fprintd/package.nix @@ -80,12 +80,14 @@ stdenv.mkDerivation (finalAttrs: { "-Dsystemd_system_unit_dir=${placeholder "out"}/lib/systemd/system" ]; - PKG_CONFIG_DBUS_1_INTERFACES_DIR = "${placeholder "out"}/share/dbus-1/interfaces"; - PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; - PKG_CONFIG_DBUS_1_DATADIR = "${placeholder "out"}/share"; + env = { + PKG_CONFIG_DBUS_1_INTERFACES_DIR = "${placeholder "out"}/share/dbus-1/interfaces"; + PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; + PKG_CONFIG_DBUS_1_DATADIR = "${placeholder "out"}/share"; - # FIXME: Ugly hack for tests to find libpam_wrapper.so - LIBRARY_PATH = lib.makeLibraryPath [ python3.pkgs.pypamtest ]; + # FIXME: Ugly hack for tests to find libpam_wrapper.so + LIBRARY_PATH = lib.makeLibraryPath [ python3.pkgs.pypamtest ]; + }; mesonCheckFlags = [ # PAM related checks are timing out diff --git a/pkgs/by-name/ga/garnet/deps.json b/pkgs/by-name/ga/garnet/deps.json index 5259e52e7d4c..40be469cabc4 100644 --- a/pkgs/by-name/ga/garnet/deps.json +++ b/pkgs/by-name/ga/garnet/deps.json @@ -1,28 +1,28 @@ [ - { - "pname": "Azure.Core", - "version": "1.44.1", - "hash": "sha256-0su/ylZ68+FDZ6mgfp3qsm7qpfPtD5SW75HXbVhs5qk=" - }, { "pname": "Azure.Core", "version": "1.47.3", "hash": "sha256-fWyfqF1lpnap4cF3l9J0fYtZbxIqm6UFsuJgN+/hwW4=" }, + { + "pname": "Azure.Core", + "version": "1.49.0", + "hash": "sha256-ZLd8vl1QNHWYMOAx/ciDUNNfMGu2DFIfw37+FwiGI/4=" + }, { "pname": "Azure.Identity", - "version": "1.16.0", - "hash": "sha256-vJa746fywiLlC2QoUu2SLf+mQPzGTGxbXzGoWqAUb0Q=" + "version": "1.17.0", + "hash": "sha256-ewFwqmJ6XKezk2f0xwX2CRKpeBfHFaLg+XbrPJxhc0Q=" }, { "pname": "Azure.Storage.Blobs", - "version": "12.25.1", - "hash": "sha256-OJgmzE7+BJsrqGMErUwG4wmaguYL1zPbhtdQvvqFuHY=" + "version": "12.26.0", + "hash": "sha256-J6774WE6xlrsmhkmE1dapkrhK6dFByYxSHLs1OQPk48=" }, { "pname": "Azure.Storage.Common", - "version": "12.24.0", - "hash": "sha256-ZjeMv8xaZXkmb1OgZlN9uJelhAcU7KhO/FK02qiz/zA=" + "version": "12.25.0", + "hash": "sha256-4eMv4oOumO6FFx0VMsuIr6sWtouu4f6AajebTQjhj9Q=" }, { "pname": "CommandLineParser", @@ -34,11 +34,6 @@ "version": "1.4.6", "hash": "sha256-7lXJhhQlEuRoaF18XiZYJDyhA8RIWpYWNB9kr4aARQc=" }, - { - "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "6.0.0", - "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" - }, { "pname": "Microsoft.Bcl.AsyncInterfaces", "version": "8.0.0", @@ -59,10 +54,15 @@ "version": "9.0.8", "hash": "sha256-hes+QZM3DQ1R/8CDOdWObk6s1oGhzFqka8Qc7Baf9PY=" }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "9.0.9", + "hash": "sha256-Qmi+ftu17qqVVHJ+SgKvLrXCHJDrP5h4ZgTflgDWgzc=" + }, { "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "9.0.8", - "hash": "sha256-N8WMvnbCKsUtpK08B1CYi5LOuq6Sbv3Nois4CKjDQJ8=" + "version": "9.0.9", + "hash": "sha256-p7hhHy1hGSJk6OQvaFhz4WFbtM8VkeKb3sSZTB61M0s=" }, { "pname": "Microsoft.Extensions.DependencyInjection", @@ -124,6 +124,11 @@ "version": "9.0.8", "hash": "sha256-K3T8krgXZmvQg87AQQrn9kiH2sDyKzRUMDyuB/ItmPc=" }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "9.0.9", + "hash": "sha256-bCd4Bj5uP4kT0hCvs0LZS8IVqEtpOIyhSiay5ijJbBA=" + }, { "pname": "Microsoft.Identity.Client", "version": "4.76.0", @@ -176,13 +181,13 @@ }, { "pname": "System.ClientModel", - "version": "1.1.0", - "hash": "sha256-FiueWJawZGar++OztDFWxU2nQE5Vih9iYsc3uEx0thM=" + "version": "1.6.1", + "hash": "sha256-OMnamkT9Nt5ZSR6xPKFmOQRUjdn0a4nP9jkD2eZxxc0=" }, { "pname": "System.ClientModel", - "version": "1.6.1", - "hash": "sha256-OMnamkT9Nt5ZSR6xPKFmOQRUjdn0a4nP9jkD2eZxxc0=" + "version": "1.7.0", + "hash": "sha256-R9tHPr+rDvwaS1RQUHVZHTnmAL9I79OvixuZ2Thp9rw=" }, { "pname": "System.Diagnostics.DiagnosticSource", @@ -206,18 +211,8 @@ }, { "pname": "System.IO.Pipelines", - "version": "9.0.8", - "hash": "sha256-dO84rUcpDgj6k8rTZq3Kmy/y+6c/cP1Fa1dsCV9JIlA=" - }, - { - "pname": "System.Memory.Data", - "version": "1.0.2", - "hash": "sha256-XiVrVQZQIz4NgjiK/wtH8iZhhOZ9MJ+X2hL2/8BrGN0=" - }, - { - "pname": "System.Memory.Data", - "version": "6.0.0", - "hash": "sha256-83/bxn3vyv17dQDDqH1L3yDpluhOxIS5XR27f4OnCEo=" + "version": "9.0.9", + "hash": "sha256-bRMt0ib0KwKzHXgeAXZgegou5eX8lsm80Eu38bHBxBs=" }, { "pname": "System.Memory.Data", @@ -229,11 +224,6 @@ "version": "9.0.9", "hash": "sha256-wc7lhmydATxle8Wv124yFPT+bkpKpcCQL2TAPGodIAc=" }, - { - "pname": "System.Numerics.Vectors", - "version": "4.5.0", - "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" - }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "6.0.0", @@ -246,37 +236,12 @@ }, { "pname": "System.Text.Encodings.Web", - "version": "6.0.0", - "hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo=" - }, - { - "pname": "System.Text.Encodings.Web", - "version": "9.0.8", - "hash": "sha256-2Fy5/VAqBHuwcxHMVevyzQDRIRlyTZlT+5pwr6OtuuU=" + "version": "9.0.9", + "hash": "sha256-euYrJAKiTDCj/Rf1KVWI6IophDX828x5T9As9vAf81A=" }, { "pname": "System.Text.Json", - "version": "6.0.0", - "hash": "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo=" - }, - { - "pname": "System.Text.Json", - "version": "6.0.10", - "hash": "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc=" - }, - { - "pname": "System.Text.Json", - "version": "6.0.9", - "hash": "sha256-5jjvxV8ubGYjkydDhLsGZXB6ml3O/7CGauQcu1ikeLs=" - }, - { - "pname": "System.Text.Json", - "version": "9.0.8", - "hash": "sha256-CEoLOj0KeuctK2jXd6yZ+/5yx4apsEh7+xsJH95h/1c=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.5.4", - "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" + "version": "9.0.9", + "hash": "sha256-I+GCgXZZUtgAta94BIBqy72HnZJ3egzNBOTxnVy2Ur8=" } ] diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix index 48c8e93411c9..145cc194cadf 100644 --- a/pkgs/by-name/ga/garnet/package.nix +++ b/pkgs/by-name/ga/garnet/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "garnet"; - version = "1.0.86"; + version = "1.0.89"; src = fetchFromGitHub { owner = "microsoft"; repo = "garnet"; tag = "v${version}"; - hash = "sha256-EmwDc6kbOL++g1Xq4LoV3JuxYWSifOmv8vvWKsU3CE4="; + hash = "sha256-DL87KIkC1lzqVJPAUqFp7d/MKFoWWS0Lo1/02dwkCxQ="; }; projectFile = "main/GarnetServer/GarnetServer.csproj"; diff --git a/pkgs/by-name/ge/gemini-cli-bin/package.nix b/pkgs/by-name/ge/gemini-cli-bin/package.nix index 5cfecae6df92..38a6aeeff552 100644 --- a/pkgs/by-name/ge/gemini-cli-bin/package.nix +++ b/pkgs/by-name/ge/gemini-cli-bin/package.nix @@ -8,11 +8,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "gemini-cli-bin"; - version = "0.22.2"; + version = "0.22.4"; src = fetchurl { url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini.js"; - hash = "sha256-neUS8w+3Fz5rwL0DWj1y/GPUo++H5jawDM7jKNGdlZ0="; + hash = "sha256-7Dy2/dkNCC/TaUEixP6iMegOh9SoeTHUn7K0VGi4Rwg="; }; dontUnpack = true; diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index 6840391be2ce..c35944a55473 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -14,16 +14,16 @@ buildNpmPackage (finalAttrs: { pname = "gemini-cli"; - version = "0.22.2"; + version = "0.22.4"; src = fetchFromGitHub { owner = "google-gemini"; repo = "gemini-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-wVIGMkft/hamsuyJH+Ku8vIAZ2ITMfH9LqmtUIP8xN0="; + hash = "sha256-gYh8GpuBwkowdBNCYkh7w2MFSTw8xXYO4XbQBezzFlQ="; }; - npmDepsHash = "sha256-gyv2yVTNPuwEiWDXfYr21wc+Sii5ac8nRE/04KkPmJg="; + npmDepsHash = "sha256-f5s2T+826rZU8IXe4fv26JiR3laPunbKeJSRnst6upw="; nativeBuildInputs = [ jq @@ -97,6 +97,7 @@ buildNpmPackage (finalAttrs: { license = lib.licenses.asl20; sourceProvenance = with lib.sourceTypes; [ fromSource ]; maintainers = with lib.maintainers; [ + brantes xiaoxiangmoe FlameFlag taranarmo diff --git a/pkgs/by-name/gl/glasgow/package.nix b/pkgs/by-name/gl/glasgow/package.nix index 56133af24a68..a84b81799ce0 100644 --- a/pkgs/by-name/gl/glasgow/package.nix +++ b/pkgs/by-name/gl/glasgow/package.nix @@ -99,7 +99,7 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs = [ "--set" "YOSYS" - "${yosys}/bin/yosys" + (lib.getExe yosys) "--set" "ICEPACK" "${icestorm}/bin/icepack" diff --git a/pkgs/by-name/gn/gnome-applets/package.nix b/pkgs/by-name/gn/gnome-applets/package.nix index 671e7c710efa..07942d9a6ef8 100644 --- a/pkgs/by-name/gn/gnome-applets/package.nix +++ b/pkgs/by-name/gn/gnome-applets/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; # Don't try to install modules to gnome panel's directory, as it's read only - PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules"; + env.PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules"; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/by-name/gn/gnome-flashback/package.nix b/pkgs/by-name/gn/gnome-flashback/package.nix index d97affeab9ac..ee21354c1abe 100644 --- a/pkgs/by-name/gn/gnome-flashback/package.nix +++ b/pkgs/by-name/gn/gnome-flashback/package.nix @@ -98,8 +98,10 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - PKG_CONFIG_LIBGNOME_PANEL_LAYOUTSDIR = "${placeholder "out"}/share/gnome-panel/layouts"; - PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules"; + env = { + PKG_CONFIG_LIBGNOME_PANEL_LAYOUTSDIR = "${placeholder "out"}/share/gnome-panel/layouts"; + PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules"; + }; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/by-name/gn/gnu-shepherd/package.nix b/pkgs/by-name/gn/gnu-shepherd/package.nix index ca6792a2c796..b6eb0085202d 100644 --- a/pkgs/by-name/gn/gnu-shepherd/package.nix +++ b/pkgs/by-name/gn/gnu-shepherd/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnu-shepherd"; - version = "1.0.7"; + version = "1.0.9"; src = fetchurl { url = "mirror://gnu/shepherd/shepherd-${version}.tar.gz"; - hash = "sha256-MlqbdYHug6FRFd+/vMJHyetRD3UlSaI/OukSqOxydZc="; + hash = "sha256-5IjFhchBjfbo9HbcqBtykQ8zfJzTYI+0Z95SYABAANY="; }; configureFlags = [ "--localstatedir=/" ]; diff --git a/pkgs/by-name/gr/grummage/package.nix b/pkgs/by-name/gr/grummage/package.nix new file mode 100644 index 000000000000..909469f9558d --- /dev/null +++ b/pkgs/by-name/gr/grummage/package.nix @@ -0,0 +1,41 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + grype, +}: + +python3Packages.buildPythonApplication rec { + pname = "grummage"; + version = "2.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "popey"; + repo = "grummage"; + tag = "v${version}"; + hash = "sha256-K5/k4wSl2Ary9McPaK+T6nHqvIULuUcB3emJ7EibQrs="; + }; + + build-system = [ + python3Packages.hatchling + ]; + + dependencies = [ + python3Packages.textual + ]; + + makeWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ grype ]}" ]; + + # no included tests or version flag + doCheck = false; + + meta = { + description = "Interactive terminal frontend to Grype"; + homepage = "https://github.com/popey/grummage"; + changelog = "https://github.com/popey/grummage/releases/tag/${src.tag}"; + maintainers = with lib.maintainers; [ ethancedwards8 ]; + license = lib.licenses.mit; + mainProgram = "grummage"; + }; +} diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix index 8b27815ad65b..89257bc86669 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.2-0"; + version = "25.12.0-0"; src = fetchurl { aarch64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; - hash = "sha256-XJNoSrmnlSajzCahac9+IsQ2cIkCiF0sGvdMKKT2mYw="; + hash = "sha256-IdCwbekURJ0N5taw7NyINL8Rlb1i/jEfwQ0Sv6Kz2FM="; }; x86_64-darwin = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; - hash = "sha256-cfPWC/mF/KCThIRJlGLpz/L5ZsI+P0bI0OZ7bL1dofg="; + hash = "sha256-QJvbpgQFYA1O4xdF/whYllfBOxOjfZxkRghcEWAXcII="; }; x86_64-linux = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; - hash = "sha256-x79q24oTmj8Z54/g7w6DxTl3+91NUJf8Ago6mVUmILY="; + hash = "sha256-BVYuFHHrJHp5AX6ASG8QLBzEoynq2ugA0aWJp5bVpmc="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/hu/hubstaff/package.nix b/pkgs/by-name/hu/hubstaff/package.nix index 862da6611fa1..a0c25284f576 100644 --- a/pkgs/by-name/hu/hubstaff/package.nix +++ b/pkgs/by-name/hu/hubstaff/package.nix @@ -29,9 +29,9 @@ }: let - url = "https://app.hubstaff.com/download/10606-standard-linux-1-7-5-release/sh"; - version = "1.7.5-a68a2738"; - sha256 = "sha256:19rp5xldhfx48v8hdbvxbvv1j2n3wn5rymm82gryz620kfiandfb"; + url = "https://app.hubstaff.com/download/11100-standard-linux-1-7-8-release/sh"; + version = "1.7.8-c835b2c2"; + sha256 = "sha256:0cv6b5rx1bjizwa22xlzmljwgcvm1mqyng79qqrdzmd0xy7c02pi"; rpath = lib.makeLibraryPath [ libX11 diff --git a/pkgs/by-name/hy/hyprlauncher/package.nix b/pkgs/by-name/hy/hyprlauncher/package.nix index 677da685b6a7..2f260b1ea89e 100644 --- a/pkgs/by-name/hy/hyprlauncher/package.nix +++ b/pkgs/by-name/hy/hyprlauncher/package.nix @@ -19,13 +19,13 @@ gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprlauncher"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlauncher"; tag = "v${finalAttrs.version}"; - hash = "sha256-KMqHEAuRfO4ep40jxsGW6mnJSeWM41qv63KbWcLBfuw="; + hash = "sha256-slOlmNtNSqtVvmkZErkwFjGxsLioDUp0l1xXt+g8ggo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ig/igraph/package.nix b/pkgs/by-name/ig/igraph/package.nix index 752d70417e19..046952aee7c0 100644 --- a/pkgs/by-name/ig/igraph/package.nix +++ b/pkgs/by-name/ig/igraph/package.nix @@ -25,13 +25,13 @@ assert (blas.isILP64 == lapack.isILP64 && blas.isILP64 == arpack.isILP64 && !bla stdenv.mkDerivation (finalAttrs: { pname = "igraph"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "igraph"; repo = "igraph"; tag = finalAttrs.version; - hash = "sha256-SwcihzISSmeVhpMrysOhWrUzVVuB4ZBVEjC0vHJwrdw="; + hash = "sha256-mXaW9UOTPN5iM7ZNoV2NjH+2Maez5A/YfABeQRe0vgY="; }; postPatch = '' diff --git a/pkgs/by-name/im/imsprog/package.nix b/pkgs/by-name/im/imsprog/package.nix index 9071ce63c419..5772d44c8af9 100644 --- a/pkgs/by-name/im/imsprog/package.nix +++ b/pkgs/by-name/im/imsprog/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "imsprog"; - version = "1.6.2"; + version = "1.7.2"; src = fetchFromGitHub { owner = "bigbigmdm"; repo = "IMSProg"; tag = "v${finalAttrs.version}"; - hash = "sha256-5aDQgpZ8sS7YZAE/L0WH1nnlBZY7R68XbsAssWkGTYQ="; + hash = "sha256-KOtInfdMbBeW4oeQrKR8uK7nEsiS1NHrg/kW9nyKKNI="; }; strictDeps = true; diff --git a/pkgs/by-name/in/install-nothing/package.nix b/pkgs/by-name/in/install-nothing/package.nix new file mode 100644 index 000000000000..79a2ddc85780 --- /dev/null +++ b/pkgs/by-name/in/install-nothing/package.nix @@ -0,0 +1,35 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "install-nothing"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "buyukakyuz"; + repo = "install-nothing"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Raz6TJ7MqOi4bQE6nN7JJVCVlGZ9v7OZRfaeL+UMx2A="; + }; + + cargoHash = "sha256-jNjAzMrRUT3MdD7OMfCB0+dKRGPQsT9kBIweTOhJCOc="; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Terminal application that simulates installing things but doesn't actually install anything"; + homepage = "https://github.com/buyukakyuz/install-nothing"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ yiyu ]; + mainProgram = "install-nothing"; + }; +}) diff --git a/pkgs/by-name/ka/kamailio/package.nix b/pkgs/by-name/ka/kamailio/package.nix index 088725595cca..82532fd79f59 100644 --- a/pkgs/by-name/ka/kamailio/package.nix +++ b/pkgs/by-name/ka/kamailio/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kamailio"; - version = "6.0.3"; + version = "6.0.4"; src = fetchurl { url = "https://www.kamailio.org/pub/kamailio/${finalAttrs.version}/src/kamailio-${finalAttrs.version}_src.tar.gz"; - hash = "sha256-ljxwsspk8IAchUnMUbTi8bf05zrp1KcBRcXE1bTaEYQ="; + hash = "sha256-34Ps3i1tnSVc/JLBjSRXGY8ZRSmXhGqNy3v+c3autuY="; }; buildInputs = [ diff --git a/pkgs/by-name/ke/keepass/package.nix b/pkgs/by-name/ke/keepass/package.nix index a9353f17bcc8..e889991fbcb6 100644 --- a/pkgs/by-name/ke/keepass/package.nix +++ b/pkgs/by-name/ke/keepass/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "keepass"; - version = "2.59"; + version = "2.60"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${finalAttrs.version}-Source.zip"; - hash = "sha256-esJxGCGDb8AZi28Z7NeHMYyL8GWFpKOusua9UxlgSns="; + hash = "sha256-AraAdneAkLTS1wZ7pWC0Mm51m50s2hCy6wN74nlUtxo="; }; sourceRoot = "."; diff --git a/pkgs/by-name/ke/kernel-hardening-checker/package.nix b/pkgs/by-name/ke/kernel-hardening-checker/package.nix index c6fdef230525..794b855b780a 100644 --- a/pkgs/by-name/ke/kernel-hardening-checker/package.nix +++ b/pkgs/by-name/ke/kernel-hardening-checker/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "kernel-hardening-checker"; - version = "0.6.10.2"; + version = "0.6.17.1"; format = "pyproject"; src = fetchFromGitHub { owner = "a13xp0p0v"; repo = "kernel-hardening-checker"; rev = "v${version}"; - hash = "sha256-9FhDDKTx/YwlEuGf7fgugC5tPgslzXZdlXCCfuM09Dg="; + hash = "sha256-wkRbiXHLtTDYBrxn9ZPxXMmWJiIBI5AImjFo6NVaKRM="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix index 8a6f02194f3f..ddee1cea3dd6 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -51,21 +51,21 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.44.0"; + version = "0.45.0"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; tag = "v${version}"; - hash = "sha256-5MBYj1d/KhTFcijLMLXpmHPeuSAXuOjzjganUpWnVF4="; + hash = "sha256-3XQWmLd8F0ndzzLOcV/7144M9enqc/7FULVLeM2Kpts="; }; goModules = (buildGo124Module { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-Afk/I/+4KHcFJ4r3/RSs+G5V6aTa+muwERoMD0wi6Io="; + vendorHash = "sha256-aLl9hPfRmUE8VARwkwXhxjzDPKUGNGD+yzxY5pUIcgs="; }).goModules; buildInputs = [ @@ -143,11 +143,6 @@ buildPythonApplication rec { # OSError: master_fd is in error condition ./disable-test_ssh_bootstrap_with_different_launchers.patch - # Fix timeout issue in Fish integration tests after recent Fish release - (fetchpatch { - url = "https://github.com/kovidgoyal/kitty/commit/456fa8691a94f99fae0cef7f19dd2c85c208445a.patch"; - hash = "sha256-WLPodki5cA9Y3pcVwSV7EUmLEGGXkJDYX1MsHIzPk2s="; - }) ]; hardeningDisable = [ diff --git a/pkgs/by-name/li/libosmocore/package.nix b/pkgs/by-name/li/libosmocore/package.nix index b41743066af3..df8da21d34b4 100644 --- a/pkgs/by-name/li/libosmocore/package.nix +++ b/pkgs/by-name/li/libosmocore/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libosmocore"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmocore"; rev = version; - hash = "sha256-cEMPz5xmvaBnm+U7G1PttfhR6TXsT2PN2hk2FXHbXpg="; + hash = "sha256-4fb7vmA3iQuQZ+T2Gp0B7bc5+CYE1cTR3IoFwOde7SE="; }; postPatch = '' diff --git a/pkgs/by-name/li/libphidget22/package.nix b/pkgs/by-name/li/libphidget22/package.nix index 4be4da81ccfb..bf15bd17871d 100644 --- a/pkgs/by-name/li/libphidget22/package.nix +++ b/pkgs/by-name/li/libphidget22/package.nix @@ -7,7 +7,7 @@ }: let # This package should be updated together with libphidget22extra - version = "1.22.20250714"; + version = "1.23.20250925"; in stdenv.mkDerivation { pname = "libphidget22"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.phidgets.com/downloads/phidget22/libraries/linux/libphidget22/libphidget22-${version}.tar.gz"; - hash = "sha256-QsdNyShJkKtRHNtezO9jF2ZUilrTaqZBMTp+UcWNkhA="; + hash = "sha256-/2OgjiuoK3+gJ95tSk809OfMABUtKPN9bb4pVH447Ik="; }; nativeBuildInputs = [ automake ]; diff --git a/pkgs/by-name/li/libphidget22extra/package.nix b/pkgs/by-name/li/libphidget22extra/package.nix index ffe239d5570e..0fd2f02137cf 100644 --- a/pkgs/by-name/li/libphidget22extra/package.nix +++ b/pkgs/by-name/li/libphidget22extra/package.nix @@ -9,7 +9,7 @@ let # This package should be updated together with libphidget22 - version = "1.22.20250324"; + version = "1.23.20250925"; in stdenv.mkDerivation { pname = "libphidget22extra"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.phidgets.com/downloads/phidget22/libraries/linux/libphidget22extra/libphidget22extra-${version}.tar.gz"; - hash = "sha256-8FTd/hyqzZKWN68FAxrV1N0pPglNAbZ/aRH4V6hEgBM="; + hash = "sha256-eU/4tO9oa+/Cyy2Ro3zm2m3sAN4s3mCcRblicqSapxs="; }; nativeBuildInputs = [ automake ]; diff --git a/pkgs/by-name/lo/logiops/package.nix b/pkgs/by-name/lo/logiops/package.nix index e2e136bb170c..369cd824a4d3 100644 --- a/pkgs/by-name/lo/logiops/package.nix +++ b/pkgs/by-name/lo/logiops/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (oldAttrs: { "-DDBUS_SYSTEM_POLICY_INSTALL_DIR=${placeholder "out"}/share/dbus-1/system.d" ]; - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + env.PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; meta = { description = "Unofficial userspace driver for HID++ Logitech devices"; diff --git a/pkgs/by-name/lo/logiops_0_2_3/package.nix b/pkgs/by-name/lo/logiops_0_2_3/package.nix index 7c08fb49023c..c7228d4f9912 100644 --- a/pkgs/by-name/lo/logiops_0_2_3/package.nix +++ b/pkgs/by-name/lo/logiops_0_2_3/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { hash = "sha256-1v728hbIM2ODtB+r6SYzItczRJCsbuTvhYD2OUM1+/E="; }; - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + env.PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/lu/luarocks-packages-updater/updater.py b/pkgs/by-name/lu/luarocks-packages-updater/updater.py index 555cde43ec55..fb934eefee5e 100755 --- a/pkgs/by-name/lu/luarocks-packages-updater/updater.py +++ b/pkgs/by-name/lu/luarocks-packages-updater/updater.py @@ -1,15 +1,16 @@ #!/usr/bin/env python # format: -# $ nix run nixpkgs#python3Packages.ruff -- update.py +# $ nix run nixpkgs#python3Packages.ruff -- updater.py # type-check: -# $ nix run nixpkgs#python3Packages.mypy -- update.py +# $ nix run nixpkgs#python3Packages.mypy -- updater.py # linted: -# $ nix run nixpkgs#python3Packages.flake8 -- --ignore E501,E265,E402 update.py +# $ nix run nixpkgs#python3Packages.flake8 -- --ignore E501,E265,E402 updater.py import csv import inspect import logging import os +import re import shutil import subprocess import tempfile @@ -18,8 +19,8 @@ from dataclasses import dataclass from multiprocessing.dummy import Pool from pathlib import Path -import nixpkgs_plugin_update -from nixpkgs_plugin_update import FetchConfig, update_plugins +import nixpkgs_plugin_update # type: ignore +from nixpkgs_plugin_update import FetchConfig, Redirects, commit, retry, update_plugins class ColoredFormatter(logging.Formatter): @@ -57,10 +58,13 @@ HEADER = """/* */ """.format(GENERATED_NIXFILE=GENERATED_NIXFILE) -FOOTER = """ +FOOTER = ( + textwrap.dedent(""" } # GENERATED - do not edit this file -""" +""").strip() + + "\n" +) @dataclass @@ -87,6 +91,20 @@ class LuaPlugin: return self.name.replace(".", "-") +def extract_version(nix_expr: str) -> str | None: + match = re.search(r'version\s*=\s*"([^"]+)"', nix_expr) + if match: + return match.group(1) + return None + + +def extract_rev(nix_expr: str) -> str | None: + match = re.search(r'rev\s*=\s*"([^"]+)"', nix_expr) + if match: + return match.group(1) + return None + + # rename Editor to LangUpdate/ EcosystemUpdater class LuaEditor(nixpkgs_plugin_update.Editor): def create_parser(self): @@ -94,10 +112,10 @@ class LuaEditor(nixpkgs_plugin_update.Editor): parser.set_defaults(proc=1) return parser - def get_current_plugins(self): + def get_current_plugins(self, _config: FetchConfig, _nixpkgs: str): return [] - def load_plugin_spec(self, input_file) -> list[LuaPlugin]: + def load_plugin_spec(self, _config: FetchConfig, input_file) -> list[LuaPlugin]: luaPackages = [] csvfilename = input_file log.info("Loading package descriptions from %s", csvfilename) @@ -119,7 +137,7 @@ class LuaEditor(nixpkgs_plugin_update.Editor): with tempfile.NamedTemporaryFile("w+") as f: f.write(HEADER) header2 = textwrap.dedent( - """ + """ { stdenv, lib, @@ -133,7 +151,7 @@ class LuaEditor(nixpkgs_plugin_update.Editor): ) f.write(header2) for plugin, nix_expr in results: - f.write(f"{plugin.normalized_name} = {nix_expr}") + f.write(f" {plugin.normalized_name} = {nix_expr}") f.write(FOOTER) f.flush() @@ -150,30 +168,163 @@ class LuaEditor(nixpkgs_plugin_update.Editor): def attr_path(self): return "luaPackages" + def parse_generated_nix(self, input_file: str) -> dict[str, str]: + plugins: dict[str, str] = {} + if not os.path.exists(input_file): + return plugins + + with open(input_file, "r") as f: + content = f.read() + + start_marker = "final: prev: {" + start_idx = content.find(start_marker) + if start_idx == -1: + log.warning("Could not find start marker in generated file") + return plugins + start_idx += len(start_marker) + + # We assume the file ends with the footer or at least a closing brace + lines = content[start_idx:].splitlines() + + current_name = None + current_lines = [] + + # Regex to match start of a plugin definition: name = callPackage ( + start_pattern = re.compile(r"^\s+([\w\.\-]+)\s+=\s+callPackage\s+\(") + # Regex to match end of a plugin definition: ) { }; + end_pattern = re.compile(r"^\s+\)\s+\{\s+\};$") + + for line in lines: + if current_name is None: + match = start_pattern.match(line) + if match: + current_name = match.group(1) + # We need to keep the RHS of the assignment + # line is " name = callPackage (" + # We want "callPackage (" + rhs = line.split("=", 1)[1].strip() + current_lines = [rhs] + else: + current_lines.append(line) + if end_pattern.match(line): + plugins[current_name] = "\n".join(current_lines) + "\n\n" + current_name = None + current_lines = [] + + return plugins + + def add(self, args): + if not args.add_plugins: + return + + fieldnames = ["name", "rockspec", "ref", "server", "version", "luaversion", "maintainers"] + fetch_config = FetchConfig(args.proc, args.github_token) + + for plugin_name in args.add_plugins: + log.info(f"Adding {plugin_name} to CSV") + + existing_entries = [] + with open(self.default_in, "r", newline="") as csvfile: + reader = csv.DictReader(csvfile) + existing_entries = list(reader) + + new_entry = { + "name": plugin_name, + "rockspec": "", + "ref": "", + "server": "", + "version": "", + "luaversion": "", + "maintainers": "", + } + existing_entries.append(new_entry) + + existing_entries.sort(key=lambda x: x["name"].lower()) + + with open(self.default_in, "w", newline="") as csvfile: + writer = csv.DictWriter(csvfile, fieldnames=fieldnames, lineterminator="\n") + writer.writeheader() + writer.writerows(existing_entries) + + update = self.get_update(str(self.default_in), str(args.outfile), fetch_config, to_update=[plugin_name]) + redirects, updated_plugins = update() + + if not args.no_commit and updated_plugins: + for name, old_ver, new_ver in updated_plugins: + if old_ver == "init": + msg = f"{self.attr_path}.{name}: init at {new_ver}" + else: + msg = f"{self.attr_path}.{name}: {old_ver} -> {new_ver}" + + commit(self.nixpkgs_repo, msg, [args.outfile, self.default_in]) + def get_update( self, input_file: str, output_file: str, config: FetchConfig, - # TODO: implement support for adding/updating individual plugins to_update: list[str] | None, ): - if to_update is not None: - raise NotImplementedError("For now, lua updater doesn't support updating individual packages.") - _prefetch = generate_pkg_nix + def update() -> tuple[Redirects, list[tuple[str, str, str]]]: + all_plugin_specs = self.load_plugin_spec(config, input_file) + sorted_all_specs = sorted(all_plugin_specs, key=lambda v: v.name.lower()) - def update() -> dict: - plugin_specs = self.load_plugin_spec(input_file) - sorted_plugin_specs = sorted(plugin_specs, key=lambda v: v.name.lower()) + specs_to_process = sorted_all_specs + if to_update: + specs_to_process = [ + p for p in sorted_all_specs if p.normalized_name in to_update or p.name in to_update + ] + + # Load existing plugins to preserve them if update fails or skipped + existing_plugins = self.parse_generated_nix(output_file) + + old_versions = {} + for name, expr in existing_plugins.items(): + v = extract_version(expr) + if v: + r = extract_rev(expr) + old_versions[name] = f"{v}-{r}" if r else v try: pool = Pool(processes=config.proc) - results = pool.map(_prefetch, sorted_plugin_specs) + results = pool.map(generate_pkg_nix, specs_to_process) finally: pass - successful_results = [(plug, nix_expr) for plug, nix_expr, error in results if nix_expr is not None] - errors = [(plug, error) for plug, nix_expr, error in results if error is not None] + results_map = {} + for plug, nix_expr, error in results: + results_map[plug.normalized_name] = (nix_expr, error) + + successful_results = [] + errors = [] + updated_plugins: list[tuple[str, str, str]] = [] + + # Iterate over ALL specs to rebuild the full file + for plug in sorted_all_specs: + final_expr = None + + # Check if this plugin was processed in this run + if plug.normalized_name in results_map: + nix_expr, error = results_map[plug.normalized_name] + + if nix_expr: + final_expr = nix_expr + elif plug.normalized_name in existing_plugins: + # Update failed, fallback to existing + log.warning(f"Update failed for {plug.name}, keeping existing version. Error: {error}") + final_expr = existing_plugins[plug.normalized_name] + errors.append((plug, error)) + else: + # Update failed with no fallback + log.error(f"Update failed for {plug.name} and no existing version found. Error: {error}") + errors.append((plug, error)) + else: + # Not processed this run, use existing if available + final_expr = existing_plugins.get(plug.normalized_name) + + if final_expr: + successful_results.append((plug, final_expr)) + track_version_change(plug, final_expr, old_versions, updated_plugins) self.generate_nix(successful_results, output_file) @@ -182,12 +333,12 @@ class LuaEditor(nixpkgs_plugin_update.Editor): for plug, error in errors: log.error("%s: %s", plug.name, error) - redirects = {} - return redirects + redirects: Redirects = {} + return redirects, updated_plugins return update - def rewrite_input(self, input_file: str, *args, **kwargs): + def rewrite_input(self, _config: FetchConfig, _input_file: str, *args, **kwargs): # vim plugin reads the file before update but that shouldn't be our case # not implemented yet # fieldnames = ['name', 'server', 'version', 'luaversion', 'maintainers'] @@ -202,6 +353,29 @@ class LuaEditor(nixpkgs_plugin_update.Editor): pass +def track_version_change( + plug: LuaPlugin, nix_expr: str, old_versions: dict[str, str], updated_plugins: list[tuple[str, str, str]] +) -> None: + """Track version changes for a plugin.""" + v = extract_version(nix_expr) + if not v: + return + + r = extract_rev(nix_expr) + new_ver = f"{v}-{r}" if r else v + old_ver = old_versions.get(plug.normalized_name) + + if old_ver is None: + updated_plugins.append((plug.normalized_name, "init", new_ver)) + elif new_ver != old_ver: + updated_plugins.append((plug.normalized_name, old_ver, new_ver)) + + +@retry(subprocess.CalledProcessError, tries=3, delay=3, backoff=2) +def run_luarocks(cmd: list[str]) -> str: + return subprocess.check_output(cmd, text=True) + + def generate_pkg_nix(plug: LuaPlugin): """ Generate nix expression for a luarocks package @@ -235,12 +409,12 @@ def generate_pkg_nix(plug: LuaPlugin): if plug.luaversion: cmd.append(f"--lua-version={plug.luaversion}") luaver = plug.luaversion.replace(".", "") - if luaver := os.getenv(f"LUA_{luaver}"): - cmd.append(f"--lua-dir={luaver}") + if lua_dir := os.getenv(f"LUA_{luaver}"): + cmd.append(f"--lua-dir={lua_dir}") log.debug("running %s", " ".join(cmd)) - output = subprocess.check_output(cmd, text=True) + output = run_luarocks(cmd) ## FIXME: luarocks nix command output isn't formatted properly output = "callPackage(\n" + output.strip() + ") {};\n\n" return (plug, output, None) @@ -254,8 +428,8 @@ def main(): "lua", ROOT, "", - default_in=PKG_LIST, - default_out=GENERATED_NIXFILE, + default_in=Path(PKG_LIST), + default_out=Path(GENERATED_NIXFILE), ) editor.run() diff --git a/pkgs/by-name/ma/magpie/package.nix b/pkgs/by-name/ma/magpie/package.nix index 185fc183ce1c..a63fd4dfff81 100644 --- a/pkgs/by-name/ma/magpie/package.nix +++ b/pkgs/by-name/ma/magpie/package.nix @@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # Install udev files into our own tree. - PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + env.PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; separateDebugInfo = true; diff --git a/pkgs/by-name/mc/mcy/package.nix b/pkgs/by-name/mc/mcy/package.nix index e2d6031e9b4e..e54d9a44788e 100644 --- a/pkgs/by-name/mc/mcy/package.nix +++ b/pkgs/by-name/mc/mcy/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation { patchShebangs . substituteInPlace mcy.py \ - --replace yosys '${yosys}/bin/yosys' \ + --replace yosys '${lib.getExe yosys}' \ --replace 'os.execvp("mcy-dash"' "os.execvp(\"$out/bin/mcy-dash\"" substituteInPlace mcy-dash.py \ --replace 'app.run(debug=True)' 'app.run(host="0.0.0.0",debug=True)' \ --replace 'subprocess.Popen(["mcy"' "subprocess.Popen([\"$out/bin/mcy\"" substituteInPlace scripts/create_mutated.sh \ - --replace yosys '${yosys}/bin/yosys' + --replace yosys '${lib.getExe yosys}' ''; # the build needs a bit of work... diff --git a/pkgs/by-name/me/mediathekview/package.nix b/pkgs/by-name/me/mediathekview/package.nix index 8888c6da78b4..4f4ddc4f98c2 100644 --- a/pkgs/by-name/me/mediathekview/package.nix +++ b/pkgs/by-name/me/mediathekview/package.nix @@ -1,20 +1,21 @@ { lib, + pkgs, stdenv, fetchurl, makeWrapper, libglvnd, libnotify, - jre, + openjdk25, # 2025-12-25: pkgs.jre points to java 21 and there is no equivalent for jre25 zip, }: -stdenv.mkDerivation rec { - version = "14.2.0"; +stdenv.mkDerivation (finalAttrs: { + version = "14.4.2"; pname = "mediathekview"; src = fetchurl { - url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz"; - sha256 = "sha256-EWpa6YE9Fk7K14vvsbjadKuGGZGqNhlouDtwj6KpbdE="; + url = "https://download.mediathekview.de/stabil/MediathekView-${finalAttrs.version}-linux.tar.gz"; + sha256 = "sha256-sDZSXYzak2RKQiW1OGpgSvFlkZrttsoOxVqRaodol24="; }; nativeBuildInputs = [ @@ -35,29 +36,37 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,lib} install -m644 MediathekView.jar $out/lib + cp -r dependency $out/lib - makeWrapper ${jre}/bin/java $out/bin/mediathek \ - --add-flags "-jar $out/lib/MediathekView.jar" \ + makeWrapper ${openjdk25}/bin/java $out/bin/mediathek \ + --add-flags "--add-exports=java.desktop/sun.swing=ALL-UNNAMED -XX:MaxRAMPercentage=10.0 -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=compact -XX:+UseStringDeduplication --add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED --enable-native-access=ALL-UNNAMED -cp \"$out/lib/dependency/*:$out/lib/MediathekView.jar\" mediathek.Main" \ --suffix LD_LIBRARY_PATH : "${libraryPath}" - makeWrapper ${jre}/bin/java $out/bin/MediathekView \ - --add-flags "-jar $out/lib/MediathekView.jar" \ - --suffix LD_LIBRARY_PATH : "${libraryPath}" + ln -s $out/bin/mediathek $out/bin/MediathekView - makeWrapper ${jre}/bin/java $out/bin/MediathekView_ipv4 \ - --add-flags "-Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" \ + makeWrapper ${openjdk25}/bin/java $out/bin/MediathekView_ipv4 \ + --add-flags "-Djava.net.preferIPv4Stack=true --add-exports=java.desktop/sun.swing=ALL-UNNAMED -XX:MaxRAMPercentage=10.0 -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=compact -XX:+UseStringDeduplication --add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED --enable-native-access=ALL-UNNAMED -cp \"$out/lib/dependency/*:$out/lib/MediathekView.jar\" mediathek.Main" \ --suffix LD_LIBRARY_PATH : "${libraryPath}" runHook postInstall ''; + doInstallCheck = true; + # sanity to ensure that mediathek can actually start + # unfortunately the executable does not print its own version + installCheckPhase = '' + runHook postCheck + ($out/bin/${finalAttrs.meta.mainProgram} --help 2>&1 ||: ) | grep -q 'Diese Version von MediathekView unterst?tzt keine Kommandozeilenausf?hrung.' + runHook preCheck + ''; + meta = { description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)"; homepage = "https://mediathekview.de/"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.gpl3Plus; mainProgram = "mediathek"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ makefu ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/me/mekuteriya/package.nix b/pkgs/by-name/me/mekuteriya/package.nix index cd1a93fdd5b3..60b0030c7a2b 100644 --- a/pkgs/by-name/me/mekuteriya/package.nix +++ b/pkgs/by-name/me/mekuteriya/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "mekuteriya"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "frectonz"; repo = "mek-ut-er-ya"; rev = version; - hash = "sha256-bWp2UNrhCHY2DQWusGS9L9/jI2r23F34yLpuE6nuOD0="; + hash = "sha256-u3NK5KL3GjGekcFd4cB/z0omsL2FgiX8dMpcVl5h9s0="; }; - cargoHash = "sha256-YIsM2IVtV1jG/JzCR9gQPqnKhtxJYdCWdTw4FlK3Y9w="; + cargoHash = "sha256-pmy0jXFA6qt8U69CQBmpVWYr+Ifn0Z+Dj0hRHxHPBoQ="; meta = { description = "Ethiopian Calendar CLI"; diff --git a/pkgs/by-name/mh/mhabit/git-hashes.json b/pkgs/by-name/mh/mhabit/git-hashes.json new file mode 100644 index 000000000000..e37b6761c806 --- /dev/null +++ b/pkgs/by-name/mh/mhabit/git-hashes.json @@ -0,0 +1,3 @@ +{ + "icon_font_generator": "sha256-QmChsa2qP+gZyZ2IrJMrY/zBP/J5QigidjIHahp3V0g=" +} diff --git a/pkgs/by-name/mh/mhabit/package.nix b/pkgs/by-name/mh/mhabit/package.nix index 8570263518d3..9558c05dfde8 100644 --- a/pkgs/by-name/mh/mhabit/package.nix +++ b/pkgs/by-name/mh/mhabit/package.nix @@ -1,27 +1,33 @@ { lib, fetchFromGitHub, - flutter329, + flutter332, sqlite, libsecret, + _experimental-update-script-combinators, + nix-update-script, + runCommand, + yq-go, + dart, }: let - flutter = flutter329; -in -flutter.buildFlutterApplication rec { - pname = "mhabit"; - version = "1.21.1+120"; + version = "1.22.6+133"; src = fetchFromGitHub { owner = "FriesI23"; repo = "mhabit"; tag = "v${version}"; - hash = "sha256-ym+xCv7fRwlms2oIvcthyuz53T0LCgigleg1qmLfZVU="; + hash = "sha256-zdgD3TGSjRQc6PAeTh2EV42X5EEgiOh0yH0+Fqre+Qc="; }; +in +flutter332.buildFlutterApplication { + pname = "mhabit"; + inherit version src; pubspecLock = lib.importJSON ./pubspec.lock.json; - gitHashes.icon_font_generator = "sha256-QmChsa2qP+gZyZ2IrJMrY/zBP/J5QigidjIHahp3V0g="; + + gitHashes = lib.importJSON ./git-hashes.json; buildInputs = [ sqlite @@ -36,6 +42,37 @@ flutter.buildFlutterApplication rec { install -Dm644 assets/logo/icon.svg $out/share/icons/hicolor/scalable/io.github.friesi23.mhabit ''; + passthru = { + pubspecSource = + runCommand "pubspec.lock.json" + { + inherit src; + nativeBuildInputs = [ yq-go ]; + } + '' + yq eval --output-format=json --prettyPrint $src/pubspec.lock > "$out" + ''; + updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { }) + ( + (_experimental-update-script-combinators.copyAttrOutputToFile "mhabit.pubspecSource" ./pubspec.lock.json) + // { + supportedFeatures = [ ]; + } + ) + { + command = [ + dart.fetchGitHashesScript + "--input" + ./pubspec.lock.json + "--output" + ./git-hashes.json + ]; + supportedFeatures = [ ]; + } + ]; + }; + meta = { description = "Track micro habits with easy-to-use charts and tools"; longDescription = '' diff --git a/pkgs/by-name/mh/mhabit/pubspec.lock.json b/pkgs/by-name/mh/mhabit/pubspec.lock.json index b2ab3afaa8cd..e218672521e6 100644 --- a/pkgs/by-name/mh/mhabit/pubspec.lock.json +++ b/pkgs/by-name/mh/mhabit/pubspec.lock.json @@ -30,15 +30,25 @@ "source": "hosted", "version": "1.0.5" }, + "animated_reorderable_list": { + "dependency": "direct main", + "description": { + "name": "animated_reorderable_list", + "sha256": "5de5cca556a8c9c8f7b65234ae4b683593dc6e167db498744a5e389302f24d13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, "animations": { "dependency": "direct main", "description": { "name": "animations", - "sha256": "d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb", + "sha256": "a8031b276f0a7986ac907195f10ca7cd04ecf2a8a566bd6dbe03018a9b02b427", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.11" + "version": "2.1.0" }, "ansicolor": { "dependency": "transitive", @@ -124,11 +134,11 @@ "dependency": "transitive", "description": { "name": "build_daemon", - "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa", + "sha256": "409002f1adeea601018715d613115cfaf0e31f512cb80ae4534c79867ae2363d", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.4" + "version": "4.1.0" }, "build_resolvers": { "dependency": "transitive", @@ -174,11 +184,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "ba95c961bafcd8686d1cf63be864eb59447e795e124d98d6a27d91fcd13602fb", + "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.11.1" + "version": "8.12.0" }, "characters": { "dependency": "transitive", @@ -234,11 +244,11 @@ "dependency": "transitive", "description": { "name": "code_builder", - "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e", + "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.10.1" + "version": "4.11.0" }, "collection": { "dependency": "direct main", @@ -504,31 +514,31 @@ "dependency": "direct main", "description": { "name": "file_selector", - "sha256": "5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828", + "sha256": "5f1d15a7f17115038f433d1b0ea57513cc9e29a9d5338d166cb0bef3fa90a7a0", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.3" + "version": "1.0.4" }, "file_selector_android": { "dependency": "transitive", "description": { "name": "file_selector_android", - "sha256": "3015702ab73987000e7ff2df5ddc99666d2bcd65cdb243f59da35729d3be6cff", + "sha256": "1ce58b609289551f8ec07265476720e77d19764339cc1d8e4df3c4d34dac6499", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1+15" + "version": "0.5.1+17" }, "file_selector_ios": { "dependency": "transitive", "description": { "name": "file_selector_ios", - "sha256": "94b98ad950b8d40d96fee8fa88640c2e4bd8afcdd4817993bd04e20310f45420", + "sha256": "fe9f52123af16bba4ad65bd7e03defbbb4b172a38a8e6aaa2a869a0c56a5f5fb", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.3+1" + "version": "0.5.3+2" }, "file_selector_linux": { "dependency": "transitive", @@ -544,11 +554,11 @@ "dependency": "transitive", "description": { "name": "file_selector_macos", - "sha256": "8c9250b2bd2d8d4268e39c82543bacbaca0fda7d29e0728c3c4bbb7c820fd711", + "sha256": "19124ff4a3d8864fdc62072b6a2ef6c222d55a3404fe14893a3c02744907b60c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.4+3" + "version": "0.9.4+4" }, "file_selector_platform_interface": { "dependency": "transitive", @@ -630,31 +640,31 @@ "dependency": "direct dev", "description": { "name": "flutter_gen", - "sha256": "102471a3c6ee7d9175ac8f1989e1bd0e1b4f0d23615da4f961cf9e82752550fe", + "sha256": "eac4863b65813aacbf16ecc07e7c271ab82fb2d95181825348f1fb7b03fd52da", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.11.0" + "version": "5.12.0" }, "flutter_gen_core": { "dependency": "transitive", "description": { "name": "flutter_gen_core", - "sha256": "eda54fdc5de08e7eeea663eb8442aafc8660b5a13fda4e0c9e572c64e50195fb", + "sha256": "b6bafbbd981da2f964eb45bcb8b8a7676a281084f8922c0c75de4cfbaa849311", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.11.0" + "version": "5.12.0" }, "flutter_gen_runner": { "dependency": "direct dev", "description": { "name": "flutter_gen_runner", - "sha256": "669bf8b7a9b4acbdcb7fcc5e12bf638aca19acedf43341714cbca3bf3a219521", + "sha256": "c99b10af9d404e3f46fd1927e7d90099779e935e86022674c4c2a9e6c2a93b29", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.11.0" + "version": "5.12.0" }, "flutter_highlight": { "dependency": "transitive", @@ -690,11 +700,11 @@ "dependency": "direct main", "description": { "name": "flutter_local_notifications", - "sha256": "20ca0a9c82ce0c855ac62a2e580ab867f3fbea82680a90647f7953832d0850ae", + "sha256": "19ffb0a8bb7407875555e5e98d7343a633bb73707bae6c6a5f37c90014077875", "url": "https://pub.dev" }, "source": "hosted", - "version": "19.4.0" + "version": "19.5.0" }, "flutter_local_notifications_linux": { "dependency": "transitive", @@ -720,11 +730,11 @@ "dependency": "transitive", "description": { "name": "flutter_local_notifications_windows", - "sha256": "ed46d7ae4ec9d19e4c8fa2badac5fe27ba87a3fe387343ce726f927af074ec98", + "sha256": "8d658f0d367c48bd420e7cf2d26655e2d1130147bca1eea917e576ca76668aaf", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.2" + "version": "1.0.3" }, "flutter_localizations": { "dependency": "direct main", @@ -806,11 +816,11 @@ "dependency": "direct main", "description": { "name": "flutter_svg", - "sha256": "cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845", + "sha256": "b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.0" + "version": "2.2.1" }, "flutter_test": { "dependency": "direct dev", @@ -1079,11 +1089,11 @@ "dependency": "direct main", "description": { "name": "logger", - "sha256": "55d6c23a6c15db14920e037fe7e0dc32e7cdaf3b64b4b25df2d541b5b6b81c0c", + "sha256": "a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.1" + "version": "2.6.2" }, "logging": { "dependency": "transitive", @@ -1379,21 +1389,21 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9", + "sha256": "3b4c1fc3aa55ddc9cd4aa6759984330d5c8e66aa7702a6223c61540dc6380c37", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.17" + "version": "2.2.19" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942", + "sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2" }, "path_provider_linux": { "dependency": "transitive", @@ -1459,11 +1469,11 @@ "dependency": "direct main", "description": { "name": "pool", - "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.1" + "version": "1.5.2" }, "posix": { "dependency": "transitive", @@ -1479,11 +1489,11 @@ "dependency": "direct main", "description": { "name": "provider", - "sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84", + "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.5" + "version": "6.1.5+1" }, "pub_semver": { "dependency": "transitive", @@ -1589,11 +1599,11 @@ "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "5bcf0772a761b04f8c6bf814721713de6f3e5d9d89caf8d3fe031b02a342379e", + "sha256": "bd14436108211b0d4ee5038689a56d4ae3620fd72fd6036e113bf1345bc74d9e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.11" + "version": "2.4.13" }, "shared_preferences_foundation": { "dependency": "transitive", @@ -1855,11 +1865,11 @@ "dependency": "transitive", "description": { "name": "sqlite3", - "sha256": "f393d92c71bdcc118d6203d07c991b9be0f84b1a6f89dd4f7eed348131329924", + "sha256": "f18fd9a72d7a1ad2920db61368f2a69368f1cc9b56b8233e9d83b47b0a8435aa", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.9.0" + "version": "2.9.3" }, "stack_trace": { "dependency": "transitive", @@ -2035,21 +2045,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "0aedad096a85b49df2e4725fa32118f9fa580f3b14af7a2d2221896a02cd5656", + "sha256": "81777b08c498a292d93ff2feead633174c386291e35612f8da438d6e92c4447e", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.17" + "version": "6.3.20" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb", + "sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.3" + "version": "6.3.4" }, "url_launcher_linux": { "dependency": "transitive", @@ -2065,11 +2075,11 @@ "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2", + "sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.2" + "version": "3.2.3" }, "url_launcher_platform_interface": { "dependency": "transitive", @@ -2135,11 +2145,11 @@ "dependency": "transitive", "description": { "name": "vector_graphics_compiler", - "sha256": "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331", + "sha256": "d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.17" + "version": "1.1.19" }, "vector_math": { "dependency": "transitive", @@ -2175,11 +2185,11 @@ "dependency": "transitive", "description": { "name": "watcher", - "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a", + "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.2" + "version": "1.1.4" }, "web": { "dependency": "transitive", diff --git a/pkgs/by-name/mo/mockoon/package.nix b/pkgs/by-name/mo/mockoon/package.nix index bb7d4bdcfec9..4bb7d5f50f25 100644 --- a/pkgs/by-name/mo/mockoon/package.nix +++ b/pkgs/by-name/mo/mockoon/package.nix @@ -6,11 +6,11 @@ let pname = "mockoon"; - version = "9.3.0"; + version = "9.4.0"; src = fetchurl { url = "https://github.com/mockoon/mockoon/releases/download/v${version}/mockoon-${version}.x86_64.AppImage"; - hash = "sha256-KdhI8wJZLEAuGOiZa6sZ4+4+iNBOENsebYSVl9AYBEE="; + hash = "sha256-BnzeCJIuVvbrdS5X6Or2t2QjwE+S9/jZOfgsjbtBoZU="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix index 860120429424..126f9fed5831 100644 --- a/pkgs/by-name/mo/mongodb-ce/package.nix +++ b/pkgs/by-name/mo/mongodb-ce/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mongodb-ce"; - version = "8.0.15"; + version = "8.2.3"; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} @@ -53,19 +53,19 @@ stdenv.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2404-${finalAttrs.version}.tgz"; - hash = "sha256-hHlTsXbzDBhesK6hrGV27zXBBd7uEFlt/5QDJFn5aFA="; + hash = "sha256-NjPVLSqm5CPaG9/yOL7wEWW2rwFYcgCqwIZNk/ObYI8="; }; "aarch64-linux" = fetchurl { url = "https://fastdl.mongodb.org/linux/mongodb-linux-aarch64-ubuntu2404-${finalAttrs.version}.tgz"; - hash = "sha256-th67W8GA62AcKlASxafYBZLM2j+kZGuk4N706nXQKQ0="; + hash = "sha256-oVgHrXLjbc7XBrBr8QtChGfyfs+hCot4Dt9I/Qf9X3E="; }; "x86_64-darwin" = fetchurl { url = "https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${finalAttrs.version}.tgz"; - hash = "sha256-MBNmctpSZjHZyYkUyt6q/uGmSGRdRD+7GHrh/Aj+bmA="; + hash = "sha256-2jjP+vPAct+dcAn6RQLKrDyAsKQxj4kL+3XlDXfT1cQ="; }; "aarch64-darwin" = fetchurl { url = "https://fastdl.mongodb.org/osx/mongodb-macos-arm64-${finalAttrs.version}.tgz"; - hash = "sha256-3yXoOMD6S90XErUWCctCMV5aulljrvXsVGEUBvHmk5w="; + hash = "sha256-qUVQIeot2NO0ddrEW5jElu6HVyqiwTbR1S6KM2LJwV8="; }; }; updateScript = @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { text = '' # Get latest version string from Github - NEW_VERSION=$(curl -s "https://api.github.com/repos/mongodb/mongo/tags?per_page=1000" | jq -r 'first(.[] | .name | select(startswith("r8.0")) | select(contains("rc") | not) | .[1:])') + NEW_VERSION=$(curl -s "https://api.github.com/repos/mongodb/mongo/tags?per_page=1000" | jq -r 'first(.[] | .name | select(startswith("r8.2")) | select(contains("rc") | not) | .[1:])') # Check if the new version is available for download, if not, exit curl -s https://www.mongodb.com/try/download/community-edition/releases | pup 'h3:not([id]) text{}' | grep "$NEW_VERSION" @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - changelog = "https://www.mongodb.com/docs/upcoming/release-notes/8.0/"; + changelog = "https://www.mongodb.com/docs/upcoming/release-notes/8.2/"; description = "MongoDB is a general purpose, document-based, distributed database"; homepage = "https://www.mongodb.com/"; license = with lib.licenses; [ sspl ]; diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index 4653bb2c718d..7e4936322523 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -198,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # Install udev files into our own tree. - PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + env.PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; separateDebugInfo = true; strictDeps = true; diff --git a/pkgs/by-name/mu/mutter46/package.nix b/pkgs/by-name/mu/mutter46/package.nix index f215ef9fd523..c2045eeb3060 100644 --- a/pkgs/by-name/mu/mutter46/package.nix +++ b/pkgs/by-name/mu/mutter46/package.nix @@ -184,7 +184,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # Install udev files into our own tree. - PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + env.PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; separateDebugInfo = true; diff --git a/pkgs/by-name/na/nak/package.nix b/pkgs/by-name/na/nak/package.nix index b2544e338c9b..a2c84d130c39 100644 --- a/pkgs/by-name/na/nak/package.nix +++ b/pkgs/by-name/na/nak/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "nak"; - version = "0.17.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = "fiatjaf"; repo = "nak"; tag = "v${finalAttrs.version}"; - hash = "sha256-FQwo40uNyjoBsqsXFbbReI+n89sQR+d2wn1stSQb/+k="; + hash = "sha256-xQgUG138qBPihbAs19Z6qXcWcjjBJyXPJDHoX7EuDx0="; }; - vendorHash = "sha256-EaJPQS712e5IM1Mh7A2lJKohOkLuKV/7gtxGnajjbFw="; + vendorHash = "sha256-7sKGGu04KNdVI0RcTvW4Ehld6BYaQF+3Jlh+Mq96wDQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/ne/nemo-fileroller/package.nix b/pkgs/by-name/ne/nemo-fileroller/package.nix index 3f2abc7be5e5..39225ebed4fa 100644 --- a/pkgs/by-name/ne/nemo-fileroller/package.nix +++ b/pkgs/by-name/ne/nemo-fileroller/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { --replace "GNOMELOCALEDIR" "${cinnamon-translations}/share/locale" ''; - PKG_CONFIG_LIBNEMO_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/${nemo.extensiondir}"; + env.PKG_CONFIG_LIBNEMO_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/${nemo.extensiondir}"; meta = { homepage = "https://github.com/linuxmint/nemo-extensions/tree/master/nemo-fileroller"; diff --git a/pkgs/by-name/ne/nemo-python/package.nix b/pkgs/by-name/ne/nemo-python/package.nix index 4a962984b427..60c5aeb60d67 100644 --- a/pkgs/by-name/ne/nemo-python/package.nix +++ b/pkgs/by-name/ne/nemo-python/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { --replace "get_option('prefix'), get_option('libdir')" "'${python3}/lib'" ''; - PKG_CONFIG_LIBNEMO_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/${nemo.extensiondir}"; + env.PKG_CONFIG_LIBNEMO_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/${nemo.extensiondir}"; passthru.nemoPythonExtensionDeps = [ python3.pkgs.pygobject3 ]; diff --git a/pkgs/by-name/ne/networkmanager-strongswan/package.nix b/pkgs/by-name/ne/networkmanager-strongswan/package.nix index 1f0b5327f07b..71f80f142314 100644 --- a/pkgs/by-name/ne/networkmanager-strongswan/package.nix +++ b/pkgs/by-name/ne/networkmanager-strongswan/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { "--with-gtk4" ]; - PKG_CONFIG_LIBNM_VPNSERVICEDIR = "${placeholder "out"}/lib/NetworkManager/VPN"; + env.PKG_CONFIG_LIBNM_VPNSERVICEDIR = "${placeholder "out"}/lib/NetworkManager/VPN"; passthru = { networkManagerPlugin = "VPN/nm-strongswan-service.name"; diff --git a/pkgs/by-name/no/noctalia-shell/package.nix b/pkgs/by-name/no/noctalia-shell/package.nix new file mode 100644 index 000000000000..5fa2706a6bcb --- /dev/null +++ b/pkgs/by-name/no/noctalia-shell/package.nix @@ -0,0 +1,121 @@ +{ + fetchFromGitHub, + lib, + nix-update-script, + stdenvNoCC, + + # build + qt6, + quickshell, + + # runtime deps + brightnessctl, + cava, + cliphist, + ddcutil, + matugen, + wlsunset, + wl-clipboard, + imagemagick, + wget, + gpu-screen-recorder, + + # calendar support + python3, + evolution-data-server, + libical, + glib, + libsoup_3, + json-glib, + gobject-introspection, + + brightnessctlSupport ? true, + cavaSupport ? true, + cliphistSupport ? true, + ddcutilSupport ? true, + matugenSupport ? true, + wlsunsetSupport ? true, + wl-clipboardSupport ? true, + imagemagickSupport ? true, + gpuScreenRecorderSupport ? stdenvNoCC.hostPlatform.system == "x86_64-linux", + calendarSupport ? false, +}: +let + runtimeDeps = [ + wget + ] + ++ lib.optional brightnessctlSupport brightnessctl + ++ lib.optional cavaSupport cava + ++ lib.optional cliphistSupport cliphist + ++ lib.optional ddcutilSupport ddcutil + ++ lib.optional matugenSupport matugen + ++ lib.optional wlsunsetSupport wlsunset + ++ lib.optional wl-clipboardSupport wl-clipboard + ++ lib.optional imagemagickSupport imagemagick + ++ lib.optional gpuScreenRecorderSupport gpu-screen-recorder + ++ lib.optional calendarSupport (python3.withPackages (pp: [ pp.pygobject3 ])); + + giTypelibPath = lib.makeSearchPath "lib/girepository-1.0" [ + evolution-data-server + libical + glib.out + libsoup_3 + json-glib + gobject-introspection + ]; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "noctalia-shell"; + version = "3.7.5"; + + src = fetchFromGitHub { + owner = "noctalia-dev"; + repo = "noctalia-shell"; + tag = "v${finalAttrs.version}"; + hash = "sha256-TBrsYS+n+8AsXRAP4wA3JNOdT604QmPo8yeSTT/p61I="; + }; + + nativeBuildInputs = [ + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + qt6.qtbase + qt6.qtmultimedia + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/noctalia-shell $out/bin + ln -s ${quickshell}/bin/qs $out/bin/noctalia-shell + + cp -R \ + Assets Bin Commons CREDITS.md Helpers Modules Services Shaders Widgets shell.qml \ + $out/share/noctalia-shell + + rm -R $out/share/noctalia-shell/Assets/Screenshots + rm -R $out/share/noctalia-shell/Bin/dev + + runHook postInstall + ''; + + preFixup = '' + qtWrapperArgs+=( + --prefix PATH : ${lib.makeBinPath runtimeDeps} + --add-flags "-p $out/share/noctalia-shell" + ${lib.optionalString calendarSupport "--prefix GI_TYPELIB_PATH : ${giTypelibPath}"} + ) + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Sleek and minimal desktop shell thoughtfully crafted for Wayland, built with Quickshell"; + homepage = "https://github.com/noctalia-dev/noctalia-shell"; + license = lib.licenses.mit; + mainProgram = "noctalia-shell"; + maintainers = with lib.maintainers; [ spacedentist ]; + platforms = quickshell.meta.platforms; + }; +}) diff --git a/pkgs/by-name/nz/nzportable/assets.nix b/pkgs/by-name/nz/nzportable/assets.nix index 2f3bc507bead..3161c24a7af5 100644 --- a/pkgs/by-name/nz/nzportable/assets.nix +++ b/pkgs/by-name/nz/nzportable/assets.nix @@ -5,12 +5,12 @@ }: stdenvNoCC.mkDerivation { pname = "nzp-assets"; - version = "0-unstable-2024-09-28"; + version = "0-unstable-2025-11-25"; src = fetchFromGitHub { owner = "nzp-team"; repo = "assets"; - rev = "4a7b1b787061c1c7c17ab3b59a8e0e0f44c9546f"; + rev = "96dd29602d6d8af0cce9208910e7ab68bfc95019"; hash = "sha256-gCTC/76r0ITIDLIph9uivq0ZJGaPUmlBGizdCUxJrng="; }; diff --git a/pkgs/by-name/nz/nzportable/fteqw.nix b/pkgs/by-name/nz/nzportable/fteqw.nix index 89ba5709e9d4..8be5ef62f08e 100644 --- a/pkgs/by-name/nz/nzportable/fteqw.nix +++ b/pkgs/by-name/nz/nzportable/fteqw.nix @@ -41,12 +41,12 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "nzp-fteqw"; - version = "0-unstable-2024-09-11"; + version = "0-unstable-2025-09-25"; src = fetchFromGitHub { owner = "nzp-team"; repo = "fteqw"; - rev = "593345a7f03245fc45580ac252857e5db5105033"; + rev = "f68a2b547d2dc4bf6886b922baa1bff487cc5038"; hash = "sha256-ANDHh4PKh8fAvbBiiW47l1XeGOCes0Sg595+65NFG6w="; }; @@ -93,6 +93,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "FTE_TOOL_IMAGE" false) (lib.cmakeBool "FTE_TOOL_QTV" false) (lib.cmakeBool "FTE_TOOL_MASTER" false) + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5") ]; postInstall = '' diff --git a/pkgs/by-name/nz/nzportable/quakec.nix b/pkgs/by-name/nz/nzportable/quakec.nix index 7b219dac08f7..01578b2d131e 100644 --- a/pkgs/by-name/nz/nzportable/quakec.nix +++ b/pkgs/by-name/nz/nzportable/quakec.nix @@ -7,12 +7,12 @@ }: stdenvNoCC.mkDerivation { pname = "nzp-quakec"; - version = "0-unstable-2024-10-12"; + version = "0-unstable-2025-11-26"; src = fetchFromGitHub { owner = "nzp-team"; repo = "quakec"; - rev = "01e95c4dab91ce0e8b7387d2726d9ee307792ae7"; + rev = "b1d7fec5a536b088283578866ade2c596f7928d0"; hash = "sha256-h4llx3tzeoI1aHLokM7NqkZJWuo6rcrmWfb0pDQL+zM="; }; diff --git a/pkgs/by-name/os/ospd-openvas/package.nix b/pkgs/by-name/os/ospd-openvas/package.nix index 955fe83b8f60..541d86c31383 100644 --- a/pkgs/by-name/os/ospd-openvas/package.nix +++ b/pkgs/by-name/os/ospd-openvas/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ospd-openvas"; - version = "22.9.1"; + version = "22.10.0"; pyproject = true; src = fetchFromGitHub { owner = "greenbone"; repo = "ospd-openvas"; tag = "v${version}"; - hash = "sha256-4Lu9HVLxROEBDzkHgm4iH778QFwaLkM6qiOEq8OTcIU="; + hash = "sha256-a1+rPHt/H3/ejEGGNUBER2ow5x9JlQsfIQHdM6GKPeQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/ox/oxtools/package.nix b/pkgs/by-name/ox/oxtools/package.nix index 1073b43b24ce..4e70892e5663 100644 --- a/pkgs/by-name/ox/oxtools/package.nix +++ b/pkgs/by-name/ox/oxtools/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "0xtools"; - version = "2.0.3"; + version = "3.0.3"; src = fetchFromGitHub { owner = "tanelpoder"; repo = "0xtools"; rev = "v${finalAttrs.version}"; - hash = "sha256-QWH3sKYFiEWuexZkMlyWQPHmKJpcaiWI5szhdx5yKtM="; + hash = "sha256-mHd4NFp+QB+TTBLeuEeJVdgQ2r8CM4CfZC515t/3u94="; }; postPatch = '' diff --git a/pkgs/by-name/pg/pgbouncer/package.nix b/pkgs/by-name/pg/pgbouncer/package.nix index 5bab21bf1d99..68bace9c967f 100644 --- a/pkgs/by-name/pg/pgbouncer/package.nix +++ b/pkgs/by-name/pg/pgbouncer/package.nix @@ -6,20 +6,26 @@ libevent, c-ares, pkg-config, + python3, + pandoc, systemd, nixosTests, }: stdenv.mkDerivation rec { pname = "pgbouncer"; - version = "1.24.1"; + version = "1.25.1"; src = fetchurl { url = "https://www.pgbouncer.org/downloads/files/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-2nKjq6EwcodtBVo+WN1Kukpd5O1hSOcwMxhSRVmP0+A="; + hash = "sha256-blZq6S/j739qG54m1gSffXyjnEDinns49tVQCuFdhGU="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + python3 + pandoc + ]; buildInputs = [ libevent openssl diff --git a/pkgs/by-name/pi/pihole-web/package.nix b/pkgs/by-name/pi/pihole-web/package.nix index 1cbd09116d0e..9eac557b8f20 100644 --- a/pkgs/by-name/pi/pihole-web/package.nix +++ b/pkgs/by-name/pi/pihole-web/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pihole-web"; - version = "6.2.1"; + version = "6.4"; src = fetchFromGitHub { owner = "pi-hole"; repo = "web"; tag = "v${finalAttrs.version}"; - hash = "sha256-pfKWOb+DJSRy9r2igx8voRpAPHKshVqYMoxOwoBWZLA="; + hash = "sha256-zIuDqDL6JO8JLr+u+XWBRxweK67KBztvqUp00MshbYQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/by-name/pl/plan9port-wayland/package.nix b/pkgs/by-name/pl/plan9port-wayland/package.nix new file mode 100644 index 000000000000..041a9990210c --- /dev/null +++ b/pkgs/by-name/pl/plan9port-wayland/package.nix @@ -0,0 +1,129 @@ +{ + lib, + stdenv, + fetchFromGitHub, + perl, # For building web manuals + which, + wayland, + libxkbcommon, + ed, +}: + +stdenv.mkDerivation { + pname = "plan9port-wayland"; + version = "0-unstable-2025-11-26"; + + src = fetchFromGitHub { + owner = "eaburns"; + repo = "plan9port"; + rev = "5848a455a79e4c3c5089fdeb7dcad69d67349bcd"; + hash = "sha256-tBuGdfy/ApQoOXpfnJUmv4oM4D4yHAeoTDhISkwg1TI="; + }; + + postPatch = '' + substituteInPlace bin/9c \ + --replace 'which uniq' '${which}/bin/which uniq' + + ed -sE INSTALL <LOCAL.config <LOCAL.INSTALL <test.c < + #include + #include + void + threadmain(int argc, char **argv) + { + threadexitsall(nil); + } + EOF + $out/bin/9 9c -o test.o test.c + $out/bin/9 9l -o test test.o + ./test + + runHook postInstallCheck + ''; + + env.XDG_SESSION_TYPE = "wayland"; + + meta = { + homepage = "https://github.com/eaburns/plan9port"; + description = "Plan 9 from User Space (fork with wayland support)"; + longDescription = '' + Plan 9 from User Space (aka plan9port) is a port of many Plan 9 programs + from their native Plan 9 environment to Unix-like operating systems. + ''; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + aleksana + ]; + mainProgram = "9"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/pl/planify/package.nix b/pkgs/by-name/pl/planify/package.nix index f995e5ae4f43..185f6ea24a47 100644 --- a/pkgs/by-name/pl/planify/package.nix +++ b/pkgs/by-name/pl/planify/package.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.16.1"; + version = "4.17.0"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; tag = "v${version}"; - hash = "sha256-jQW82nnIfuKhTWPlJQD2Mcl+Yl+NqnTbRnMn5+sfuD4="; + hash = "sha256-wsjLx5MYLAnYZEAeavvuh0nogpINeklo2VD3EftW+UA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/power-profiles-daemon/package.nix b/pkgs/by-name/po/power-profiles-daemon/package.nix index b303721afd81..fabb6ed3f710 100644 --- a/pkgs/by-name/po/power-profiles-daemon/package.nix +++ b/pkgs/by-name/po/power-profiles-daemon/package.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { # Only need to wrap the Python tool (powerprofilectl) dontWrapGApps = true; - PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; + env.PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; postPatch = '' patchShebangs --build \ diff --git a/pkgs/by-name/pr/progress-tracker/package.nix b/pkgs/by-name/pr/progress-tracker/package.nix index 55179cb41d66..678b256867cd 100644 --- a/pkgs/by-name/pr/progress-tracker/package.nix +++ b/pkgs/by-name/pr/progress-tracker/package.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "progress-tracker"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "smolBlackCat"; repo = "progress-tracker"; rev = "v${finalAttrs.version}"; - hash = "sha256-RIguUto0ADAT9OJ+gBf/JBpAiDn1DX9NBuGmDJYJn+Q="; + hash = "sha256-jFHB/YqdRlLihRWfxgap1OCZkbYqh5knfBzuEiWJjRY="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/pr/proton-vpn-cli/package.nix b/pkgs/by-name/pr/proton-vpn-cli/package.nix new file mode 100644 index 000000000000..8d8e5cf7ac73 --- /dev/null +++ b/pkgs/by-name/pr/proton-vpn-cli/package.nix @@ -0,0 +1,71 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + gobject-introspection, + libnotify, + wrapGAppsNoGuiHook, +}: + +python3Packages.buildPythonApplication rec { + pname = "proton-vpn-cli"; + version = "0.1.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ProtonVPN"; + repo = "proton-vpn-cli"; + tag = "v${version}"; + hash = "sha256-Hn7xLb7VWa2dlsrQnjnRgv+8UntOwDak9+rV1HF7k80="; + }; + + nativeBuildInputs = [ + # Needed for the NM namespace + gobject-introspection + wrapGAppsNoGuiHook + ]; + + buildInputs = [ + libnotify # gir typelib is used + ]; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + click + dbus-fast + packaging + proton-core + proton-keyring-linux + proton-vpn-api-core + proton-vpn-local-agent + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + preCheck = '' + # Needed for Permission denied: '/homeless-shelter' + export HOME=$(mktemp -d) + export XDG_RUNTIME_DIR=$(mktemp -d) + ''; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + pytest-asyncio + pytest-cov-stub + ]; + + meta = { + description = "Official ProtonVPN CLI Linux app"; + homepage = "https://github.com/ProtonVPN/proton-vpn-cli"; + license = lib.licenses.gpl3Plus; + mainProgram = "protonvpn"; + maintainers = with lib.maintainers; [ anthonyroussel ]; + }; +} diff --git a/pkgs/by-name/pr/protonvpn-gui/package.nix b/pkgs/by-name/pr/protonvpn-gui/package.nix index fc4b54a9cf62..bc28c29302b9 100644 --- a/pkgs/by-name/pr/protonvpn-gui/package.nix +++ b/pkgs/by-name/pr/protonvpn-gui/package.nix @@ -3,23 +3,23 @@ python3Packages, fetchFromGitHub, gobject-introspection, - wrapGAppsHook3, - libnotify, - withIndicator ? true, libappindicator-gtk3, libayatana-appindicator, + libnotify, + wrapGAppsHook3, + withIndicator ? true, }: python3Packages.buildPythonApplication rec { pname = "protonvpn-gui"; - version = "4.13.0"; + version = "4.13.1"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "proton-vpn-gtk-app"; tag = "v${version}"; - hash = "sha256-1T8gh0aKYiVnkr4SLg2a5Hcc8FQn8llofCXxeZGwd8I="; + hash = "sha256-pfk7ttQp7nWpGWqBWny9VdSktpB7RoBJIcF/pF6gAfA="; }; nativeBuildInputs = [ @@ -49,7 +49,6 @@ python3Packages.buildPythonApplication rec { proton-keyring-linux proton-vpn-api-core proton-vpn-local-agent - proton-vpn-network-manager pycairo pygobject3 ]; @@ -72,10 +71,18 @@ python3Packages.buildPythonApplication rec { preCheck = '' # Needed for Permission denied: '/homeless-shelter' export HOME=$(mktemp -d) + export XDG_RUNTIME_DIR=$(mktemp -d) ''; - # Gets a segmentation fault after the widgets test - doCheck = false; + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + pytest-cov-stub + ]; + + disabledTestPaths = [ + # Segmentation fault during widgets tests + "tests/unit/widgets" + ]; meta = { description = "Proton VPN GTK app for Linux"; @@ -84,6 +91,7 @@ python3Packages.buildPythonApplication rec { platforms = lib.platforms.linux; mainProgram = "protonvpn-app"; maintainers = with lib.maintainers; [ + anthonyroussel sebtm rapiteanu ]; diff --git a/pkgs/by-name/pu/publii/package.nix b/pkgs/by-name/pu/publii/package.nix index 9ac9e5231919..183bfe79102d 100644 --- a/pkgs/by-name/pu/publii/package.nix +++ b/pkgs/by-name/pu/publii/package.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "publii"; - version = "0.47.1"; + version = "0.47.3"; src = fetchurl { url = "https://getpublii.com/download/Publii-${version}.deb"; - hash = "sha256-X2rN/inGAxQWYg8OxTLtGzr4q4vUgCYCz3xuxCyCwkQ="; + hash = "sha256-1LzjnN0gmzE4JJdgTOUQ3n/BATg+B5Lfi0yR94TU+XE="; }; dontConfigure = true; diff --git a/pkgs/by-name/qu/questdb/package.nix b/pkgs/by-name/qu/questdb/package.nix index 897e32a43797..ae3f4be7b4a4 100644 --- a/pkgs/by-name/qu/questdb/package.nix +++ b/pkgs/by-name/qu/questdb/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "questdb"; - version = "9.1.0"; + version = "9.2.2"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz"; - hash = "sha256-bgeNZi0VonO+L9Vww5n6e0ZOLl9MTXnNe2kPLttbw1c="; + hash = "sha256-J+3C4IxM+SMZoSdTvpM8y1lfTtA9IbbvUnyGBWX+GB0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ro/routinator/package.nix b/pkgs/by-name/ro/routinator/package.nix index bfaf7705b3a3..1ba406c73f85 100644 --- a/pkgs/by-name/ro/routinator/package.nix +++ b/pkgs/by-name/ro/routinator/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.14.2"; + version = "0.15.1"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = "routinator"; rev = "v${version}"; - hash = "sha256-itD9d+EqEdJ2bTJEpHxJCFFS8Mpc7AFQ1JgkNQxncV0="; + hash = "sha256-tgDhIM8Dw4k/ocXa3U1xqS/TDmqNbjnNzIyCxEmu294="; }; - cargoHash = "sha256-58EnGouq8iKkgsvyHqARoQ0u4QXjw0m6pv4Am4J9wlU="; + cargoHash = "sha256-XOy8sm6nzmihFYsgLcusoYKwgTvx0qX8o8XWV4EMXZ8="; meta = { description = "RPKI Validator written in Rust"; diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix index 5e7f70f6bea0..d497cd1fb77a 100644 --- a/pkgs/by-name/rq/rqlite/package.nix +++ b/pkgs/by-name/rq/rqlite/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "rqlite"; - version = "9.3.2"; + version = "9.3.5"; src = fetchFromGitHub { owner = "rqlite"; repo = "rqlite"; tag = "v${finalAttrs.version}"; - hash = "sha256-35wW/on76G51/U/9DTyeXKIxPsYZiISIHBDSeUCM/A4="; + hash = "sha256-JYFTFIPtLNbYhv+ITWEm7ZBJrOBHc/wynxy74uouA2c="; }; - vendorHash = "sha256-ieJ5D5CPMPVyPGvMx6suiaj9ah4i1bDzAxHQtRDDYWo="; + vendorHash = "sha256-9KaBRiuNQGTcx8Gc8wPy6bj5d6pFKsLS87nsDwWet0o="; subPackages = [ "cmd/rqlite" diff --git a/pkgs/by-name/sc/scc/package.nix b/pkgs/by-name/sc/scc/package.nix index ba44ba9c6a75..93abfb74d885 100644 --- a/pkgs/by-name/sc/scc/package.nix +++ b/pkgs/by-name/sc/scc/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "scc"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "boyter"; repo = "scc"; rev = "v${version}"; - hash = "sha256-ec3k6NL3zTYvcJo0bR/BqdTu5br4vRZpgrBR6Kj5YxY="; + hash = "sha256-tFhYFHMscK3zfoQlaSxnA0pVuNQC1Xjn9jcZWkEV6XI="; }; vendorHash = null; diff --git a/pkgs/by-name/si/simple-binary-encoding/deps.json b/pkgs/by-name/si/simple-binary-encoding/deps.json index e48a93b279ac..b882d83af494 100644 --- a/pkgs/by-name/si/simple-binary-encoding/deps.json +++ b/pkgs/by-name/si/simple-binary-encoding/deps.json @@ -29,13 +29,13 @@ "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.53.0": { "pom": "sha256-yWBPdJaskfaW5HRY2KLWt91U0MqkNn88GspmphyDcvQ=" }, - "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/9.2.2": { - "pom": "sha256-ZLCuyyPFfukfzPJXx4F8uyxpXQT565nM+9pth/TFlOk=" + "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/9.3.0": { + "pom": "sha256-oJEzavXzZRVs4X+TsMeIcpVihO+eRiGs/t4swphzXWA=" }, - "com/gradleup/shadow#shadow-gradle-plugin/9.2.2": { - "jar": "sha256-rqYDnab2KTcMEKFxcOjz2o1nPhS++FgL0aZc3kSQc9A=", - "module": "sha256-4tXqtRULxjBI6WcI6t6/0XbmOfIsgFFoBVszcQdo3YI=", - "pom": "sha256-bO3IWZV0n5H/XNb8Z3H6PfZ4qlZSIl5uoFjNnXmVjGo=" + "com/gradleup/shadow#shadow-gradle-plugin/9.3.0": { + "jar": "sha256-uFUwX/cSRvyntFSvhyAj1eyMHyrZsbu3AAM5B9upEzs=", + "module": "sha256-jV28n6obCRQ/XZGZxPa2mDQsiFvGcsXnqLCnFP0Qy3s=", + "pom": "sha256-6Vv3tj25yBdlVfoq+DpGhRakOlYUORhM/FOCuakDObQ=" }, "com/squareup/moshi#moshi-kotlin/1.12.0": { "jar": "sha256-HENsB8FZzRrwMrt5NRpIqY5/eBrIB8/4tXEamZtWZt8=", @@ -61,9 +61,13 @@ "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" }, - "commons-io#commons-io/2.20.0": { - "jar": "sha256-35C7oP48tYa38WTnj+j49No/LdXCf6ZF+IgQDMwl3XI=", - "pom": "sha256-vb34EHLBkO6aixgaXFj1vZF6dQ+xOiVt679T9dvTOio=" + "commons-codec#commons-codec/1.20.0": { + "jar": "sha256-avZllfn2p7tYzmZRjWiI1AtUfDZtImLwZnbu4ZUo/2Y=", + "pom": "sha256-r/ZFxYzUGsUYTZds6O443laU2Zq4dk1u5/FPcOrV+Ys=" + }, + "commons-io#commons-io/2.21.0": { + "jar": "sha256-fWQ6Kv6osFi3YqpvuQ5bJW9scpc5+LN4TDNw3cYJ6I0=", + "pom": "sha256-rkd5XnIYA+yP8d7tdL4oqBGgJxO9WjqwrGfCtYy2Nas=" }, "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" @@ -85,8 +89,8 @@ "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=", "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY=" }, - "org/apache/commons#commons-parent/85": { - "pom": "sha256-0Yn/LAAn6Wu2XTHm8iftKvlmFps2rx6XPdW6CJJtx7U=" + "org/apache/commons#commons-parent/91": { + "pom": "sha256-0vi2/UgAtqrxIPWjgibV+dX8bbg3r5ni+bMwZ4aLmHI=" }, "org/apache/groovy#groovy-bom/4.0.27": { "module": "sha256-1sIlTINHuEzahMr3SRShh8Lzd+QoTo2Ls/kBUhgQqos=", @@ -149,9 +153,9 @@ "org/jetbrains/kotlin#kotlin-bom/2.0.21": { "pom": "sha256-1Ufg3iVCLZY+IsepRPO13pQ8akmClbUtv/49KJXNm+g=" }, - "org/jetbrains/kotlin#kotlin-metadata-jvm/2.2.20": { - "jar": "sha256-hSTqyQ9+jg8TZog/LGyCDJO/ph3z12hXyNPoA89nMV0=", - "pom": "sha256-e2qAtqLSZ2oEIvaWg4EyMVQlUfYbMgxochz7nh9ZCdA=" + "org/jetbrains/kotlin#kotlin-metadata-jvm/2.3.0-RC2": { + "jar": "sha256-Wk90LxSQCsjMPsDzRsOD1aSsIcFUz6CDPyem5vZkcbs=", + "pom": "sha256-o/ngkalB7A8LG/SeCS7QBofsNCqEtiGvyNIO+r9Jt64=" }, "org/jetbrains/kotlin#kotlin-reflect/2.0.21": { "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=", @@ -161,9 +165,9 @@ "module": "sha256-b134r2M2AKa5z7D8x2SvPVEZ83Zndne5G2rugWsdMKs=", "pom": "sha256-X0As+413MZW5ZwUBJMnom1+EsXJGThiUkpeJv1xMLyk=" }, - "org/jetbrains/kotlin#kotlin-stdlib-common/2.2.20": { - "module": "sha256-ND2ZRn/LRNPvsSorpwNmTKQ/Oj8m//k8jTGyJoOttX4=", - "pom": "sha256-/Xicsy4kEOzGg7hzn3t1AD0J2jMzDD+KZcJp22svbHU=" + "org/jetbrains/kotlin#kotlin-stdlib-common/2.3.0-RC2": { + "module": "sha256-CYoQLiaK/gAqYFj0bz8+qyTEGuvmYoZFNJfNpHf92Do=", + "pom": "sha256-6aCMqTaPm3QH80XTSBAQomDpIBs7Lio6vCzyp8UORaQ=" }, "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.0.21": { "jar": "sha256-cS9IB2Dt7uSKhDaea+ifarUjdUCLsso74U72Y/cr7jE=", @@ -177,48 +181,48 @@ "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" }, - "org/jetbrains/kotlin#kotlin-stdlib/2.2.20": { - "jar": "sha256-iDbM/9NYX63amQEkSyDUKQHS881YEFjYQ04v+rzzo+c=", - "module": "sha256-yRj1IU0CGnLjdn8nVul9EDpSbgTxQj2jZj79+1hH25U=", - "pom": "sha256-SosIbmQxvPYjY39Ssv8ZLhrbkTg4dC5cDupwqN7kKcQ=" + "org/jetbrains/kotlin#kotlin-stdlib/2.3.0-RC2": { + "jar": "sha256-n+5T/c1vgmUkLAe0l6yoR3yagub8b8mtgB0iDH7+Shw=", + "module": "sha256-vV8M3QDbVud2noR/CLnyKiFd/4xcgaAPpiSxhVhxhjI=", + "pom": "sha256-NhftUo605tFswNHx7nLknBn3/HQl974+zCmHC1GJLKA=" }, "org/junit#junit-bom/5.11.4": { "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" }, - "org/junit#junit-bom/5.13.1": { - "module": "sha256-M8B6uXJHkKblhZugfWkResUwQ5ckVFqBxBeeMnLHXeg=", - "pom": "sha256-+mhFHqgwVy7UP/5R11tqBfel5mWmAqUfSda+AgY6ZfM=" - }, "org/junit#junit-bom/5.13.2": { "module": "sha256-7WfhUiFASsQrXlmBAu33Yt1qlS3JUAHpwMTudKBOgoM=", "pom": "sha256-Q7EQT7P9TvS3KpdR1B4Jwp8AHIvgD/OXIjjcFppzS0k=" }, + "org/junit#junit-bom/5.13.4": { + "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=", + "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI=" + }, "org/mockito#mockito-bom/4.11.0": { "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" }, "org/ow2#ow2/1.5.1": { "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" }, - "org/ow2/asm#asm-commons/9.8": { - "jar": "sha256-MwGhwctMWfzFKSZI2sHXxa7UwPBn376IhzuM3+d0BPQ=", - "pom": "sha256-95PnjwH3A3F9CUcuVs3yEv4piXDIguIRbo5Un7bRQMI=" + "org/ow2/asm#asm-commons/9.9": { + "jar": "sha256-2y9vJhULvnwSZga0oRUYNrzCKh4FpCOzWFaYvs6ZX/g=", + "pom": "sha256-GKXT7xN351RLPKMhDyYTlrmH9gEO9ZHThyra5jEZ7kM=" }, - "org/ow2/asm#asm-tree/9.8": { - "jar": "sha256-FLeIDLfIXu0QHicQQy/D/7gydVMqaolNxMQJXUmtWfE=", - "pom": "sha256-cUnn+qDhkSlvh5ru2SCciULTmPBpjSzKGpxijy4qj3c=" + "org/ow2/asm#asm-tree/9.9": { + "jar": "sha256-QhePN3XJxj+eXhRGdH0ptOyk2RvW515cQ8+jcqR9OMY=", + "pom": "sha256-0BeI7Y5ujiSsr2y0p73MJzNBYlL6oAIylZ4+Lp3xv0Q=" }, - "org/ow2/asm#asm/9.8": { - "jar": "sha256-h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=", - "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o=" + "org/ow2/asm#asm/9.9": { + "jar": "sha256-A9madK0e5ccTNO9nQ39O9P40iMqnyW2GRavHPI4gF9Q=", + "pom": "sha256-z4Ye8edF1XFUr3muFN80DtU0Hl3NAVfO/NLrfxqgXFc=" }, "org/springframework#spring-framework-bom/5.3.39": { "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" }, - "org/vafer#jdependency/2.13": { - "jar": "sha256-FFxghksjansSllUNMaSap1rWEpWBOO4NRxufywu+3T4=", - "pom": "sha256-3Ip1HRudXz2imiihDmKF62+3Q/TW46MleRsZX9B4eXs=" + "org/vafer#jdependency/2.14": { + "jar": "sha256-HT3hIYOiqJada8b/Wtdx3l1W0ISXxdk+FopctxDiy/E=", + "pom": "sha256-yGRf/88P5qu8IVS8i/0Jysbgd2M4Kz6cGLXbmR7IFjk=" } }, "https://repo.maven.apache.org/maven2": { @@ -259,9 +263,9 @@ "jar": "sha256-hNOhUFGEhfgUDqmbiphWVnSWKfZDPJK4DHWzaro7CZs=", "pom": "sha256-FFcIOFAANPwbR8ggXOHJ1rJVwczdLRr9zcv3XomySjM=" }, - "com/puppycrawl/tools#checkstyle/12.1.1": { - "jar": "sha256-bFeVVVOsrx+n0vuZZogE8b37aN6ROLM5nqN/NGlPEOw=", - "pom": "sha256-G7+5ywT3BF9vCW03d7IFICtYfbxgqF1UUKKooJWTXlY=" + "com/puppycrawl/tools#checkstyle/12.3.0": { + "jar": "sha256-508NkrI6Y3/maKxq509vJ0/TwXKBndMKARmBJCyWzck=", + "pom": "sha256-cYR9fcy1WD3YdkX4rjnP/LCarFId3Ifr1edpcDXScrs=" }, "commons-beanutils#commons-beanutils/1.11.0": { "jar": "sha256-nkS6aOyaPyEob6Kou7ADtzXA9pEBu0MUS3n0+KqnRwk=", @@ -323,10 +327,10 @@ "jar": "sha256-jzqSFqU3NnEyKT6su6nfBi6s6PixahhK9Z4uSDnUzUE=", "pom": "sha256-+IDp0dQAyZwYkvWWTl/JIN0d7wViI1m5sFjzK1tCaXU=" }, - "org/agrona#agrona/2.3.2": { - "jar": "sha256-Bfdqmcs6Q8xzVd76x4YWIdRqLhAzTlfAsl3+3xY3xis=", - "module": "sha256-nIL43vXt39VpH7+dK9OhrUQwkHrxGP8WM/F7a7CuA94=", - "pom": "sha256-Y+/XRNcac8io1ZRWB1ddQOT7uXZ4339vJQdQwOYB11o=" + "org/agrona#agrona/2.4.0": { + "jar": "sha256-AIIUN1ouPA+ABpq2Uu09CcEGmKLXPnuvl5U5CbSuw8I=", + "module": "sha256-gQ7KHnA5qlUEUngSIm+W8R8FFfhM8s5d5ay67UdsoFM=", + "pom": "sha256-GL3yrphdlVoRGHqJIoO5AU5KhHzeSJ+Z4ktfeWdValk=" }, "org/antlr#antlr4-master/4.13.2": { "pom": "sha256-Ct2gJmhYc/ZRNgF4v/xEbO7kgzCBc5466dbo8H6NkCo=" @@ -443,10 +447,10 @@ "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" }, - "org/checkerframework#checker-qual/3.51.1": { - "jar": "sha256-FTrv/lbKJPOpuLbG/4E+rOliDM81rfq5HUkWguVs1c4=", - "module": "sha256-sU5zwFoeM/ddSLfYBDH5QqpLIQ/Pc/YKQkXMP91p/yI=", - "pom": "sha256-dQgGzZygmZ5L8vel1lfSNqNrtzYm7mpI8p9VXiB0UVA=" + "org/checkerframework#checker-qual/3.52.1": { + "jar": "sha256-k0ZBoYyEYb9m1+k5srBUvypRjtQYj9fWg2plsDj1Nko=", + "module": "sha256-+K1w2ZdntgVFD9uskX2UAHDuTjATTfrK6igJSPJNKrg=", + "pom": "sha256-4lY9U+Bw0yPAZmljQxhEMVwYWlP1gLzQ+6xI/lCBCjs=" }, "org/codehaus/plexus#plexus-classworlds/2.6.0": { "jar": "sha256-Uvd8XsSfeHycQX6+1dbv2ZIvRKIC8hc3bk+UwNdPNUk=", @@ -479,9 +483,9 @@ "jar": "sha256-V9Cp6ShvgvTqqFESUYaZf4Eb784OIGD/ChWnf1qd2ac=", "pom": "sha256-w2p8E9o6SFKqiBvfnbYLnk0a8UbsKvtTmPltWYP21d0=" }, - "org/json#json/20250517": { - "jar": "sha256-PqYbKgbjHt8ckRNP6RBrDrsWYovhafPbdbx6Kwa0V5Y=", - "pom": "sha256-caH7hqKwVTejz8HIfbQtA279u/x+nDSbY10hrB+odqc=" + "org/json#json/20251224": { + "jar": "sha256-KjQ4+/kpMXTqgr36Neg9i5Zc/mvdwDShrF1gEHF0wgk=", + "pom": "sha256-Rhgi8mN18iB0W41b05kTyUA0rCDqJCvT+K7tetuArYI=" }, "org/jspecify#jspecify/1.0.0": { "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=", @@ -492,10 +496,6 @@ "module": "sha256-3nCsXZGlJlbYiQptI7ngTZm5mxoEAlMN7K1xvzGyc14=", "pom": "sha256-zvgP7IZFT2gGv7DfJGabXG8y4styhTnqhZ9H39ybvBc=" }, - "org/junit#junit-bom/6.0.0": { - "module": "sha256-R98chw1F2mEXtKYNzAYhRmrD332s6I2aL5TXhAYkbkU=", - "pom": "sha256-s9mDL1wRu7aw5ihRuTqinSeMOfsadR63cbRtAEohYhk=" - }, "org/junit#junit-bom/6.0.1": { "module": "sha256-xI2Y9e3P2cVeefrLugEB98G6CIY0ib6EqRYrmaGG0cI=", "pom": "sha256-4xXFzLsIchbc4ErnDDK/F2K+KguKQ++B47p4MXpM1cg=" @@ -535,9 +535,9 @@ "module": "sha256-QGPjXSBE9xraiSUfrtFB8KWvnOwm1uO3znI889Vz29c=", "pom": "sha256-TNsMG5Lxon57UucN6Buik1shlBgC2MqoiOnZ4V+s/ho=" }, - "org/mockito#mockito-core/5.20.0": { - "jar": "sha256-0altJSEo06QkfP2KLnZBLvo8wQOXe+F5M8lCEXok83Q=", - "pom": "sha256-mQPiB1XAxIh6q5xPEAYft/ERUdOp+t2WTp+6QnIm0TU=" + "org/mockito#mockito-core/5.21.0": { + "jar": "sha256-A9sj3nQsvKQqo9YSf9rOVg+sN7A22TGHCAH4TCiL0oY=", + "pom": "sha256-AiGzH5bfAaFYxkU3Gq2BstP1vuD1icoNDC6qbo2gkvM=" }, "org/objenesis#objenesis-parent/3.3": { "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" @@ -566,6 +566,16 @@ "jar": "sha256-k4otCP5UBQ12ELlE2N3DoJNVcQ2ea+CqyDjbwE6aKCU=", "pom": "sha256-tsqj6301vXVu1usKKoGGi408D29CJE/q5BdgrGYwbYc=" }, + "org/slf4j#slf4j-bom/2.0.17": { + "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek=" + }, + "org/slf4j#slf4j-parent/2.0.17": { + "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs=" + }, + "org/slf4j#slf4j-simple/2.0.17": { + "jar": "sha256-3f6lmsB0xtPiSsLDhiLS2WOJXhf3CzjtS9rk14C+aWQ=", + "pom": "sha256-+zDo4vauotKYQnmGd+1FQbmyJVcVwVg1DKLF9ce4ZLA=" + }, "org/sonatype/oss#oss-parent/7": { "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" }, diff --git a/pkgs/by-name/si/simple-binary-encoding/package.nix b/pkgs/by-name/si/simple-binary-encoding/package.nix index 10307587d882..7cb0dfb76ea8 100644 --- a/pkgs/by-name/si/simple-binary-encoding/package.nix +++ b/pkgs/by-name/si/simple-binary-encoding/package.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "simple-binary-encoding"; - version = "1.36.2"; + version = "1.37.0"; src = fetchFromGitHub { owner = "aeron-io"; repo = "simple-binary-encoding"; tag = finalAttrs.version; - hash = "sha256-GQNJI/QZh7EZk06OhDoh4znnEBC4d5pnrQyhHL+HbzA="; + hash = "sha256-vrXs0bZuIToBMDvWT6gp6xp8jcBUslF/6OvJWBnazu0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sn/snitch/package.nix b/pkgs/by-name/sn/snitch/package.nix index 37495236aa28..2dfdc5f6ac95 100644 --- a/pkgs/by-name/sn/snitch/package.nix +++ b/pkgs/by-name/sn/snitch/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "snitch"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "karol-broda"; repo = "snitch"; rev = "v${finalAttrs.version}"; - hash = "sha256-krZf6bx1CZGgwg7cu2f2dzPYFEU4rM/nZjGtkXgGQkM="; + hash = "sha256-V9YoyDAdH/TODVP5nGfOIh0KfsPyZVQg9Mkj7cjy3Xo="; }; vendorHash = "sha256-fX3wOqeOgjH7AuWGxPQxJ+wbhp240CW8tiF4rVUUDzk="; diff --git a/pkgs/by-name/sp/spedread/package.nix b/pkgs/by-name/sp/spedread/package.nix index d3953b306ec0..e0f079ddd27c 100644 --- a/pkgs/by-name/sp/spedread/package.nix +++ b/pkgs/by-name/sp/spedread/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spedread"; - version = "2.5.1"; + version = "2.6.1"; src = fetchFromGitHub { owner = "Darazaki"; repo = "Spedread"; tag = "v${finalAttrs.version}"; - hash = "sha256-0VQdiosYd4HBFM1A9jvtQulvgiRwMoClXAVwLhGh6xU="; + hash = "sha256-xIVPK0T5wrxlNNWHZnxbW62ZZnagTzoe3OLiW0QtLSQ="; }; postPatch = '' diff --git a/pkgs/by-name/sp/spice-gtk/package.nix b/pkgs/by-name/sp/spice-gtk/package.nix index 301162b9c6ab..e3f545627bda 100644 --- a/pkgs/by-name/sp/spice-gtk/package.nix +++ b/pkgs/by-name/sp/spice-gtk/package.nix @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { wayland-protocols ]; - PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; + env.PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; mesonFlags = [ "-Dusb-acl-helper-dir=${placeholder "out"}/bin" diff --git a/pkgs/by-name/sp/spring-boot-cli/package.nix b/pkgs/by-name/sp/spring-boot-cli/package.nix index 79b57f6abd64..6a4351ec796f 100644 --- a/pkgs/by-name/sp/spring-boot-cli/package.nix +++ b/pkgs/by-name/sp/spring-boot-cli/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "spring-boot-cli"; - version = "3.5.6"; + version = "4.0.1"; src = fetchzip { url = "mirror://maven/org/springframework/boot/spring-boot-cli/${finalAttrs.version}/spring-boot-cli-${finalAttrs.version}-bin.zip"; - hash = "sha256-ujG9miirmOfWKB5o4ju0jtYoWu9k0bYRYohFnEpOVRA="; + hash = "sha256-cXpk6WbjAHv8DfEdYpdNPNf01UPBojmtLFSUKBkWj44="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sv/svls/package.nix b/pkgs/by-name/sv/svls/package.nix index 1ab6c70971cc..f1723fde042d 100644 --- a/pkgs/by-name/sv/svls/package.nix +++ b/pkgs/by-name/sv/svls/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "svls"; - version = "0.2.13"; + version = "0.2.14"; src = fetchFromGitHub { owner = "dalance"; repo = "svls"; rev = "v${version}"; - sha256 = "sha256-kxsB7il2KKjxSUoA+e6tSNQHwGGVO4UB/mAfnDPjb0c="; + sha256 = "sha256-dLAlXsvUno6bx67A3knevo0ZRBMNOlWW3CmNfgCgha4="; }; - cargoHash = "sha256-2SOCv8xeaRVlpJrBd9po5KgNY7ZSraw4UNsE0gRTbLs="; + cargoHash = "sha256-7q6VeMjnDE4N35Kk6w4T9Za2VquibuvitGVWTvHvvgs="; meta = { description = "SystemVerilog language server"; diff --git a/pkgs/by-name/ta/tarantool/package.nix b/pkgs/by-name/ta/tarantool/package.nix index 38b5771a3560..de084a5d4425 100644 --- a/pkgs/by-name/ta/tarantool/package.nix +++ b/pkgs/by-name/ta/tarantool/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tarantool"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "tarantool"; repo = "tarantool"; tag = finalAttrs.version; - hash = "sha256-NU+0R07Qrnew7+HeeJu6QnGfktEXFRxSZFwl48vjGZE="; + hash = "sha256-fkAjzAS7LV+bME8FeImg1OXNfNhXTH6qb53TzHz4SFY="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/te/telepresence2/package.nix b/pkgs/by-name/te/telepresence2/package.nix index 0e971c6c038b..28ad0721bddf 100644 --- a/pkgs/by-name/te/telepresence2/package.nix +++ b/pkgs/by-name/te/telepresence2/package.nix @@ -31,13 +31,13 @@ let in buildGoModule rec { pname = "telepresence2"; - version = "2.25.1"; + version = "2.25.2"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - hash = "sha256-Itj+tC5OclTXsRdJ6Rh4xQ1YwMSZTTdcRzpUQrmpC0M="; + hash = "sha256-7QLx+t8Y9r8iO53gtbeK3SOEhYN6NZTWzCe+bhWl3JA="; }; propagatedBuildInputs = [ @@ -51,7 +51,7 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - vendorHash = "sha256-iNvvFl05Q/6uXDSYyAijayXfvObmwh6aDR6XmFQkSHI="; + vendorHash = "sha256-Zroh9/FKG+wm8nX+t+TpJQeT2nFi8UrzxAWnNAaMt8Q="; ldflags = [ "-s" diff --git a/pkgs/by-name/to/touchegg/package.nix b/pkgs/by-name/to/touchegg/package.nix index b4326dfb0f1c..6c1a139026e9 100644 --- a/pkgs/by-name/to/touchegg/package.nix +++ b/pkgs/by-name/to/touchegg/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { libxcb ]); - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + env.PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/tr/trunk-recorder/package.nix b/pkgs/by-name/tr/trunk-recorder/package.nix index 0ee5832d990b..bc7675ed7357 100644 --- a/pkgs/by-name/tr/trunk-recorder/package.nix +++ b/pkgs/by-name/tr/trunk-recorder/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation rec { pname = "trunk-recorder"; - version = "5.0.2"; + version = "5.1.1"; src = fetchFromGitHub { owner = "robotastic"; repo = "trunk-recorder"; rev = "v${version}"; - hash = "sha256-UTowlW2xKJllYlEvfEVQEyjNmFX3oafKJThIYDx7dkc="; + hash = "sha256-2qy6krI5NglkC+bUFfJaEuHIcBoYJrxBRnFs8O0NcZA="; }; cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; diff --git a/pkgs/by-name/un/unison-ucm/package.nix b/pkgs/by-name/un/unison-ucm/package.nix index 67a50d21f5ae..eca7813c0c56 100644 --- a/pkgs/by-name/un/unison-ucm/package.nix +++ b/pkgs/by-name/un/unison-ucm/package.nix @@ -14,25 +14,25 @@ stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - version = "0.5.50"; + version = "1.0.1"; src = { aarch64-darwin = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-arm64.tar.gz"; - hash = "sha256-h0rA7pCHm9DtD7/ZO4XsCscvKh/wq9vWwcM2KeloSqc="; + hash = "sha256-yEV6wQge9LJ9tp2So85Q7DN/8LmmSJ9vgU1lYezdp5o="; }; x86_64-darwin = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos-x64.tar.gz"; - hash = "sha256-FQXzmLvX4Ac4RtObLVRjeMNW2CYowh8Eq87mH2S9+WA="; + hash = "sha256-T1bZ/TQKeyW3m+IIxJkrEEDKJHGEJBHzJDLsH1Cfoag="; }; aarch64-linux = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-arm64.tar.gz"; - hash = "sha256-Cb25GhImYPhfT/VbY4gFFU1PUEj87z1qi0dlkvFiT/8="; + hash = "sha256-NXpKthOeYYqd9ZVbpXQpNf2O4aC/X9R/kSzoNzDTC7c="; }; x86_64-linux = fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux-x64.tar.gz"; - hash = "sha256-XutiYr0x4PT4SVADun8ymJpPgX8a4aEqVhD2EqikRkU="; + hash = "sha256-ovx+ZBR3ZDDb/HJ464lmhro6kd4OK8jbCSbYJgwubhU="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix index bfa1a3a01e25..76959d63576b 100644 --- a/pkgs/by-name/va/valkey/package.nix +++ b/pkgs/by-name/va/valkey/package.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "valkey"; - version = "8.1.4"; + version = "9.0.1"; src = fetchFromGitHub { owner = "valkey-io"; repo = "valkey"; rev = finalAttrs.version; - hash = "sha256-obtmiDobMs/POqYH5XjqpzmjVrEC6gUsTc1rREDJ8tw="; + hash = "sha256-Y0jJIS2DSJWQJK0Uyzyb/WSHTE/uQZefRidf0hRQwNU="; }; patches = lib.optional useSystemJemalloc ./use_system_jemalloc.patch; diff --git a/pkgs/by-name/ve/veryl/package.nix b/pkgs/by-name/ve/veryl/package.nix index 3e8644849033..4c5c7b3f816b 100644 --- a/pkgs/by-name/ve/veryl/package.nix +++ b/pkgs/by-name/ve/veryl/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "veryl"; - version = "0.16.4"; + version = "0.17.1"; src = fetchFromGitHub { owner = "veryl-lang"; repo = "veryl"; rev = "v${version}"; - hash = "sha256-VT6ZYAqUEBkl8D7PMUEtTWkVuGPwFn1SVy1G/MH+3iQ="; + hash = "sha256-emMY1DfqaMHtaYcetFsTk3L8E9MwpJ46PbzK1hTqB3Y="; fetchSubmodules = true; }; - cargoHash = "sha256-7aOJGvWtk7sX1PFTM/wWr0/CnGpR1qQtfbamQUmNc/M="; + cargoHash = "sha256-/G+u2/LOwiWwkRMRQolWJ45eYh2ANONaNLruAgK8jmw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/vi/virt-v2v/package.nix b/pkgs/by-name/vi/virt-v2v/package.nix index e20eba572589..642f5e84b83f 100644 --- a/pkgs/by-name/vi/virt-v2v/package.nix +++ b/pkgs/by-name/vi/virt-v2v/package.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { ln -s "${pkgsCross.mingwW64.rhsrvany}/bin/" $out/share/virt-tools ''; - PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR = "${placeholder "out"}/share/bash-completion/completions"; + env.PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR = "${placeholder "out"}/share/bash-completion/completions"; passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix index 314dfbca2e4e..1dcb521da75d 100644 --- a/pkgs/by-name/vu/vue-language-server/package.nix +++ b/pkgs/by-name/vu/vue-language-server/package.nix @@ -11,19 +11,19 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vue-language-server"; - version = "3.1.5"; + version = "3.2.1"; src = fetchFromGitHub { owner = "vuejs"; repo = "language-tools"; rev = "v${finalAttrs.version}"; - hash = "sha256-cizb5nm1udYssh4EcWEWU22sZJP5so+oiYe8yaPqO98="; + hash = "sha256-0bW8US0pp5capY2KnyQ0HuZQ3xpLSNqAA4YiBwF9ljY="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-urnzAHrhuqw/7UwryNnR/BCMyxbzGXKUx0PQ+oAd27o="; + hash = "sha256-NefWKlxX6HLIxBw0DeVOh0M1BVdncFsqebRNeU0dx4U="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/waffle/package.nix b/pkgs/by-name/wa/waffle/package.nix index 477b92ec59bb..0fb776f8cb27 100644 --- a/pkgs/by-name/wa/waffle/package.nix +++ b/pkgs/by-name/wa/waffle/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { wayland-scanner ]; - PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR = "${placeholder "out"}/share/bash-completion/completions"; + env.PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR = "${placeholder "out"}/share/bash-completion/completions"; postInstall = '' wrapProgram $out/bin/wflinfo \ diff --git a/pkgs/by-name/yo/yosys/package.nix b/pkgs/by-name/yo/yosys/package.nix index 477b3cebdfa4..bd4d637727c6 100644 --- a/pkgs/by-name/yo/yosys/package.nix +++ b/pkgs/by-name/yo/yosys/package.nix @@ -196,6 +196,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/YosysHQ/yosys/releases/tag/v${finalAttrs.version}"; license = lib.licenses.isc; platforms = lib.platforms.all; + mainProgram = "yosys"; maintainers = with lib.maintainers; [ shell thoughtpolice diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix index 28999fcb611a..72c6a1d404e7 100644 --- a/pkgs/desktops/pantheon/services/contractor/default.nix +++ b/pkgs/desktops/pantheon/services/contractor/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { libgee ]; - PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/services"; + env.PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/services"; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 910be8e3417d..1d8184166f84 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -12,6 +12,7 @@ makeWrapper, replaceVars, buildNpmPackage, + nix-update-script, emscripten, }: @@ -21,7 +22,7 @@ in stdenv.mkDerivation rec { pname = "emscripten"; - version = "4.0.21"; + version = "4.0.22"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { name = "emscripten-node-modules-${version}"; inherit pname version src; - npmDepsHash = "sha256-IwiH+GELJzd4rDq31arhiF5miIRLDe7nrVsM7Yg9rTg="; + npmDepsHash = "sha256-2baHlyXdFF7JIY+FxpgHhe5NEqzjHpTSS/NhvM0ARZc="; dontBuild = true; @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - hash = "sha256-8lh7ZpzVnoQXOGE/xJgHSWkYXUDOOprbSGaEkyU+vKE="; + hash = "sha256-tC+7zo5RnIo91SFzzwyU7qHFXf4TDcczf3mO4ObfsVE="; rev = version; }; @@ -71,88 +72,134 @@ stdenv.mkDerivation rec { ]; buildPhase = '' - runHook preBuild + runHook preBuild - patchShebangs . + # Make Python scripts executable so patchShebangs will patch their shebangs + chmod +x *.py tools/*.py - # emscripten 4.0.12 requires LLVM tip-of-tree instead of LLVM 21 - sed -i -e "s/EXPECTED_LLVM_VERSION = 22/EXPECTED_LLVM_VERSION = 21.1/g" tools/shared.py + patchShebangs . - # fixes cmake support - sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py + # emscripten 4.0.12 requires LLVM tip-of-tree instead of LLVM 21 + sed -i -e "s/EXPECTED_LLVM_VERSION = 22/EXPECTED_LLVM_VERSION = 21.1/g" tools/shared.py - sed -i "/^def check_sanity/a\\ return" tools/shared.py + # Verify LLVM version patch was applied (fail when nixpkgs has LLVM 22+) + grep -q "EXPECTED_LLVM_VERSION = 21.1" tools/shared.py || \ + (echo "ERROR: LLVM version patch failed - check if still needed" && exit 1) - echo "EMSCRIPTEN_ROOT = '$out/share/emscripten'" > .emscripten - echo "LLVM_ROOT = '${llvmEnv}/bin'" >> .emscripten - echo "NODE_JS = '${nodejs}/bin/node'" >> .emscripten - echo "JS_ENGINES = [NODE_JS]" >> .emscripten - echo "CLOSURE_COMPILER = ['${closurecompiler}/bin/closure-compiler']" >> .emscripten - echo "JAVA = '${jre}/bin/java'" >> .emscripten - # to make the test(s) below work - # echo "SPIDERMONKEY_ENGINE = []" >> .emscripten - echo "BINARYEN_ROOT = '${binaryen}'" >> .emscripten + # fixes cmake support + sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py - # make emconfigure/emcmake use the correct (wrapped) binaries - sed -i "s|^EMCC =.*|EMCC='$out/bin/emcc'|" tools/shared.py - sed -i "s|^EMXX =.*|EMXX='$out/bin/em++'|" tools/shared.py - sed -i "s|^EMAR =.*|EMAR='$out/bin/emar'|" tools/shared.py - sed -i "s|^EMRANLIB =.*|EMRANLIB='$out/bin/emranlib'|" tools/shared.py + sed -i "/^def check_sanity/a\\ return" tools/shared.py - runHook postBuild + echo "EMSCRIPTEN_ROOT = '$out/share/emscripten'" > .emscripten + echo "LLVM_ROOT = '${llvmEnv}/bin'" >> .emscripten + echo "NODE_JS = '${nodejs}/bin/node'" >> .emscripten + echo "JS_ENGINES = [NODE_JS]" >> .emscripten + echo "CLOSURE_COMPILER = ['${closurecompiler}/bin/closure-compiler']" >> .emscripten + echo "JAVA = '${jre}/bin/java'" >> .emscripten + # to make the test(s) below work + # echo "SPIDERMONKEY_ENGINE = []" >> .emscripten + echo "BINARYEN_ROOT = '${binaryen}'" >> .emscripten + + # make emconfigure/emcmake use the correct (wrapped) binaries + sed -i "s|^EMCC =.*|EMCC='$out/bin/emcc'|" tools/shared.py + sed -i "s|^EMXX =.*|EMXX='$out/bin/em++'|" tools/shared.py + sed -i "s|^EMAR =.*|EMAR='$out/bin/emar'|" tools/shared.py + sed -i "s|^EMRANLIB =.*|EMRANLIB='$out/bin/emranlib'|" tools/shared.py + + # Remove --no-stack-first flag (not in LLVM 21, added in LLVM 22 when --stack-first became default) + # Replace else block with pass to avoid empty block syntax error + sed -i "s/cmd.append('--no-stack-first')/pass/" tools/building.py + + # Verify --no-stack-first was removed (fail if patch is no longer needed) + grep -q "cmd.append('--no-stack-first')" tools/building.py && \ + (echo "ERROR: --no-stack-first patch not needed anymore" && exit 1) || true + + # Fix /tmp symlink issue (macOS: /tmp -> /private/tmp) causing relpath miscalculation + sed -i 's/os\.path\.relpath(source_dir, build_dir)/os.path.relpath(source_dir, os.path.realpath(build_dir))/' tools/system_libs.py + sed -i 's/os\.path\.relpath(src, build_dir)/os.path.relpath(src, os.path.realpath(build_dir))/' tools/system_libs.py + + # Verify the relpath fix was applied + grep -q 'os.path.realpath(build_dir)' tools/system_libs.py || (echo "ERROR: relpath fix not applied" && exit 1) + + # Functional test: verify relpath resolves correctly through symlinks + ${python3}/bin/python3 -c " + import os, tempfile + src = os.path.abspath('tools/system_libs.py') + with tempfile.TemporaryDirectory() as tmpdir: + build_dir_real = os.path.realpath(tmpdir) + relpath = os.path.relpath(src, build_dir_real) + resolved = os.path.normpath(os.path.join(build_dir_real, relpath)) + assert resolved == src, f'relpath test failed: {resolved} != {src}' + print('relpath symlink fix test passed') + " + + runHook postBuild ''; installPhase = '' - runHook preInstall + runHook preInstall - appdir=$out/share/emscripten - mkdir -p $appdir - cp -r . $appdir - chmod -R +w $appdir + appdir=$out/share/emscripten + mkdir -p $appdir + cp -r . $appdir + chmod -R +w $appdir - mkdir -p $appdir/node_modules/.bin - cp -r ${nodeModules}/* $appdir/node_modules - cp -r ${nodeModules}/* $appdir/node_modules/.bin + mkdir -p $appdir/node_modules/.bin + cp -r ${nodeModules}/* $appdir/node_modules + cp -r ${nodeModules}/* $appdir/node_modules/.bin - cp ${./locate_cache.sh} $appdir/locate_cache.sh - chmod +x $appdir/locate_cache.sh + cp ${./locate_cache.sh} $appdir/locate_cache.sh + chmod +x $appdir/locate_cache.sh - export EM_CACHE=$out/share/emscripten/cache + export EM_CACHE=$out/share/emscripten/cache - mkdir -p $out/bin - for b in em++ emcc; do - makeWrapper $appdir/$b $out/bin/$b \ - --set NODE_PATH ${nodeModules} \ - --set EM_EXCLUSIVE_CACHE_ACCESS 1 \ - --set PYTHON ${python3}/bin/python \ - --run "source $appdir/locate_cache.sh" - done - for b in em-config emar embuilder emcmake emconfigure emmake emranlib emrun emscons emsize; do - chmod +x $appdir/$b.py - makeWrapper $appdir/$b.py $out/bin/$b \ - --set NODE_PATH ${nodeModules} \ - --set EM_EXCLUSIVE_CACHE_ACCESS 1 \ - --set PYTHON ${python3}/bin/python \ - --run "source $appdir/locate_cache.sh" - done + mkdir -p $out/bin - # precompile libc (etc.) in all variants: - pushd $TMPDIR - echo 'int __main_argc_argv( int a, int b ) { return 42; }' >test.c - for LTO in -flto ""; do - for BIND in "" "--bind"; do - $out/bin/emcc $LTO $BIND test.c - done - done - popd + # Wrap all tools consistently via their .py entry points + for b in em++ emcc em-config emar embuilder emcmake emconfigure emmake emranlib emrun emscons emsize; do + makeWrapper $appdir/$b.py $out/bin/$b \ + --set NODE_PATH ${nodeModules} \ + --set EM_EXCLUSIVE_CACHE_ACCESS 1 \ + --set PYTHON ${python3}/bin/python \ + --run "source $appdir/locate_cache.sh" + done - export PYTHON=${python3}/bin/python - export NODE_PATH=${nodeModules} - pushd $appdir - ${pythonWithPsutil}/bin/python test/runner.py test_hello_world - popd + # Create extensionless aliases for tools that need them (e.g., file_packager) + for tool in file_packager; do + ln -sf $appdir/tools/$tool.py $appdir/tools/$tool + done - runHook postInstall + # Symlinks for CMake toolchain (expects tools in share/emscripten/) + for tool in emcc em++ em-config emar emranlib emcmake emconfigure; do + ln -sf $out/bin/$tool $appdir/$tool + done + + # precompile libc (etc.) in all variants: + pushd $TMPDIR + echo 'int __main_argc_argv( int a, int b ) { return 42; }' >test.c + for LTO in -flto ""; do + for BIND in "" "--bind"; do + for PTHREAD in "" "-pthread"; do + $out/bin/emcc $LTO $BIND $PTHREAD test.c || true + done + done + done + popd + + export PYTHON=${python3}/bin/python + export NODE_PATH=${nodeModules} + pushd $appdir + ${pythonWithPsutil}/bin/python test/runner.py test_hello_world + popd + + # fail if any .py files still have unpatched shebangs + if grep -l '#!/usr/bin/env' $appdir/*.py $appdir/tools/*.py 2>/dev/null; then + echo "ERROR: unpatched shebangs found in .py files" + exit 1 + fi + + runHook postInstall ''; passthru = { @@ -160,6 +207,12 @@ stdenv.mkDerivation rec { # when building the javascript backend. targetPrefix = "em"; bintools = emscripten; + updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "nodeModules" + ]; + }; }; meta = { diff --git a/pkgs/development/compilers/emscripten/locate_cache.sh b/pkgs/development/compilers/emscripten/locate_cache.sh index e8cab885d1be..1fc97086dae5 100644 --- a/pkgs/development/compilers/emscripten/locate_cache.sh +++ b/pkgs/development/compilers/emscripten/locate_cache.sh @@ -1 +1 @@ -export EM_CACHE=${EM_CACHE:-"/tmp/$(basename $(realpath $(dirname $(which emcc))/..))_cache"} +export EM_CACHE=${EM_CACHE:-"/tmp/$(basename $(realpath $(dirname $(command -v emcc))/..))_cache"} diff --git a/pkgs/development/libraries/gcr/4.nix b/pkgs/development/libraries/gcr/4.nix index d6503937d340..9527d9837cb0 100644 --- a/pkgs/development/libraries/gcr/4.nix +++ b/pkgs/development/libraries/gcr/4.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; # fails 21 out of 603 tests, needs dbus daemon - PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + env.PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; postPatch = '' patchShebangs gcr/fixtures/ diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index d059b30039f6..49f11feb1e48 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 21 out of 603 tests, needs dbus daemon - PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + env.PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; postPatch = '' patchShebangs gcr/fixtures/ diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index 3f2e32519cf4..ab1137530cee 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -55,8 +55,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-python" ]; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; + + env = { + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; + }; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/development/libraries/goocanvas/3.x.nix b/pkgs/development/libraries/goocanvas/3.x.nix index 4844be9c4a3a..4d37b3f307da 100644 --- a/pkgs/development/libraries/goocanvas/3.x.nix +++ b/pkgs/development/libraries/goocanvas/3.x.nix @@ -54,8 +54,10 @@ stdenv.mkDerivation (finalAttrs: { glib ]; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; + env = { + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0"; + }; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/development/libraries/indicator-application/gtk3.nix index 1d84dba554f9..447d01713dda 100644 --- a/pkgs/development/libraries/indicator-application/gtk3.nix +++ b/pkgs/development/libraries/indicator-application/gtk3.nix @@ -59,8 +59,10 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; - PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "$(out)/lib/systemd/user"; - PKG_CONFIG_INDICATOR3_0_4_INDICATORDIR = "$(out)/lib/indicators3/7/"; + env = { + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "$(out)/lib/systemd/user"; + PKG_CONFIG_INDICATOR3_0_4_INDICATORDIR = "$(out)/lib/indicators3/7/"; + }; # Upstart is not used in NixOS postFixup = '' diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 858932958dfd..283e598d6a17 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -82,8 +82,10 @@ stdenv.mkDerivation rec { ]; # Uses define_variable in pkg-config, but we still need it to use the glade output - PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules"; - PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs"; + env = { + PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules"; + PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs"; + }; doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 1ca0882bf493..f1bd6a415c88 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -621,21 +621,21 @@ final: prev: { }: buildLuarocksPackage { pname = "dkjson"; - version = "2.8-1"; + version = "2.8-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/dkjson-2.8-1.rockspec"; - hash = "sha256-arasJeX7yQ2Rg70RyepiGNvLdiyQz8Wn4HXrdTEIBBg="; + url = "mirror://luarocks/dkjson-2.8-2.rockspec"; + sha256 = "0hr4vfmf64kvmqbnr1vx4p6gl3mmiq1hg5jd60rqwplsiaib2r67"; }).outPath; src = fetchurl { - url = "http://dkolf.de/dkjson-lua/dkjson-2.8.tar.gz"; - hash = "sha256-JOjNO+uRwchh63uz+8m9QYu/+a1KpdBHGBYlgjajFTI="; + url = "https://dkolf.de/dkjson-lua/dkjson-2.8.tar.gz"; + sha256 = "0chmlcv8498n313x19aampwvz2s1pp4zpcvvxdhwihcixcxwvs14"; }; - disabled = luaOlder "5.1" || luaAtLeast "5.5"; + disabled = luaOlder "5.1" || luaAtLeast "5.6"; meta = { - homepage = "http://dkolf.de/dkjson-lua/"; + homepage = "https://dkolf.de/dkjson-lua/"; description = "David Kolf's JSON module for Lua"; license.fullName = "MIT/X11"; }; @@ -814,15 +814,15 @@ final: prev: { }: buildLuarocksPackage { pname = "fzf-lua"; - version = "0.0.2384-1"; + version = "0.0.2385-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fzf-lua-0.0.2384-1.rockspec"; - sha256 = "0aqfz3vj3cxvp4f5mb3gnpi8yz9pjcdc9bh7v3f28sakhhz8wnbm"; + url = "mirror://luarocks/fzf-lua-0.0.2385-1.rockspec"; + sha256 = "164z7xpzljfh5p6vhss2yyv5brk1jhj4sa45hsi6j2fd7yxx52si"; }).outPath; src = fetchzip { - url = "https://github.com/ibhagwan/fzf-lua/archive/9d579feab4d3035627150e5e9b6e8fbf5e814ef6.zip"; - sha256 = "1vw1w5l9jvy35vzd32clpxfrf2fdx3a636yvan23y702qy529fg4"; + url = "https://github.com/ibhagwan/fzf-lua/archive/b1d2b0dc146cb9260209da4d7ab754adb0a2653d.zip"; + sha256 = "0j1lqfwnpv82r0hnldk71f9yy1vpy73svq55c646w0lxzhicpwwc"; }; disabled = luaOlder "5.1"; @@ -903,15 +903,15 @@ final: prev: { }: buildLuarocksPackage { pname = "grug-far.nvim"; - version = "1.6.55-1"; + version = "1.6.56-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/grug-far.nvim-1.6.55-1.rockspec"; - sha256 = "0b8yh56saq6ksp031qxkxc8pz8fmm2qzlc1sk6v66v0im9i6wlnc"; + url = "mirror://luarocks/grug-far.nvim-1.6.56-1.rockspec"; + sha256 = "0l3mr5ash7lgz3pd5mdiva479zxbddfjr2n8642h38g9zy6sh49k"; }).outPath; src = fetchzip { - url = "https://github.com/MagicDuck/grug-far.nvim/archive/bc589a1ba340a00ae40bf1436401eac5b1454687.zip"; - sha256 = "0fsg38lmg5x90z0zym5x1vyylsrqxfp6l54s25r9q5sdsciap03m"; + url = "https://github.com/MagicDuck/grug-far.nvim/archive/74eef260e1142264ab994fb9c88e4f420e9486d7.zip"; + sha256 = "0b1k1gr6i0yq2ykf2h1ls3vf4m2liafcj44j9svjxhrr6b267qzc"; }; disabled = luaOlder "5.1"; @@ -5031,8 +5031,8 @@ final: prev: { src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "3d757e586ff0bfc85bdb7b46c9d3d932147a0cde"; - hash = "sha256-PUqDSm6My5vNoPNKE9KQLfASnx3tlUy+EsXn1wdbSO0="; + rev = "4d0f5e0e7f69071e315515c385fab2a4eff07b3d"; + hash = "sha256-qSbdak8RgpwkjfVJdmQzhKNZXfET9D3emT3QxZeU8R8="; }; disabled = lua.luaversion != "5.1"; diff --git a/pkgs/development/python-modules/aiosendspin/default.nix b/pkgs/development/python-modules/aiosendspin/default.nix index f04d7b212dfe..98c8ee6d800c 100644 --- a/pkgs/development/python-modules/aiosendspin/default.nix +++ b/pkgs/development/python-modules/aiosendspin/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "aiosendspin"; - version = "1.1.4"; + version = "1.1.5"; pyproject = true; src = fetchFromGitHub { owner = "Sendspin"; repo = "aiosendspin"; tag = version; - hash = "sha256-/Li8EOH814D/1TiVVNy2khCYJVoLD1mL7pYIuZ7UX6Q="; + hash = "sha256-QHRxY4KAH+mBGLP9S0mIwXLog5qjWQo2HtQ6v1k8pHE="; }; build-system = [ diff --git a/pkgs/development/python-modules/beanhub-extract/default.nix b/pkgs/development/python-modules/beanhub-extract/default.nix index 6030be8ee225..a2670c61b130 100644 --- a/pkgs/development/python-modules/beanhub-extract/default.nix +++ b/pkgs/development/python-modules/beanhub-extract/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "beanhub-extract"; - version = "0.1.6"; + version = "0.1.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "LaunchPlatform"; repo = "beanhub-extract"; tag = version; - hash = "sha256-N4LCMZRPbIzVUPDCW3mAVw6WwpuvxiJmMIoyk8VwXS0="; + hash = "sha256-CpR4NNXr6Ag8dCI+NB+4hvAtFBjKJTNkXMps2E+6L7Q="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 8dca789146b1..cfe65be72471 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -358,13 +358,13 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.42.16"; + version = "1.42.17"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-XG907CF1rlIodWB1pV62AipAaqyrBzdDvsa1Zz4I9r4="; + hash = "sha256-hHVnEH1liqAUPdCQdLupy2RkUyUahvuWxf4Ss7DlBO4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index bc6a6f5620bf..cfb932a22186 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.42.16"; + version = "1.42.17"; pyproject = true; src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-vyXONHTaLc92QUyV3yKoTcD30MzvYWkU1D0XqBMDF/0="; + hash = "sha256-tYr/vJeWSMVwgiMn0DXjWSebXqDVSc6xlL55qtpVKvI="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index 17a567016244..57310f82d8c0 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -104,10 +104,8 @@ buildPythonPackage rec { ] ++ optional-dependencies.all; - pytestFlags = [ "--verbose" ]; - # test flags from .github/workflows/Python.yml - pytestFlagsArray = [ "--verbose" ]; + pytestFlags = [ "--verbose" ]; enabledTestPaths = if stdenv.hostPlatform.isDarwin then [ "tests/fast" ] else [ "tests" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index eb47003dd03f..7d5dcdd27705 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "5.1.2"; + version = "5.2.0"; pyproject = true; src = fetchFromGitHub { owner = "iterative"; repo = "dvc-objects"; tag = version; - hash = "sha256-Lq881EnszwS+o8vaiiVgerdXAcalLT0PIJoW98+rw7w="; + hash = "sha256-COrHD7RtmShdC7YWFc+S3xi/Xxt+Afrj3vaCLfE8t28="; }; postPatch = '' diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index b68f0b136a7b..82a4c2c7ef5f 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "iamdata"; - version = "0.1.202512261"; + version = "0.1.202512271"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${version}"; - hash = "sha256-xwYPF+u37MbIgiirBR0I5Z6vdDttEzuLAA/psP3/1bM="; + hash = "sha256-kOSs5HyJcTip0Tc9VHiRrJQcQ+hEJYSdAqEi5aSfmRA="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix index d60d056ebcab..df9708a08466 100644 --- a/pkgs/development/python-modules/jsonargparse/default.nix +++ b/pkgs/development/python-modules/jsonargparse/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "jsonargparse"; - version = "4.44.0"; + version = "4.45.0"; pyproject = true; src = fetchFromGitHub { owner = "omni-us"; repo = "jsonargparse"; tag = "v${version}"; - hash = "sha256-VcCfoWT54/SGPYBOTLJuyX4507HMqwrZMQbUt0sN0Wg="; + hash = "sha256-bp1oQAVlFSNecE2vOyekfA8ij5Pq2PK0fasTIpoKmqs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix index bb743b6addb3..37c75b631fe8 100644 --- a/pkgs/development/python-modules/langgraph-sdk/default.nix +++ b/pkgs/development/python-modules/langgraph-sdk/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "langgraph-sdk"; - version = "0.3.0"; + version = "0.3.1"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; tag = "sdk==${version}"; - hash = "sha256-64FlCtUz49KKQoz78NYMVaY3Wcy/AE/D7XGQW4gIMMg="; + hash = "sha256-pIQuvOYyjXajPxqoRDHuolxNgaBeSmJvPRskinXkkDo="; }; sourceRoot = "${src.name}/libs/sdk-py"; diff --git a/pkgs/development/python-modules/metaflow/default.nix b/pkgs/development/python-modules/metaflow/default.nix index 721dcca927f8..251c24c6e4c6 100644 --- a/pkgs/development/python-modules/metaflow/default.nix +++ b/pkgs/development/python-modules/metaflow/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "metaflow"; - version = "2.19.14"; + version = "2.19.15"; pyproject = true; src = fetchFromGitHub { owner = "Netflix"; repo = "metaflow"; tag = version; - hash = "sha256-ytZbBnynNhrGRkTTQr5Ovcj0pndJTvLbKlikMn1WOFk="; + hash = "sha256-cVC0rHgRHla93x/2tZA6XBMLfWw6ZmEJvjeq1PhQv6M="; }; build-system = [ diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index bc6403efa911..5bf1d2a82b4d 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -865,8 +865,8 @@ in "sha256-aRL46lVNdGu/D0xioGFn/pVUioEiLm8+5XTgUPHqguo="; mypy-boto3-medialive = - buildMypyBoto3Package "medialive" "1.42.3" - "sha256-lQ/r4bKE8Ku9aakwezdsz1WsqcLewteunGzTkSYsB7M="; + buildMypyBoto3Package "medialive" "1.42.17" + "sha256-39EjSHBl2k1WXzbIMFcy53Io0lqnuutREPeSl5vlFyU="; mypy-boto3-mediapackage = buildMypyBoto3Package "mediapackage" "1.42.3" diff --git a/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/pkgs/development/python-modules/proton-vpn-api-core/default.nix index d0581567acf0..43584ef7e16f 100644 --- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix +++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix @@ -2,35 +2,56 @@ lib, buildPythonPackage, fetchFromGitHub, - cryptography, - fido2, - setuptools, - jinja2, - proton-core, - pynacl, aiohttp, + cryptography, + distro, + fido2, + gobject-introspection, + iproute2, + jinja2, + networkmanager, + proton-core, + proton-vpn-local-agent, + pycairo, + pygobject3, + pynacl, pyopenssl, pytest-asyncio, + pytest-cov-stub, + pytestCheckHook, + pyxdg, requests, sentry-sdk, - pyxdg, - distro, - pytestCheckHook, - pytest-cov-stub, + setuptools, }: buildPythonPackage rec { pname = "proton-vpn-api-core"; - version = "4.13.2"; + version = "4.14.1"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-api-core"; rev = "v${version}"; - hash = "sha256-oFTlN/mi4TACmqbebKirYdqDEYzUejK4SKbKgFWONDo="; + hash = "sha256-xyCjzcSasLGm2DMMViI1wpzcLd0mmaBvIyI1HrtW+Gg="; }; + postPatch = '' + substituteInPlace proton/vpn/backend/networkmanager/killswitch/wireguard/killswitch_connection_handler.py \ + --replace-fail '["/usr/sbin/ip", "route"]' '["${iproute2}/bin/ip", "route"]' + ''; + + nativeBuildInputs = [ + # Needed to recognize the NM namespace + gobject-introspection + ]; + + propagatedBuildInputs = [ + # Needed here for the NM namespace + networkmanager + ]; + build-system = [ setuptools ]; @@ -40,18 +61,27 @@ buildPythonPackage rec { distro fido2 jinja2 - pynacl proton-core - sentry-sdk + proton-vpn-local-agent + pycairo + pygobject3 + pynacl pyxdg + sentry-sdk ]; pythonImportsCheck = [ - "proton.vpn.core" + "proton.vpn.backend.networkmanager.core" + "proton.vpn.backend.networkmanager.killswitch.default" + "proton.vpn.backend.networkmanager.killswitch.wireguard" + "proton.vpn.backend.networkmanager.protocol.openvpn" + "proton.vpn.backend.networkmanager.protocol.wireguard" "proton.vpn.connection" + "proton.vpn.core" "proton.vpn.killswitch.interface" "proton.vpn.logging" "proton.vpn.session" + "proton.vpn.split_tunneling" ]; nativeCheckInputs = [ @@ -63,7 +93,7 @@ buildPythonPackage rec { pytest-cov-stub ]; - # Needed for `pythonImportsCheck`, `preCheck` happens between `pythonImportsCheckPhase` and `pytestCheckPhase`. + # Needed for `pythonImportsCheck`, `postInstall` happens between `pythonImportsCheckPhase` and `pytestCheckPhase`. postInstall = '' # Needed for Permission denied: '/homeless-shelter' export HOME=$(mktemp -d) @@ -88,6 +118,7 @@ buildPythonPackage rec { license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ + anthonyroussel sebtm rapiteanu ]; diff --git a/pkgs/development/python-modules/proton-vpn-daemon/default.nix b/pkgs/development/python-modules/proton-vpn-daemon/default.nix new file mode 100644 index 000000000000..cf33b61f2bcc --- /dev/null +++ b/pkgs/development/python-modules/proton-vpn-daemon/default.nix @@ -0,0 +1,69 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + bcc, + dbus-fast, + packaging, + proton-core, + proton-vpn-api-core, + psutil, + pytest-asyncio, + pytest-cov-stub, + pytestCheckHook, + setuptools, + systemd-python, +}: + +buildPythonPackage rec { + pname = "proton-vpn-daemon"; + version = "0.13.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ProtonVPN"; + repo = "proton-vpn-daemon"; + tag = "v${version}"; + hash = "sha256-0CqMGyaHjMktM3N1MfrELprZQZqJD1w/mFaOJvJApZQ="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + bcc + dbus-fast + packaging + proton-core + proton-vpn-api-core + psutil + systemd-python + ]; + + # Needed for `pythonImportsCheck`, `postBuild` happens between `pythonImportsCheckPhase` and `pytestCheckPhase`. + postBuild = '' + # Needed for Permission denied: '/homeless-shelter' + export HOME=$(mktemp -d) + export XDG_RUNTIME_DIR=$(mktemp -d) + ''; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + pytest-cov-stub + ]; + + pythonImportsCheck = [ + "proton.vpn.daemon" + "proton.vpn.daemon.split_tunneling" + ]; + + meta = { + description = "Daemons for Proton VPN Linux client"; + homepage = "https://github.com/ProtonVPN/proton-vpn-daemon"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ anthonyroussel ]; + }; +} diff --git a/pkgs/development/python-modules/proton-vpn-local-agent/default.nix b/pkgs/development/python-modules/proton-vpn-local-agent/default.nix index 8fcc2f597627..37d9fa67959f 100644 --- a/pkgs/development/python-modules/proton-vpn-local-agent/default.nix +++ b/pkgs/development/python-modules/proton-vpn-local-agent/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ProtonVPN"; - repo = "python-proton-vpn-local-agent"; + repo = "local-agent-rs"; rev = version; hash = "sha256-rk3wi6q0UDuwh5yhLBqdLYsJxVqhlI+Yc7HZsiAU1Y8="; }; @@ -65,10 +65,11 @@ buildPythonPackage rec { meta = { description = "Proton VPN local agent written in Rust with Python bindings"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-local-agent"; + homepage = "https://github.com/ProtonVPN/local-agent-rs"; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ + anthonyroussel sebtm rapiteanu ]; diff --git a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix deleted file mode 100644 index 1a87e16f3265..000000000000 --- a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - gobject-introspection, - apt, - iproute2, - setuptools, - networkmanager, - proton-core, - proton-vpn-api-core, - proton-vpn-local-agent, - pycairo, - pygobject3, - pyxdg, - pytest-asyncio, - pytestCheckHook, - pytest-cov-stub, -}: - -buildPythonPackage rec { - pname = "proton-vpn-network-manager"; - version = "0.13.4"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "python-proton-vpn-network-manager"; - tag = "v${version}"; - hash = "sha256-VMaj85oFxLkloR6hdeRHwVTBl44Mx5WEjOl9FnLf8+w="; - }; - - nativeBuildInputs = [ - # Needed to recognize the NM namespace - gobject-introspection - ]; - - build-system = [ - setuptools - ]; - - dependencies = [ - # Needed here for the NM namespace - networkmanager - proton-core - proton-vpn-api-core - proton-vpn-local-agent - pycairo - pygobject3 - pyxdg - ]; - - postPatch = '' - substituteInPlace proton/vpn/backend/linux/networkmanager/killswitch/wireguard/killswitch_connection_handler.py \ - --replace '/usr/sbin/ip' '${iproute2}/bin/ip' - substituteInPlace proton/vpn/backend/linux/networkmanager/killswitch/wireguard/wgkillswitch.py \ - --replace '/usr/bin/apt' '${apt}/bin/apt' - ''; - - pythonImportsCheck = [ - "proton.vpn.backend.linux.networkmanager" - "proton.vpn.backend.linux.networkmanager.killswitch.default" - "proton.vpn.backend.linux.networkmanager.killswitch.wireguard" - ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-cov-stub - pytest-asyncio - ]; - - # Needed for `pythonImportsCheck`, `preCheck` happens between `pythonImportsCheckPhase` and `pytestCheckPhase`. - preCheck = '' - # Needed for Permission denied: '/homeless-shelter' - export HOME=$(mktemp -d) - export XDG_RUNTIME_DIR=$(mktemp -d) - ''; - - meta = { - description = "Provides the necessary functionality for other ProtonVPN components to interact with NetworkManager"; - homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager"; - license = lib.licenses.gpl3Only; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ - sebtm - rapiteanu - ]; - }; -} diff --git a/pkgs/development/python-modules/sabctools/default.nix b/pkgs/development/python-modules/sabctools/default.nix index d581249d28ec..5588928abfd7 100644 --- a/pkgs/development/python-modules/sabctools/default.nix +++ b/pkgs/development/python-modules/sabctools/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { pname = "sabctools"; - version = "9.1.0"; + version = "9.2.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-i4xplGc85ZuJLvA6oRocHY3sw1UMt7S2bIkwMUDunEk="; + hash = "sha256-fR0kJvT30psxuDYk1SfaeA/bC1HxVIV9KkkEOXe9OvM="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/valkey/default.nix b/pkgs/development/python-modules/valkey/default.nix index 793104f20e05..3ea3640deebf 100644 --- a/pkgs/development/python-modules/valkey/default.nix +++ b/pkgs/development/python-modules/valkey/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, buildPythonPackage, pythonOlder, @@ -40,6 +41,14 @@ buildPythonPackage rec { hash = "sha256-woJYfgLNIVzTYj9q8IjXo+SXhQZkQdB/Ofv5StGy9Rc="; }; + patches = [ + (fetchpatch { + # valkey 9.0 compat + url = "https://github.com/valkey-io/valkey-py/commit/c01505e547f614f278b882a016557b6ed652bb9f.patch"; + hash = "sha256-rvA65inIioqdc+QV4KaaUv1I/TMZUq0TWaFJcJiy8NU="; + }) + ]; + build-system = [ setuptools ]; dependencies = lib.optionals (pythonOlder "3.11") [ async-timeout ]; @@ -92,6 +101,10 @@ buildPythonPackage rec { # OSError: AF_UNIX path too long "test_uds_connect" "test_network_connection_failure" + ] + ++ lib.optionals (pythonOlder "3.13") [ + # multiple disconnects are counted instead of just one + "test_valkey_from_pool" ]; disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/python-modules/xmltojson/default.nix b/pkgs/development/python-modules/xmltojson/default.nix new file mode 100644 index 000000000000..7196b290eb62 --- /dev/null +++ b/pkgs/development/python-modules/xmltojson/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + xmltodict, +}: + +buildPythonPackage rec { + pname = "xmltojson"; + version = "2.0.3"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-aKACInKt9wuPJjkYYXLICOlQLNA8C4UaZeB2BWHHgB0="; + }; + + pythonRelaxDeps = [ "xmltodict" ]; + + build-system = [ poetry-core ]; + + dependencies = [ xmltodict ]; + + pythonImportsCheck = [ "xmltojson" ]; + + # Module has no tests + doCheck = false; + + meta = { + description = "Module and CLI tool to quickly convert xml text or files into json"; + homepage = "https://github.com/shanahanjrs/xmltojson"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 9cddfe24341c..3a675436029a 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -423,12 +423,12 @@ in kanagawa = mkTmuxPlugin { pluginName = "kanagawa"; - version = "0-unstable-2025-02-10"; + version = "0-unstable-2025-12-17"; src = fetchFromGitHub { owner = "Nybkox"; repo = "tmux-kanagawa"; - rev = "5440b9476627bf5f7f3526156a17ae0e3fd232dd"; - hash = "sha256-sFL9/PMdPJxN7tgpc4YbUHW4PkCXlKmY7a7gi7PLcn8="; + rev = "10a59af0a50aacf7e68e6757fb42e94d1804246e"; + hash = "sha256-ldc++p2PcYdzoOLrd4PGSrueAGNWncdbc5k6wmFM9kQ="; }; meta = { homepage = "https://github.com/Nybkox/tmux-kanagawa"; diff --git a/pkgs/servers/home-assistant/build-custom-component/default.nix b/pkgs/servers/home-assistant/build-custom-component/default.nix index 8d249bfa199c..9e58ee95ee31 100644 --- a/pkgs/servers/home-assistant/build-custom-component/default.nix +++ b/pkgs/servers/home-assistant/build-custom-component/default.nix @@ -62,7 +62,7 @@ home-assistant.python.pkgs.buildPythonPackage ( } // removeAttrs args [ "meta" - "nativeCheckInputs" + "nativeBuildInputs" "passthru" ] ) diff --git a/pkgs/servers/home-assistant/custom-components/dwd/package.nix b/pkgs/servers/home-assistant/custom-components/dwd/package.nix index 01eaea2a9a6b..91d05c751c7b 100644 --- a/pkgs/servers/home-assistant/custom-components/dwd/package.nix +++ b/pkgs/servers/home-assistant/custom-components/dwd/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "hg1337"; domain = "dwd"; - version = "2025.5.0"; + version = "2025.12.1"; src = fetchFromGitHub { owner = "hg1337"; repo = "homeassistant-dwd"; rev = version; - hash = "sha256-CuoHVgk4jWDEe3OkzFCok8YqVkWLJF6Rl7i/SDeSU50="; + hash = "sha256-hhuSVHa0HgIPGXH9LJg5r0OTRrlY5fX1Ec+C8ZeNiPM="; }; dependencies = [ defusedxml ]; diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix index 87e5b2804008..736df6d7eec8 100644 --- a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix +++ b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix @@ -14,13 +14,13 @@ buildHomeAssistantComponent rec { owner = "marcolivierarsenault"; domain = "moonraker"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "marcolivierarsenault"; repo = "moonraker-home-assistant"; tag = version; - hash = "sha256-3qxTigKBZ7maUylx0NCf70tURNUWFpo2TzgxnxqjUpA="; + hash = "sha256-T/7A5LmDmqaThTa1TnDbXwA0qeipIk750+k1Kt7tFeY="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-components/mypyllant/migrate-to-new-pytest-homeassistant-custom-component.patch b/pkgs/servers/home-assistant/custom-components/mypyllant/migrate-to-new-pytest-homeassistant-custom-component.patch new file mode 100644 index 000000000000..34bf35a26129 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/mypyllant/migrate-to-new-pytest-homeassistant-custom-component.patch @@ -0,0 +1,21 @@ +diff --git a/tests/test_services.py b/tests/test_services.py +index 1fb07b3..f7a552c 100644 +--- a/tests/test_services.py ++++ b/tests/test_services.py +@@ -3,6 +3,7 @@ from dataclasses import asdict + + import pytest + from homeassistant.helpers.entity_registry import DATA_REGISTRY, EntityRegistry ++from homeassistant.helpers.trigger import TRIGGERS, TRIGGER_PLATFORM_SUBSCRIPTIONS + from homeassistant.loader import ( + DATA_COMPONENTS, + DATA_INTEGRATIONS, +@@ -31,6 +32,8 @@ def setup_hass_for_service_test(hass): + hass.data[DATA_PRELOAD_PLATFORMS] = {} + hass.data[DATA_MISSING_PLATFORMS] = {} + hass.data[DATA_REGISTRY] = EntityRegistry(hass) ++ hass.data[TRIGGER_PLATFORM_SUBSCRIPTIONS] = [] ++ hass.data[TRIGGERS] = {} + return hass + + diff --git a/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix b/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix index e16c0fb998c8..4d2d6a607474 100644 --- a/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix +++ b/pkgs/servers/home-assistant/custom-components/mypyllant/package.nix @@ -1,6 +1,7 @@ { buildHomeAssistantComponent, fetchFromGitHub, + fetchpatch2, lib, # dependencies @@ -28,6 +29,11 @@ buildHomeAssistantComponent rec { hash = "sha256-6T8SGAP2535VqZmvSeITpMIa0SBJhnWsOKM1Y66WhHE="; }; + patches = [ + # Migrates tests to the new version of `pytest-homeassistant-custom-component` (see https://github.com/signalkraft/mypyllant-component/pull/394). + ./migrate-to-new-pytest-homeassistant-custom-component.patch + ]; + dependencies = [ mypyllant voluptuous diff --git a/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix b/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix index f70df37c19b1..909e5c4e1129 100644 --- a/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix +++ b/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix @@ -13,13 +13,13 @@ buildHomeAssistantComponent rec { owner = "amitfin"; domain = "oref_alert"; - version = "4.2.1"; + version = "4.1.1"; src = fetchFromGitHub { owner = "amitfin"; repo = "oref_alert"; tag = "v${version}"; - hash = "sha256-mE39/f/2SmEJ5rTHhwmgGdQga4PQPGxoj/iKA1+Ou5k="; + hash = "sha256-nWp8cG0lFYUEO11lcZGkqx5QvOSfSVnqIqpHA8YAN30="; }; dependencies = [ diff --git a/pkgs/servers/nosql/mongodb/7.0.nix b/pkgs/servers/nosql/mongodb/7.0.nix index e1185c9165c1..5cdd476155a5 100644 --- a/pkgs/servers/nosql/mongodb/7.0.nix +++ b/pkgs/servers/nosql/mongodb/7.0.nix @@ -21,8 +21,8 @@ let in buildMongoDB { inherit avxSupport; - version = "7.0.26"; - sha256 = "sha256-731rmMz5C2cmOVKRWmT439uiRUW3kWQCz2/l/Ffk9zI="; + version = "7.0.28"; + hash = "sha256-28IouDQ+uzRoUm+PvESFkX1oz0dbFURd7JMsI7orYsc="; patches = [ # ModuleNotFoundError: No module named 'mongo_tooling_metrics': # NameError: name 'SConsToolingMetrics' is not defined: diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index ca90935250ff..84a4a0f5e7bb 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -16,6 +16,7 @@ curl, cctools, xz, + versionCheckHook, }: # Note: @@ -24,7 +25,7 @@ { version, - sha256, + hash, patches ? [ ], license ? lib.licenses.sspl, avxSupport ? stdenv.hostPlatform.avxSupport, @@ -60,15 +61,15 @@ let inherit (lib) systems subtractLists; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { inherit version passthru; pname = "mongodb"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo"; - rev = "r${version}"; - inherit sha256; + tag = "r${finalAttrs.version}"; + inherit hash; }; nativeBuildInputs = [ @@ -87,13 +88,13 @@ stdenv.mkDerivation rec { openldap sasl snappy + xz zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ] - ++ lib.optional stdenv.hostPlatform.isLinux net-snmp - ++ [ xz ]; + ++ lib.optional stdenv.hostPlatform.isLinux net-snmp; # MongoDB keeps track of its build parameters, which tricks nix into # keeping dependencies to build inputs in the final output. @@ -103,14 +104,14 @@ stdenv.mkDerivation rec { postPatch = '' # fix environment variable reading substituteInPlace SConstruct \ - --replace "env = Environment(" "env = Environment(ENV = os.environ," + --replace-fail "env = Environment(" "env = Environment(ENV = os.environ," '' + '' # Fix debug gcc 11 and clang 12 builds on Fedora # https://github.com/mongodb/mongo/commit/e78b2bf6eaa0c43bd76dbb841add167b443d2bb0.patch - substituteInPlace src/mongo/db/query/plan_summary_stats.h --replace '#include ' '#include + substituteInPlace src/mongo/db/query/plan_summary_stats.h --replace-fail '#include ' '#include #include ' - substituteInPlace src/mongo/db/exec/plan_stats.h --replace '#include ' '#include + substituteInPlace src/mongo/db/exec/plan_stats.h --replace-fail '#include ' '#include #include ' '' + lib.optionalString (!avxSupport) '' @@ -130,7 +131,7 @@ stdenv.mkDerivation rec { "--disable-warnings-as-errors" "VARIANT_DIR=nixos" # Needed so we don't produce argument lists that are too long for gcc / ld "--link-model=static" - "MONGO_VERSION=${version}" + "MONGO_VERSION=${finalAttrs.version}" ] ++ map (lib: "--use-system-${lib}") system-libraries; @@ -157,11 +158,9 @@ stdenv.mkDerivation rec { ''; doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - "$out/bin/mongo" --version - runHook postInstallCheck - ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/mongo"; + versionCheckProgramArg = "--version"; installTargets = "install-devcore"; @@ -179,4 +178,4 @@ stdenv.mkDerivation rec { ]; platforms = subtractLists systems.doubles.i686 systems.doubles.unix; }; -} +}) diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 6e5eb4c06682..aa8cdeb74f26 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -14,15 +14,15 @@ DarwinTools, # For building on Darwin }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "plan9port"; - version = "2025-01-29"; + version = "0-unstable-2025-11-10"; src = fetchFromGitHub { owner = "9fans"; - repo = pname; - rev = "a5d6857a3b912b43c88ef298c28d13d4623f9ef0"; - sha256 = "0c23z56zygrsyr96ml7907mpfgx80vnsy99nqr3nmfw1a045mjgv"; + repo = "plan9port"; + rev = "f39a2407b6e6ace6af68e466bfa2f362b9a9dd36"; + hash = "sha256-YvrwUC+aMqp/Kvvfd7HGvYkbP8Dm/Z5/SVH4gG9BdRA="; }; postPatch = '' diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index be6ca0522108..95632aef9c9f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1362,8 +1362,8 @@ mapAliases { proton-caller = throw "'proton-caller' has been removed from nixpkgs due to being unmaintained and lack of upstream maintenance."; # Added 2025-09-25 proton-vpn-local-agent = throw "'proton-vpn-local-agent' has been renamed to 'python3Packages.proton-vpn-local-agent'"; # Converted to throw 2025-10-26 protonup = throw "'protonup' has been renamed to/replaced by 'protonup-ng'"; # Converted to throw 2025-10-27 - protonvpn-cli = throw "protonvpn-cli source code was removed from upstream. Use protonvpn-gui instead."; # Added 2025-10-16 - protonvpn-cli_2 = throw "protonvpn-cli_2 has been removed due to being deprecated. Use protonvpn-gui instead."; # Added 2025-10-16 + protonvpn-cli = throw "protonvpn-cli source code was removed from upstream. Use proton-vpn-cli instead."; # Added 2025-10-16 + protonvpn-cli_2 = throw "protonvpn-cli_2 has been removed due to being deprecated. Use proton-vpn-cli instead."; # Added 2025-10-16 proxmark3-rrg = throw "'proxmark3-rrg' has been renamed to/replaced by 'proxmark3'"; # Converted to throw 2025-10-27 pscid = throw "'pscid' has been removed because it was unmaintained upstream"; # Added 2025-12-12 pulp = throw "'pulp' has been removed because it was unmaintained upstream"; # Added 2025-12-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f0e90ef0f72..2d734cf3dac2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1151,13 +1151,18 @@ with pkgs; # Git with SVN support, but without GUI. gitSVN = lowPrio (git.override { svnSupport = true; }); - git-doc = lib.addMetaAttrs { - description = "Additional documentation for Git"; - longDescription = '' - This package contains additional documentation (HTML and text files) that - is referenced in the man pages of Git. - ''; - } gitFull.doc; + git-doc = + # doc attribute is not present at least for pkgsLLVM + if (gitFull ? doc) then + lib.addMetaAttrs { + description = "Additional documentation for Git"; + longDescription = '' + This package contains additional documentation (HTML and text files) that + is referenced in the man pages of Git. + ''; + } gitFull.doc + else + throw "'git-doc' can't be evaluated as 'gitFull' does not expose 'doc' attribute"; gitMinimal = git.override { withManual = false; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0cd39d20a1c0..ae95908fe400 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6436,7 +6436,9 @@ self: super: with self; { gower = callPackage ../development/python-modules/gower { }; - gpaw = callPackage ../development/python-modules/gpaw { }; + gpaw = callPackage ../development/python-modules/gpaw { + inherit (pkgs) libxc; + }; gpgme = callPackage ../development/python-modules/gpgme { inherit (pkgs) gpgme; }; @@ -12599,11 +12601,9 @@ self: super: with self; { proton-vpn-api-core = callPackage ../development/python-modules/proton-vpn-api-core { }; - proton-vpn-local-agent = callPackage ../development/python-modules/proton-vpn-local-agent { }; + proton-vpn-daemon = callPackage ../development/python-modules/proton-vpn-daemon { }; - proton-vpn-network-manager = - callPackage ../development/python-modules/proton-vpn-network-manager - { }; + proton-vpn-local-agent = callPackage ../development/python-modules/proton-vpn-local-agent { }; protonup-ng = callPackage ../development/python-modules/protonup-ng { }; @@ -14506,7 +14506,9 @@ self: super: with self; { pyscard = callPackage ../development/python-modules/pyscard { }; - pyscf = callPackage ../development/python-modules/pyscf { }; + pyscf = callPackage ../development/python-modules/pyscf { + inherit (pkgs) libxc; + }; pyschedule = callPackage ../development/python-modules/pyschedule { }; @@ -20815,6 +20817,8 @@ self: super: with self; { xmltodict = callPackage ../development/python-modules/xmltodict { }; + xmltojson = callPackage ../development/python-modules/xmltojson { }; + xmod = callPackage ../development/python-modules/xmod { }; xmodem = callPackage ../development/python-modules/xmodem { };