diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix index 74af2d68abe6..4ea169118542 100644 --- a/doc/doc-support/package.nix +++ b/doc/doc-support/package.nix @@ -54,7 +54,8 @@ stdenvNoCC.mkDerivation ( }; in { - name = "nixpkgs-manual"; + inherit (lib.trivial) version; + pname = "nixpkgs-manual"; nativeBuildInputs = [ nixos-render-docs ]; diff --git a/doc/packages/eclipse.section.md b/doc/packages/eclipse.section.md index 8f047f443151..272bfae4dc83 100644 --- a/doc/packages/eclipse.section.md +++ b/doc/packages/eclipse.section.md @@ -32,7 +32,7 @@ to your Nixpkgs configuration (`~/.config/nixpkgs/config.nix`) and install it by $ nix-env -f '' -qaP -A eclipses.plugins --description ``` -If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the `buildEclipseUpdateSite` and `buildEclipsePlugin` functions found in the `nixpkgs.eclipses.plugins` attribute set. Use the `buildEclipseUpdateSite` function to install a plugin distributed as an Eclipse update site. This function takes `{ name, src }` as argument, where `src` indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available, then the `buildEclipsePlugin` function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes an argument `{ name, srcFeature, srcPlugin }` where `srcFeature` and `srcPlugin` are the feature and plugin JARs, respectively. +If there is a need to install plugins that are not available in Nixpkgs then it may be possible to define these plugins outside Nixpkgs using the `buildEclipseUpdateSite` and `buildEclipsePlugin` functions found in the `nixpkgs.eclipses.plugins` attribute set. Use the `buildEclipseUpdateSite` function to install a plugin distributed as an Eclipse update site. This function takes `{ src }` and either `pname` or `name` + `version` as arguments, where `src` indicates the Eclipse update site archive. All Eclipse features and plugins within the downloaded update site will be installed. When an update site archive is not available, then the `buildEclipsePlugin` function can be used to install a plugin that consists of a pair of feature and plugin JARs. This function takes `{ srcFeature, srcPlugin }` and either `pname` or `name` + `version` as arguments, where `srcFeature` and `srcPlugin` are the feature and plugin JARs, respectively. Expanding the previous example with two plugins using the above functions, we have: @@ -47,7 +47,8 @@ Expanding the previous example with two plugins using the above functions, we ha plugins = [ plugins.color-theme (plugins.buildEclipsePlugin { - name = "myplugin1-1.0"; + pname = "myplugin1"; + version = "1.0"; srcFeature = fetchurl { url = "http://…/features/myplugin1.jar"; hash = "sha256-123…"; @@ -58,7 +59,8 @@ Expanding the previous example with two plugins using the above functions, we ha }; }) (plugins.buildEclipseUpdateSite { - name = "myplugin2-1.0"; + pname = "myplugin2"; + version = "1.0"; src = fetchurl { stripRoot = false; url = "http://…/myplugin2.zip"; diff --git a/lib/fileset/default.nix b/lib/fileset/default.nix index 8cbc886fb4f6..60b5913a6e86 100644 --- a/lib/fileset/default.nix +++ b/lib/fileset/default.nix @@ -862,7 +862,7 @@ in # but removing a subdirectory using file set functions difference (fromSource (lib.sources.sourceByRegex ./. [ - "^README\.md$" + "^README\\.md$" # This regex includes everything in ./doc "^doc(/.*)?$" ]) diff --git a/lib/sources.nix b/lib/sources.nix index c99f2c265086..88943a9fec94 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -200,7 +200,7 @@ let ## `sourceByRegex` usage example ```nix - src = sourceByRegex ./my-subproject [".*\.py$" "^database.sql$"] + src = sourceByRegex ./my-subproject [".*\\.py$" "^database\\.sql$"] ``` ::: diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 69bc87068a8b..8c4f2c636e3e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1403,14 +1403,6 @@ githubId = 60479013; name = "Alma Cemerlic"; }; - alois31 = { - name = "Alois Wohlschlager"; - email = "alois1@gmx-topmail.de"; - matrix = "@aloisw:kde.org"; - github = "alois31"; - githubId = 36605164; - keys = [ { fingerprint = "CA97 A822 FF24 25D4 74AF 3E4B E0F5 9EA5 E521 6914"; } ]; - }; Alper-Celik = { email = "alper@alper-celik.dev"; name = "Alper Çelik"; @@ -1755,12 +1747,6 @@ matrix = "@andrew:kvalhe.im"; name = "Andrew Kvalheim"; }; - andrewrk = { - email = "superjoe30@gmail.com"; - github = "andrewrk"; - githubId = 106511; - name = "Andrew Kelley"; - }; andrewzah = { name = "Andrew Zah"; github = "andrewzah"; @@ -12790,7 +12776,7 @@ email = "jokatzke@fastmail.com"; github = "jokatzke"; githubId = 46931073; - name = "Jonas Katzke"; + name = "Josefine Katzke"; }; joko = { email = "ioannis.koutras@gmail.com"; @@ -13850,12 +13836,6 @@ githubId = 20063; name = "Pascal Hertleif"; }; - kiloreux = { - email = "kiloreux@gmail.com"; - github = "kiloreux"; - githubId = 6282557; - name = "Kiloreux Emperex"; - }; kim0 = { email = "email.ahmedkamal@googlemail.com"; github = "kim0"; @@ -27065,6 +27045,12 @@ githubId = 67477750; name = "Tomkoid"; }; + TomMD = { + name = "Thomas M. DuBuisson"; + email = "thomas.dubuisson@gmail.com"; + github = "TomMD"; + githubId = 137806; + }; Tommimon = { name = "Tommaso Montanari"; email = "sefymw7q8@mozmail.com"; @@ -27091,6 +27077,12 @@ githubId = 27378358; name = "tony"; }; + tonybutt = { + email = "anthony@abutt.io"; + github = "tonybutt"; + githubId = 38566841; + name = "Anthony Butt"; + }; toonn = { email = "nixpkgs@toonn.io"; matrix = "@toonn:matrix.org"; @@ -27993,8 +27985,9 @@ }; vinetos = { name = "vinetos"; - email = "vinetosdev@gmail.com"; + email = "contact+git@vinetos.fr"; github = "vinetos"; + matrix = "@vinetos:matrix.org"; githubId = 10145351; }; vinnymeller = { diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index f60294950f01..f2b8e1dd7b7d 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -386,7 +386,6 @@ with lib.maintainers; members = [ leona theCapypara - thiagokokada jamesward ]; shortName = "Jetbrains"; diff --git a/nixos/modules/config/qt.nix b/nixos/modules/config/qt.nix index 187f4679bd68..7b2f0f8332f5 100644 --- a/nixos/modules/config/qt.nix +++ b/nixos/modules/config/qt.nix @@ -74,7 +74,6 @@ in { meta.maintainers = with lib.maintainers; [ romildo - thiagokokada ]; imports = [ diff --git a/nixos/modules/services/hardware/tuxedo-rs.nix b/nixos/modules/services/hardware/tuxedo-rs.nix index aa292f305151..7fd96d7705ef 100644 --- a/nixos/modules/services/hardware/tuxedo-rs.nix +++ b/nixos/modules/services/hardware/tuxedo-rs.nix @@ -49,5 +49,7 @@ in ] ); - meta.maintainers = with lib.maintainers; [ mrcjkb ]; + meta.maintainers = with lib.maintainers; [ + xaverdh + ]; } diff --git a/nixos/modules/services/networking/acme-dns.nix b/nixos/modules/services/networking/acme-dns.nix index 665f0bd8fd92..ed61fee0e672 100644 --- a/nixos/modules/services/networking/acme-dns.nix +++ b/nixos/modules/services/networking/acme-dns.nix @@ -95,11 +95,11 @@ in database = { engine = mkOption { type = types.enum [ - "sqlite3" + "sqlite" "postgres" ]; description = "Database engine to use."; - default = "sqlite3"; + default = "sqlite"; }; connection = mkOption { type = types.str; diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 6afb23bd421c..2c59d224176e 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -573,7 +573,7 @@ in "${cfg.package.util-linux}/bin/sulogin" # Resolving sysroot symlinks without code exec - "${config.system.nixos-init.package}/bin/chroot-realpath" + "${config.system.nixos-init.package}/bin/resolve-in-root" # Find the etc paths "${config.system.nixos-init.package}/bin/find-etc" ] @@ -664,7 +664,7 @@ in # Resolve symlinks in the init parameter. We need this for some boot loaders # (e.g. boot.loader.generationsDir). - closure="$(chroot-realpath /sysroot "$closure")" + closure="$(resolve-in-root /sysroot "$closure")" # Assume the directory containing the init script is the closure. closure="$(dirname "$closure")" diff --git a/nixos/tests/kmscon.nix b/nixos/tests/kmscon.nix index 28f2cdd1c3d3..cb20274c6ece 100644 --- a/nixos/tests/kmscon.nix +++ b/nixos/tests/kmscon.nix @@ -33,12 +33,18 @@ with subtest("ensure we can open a tty"): machine.wait_for_text("machine login:") + machine.send_chars("alice\n") machine.wait_for_text("Password:") + machine.send_chars("foobar\n") machine.wait_for_text("alice@machine") - machine.send_chars("echo $TERM\n") - machine.wait_for_text("xterm-256color") + + machine.send_chars("echo $TERM | tee /tmp/term.txt\n") + machine.wait_until_succeeds("test -s /tmp/term.txt") + term = machine.succeed("cat /tmp/term.txt").strip() + assert term == "xterm-256color", f"Unexpected TERM value: {term!r}" + machine.screenshot("tty.png") ''; } diff --git a/nixos/tests/replace-dependencies/default.nix b/nixos/tests/replace-dependencies/default.nix index ce0013a868c7..7eb038193f51 100644 --- a/nixos/tests/replace-dependencies/default.nix +++ b/nixos/tests/replace-dependencies/default.nix @@ -2,7 +2,7 @@ import ../make-test-python.nix ( { pkgs, ... }: { name = "replace-dependencies"; - meta.maintainers = with pkgs.lib.maintainers; [ alois31 ]; + meta.maintainers = [ ]; nodes.machine = { ... }: diff --git a/pkgs/applications/audio/midas/generic.nix b/pkgs/applications/audio/midas/generic.nix index f6da31796192..b21ab315a178 100644 --- a/pkgs/applications/audio/midas/generic.nix +++ b/pkgs/applications/audio/midas/generic.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { vmTools.debClosureGenerator { name = "x32edit-dependencies"; inherit (distro) urlPrefix; - packagesLists = [ distro.packagesList ]; + packagesLists = [ distro.packagesLists ]; packages = [ "libstdc++6" "libcurl4" diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index c14e4a52ff95..fef09c0a3ca6 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -13,7 +13,7 @@ rec { # to be used when building more advanced builders. buildEclipsePluginBase = { - name, + name ? "eclipse-plugin-${attrs.pname}-${attrs.version}", buildInputs ? [ ], passthru ? { }, ... @@ -21,7 +21,7 @@ rec { stdenv.mkDerivation ( attrs // { - name = "eclipse-plugin-" + name; + inherit name; buildInputs = buildInputs ++ [ unzip ]; @@ -36,7 +36,7 @@ rec { # plugin JARs. buildEclipsePlugin = { - name, + name ? "eclipse-plugin-${attrs.pname}-${attrs.version}", srcFeature, srcPlugin ? null, srcPlugins ? [ ], @@ -75,7 +75,10 @@ rec { # `features` and `plugins`. All features and plugins inside these # directories will be installed. buildEclipseUpdateSite = - { name, ... }@attrs: + { + name ? "eclipse-plugin-${attrs.pname}-${attrs.version}", + ... + }@attrs: buildEclipsePluginBase ( attrs // { @@ -119,7 +122,7 @@ rec { ); acejump = buildEclipsePlugin rec { - name = "acejump-${version}"; + pname = "acejump"; version = "1.0.0.201610261941"; srcFeature = fetchurl { @@ -142,7 +145,7 @@ rec { }; ansi-econsole = buildEclipsePlugin rec { - name = "ansi-econsole-${version}"; + pname = "ansi-econsole"; version = "1.3.5.201612301822"; srcFeature = fetchurl { @@ -165,17 +168,18 @@ rec { }; antlr-runtime_4_5 = buildEclipsePluginBase rec { - name = "antlr-runtime-4.5.3"; + pname = "antlr-runtime"; + version = "4.5.3"; src = fetchurl { - url = "https://www.antlr.org/download/${name}.jar"; + url = "https://www.antlr.org/download/${pname}-${version}.jar"; sha256 = "0lm78i2annlczlc2cg5xvby0g1dyl0sh1y5xc2pymjlmr67a1g4k"; }; buildCommand = '' dropinDir="$out/eclipse/dropins/" mkdir -p $dropinDir - cp -v $src $dropinDir/${name}.jar + cp -v $src $dropinDir/${pname}-${version}.jar ''; meta = { @@ -188,17 +192,18 @@ rec { }; antlr-runtime_4_7 = buildEclipsePluginBase rec { - name = "antlr-runtime-4.7.1"; + pname = "antlr-runtime"; + version = "4.7.1"; src = fetchurl { - url = "https://www.antlr.org/download/${name}.jar"; + url = "https://www.antlr.org/download/${pname}-${version}.jar"; sha256 = "07f91mjclacrvkl8a307w2abq5wcqp0gcsnh0jg90ddfpqcnsla3"; }; buildCommand = '' dropinDir="$out/eclipse/dropins/" mkdir -p $dropinDir - cp -v $src $dropinDir/${name}.jar + cp -v $src $dropinDir/${pname}-${version}.jar ''; meta = { @@ -211,7 +216,7 @@ rec { }; anyedittools = buildEclipsePlugin rec { - name = "anyedit-${version}"; + pname = "anyedit"; version = "2.7.3.202502241151"; srcFeature = fetchurl { @@ -234,7 +239,7 @@ rec { }; autodetect-encoding = buildEclipsePlugin rec { - name = "autodetect-encoding-${version}"; + pname = "autodetect-encoding"; version = "1.8.5.201801191359"; srcFeature = fetchurl { @@ -257,13 +262,13 @@ rec { }; cdt = buildEclipseUpdateSite rec { - name = "cdt-${version}"; + pname = "cdt"; # find current version at https://github.com/eclipse-cdt/cdt/releases version = "11.4.0"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${pname}-${version}/${pname}-${version}.zip"; hash = "sha256-39AoB5cKRQMFpRaOlrTEsyEKZYVqdTp1tMtlaDjjZ84="; }; @@ -278,7 +283,7 @@ rec { }; checkstyle = buildEclipseUpdateSite rec { - name = "checkstyle-${version}"; + pname = "checkstyle"; version = "8.7.0.201801131309"; src = fetchzip { @@ -298,7 +303,7 @@ rec { }; color-theme = buildEclipsePlugin rec { - name = "color-theme-${version}"; + pname = "color-theme"; version = "1.0.0.201410260308"; srcFeature = fetchurl { @@ -321,7 +326,7 @@ rec { }; cup = buildEclipsePlugin rec { - name = "cup-${version}"; + pname = "cup"; version = "1.1.0.201604221613"; version_ = "1.0.0.201604221613"; @@ -354,7 +359,7 @@ rec { }; drools = buildEclipseUpdateSite rec { - name = "drools-${version}"; + pname = "drools"; version = "7.17.0.Final"; src = fetchzip { @@ -378,8 +383,8 @@ rec { }; }; - eclemma = buildEclipseUpdateSite rec { - name = "eclemma-${version}"; + eclemma = buildEclipseUpdateSite { + pname = "eclemma"; version = "2.3.2.201409141915"; src = fetchzip { @@ -398,7 +403,7 @@ rec { }; findbugs = buildEclipsePlugin rec { - name = "findbugs-${version}"; + pname = "findbugs"; version = "3.0.1.20150306-5afe4d1"; srcFeature = fetchurl { @@ -421,7 +426,7 @@ rec { }; freemarker = buildEclipseUpdateSite rec { - name = "freemarker-${version}"; + pname = "freemarker"; version = "1.5.305"; src = fetchzip { @@ -438,7 +443,7 @@ rec { }; embed-cdt = buildEclipseUpdateSite rec { - name = "embed-cdt-${version}"; + pname = "embed-cdt"; version = "6.3.1"; src = fetchzip { @@ -459,7 +464,7 @@ rec { gnuarmeclipse = embed-cdt; # backward compat alias, added 2022-11-04 jsonedit = buildEclipsePlugin rec { - name = "jsonedit-${version}"; + pname = "jsonedit"; version = "1.1.1"; srcFeature = fetchurl { @@ -519,7 +524,7 @@ rec { }; jdt-codemining = buildEclipsePlugin rec { - name = "jdt-codemining-${version}"; + pname = "jdt-codemining"; version = "1.0.0.201806221018"; srcFeature = fetchurl { @@ -542,7 +547,7 @@ rec { }; rustdt = buildEclipseUpdateSite rec { - name = "rustdt-${version}"; + pname = "rustdt"; version = "0.6.2"; owner = "RustDT"; repo = "rustdt.github.io"; @@ -567,7 +572,7 @@ rec { }; spotbugs = buildEclipseUpdateSite rec { - name = "spotbugs-${version}"; + pname = "spotbugs"; version = "3.1.11"; src = fetchzip { @@ -586,7 +591,7 @@ rec { }; testng = buildEclipsePlugin rec { - name = "testng-${version}"; + pname = "testng"; version = "6.9.13.201609291640"; srcFeature = fetchurl { @@ -609,7 +614,7 @@ rec { }; vrapper = buildEclipseUpdateSite rec { - name = "vrapper-${version}"; + pname = "vrapper"; version = "0.72.0"; owner = "vrapper"; repo = "vrapper"; @@ -632,7 +637,7 @@ rec { }; yedit = buildEclipsePlugin rec { - name = "yedit-${version}"; + pname = "yedit"; version = "1.0.20.201509041456"; srcFeature = fetchurl { @@ -655,11 +660,11 @@ rec { }; zest = buildEclipseUpdateSite rec { - name = "zest-${version}"; + pname = "zest"; version = "3.9.101"; src = fetchurl { - url = "http://archive.eclipse.org/tools/gef/downloads/drops/${version}/R201408150207/GEF-${name}.zip"; + url = "http://archive.eclipse.org/tools/gef/downloads/drops/${version}/R201408150207/GEF-${pname}-${version}.zip"; sha256 = "01scn7cmcrjcp387spjm8ifgwrwwi77ypildandbisfvhj3qqs7m"; }; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index f8d4ebfbf925..35c0362b2601 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6790,6 +6790,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + im-select-nvim = buildVimPlugin { + pname = "im-select.nvim"; + version = "0-unstable-2025-07-24"; + src = fetchFromGitHub { + owner = "keaising"; + repo = "im-select.nvim"; + rev = "113a6905a1c95d2990269f96abcbad9718209557"; + hash = "sha256-rtbqJjih9yy2svMIro7FbdH9DqGTumAmfcRICfqT8tQ="; + }; + meta.homepage = "https://github.com/keaising/im-select.nvim/"; + meta.hydraPlatforms = [ ]; + }; + img-clip-nvim = buildVimPlugin { pname = "img-clip.nvim"; version = "0.6.0-unstable-2025-12-19"; @@ -8547,6 +8560,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + mcphub-nvim = buildVimPlugin { + pname = "mcphub.nvim"; + version = "6.2.0-unstable-2026-01-18"; + src = fetchFromGitHub { + owner = "ravitemer"; + repo = "mcphub.nvim"; + rev = "7cd5db330f41b7bae02b2d6202218a061c3ebc1f"; + hash = "sha256-g9tPvjThz6EUk7zcY7lL+YH4lrT4x3FJ6jrNMHA8PAE="; + }; + meta.homepage = "https://github.com/ravitemer/mcphub.nvim/"; + meta.hydraPlatforms = [ ]; + }; + mediawiki-vim = buildVimPlugin { pname = "mediawiki.vim"; version = "0.2-unstable-2015-11-15"; @@ -23128,6 +23154,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + y9nika-nvim = buildVimPlugin { + pname = "y9nika.nvim"; + version = "0-unstable-2026-01-17"; + src = fetchFromGitHub { + owner = "y9san9"; + repo = "y9nika.nvim"; + rev = "f7174b7812e60379953a4102d6be20e47995b924"; + hash = "sha256-bF9tFXLIYzjrMFVyB4FhsuC8eKiEutk7VjFHB+laAt4="; + }; + meta.homepage = "https://github.com/y9san9/y9nika.nvim/"; + meta.hydraPlatforms = [ ]; + }; + yaml-companion-nvim = buildVimPlugin { pname = "yaml-companion.nvim"; version = "0.1.3-unstable-2024-07-14"; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index 3e6ed03ace08..f0f56a9b8213 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -209,6 +209,6 @@ in meta = super.nvim-treesitter.meta or { } // { license = lib.licenses.asl20; - maintainers = [ ]; + maintainers = with lib.maintainers; [ figsoda ]; }; } diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index cdcf3fff0f36..a2ff32ea543c 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2021,6 +2021,19 @@ assertNoAdditions { checkInputs = [ self.lualine-nvim ]; }; + mcphub-nvim = super.mcphub-nvim.overrideAttrs { + dependencies = [ self.plenary-nvim ]; + checkInputs = [ + # Required by mcphub.extensions.luali + self.lualine-nvim + ]; + + nvimSkipModules = [ + # ENOENT: no such file or directory (cmd): 'npm' + "bundled_build" + ]; + }; + mind-nvim = super.mind-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index e180427ed44a..0c3df540f2b5 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -520,6 +520,7 @@ https://github.com/cocopon/iceberg.vim/,, https://github.com/idris-hackers/idris-vim/,, https://github.com/idris-community/idris2-nvim/,, https://github.com/edwinb/idris2-vim/,, +https://github.com/keaising/im-select.nvim/,HEAD, https://github.com/HakonHarnes/img-clip.nvim/,HEAD, https://github.com/lewis6991/impatient.nvim/,, https://github.com/backdround/improved-search.nvim/,HEAD, @@ -656,6 +657,7 @@ https://github.com/marko-cerovac/material.nvim/,, https://github.com/kaicataldo/material.vim/,HEAD, https://github.com/mattn/calendar-vim/,,mattn-calendar-vim https://github.com/vim-scripts/mayansmoke/,, +https://github.com/ravitemer/mcphub.nvim/,HEAD, https://github.com/chikamichi/mediawiki.vim/,HEAD, https://github.com/savq/melange-nvim/,, https://github.com/lsig/messenger.nvim/,HEAD, @@ -1776,6 +1778,7 @@ https://github.com/kyza0d/xeno.nvim/,HEAD, https://github.com/Mythos-404/xmake.nvim/,HEAD, https://github.com/drmingdrmer/xptemplate/,, https://github.com/guns/xterm-color-table.vim/,, +https://github.com/y9san9/y9nika.nvim/,HEAD, https://github.com/someone-stole-my-name/yaml-companion.nvim/,HEAD, https://github.com/cwrau/yaml-schema-detect.nvim/,HEAD, https://github.com/gbprod/yanky.nvim/,HEAD, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 661f4d812946..d85806f0af48 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1328,8 +1328,8 @@ let mktplcRef = { publisher = "discloud"; name = "discloud"; - version = "2.27.12"; - hash = "sha256-Id7TpEqF/pFVbZBVRFrlXdN3kBL0BC/nX3Vg2PYgVJU="; + version = "2.27.15"; + hash = "sha256-LFZR0AxMC0TKUOKU/Ftz1AkLRazqUptkZQ11NIvv7Hs="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/leanprover.lean4/default.nix b/pkgs/applications/editors/vscode/extensions/leanprover.lean4/default.nix index b081e16eceb7..ed43b2c75db0 100644 --- a/pkgs/applications/editors/vscode/extensions/leanprover.lean4/default.nix +++ b/pkgs/applications/editors/vscode/extensions/leanprover.lean4/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "lean4"; publisher = "leanprover"; - version = "0.0.221"; - hash = "sha256-OoDM9PuhQBRln41OHdVbI8EcXaqIQPArnqgFt+63aJg="; + version = "0.0.223"; + hash = "sha256-afdbAEQSWt4WeCISdtsuGN8GMjSSSpCuED6L/Oluso0="; }; meta = { diff --git a/pkgs/applications/misc/mkgmap/testinputs.nix b/pkgs/applications/misc/mkgmap/testinputs.nix deleted file mode 100644 index c92499aea5c7..000000000000 --- a/pkgs/applications/misc/mkgmap/testinputs.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ fetchurl }: -let - fetchTestInput = - { res, sha256 }: - fetchurl { - inherit sha256; - url = "https://www.mkgmap.org.uk/testinput/${res}"; - name = builtins.replaceStrings [ "/" ] [ "__" ] res; - }; -in -[ - (fetchTestInput { - res = "osm/lon1.osm.gz"; - sha256 = "1r8sl67hayjgybxy9crqwp7f1w0ljxvxh0apqcvr888yhsbb8drv"; - }) - (fetchTestInput { - res = "osm/uk-test-1.osm.gz"; - sha256 = "0jdngkjn22jvi8q7hrzpqb9mnjlz82h1dwdmc4qrb64kkhzm4dfk"; - }) - (fetchTestInput { - res = "osm/uk-test-2.osm.gz"; - sha256 = "05mw0qcdgki151ldmxayry0gqlb72jm5wrvxq3dkwq5i7jb21qs4"; - }) - (fetchTestInput { - res = "osm/is-in-samples.osm"; - sha256 = "18vqfbq25ys59bj6dl6dq3q4m2ri3ki2xazim14fm94k1pbyhbh3"; - }) - (fetchTestInput { - res = "mp/test1.mp"; - sha256 = "1dykr0z84c3fqgm9kdp2dzvxc3galjbx0dn9zxjw8cfk7mvnspj2"; - }) - (fetchTestInput { - res = "img/63240001.img"; - sha256 = "1wmqgy940q1svazw85z8di20xyjm3vpaiaj9hizr47b549klw74q"; - }) - (fetchTestInput { - res = "img/63240002.img"; - sha256 = "12ivywkiw6lrglyk0clnx5ff2wqj4z0c3f5yqjsqlsaawbmxqa1f"; - }) - (fetchTestInput { - res = "img/63240003.img"; - sha256 = "19mgxqv6kqk8ahs8s819sj7cc79id67373ckwfsq7vvqyfrbasz1"; - }) - (fetchTestInput { - res = "hgt/N00W090.hgt.zip"; - sha256 = "16hb06bgf47sz2mfbbx3xqmrh1nmm04wj4ngm512sng4rjhksxgn"; - }) - (fetchTestInput { - res = "hgt/N00W091.hgt.zip"; - sha256 = "153j4wj7170qj81nr7sr6dp9zar62gnrkh6ww62bygpfqqyzdr1x"; - }) - (fetchTestInput { - res = "hgt/S01W090.hgt.zip"; - sha256 = "0czgs9rhp7bnzmzm7907vprj3nhm2lj6q1piafk8dm9rcqkfg8sj"; - }) - (fetchTestInput { - res = "hgt/S01W091.hgt.zip"; - sha256 = "0z58q3ai499mflxfjqhqv9i1di3fmp05pkv39886k1na107g3wbn"; - }) - (fetchTestInput { - res = "hgt/S02W090.hgt.zip"; - sha256 = "0q7817gdxk2vq73ci6ffks288zqywc21f5ns73b6p5ds2lrxhf5n"; - }) - (fetchTestInput { - res = "hgt/S02W091.hgt.zip"; - sha256 = "1mwpgd85v9n99gmx2bn8md7d312wvhq86w3c9k92y8ayrs20lmdr"; - }) -] diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d70d5e0255e2..00652c48938f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -679,13 +679,13 @@ "vendorHash": "sha256-OvotUEh+P2b3ngaD/8lVbemnM3lrtwqduPXPjF/bqVA=" }, "hashicorp_vault": { - "hash": "sha256-7vcggk2Sh4z/6CCyeL8XAzk82K5jaFjiDGBEG+5ftEg=", + "hash": "sha256-Rg18X+VFDA9p3Dx/fA/C982X4XEvSRPU0+Zkq8HWqas=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "repo": "terraform-provider-vault", - "rev": "v5.6.0", + "rev": "v5.7.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-4ak7PkjQi6Nq/Xv8j3iKV8qB9tEfl1YxDbwlzTs8xBY=" + "vendorHash": "sha256-XnyEPnB0995S7LzGAlkB/O3VKWXAm1rp9NQcDvIhRVw=" }, "hashicorp_vsphere": { "hash": "sha256-vRO6vxzi4d0hNc0MmQLhN7roONnsjxPBtFt0fyvxWd8=", @@ -1148,13 +1148,13 @@ "vendorHash": null }, "sacloud_sakuracloud": { - "hash": "sha256-hEE1bnkXutlQL0b51uTGZs4tzys4RBloadK1yYRK46M=", + "hash": "sha256-gcl4ClYxmZbACn8rmcZzn/XeYMeLAuhAr2IVuQRqXoQ=", "homepage": "https://registry.terraform.io/providers/sacloud/sakuracloud", "owner": "sacloud", "repo": "terraform-provider-sakuracloud", - "rev": "v2.34.1", + "rev": "v2.34.2", "spdx": "Apache-2.0", - "vendorHash": "sha256-X2CQf1/KGZZv1R0WzA6+IEDggmuttm/MeFMqxBm8PVk=" + "vendorHash": "sha256-LQAEOSSqpR8ipYkL6dcJvJvgs17VOYRolYn7Qt4Oer4=" }, "sap-cloud-infrastructure_sci": { "hash": "sha256-m3degJZruqRkA/lSnNQrLfJIlpl5k8qCpbyIcsyV5/U=", diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 9f9a624cd0d2..55ef9b276098 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -75,7 +75,7 @@ let "9.0.1".sha256 = "sha256-gRgQhFiYvGR/Z46TmTl1bgN9O32nifxQGdrzfw0WHrk="; "9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE="; "9.1.1".sha256 = "sha256-aFsGsFzexyDnOVarHPKs35HjiV8uUCpeOKSl15wXZ4s="; - "9.2+rc1".sha256 = "sha256-zKVhnBid5LOcd7uHWFGmUdHpyNLxIyB7RNNz5btz0mI="; + "9.2+rc2".sha256 = "sha256-L6V9Vyv8Q0IWpGfXqL/YKcpx/gLBa7k9rnPvRGvAO+M="; }; releaseRev = v: "V${v}"; fetched = diff --git a/pkgs/applications/science/logic/easycrypt/default.nix b/pkgs/applications/science/logic/easycrypt/default.nix index b23e7c110863..ae77af313611 100644 --- a/pkgs/applications/science/logic/easycrypt/default.nix +++ b/pkgs/applications/science/logic/easycrypt/default.nix @@ -9,15 +9,15 @@ python3, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "easycrypt"; - version = "2025.11"; + version = "2026.02"; src = fetchFromGitHub { owner = "easycrypt"; repo = "easycrypt"; - tag = "r${version}"; - hash = "sha256-BLyC8AB075Nyhb5heIKVkxnWWt4Zn8Doo10ShsACJ4g="; + tag = "r${finalAttrs.version}"; + hash = "sha256-ii/msqNUPZ7jQXG2fEkEpsGXc4sw6DcyaTIw21lrl7M="; }; nativeBuildInputs = @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { batteries dune-build-info dune-site + markdown pcre2 why3 yojson @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { strictDeps = true; postPatch = '' - substituteInPlace dune-project --replace-fail '(name easycrypt)' '(name easycrypt)(version ${version})' + substituteInPlace dune-project --replace-fail '(name easycrypt)' '(name easycrypt)(version ${finalAttrs.version})' ''; pythonPath = with python3.pkgs; [ pyyaml ]; @@ -67,4 +68,4 @@ stdenv.mkDerivation rec { description = "Computer-Aided Cryptographic Proofs"; mainProgram = "easycrypt"; }; -} +}) diff --git a/pkgs/applications/science/logic/rocq-core/default.nix b/pkgs/applications/science/logic/rocq-core/default.nix index 946509c216ad..5b61f87a6c67 100644 --- a/pkgs/applications/science/logic/rocq-core/default.nix +++ b/pkgs/applications/science/logic/rocq-core/default.nix @@ -28,7 +28,7 @@ let "9.0.1".sha256 = "sha256-gRgQhFiYvGR/Z46TmTl1bgN9O32nifxQGdrzfw0WHrk="; "9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE="; "9.1.1".sha256 = "sha256-aFsGsFzexyDnOVarHPKs35HjiV8uUCpeOKSl15wXZ4s="; - "9.2+rc1".sha256 = "sha256-zKVhnBid5LOcd7uHWFGmUdHpyNLxIyB7RNNz5btz0mI="; + "9.2+rc2".sha256 = "sha256-L6V9Vyv8Q0IWpGfXqL/YKcpx/gLBa7k9rnPvRGvAO+M="; }; releaseRev = v: "V${v}"; fetched = diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 49d1f1cae540..450b97ac906e 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -76,9 +76,9 @@ let virtualboxSubVersion = ""; virtualboxSha256 = "c58443a0e6fcc7fc7e84c1011a10823b3540c6a2b8f2e27c4d8971272baf09f7"; - kvmPatchVboxVersion = "7.2.4"; - kvmPatchVersion = "20251103"; - kvmPatchHash = "sha256-VhSuRYiZLg8hIGatf27u/nBBBtB1zz4ePxtiRYy84Hw="; + kvmPatchVboxVersion = "7.2.6"; + kvmPatchVersion = "20260201"; + kvmPatchHash = "sha256-pq4DPLwHRRAMJjmfXympDxJK9+d+LwTOxBqxAm0pl3o="; # The KVM build is not compatible to VirtualBox's kernel modules. So don't export # modsrc at all. diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 408017628228..2822cfd9dd26 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -3,12 +3,11 @@ lib, virtualbox, }: -let - virtualboxExtPackVersion = "7.2.6"; -in fetchurl rec { - name = "Oracle_VirtualBox_Extension_Pack-${virtualboxExtPackVersion}.vbox-extpack"; - url = "https://download.virtualbox.org/virtualbox/${virtualboxExtPackVersion}/${name}"; + pname = "virtualbox-extpack"; + version = "7.2.6"; + name = "Oracle_VirtualBox_Extension_Pack-${version}.vbox-extpack"; + url = "https://download.virtualbox.org/virtualbox/${version}/${name}"; sha256 = # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. diff --git a/pkgs/applications/virtualization/virtualbox/update.sh b/pkgs/applications/virtualization/virtualbox/update.sh index 51600df4ce5b..34d70069c68b 100755 --- a/pkgs/applications/virtualization/virtualbox/update.sh +++ b/pkgs/applications/virtualization/virtualbox/update.sh @@ -39,7 +39,7 @@ if [ ! "$oldVersion" = "$latestVersion" ]; then -e "s/virtualboxSha256 = \".*\";/virtualboxSha256 = \"$virtualBoxShaSum\";/g" \ -i "$virtualboxNixFile" sed -e 's|value = "'$extpackOldShaSum'"|value = "'$extpackShaSum'"|' \ - -e "s/virtualboxExtPackVersion = \".*\";/virtualboxExtPackVersion = \"$latestVersion\";/g" \ + -e "s/version = \".*\";/version = \"$latestVersion\";/g" \ -i $extpackNixFile sed -e "s/sha256 = \".*\";/sha256 = \"$guestAdditionsIsoShaSum\";/g" \ -i "$guestAdditionsIsoNixFile" diff --git a/pkgs/by-name/ac/acme-dns/package.nix b/pkgs/by-name/ac/acme-dns/package.nix index fa459116d564..54b27bde9116 100644 --- a/pkgs/by-name/ac/acme-dns/package.nix +++ b/pkgs/by-name/ac/acme-dns/package.nix @@ -8,25 +8,16 @@ buildGoModule (finalAttrs: { pname = "acme-dns"; - # Unstable version to allow building with toolchains later than EOL Go 1.22, - # see https://github.com/joohoi/acme-dns/issues/365 - version = "1.1-unstable-2024-12-15"; + version = "2.0.2"; src = fetchFromGitHub { - owner = "joohoi"; + owner = "acme-dns"; repo = "acme-dns"; - rev = "b7a0a8a7bcef39f6158dd596fe716594a170d362"; - hash = "sha256-UApFNcU6a6nzpwbIJv1LLmXVTGLzY0HQBlRATq2s9x8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-tjVI+CaQTN1SB/RkTg0CJ1o9azb2ULwR1uKK5fJZ8fw="; }; - # Fetching of goModules fails with 'go: updates to go.mod needed' - postPatch = '' - substituteInPlace go.mod \ - --replace-fail 'go 1.22' 'go 1.22.0' \ - --replace-fail 'toolchain go1.22.0' 'toolchain go1.24.1' - ''; - - vendorHash = "sha256-pKEOmMF1lvm/CU1n3ykh6YvtRNH/2i+0AvOJzq8eets="; + vendorHash = "sha256-n3icQQkdA0nCkvthsFsUTrYg0B3t8hROL4QXgBQRbSg="; postInstall = '' install -D -m0444 -t $out/lib/systemd/system ./acme-dns.service @@ -37,8 +28,8 @@ buildGoModule (finalAttrs: { meta = { description = "Limited DNS server to handle ACME DNS challenges easily and securely"; - homepage = "https://github.com/joohoi/acme-dns"; - changelog = "https://github.com/joohoi/acme-dns/releases/tag/${finalAttrs.src.rev}"; + homepage = "https://github.com/acme-dns/acme-dns"; + changelog = "https://github.com/acme-dns/acme-dns/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ emilylange ]; mainProgram = "acme-dns"; diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix index 7b2d50ea0139..9459f19b2745 100644 --- a/pkgs/by-name/au/auth0-cli/package.nix +++ b/pkgs/by-name/au/auth0-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "auth0-cli"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "auth0"; repo = "auth0-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-ng+eIM8C557HY9kfAaidhwb/oT875qcPC7zTpXFn0c8="; + hash = "sha256-DrQCbuVFfbhobF3lppQg/a0J/ZSMuP+wbLrMsLcKSRE="; }; - vendorHash = "sha256-fEoDvnHNQWwk++3n/4R1Q3YKwraxP8OBFLU0hZLcouc="; + vendorHash = "sha256-Us6NJiSfOK1BBRyrYil26HGaZAgum6k3B5LdV60rCeA="; ldflags = [ "-s" diff --git a/pkgs/by-name/au/auto-editor/package.nix b/pkgs/by-name/au/auto-editor/package.nix index 3824c3a00534..045a066e1910 100644 --- a/pkgs/by-name/au/auto-editor/package.nix +++ b/pkgs/by-name/au/auto-editor/package.nix @@ -10,6 +10,7 @@ withVpx ? true, withSvtAv1 ? true, withCuda ? false, + withVpl ? stdenv.hostPlatform.isLinux, ffmpeg-full, yt-dlp, @@ -29,13 +30,13 @@ buildNimPackage rec { pname = "auto-editor"; - version = "29.6.1"; + version = "29.7.0"; src = fetchFromGitHub { owner = "WyattBlue"; repo = "auto-editor"; tag = version; - hash = "sha256-7/ey7nZdy1SnGdW5LjX7dtxyqqvrTuIvtJXMXYVYB6k="; + hash = "sha256-R1GnvFjC/nq/gIiX6rUxP7qR3IfpGfc4Ci28AIk4CfQ="; }; lockFile = ./lock.json; @@ -51,14 +52,15 @@ buildNimPackage rec { ++ lib.optionals withWhisper [ whisper-cpp ] ++ lib.optionals withVpx [ libvpx ] ++ lib.optionals withSvtAv1 [ svt-av1 ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ libvpl ]; + ++ lib.optionals withVpl [ libvpl ]; nimFlags = lib.optionals withHEVC [ "-d:enable_hevc" ] ++ lib.optionals withWhisper [ "-d:enable_whisper" ] ++ lib.optionals withVpx [ "-d:enable_vpx" ] ++ lib.optionals withSvtAv1 [ "-d:enable_svtav1" ] - ++ lib.optionals withCuda [ "-d:enable_cuda" ]; + ++ lib.optionals withCuda [ "-d:enable_cuda" ] + ++ lib.optionals withVpl [ "-d:enable_vpl" ]; postPatch = '' substituteInPlace src/log.nim \ diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix index e4f0da60ee49..bec04b6ac281 100644 --- a/pkgs/by-name/aw/aws-vault/package.nix +++ b/pkgs/by-name/aw/aws-vault/package.nix @@ -10,17 +10,17 @@ }: buildGoModule (finalAttrs: { pname = "aws-vault"; - version = "7.9.3"; + version = "7.9.4"; src = fetchFromGitHub { owner = "ByteNess"; repo = "aws-vault"; rev = "v${finalAttrs.version}"; - hash = "sha256-oQI1VjK4nQAErXgtUumdTwVB0maCfEv4WRF+buaHnKM="; + hash = "sha256-Tdi2kGoJ0ZwEnBvjkjZuoTTIdmsJjdMi75gwBmy+5N4="; }; proxyVendor = true; - vendorHash = "sha256-KXJSggr0kOTduv3yhDJbDNdSrfXS+d2UOFFn9UK519M="; + vendorHash = "sha256-rY7UbAgv+dLnZBLFptPp7D+gYBsCj7QYM4VvH/HBdq4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix index 27995bf6c9d7..a0248bb508ca 100644 --- a/pkgs/by-name/az/azurehound/package.nix +++ b/pkgs/by-name/az/azurehound/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "azurehound"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "SpecterOps"; repo = "AzureHound"; tag = "v${finalAttrs.version}"; - hash = "sha256-E2TMIajzxydNFHhVnOpFVTd2L5gDK9VcIZetcgh0edg="; + hash = "sha256-/ene4POMlqpSFixbD7uzubmOmI/IOPgJbzEQV2dq1gU="; }; vendorHash = "sha256-+iNFWKFNON4HX2mf4O29zAdElEkIGIx55Wi9MRtg1dg="; diff --git a/pkgs/by-name/ba/bazel-buildtools/package.nix b/pkgs/by-name/ba/bazel-buildtools/package.nix index 4d33a8e2d8b6..8426f09a67a3 100644 --- a/pkgs/by-name/ba/bazel-buildtools/package.nix +++ b/pkgs/by-name/ba/bazel-buildtools/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "bazel-buildtools"; - version = "8.2.1"; + version = "8.5.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; rev = "v${finalAttrs.version}"; - hash = "sha256-YkxEc+hcfOH2zzdHngoJmuCqGD4FWSkFd2cVqIrpHD4="; + hash = "sha256-ykfdajj9KpP9+j0uePYCRf7TDpb1GbGAiR6bI++jslg="; }; vendorHash = "sha256-sYZ7ogQY0dWOwJMvLljOjaKeYGYdLrF5AnetregdlYY="; diff --git a/pkgs/by-name/bc/bcc/package.nix b/pkgs/by-name/bc/bcc/package.nix index a5c1e235e9ac..8f1b3f9d310d 100644 --- a/pkgs/by-name/bc/bcc/package.nix +++ b/pkgs/by-name/bc/bcc/package.nix @@ -22,14 +22,14 @@ python3Packages.buildPythonApplication rec { pname = "bcc"; - version = "0.36.0"; + version = "0.36.1"; pyproject = false; src = fetchFromGitHub { owner = "iovisor"; repo = "bcc"; tag = "v${version}"; - hash = "sha256-J00GRIM9AemLkKHoyKqLR2U2aEBwNy/a5hbGjLRrO8w="; + hash = "sha256-+XBFENCAKP8Z+5dviBervDXHOM2qY3lfDFsDKVjzMbM="; }; patches = [ diff --git a/pkgs/by-name/be/bee/package.nix b/pkgs/by-name/be/bee/package.nix index ae296c464154..bdecd2383538 100644 --- a/pkgs/by-name/be/bee/package.nix +++ b/pkgs/by-name/be/bee/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "bee"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "ethersphere"; repo = "bee"; rev = "v${finalAttrs.version}"; - hash = "sha256-Yz23iVYGZ4PS1jbV5zFaCEsQOoAbHBpePml0zp5GSkQ="; + hash = "sha256-SteqSo2mfb3Mr5Zn1fZauhQbQ8iE3VgoDfLVj/IDhvs="; }; - vendorHash = "sha256-0czsloD2EhSWKQbj7NJ4IqGgKM9+Vp8gSIhOKWg/onA="; + vendorHash = "sha256-6yX2WnWH2K7/2Ou82mw7/LJfu5MEZp/MN61Z2N5pgPc="; subPackages = [ "cmd/bee" ]; diff --git a/pkgs/by-name/br/brogue-ce/package.nix b/pkgs/by-name/br/brogue-ce/package.nix index 80b2056bdd2e..814b9acc7861 100644 --- a/pkgs/by-name/br/brogue-ce/package.nix +++ b/pkgs/by-name/br/brogue-ce/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "brogue-ce"; - version = "1.14.1"; + version = "1.15"; src = fetchFromGitHub { owner = "tmewett"; repo = "BrogueCE"; rev = "v${finalAttrs.version}"; - hash = "sha256-habmfq1jZa70eggLOgsPT6j1OGmmQ6qmWcCwRN2G4Fo="; + hash = "sha256-NZp40tPNyO85J6pduV/X79cfUYAAUH7wySlg1IgT4f4="; }; postPatch = '' diff --git a/pkgs/by-name/bt/btcpayserver/package.nix b/pkgs/by-name/bt/btcpayserver/package.nix index 6b344b323bcd..dac70a10405f 100644 --- a/pkgs/by-name/bt/btcpayserver/package.nix +++ b/pkgs/by-name/bt/btcpayserver/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "2.3.2"; + version = "2.3.4"; src = fetchFromGitHub { owner = "btcpayserver"; repo = "btcpayserver"; tag = "v${version}"; - hash = "sha256-0R39jyQaHiei8jXS8gPmkpolC2EcLusLPIMj6Q5iycE="; + hash = "sha256-u4VNDKLOb6bEkdhRTmnGxyM+2a6mcdWwV1T4+HFK/14="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/by-name/ca/cargo-insta/package.nix b/pkgs/by-name/ca/cargo-insta/package.nix index 2d899da347c9..ad28546fc462 100644 --- a/pkgs/by-name/ca/cargo-insta/package.nix +++ b/pkgs/by-name/ca/cargo-insta/package.nix @@ -37,6 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { maintainers = with lib.maintainers; [ oxalica matthiasbeyer + figsoda ]; }; }) diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix index 76d4a07346d7..a1fc26948707 100644 --- a/pkgs/by-name/ca/cargo-nextest/package.nix +++ b/pkgs/by-name/ca/cargo-nextest/package.nix @@ -49,6 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { maintainers = with lib.maintainers; [ matthiasbeyer chrjabs + figsoda ]; }; }) diff --git a/pkgs/by-name/ch/chameleon-cli/package.nix b/pkgs/by-name/ch/chameleon-cli/package.nix index 4b2264e7475a..1c69248c8b98 100644 --- a/pkgs/by-name/ch/chameleon-cli/package.nix +++ b/pkgs/by-name/ch/chameleon-cli/package.nix @@ -4,8 +4,10 @@ fetchFromGitHub, cmake, makeWrapper, + openssl, xz, python3, + nix-update-script, }: let @@ -21,18 +23,16 @@ in stdenv.mkDerivation (finalAttrs: { pname = "chameleon-cli"; - version = "2.1.0-unstable-2025-10-13"; + version = "2.1.0-unstable-2026-02-06"; src = fetchFromGitHub { owner = "RfidResearchGroup"; repo = "ChameleonUltra"; - rev = "97dfe5b9a41a6ea5535c6842afbe420098c4844b"; - sparseCheckout = [ "software" ]; - hash = "sha256-zFExh0vhzNcf02izgO4P4cWq3LoQpEHb4ZW7hsHZqNA="; + rev = "2c7c3eeb4df8eee7451aff7c5ddae5d10cd0c34d"; + rootDir = "software"; + hash = "sha256-5QlJGmUjJKWc7e53zMXNoNXTBhwpepThKn9xMKpF16s="; }; - sourceRoot = "${finalAttrs.src.name}/software"; - postPatch = '' substituteInPlace src/CMakeLists.txt \ --replace-fail "liblzma" "lzma" \ @@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + openssl xz ]; @@ -67,7 +68,12 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version=branch" + "--version-regex=v(.*)" + ]; + }; meta = { description = "Command line interface for Chameleon Ultra"; diff --git a/pkgs/by-name/ch/chameleon-cli/update.sh b/pkgs/by-name/ch/chameleon-cli/update.sh deleted file mode 100755 index 2875b72ffacd..000000000000 --- a/pkgs/by-name/ch/chameleon-cli/update.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils nix-update - -# This update script exists, because nix-update is unable to ignore `dev` -# tags that exist on the upstream repo. -# -# Once https://github.com/Mic92/nix-update/issues/322 is resolved it can be -# removed. - -set -exuo pipefail - -cd "$(git rev-parse --show-toplevel)" - -nix-update --version=branch chameleon-cli - -tag=$(git ls-remote --tags --refs --sort='-version:refname' https://github.com/RfidResearchGroup/ChameleonUltra.git 'v*' | head -n 1 | cut --delimiter=/ --field=3-) -tag="${tag#v}" -sed -i -e 's|version = "[^-]*-unstable-|version = "'"${tag}"'-unstable-|' pkgs/by-name/ch/chameleon-cli/package.nix diff --git a/pkgs/by-name/ch/charis-sil/package.nix b/pkgs/by-name/ch/charis-sil/package.nix deleted file mode 100644 index 71e143a87ffc..000000000000 --- a/pkgs/by-name/ch/charis-sil/package.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchzip, -}: - -stdenvNoCC.mkDerivation rec { - pname = "charis-sil"; - version = "6.200"; - - src = fetchzip { - url = "https://software.sil.org/downloads/r/charis/CharisSIL-${version}.zip"; - hash = "sha256-q451lec/l13Uanmr8K/C55Cr3avRvqQUkPK/ZZ1kgHo="; - }; - - installPhase = '' - runHook preInstall - - install -Dm644 *.ttf -t $out/share/fonts/truetype - install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/${pname}-${version} - - runHook postInstall - ''; - - meta = { - homepage = "https://software.sil.org/charis"; - description = "Family of highly readable fonts for broad multilingual use"; - longDescription = '' - This Charis SIL font is essentially the same design as the SIL Charis font first released by SIL in 1997. Charis is similar to Bitstream Charter, one of the first fonts designed specifically for laser printers. It is highly readable and holds up well in less-than-ideal reproduction environments. It also has a full set of styles – regular, italic, bold, bold italic. Charis is a serif, proportionally-spaced font optimized for readability in long printed documents. - - The goal for this product was to provide a single Unicode-based font family that would contain a comprehensive inventory of glyphs needed for almost any Roman- or Cyrillic-based writing system, whether used for phonetic or orthographic needs. In addition, there is provision for other characters and symbols useful to linguists. This font makes use of state-of-the-art font technologies to support complex typographic issues, such as the need to position arbitrary combinations of base glyphs and diacritics optimally. - ''; - license = lib.licenses.ofl; - platforms = lib.platforms.all; - maintainers = [ lib.maintainers.f--t ]; - }; -} diff --git a/pkgs/by-name/ch/charis/package.nix b/pkgs/by-name/ch/charis/package.nix new file mode 100644 index 000000000000..53342c22b0ed --- /dev/null +++ b/pkgs/by-name/ch/charis/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenvNoCC, + fetchzip, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "charis"; + version = "7.000"; + + src = fetchzip { + url = "https://software.sil.org/downloads/r/charis/Charis-${finalAttrs.version}.zip"; + hash = "sha256-cVz0U2PAIl8FqT/HhvDNoWg3SCwKQ1e7rdk+dkP1Cc8="; + }; + + installPhase = '' + runHook preInstall + + install -D --mode 444 --target-directory $out/share/fonts/truetype *.ttf + install -D --mode 444 --target-directory $out/share/doc/charis-${finalAttrs.version} \ + OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt + + runHook postInstall + ''; + + meta = { + homepage = "https://software.sil.org/charis"; + description = "Family of highly readable fonts for broad multilingual use"; + longDescription = '' + This Charis font is essentially the same design as the SIL Charis font + first released by SIL in 1997. Charis is similar to Bitstream Charter, + one of the first fonts designed specifically for laser printers. It is + highly readable and holds up well in less-than-ideal reproduction + environments. It also has a full set of styles – regular, italic, bold, + bold italic. Charis is a serif, proportionally-spaced font optimized for + readability in long printed documents. + + The goal for this product was to provide a single Unicode-based font + family that would contain a comprehensive inventory of glyphs needed for + almost any Roman- or Cyrillic-based writing system, whether used for + phonetic or orthographic needs. In addition, there is provision for other + characters and symbols useful to linguists. This font makes use of + state-of-the-art font technologies to support complex typographic issues, + such as the need to position arbitrary combinations of base glyphs and + diacritics optimally. + ''; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.f--t ]; + }; +}) diff --git a/pkgs/by-name/ch/checkstyle/package.nix b/pkgs/by-name/ch/checkstyle/package.nix index efe0b4ef9e24..50147c9caf1e 100644 --- a/pkgs/by-name/ch/checkstyle/package.nix +++ b/pkgs/by-name/ch/checkstyle/package.nix @@ -7,12 +7,12 @@ }: stdenvNoCC.mkDerivation rec { - version = "13.1.0"; + version = "13.2.0"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-o00i6bi9qNABypHRKLfniqYMxeWmiYx/eOy6Q3oh3UA="; + sha256 = "sha256-rAPNT/zbMXX1s4upQlZD6QnNFliNPlVBzbUjxcTL3PU="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/ci/cinnamon-session/package.nix b/pkgs/by-name/ci/cinnamon-session/package.nix index 39981d043e10..29b422d6480c 100644 --- a/pkgs/by-name/ci/cinnamon-session/package.nix +++ b/pkgs/by-name/ci/cinnamon-session/package.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "cinnamon-session"; - version = "6.6.1"; + version = "6.6.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon-session"; tag = finalAttrs.version; - hash = "sha256-zPfyPBKN9Qqs2UndW0vYzBqmeFla3ytvdcv/X2dv1zs="; + hash = "sha256-5Cbx0SNBcTovRvxwPSqR4SM/FBLXrfkS5RZGXeU1ULY="; }; buildInputs = [ diff --git a/pkgs/by-name/ci/cinnamon/package.nix b/pkgs/by-name/ci/cinnamon/package.nix index 0b6ed0ea175f..d03a0b32abc5 100644 --- a/pkgs/by-name/ci/cinnamon/package.nix +++ b/pkgs/by-name/ci/cinnamon/package.nix @@ -74,13 +74,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "cinnamon"; - version = "6.6.6"; + version = "6.6.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; tag = finalAttrs.version; - hash = "sha256-yOgDajTZFC566uhf9pvenAIMdDTU1JOF+ahtgPp6kTY="; + hash = "sha256-UP/8FIgTCdQrE+kvG0nLo+oqYo8x/lm3RPKOXnTFJaE="; }; patches = [ diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix index 370e675c843b..f97a4441cacb 100644 --- a/pkgs/by-name/ci/cirrus-cli/package.nix +++ b/pkgs/by-name/ci/cirrus-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "cirrus-cli"; - version = "0.162.0"; + version = "0.163.2"; src = fetchFromGitHub { owner = "cirruslabs"; repo = "cirrus-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-2YIStmYuJK4k7TUyMTHx8IozoqxQlcp/QvzYq2dOrBw="; + hash = "sha256-x/SwCCgW3wZnQ0VwVUinfPXiBexKdfvFGMFiBdmApFI="; }; - vendorHash = "sha256-YIDWRKbnXOWrQdjXz/GYzTIduSGQBaeCo21gp469VHc="; + vendorHash = "sha256-7xjt1TP+Wei+iEiCJMn7XyzW4RV2GNf+xX5O3tnXFvc="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${finalAttrs.version}" diff --git a/pkgs/by-name/ci/citron-emu/package.nix b/pkgs/by-name/ci/citron-emu/package.nix new file mode 100644 index 000000000000..0f10a33c5778 --- /dev/null +++ b/pkgs/by-name/ci/citron-emu/package.nix @@ -0,0 +1,197 @@ +{ + lib, + stdenv, + SDL2, + boost, + catch2_3, + cmake, + ninja, + fetchFromGitea, + cpp-jwt, + cubeb, + gamemode, + discord-rpc, + enet, + fetchzip, + ffmpeg-headless, + fmt, + glslang, + openal, + libopus, + libusb1, + libva, + lz4, + python3, + wrapGAppsHook3, + nlohmann_json, + rapidjson, + openssl, + pkg-config, + qt6, + spirv-tools, + spirv-headers, + vulkan-utility-libraries, + vulkan-headers, + vulkan-loader, + simpleini, + zlib, + vulkan-memory-allocator, + zstd, + withDiscordPresence ? true, + withOptimisation ? false, +}: +let + nx_tzdbVersion = "221202"; + nx_tzdb = fetchzip { + url = "https://github.com/lat9nq/tzdb_to_nx/releases/download/${nx_tzdbVersion}/${nx_tzdbVersion}.zip"; + hash = "sha256-YOIElcKTiclem05trZsA3YJReozu/ex7jJAKD6nAMwc="; + stripRoot = false; + }; + inherit (qt6) + qtbase + qtmultimedia + qttools + qtwayland + qtwebengine + wrapQtAppsHook + ; +in +stdenv.mkDerivation (finalAttrs: { + pname = "citron-emu"; + version = "0.12.25"; + src = fetchFromGitea { + fetchSubmodules = true; + domain = "git.citron-emu.org"; + owner = "Citron"; + repo = "Emulator"; + tag = finalAttrs.version; + hash = "sha256-Su+SvCb6KDF9/ilb6Y/RZTOq/ffaMTWiJZy8nmGZ3n4="; + }; + + nativeBuildInputs = [ + cmake + ninja + glslang + pkg-config + python3 + qttools + wrapGAppsHook3 + wrapQtAppsHook + ]; + + buildInputs = [ + vulkan-headers + boost + catch2_3 + cpp-jwt + cubeb + enet + ffmpeg-headless + fmt + openal + libopus + libusb1 + libva + lz4 + nlohmann_json + rapidjson + openssl + qtbase + qtmultimedia + qtwayland + qtwebengine + gamemode + SDL2 + simpleini + spirv-tools + spirv-headers + vulkan-loader + vulkan-memory-allocator + vulkan-utility-libraries + zlib + zstd + ] + ++ lib.optionals withDiscordPresence [ + discord-rpc + ]; + + __structuredAttrs = true; + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5") + (lib.cmakeBool "CITRON_ENABLE_LTO" true) + (lib.cmakeBool "CITRON_TESTS" false) + (lib.cmakeBool "ENABLE_QT" true) + (lib.cmakeBool "USE_SYSTEM_QT" true) + (lib.cmakeBool "ENABLE_QT_TRANSLATION" true) + (lib.cmakeBool "CITRON_USE_EXTERNAL_SDL2" false) + (lib.cmakeBool "CITRON_USE_EXTERNAL_VULKAN_HEADERS" false) + (lib.cmakeBool "CITRON_USE_EXTERNAL_VULKAN_UTILITY_LIBRARIES" false) + (lib.cmakeBool "CITRON_USE_EXTERNAL_VULKAN_SPIRV_TOOLS" false) + (lib.cmakeBool "CITRON_DOWNLOAD_TIME_ZONE_DATA" false) + (lib.cmakeBool "CITRON_CHECK_SUBMODULES" false) + (lib.cmakeBool "CITRON_USE_QT_WEB_ENGINE" true) + (lib.cmakeBool "CITRON_USE_QT_MULTIMEDIA" true) + (lib.cmakeBool "USE_DISCORD_PRESENCE" withDiscordPresence) + (lib.cmakeBool "CITRON_ENABLE_COMPATIBILITY_REPORTING" false) + (lib.cmakeBool "CITRON_USE_AUTO_UPDATER" false) + (lib.cmakeFeature "TITLE_BAR_FORMAT_IDLE" "${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) {}") + (lib.cmakeFeature "TITLE_BAR_FORMAT_RUNNING" "${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) | {}") + ] + ++ lib.optionals withOptimisation [ + (lib.cmakeFeature "CMAKE_C_FLAGS" "-march=x86-64-v3") + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-march=x86-64-v3") + ]; + + env = { + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isx86_64 "-msse4.1"; + }; + + dontWrapGApps = true; + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + preConfigure = '' + # provide pre-downloaded tz data + mkdir -p build/externals/nx_tzdb + ln -s ${nx_tzdb} build/externals/nx_tzdb/nx_tzdb + ''; + + postPatch = '' + # --- Qt 6.10: use GuiPrivate so qpa/qplatformnativeinterface.h is found --- + + # Add GuiPrivate to the Qt6 components + substituteInPlace CMakeLists.txt \ + --replace-fail "find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia Concurrent)" \ + "find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia Concurrent GuiPrivate)" + + # Link Qt6::GuiPrivate into the GUI target so its private headers are on the include path + substituteInPlace src/citron/CMakeLists.txt \ + --replace-fail "target_link_libraries(citron PRIVATE Boost::headers" \ + "target_link_libraries(citron PRIVATE Boost::headers Qt6::GuiPrivate" + ''; + + postInstall = '' + install -Dm444 $src/dist/72-citron-input.rules $out/lib/udev/rules.d/72-citron-input.rules + ''; + + passthru = { + inherit nx_tzdb; + }; + + meta = { + homepage = "https://citron-emu.org"; + changelog = "https://git.citron-emu.org/Citron/Emulator/releases/tag/${finalAttrs.version}"; + description = "Nintendo Switch emulator for PC"; + mainProgram = "citron"; + platforms = [ "x86_64-linux" ]; + license = with lib.licenses; [ + gpl3Plus + # Icons + asl20 + mit + cc0 + ]; + maintainers = with lib.maintainers; [ samemrecebi ]; + }; +}) diff --git a/pkgs/by-name/cl/cloudlist/package.nix b/pkgs/by-name/cl/cloudlist/package.nix index 175c97054fc3..838fcb733b72 100644 --- a/pkgs/by-name/cl/cloudlist/package.nix +++ b/pkgs/by-name/cl/cloudlist/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "cloudlist"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cloudlist"; tag = "v${finalAttrs.version}"; - hash = "sha256-Tm2gqRZxfeu5gOndVeeFU9HCePpXyx/G73VzVuJRRzY="; + hash = "sha256-SxrCkaHhlf/+rYcYjuE7UecQWoAhgVy+keRbc0py36k="; }; - vendorHash = "sha256-LkjJrxrK1N+6v6ilMT68lu21B3NemxdquMIA5e8r1a0="; + vendorHash = "sha256-V+2ByID1/2yaxuy7OL21ZBzYgZchszMOblL0bNglcEY="; subPackages = [ "cmd/cloudlist/" ]; diff --git a/pkgs/by-name/cl/cloudlog/package.nix b/pkgs/by-name/cl/cloudlog/package.nix index 121396bedd2c..6c3ada1a5c39 100644 --- a/pkgs/by-name/cl/cloudlog/package.nix +++ b/pkgs/by-name/cl/cloudlog/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.8.6"; + version = "2.8.7"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-k+/KajRRKsfEFk8ApEJ154pT4cR54ZnavSrk8U4Azso="; + hash = "sha256-/zMZbM9TvFMZTUkAN4wqutZ+YQA9sVtdXZwEGISm6NA="; }; postPatch = '' diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix index 712052ad80c9..8c4b5959dfca 100644 --- a/pkgs/by-name/cn/cnquery/package.nix +++ b/pkgs/by-name/cn/cnquery/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "12.20.1"; + version = "12.22.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; tag = "v${version}"; - hash = "sha256-zsmu/PKsmqpG1TwK8VKY7F4YFQ89bmzFSNvI54Gy/gA="; + hash = "sha256-RauEf78cTRPHSmisDus/5XoROZp5VpZL0mKPXbRoPCw="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-cJCd8cXZa5JgY91D4+RnLOONZM/lj2Fbb3bU5pCbbbs="; + vendorHash = "sha256-Hh6dsxelPuuU7ISa2E396iUUrYdttG2HdxnBxYlXcis="; ldflags = [ "-w" diff --git a/pkgs/by-name/co/codex-acp/package.nix b/pkgs/by-name/co/codex-acp/package.nix index 613308ff33a9..f7c3e064941a 100644 --- a/pkgs/by-name/co/codex-acp/package.nix +++ b/pkgs/by-name/co/codex-acp/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex-acp"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "zed-industries"; repo = "codex-acp"; tag = "v${finalAttrs.version}"; - hash = "sha256-QQye6H5XCHDsqypXK5ROQ27PYk/W0Cip61sjECZDQo4="; + hash = "sha256-UtfvuejBnciksytIkTE2yFLTTy5gIB/kbOg7abTBGqQ="; }; - cargoHash = "sha256-pHJhzPSLX9lKa9FXuauF0brwgFSQgPIHOVo6l+PqnnI="; + cargoHash = "sha256-pCHmYa+5xkON2BoAh7RRe5lQeUqSNgqemt0stHQly6c="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/co/cog/package.nix b/pkgs/by-name/co/cog/package.nix index e99d7df42e57..18e16acac43e 100644 --- a/pkgs/by-name/co/cog/package.nix +++ b/pkgs/by-name/co/cog/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "cog"; - version = "0.0.51"; + version = "0.0.52"; src = fetchFromGitHub { owner = "grafana"; repo = "cog"; tag = "v${finalAttrs.version}"; - hash = "sha256-Z6UegaM4+OXOo6sjfLN1tGVbeYCN9nYKRqDlOpz4NPU="; + hash = "sha256-BebTJZo9bL6xQY0njfLzyeElTgnnJsizGY2G7D9ClXI="; }; - vendorHash = "sha256-AcBsXkXwXCtmJ5k+YBnQnmFZCrfarhuOygmqFJQ1CZk="; + vendorHash = "sha256-S0P65rjIMcDWcJxGyk9aR46bsVXdvVWSt+MLJ4tLdqc="; subPackages = [ "cmd/cli" ]; diff --git a/pkgs/by-name/co/collectl/package.nix b/pkgs/by-name/co/collectl/package.nix index df630fdd4d7d..8251bf100985 100644 --- a/pkgs/by-name/co/collectl/package.nix +++ b/pkgs/by-name/co/collectl/package.nix @@ -68,13 +68,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "collectl"; - version = "4.3.20.1"; + version = "4.3.20.2"; src = fetchFromGitHub { owner = "sharkcz"; repo = "collectl"; rev = finalAttrs.version; - hash = "sha256-OJGCuxWvoId1cQ5Ugiav5/T/NzddwhM+gG3s0BnYYz0="; + hash = "sha256-xIfimx7IbC5WHLCLPXGAhL9gkC4F+/JHDFYb0wwAK3I="; }; strictDeps = true; diff --git a/pkgs/by-name/co/color-lsp/package.nix b/pkgs/by-name/co/color-lsp/package.nix new file mode 100644 index 000000000000..1607772ee192 --- /dev/null +++ b/pkgs/by-name/co/color-lsp/package.nix @@ -0,0 +1,40 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "color-lsp"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "huacnlee"; + repo = "color-lsp"; + rev = "v${version}"; + hash = "sha256-U0pTzW2PCgMxVsa1QX9MC249PXXL2KvRSN1Em2WvIeI="; + }; + + cargoHash = "sha256-etK+9fcKS+y+0C36vJrMkQ0yyVSpCW/DLKg4nTw3LrE="; + + # Only build the color-lsp binary, not the zed extension + cargoBuildFlags = [ + "-p" + "color-lsp" + ]; + cargoTestFlags = [ + "-p" + "color-lsp" + ]; + + meta = { + description = "A document color language server supporting HEX, RGB, HSL, and named colors"; + homepage = "https://github.com/huacnlee/color-lsp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + tonybutt + matthiasbeyer + ]; + mainProgram = "color-lsp"; + }; +} diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix index 9308baacf939..335da70bd81f 100644 --- a/pkgs/by-name/co/coroot-node-agent/package.nix +++ b/pkgs/by-name/co/coroot-node-agent/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "coroot-node-agent"; - version = "1.28.1"; + version = "1.28.3"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot-node-agent"; rev = "v${finalAttrs.version}"; - hash = "sha256-g2qvfK+H1+pK6vBlC0nOwenfYF3/KFHZPiO3OZkOUyg="; + hash = "sha256-1jwj6saABm1RFmqO0c5ViFTveRmlsmrNZ5D7P6HtWMc="; }; - vendorHash = "sha256-sjdUjnBMzEfGCVOwuL9Zw/5Lup3yUf5LoBajLOCNteA="; + vendorHash = "sha256-OOd3OctfklHzpMVDCnnb8HYPYqWQgBe+8HfbSm7dXzg="; buildInputs = [ systemdLibs ]; diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix index 34fc741e7f40..bd1a3a711a1c 100644 --- a/pkgs/by-name/cr/crush/package.nix +++ b/pkgs/by-name/cr/crush/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "crush"; - version = "0.39.3"; + version = "0.41.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "crush"; tag = "v${finalAttrs.version}"; - hash = "sha256-XzshO11AgukJBhdfAVRn90TViyuI9cJftVfIOGqRyeM="; + hash = "sha256-CfYBAGuny+v7wvJBDCeZVxG+M9LE+eBaq5REjJA2yyw="; }; - vendorHash = "sha256-Y7QterJ5Mmjg/kMqFGbeSvd+3UwG8uGFTrdIBET5yRI="; + vendorHash = "sha256-2rEerdtwNAhQbdqabyyetw30DSpbmIxoiU2YPTWbEcg="; ldflags = [ "-s" diff --git a/pkgs/by-name/cs/csharpier/package.nix b/pkgs/by-name/cs/csharpier/package.nix index e419f73ae240..23a75a8bc7a7 100644 --- a/pkgs/by-name/cs/csharpier/package.nix +++ b/pkgs/by-name/cs/csharpier/package.nix @@ -2,10 +2,10 @@ buildDotnetGlobalTool { pname = "csharpier"; - version = "1.2.5"; + version = "1.2.6"; executables = "csharpier"; - nugetHash = "sha256-VevPiNTtfRJvmK/eYlJtJEJkYkiSvRoP7nTq7q9Bs9I="; + nugetHash = "sha256-SaBHGaaeg/1c4okHN1Pn8caGZgfLJ/KsGRqgUiAqKlQ="; meta = { description = "Opinionated code formatter for C#"; diff --git a/pkgs/by-name/cy/cyberchef/package.nix b/pkgs/by-name/cy/cyberchef/package.nix index bed595354e9e..8a47c17b1849 100644 --- a/pkgs/by-name/cy/cyberchef/package.nix +++ b/pkgs/by-name/cy/cyberchef/package.nix @@ -21,7 +21,7 @@ let categories = [ "Development" ]; } ); - version = "10.19.4"; + version = "10.21.0"; in stdenv.mkDerivation { pname = "cyberchef"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip"; - hash = "sha256-eOMo7kdxC5HfmMrKUhGZU3vnBXibO2Fz1ftIS9RAbjY="; + hash = "sha256-5w5Bl8LAmpx3dHAwfq4ALKKoS6zRBsh1X7p7ek4dy/s="; stripRoot = false; }; diff --git a/pkgs/by-name/de/deadlock-mod-manager/package.nix b/pkgs/by-name/de/deadlock-mod-manager/package.nix index 432c08e7c040..68510994039c 100644 --- a/pkgs/by-name/de/deadlock-mod-manager/package.nix +++ b/pkgs/by-name/de/deadlock-mod-manager/package.nix @@ -27,19 +27,19 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "deadlock-mod-manager"; - version = "0.13.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "deadlock-mod-manager"; repo = "deadlock-mod-manager"; tag = "v${finalAttrs.version}"; - hash = "sha256-ja7B48UVpwj1gCZfrFWZjtTTaUh1QLTAE88oXwDt18Y="; + hash = "sha256-A7RsgPi3NlcLSBkLg7/pWcSduaZyCspz19sjGjzEkqM="; }; cargoRoot = "apps/desktop"; buildAndTestSubdir = finalAttrs.cargoRoot; - cargoHash = "sha256-PeY59bvL/JGl8KyE0X+nPY3XC4TNa15lGcG2i///bCI="; + cargoHash = "sha256-L4orWiK1s1hfC2QDJ8G4hI1iqrdPHBaVTVHoW0hdlGo="; nativeBuildInputs = [ rustPlatform.cargoSetupHook @@ -79,7 +79,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpm = pnpm_9; fetcherVersion = 2; sourceRoot = "source"; - hash = "sha256-dS9s5oy8GtRek7OwiGDwv7280zZuyjxIhiA6BqH8C1w="; + hash = "sha256-KhBWFujjo3FW3intvGA2Y7eLIdJ1B/4P5xIRPvzygT8="; }; patches = [ diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix index 4ae69159ff9f..e27e65f4d3f7 100644 --- a/pkgs/by-name/dn/dnscontrol/package.nix +++ b/pkgs/by-name/dn/dnscontrol/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "dnscontrol"; - version = "4.33.1"; + version = "4.34.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; tag = "v${finalAttrs.version}"; - hash = "sha256-FshKD5ERC0DyPcgF65usYhNbobarwVFkk0oUh6MsxdQ="; + hash = "sha256-Qi/xg7yo/3r9AyY7r+bx7M95zWF+qjWlVrxix1pYfjM="; }; - vendorHash = "sha256-G8TEJwzPJ1WAEXmAdMhq2jSY5FADYMqhhUj7KUYc/gA="; + vendorHash = "sha256-lYi8rWFEAYQx9muy+JAknoCgEL2xVGSJ6npCTU+hdr8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/do/downkyicore/deps.json b/pkgs/by-name/do/downkyicore/deps.json new file mode 100644 index 000000000000..a265fec199b1 --- /dev/null +++ b/pkgs/by-name/do/downkyicore/deps.json @@ -0,0 +1,422 @@ +[ + { + "pname": "Avalonia", + "version": "11.3.6", + "hash": "sha256-dSq6RshqnvbHBPkSvp4rTOgtWmVUPVvaGZadPI2TK9g=" + }, + { + "pname": "Avalonia.Angle.Windows.Natives", + "version": "2.1.25547.20250602", + "hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M=" + }, + { + "pname": "Avalonia.BuildServices", + "version": "0.0.31", + "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA=" + }, + { + "pname": "Avalonia.Controls.ColorPicker", + "version": "11.3.6", + "hash": "sha256-oiaEB3gLyafsRyY8YZ/f//Wne4vAhd73jCF5XOZDIkw=" + }, + { + "pname": "Avalonia.Controls.DataGrid", + "version": "11.3.6", + "hash": "sha256-Hk1EOnd1E+ZrQTavmQtBZ4NvHiyFhzIMcT7UQPuU2Sw=" + }, + { + "pname": "Avalonia.Desktop", + "version": "11.3.6", + "hash": "sha256-n54YrP1SviFQH9VEXfw0O3o6K86rhGBbVw4vXhWUFOE=" + }, + { + "pname": "Avalonia.Diagnostics", + "version": "11.3.6", + "hash": "sha256-uFKSZLA5qvta/ZSVr+vvKT8l9asBT56iF6Lgxcawsgk=" + }, + { + "pname": "Avalonia.FreeDesktop", + "version": "11.3.6", + "hash": "sha256-KnnXq7iFyS94PbHfbk3ks/DHEQVKxkHD+Nhe0pTPZnc=" + }, + { + "pname": "Avalonia.Markup.Xaml.Loader", + "version": "11.0.7", + "hash": "sha256-JlvRAu+8RA+Q6sU9GAL5UA9ckNvrFSiWFHPhKSF3v8w=" + }, + { + "pname": "Avalonia.Native", + "version": "11.3.6", + "hash": "sha256-uVFziTCL3J2DvrjNl7O3aIKCChsm4tO7INDh+3hrlJw=" + }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "11.3.6", + "hash": "sha256-Nxg+jt3Eit9amUZPPicmXy+5/2nqEu6rTLRk7ccH+qE=" + }, + { + "pname": "Avalonia.Skia", + "version": "11.3.6", + "hash": "sha256-PqoGzraRMb4SAl0FAeROcTmPXUm5SHn6KCCdexIBgLM=" + }, + { + "pname": "Avalonia.Themes.Simple", + "version": "11.3.6", + "hash": "sha256-omvYccZgdrkD5KnPKQlafz7lMFL46KMQrTJVxF9AV0E=" + }, + { + "pname": "Avalonia.Win32", + "version": "11.3.6", + "hash": "sha256-zlYoHQMyvirc73hEnpjZbhz5BUss/jAlq6Jwb+8Fucc=" + }, + { + "pname": "Avalonia.X11", + "version": "11.3.6", + "hash": "sha256-nXHgvgp2cOjwchgkN1E0N47JWyYEkYTZ69FyEtCATf8=" + }, + { + "pname": "Downloader", + "version": "3.3.4", + "hash": "sha256-QbbWlP3IzDzPWuZcQCfqpKQZMPSMETL/+6AXlhcjVc8=" + }, + { + "pname": "DryIoc.dll", + "version": "4.8.0", + "hash": "sha256-RcQour05/6Sk6m287U0xzeLtn3j8lYfi0vybR+0558c=" + }, + { + "pname": "FFMpegCore", + "version": "5.1.0", + "hash": "sha256-k6AOQjAAWiZI0g7wr32z+0kb48gfcQ1n2XhK4TL53xA=" + }, + { + "pname": "FreeSql", + "version": "3.5.212", + "hash": "sha256-VwgsUXriNR09s19t3WxHFEmU49BF3fppo9Jormq/3VA=" + }, + { + "pname": "FreeSql.DbContext", + "version": "3.5.212", + "hash": "sha256-pXfIFJoHcRZFaDnXSiCvr6j9oTNDCL81YL50Mf+fL6I=" + }, + { + "pname": "FreeSql.Provider.SqliteCore", + "version": "3.5.212", + "hash": "sha256-6MGO6qZgiOXyYLRKvDUwFBP2B/SeAdlZPx+pkAJ3hfo=" + }, + { + "pname": "Google.Protobuf", + "version": "3.25.1", + "hash": "sha256-UfP/iIcARptUcTVptj/5JQ9Jz9AG3aj+iKotsetOnH0=" + }, + { + "pname": "HarfBuzzSharp", + "version": "8.3.1.1", + "hash": "sha256-614yv6bK9ynhdUnvW4wIkgpBe2sqTh28U9cDZzdhPc0=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Linux", + "version": "8.3.1.1", + "hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.macOS", + "version": "8.3.1.1", + "hash": "sha256-hK20KbX2OpewIO5qG5gWw5Ih6GoLcIDgFOqCJIjXR/Q=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", + "version": "8.3.1.1", + "hash": "sha256-mLKoLqI47ZHXqTMLwP1UCm7faDptUfQukNvdq6w/xxw=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Win32", + "version": "8.3.1.1", + "hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo=" + }, + { + "pname": "Instances", + "version": "3.0.0", + "hash": "sha256-tqIbgABsgi8JgT5h+WkCehANUmCzK5/p0UZH5xjOy2Y=" + }, + { + "pname": "MicroCom.Runtime", + "version": "0.11.0", + "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=" + }, + { + "pname": "Microsoft.Data.Sqlite.Core", + "version": "9.0.5", + "hash": "sha256-LmIKIg6oTKjrLmbJgETn9vFmhVYFazUW2W7VfzPgQSM=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection", + "version": "8.0.0", + "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "8.0.1", + "hash": "sha256-lzTYLpRDAi3wW9uRrkTNJtMmaYdtGJJHdBLbUKu60PM=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "8.0.1", + "hash": "sha256-TYce3qvMr92JbAZ62ATBsocaH0joJzw0px0tYGZ9N0U=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "3.1.0", + "hash": "sha256-cnygditsEaU86bnYtIthNMymAHqaT/sf9Gjykhzqgb0=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.0", + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + }, + { + "pname": "Microsoft.Win32.SystemEvents", + "version": "4.7.0", + "hash": "sha256-GHxnD1Plb32GJWVWSv0Y51Kgtlb+cdKgOYVBYZSgVF4=" + }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.3", + "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" + }, + { + "pname": "Prism.Avalonia", + "version": "8.1.97.11073", + "hash": "sha256-iZTropXsrrgv4CjjFQRqjRbhBPeP21zEofiN81454wA=" + }, + { + "pname": "Prism.Core", + "version": "8.1.97", + "hash": "sha256-hAU7OpnhTZ6gKkict2BDlb3B0G1rnadDiTHoaCU9Nfc=" + }, + { + "pname": "Prism.DryIoc.Avalonia", + "version": "8.1.97.11073", + "hash": "sha256-4mEQe3H/bnf2eazOeeL+pfJbwnGTQd0LB8t5cgaOhHo=" + }, + { + "pname": "QRCoder", + "version": "1.6.0", + "hash": "sha256-2Ev/6d7PH6K4dVYQQHlZ+ZggkCnDtrlaGygs65mDo28=" + }, + { + "pname": "runtime.any.System.IO", + "version": "4.3.0", + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" + }, + { + "pname": "runtime.any.System.Reflection", + "version": "4.3.0", + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" + }, + { + "pname": "runtime.any.System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" + }, + { + "pname": "runtime.any.System.Runtime", + "version": "4.3.0", + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" + }, + { + "pname": "runtime.any.System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" + }, + { + "pname": "runtime.any.System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" + }, + { + "pname": "runtime.native.System", + "version": "4.3.0", + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" + }, + { + "pname": "runtime.unix.System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" + }, + { + "pname": "SkiaSharp", + "version": "2.88.9", + "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24=" + }, + { + "pname": "SkiaSharp.NativeAssets.Linux", + "version": "2.88.9", + "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A=" + }, + { + "pname": "SkiaSharp.NativeAssets.macOS", + "version": "2.88.9", + "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g=" + }, + { + "pname": "SkiaSharp.NativeAssets.WebAssembly", + "version": "2.88.9", + "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY=" + }, + { + "pname": "SkiaSharp.NativeAssets.Win32", + "version": "2.88.9", + "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" + }, + { + "pname": "SQLitePCLRaw.bundle_e_sqlcipher", + "version": "2.1.11", + "hash": "sha256-wHveswfPGD1t70PcHOvB9o4devEiGRJfnA/f0GC9wHg=" + }, + { + "pname": "SQLitePCLRaw.core", + "version": "2.1.11", + "hash": "sha256-s/fxEoYlNf9c2C4HZueMzPCBvpiViDVlSpg7epB0GXY=" + }, + { + "pname": "SQLitePCLRaw.lib.e_sqlcipher", + "version": "2.1.11", + "hash": "sha256-Rh713RQnhLRLImYvhT3V3notKOnJjgFl8mcz2Bo1VpY=" + }, + { + "pname": "SQLitePCLRaw.provider.e_sqlcipher", + "version": "2.1.11", + "hash": "sha256-PpUqjhd17HGN2eKpod2OZ8Er8G4OtlThXWu4t2nE2FY=" + }, + { + "pname": "System.Collections.Immutable", + "version": "9.0.5", + "hash": "sha256-gkdeCPvmRWtUQqW3LOTGdmf2DzY0D9OKeW1jvd3EbSM=" + }, + { + "pname": "System.Configuration.ConfigurationManager", + "version": "4.7.0", + "hash": "sha256-rYjp/UmagI4ZULU1ocia/AiXxLNL8uhMV8LBF4QFW10=" + }, + { + "pname": "System.Drawing.Common", + "version": "4.7.0", + "hash": "sha256-D3qG+xAe78lZHvlco9gHK2TEAM370k09c6+SQi873Hk=" + }, + { + "pname": "System.Formats.Nrbf", + "version": "9.0.5", + "hash": "sha256-i8XH8fQWFFKhHJX6IEw5N/RDBNjONj7+gT80xE/zUvY=" + }, + { + "pname": "System.IO", + "version": "4.3.0", + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" + }, + { + "pname": "System.IO.Pipelines", + "version": "8.0.0", + "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" + }, + { + "pname": "System.Memory", + "version": "4.5.3", + "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" + }, + { + "pname": "System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" + }, + { + "pname": "System.Reflection", + "version": "4.3.0", + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" + }, + { + "pname": "System.Reflection.Emit", + "version": "4.3.0", + "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" + }, + { + "pname": "System.Reflection.Emit.ILGeneration", + "version": "4.3.0", + "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" + }, + { + "pname": "System.Reflection.Emit.Lightweight", + "version": "4.3.0", + "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "9.0.5", + "hash": "sha256-HhI7ENFGiQXOQmc+BORqFzGtW/989pmm+W4exAWw/8Q=" + }, + { + "pname": "System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" + }, + { + "pname": "System.Runtime", + "version": "4.3.0", + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" + }, + { + "pname": "System.Security.AccessControl", + "version": "4.7.0", + "hash": "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g=" + }, + { + "pname": "System.Security.Cryptography.ProtectedData", + "version": "4.7.0", + "hash": "sha256-dZfs5q3Ij1W1eJCfYjxI2o+41aSiFpaAugpoECaCOug=" + }, + { + "pname": "System.Security.Permissions", + "version": "4.7.0", + "hash": "sha256-BGgXMLUi5rxVmmChjIhcXUxisJjvlNToXlyaIbUxw40=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "4.7.0", + "hash": "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "7.0.0", + "hash": "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ=" + }, + { + "pname": "System.Text.Json", + "version": "7.0.2", + "hash": "sha256-bkfxuc3XPxtYcOJTGRMc/AkJiyIU+fTLK7PxtbuN3sQ=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" + }, + { + "pname": "System.Windows.Extensions", + "version": "4.7.0", + "hash": "sha256-yW+GvQranReaqPw5ZFv+mSjByQ5y1pRLl05JIEf3tYU=" + }, + { + "pname": "Tmds.DBus.Protocol", + "version": "0.21.2", + "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI=" + }, + { + "pname": "Xaml.Behaviors", + "version": "11.3.0", + "hash": "sha256-n8s/zTSzovI9HYvTzBQHUi6e/zo//6thM2w73O9T+iY=" + } +] \ No newline at end of file diff --git a/pkgs/by-name/do/downkyicore/package.nix b/pkgs/by-name/do/downkyicore/package.nix new file mode 100644 index 000000000000..dbecfc742178 --- /dev/null +++ b/pkgs/by-name/do/downkyicore/package.nix @@ -0,0 +1,141 @@ +{ + lib, + stdenv, + buildDotnetModule, + dotnetCorePackages, + fetchFromGitHub, + nix-update-script, + autoPatchelfHook, + copyDesktopItems, + makeDesktopItem, + icoutils, + aria2, + ffmpeg, + fontconfig, + freetype, + icu, + krb5, + openssl, + zlib, + lttng-ust_2_12, + libx11, + libxcursor, + libxext, + libxi, + libxrandr, + libice, + libsm, +}: + +buildDotnetModule (finalAttrs: { + pname = "downkyicore"; + version = "1.0.23"; + + src = fetchFromGitHub { + owner = "yaobiao131"; + repo = "downkyicore"; + tag = "v${finalAttrs.version}"; + hash = "sha256-1APolFe2eq7aIZdg3Sl4DI/6lnvaAgX/GDcHx3M+o/I="; + }; + + projectFile = "DownKyi/DownKyi.csproj"; + nugetDeps = ./deps.json; + + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + executables = [ "DownKyi" ]; + + nativeBuildInputs = [ + copyDesktopItems + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + autoPatchelfHook + icoutils + ]; + + buildInputs = [ + aria2 + ffmpeg + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + fontconfig + freetype + icu + krb5 + openssl + zlib + lttng-ust_2_12 + (lib.getLib stdenv.cc.cc) + ]; + + runtimeDeps = lib.optionals stdenv.hostPlatform.isLinux [ + libx11 + libxcursor + libxext + libxi + libxrandr + libice + libsm + ]; + + postPatch = '' + substituteInPlace DownKyi/DownKyi.csproj DownKyi.Core/DownKyi.Core.csproj \ + --replace-fail net6.0 net8.0 + ''; + + makeWrapperArgs = [ + "--chdir" + "${placeholder "out"}/lib/downkyicore" + ]; + + passthru.updateScript = nix-update-script { }; + + # Provide system ffmpeg/aria2 binaries and license texts where the app expects them. + postInstall = '' + mkdir -p $out/lib/downkyicore/{aria2,ffmpeg} + + ln -s ${lib.getExe aria2} $out/lib/downkyicore/aria2/aria2c + ln -s ${lib.getExe' ffmpeg "ffmpeg"} $out/lib/downkyicore/ffmpeg/ffmpeg + ln -s ${lib.getExe' ffmpeg "ffprobe"} $out/lib/downkyicore/ffmpeg/ffprobe + + printf 'See https://github.com/aria2/aria2/blob/master/COPYING for aria2 licensing information.\n' > $out/lib/downkyicore/aria2_COPYING.txt + printf 'See https://ffmpeg.org/legal.html for FFmpeg licensing information.\n' > $out/lib/downkyicore/FFmpeg_LICENSE.txt + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + icotool -x DownKyi/Resources/favicon.ico + install -Dm444 \ + favicon_*_128x128x32.png \ + $out/share/icons/hicolor/128x128/apps/downkyicore.png + ''; + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + app="$out/Applications/DownKyi.app" + mkdir -p "$app/Contents/MacOS" "$app/Contents/Resources" + + cp $src/script/macos/Info.plist "$app/Contents/Info.plist" + makeWrapper "$out/bin/DownKyi" "$app/Contents/MacOS/DownKyi" + cp $src/script/macos/logo.icns "$app/Contents/Resources/logo.icns" + ''; + + desktopItems = lib.optionals stdenv.hostPlatform.isLinux [ + (makeDesktopItem { + name = "downkyicore"; + desktopName = "DownKyi"; + comment = "Cross-platform Bilibili downloader"; + exec = "DownKyi"; + icon = "downkyicore"; + categories = [ + "Network" + "AudioVideo" + ]; + }) + ]; + + meta = { + description = "Cross-platform Bilibili downloader built with Avalonia"; + homepage = "https://github.com/yaobiao131/downkyicore"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ mio ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + mainProgram = "DownKyi"; + }; +}) diff --git a/pkgs/by-name/dr/drupal/package.nix b/pkgs/by-name/dr/drupal/package.nix index 92810ea2aaaa..89ea3561993f 100644 --- a/pkgs/by-name/dr/drupal/package.nix +++ b/pkgs/by-name/dr/drupal/package.nix @@ -8,18 +8,18 @@ php.buildComposerProject2 (finalAttrs: { pname = "drupal"; - version = "11.3.2"; + version = "11.3.3"; src = fetchFromGitLab { domain = "git.drupalcode.org"; owner = "project"; repo = "drupal"; tag = finalAttrs.version; - hash = "sha256-RrBnVDjB6aKW6btmX604saXfPKo18oRka+SdlNmFqUo="; + hash = "sha256-QD/vk19OLrI8whxZ9dJROL/v90U4QuCfeONs0OX4qS4="; }; composerNoPlugins = false; - vendorHash = "sha256-c3pqPnyeuSqpMhh1an1NAnDC+IyeRVUT+dCN19/nrMQ="; + vendorHash = "sha256-YsNg5l72htLoJgBhQ+RYxWYK5nB5Nq7Js6tf8L+BE7E="; passthru = { tests = { diff --git a/pkgs/by-name/et/etBook/package.nix b/pkgs/by-name/et/et-book/package.nix similarity index 92% rename from pkgs/by-name/et/etBook/package.nix rename to pkgs/by-name/et/et-book/package.nix index b76b8ae1b210..a25b27d5c6a9 100644 --- a/pkgs/by-name/et/etBook/package.nix +++ b/pkgs/by-name/et/et-book/package.nix @@ -26,6 +26,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Typeface used in Edward Tufte’s books"; + homepage = "https://edwardtufte.github.io/et-book/"; license = lib.licenses.mit; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ jethro ]; diff --git a/pkgs/by-name/fa/faketty/package.nix b/pkgs/by-name/fa/faketty/package.nix index 946cb75ea9a6..994669ea4e03 100644 --- a/pkgs/by-name/fa/faketty/package.nix +++ b/pkgs/by-name/fa/faketty/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { asl20 # or mit ]; - maintainers = [ ]; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "faketty"; }; } diff --git a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix index 920d6600fd7f..9e8633590174 100644 --- a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix +++ b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "fcitx5-pinyin-moegirl"; - version = "20260109"; + version = "20260209"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict"; - hash = "sha256-xGZ7sxELPlPo27oSCoDXQrligkmcw/fDexIFt/S0rqc="; + hash = "sha256-ZpuAcS6KgVRL8ru+U///Zi7jiXLGIbSx6dPF0KWLvwQ="; }; dontUnpack = true; diff --git a/pkgs/by-name/ff/ffmpeg-normalize/package.nix b/pkgs/by-name/ff/ffmpeg-normalize/package.nix index 363665db0f44..503bf797b9dc 100644 --- a/pkgs/by-name/ff/ffmpeg-normalize/package.nix +++ b/pkgs/by-name/ff/ffmpeg-normalize/package.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.36.1"; + version = "1.37.3"; pyproject = true; src = fetchPypi { inherit version; pname = "ffmpeg_normalize"; - hash = "sha256-HcGdP/XvLHxAQMC9infjVTMXd+/DHNBd5m5XDzBXZKk="; + hash = "sha256-mN4vmiST+LV5Bv/QZ9Pvo3qzhTaeD3MpDa8sLNqjeW0="; }; build-system = with python3Packages; [ uv-build ]; diff --git a/pkgs/by-name/fo/focuswriter/package.nix b/pkgs/by-name/fo/focuswriter/package.nix index e1eab242465b..9f04ec316f69 100644 --- a/pkgs/by-name/fo/focuswriter/package.nix +++ b/pkgs/by-name/fo/focuswriter/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "focuswriter"; - version = "1.8.13"; + version = "1.9.0"; src = fetchFromGitHub { owner = "gottcode"; repo = "focuswriter"; rev = "v${finalAttrs.version}"; - hash = "sha256-lKhgfFPEcipQcW1S2+ntglVacH6dEcGpnNHvwgeVIzI="; + hash = "sha256-wGm+0bB4dxH6PA6993pDZopSMDNVoIHPcQXkdllcjHU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fr/freedv/no-framework.patch b/pkgs/by-name/fr/freedv/no-framework.patch index cf31c17b1d48..29cce76b27aa 100644 --- a/pkgs/by-name/fr/freedv/no-framework.patch +++ b/pkgs/by-name/fr/freedv/no-framework.patch @@ -6,8 +6,8 @@ index 38b3b262..3be9bfee 100644 TARGET FreeDV POST_BUILD COMMAND rm -rf dist_tmp FreeDV.dmg || true -- COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${portaudio_BINARY_DIR}:${samplerate_BINARY_DIR}/src:${Python3_ROOT_DIR}:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${CODEC2_BUILD_DIR}/src -s ${CMAKE_BINARY_DIR}/codec2_build/src ${PORTAUDIO_BUNDLE_ARG} -s ${samplerate_BINARY_DIR}/src -s ${rade_BINARY_DIR}/src -s ${Python3_ROOT_DIR} -s `dirname ${CLANG_SANITIZER_FILE}` -+ COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${portaudio_BINARY_DIR}:${samplerate_BINARY_DIR}/src:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${CODEC2_BUILD_DIR}/src -s ${CMAKE_BINARY_DIR}/codec2_build/src ${PORTAUDIO_BUNDLE_ARG} -s ${samplerate_BINARY_DIR}/src -s ${rade_BINARY_DIR}/src -s `dirname ${CLANG_SANITIZER_FILE}` +- COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${portaudio_BINARY_DIR}:${samplerate_BINARY_DIR}/src:${Python3_ROOT_DIR}/../..:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${CODEC2_BUILD_DIR}/src -s ${CMAKE_BINARY_DIR}/codec2_build/src ${PORTAUDIO_BUNDLE_ARG} -s ${samplerate_BINARY_DIR}/src -s ${rade_BINARY_DIR}/src -s ${Python3_ROOT_DIR}/../.. -s `dirname ${CLANG_SANITIZER_FILE}` -ns ++ COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${portaudio_BINARY_DIR}:${samplerate_BINARY_DIR}/src:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${CODEC2_BUILD_DIR}/src -s ${CMAKE_BINARY_DIR}/codec2_build/src ${PORTAUDIO_BUNDLE_ARG} -s ${samplerate_BINARY_DIR}/src -s ${rade_BINARY_DIR}/src -s `dirname ${CLANG_SANITIZER_FILE}` -ns COMMAND cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/freedv.icns FreeDV.app/Contents/Resources COMMAND rm ARGS -rf FreeDV.app/Contents/Frameworks COMMAND mkdir ARGS FreeDV.app/Contents/Frameworks @@ -21,7 +21,7 @@ index 38b3b262..3be9bfee 100644 - COMMAND cd FreeDV.app/Contents/Resources && ../Frameworks/Python.framework/Versions/Current/bin/python3 -c "import radae_txe\; import radae_rxe\;" && cd ../../.. - # Codesign binary so that it can execute -- COMMAND codesign --force --options runtime --timestamp --entitlements ${CMAKE_CURRENT_SOURCE_DIR}/entitlements.plist --sign ${MACOS_CODESIGN_IDENTITY} ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app -name '*.so' -o -name '*.dylib'` `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.12/bin -name 'Python' -o -name 'python3.12*'` `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/ -name 'Python'` ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/MacOS/FreeDV ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.12/lib/python3.12/site-packages/torch/bin/* ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.12/Python +- COMMAND codesign --force --options runtime --timestamp --entitlements ${CMAKE_CURRENT_SOURCE_DIR}/entitlements.plist --sign ${MACOS_CODESIGN_IDENTITY} ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app -name '*.so' -o -name '*.dylib'` `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/Current/bin -name 'Python' -o -name 'python3.*'` `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/ -name 'Python'` ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/MacOS/FreeDV ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/Current/lib/python3.*/site-packages/torch/bin/* ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.*/Frameworks/Tcl.framework/Versions/*/*.a ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.*/Frameworks/Tk.framework/Versions/*/*.a ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.*/Frameworks/Tk.framework/Versions/*/Tk ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/3.*/Frameworks/Tcl.framework/Versions/*/Tcl ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app/Contents/Frameworks/Python.framework/Versions/*/Python + COMMAND codesign --force --options runtime --timestamp --entitlements ${CMAKE_CURRENT_SOURCE_DIR}/entitlements.plist --sign ${MACOS_CODESIGN_IDENTITY} ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app `find ${CMAKE_CURRENT_BINARY_DIR}/FreeDV.app -name '*.so' -o -name '*.dylib'` ) diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix index f1c3cfb78e42..a5d3af69c2d3 100644 --- a/pkgs/by-name/fr/freedv/package.nix +++ b/pkgs/by-name/fr/freedv/package.nix @@ -34,12 +34,6 @@ let rev = "v1.2.6"; hash = "sha256-UKO2k+kKH/dwt2xfaYMrH/GXjEkIrnxh1kGG/3P5d3Y="; }; - mimallocSrc = fetchFromGitHub { - owner = "microsoft"; - repo = "mimalloc"; - tag = "v2.2.4"; - hash = "sha256-+8xZT+mVEqlqabQc+1buVH/X6FZxvCd0rWMyjPu9i4o="; - }; opusSrc = fetchFromGitHub { owner = "xiph"; repo = "opus"; @@ -57,19 +51,27 @@ let radaeSrc = fetchFromGitHub { owner = "drowe67"; repo = "radae"; - rev = "0f26661b26d02e6963353dce7ad1bbe3f4791ab2"; - hash = "sha256-0pCH+oyVChWdOL5o6Uhb9DDSw4AqCfcsEKw2SZs3K4w="; + rev = "5d640a028ab2b8e4ff23ed7136caee396cdcb844"; + # upstream repository archive fetching is broken + forceFetchGit = true; + hash = "sha256-+Sd+FWycEJabT3RN/zyKXS2Xzr060/ekYdzg6s1gQcM="; + }; + radeInteg = fetchFromGitHub { + owner = "drowe67"; + repo = "radae"; + rev = "7bd3ae2401fcba58e314755576a2940085835312"; + hash = "sha256-WVYKvttiNh6uEzw0b27winyDfzzGkEEhYq7DIwfZW74="; }; in stdenv.mkDerivation (finalAttrs: { pname = "freedv"; - version = "2.1.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; tag = "v${finalAttrs.version}"; - hash = "sha256-3nLO0UHoIjPN5liz3XJ7r9/Qo+a64ewqvzWPZuFG2SY="; + hash = "sha256-7SOGz2+MzAkXd5JDKasSJcKVXcnuYk+C0S9N/NPRfOM="; }; patches = [ @@ -78,19 +80,20 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' cp -R ${ebur128Src} ebur128 - cp -R ${mimallocSrc} mimalloc cp -R ${radaeSrc} radae - chmod -R u+w ebur128 mimalloc radae + cp -R ${radeInteg} rade_integ + chmod -R u+w ebur128 radae rade_integ substituteInPlace cmake/BuildEbur128.cmake \ --replace-fail "GIT_REPOSITORY https://github.com/jiixyj/libebur128.git" "URL $(realpath ebur128)" \ --replace-fail 'GIT_TAG "v''${EBUR128_VERSION}"' "" \ --replace-fail "git apply" "patch -p1 <" - substituteInPlace cmake/BuildMimalloc.cmake \ - --replace-fail "GIT_REPOSITORY https://github.com/microsoft/mimalloc.git" "URL $(realpath mimalloc)" \ - --replace-fail "GIT_TAG v2.2.4" "" substituteInPlace cmake/BuildRADE.cmake \ --replace-fail "https://github.com/xiph/opus/archive/940d4e5af64351ca8ba8390df3f555484c567fbb.zip" "${opusSrc}" \ --replace-fail "GIT_REPOSITORY https://github.com/drowe67/radae.git" "URL $(realpath radae)" \ + --replace-fail "GIT_TAG main" "" + substituteInPlace cmake/BuildRADEForIntegrations.cmake \ + --replace-fail "https://github.com/xiph/opus/archive/940d4e5af64351ca8ba8390df3f555484c567fbb.zip" "${opusSrc}" \ + --replace-fail "GIT_REPOSITORY https://github.com/drowe67/radae.git" "URL $(realpath rade_integ)" \ --replace-fail "GIT_TAG ms-disable-python-gc" "" patchShebangs test/test_*.sh substituteInPlace cmake/CheckGit.cmake \ diff --git a/pkgs/by-name/fr/fresh-editor/package.nix b/pkgs/by-name/fr/fresh-editor/package.nix index 08125e94188f..4a1e074aebfb 100644 --- a/pkgs/by-name/fr/fresh-editor/package.nix +++ b/pkgs/by-name/fr/fresh-editor/package.nix @@ -80,7 +80,6 @@ rustPlatform.buildRustPackage (finalAttrs: { platforms = lib.platforms.linux ++ lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ fromSource - binaryNativeCode # librusty_v8.a ]; }; }) diff --git a/pkgs/by-name/gd/gdal/package.nix b/pkgs/by-name/gd/gdal/package.nix index ea009b46261b..011aa5a3f941 100644 --- a/pkgs/by-name/gd/gdal/package.nix +++ b/pkgs/by-name/gd/gdal/package.nix @@ -83,13 +83,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal"; - version = "3.12.1"; + version = "3.12.2"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; tag = "v${finalAttrs.version}"; - hash = "sha256-vs9qun9Z8o4KPxWjKOV9Lp/GgAsYW7gseYv4G7+liso="; + hash = "sha256-W9MSZP+qmG7r2SzjOXbeYebY5vx8z8cpySv/sGyj42Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gf/gf/package.nix b/pkgs/by-name/gf/gf/package.nix index a1c769d05769..27acfbcc79c8 100644 --- a/pkgs/by-name/gf/gf/package.nix +++ b/pkgs/by-name/gf/gf/package.nix @@ -39,14 +39,13 @@ stdenv.mkDerivation { ./build-use-optional-freetype-with-pkg-config.patch ]; - postPatch = [ - (lib.optionalString withExtensions '' + postPatch = + lib.optionalString withExtensions '' cp ./extensions_v5/extensions.cpp . - '') - (lib.optionalString (pluginsFile != null) '' + '' + + lib.optionalString (pluginsFile != null) '' cp ${pluginsFile} ./plugins.cpp - '') - ]; + ''; preConfigure = '' patchShebangs build.sh diff --git a/pkgs/by-name/gh/ghw/package.nix b/pkgs/by-name/gh/ghw/package.nix index 4a48651f44e4..e3c0544bb948 100644 --- a/pkgs/by-name/gh/ghw/package.nix +++ b/pkgs/by-name/gh/ghw/package.nix @@ -6,15 +6,15 @@ }: buildGoModule (finalAttrs: { pname = "ghw"; - version = "0.21.2"; + version = "0.22.0"; src = fetchFromGitHub { owner = "jaypipes"; repo = "ghw"; tag = "v${finalAttrs.version}"; - hash = "sha256-WZGEhrgHmJ/4puvDPYLq3iU+Ddf1PnptRj0ehcDbjZQ="; + hash = "sha256-W3a6hKX8vsWe02uLUx9zIOmJiivIOa4Ja++iXVd8J3E="; }; - vendorHash = "sha256-lItNgi65HQASNQufUdhvEoNtrltkW+0hBHUlFZjfneE="; + vendorHash = "sha256-REgtByhTlYQ3XyYleWAcrCymIWtWmltjx21tr2mtF7k="; subPackages = [ "cmd/..." ]; doCheck = false; # wants to read from /sys and other places not allowed diff --git a/pkgs/by-name/go/google-java-format/package.nix b/pkgs/by-name/go/google-java-format/package.nix index 0cc1f49f7e1f..6cb5f688e32e 100644 --- a/pkgs/by-name/go/google-java-format/package.nix +++ b/pkgs/by-name/go/google-java-format/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "google-java-format"; - version = "1.34.0"; + version = "1.34.1"; src = fetchurl { url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar"; - sha256 = "sha256-S7/IwMJ6Eux420pXJQTPeDab3aztUOGZxPmfBW/DLUE="; + sha256 = "sha256-eeHLXIvWmMVywK5QTQeBYSm4/AYgT7SVUL7IO9XqCqg="; }; dontUnpack = true; diff --git a/pkgs/by-name/go/goose-cli/package.nix b/pkgs/by-name/go/goose-cli/package.nix index b133c02dceb8..acc6820fa763 100644 --- a/pkgs/by-name/go/goose-cli/package.nix +++ b/pkgs/by-name/go/goose-cli/package.nix @@ -28,16 +28,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "goose-cli"; - version = "1.19.1"; + version = "1.23.2"; src = fetchFromGitHub { owner = "block"; repo = "goose"; tag = "v${finalAttrs.version}"; - hash = "sha256-BgY3YDe6x46XvHyE0Ia6SxNGTyU0MegkYz5TbOZVrrQ="; + hash = "sha256-Zwb3y9XhtmKxJG6XOIHl49YVZMBsYtOPePM7heJfEvE="; }; - cargoHash = "sha256-2jjAqIBLd7awzLcowYKADHyluclrH+iELUSMvACRj30="; + cargoHash = "sha256-G6Jok2OfSlOVlkF62gxivrKM0VlGqWFNdR0pQh79A0Q="; cargoBuildFlags = [ "--bin" @@ -113,6 +113,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=recipes::extract_from_cli::tests::test_extract_recipe_info_from_cli_basic" "--skip=recipes::extract_from_cli::tests::test_extract_recipe_info_from_cli_with_additional_sub_recipes" "--skip=recipes::recipe::tests::load_recipe::test_load_recipe_success" + "--skip=test_session_id_matches_across_calls" + "--skip=test_session_id_propagation_to_llm" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gr/grok-cli/package.nix b/pkgs/by-name/gr/grok-cli/package.nix index 8c2455771374..1b2ab1a32e3a 100644 --- a/pkgs/by-name/gr/grok-cli/package.nix +++ b/pkgs/by-name/gr/grok-cli/package.nix @@ -35,7 +35,7 @@ buildNpmPackage rec { description = "AI agent CLI powered by Grok"; homepage = "https://github.com/superagent-ai/grok-cli"; license = lib.licenses.mit; - maintainers = with lib; [ maintainers.madebydamo ]; + maintainers = with lib.maintainers; [ madebydamo ]; mainProgram = "grok"; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/gy/gyre-fonts/package.nix b/pkgs/by-name/gy/gyre-fonts/package.nix index aaf2adb8ebe5..5e47fa1305a2 100644 --- a/pkgs/by-name/gy/gyre-fonts/package.nix +++ b/pkgs/by-name/gy/gyre-fonts/package.nix @@ -4,21 +4,21 @@ fetchzip, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "gyre-fonts"; - version = "2.005"; + version = "2.501"; src = fetchzip { - url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-${version}otf.zip"; - stripRoot = false; - hash = "sha256-+6IufuFf+IoLXoZEPlfHUNgRhKrQNBEZ1OwPD9/uOjg="; + url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg${ + lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version + }otf.zip"; + hash = "sha256-mRPI/rDsx1vDVItG7h29I7VNPYqgSPqChXS6/gVgfNc="; }; installPhase = '' runHook preInstall - mkdir -p $out/share/fonts/truetype - cp *.otf $out/share/fonts/truetype + install -D --mode=444 --target-directory=$out/share/fonts/opentype *.otf runHook postInstall ''; @@ -37,4 +37,4 @@ stdenvNoCC.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ bergey ]; }; -} +}) diff --git a/pkgs/by-name/ho/homebridge-config-ui-x/package.nix b/pkgs/by-name/ho/homebridge-config-ui-x/package.nix index 2800d340ba6d..5d77836820f5 100644 --- a/pkgs/by-name/ho/homebridge-config-ui-x/package.nix +++ b/pkgs/by-name/ho/homebridge-config-ui-x/package.nix @@ -8,27 +8,28 @@ python3, cacert, versionCheckHook, + nodejs_22, }: -buildNpmPackage (finalAttrs: { +buildNpmPackage.override { nodejs = nodejs_22; } (finalAttrs: { pname = "homebridge-config-ui-x"; - version = "5.14.0"; + version = "5.16.0"; src = fetchFromGitHub { owner = "homebridge"; repo = "homebridge-config-ui-x"; tag = "v${finalAttrs.version}"; - hash = "sha256-CAdzkFuVuJtHoUUDBIRRzxRJiOtGUJFzS/lczYXTfRw="; + hash = "sha256-LXOfpOmYEeHDL0uMvRSG4q51k00tyKBEU6XP6UFm/RY="; }; # Deps hash for the root package - npmDepsHash = "sha256-73Xt2R3COL0WPgtqn3ZwGTmOHrNqHONrX3hQCU/v5y0="; + npmDepsHash = "sha256-MUfDMHxnwEBjv76NoJ6CYP3YJ+us0Nn/MUFcR1NFQAE="; # Deps src and hash for ui subdirectory npmDeps_ui = fetchNpmDeps { name = "npm-deps-ui"; src = "${finalAttrs.src}/ui"; - hash = "sha256-xtXAeTBryQt4FMvK3oXHJ3DdB/3umrSrmqZ3IIDgq2s="; + hash = "sha256-GB17rJ2D1yXl/lxM8pQl2e2xnakgA8JLX7sbbdk3P5M="; }; # Need to also run npm ci in the ui subdirectory @@ -59,6 +60,8 @@ buildNpmPackage (finalAttrs: { ]; doInstallCheck = true; + passthru.updateScript = ./update.sh; + meta = { description = "Configure Homebridge, monitor and backup from a browser"; homepage = "https://github.com/homebridge/homebridge-config-ui-x"; diff --git a/pkgs/by-name/ho/homebridge-config-ui-x/update.sh b/pkgs/by-name/ho/homebridge-config-ui-x/update.sh new file mode 100755 index 000000000000..a0c889fbb101 --- /dev/null +++ b/pkgs/by-name/ho/homebridge-config-ui-x/update.sh @@ -0,0 +1,77 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl jq gnugrep gnused git nix +# shellcheck shell=bash +set -euo pipefail + +nixpkgs="$(pwd)" +cd "$(readlink -e "$(dirname "${BASH_SOURCE[0]}")")" + +pkg="(import $nixpkgs/default.nix {}).homebridge-config-ui-x" + +nix_eval() { + nix eval --json --impure --expr "$pkg.$1" | jq -r +} + +# Build a fixed-output derivation with an empty hash to get the correct one +nix_prefetch() { + local attr="$1" + local expr="let src = $pkg.$attr; in (src.overrideAttrs or (f: src // f src)) (_: { outputHash = \"\"; outputHashAlgo = \"sha256\"; })" + nix-build --impure --no-out-link --expr "$expr" 2>&1 | tr -s ' ' | grep -oP 'got:\s+\K\S+' || true +} + +update_src_hash() { + echo "Updating source hash..." + local old_hash new_hash + old_hash=$(nix_eval "src.outputHash") + new_hash=$(nix_prefetch "src") + if [ -z "$new_hash" ]; then + echo "ERROR: Failed to determine new source hash" + exit 1 + fi + sed -i "s|$old_hash|$new_hash|g" package.nix +} + +update_npm_deps_hash() { + echo "Updating npm dependencies hash..." + local old_hash new_hash + old_hash=$(nix_eval "npmDeps.outputHash") + new_hash=$(nix_prefetch "npmDeps") + if [ -z "$new_hash" ]; then + echo "ERROR: Failed to determine new npm deps hash" + exit 1 + fi + sed -i "s|$old_hash|$new_hash|g" package.nix +} + +update_npm_deps_ui_hash() { + echo "Updating ui npm dependencies hash..." + local old_hash new_hash + old_hash=$(nix_eval "npmDeps_ui.outputHash") + new_hash=$(nix_prefetch "npmDeps_ui") + if [ -z "$new_hash" ]; then + echo "ERROR: Failed to determine new npm deps ui hash" + exit 1 + fi + sed -i "s|$old_hash|$new_hash|g" package.nix +} + +LATEST_VERSION=$(curl -fsSL ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/homebridge/homebridge-config-ui-x/releases/latest" \ + | jq -r '.tag_name' \ + | sed 's/^v//') + +CURRENT_VERSION=$(nix_eval "version") + +if [ "$CURRENT_VERSION" = "$LATEST_VERSION" ]; then + echo "homebridge-config-ui-x is already up to date at version $CURRENT_VERSION" + exit 0 +fi + +echo "Updating homebridge-config-ui-x from $CURRENT_VERSION to $LATEST_VERSION" + +sed -i "s/version = \"$CURRENT_VERSION\"/version = \"$LATEST_VERSION\"/" package.nix + +update_src_hash +update_npm_deps_hash +update_npm_deps_ui_hash + +echo "Successfully updated homebridge-config-ui-x from $CURRENT_VERSION to $LATEST_VERSION" diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index 21c83053013d..eb27978ad443 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -115,26 +115,24 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "immich"; - version = "2.5.5"; + version = "2.5.6"; src = fetchFromGitHub { owner = "immich-app"; repo = "immich"; tag = "v${finalAttrs.version}"; - hash = "sha256-wAZcgAazfEy5dJhlut4cHGOj+qWrvF9vD6sxAswuhVU="; + hash = "sha256-F6lF0wQ2acq0MEoFNnKU68LH5cq1WwRKvsCJB+pEirE="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 3; - hash = "sha256-kJBX0hoDijs5IjS37oUDVv61t4vXTF6e3lmZIy/lQ/o="; + hash = "sha256-VzlcVHCJCD1Ree0Sy2PFKZSjHBowLoIRqpUKdF2Ph+c="; }; postPatch = '' - # pg_dumpall fails without database root access - # see https://github.com/immich-app/immich/issues/13971 - substituteInPlace server/src/utils/database-backups.ts \ + substituteInPlace server/src/services/database-backup.service.ts \ --replace-fail '`/usr/lib/postgresql/''${databaseMajorVersion}/bin/''${bin}`' '`''${bin}`' ''; diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix index 969cbc580b8d..4225e088e21c 100644 --- a/pkgs/by-name/in/infrastructure-agent/package.nix +++ b/pkgs/by-name/in/infrastructure-agent/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "infrastructure-agent"; - version = "1.72.1"; + version = "1.72.2"; src = fetchFromGitHub { owner = "newrelic"; repo = "infrastructure-agent"; rev = finalAttrs.version; - hash = "sha256-2kRayrMisv/poIx/OGqS01D/yLt/w4u2X+cJYN8QHA8="; + hash = "sha256-GcQ/UUznuWdAtOyCC4qLQfItm81zwryV2gDDlYKFONI="; }; vendorHash = "sha256-H41FxeJLrlaL/KbcBAS1WuMfVn6d+4So3egXb6E46/o="; diff --git a/pkgs/by-name/in/inlyne/package.nix b/pkgs/by-name/in/inlyne/package.nix index 4ae2977be3fa..970360e24eda 100644 --- a/pkgs/by-name/in/inlyne/package.nix +++ b/pkgs/by-name/in/inlyne/package.nix @@ -85,7 +85,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/Inlyne-Project/inlyne"; changelog = "https://github.com/Inlyne-Project/inlyne/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "inlyne"; }; }) diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix index f790a8f6e926..3c1f51218ed5 100644 --- a/pkgs/by-name/ip/ipxe/package.nix +++ b/pkgs/by-name/ip/ipxe/package.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "ipxe"; - version = "1.21.1-unstable-2026-01-10"; + version = "1.21.1-unstable-2026-01-30"; nativeBuildInputs = [ mtools @@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - rev = "9c01c5a5dacb54167132d9a27259b23acdf091d6"; - hash = "sha256-7Gsczc6jcUT0jDHNrgYWycqTs2/x3eqzbFwEwz8Z8kU="; + rev = "74e0551ac2f66760430e69407a4f7ed0dfe9feab"; + hash = "sha256-7Guts4js1pM/Vse58XCjr7K8qHbJU5oiFFuqojwXTC4="; }; # Calling syslinux on a FAT image isn't going to work on Aarch64. diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix index c77ddafde210..99cecc3c54dd 100644 --- a/pkgs/by-name/ir/irpf/package.nix +++ b/pkgs/by-name/ir/irpf/package.nix @@ -91,6 +91,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; maintainers = with lib.maintainers; [ atila + rafaelrc ]; mainProgram = "irpf"; }; diff --git a/pkgs/by-name/ju/just-lsp/package.nix b/pkgs/by-name/ju/just-lsp/package.nix index 7e05e307a959..73b7e28b3614 100644 --- a/pkgs/by-name/ju/just-lsp/package.nix +++ b/pkgs/by-name/ju/just-lsp/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "just-lsp"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "terror"; repo = "just-lsp"; tag = finalAttrs.version; - hash = "sha256-wcUDzrI8jR8fedwu1Z9eY1NLJytDgZsdVK3ay2q6IbM="; + hash = "sha256-gY7SJmRv9KmJ+2OhHbQLqjXs6Zcelm9eW6kxGshQ+Ks="; }; - cargoHash = "sha256-ajZUTE/J0I0jEQebLRw/4lstOQNxe+Nh7HTINN0g5K8="; + cargoHash = "sha256-RMUKW1jT+g9xEFa3WrSLQgXM73yFvT58nH++hWOJ9v4="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/k6/k6/package.nix b/pkgs/by-name/k6/k6/package.nix index 812c31610310..3d00b82ed088 100644 --- a/pkgs/by-name/k6/k6/package.nix +++ b/pkgs/by-name/k6/k6/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "k6"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "grafana"; repo = "k6"; rev = "v${finalAttrs.version}"; - hash = "sha256-kgdJAmjk92xXBYJrfprYztBnTK4cqIpk9iwKULDVRl8="; + hash = "sha256-rfurCWplI21vEYEArxp4wrAn6oOWenMkGetFDy5WCAY="; }; subPackages = [ "./" ]; diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix index b830d8b81a18..4f34d3079c0d 100644 --- a/pkgs/by-name/ke/keycloak/package.nix +++ b/pkgs/by-name/ke/keycloak/package.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "keycloak"; - version = "26.5.2"; + version = "26.5.3"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip"; - hash = "sha256-SXoHnwk/hepSV5BIsmZvCXOPn5UfVKwbNZ4D9zSlaz0="; + hash = "sha256-OMx2E4Q1Pob73iqWo/sfYI14+IMW0cp/22wMUKcqQvg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix index 2693f00c39a0..b5f1b572d847 100644 --- a/pkgs/by-name/ko/komikku/package.nix +++ b/pkgs/by-name/ko/komikku/package.nix @@ -24,14 +24,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "komikku"; - version = "1.101.0"; + version = "1.102.0"; pyproject = false; src = fetchFromCodeberg { owner = "valos"; repo = "Komikku"; tag = "v${finalAttrs.version}"; - hash = "sha256-sDhnG6d77erHO9HS0fL4Fl5qHbeyuLz2TFeic5zLJIE="; + hash = "sha256-wxGDy/cM9IBpgPNdun/P9f4447hJaaibBgIgLVaOirY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/kr/krep/package.nix b/pkgs/by-name/kr/krep/package.nix index 40c29a0d7951..ce6e7d64e7ea 100644 --- a/pkgs/by-name/kr/krep/package.nix +++ b/pkgs/by-name/kr/krep/package.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "ENABLE_ARCH_DETECTION=0" + "HAS_AVX512=0" + "HAS_AVX2=0" ]; installFlags = [ diff --git a/pkgs/by-name/ku/kubevirt/package.nix b/pkgs/by-name/ku/kubevirt/package.nix index 90cc5939ac0f..e19627a465f3 100644 --- a/pkgs/by-name/ku/kubevirt/package.nix +++ b/pkgs/by-name/ku/kubevirt/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "kubevirt"; - version = "1.6.3"; + version = "1.7.0"; src = fetchFromGitHub { owner = "kubevirt"; repo = "kubevirt"; rev = "v${finalAttrs.version}"; - hash = "sha256-PWy8RqAuu3VRryzwEcsk8Z/uPSfsil+lzbU8oay4Lig="; + hash = "sha256-0dfZbhcFSIU9TFxQ3UT8Sz+tgeiqVke+RxVwlxw49Hk="; }; vendorHash = null; diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix index 2e8e83411832..498f4253c9ef 100644 --- a/pkgs/by-name/le/legcord/package.nix +++ b/pkgs/by-name/le/legcord/package.nix @@ -17,13 +17,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "legcord"; - version = "1.1.6"; + version = "1.2.1"; src = fetchFromGitHub { owner = "Legcord"; repo = "Legcord"; tag = "v${finalAttrs.version}"; - hash = "sha256-AHqaC0N+5grBDixP+wXAzKdOTgohgwP4HbAPEZEVXKQ="; + hash = "sha256-196AE244jEZNfhkC+vouNq9M7DOd3kk/1JLW1XRLOHA="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 1; - hash = "sha256-D+GPJn3qpIax+YNcLqLX71bobDdfQXyGiJ6b5PiJqC4="; + hash = "sha256-ksClxW8dIV72Hky5RFJ6cpPAteL29Cx8Me0aG5V/Y4k="; }; buildPhase = '' diff --git a/pkgs/by-name/li/libaom/package.nix b/pkgs/by-name/li/libaom/package.nix index e385b8968adb..c8296dd90fb8 100644 --- a/pkgs/by-name/li/libaom/package.nix +++ b/pkgs/by-name/li/libaom/package.nix @@ -125,7 +125,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://aomedia.org/av1-features/get-started/"; changelog = "https://aomedia.googlesource.com/aom/+/refs/tags/v${finalAttrs.version}/CHANGELOG"; maintainers = with lib.maintainers; [ - kiloreux dandellion ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/li/libebur128/package.nix b/pkgs/by-name/li/libebur128/package.nix index 335b4ac1f053..b183b2a47a7a 100644 --- a/pkgs/by-name/li/libebur128/package.nix +++ b/pkgs/by-name/li/libebur128/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Implementation of the EBU R128 loudness standard"; homepage = "https://github.com/jiixyj/libebur128"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.andrewrk ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/li/libjpeg_original/package.nix b/pkgs/by-name/li/libjpeg_original/package.nix index ce73a5955354..32f6ca87bb64 100644 --- a/pkgs/by-name/li/libjpeg_original/package.nix +++ b/pkgs/by-name/li/libjpeg_original/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libjpeg"; - version = "9f"; + version = "10"; src = fetchurl { url = "http://www.ijg.org/files/jpegsrc.v${finalAttrs.version}.tar.gz"; - hash = "sha256-BHBcEQyyRpyqeftx+6PXv4NJFHBulkGkWJSFwfgyVls="; + hash = "sha256-i56qEyQmkOvQPhcoqx7fl6gaeO1ug2JNSTZV8xrJWrU="; }; configureFlags = lib.optional static "--enable-static --disable-shared"; diff --git a/pkgs/by-name/li/liblaxjson/package.nix b/pkgs/by-name/li/liblaxjson/package.nix index 088349952e3a..af649ead2966 100644 --- a/pkgs/by-name/li/liblaxjson/package.nix +++ b/pkgs/by-name/li/liblaxjson/package.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; - maintainers = [ lib.maintainers.andrewrk ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/li/libsoundio/package.nix b/pkgs/by-name/li/libsoundio/package.nix index 0583b930632b..d3dc8d8a28f9 100644 --- a/pkgs/by-name/li/libsoundio/package.nix +++ b/pkgs/by-name/li/libsoundio/package.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://libsound.io/"; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.andrewrk ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/li/lighthouse/package.nix b/pkgs/by-name/li/lighthouse/package.nix index 3a2acc3ca68d..5f1d7fe41822 100644 --- a/pkgs/by-name/li/lighthouse/package.nix +++ b/pkgs/by-name/li/lighthouse/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { pname = "lighthouse"; - version = "7.1.0"; + version = "8.1.0"; # lighthouse/common/deposit_contract/build.rs, `TAG` depositContractSpecVersion = "0.12.1"; @@ -28,17 +28,16 @@ rustPlatform.buildRustPackage rec { owner = "sigp"; repo = "lighthouse"; tag = "v${version}"; - hash = "sha256-+tLAuuinSaVIwO5wi1Cf+86pWj83Jj0p1ajnDdpHsyI="; + hash = "sha256-+MF3KbyKbaEBsrNHQOOolfhl4uJ1laOL1eGtcWEoaLE="; }; patches = [ ./use-system-sqlite.patch ]; - cargoHash = "sha256-pb44m+iWArlIim2tqbaH+pwCSqIdqzfVZJ9yj/ne1LY="; + cargoHash = "sha256-6C0rDVsF0wIcApc2YL3qC/Xa9qby9GDbQYGiaaJuH0k="; buildFeatures = [ - "modern" "gnosis" ]; diff --git a/pkgs/by-name/li/lighthouse/use-system-sqlite.patch b/pkgs/by-name/li/lighthouse/use-system-sqlite.patch index c91b2574eed1..4e4bfded7054 100644 --- a/pkgs/by-name/li/lighthouse/use-system-sqlite.patch +++ b/pkgs/by-name/li/lighthouse/use-system-sqlite.patch @@ -1,13 +1,13 @@ diff --git a/Cargo.toml b/Cargo.toml -index 6a7b2f610..4cd9a9bc0 100644 +index aac26e060..d10c34a40 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -215,7 +215,7 @@ reqwest = { version = "0.11", default-features = false, features = [ +@@ -228,7 +228,7 @@ reqwest = { version = "0.12", default-features = false, features = [ ] } ring = "0.17" rpds = "0.11" -rusqlite = { version = "0.28", features = ["bundled"] } +rusqlite = { version = "0.28" } - rust_eth_kzg = "0.5.4" - safe_arith = { path = "consensus/safe_arith" } - sensitive_url = { path = "common/sensitive_url" } + rust_eth_kzg = "0.9" + safe_arith = "0.1" + sensitive_url = { version = "0.1", features = ["serde"] } diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 4d80fef3b155..547fb8c08d5f 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -47,14 +47,14 @@ in # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation (finalAttrs: { pname = "limine"; - version = "10.6.4"; + version = "10.6.6"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-mxIPN+avDU6vAd72mX4IFOKj7QkFcQ/L4jceRkRPIvw="; + hash = "sha256-xU0uygvqeWfsy5FsYQQAEwc0H15j8amW0097Fojw1DM="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/li/livi/package.nix b/pkgs/by-name/li/livi/package.nix index 0d820f3ecac2..1deca9d950ae 100644 --- a/pkgs/by-name/li/livi/package.nix +++ b/pkgs/by-name/li/livi/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "livi"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitLab { owner = "guidog"; repo = "livi"; domain = "gitlab.gnome.org"; rev = "v${finalAttrs.version}"; - hash = "sha256-cLvSK50RnXCYoXwpp+unTVnxqCkPa3Zr4dZT0TpYFpE="; + hash = "sha256-2hDQS5f+KAWal8AbtB4IV4/B6Rq+n1vAcWA9eoDS3y4="; }; nativeBuildInputs = [ meson diff --git a/pkgs/by-name/lo/loopwm/package.nix b/pkgs/by-name/lo/loopwm/package.nix index 5a6c29309a4d..de60e517b780 100644 --- a/pkgs/by-name/lo/loopwm/package.nix +++ b/pkgs/by-name/lo/loopwm/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "loopwm"; - version = "1.3.0"; + version = "1.4.2"; src = fetchurl { url = "https://github.com/MrKai77/Loop/releases/download/${finalAttrs.version}/Loop.zip"; - hash = "sha256-UiEUdRKQLJdOj+fI4fmTi71TreP1gM+jr+53dhtESRE="; + hash = "sha256-UU6X+qs4Q837ixhZuRMzcEY5oaLOWA5PaE117+AH04Y="; }; sourceRoot = "."; diff --git a/pkgs/by-name/ly/LycheeSlicer/package.nix b/pkgs/by-name/ly/lycheeslicer/package.nix similarity index 98% rename from pkgs/by-name/ly/LycheeSlicer/package.nix rename to pkgs/by-name/ly/lycheeslicer/package.nix index e4fb273697de..7bd68f32957f 100644 --- a/pkgs/by-name/ly/LycheeSlicer/package.nix +++ b/pkgs/by-name/ly/lycheeslicer/package.nix @@ -8,7 +8,7 @@ wayland-protocols, }: let - pname = "LycheeSlicer"; + pname = "lycheeslicer"; version = "7.6.1"; src = fetchurl { diff --git a/pkgs/applications/misc/mbutil/migrate_to_pytest.patch b/pkgs/by-name/mb/mbutil/migrate_to_pytest.patch similarity index 100% rename from pkgs/applications/misc/mbutil/migrate_to_pytest.patch rename to pkgs/by-name/mb/mbutil/migrate_to_pytest.patch diff --git a/pkgs/applications/misc/mbutil/default.nix b/pkgs/by-name/mb/mbutil/package.nix similarity index 68% rename from pkgs/applications/misc/mbutil/default.nix rename to pkgs/by-name/mb/mbutil/package.nix index 7540b915839f..704d52a382b9 100644 --- a/pkgs/applications/misc/mbutil/default.nix +++ b/pkgs/by-name/mb/mbutil/package.nix @@ -1,12 +1,10 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, - setuptools, - pytestCheckHook, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "mbutil"; version = "0.3.0"; pyproject = true; @@ -20,10 +18,14 @@ buildPythonApplication rec { patches = [ ./migrate_to_pytest.patch ]; - build-system = [ setuptools ]; + build-system = [ python3Packages.setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; enabledTestPaths = [ "test/test.py" ]; + disabledTests = [ + # sqlite3.OperationalError: database is locked + "test_utf8grid_disk_to_mbtiles" + ]; meta = { description = "Importer and exporter for MBTiles"; diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonds/package.nix similarity index 99% rename from pkgs/by-name/me/melonDS/package.nix rename to pkgs/by-name/me/melonds/package.nix index 6b05243ab6d7..cb9cecb0f238 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonds/package.nix @@ -28,7 +28,7 @@ let ; in stdenv.mkDerivation (finalAttrs: { - pname = "melonDS"; + pname = "melonds"; version = "1.1-unstable-2026-02-02"; src = fetchFromGitHub { diff --git a/pkgs/by-name/me/metabase/package.nix b/pkgs/by-name/me/metabase/package.nix index 9ea578c719c3..d56fe12b05bb 100644 --- a/pkgs/by-name/me/metabase/package.nix +++ b/pkgs/by-name/me/metabase/package.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "metabase"; - version = "0.58.2"; + version = "0.58.5"; src = fetchurl { url = "https://downloads.metabase.com/v${finalAttrs.version}/metabase.jar"; - hash = "sha256-stMlL0QSM4Py5xh2CsAV53v1FSc9u6NBQ+i5oLfewoQ="; + hash = "sha256-JjpDsI7G0b5YVjICXe9ZeprnipeyVg79qW42LTcE4U4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/me/mev-boost/package.nix b/pkgs/by-name/me/mev-boost/package.nix index ca533927951f..ab25f8b21dc3 100644 --- a/pkgs/by-name/me/mev-boost/package.nix +++ b/pkgs/by-name/me/mev-boost/package.nix @@ -6,15 +6,15 @@ buildGoModule (finalAttrs: { pname = "mev-boost"; - version = "1.10.1"; + version = "1.11"; src = fetchFromGitHub { owner = "flashbots"; repo = "mev-boost"; rev = "v${finalAttrs.version}"; - hash = "sha256-Fm/zeaFJTtevEMZPK0O1QyfF7KXKcpqS2SC3DW7dn3Y="; + hash = "sha256-uEIZojmzSVyF+ZOQsSqZA0MB2cT8I/JHGfgKVI48PIk="; }; - vendorHash = "sha256-FpkQp/PgmZ9+swQYI984j87ODbT0kpanBkHfJK86FWA="; + vendorHash = "sha256-dIc0ZHTx+7P621FvfDKlItc/FazUpwxRmDQF2SNVIwA="; meta = { description = "Ethereum block-building middleware"; diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index 6693a74262f7..fe2a836f5c14 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -22,16 +22,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mise"; - version = "2026.2.7"; + version = "2026.2.9"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; tag = "v${finalAttrs.version}"; - hash = "sha256-ckxezWHQBLkhWSByXcVDaKtpnmvzoYzCR39jcXQIJXE="; + hash = "sha256-JIItmBm0T50688seBgNyDHmPDlhLG90C+UGo1519Hk8="; }; - cargoHash = "sha256-OKm6nBMi/LXNNwS0wq8ChmQVolzuyWLZ7T7k8C8CwNw="; + cargoHash = "sha256-mW3bsGA7Bx/aoh0GIIUBJaMhGgYzN9zT/nT44ADEqoc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/misc/mkgmap/splitter/build.xml.patch b/pkgs/by-name/mk/mkgmap-splitter/build.xml.patch similarity index 89% rename from pkgs/applications/misc/mkgmap/splitter/build.xml.patch rename to pkgs/by-name/mk/mkgmap-splitter/build.xml.patch index 1fb0a14ef4c3..9b0db9c58a94 100644 --- a/pkgs/applications/misc/mkgmap/splitter/build.xml.patch +++ b/pkgs/by-name/mk/mkgmap-splitter/build.xml.patch @@ -1,5 +1,5 @@ ---- a/build.xml (revision 597) -+++ a/build.xml (working copy) +--- a/build.xml 2026-02-10 03:53:33.129313250 +0200 ++++ b/build.xml 2026-02-10 03:53:36.908100965 +0200 @@ -212,7 +212,7 @@ @@ -9,7 +9,7 @@ -@@ -219,7 +219,7 @@ +@@ -222,7 +222,7 @@ @@ -18,7 +18,7 @@ -@@ -324,7 +324,7 @@ +@@ -330,7 +330,7 @@ @@ -27,7 +27,7 @@ -@@ -349,7 +349,7 @@ +@@ -355,7 +355,7 @@ ignoreerrors="true"/> diff --git a/pkgs/applications/misc/mkgmap/splitter/fix-failing-test.patch b/pkgs/by-name/mk/mkgmap-splitter/fix-failing-test.patch similarity index 100% rename from pkgs/applications/misc/mkgmap/splitter/fix-failing-test.patch rename to pkgs/by-name/mk/mkgmap-splitter/fix-failing-test.patch diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/by-name/mk/mkgmap-splitter/package.nix similarity index 59% rename from pkgs/applications/misc/mkgmap/splitter/default.nix rename to pkgs/by-name/mk/mkgmap-splitter/package.nix index fea9619173f7..67adcb1b10be 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/by-name/mk/mkgmap-splitter/package.nix @@ -7,21 +7,23 @@ jre, ant, makeWrapper, + mkgmap, stripJavaArchivesHook, doCheck ? true, }: + let - deps = import ../deps.nix { inherit fetchurl; }; + inherit (mkgmap) deps; testInputs = import ./testinputs.nix { inherit fetchurl; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "splitter"; version = "654"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/splitter/trunk"; - rev = version; - sha256 = "sha256-y/pl8kIQ6fiF541ho72LMgJFWJdkUBqPToQGCGmmcfg="; + rev = finalAttrs.version; + hash = "sha256-y/pl8kIQ6fiF541ho72LMgJFWJdkUBqPToQGCGmmcfg="; }; patches = [ @@ -31,33 +33,31 @@ stdenv.mkDerivation rec { ./fix-failing-test.patch ]; - postPatch = - with deps; - '' - # Manually create version properties file for reproducibility - mkdir -p build/classes - cat > build/classes/splitter-version.properties << EOF - svn.version=${version} - build.timestamp=unknown - EOF + postPatch = '' + # Manually create version properties file for reproducibility + mkdir -p build/classes + cat > build/classes/splitter-version.properties << EOF + svn.version=${finalAttrs.version} + build.timestamp=unknown + EOF - # Put pre-fetched dependencies into the right place - mkdir -p lib/compile - cp ${fastutil} lib/compile/${fastutil.name} - cp ${osmpbf} lib/compile/${osmpbf.name} - cp ${protobuf} lib/compile/${protobuf.name} - cp ${xpp3} lib/compile/${xpp3.name} - '' - + lib.optionalString doCheck '' - mkdir -p lib/test - cp ${junit} lib/test/${junit.name} - cp ${hamcrest-core} lib/test/${hamcrest-core.name} + # Put pre-fetched dependencies into the right place + mkdir -p lib/compile + cp ${deps.fastutil} lib/compile/${deps.fastutil.name} + cp ${deps.osmpbf} lib/compile/${deps.osmpbf.name} + cp ${deps.protobuf} lib/compile/${deps.protobuf.name} + cp ${deps.xpp3} lib/compile/${deps.xpp3.name} + '' + + lib.optionalString doCheck '' + mkdir -p lib/test + cp ${deps.junit} lib/test/${deps.junit.name} + cp ${deps.hamcrest-core} lib/test/${deps.hamcrest-core.name} - mkdir -p test/resources/in/osm - ${lib.concatMapStringsSep "\n" (res: '' - cp ${res} test/resources/in/${builtins.replaceStrings [ "__" ] [ "/" ] res.name} - '') testInputs} - ''; + mkdir -p test/resources/in/osm + ${lib.concatMapStringsSep "\n" (res: '' + cp ${res} test/resources/in/${builtins.replaceStrings [ "__" ] [ "/" ] res.name} + '') testInputs} + ''; nativeBuildInputs = [ jdk @@ -94,9 +94,9 @@ stdenv.mkDerivation rec { ''; passthru.updateScript = [ - ../update.sh + ./update.sh "mkgmap-splitter" - meta.downloadPage + finalAttrs.meta.downloadPage ]; meta = { @@ -112,4 +112,4 @@ stdenv.mkDerivation rec { binaryBytecode # deps ]; }; -} +}) diff --git a/pkgs/applications/misc/mkgmap/splitter/testinputs.nix b/pkgs/by-name/mk/mkgmap-splitter/testinputs.nix similarity index 63% rename from pkgs/applications/misc/mkgmap/splitter/testinputs.nix rename to pkgs/by-name/mk/mkgmap-splitter/testinputs.nix index 462e8bfa0beb..9b0a74730fd1 100644 --- a/pkgs/applications/misc/mkgmap/splitter/testinputs.nix +++ b/pkgs/by-name/mk/mkgmap-splitter/testinputs.nix @@ -1,9 +1,9 @@ { fetchurl }: let fetchTestInput = - { res, sha256 }: + { res, hash }: fetchurl { - inherit sha256; + inherit hash; url = "https://www.mkgmap.org.uk/testinput/${res}"; name = builtins.replaceStrings [ "/" ] [ "__" ] res; }; @@ -11,10 +11,10 @@ in [ (fetchTestInput { res = "osm/alaska-2016-12-27.osm.pbf"; - sha256 = "0hmb5v71a1bxgvrg1cbfj5l27b3vvdazs4pyggpmhcdhbwpw7ppm"; + hash = "sha256-9d7DL1+wMVjve/4S/VXbe6wjaJFusfDyfn0FFc4uq0I="; }) (fetchTestInput { res = "osm/hamburg-2016-12-26.osm.pbf"; - sha256 = "08bny4aavwm3z2114q99fv3fi2w905zxi0fl7bqgjyhgk0fxjssf"; + hash = "sha256-TmvZHZgPevnwOtSB2H8BiYvoxnYpYRKC+KPyrRTxdiE="; }) ] diff --git a/pkgs/applications/misc/mkgmap/update.sh b/pkgs/by-name/mk/mkgmap-splitter/update.sh similarity index 100% rename from pkgs/applications/misc/mkgmap/update.sh rename to pkgs/by-name/mk/mkgmap-splitter/update.sh diff --git a/pkgs/applications/misc/mkgmap/build.xml.patch b/pkgs/by-name/mk/mkgmap/build.xml.patch similarity index 78% rename from pkgs/applications/misc/mkgmap/build.xml.patch rename to pkgs/by-name/mk/mkgmap/build.xml.patch index 567c0d5586f8..bd1d9ab19c0e 100644 --- a/pkgs/applications/misc/mkgmap/build.xml.patch +++ b/pkgs/by-name/mk/mkgmap/build.xml.patch @@ -1,29 +1,29 @@ ---- a/build.xml (revision 4555) -+++ a/build.xml (working copy) -@@ -228,7 +228,7 @@ +--- a/build.xml ++++ b/build.xml +@@ -228,8 +228,7 @@ - + - - +- description="main compilation"> ++ + -@@ -263,7 +263,7 @@ + +@@ -264,7 +263,7 @@ - + - + -@@ -271,7 +271,7 @@ +@@ -275,7 +274,7 @@ - + - + - diff --git a/pkgs/applications/misc/mkgmap/deps.nix b/pkgs/by-name/mk/mkgmap/deps.nix similarity index 61% rename from pkgs/applications/misc/mkgmap/deps.nix rename to pkgs/by-name/mk/mkgmap/deps.nix index 68cd5a79fe72..858b6c0f0aae 100644 --- a/pkgs/applications/misc/mkgmap/deps.nix +++ b/pkgs/by-name/mk/mkgmap/deps.nix @@ -2,30 +2,30 @@ { fastutil = fetchurl { url = "http://ivy.mkgmap.org.uk/repo/it.unimi.dsi/fastutil/6.5.15-mkg.1b/jars/fastutil.jar"; - sha256 = "0d88m0rpi69wgxhnj5zh924q4zsvxq8m4ybk7m9mr3gz1hx0yx8c"; + hash = "sha256-DHUPOgz/jVxTPXN5UhHuW3+CiUjwF2lhfzyZeDOoCDU="; }; osmpbf = fetchurl { url = "http://ivy.mkgmap.org.uk/repo/crosby/osmpbf/1.3.3/jars/osmpbf.jar"; - sha256 = "0zb4pqkwly5z30ww66qhhasdhdrzwmrw00347yrbgyk2ii4wjad3"; + hash = "sha256-oynJSYxi+reyP2QAwHPlPzfYtIIQG8M5GL94yie+ZH0="; }; protobuf = fetchurl { url = "mirror://maven/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar"; - sha256 = "0x6c4pbsizvk3lm6nxcgi1g2iqgrxcna1ip74lbn01f0fm2wdhg0"; + hash = "sha256-4MHGRXXABWAXJefGoCzr+eEoXoiPdWsqHXP/qNclzHQ="; }; xpp3 = fetchurl { url = "mirror://maven/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar"; - sha256 = "1f9ifnxxj295xb1494jycbfm76476xm5l52p7608gf0v91d3jh83"; + hash = "sha256-A0E5WkgbuIeAOVcUWmo3h5hT3WJekkTC6iUJ2bt1Mbk="; }; jaxb-api = fetchurl { url = "mirror://maven/javax/xml/bind/jaxb-api/2.3.0/jaxb-api-2.3.0.jar"; - sha256 = "00rxpc0m30d3jc572ni01ryxq8gcbnr955xsabrijg9pknc0fc48"; + hash = "sha256-iDAHmJ03PRnzUrqXkrJd7CHcfQ4gWnEKk6OBUQG7PQM="; }; junit = fetchurl { url = "mirror://maven/junit/junit/4.11/junit-4.11.jar"; - sha256 = "1zh6klzv8w30dx7jg6pkhllk4587av4znflzhxz8x97c7rhf3a4h"; + hash = "sha256-kKjhYD7spI5+h586+8lWBxUyKYXzmidPb2BwtD+dBv4="; }; hamcrest-core = fetchurl { url = "mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"; - sha256 = "1sfqqi8p5957hs9yik44an3lwpv8ln2a6sh9gbgli4vkx68yzzb6"; + hash = "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok="; }; } diff --git a/pkgs/applications/misc/mkgmap/ignore-impure-test.patch b/pkgs/by-name/mk/mkgmap/ignore-impure-test.patch similarity index 100% rename from pkgs/applications/misc/mkgmap/ignore-impure-test.patch rename to pkgs/by-name/mk/mkgmap/ignore-impure-test.patch diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/by-name/mk/mkgmap/package.nix similarity index 56% rename from pkgs/applications/misc/mkgmap/default.nix rename to pkgs/by-name/mk/mkgmap/package.nix index 09b42f21039c..8eeda4ec1559 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/by-name/mk/mkgmap/package.nix @@ -11,18 +11,19 @@ doCheck ? true, withExamples ? false, }: + let deps = import ./deps.nix { inherit fetchurl; }; testInputs = import ./testinputs.nix { inherit fetchurl; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mkgmap"; version = "4924"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; - rev = version; - sha256 = "sha256-4DGGAWgyIvK5pcopwlO4YDGDc73lOsL0Ljy/kFUY2As="; + rev = finalAttrs.version; + hash = "sha256-4DGGAWgyIvK5pcopwlO4YDGDc73lOsL0Ljy/kFUY2As="; }; patches = [ @@ -31,36 +32,34 @@ stdenv.mkDerivation rec { ./ignore-impure-test.patch ]; - postPatch = - with deps; - '' - # Manually create version properties file for reproducibility - mkdir -p build/classes - cat > build/classes/mkgmap-version.properties << EOF - svn.version=${version} - build.timestamp=unknown - EOF + postPatch = '' + # Manually create version properties file for reproducibility + mkdir -p build/classes + cat > build/classes/mkgmap-version.properties << EOF + svn.version=${finalAttrs.version} + build.timestamp=unknown + EOF - # Put pre-fetched dependencies into the right place - mkdir -p lib/compile - cp ${fastutil} lib/compile/${fastutil.name} - cp ${osmpbf} lib/compile/${osmpbf.name} - cp ${protobuf} lib/compile/${protobuf.name} - '' - + lib.optionalString doCheck '' - mkdir -p lib/test - cp ${fastutil} lib/test/${fastutil.name} - cp ${osmpbf} lib/test/${osmpbf.name} - cp ${protobuf} lib/test/${protobuf.name} - cp ${jaxb-api} lib/test/${jaxb-api.name} - cp ${junit} lib/test/${junit.name} - cp ${hamcrest-core} lib/test/${hamcrest-core.name} + # Put pre-fetched dependencies into the right place + mkdir -p lib/compile + cp ${deps.fastutil} lib/compile/${deps.fastutil.name} + cp ${deps.osmpbf} lib/compile/${deps.osmpbf.name} + cp ${deps.protobuf} lib/compile/${deps.protobuf.name} + '' + + lib.optionalString doCheck '' + mkdir -p lib/test + cp ${deps.fastutil} lib/test/${deps.fastutil.name} + cp ${deps.osmpbf} lib/test/${deps.osmpbf.name} + cp ${deps.protobuf} lib/test/${deps.protobuf.name} + cp ${deps.jaxb-api} lib/test/${deps.jaxb-api.name} + cp ${deps.junit} lib/test/${deps.junit.name} + cp ${deps.hamcrest-core} lib/test/${deps.hamcrest-core.name} - mkdir -p test/resources/in/img - ${lib.concatMapStringsSep "\n" (res: '' - cp ${res} test/resources/in/${builtins.replaceStrings [ "__" ] [ "/" ] res.name} - '') testInputs} - ''; + mkdir -p test/resources/in/img + ${lib.concatMapStringsSep "\n" (res: '' + cp ${res} test/resources/in/${builtins.replaceStrings [ "__" ] [ "/" ] res.name} + '') testInputs} + ''; nativeBuildInputs = [ jdk @@ -100,11 +99,14 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = [ - ./update.sh - "mkgmap" - meta.downloadPage - ]; + passthru = { + inherit deps; + updateScript = [ + ./update.sh + "mkgmap" + finalAttrs.meta.downloadPage + ]; + }; meta = { description = "Create maps for Garmin GPS devices from OpenStreetMap (OSM) data"; @@ -119,5 +121,4 @@ stdenv.mkDerivation rec { binaryBytecode # deps ]; }; - -} +}) diff --git a/pkgs/by-name/mk/mkgmap/testinputs.nix b/pkgs/by-name/mk/mkgmap/testinputs.nix new file mode 100644 index 000000000000..e99705d851ce --- /dev/null +++ b/pkgs/by-name/mk/mkgmap/testinputs.nix @@ -0,0 +1,68 @@ +{ fetchurl }: +let + fetchTestInput = + { res, hash }: + fetchurl { + inherit hash; + url = "https://www.mkgmap.org.uk/testinput/${res}"; + name = builtins.replaceStrings [ "/" ] [ "__" ] res; + }; +in +[ + (fetchTestInput { + res = "osm/lon1.osm.gz"; + hash = "sha256-Oze0loYeIZQ3w1cB2HeXFPDgzuU4s+T78k96BY+hGuU="; + }) + (fetchTestInput { + res = "osm/uk-test-1.osm.gz"; + hash = "sha256-0zVSP5yTmJUxYbXxFqBAn0pb08L3Z3gwilsKYeV8tkk="; + }) + (fetchTestInput { + res = "osm/uk-test-2.osm.gz"; + hash = "sha256-ROMgljyxYD7bwH1nXqoUZ1H8gM9e9dpoKCHO1xgGvBY="; + }) + (fetchTestInput { + res = "osm/is-in-samples.osm"; + hash = "sha256-Ay7o1w2TpOpIqPGrLuIcMYtK8MDN0GbkSkX7IvByeKM="; + }) + (fetchTestInput { + res = "mp/test1.mp"; + hash = "sha256-Ql5tdz3TMcRl/8k20Jek6g3W92/itpnqw24wgj7I07c="; + }) + (fetchTestInput { + res = "img/63240001.img"; + hash = "sha256-mBxOZyJlHZJ/hEmqqO4eVfoORGzoF8S/2jpgQJJ/uPI="; + }) + (fetchTestInput { + res = "img/63240002.img"; + hash = "sha256-Lijc6+JKaYq1xL64wcAnEnPhXOmWMjA9fZkaHif3O4o="; + }) + (fetchTestInput { + res = "img/63240003.img"; + hash = "sha256-4Wu1svN474O145ONM45pMR3GjtQpII00VGjiaTbur6Y="; + }) + (fetchTestInput { + res = "hgt/N00W090.hgt.zip"; + hash = "sha256-9nU9oczkWS1Cqc8SyQmo1QaYK+6jr+Wq+PoQ95YBC5o="; + }) + (fetchTestInput { + res = "hgt/N00W091.hgt.zip"; + hash = "sha256-PeT2PcbuPr+E4dzAme0TJqufbjNZn2wDkhiccCQncpQ="; + }) + (fetchTestInput { + res = "hgt/S01W090.hgt.zip"; + hash = "sha256-UqPnJmY51YamU/EGbCQVFdoh890HpFN//XadC3PS7zM="; + }) + (fetchTestInput { + res = "hgt/S01W091.hgt.zip"; + hash = "sha256-dvHxDgjKhmkQSmPPW8CtbsQWYtoYYuk6dTUlEtXAqHw="; + }) + (fetchTestInput { + res = "hgt/S02W090.hgt.zip"; + hash = "sha256-tjjYMxW6lWvWONoWFwTjHn+EhJ7OmcjGwVvM3t4J6GA="; + }) + (fetchTestInput { + res = "hgt/S02W091.hgt.zip"; + hash = "sha256-uVUKhM5eIS/STGxwgzDcXITRTqvILtHrS8mmXVB7l9c="; + }) +] diff --git a/pkgs/by-name/mk/mkgmap/update.sh b/pkgs/by-name/mk/mkgmap/update.sh new file mode 100755 index 000000000000..ddfca9359359 --- /dev/null +++ b/pkgs/by-name/mk/mkgmap/update.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts + +set -euo pipefail + +version=$(curl -s $2 | sed -n 's#.*\(.*\).*#\1#p') +update-source-version $1 "$version" diff --git a/pkgs/by-name/mm/mmtc/package.nix b/pkgs/by-name/mm/mmtc/package.nix index 7d47fa5045ff..623b9e3ed060 100644 --- a/pkgs/by-name/mm/mmtc/package.nix +++ b/pkgs/by-name/mm/mmtc/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/figsoda/mmtc"; changelog = "https://github.com/figsoda/mmtc/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mpl20; - maintainers = [ ]; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "mmtc"; }; }) diff --git a/pkgs/by-name/na/namaka/package.nix b/pkgs/by-name/na/namaka/package.nix index 4df48c7aa4bd..01c91de27526 100644 --- a/pkgs/by-name/na/namaka/package.nix +++ b/pkgs/by-name/na/namaka/package.nix @@ -45,6 +45,6 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/nix-community/namaka"; changelog = "https://github.com/nix-community/namaka/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mpl20; - maintainers = [ ]; + maintainers = with lib.maintainers; [ figsoda ]; }; }) diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index e5358ff18462..0013bfceb1de 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "25.11"; src = fetchFromGitHub { - owner = "YaLTeR"; + owner = "niri-wm"; repo = "niri"; tag = "v${finalAttrs.version}"; hash = "sha256-FC9eYtSmplgxllCX4/3hJq5J3sXWKLSc7at8ZUxycVw="; @@ -118,7 +118,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # Upstream recommends setting the commit hash manually when in a # build environment where the Git repository is unavailable. - # See https://github.com/YaLTeR/niri/wiki/Packaging-niri#version-string + # See https://github.com/niri-wm/niri/wiki/Packaging-niri#version-string NIRI_BUILD_COMMIT = "Nixpkgs"; }; @@ -133,8 +133,8 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Scrollable-tiling Wayland compositor"; - homepage = "https://github.com/YaLTeR/niri"; - changelog = "https://github.com/YaLTeR/niri/releases/tag/v${finalAttrs.version}"; + homepage = "https://github.com/niri-wm/niri"; + changelog = "https://github.com/niri-wm/niri/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ sodiboo diff --git a/pkgs/by-name/ni/nix-melt/package.nix b/pkgs/by-name/ni/nix-melt/package.nix index 9fcedaf8151d..1bacc1c4c5d9 100644 --- a/pkgs/by-name/ni/nix-melt/package.nix +++ b/pkgs/by-name/ni/nix-melt/package.nix @@ -37,6 +37,9 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/nix-community/nix-melt"; changelog = "https://github.com/nix-community/nix-melt/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mpl20; - maintainers = [ lib.maintainers.matthiasbeyer ]; + maintainers = with lib.maintainers; [ + figsoda + matthiasbeyer + ]; }; }) diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix index 8fc1c0702587..5d24ca971e50 100644 --- a/pkgs/by-name/ni/nix-update/package.nix +++ b/pkgs/by-name/ni/nix-update/package.nix @@ -52,6 +52,7 @@ python3Packages.buildPythonApplication (finalAttrs: { changelog = "https://github.com/Mic92/nix-update/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ + figsoda mdaniels5757 mic92 ]; diff --git a/pkgs/by-name/ni/nixos-init/Cargo.lock b/pkgs/by-name/ni/nixos-init/Cargo.lock index 4f44e49b6219..5aee8eedf701 100644 --- a/pkgs/by-name/ni/nixos-init/Cargo.lock +++ b/pkgs/by-name/ni/nixos-init/Cargo.lock @@ -22,7 +22,7 @@ checksum = "75726e2aa2b4c5a9d5c4cf3cb7f24658b6ec861616088f3ef3fb72edc0599286" dependencies = [ "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -31,6 +31,12 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + [[package]] name = "env_filter" version = "0.1.3" @@ -84,6 +90,15 @@ version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.16" @@ -92,15 +107,15 @@ checksum = "7ee5b5339afb4c41626dde77b7a611bd4f2c202b897852b4bcf5d03eddc61010" [[package]] name = "libc" -version = "0.2.174" +version = "0.2.180" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" +checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" [[package]] name = "linux-raw-sys" -version = "0.9.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" [[package]] name = "log" @@ -123,6 +138,7 @@ dependencies = [ "env_logger", "indoc", "log", + "pathrs", "serde", "serde_json", "tempfile", @@ -134,6 +150,24 @@ version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +[[package]] +name = "pathrs" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7e1a93ab007fbfbd784b3015b60cae7fc564ed3dc44d3c9f9f4a5043040ad83" +dependencies = [ + "bitflags", + "itertools", + "libc", + "memchr", + "once_cell", + "rustix", + "rustversion", + "static_assertions", + "tempfile", + "thiserror 2.0.18", +] + [[package]] name = "proc-macro2" version = "1.0.103" @@ -160,9 +194,9 @@ checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" [[package]] name = "rustix" -version = "1.0.8" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8" +checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" dependencies = [ "bitflags", "errno", @@ -171,6 +205,12 @@ dependencies = [ "windows-sys 0.60.2", ] +[[package]] +name = "rustversion" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" + [[package]] name = "ryu" version = "1.0.21" @@ -220,6 +260,12 @@ dependencies = [ "serde_core", ] +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "syn" version = "2.0.111" @@ -250,7 +296,16 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" +dependencies = [ + "thiserror-impl 2.0.18", ] [[package]] @@ -264,6 +319,17 @@ dependencies = [ "syn", ] +[[package]] +name = "thiserror-impl" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "unicode-ident" version = "1.0.22" diff --git a/pkgs/by-name/ni/nixos-init/Cargo.toml b/pkgs/by-name/ni/nixos-init/Cargo.toml index a6495ad1ffdf..46102be28304 100644 --- a/pkgs/by-name/ni/nixos-init/Cargo.toml +++ b/pkgs/by-name/ni/nixos-init/Cargo.toml @@ -7,6 +7,7 @@ edition = "2024" anyhow = "1.0.98" log = "0.4.27" env_logger = { version = "0.11.8", default-features = false } +pathrs = "0.2.2" serde = { version = "1.0.228", features = ["derive"] } serde_json = "1.0.145" bootspec = "2.0.0" diff --git a/pkgs/by-name/ni/nixos-init/README.md b/pkgs/by-name/ni/nixos-init/README.md index 7bcf47e792ed..4d1677db0015 100644 --- a/pkgs/by-name/ni/nixos-init/README.md +++ b/pkgs/by-name/ni/nixos-init/README.md @@ -52,7 +52,7 @@ closure. Currently nixos-init comes in at ~500 KiB. - `find-etc`: Finds the `/etc` paths in `/sysroot` so that the initrd doesn't directly depend on the toplevel, reducing the need to rebuild the initrd on every generation. -- `chroot-realpath`: Figures out the canonical path inside a chroot. +- `resolve-in-root`: Figures out the canonical path inside a chroot. ## Future diff --git a/pkgs/by-name/ni/nixos-init/package.nix b/pkgs/by-name/ni/nixos-init/package.nix index aab7354c8856..0e4c26cb2dd3 100644 --- a/pkgs/by-name/ni/nixos-init/package.nix +++ b/pkgs/by-name/ni/nixos-init/package.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: { binaries = [ "initrd-init" "find-etc" - "chroot-realpath" + "resolve-in-root" ]; postInstall = '' diff --git a/pkgs/by-name/ni/nixos-init/src/chroot_realpath.rs b/pkgs/by-name/ni/nixos-init/src/chroot_realpath.rs deleted file mode 100644 index 3c4fd293ccb8..000000000000 --- a/pkgs/by-name/ni/nixos-init/src/chroot_realpath.rs +++ /dev/null @@ -1,52 +0,0 @@ -use std::{ - env, - io::{Write, stdout}, - os::unix::ffi::OsStrExt, - os::unix::fs, - path::{Path, PathBuf}, - process::Command, -}; - -use anyhow::{Context, Result, bail}; - -/// Canonicalize `path` in a chroot at the specified `root`. -pub fn canonicalize_in_chroot(root: &str, path: &Path) -> Result { - let output = Command::new("chroot-realpath") - .arg(root) - .arg(path.as_os_str()) - .output() - .context("Failed to run chroot-realpath. Most likely, the binary is not on PATH")?; - - if !output.status.success() { - bail!( - "chroot-realpath exited unsuccessfully: {}", - String::from_utf8_lossy(&output.stderr) - ); - } - - let output = - String::from_utf8(output.stdout).context("Failed to decode stdout of chroot-realpath")?; - - Ok(PathBuf::from(&output)) -} - -/// Entrypoint for the `chroot-realpath` binary. -pub fn chroot_realpath() -> Result<()> { - let args: Vec = env::args().collect(); - - if args.len() != 3 { - bail!("Usage: {} ", args[0]); - } - - fs::chroot(&args[1]).context("Failed to chroot")?; - std::env::set_current_dir("/").context("Failed to change directory")?; - - let path = std::fs::canonicalize(&args[2]) - .with_context(|| format!("Failed to canonicalize {}", args[2]))?; - - stdout() - .write_all(path.into_os_string().as_bytes()) - .context("Failed to write output")?; - - Ok(()) -} diff --git a/pkgs/by-name/ni/nixos-init/src/find_etc.rs b/pkgs/by-name/ni/nixos-init/src/find_etc.rs index 2af0dab6ffbb..8b994e1d7534 100644 --- a/pkgs/by-name/ni/nixos-init/src/find_etc.rs +++ b/pkgs/by-name/ni/nixos-init/src/find_etc.rs @@ -3,7 +3,7 @@ use std::{os::unix, path::Path}; use anyhow::{Context, Result}; use crate::config::Config; -use crate::{SYSROOT_PATH, canonicalize_in_chroot, find_toplevel_in_prefix}; +use crate::{SYSROOT_PATH, find_toplevel_in_prefix, resolve_in_prefix}; /// Entrypoint for the `find-etc` binary. /// @@ -18,14 +18,14 @@ pub fn find_etc() -> Result<()> { let basedir = config .etc_basedir .context("Failed to read etc_basedir from bootspec")?; - let etc_basedir = Path::new(SYSROOT_PATH) - .join(canonicalize_in_chroot(SYSROOT_PATH, Path::new(&basedir))?.strip_prefix("/")?); + let etc_basedir = + Path::new(SYSROOT_PATH).join(resolve_in_prefix(SYSROOT_PATH, &basedir)?.strip_prefix("/")?); let metadata_image = config .etc_metadata_image .context("Failed to read etc_metadata_image from bootspec")?; let etc_metadata_image = Path::new(SYSROOT_PATH) - .join(canonicalize_in_chroot(SYSROOT_PATH, Path::new(&metadata_image))?.strip_prefix("/")?); + .join(resolve_in_prefix(SYSROOT_PATH, &metadata_image)?.strip_prefix("/")?); unix::fs::symlink(etc_basedir, "/etc-basedir").context("Failed to link /etc-basedir")?; unix::fs::symlink(etc_metadata_image, "/etc-metadata-image") diff --git a/pkgs/by-name/ni/nixos-init/src/lib.rs b/pkgs/by-name/ni/nixos-init/src/lib.rs index aa123c5e30c2..2ee90c6f8228 100644 --- a/pkgs/by-name/ni/nixos-init/src/lib.rs +++ b/pkgs/by-name/ni/nixos-init/src/lib.rs @@ -1,10 +1,10 @@ mod activate; -mod chroot_realpath; mod config; mod find_etc; mod fs; mod init; mod initrd_init; +mod path; mod proc_mounts; mod switch_root; @@ -14,10 +14,10 @@ use anyhow::{Context, Result, bail}; pub use crate::{ activate::activate, - chroot_realpath::{canonicalize_in_chroot, chroot_realpath}, find_etc::find_etc, init::init, initrd_init::initrd_init, + path::{resolve_in_prefix, resolve_in_root}, switch_root::switch_root, }; @@ -77,7 +77,7 @@ pub fn verify_init_is_nixos(prefix: &str, path: impl AsRef) -> Result Result { let cmdline = std::fs::read_to_string("/proc/cmdline")?; let init = extract_init(&cmdline)?; - let canonicalized_init = canonicalize_in_chroot(prefix, &init)?; + let canonicalized_init = resolve_in_prefix(prefix, &init)?; log::info!("Found init: {}.", canonicalized_init.display()); Ok(canonicalized_init) } diff --git a/pkgs/by-name/ni/nixos-init/src/main.rs b/pkgs/by-name/ni/nixos-init/src/main.rs index d2ca7a5f3011..a051af590be3 100644 --- a/pkgs/by-name/ni/nixos-init/src/main.rs +++ b/pkgs/by-name/ni/nixos-init/src/main.rs @@ -2,7 +2,7 @@ use std::{env, io::Write, process::ExitCode}; use log::Level; -use nixos_init::{chroot_realpath, find_etc, initrd_init}; +use nixos_init::{find_etc, initrd_init, resolve_in_root}; fn main() -> ExitCode { let arg0 = env::args() @@ -13,7 +13,7 @@ fn main() -> ExitCode { setup_logger(); let entrypoint = match arg0.as_str() { "find-etc" => find_etc, - "chroot-realpath" => chroot_realpath, + "resolve-in-root" => resolve_in_root, "initrd-init" => initrd_init, _ => { log::error!("Command {arg0} unknown"); diff --git a/pkgs/by-name/ni/nixos-init/src/path.rs b/pkgs/by-name/ni/nixos-init/src/path.rs new file mode 100644 index 000000000000..7af9447aaf0d --- /dev/null +++ b/pkgs/by-name/ni/nixos-init/src/path.rs @@ -0,0 +1,64 @@ +use std::{ + env, + io::{Write, stdout}, + os::{ + fd::{AsFd, AsRawFd}, + unix::ffi::OsStrExt, + }, + path::{Path, PathBuf}, +}; + +use anyhow::{Context, Result, bail}; +use pathrs::{ + Root, + procfs::{ProcfsBase, ProcfsHandle}, +}; + +/// Resolve a path inside a prefix. +/// +/// This resolves the path by following all symlinks until the end. +/// +/// Uses `openat(2)` with the `RESOLVE_IN_ROOT` flag. +pub fn resolve_in_prefix(prefix: &str, path: impl AsRef) -> Result { + let root = Root::open(prefix).with_context(|| format!("Failed to open prefix {prefix}"))?; + let handle = root.resolve(&path).with_context(|| { + format!( + "Failed to resolve path {} in prefix {prefix}", + path.as_ref().display() + ) + })?; + + let fd = handle.as_fd().as_raw_fd(); + if fd.is_negative() { + bail!("File descriptor of resolved path is negative") + } + let proc = ProcfsHandle::new().context("Failed to open /proc")?; + let resolved_path = proc + .readlink(ProcfsBase::ProcSelf, format!("fd/{fd}")) + .context("Failed to read path from procfs fd")?; + + // Reading the path of the resolved FD will add the prefix to the path. Nonetheless this path + // has been correctly resolved and we can simply strip the prefix again. + Ok(Path::new("/").join( + resolved_path + .strip_prefix(prefix) + .context("Failed to strip prefix from path")?, + )) +} + +/// Entrypoint for the `resolve-in-root` binary. +pub fn resolve_in_root() -> Result<()> { + let args: Vec = env::args().collect(); + + if args.len() != 3 { + bail!("Usage: {} ", args[0]); + } + + let path = resolve_in_prefix(&args[1], &args[2])?; + + stdout() + .write_all(path.into_os_string().as_bytes()) + .context("Failed to write output")?; + + Ok(()) +} diff --git a/pkgs/by-name/ni/nixpkgs-review/package.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix index e80bb821385d..4a37d17b7acc 100644 --- a/pkgs/by-name/ni/nixpkgs-review/package.nix +++ b/pkgs/by-name/ni/nixpkgs-review/package.nix @@ -85,6 +85,7 @@ python3Packages.buildPythonApplication (finalAttrs: { license = lib.licenses.mit; mainProgram = "nixpkgs-review"; maintainers = with lib.maintainers; [ + figsoda mdaniels5757 mic92 ]; diff --git a/pkgs/by-name/nk/nkeys/package.nix b/pkgs/by-name/nk/nkeys/package.nix index 82272efbe583..0a5efee7ccae 100644 --- a/pkgs/by-name/nk/nkeys/package.nix +++ b/pkgs/by-name/nk/nkeys/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "nkeys"; - version = "0.4.12"; + version = "0.4.15"; src = fetchFromGitHub { owner = "nats-io"; repo = "nkeys"; tag = "v${finalAttrs.version}"; - hash = "sha256-uNvRzljA6c6ppFtZLpFmwz/c9fmDzQz44Ekys0rBZ+o="; + hash = "sha256-hlVPfL3ecEmqXRsV3skiOD7B1s2a0ZZ5RX6LV6ISEWI="; }; - vendorHash = "sha256-yZc2qG61VsUDXr1uxF/BK7WFI6a7xOsjAxnw6G+JpeQ="; + vendorHash = "sha256-3gyWzCYpkXnEURKB05GtGJxDMk6oIzWS4u3U5OUd3p4="; meta = { description = "Public-key signature system for NATS"; diff --git a/pkgs/by-name/nz/nzbget/package.nix b/pkgs/by-name/nz/nzbget/package.nix index 992d27d76aba..c90710075a86 100644 --- a/pkgs/by-name/nz/nzbget/package.nix +++ b/pkgs/by-name/nz/nzbget/package.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nzbget"; - version = "25.4"; + version = "26.0"; src = fetchFromGitHub { owner = "nzbgetcom"; repo = "nzbget"; rev = "v${finalAttrs.version}"; - hash = "sha256-BP2kNgEDLVpW4TvUW2dToa3rnvGANZw2alBO75Jd2hs="; + hash = "sha256-IyaTe0bBQKnIuG3wq29KMZjKSiKu3Atd3GsNg8PGhRI="; }; patches = [ diff --git a/pkgs/by-name/oc/octorus/package.nix b/pkgs/by-name/oc/octorus/package.nix new file mode 100644 index 000000000000..d4b221ecabae --- /dev/null +++ b/pkgs/by-name/oc/octorus/package.nix @@ -0,0 +1,32 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + installShellFiles, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "octorus"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "ushironoko"; + repo = "octorus"; + rev = "v${finalAttrs.version}"; + hash = "sha256-20HVES8XgZEgKIijTzo9rV5IRfhyZlY1noX6yHSUf8g="; + }; + + cargoHash = "sha256-4HHl3SIXqfWOeKFmGqXLTC9veglMAFo1MLJIR/BYr0M="; + + nativeBuildInputs = [ installShellFiles ]; + + meta = { + description = "TUI PR review tool for GitHub"; + homepage = "https://github.com/ushironoko/octorus"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + matthiasbeyer + ]; + mainProgram = "octorus"; + }; +}) diff --git a/pkgs/by-name/of/offpunk/package.nix b/pkgs/by-name/of/offpunk/package.nix index 807e0755e537..852cc0ce8507 100644 --- a/pkgs/by-name/of/offpunk/package.nix +++ b/pkgs/by-name/of/offpunk/package.nix @@ -3,6 +3,7 @@ python3Packages, fetchFromSourcehut, file, + gettext, installShellFiles, less, offpunk, @@ -14,19 +15,22 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "offpunk"; - version = "2.8"; + version = "3.0"; pyproject = true; src = fetchFromSourcehut { owner = "~lioploum"; repo = "offpunk"; rev = "v${finalAttrs.version}"; - hash = "sha256-s/pEN7n/g9o8a/hYTC39PgbBLyCUwN5LIggqUSMKRS4="; + hash = "sha256-5SoMa93QbwbsryeHGc3pkkDA8v9eonZvuflSuDV2hmI="; }; build-system = with python3Packages; [ hatchling ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + gettext + installShellFiles + ]; dependencies = [ file diff --git a/pkgs/by-name/op/opencc/package.nix b/pkgs/by-name/op/opencc/package.nix index 16169635f95e..464d23507bff 100644 --- a/pkgs/by-name/op/opencc/package.nix +++ b/pkgs/by-name/op/opencc/package.nix @@ -12,32 +12,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "opencc"; - version = "1.1.9"; + version = "1.2.0"; src = fetchFromGitHub { owner = "BYVoid"; repo = "OpenCC"; - rev = "ver.${finalAttrs.version}"; - sha256 = "sha256-JBTegQs9ALp4LdKKYMNp9GYEgqR9O8IkX6LqatvaTic="; + tag = "ver.${finalAttrs.version}"; + hash = "sha256-T2bl4JVE04/64bLdBj5BB+2G09kDFyLnI+hx23h5q68="; }; - patches = [ - # fix build with gcc15 by adding cstdint include - (fetchpatch { - url = "https://github.com/BYVoid/OpenCC/commit/3d3adca2dbee0da7d33eb3c3563299fcbd2255e3.patch"; - hash = "sha256-4ZQxVnEHnNBKtEu0IPnSC/ZX7gm2cJ1Ss00PvCZr5P8="; - }) - (fetchpatch { - url = "https://github.com/BYVoid/OpenCC/commit/72cae18cfe4272f2b11c9ec1c44d6af7907abcab.patch"; - hash = "sha256-Cd95AsW/tLk2l8skxqfEfQUm0t23G4ocoirauwMbuwk="; - }) - (fetchpatch { - name = "CVE-2025-15536.patch"; - url = "https://github.com/BYVoid/OpenCC/commit/345c9a50ab07018f1b4439776bad78a0d40778ec.patch"; - hash = "sha256-lwzVRcCkMjHniaOQeoicO9fpEhyku2yhiPREk0WoXVM="; - }) - ]; - nativeBuildInputs = [ cmake python3 diff --git a/pkgs/by-name/op/opencore-amr/package.nix b/pkgs/by-name/op/opencore-amr/package.nix index 2063c06d1d48..3b13e6796971 100644 --- a/pkgs/by-name/op/opencore-amr/package.nix +++ b/pkgs/by-name/op/opencore-amr/package.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec. Library of VisualOn implementation of Adaptive Multi Rate Wideband (AMR-WB)"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.kiloreux ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix index 786b16d322f0..eb6004f49660 100644 --- a/pkgs/by-name/op/openfga/package.nix +++ b/pkgs/by-name/op/openfga/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "openfga"; - version = "1.11.3"; + version = "1.11.4"; src = fetchFromGitHub { owner = "openfga"; repo = "openfga"; rev = "v${finalAttrs.version}"; - hash = "sha256-PpDyDwKYx45Q07n7AdwVQdZ2TygDYo/Zi6m+RnzGPzE="; + hash = "sha256-MhxDlJzAScmf8J42WrsgVzSasiIhzqprrU9TqoY2bzk="; }; - vendorHash = "sha256-UoGxXhf3hx3Gk8GCcPpBMbmKxLrxVl3lNpBOEubdHtw="; + vendorHash = "sha256-m2ddB7yfZmTwWKvf/lTzmc2D4lR1JXc5sFlRgAi+q+s="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/op/openscreen/package.nix b/pkgs/by-name/op/openscreen/package.nix index 39a230c14360..9f61647ad701 100644 --- a/pkgs/by-name/op/openscreen/package.nix +++ b/pkgs/by-name/op/openscreen/package.nix @@ -17,16 +17,16 @@ buildNpmPackage (finalAttrs: { inherit nodejs; pname = "openscreen"; - version = "1.1.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "siddharthvaddem"; repo = "openscreen"; tag = "v${finalAttrs.version}"; - hash = "sha256-eneZ/2oCjIimlqGpwKGdxiPPsDTdaBOHpTUfWOQSD54="; + hash = "sha256-NW6GrmWgdLgobYGAoxlSF/ne17A0IzAQBi4LJk2awpw="; }; - npmDepsHash = "sha256-TNUbF0YVpAGZFGYf3cgM2oTrSGTo6tTvckqLrvdiE6g="; + npmDepsHash = "sha256-IaYSejp4sXEN0KlK7+bmzufGs8D60ZjmFWjO2zMkFrM="; npmRebuildFlags = [ "--ignore-scripts" ]; # Prevent running `node-gyp build` diff --git a/pkgs/by-name/op/opentrack/desktop-filename.patch b/pkgs/by-name/op/opentrack/desktop-filename.patch new file mode 100644 index 000000000000..9b7fa5c18c50 --- /dev/null +++ b/pkgs/by-name/op/opentrack/desktop-filename.patch @@ -0,0 +1,15 @@ +diff --git a/gui/init.cpp b/gui/init.cpp +index 1647b050db0efe76028000939a7ca8e4047116b7..9114c31c51a69294e0803c15008a824e18da7a09 100644 +--- a/gui/init.cpp ++++ b/gui/init.cpp +@@ -315,6 +315,10 @@ int otr_main(int argc, char** argv, std::function()> co + add_win32_path(); + #endif + ++#ifdef Q_OS_LINUX ++ app.setDesktopFileName("opentrack"); ++#endif ++ + QDir::setCurrent(OPENTRACK_BASE_PATH); + + set_qt_style(); diff --git a/pkgs/by-name/op/opentrack/package.nix b/pkgs/by-name/op/opentrack/package.nix index dfe8a2387ad1..f66c08ec2a67 100644 --- a/pkgs/by-name/op/opentrack/package.nix +++ b/pkgs/by-name/op/opentrack/package.nix @@ -40,6 +40,11 @@ stdenv.mkDerivation (finalAttrs: { meta.license = lib.licenses.free; }; + patches = [ + # calls `app.setDesktopFileName("opentrack");` - distros that don't wrap the binary apparently don't need this. + ./desktop-filename.patch + ]; + strictDeps = true; nativeBuildInputs = [ @@ -64,13 +69,14 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ + (lib.cmakeFeature "OPENTRACK_COMMIT" "opentrack-${finalAttrs.version}") (lib.cmakeBool "SDK_WINE" withWine) (lib.cmakeFeature "SDK_ARUCO_LIBPATH" "${finalAttrs.aruco}/lib/libaruco.a") (lib.cmakeFeature "SDK_XPLANE" finalAttrs.xplaneSdk.outPath) ]; postInstall = '' - install -Dt $out/share/icons/hicolor/256x256 $src/gui/images/opentrack.png + install -Dt $out/share/icons/hicolor/256x256/apps ../gui/images/opentrack.png ''; # manually wrap just the main binary diff --git a/pkgs/by-name/pa/paqet/package.nix b/pkgs/by-name/pa/paqet/package.nix index 033cbb1bbf62..dd07e8642fa9 100644 --- a/pkgs/by-name/pa/paqet/package.nix +++ b/pkgs/by-name/pa/paqet/package.nix @@ -9,12 +9,12 @@ }: buildGoModule (finalAttrs: { pname = "paqet"; - version = "1.0.0-alpha.14"; + version = "1.0.0-alpha.15"; src = fetchFromGitHub { owner = "hanselime"; repo = "paqet"; tag = "v${finalAttrs.version}"; - hash = "sha256-U5NBbXkyYcEemKgApNeDvxe3dKAt6HViUXlYcvvK0UU="; + hash = "sha256-ryspYKbnDT7emEftRWCZLVNFDEOvAv7IhdM4VBRQjKc="; }; vendorHash = "sha256-Vf3bKdhlM4vqzBv5RAwHeShGHudEh1VNTCFxAL/cwLw="; diff --git a/pkgs/by-name/pa/patsh/package.nix b/pkgs/by-name/pa/patsh/package.nix index 8676504b8a55..0490ecdf4acd 100644 --- a/pkgs/by-name/pa/patsh/package.nix +++ b/pkgs/by-name/pa/patsh/package.nix @@ -48,6 +48,6 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/nix-community/patsh"; changelog = "https://github.com/nix-community/patsh/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mpl20; - maintainers = [ ]; + maintainers = with lib.maintainers; [ figsoda ]; }; }) diff --git a/pkgs/by-name/pd/pdns-recursor/package.nix b/pkgs/by-name/pd/pdns-recursor/package.nix index 331bfdefd549..df2116f8f4a3 100644 --- a/pkgs/by-name/pd/pdns-recursor/package.nix +++ b/pkgs/by-name/pd/pdns-recursor/package.nix @@ -21,17 +21,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdns-recursor"; - version = "5.3.4"; + version = "5.3.5"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.xz"; - hash = "sha256-+1CoWH9LPVf4jcrMImpkxRVJkrDa/SD1uwNDVeNiRSQ="; + hash = "sha256-dEl65iAWfYV84tVwK9FAGOX0yEjoePKc71FYGnSw0F4="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; sourceRoot = "pdns-recursor-${finalAttrs.version}/rec-rust-lib/rust"; - hash = "sha256-g0Mu1+ZRQyzC4nG5ueISaDzFtmFfy+CGt063/V5lo30="; + hash = "sha256-h1xVW80Uv9sX+ykW5SFqQSpmAuRbM9aCzmxRUKABPwI="; }; cargoRoot = "rec-rust-lib/rust"; diff --git a/pkgs/by-name/pi/pinocchio/package.nix b/pkgs/by-name/pi/pinocchio/package.nix index 54e35f5775be..5144a6af2501 100644 --- a/pkgs/by-name/pi/pinocchio/package.nix +++ b/pkgs/by-name/pi/pinocchio/package.nix @@ -1,33 +1,43 @@ { + lib, + + fetchFromGitHub, + nix-update-script, + stdenv, + + # nativeBuildInputs + cmake, + doxygen, + pkg-config, + + # propagatedBuildInputs boost, casadi, - casadiSupport ? true, - cmake, - collisionSupport ? true, - console-bridge, - ctestCheckHook, - doxygen, - eigen, - example-robot-data, - fetchFromGitHub, - fetchpatch, coal, + console-bridge, + eigen, jrl-cmakemodules, - lib, - pkg-config, - stdenv, urdfdom, + + # nativeCheckInputs + ctestCheckHook, + + # checkInputs = [ + example-robot-data, + + casadiSupport ? true, + collisionSupport ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "pinocchio"; - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = "pinocchio"; rev = "v${finalAttrs.version}"; - hash = "sha256-2oMP653fJ7Msk+IB8whRk2L8xkAmRdDeMLPJyyD99OQ="; + hash = "sha256-k2lT1I0wb3N/o95ol2oO6HSYHf4wKJ0SFEg8JNxZmpI="; }; outputs = [ @@ -35,19 +45,7 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - patches = [ - # ref. https://github.com/stack-of-tasks/pinocchio/pull/2771 - (fetchpatch { - name = "fix-viser-path.patch"; - url = "https://github.com/stack-of-tasks/pinocchio/commit/36a04bddb6980a7bcd28ebcc55d4e442f7920d87.patch"; - hash = "sha256-9oENiMmRqJLU4ZiyGojm7suqdwTDGfk56aS2kcZiGaI="; - }) - ]; - postPatch = '' - # allow package:// uri use in examples - export ROS_PACKAGE_PATH=${example-robot-data}/share - # silence matplotlib warning export MPLCONFIGDIR=$(mktemp -d) ''; @@ -99,9 +97,12 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "Fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives"; homepage = "https://github.com/stack-of-tasks/pinocchio"; + changelog = "https://github.com/stack-of-tasks/pinocchio/blob/devel/CHANGELOG.md"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ nim65s diff --git a/pkgs/by-name/pi/piv-agent/package.nix b/pkgs/by-name/pi/piv-agent/package.nix index ee530decdd04..e9e136784319 100644 --- a/pkgs/by-name/pi/piv-agent/package.nix +++ b/pkgs/by-name/pi/piv-agent/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "piv-agent"; - version = "0.23.1"; + version = "0.24.0"; src = fetchFromGitHub { owner = "smlx"; repo = "piv-agent"; rev = "v${finalAttrs.version}"; - hash = "sha256-NNgDkdsEN2LxgxTlH4rMkod2E0/BDkjcS8Pes2/ZFEs="; + hash = "sha256-fFnUWV+q9M0QS84N59DKMVQ+uTG8adZaUi1fPipwF/U="; }; - vendorHash = "sha256-k1PMHUGu3I8tLFeeHjV2ZO9R/sHbbPzNa5u/HxzdlYc="; + vendorHash = "sha256-j8Sq8j99APyOmfgpqkaVTgawJ0ahToHQt71TMBoafm0="; subPackages = [ "cmd/piv-agent" ]; diff --git a/pkgs/by-name/pl/plasticscm-client-gui-unwrapped/package.nix b/pkgs/by-name/pl/plasticscm-client-gui-unwrapped/package.nix index d3360dafffde..f78e747319a2 100644 --- a/pkgs/by-name/pl/plasticscm-client-gui-unwrapped/package.nix +++ b/pkgs/by-name/pl/plasticscm-client-gui-unwrapped/package.nix @@ -11,11 +11,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "plasticscm-client-gui-unwrapped"; - version = "11.0.16.9915"; + version = "11.0.16.9925"; src = fetchurl { url = "https://www.plasticscm.com/plasticrepo/stable/debian/amd64/plasticscm-client-gui_${finalAttrs.version}_amd64.deb"; - hash = "sha256-T5032/pM30LTQWi55YQEFSeglnnxXlJsZUCXL4JCpnw="; + hash = "sha256-nzq5Wj/UDvBUGDNgSd/Ib+0TwD+uq1hN1J5OZCvH7sE="; nativeBuildInputs = [ dpkg ]; downloadToTemp = true; recursiveHash = true; diff --git a/pkgs/by-name/pl/plasticscm-theme/package.nix b/pkgs/by-name/pl/plasticscm-theme/package.nix index 8cf946687d52..351667d7f038 100644 --- a/pkgs/by-name/pl/plasticscm-theme/package.nix +++ b/pkgs/by-name/pl/plasticscm-theme/package.nix @@ -11,7 +11,7 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "plasticscm-theme"; - version = "11.0.16.9915"; + version = "11.0.16.9925"; src = fetchurl { url = "https://www.plasticscm.com/plasticrepo/stable/debian/amd64/plasticscm-theme_${finalAttrs.version}_amd64.deb"; diff --git a/pkgs/by-name/pr/prow/package.nix b/pkgs/by-name/pr/prow/package.nix index 8eefeb47415d..42e80a9f06a5 100644 --- a/pkgs/by-name/pr/prow/package.nix +++ b/pkgs/by-name/pr/prow/package.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "prow"; - version = "0-unstable-2026-02-01"; - rev = "a50f011ce108985726aa0d8ecbc65524292f7940"; + version = "0-unstable-2026-02-06"; + rev = "85e3dda3b79520c15cd101b85b52ccf4f7e1f1e6"; src = fetchFromGitHub { inherit rev; owner = "kubernetes-sigs"; repo = "prow"; - hash = "sha256-tWd9Zj8nwAjlnuqfCU2VtCNcP8+p17yX876AsQJI4U4="; + hash = "sha256-1x0RKRYi7HruNJJwAhPQ+sIcKKwdyyI3cysBQvY2Z8Y="; }; vendorHash = "sha256-Pv9LznRh7Nzm74gMKT2Q/VLIMIIc93en0qX6YA6TwK4="; diff --git a/pkgs/by-name/pv/pvs-studio/package.nix b/pkgs/by-name/pv/pvs-studio/package.nix index c23eb4f88eb8..9a2fa2f2fb81 100644 --- a/pkgs/by-name/pv/pvs-studio/package.nix +++ b/pkgs/by-name/pv/pvs-studio/package.nix @@ -15,7 +15,7 @@ # nixpkgs-update: no auto update stdenv.mkDerivation rec { pname = "pvs-studio"; - version = "7.38.97034.608"; + version = "7.40.101088.713"; src = let @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { in fetchzip { url = selectSystem { - aarch64-darwin = "https://web.archive.org/web/20251002123729/https://files.pvs-studio.com/pvs-studio-${version}-macos-arm64.zip"; - x86_64-darwin = "https://web.archive.org/web/20251002121955/https://files.pvs-studio.com/pvs-studio-${version}-macos-x86_64.zip"; - x86_64-linux = "https://web.archive.org/web/20251002124032/https://files.pvs-studio.com/pvs-studio-${version}-x86_64.tgz"; + aarch64-darwin = "https://web.archive.org/web/20260131193428/https://files.pvs-studio.com/pvs-studio-${version}-macos-arm64.zip"; + x86_64-darwin = "https://web.archive.org/web/20260131193142/https://files.pvs-studio.com/pvs-studio-${version}-macos-x86_64.zip"; + x86_64-linux = "https://web.archive.org/web/20260131192910/https://files.pvs-studio.com/pvs-studio-${version}-x86_64.tgz"; }; hash = selectSystem { - aarch64-darwin = "sha256-nZwG2qFnpWnJBVmfdIqT/y3gVs66NUKy4BifFCgA3aE="; - x86_64-darwin = "sha256-Q48i518jNQYTGGW7ihcyk7/DauHH1/fWniEvdsp7rSU="; - x86_64-linux = "sha256-Dw9PasnbUbBsVCPZoUHHcRIBzq1XqFzThaVY6NB3qFE="; + aarch64-darwin = "sha256-ExJldpqwD9dqGtY/QQ2i3qiNXSyR6exhYKIrwgdQrtQ="; + x86_64-darwin = "sha256-zKwUVDoi9yWCD0gooeDslTwzQ/9N17OkMqwkAL0EQe8="; + x86_64-linux = "sha256-c7+Zvo+cHtGtdaHi+3w7Vjluo7uQ2CfptCO8RkVm7wU="; }; }; diff --git a/pkgs/by-name/py/pyrefly/package.nix b/pkgs/by-name/py/pyrefly/package.nix index 07e4e672c0f9..0d1b31a0a266 100644 --- a/pkgs/by-name/py/pyrefly/package.nix +++ b/pkgs/by-name/py/pyrefly/package.nix @@ -10,17 +10,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "pyrefly"; - version = "0.51.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "facebook"; repo = "pyrefly"; tag = finalAttrs.version; - hash = "sha256-Id1HPBJoeNBknuxiAyRSAay89jPaXGHgUe1s4LzrXhc="; + hash = "sha256-UvYM+j26qIe5yQNp0ttEvdrEoYFDvWY6xFGS0bMFXT4="; }; buildAndTestSubdir = "pyrefly"; - cargoHash = "sha256-VdF6nUTubF08VfGMHkq9iOvX1UiXOsWck481NgxwzY0="; + cargoHash = "sha256-gzaRZys2F9fyv0Q0gAAg3UdxF9rMMI6+lzZPhnrVC00="; buildInputs = [ rust-jemalloc-sys ]; diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix index 44a4bc2d9518..e439295a3feb 100644 --- a/pkgs/by-name/qu/quarkus/package.nix +++ b/pkgs/by-name/qu/quarkus/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quarkus-cli"; - version = "3.31.1"; + version = "3.31.2"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-wKNFWIm/BDkGyerafKskekhfgn5QBcxecUDSw4hhwCY="; + hash = "sha256-gWaU/038550xRIigXEOfQe2ZdlTxpjzWH0DbJo8FTLQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index 5965c9d4bc89..49fad64f67e9 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -1,6 +1,6 @@ { rustPlatform, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, cargo-tauri, @@ -18,38 +18,41 @@ moreutils, jq, gst_all_1, + + # NOTE: this is enabled by default for better compatibility, but it may slow + # down performance. + withNvidiaFix ? true, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "readest"; - version = "0.9.98"; + version = "0.9.99"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${finalAttrs.version}"; - hash = "sha256-qhV2ZEMcnn+0IePaIIvTcCYGCdLAUhtC0GEQAuXWUC8="; + hash = "sha256-Fcil35siaGrooW8+R2WrZaR5qHPJXIYOU/Au1YKlb2M="; fetchSubmodules = true; }; postUnpack = '' - # pnpm.configHook has to write to ../.., as our sourceRoot is set to apps/readest-app + # pnpm.configHook has to write to ../.., as our sourceRoot is set to + # apps/readest-app chmod -R +w . ''; sourceRoot = "${finalAttrs.src.name}/apps/readest-app"; + pnpmRoot = "../.."; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_9; - fetcherVersion = 1; - hash = "sha256-3eYWN5ZZByOO2UFJ7X4PdBr/fNtnBmhrzx4J9IFxiNw="; + pnpm = pnpm_10; + fetcherVersion = 3; + hash = "sha256-/bzjOdpvuPLBMvX/q1WaO3lFg5/jLz5Ypr5OojssXUI="; }; - pnpmRoot = "../.."; - - cargoHash = "sha256-qYBHYjwfGkKmGXN8caamZ6/XGtnxe+lmy6dIpdMwS/I="; - cargoRoot = "../.."; + cargoHash = "sha256-qYBHYjwfGkKmGXN8caamZ6/XGtnxe+lmy6dIpdMwS/I="; buildAndTestSubdir = "src-tauri"; @@ -67,7 +70,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargo-tauri.hook nodejs pnpmConfigHook - pnpm_9 + pnpm_10 pkg-config wrapGAppsHook3 autoPatchelfHook @@ -92,7 +95,10 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpm setup-vendors ''; - preFixup = '' + preFixup = lib.optionalString withNvidiaFix '' + # fix Nvidia issues with Tauri + # https://github.com/tauri-apps/tauri/issues/9394 + # https://github.com/tauri-apps/tauri/issues/9304 gappsWrapperArgs+=( --set-default WEBKIT_DISABLE_DMABUF_RENDERER 1 ) diff --git a/pkgs/by-name/re/remark42/package.nix b/pkgs/by-name/re/remark42/package.nix index 77595ef28e4a..df1192589b50 100644 --- a/pkgs/by-name/re/remark42/package.nix +++ b/pkgs/by-name/re/remark42/package.nix @@ -95,12 +95,12 @@ buildGoModule (finalAttrs: { version = "v${finalAttrs.version}"; }; - meta = with lib; { + meta = { description = "Self-hosted comment engine that embeds a statically built frontend"; homepage = "https://remark42.com/"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "remark42"; - platforms = platforms.unix; - maintainers = with maintainers; [ janhencic ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ janhencic ]; }; }) diff --git a/pkgs/by-name/rh/rhash/package.nix b/pkgs/by-name/rh/rhash/package.nix index ce6a487c5663..f517f6eda7c1 100644 --- a/pkgs/by-name/rh/rhash/package.nix +++ b/pkgs/by-name/rh/rhash/package.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Console utility and library for computing and verifying hash sums of files"; license = lib.licenses.bsd0; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ andrewrk ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/rt/rtrtr/package.nix b/pkgs/by-name/rt/rtrtr/package.nix index 6aba19949477..30c165da50e6 100644 --- a/pkgs/by-name/rt/rtrtr/package.nix +++ b/pkgs/by-name/rt/rtrtr/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rtrtr"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = "rtrtr"; rev = "v${finalAttrs.version}"; - hash = "sha256-1TmzC/d/odfYdo1CiCsFW3U7OCpTF4Gkw2w4c2yaxxw="; + hash = "sha256-n6dpORKh9ul9VQXKXtnkuewUnQOmge99HljUgVpO2HM="; }; - cargoHash = "sha256-SeQ2zRBbETabAhOItu3C6PUjL7vUsVDzWGbYcUIslF4="; + cargoHash = "sha256-3Atv3lEQIiM5MNjdQdLUnUDb3rHICxDAhQq0yuLSgtA="; nativeBuildInputs = [ pkg-config ]; buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix index 6ea5f4e90ca6..87ab732f4429 100644 --- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix +++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix @@ -13,15 +13,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rust-analyzer-unwrapped"; - version = "2026-02-02"; + version = "2026-02-09"; - cargoHash = "sha256-tMjS0nFfnBAdzuSidC/y8kFucMqUZKWeslYU9gmyUuU="; + cargoHash = "sha256-MAEzZDXY7W6ZlWWCK4Rx8hQtWijTt3giYxaJiaPAw5M="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = finalAttrs.version; - hash = "sha256-VOsqRwtcLiaJWVVz4Enk9yYJl7Ce9+pJ7rtFts/7tCY="; + hash = "sha256-S6qG5sNG76JitdRRY0dyEq9+n+4TJuqKrFrtTpripAo="; }; cargoBuildFlags = [ diff --git a/pkgs/by-name/sa/sagoin/package.nix b/pkgs/by-name/sa/sagoin/package.nix index b240eee9a90b..1b75e28938fd 100644 --- a/pkgs/by-name/sa/sagoin/package.nix +++ b/pkgs/by-name/sa/sagoin/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/figsoda/sagoin"; changelog = "https://github.com/figsoda/sagoin/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.agpl3Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "sagoin"; }; }) diff --git a/pkgs/by-name/sc/scalafmt/package.nix b/pkgs/by-name/sc/scalafmt/package.nix index 51aa064447e5..146899b37255 100644 --- a/pkgs/by-name/sc/scalafmt/package.nix +++ b/pkgs/by-name/sc/scalafmt/package.nix @@ -9,7 +9,7 @@ let baseName = "scalafmt"; - version = "3.10.4"; + version = "3.10.6"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -19,7 +19,7 @@ let cp $(< deps) $out/share/java/ ''; outputHashMode = "recursive"; - outputHash = "sha256-i4J7qFdzzcSb3RnYH2vAKFBVdMdW1V4hHcxQvNOEjXg="; + outputHash = "sha256-ZSVatzkY+6oiVL4MPf3oyFZiTYaXQ0PNfYvS3O/kU+A="; }; in stdenv.mkDerivation { diff --git a/pkgs/by-name/sc/scalingo/package.nix b/pkgs/by-name/sc/scalingo/package.nix index 45bd6be5a01a..21404f719f9f 100644 --- a/pkgs/by-name/sc/scalingo/package.nix +++ b/pkgs/by-name/sc/scalingo/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "scalingo"; - version = "1.43.0"; + version = "1.43.1"; src = fetchFromGitHub { owner = "scalingo"; repo = "cli"; rev = version; - hash = "sha256-A1kz4Zh6SiXcsmFqHuldRTa1qI8+bJBALjweWYBvnTo="; + hash = "sha256-Ny0AlgZAQwnFiu2W3pU1o9J7HVmI2ZjXfWVNmGwLaXI="; }; vendorHash = null; diff --git a/pkgs/by-name/sc/schemacrawler/package.nix b/pkgs/by-name/sc/schemacrawler/package.nix index de4602ac3e7e..358afb62e095 100644 --- a/pkgs/by-name/sc/schemacrawler/package.nix +++ b/pkgs/by-name/sc/schemacrawler/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "schemacrawler"; - version = "17.6.0"; + version = "17.6.1"; src = fetchzip { url = "https://github.com/schemacrawler/SchemaCrawler/releases/download/v${finalAttrs.version}/schemacrawler-${finalAttrs.version}-bin.zip"; - hash = "sha256-GReeCRzYm3tQW6TQWcxx5DeUnROnN0W6mypzWs4wUec="; + hash = "sha256-ZQJiHu3nqCSpVaixapzw2p9ix2xUhgzwEIcSntv0hxU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/sc/scipopt-scip/package.nix b/pkgs/by-name/sc/scipopt-scip/package.nix index 1f3413e0f8fa..a390c425bb2b 100644 --- a/pkgs/by-name/sc/scipopt-scip/package.nix +++ b/pkgs/by-name/sc/scipopt-scip/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "scipopt-scip"; - version = "10.0.0"; + version = "10.0.1"; src = fetchFromGitHub { owner = "scipopt"; repo = "scip"; tag = "v${finalAttrs.version}"; - hash = "sha256-KW7N2ORspzkaR/gdU//p38BV4GyuhoSIVb6q9RTrCYQ="; + hash = "sha256-YbPGJl2q9Ja1WRhcmpMJgmfE8crY/dH05ayj/N2pQAY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/sc/scipopt-soplex/package.nix b/pkgs/by-name/sc/scipopt-soplex/package.nix index 43c949d740bb..21a6159efc25 100644 --- a/pkgs/by-name/sc/scipopt-soplex/package.nix +++ b/pkgs/by-name/sc/scipopt-soplex/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "scipopt-soplex"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "scipopt"; repo = "soplex"; tag = "v${finalAttrs.version}"; - hash = "sha256-AppJUule+0x23gF/PwjDMsZ194aqK91UTevQgjPZIgc="; + hash = "sha256-NN1UwwvLPfRIpL49UV8f2G4glUmTEywKNXK3m1LFHcg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix index f970dbee2f7e..65269477d807 100644 --- a/pkgs/by-name/se/sentry-native/package.nix +++ b/pkgs/by-name/se/sentry-native/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sentry-native"; - version = "0.12.4"; + version = "0.12.6"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; tag = finalAttrs.version; - hash = "sha256-g0CRuupd8KyKWsBKOvNXZ7grrzJuREuYP4bz66SvpbU="; + hash = "sha256-2GapfbYtfo+Dw5KJjQ07ni1bUyLoVt6bINOBdohFKrI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/se/service-wrapper/package.nix b/pkgs/by-name/se/service-wrapper/package.nix index 8a32f5406216..8acb96996c40 100644 --- a/pkgs/by-name/se/service-wrapper/package.nix +++ b/pkgs/by-name/se/service-wrapper/package.nix @@ -7,11 +7,13 @@ }: let - name = "service-wrapper-${version}"; + pname = "service-wrapper"; version = "19.04"; # Akin to Ubuntu Release in -runCommand name +runCommand "${pname}-${version}" { + inherit pname version; + script = replaceVarsWith { src = ./service-wrapper.sh; isExecutable = true; diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix index 46560cf77cdd..1403098e9ca1 100644 --- a/pkgs/by-name/sh/shader-slang/package.nix +++ b/pkgs/by-name/sh/shader-slang/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "shader-slang"; - version = "2026.1.1"; + version = "2026.1.2"; src = fetchFromGitHub { owner = "shader-slang"; repo = "slang"; tag = "v${finalAttrs.version}"; - hash = "sha256-QYnhFIp4516qrokdTXvE+owLVcCzPpAT9W0yUJRs5vM="; + hash = "sha256-PaxE6C6pjLQ5rBeJDZBILvbQf2buYGWjTyZZaxG6/cI="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/sh/shen-sbcl/package.nix b/pkgs/by-name/sh/shen-sbcl/package.nix index a8d61806c64d..605d5f17fe8f 100644 --- a/pkgs/by-name/sh/shen-sbcl/package.nix +++ b/pkgs/by-name/sh/shen-sbcl/package.nix @@ -7,11 +7,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "shen-sbcl"; - version = "40"; + version = "41"; src = fetchzip { url = "https://www.shenlanguage.org/Download/S${finalAttrs.version}.zip"; - hash = "sha256-Ldz4NV+1Hf7FCDis+oeDt8mNuMe37jpaBMJlQ1XQaa0="; + hash = "sha256-uWGMET1zjGbI/+yM1zeMfhVYBgrGawafAEBBGXANXGE="; }; nativeBuildInputs = [ sbcl ]; diff --git a/pkgs/by-name/sh/shh/fix_run_checks.patch b/pkgs/by-name/sh/shh/fix_run_checks.patch index c555badd5e90..ab62229bfbbe 100644 --- a/pkgs/by-name/sh/shh/fix_run_checks.patch +++ b/pkgs/by-name/sh/shh/fix_run_checks.patch @@ -1,16 +1,16 @@ -commit 3052c2c8be6a44aab2d4c5fa0d560a8109c5ed5e -Author: 06kellyjac -Date: Mon Sep 22 13:17:14 2025 +0100 +commit b13576b678280ebaff56010ceb67b2ca83ddd7e8 +Author: kuflierl <41301536+kuflierl@users.noreply.github.com> +Date: Tue Jan 27 12:19:11 2026 +0100 fix(tests): add support for nix-build-system for tests - - Co-authored-by: kuflierl <41301536+kuflierl@users.noreply.github.com> + + Co-authored-by: 06kellyjac diff --git a/src/systemd/resolver.rs b/src/systemd/resolver.rs -index 989f378..0629fb5 100644 +index 901ebf3..aa51708 100644 --- a/src/systemd/resolver.rs +++ b/src/systemd/resolver.rs -@@ -650,17 +650,14 @@ mod tests { +@@ -651,17 +651,14 @@ mod tests { let OptionValue::List(opt_list) = &candidates[0].value else { panic!(); }; @@ -34,10 +34,10 @@ index 989f378..0629fb5 100644 let actions = vec![ProgramAction::Read("/var/data".into())]; let candidates = resolve(&opts, &actions, &hardening_opts); diff --git a/tests/options.rs b/tests/options.rs -index cf20ea0..ab9f389 100644 +index 815b413..00bf21e 100644 --- a/tests/options.rs +++ b/tests/options.rs -@@ -24,7 +24,7 @@ fn run_true() { +@@ -23,7 +23,7 @@ fn run_true() { .assert() .success() .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1)) @@ -46,7 +46,7 @@ index cf20ea0..ab9f389 100644 BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1)) } else { BoxPredicate::new(predicate::str::contains("ProtectHome=").not()) -@@ -50,7 +50,7 @@ fn run_true() { +@@ -49,7 +49,7 @@ fn run_true() { .stdout(predicate::str::contains("LockPersonality=true\n").count(1)) .stdout(predicate::str::contains("RestrictRealtime=true\n").count(1)) .stdout(predicate::str::contains("ProtectClock=true\n").count(1)) @@ -55,19 +55,19 @@ index cf20ea0..ab9f389 100644 .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_IPC_LOCK CAP_KILL CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); } -@@ -97,7 +97,7 @@ fn run_ls_dev() { +@@ -94,7 +94,7 @@ fn run_ls_dev() { .assert() .success() .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1)) - .stdout(if Uid::effective().is_root() { -+ .stdout(if Uid::effective().is_root() || !env::current_exe().unwrap().starts_with("/home") { ++ .stdout(if !env::current_exe().unwrap().starts_with("/home") { BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1)) } else { BoxPredicate::new(predicate::str::contains("ProtectHome=").not()) -@@ -130,12 +130,12 @@ fn run_ls_dev() { +@@ -126,12 +126,12 @@ fn run_ls_dev() { + #[test] fn run_ls_proc() { - Command::cargo_bin("shh") - .unwrap() + cargo_bin_cmd!("shh") - .args(["run", "--", "busybox", "ls", "/proc/1/"]) + .args(["run", "--", "ls", "/proc/1/"]) .unwrap() @@ -75,20 +75,20 @@ index cf20ea0..ab9f389 100644 .success() .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1)) - .stdout(if Uid::effective().is_root() { -+ .stdout(if Uid::effective().is_root() || !env::current_exe().unwrap().starts_with("/home") { ++ .stdout(if !env::current_exe().unwrap().starts_with("/home") { BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1)) } else { BoxPredicate::new(predicate::str::contains("ProtectHome=").not()) -@@ -166,7 +166,7 @@ fn run_ls_proc() { +@@ -161,7 +161,7 @@ fn run_ls_proc() { .assert() .success() .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1)) - .stdout(if Uid::effective().is_root() { -+ .stdout(if Uid::effective().is_root() || !env::current_exe().unwrap().starts_with("/home") { ++ .stdout(if !env::current_exe().unwrap().starts_with("/home") { BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1)) } else { BoxPredicate::new(predicate::str::contains("ProtectHome=").not()) -@@ -188,7 +188,7 @@ fn run_ls_proc() { +@@ -183,7 +183,7 @@ fn run_ls_proc() { .stdout(predicate::str::contains("LockPersonality=true\n").count(1)) .stdout(predicate::str::contains("RestrictRealtime=true\n").count(1)) .stdout(predicate::str::contains("ProtectClock=true\n").count(1)) @@ -97,16 +97,16 @@ index cf20ea0..ab9f389 100644 .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_IPC_LOCK CAP_KILL CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); } -@@ -201,7 +201,7 @@ fn run_read_kallsyms() { +@@ -195,7 +195,7 @@ fn run_read_kallsyms() { .assert() .success() .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1)) - .stdout(if Uid::effective().is_root() { -+ .stdout(if Uid::effective().is_root() || !env::current_exe().unwrap().starts_with("/home") { ++ .stdout(if !env::current_exe().unwrap().starts_with("/home") { BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1)) } else { BoxPredicate::new(predicate::str::contains("ProtectHome=").not()) -@@ -227,7 +227,7 @@ fn run_read_kallsyms() { +@@ -221,7 +221,7 @@ fn run_read_kallsyms() { .stdout(predicate::str::contains("LockPersonality=true\n").count(1)) .stdout(predicate::str::contains("RestrictRealtime=true\n").count(1)) .stdout(predicate::str::contains("ProtectClock=true\n").count(1)) @@ -115,33 +115,32 @@ index cf20ea0..ab9f389 100644 .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_IPC_LOCK CAP_KILL CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); } -@@ -344,6 +344,7 @@ fn run_systemctl() { +@@ -338,6 +338,7 @@ fn run_systemctl() { .stdout(predicate::str::contains("CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_BPF CAP_CHOWN CAP_IPC_LOCK CAP_KILL CAP_MKNOD CAP_NET_RAW CAP_PERFMON CAP_SYS_BOOT CAP_SYS_CHROOT CAP_SYS_MODULE CAP_SYS_NICE CAP_SYS_PACCT CAP_SYS_PTRACE CAP_SYS_TIME CAP_SYS_TTY_CONFIG CAP_SYSLOG CAP_WAKE_ALARM\n").count(1)); } +// patched due to nix build isolation #[test] fn run_ss() { - Command::cargo_bin("shh") -@@ -353,7 +354,7 @@ fn run_ss() { + cargo_bin_cmd!("shh") +@@ -346,7 +347,7 @@ fn run_ss() { .assert() .success() .stdout(predicate::str::contains("ProtectSystem=strict\n").count(1)) - .stdout(if Uid::effective().is_root() { -+ .stdout(if Uid::effective().is_root() || !env::current_exe().unwrap().starts_with("/home") { ++ .stdout(if !env::current_exe().unwrap().starts_with("/home") { BoxPredicate::new(predicate::str::contains("ProtectHome=true\n").count(1)) } else { BoxPredicate::new(predicate::str::contains("ProtectHome=").not()) -@@ -369,7 +370,7 @@ fn run_ss() { +@@ -362,7 +363,6 @@ fn run_ss() { .stdout(predicate::str::contains("ProtectKernelModules=true\n").count(1)) .stdout(predicate::str::contains("ProtectKernelLogs=true\n").count(1)) .stdout(predicate::str::contains("ProtectControlGroups=true\n").count(1)) - .stdout(predicate::str::contains("ProtectProc=").not()) -+ //.stdout(predicate::str::contains("ProtectProc=").not()) .stdout(predicate::str::contains("MemoryDenyWriteExecute=true\n").count(1)) .stdout(predicate::str::contains("RestrictAddressFamilies=AF_NETLINK AF_UNIX\n").count(1).or(predicate::str::contains("RestrictAddressFamilies=AF_NETLINK\n").count(1))) .stdout(predicate::str::contains("SocketBindDeny=ipv4:tcp\n").count(1)) -@@ -379,7 +380,7 @@ fn run_ss() { +@@ -372,7 +372,7 @@ fn run_ss() { .stdout(predicate::str::contains("LockPersonality=true\n").count(1)) .stdout(predicate::str::contains("RestrictRealtime=true\n").count(1)) .stdout(predicate::str::contains("ProtectClock=true\n").count(1)) diff --git a/pkgs/by-name/sh/shh/package.nix b/pkgs/by-name/sh/shh/package.nix index deedf68e8599..8bfe3869fdf4 100644 --- a/pkgs/by-name/sh/shh/package.nix +++ b/pkgs/by-name/sh/shh/package.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "shh"; - version = "2025.11.3"; + version = "2026.1.27"; src = fetchFromGitHub { owner = "desbma"; repo = "shh"; tag = "v${finalAttrs.version}"; - hash = "sha256-oXTrKUs6J3Us2m1hFbVa+G03q3oV3pqppQ+QfPXVrFA="; + hash = "sha256-RGxxpAr8E2KriwheWXcsxRRBhZST27Xp6LSdgzxsuUM="; }; - cargoHash = "sha256-GGu/oy4bfsnJNbquDeu9bDJWY9HEWS3hwsOj3nhcUNQ="; + cargoHash = "sha256-GjUu7QDLMs/E4l3tjMBqmfoGkdQJMzdM/Ovg04pIctU="; patches = [ ./fix_run_checks.patch diff --git a/pkgs/by-name/sh/shpool/package.nix b/pkgs/by-name/sh/shpool/package.nix index 20bd78d07050..62cf7ca2ba09 100644 --- a/pkgs/by-name/sh/shpool/package.nix +++ b/pkgs/by-name/sh/shpool/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "shpool"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "shell-pool"; repo = "shpool"; rev = "v${finalAttrs.version}"; - hash = "sha256-Ul1CENx1KVU2jnMNfxz3R6loBvFIcAUp6japxaK7wGU="; + hash = "sha256-r1bYcf5SPHbrPgxCvfbZNVhGj/gX8K5ucd8PH0WMgb8="; }; postPatch = '' @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '/usr/bin/shpool' "$out/bin/shpool" ''; - cargoHash = "sha256-Year32ZIzikeC2QhqTufQhcbNM8VZUq2hfAimpUDI5w="; + cargoHash = "sha256-BeMIasnEFqeoHhNAlj/uBMtMoZvrLjyWDKi0n8BaSnU="; buildInputs = [ linux-pam diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix index adae60a5104b..5c9effac3bb5 100644 --- a/pkgs/by-name/si/sing-box/package.nix +++ b/pkgs/by-name/si/sing-box/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "sing-box"; - version = "1.12.20"; + version = "1.12.21"; src = fetchFromGitHub { owner = "SagerNet"; repo = "sing-box"; tag = "v${finalAttrs.version}"; - hash = "sha256-HYm4DMrCCQi+OInZPfezL0imy9jOLPa45sSpSWn2xgs="; + hash = "sha256-glBNYPgjXt2xd3MehiNe8W0OXEigsuhVVbEZ7QRDhDI="; }; - vendorHash = "sha256-Fw03Lf8F7fFpoHwG+/3dkFUIrY9eyd7rgvgXflaMLKw="; + vendorHash = "sha256-CSAXPvXMUwD08fsp66vr1pA4Wxy0rY2cEJU1Pl0mdUA="; tags = [ "with_quic" diff --git a/pkgs/by-name/sk/skyscraper/package.nix b/pkgs/by-name/sk/skyscraper/package.nix index c44e61b2406a..1504160ac3a3 100644 --- a/pkgs/by-name/sk/skyscraper/package.nix +++ b/pkgs/by-name/sk/skyscraper/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "skyscraper"; - version = "3.18.3"; + version = "3.18.4"; src = fetchFromGitHub { owner = "Gemba"; repo = "skyscraper"; tag = finalAttrs.version; - hash = "sha256-3Yo6aRmduIhTYwaxgL5fpKuNycM+VzgLPe/7VdaePo8="; + hash = "sha256-JuV8BpA9WHalw+riS4qpc+pRAe45hr673YpsPJNAB+A="; }; strictDeps = true; diff --git a/pkgs/by-name/sn/snakefmt/package.nix b/pkgs/by-name/sn/snakefmt/package.nix index fd9ff177ec02..5bc3805f96fc 100644 --- a/pkgs/by-name/sn/snakefmt/package.nix +++ b/pkgs/by-name/sn/snakefmt/package.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "snakefmt"; - version = "0.11.3"; + version = "0.11.4"; pyproject = true; disabled = python3.pythonOlder "3.11"; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-PvuC9mwFl3EhJq1UDsFc7iTXl+RDiU/YbM9qqQdQbsA="; + hash = "sha256-LfJVYdViI88L/DtfUD1znBHUiLQb7MKhyJ2jhFCW4+Y="; }; build-system = with python3.pkgs; [ hatchling ]; diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index 9ef7a64dd114..9253ab78d42f 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -9,18 +9,19 @@ rustPlatform, wrapGAppsHook4, graphene, + sqlite, nix-update-script, versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "snx-rs"; - version = "4.9.1"; + version = "5.0.5"; src = fetchFromGitHub { owner = "ancwrd1"; repo = "snx-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-7qmwi/hV8Ev+rdG00hIrQ8yMkb/yxAvG49SAvjsO4GQ="; + hash = "sha256-M0F5mJAVPWjT00jmgRC5rlWlN5Q5G5B63DETwJz0TfU="; }; passthru.updateScript = nix-update-script { }; @@ -36,6 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { kdePackages.kstatusnotifieritem openssl graphene + sqlite ]; checkFlags = [ @@ -47,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; - cargoHash = "sha256-RRmssKIzxhcmZjTqF0fRmw8XyyHFRwLJtGOF/xeD78w="; + cargoHash = "sha256-zOKXs4bw1JF2uZN0qvID2lYtH4/d5hOihENFSeq9oe8="; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/snx-rs"; diff --git a/pkgs/by-name/so/solana-agave/crossbeam-epoch.patch b/pkgs/by-name/so/solana-agave/crossbeam-epoch.patch new file mode 100644 index 000000000000..b62f655618d9 --- /dev/null +++ b/pkgs/by-name/so/solana-agave/crossbeam-epoch.patch @@ -0,0 +1,49 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 0194c34ed2..0d58655f70 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1419,14 +1419,14 @@ dependencies = [ + + [[package]] + name = "crossbeam-epoch" +-version = "0.9.5" +-source = "git+https://github.com/anza-xyz/crossbeam?rev=fd279d707025f0e60951e429bf778b4813d1b6bf#fd279d707025f0e60951e429bf778b4813d1b6bf" ++version = "0.9.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d2fe95351b870527a5d09bf563ed3c97c0cffb87cf1c78a591bf48bb218d9aa" + dependencies = [ ++ "autocfg", + "cfg-if 1.0.0", + "crossbeam-utils", +- "lazy_static", +- "memoffset 0.6.4", +- "scopeguard", ++ "memoffset 0.9.0", + ] + + [[package]] +@@ -3118,15 +3118,6 @@ dependencies = [ + "libc", + ] + +-[[package]] +-name = "memoffset" +-version = "0.6.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +-dependencies = [ +- "autocfg", +-] +- + [[package]] + name = "memoffset" + version = "0.7.1" +diff --git a/Cargo.toml b/Cargo.toml +index 2ff2094d67..a3ace4459a 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -665,4 +665,4 @@ + [patch.crates-io] + # for details, see https://github.com/anza-xyz/crossbeam/commit/fd279d707025f0e60951e429bf778b4813d1b6bf +-crossbeam-epoch = { git = "https://github.com/anza-xyz/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" } ++# crossbeam-epoch = { git = "https://github.com/anza-xyz/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" } diff --git a/pkgs/by-name/so/solana-agave/package.nix b/pkgs/by-name/so/solana-agave/package.nix new file mode 100644 index 000000000000..7e22eda533c2 --- /dev/null +++ b/pkgs/by-name/so/solana-agave/package.nix @@ -0,0 +1,103 @@ +{ + lib, + stdenv, + buildPackages, + fetchFromGitHub, + rustPlatform, + rustfmt, + installShellFiles, + pkg-config, + apple-sdk_15, + udev, + openssl, + libz, + protobuf, + cmake, + gnumake, + clang, + llvm, + llvmPackages, + rocksdb, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "solana-agave"; + version = "2.3.12"; + + src = fetchFromGitHub { + owner = "anza-xyz"; + repo = "agave"; + tag = "v${finalAttrs.version}"; + hash = "sha256-25UgiC5jAnlNE8Z7WrQRIviCuFp4zg57ddYA4h0qJ6U="; + }; + + cargoHash = "sha256-SVngabz9mrYNn7DlL7Rh7llvO4GmJdt5vpXVcjwqtNg="; + + # For the same reason as discussed in solana-cli derivation (crossbeam softlink), the no_atomic file is missing + # and either must somehow be rendered unneeded (using an upstream package) or replaced. A cleaner, non-behavior-changing, + # solution would be to commit the file to the repo fork (replacing the softlink). + cargoPatches = [ + ./crossbeam-epoch.patch + ]; + + nativeBuildInputs = [ + installShellFiles + protobuf + cmake + gnumake + clang + llvm + llvmPackages.bintools + openssl.dev + pkg-config + rustfmt + ]; + buildInputs = [ + openssl + libz + rustPlatform.bindgenHook + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ]; + + doInstallCheck = false; + + env = { + # If set, always finds OpenSSL in the system, even if the vendored feature is enabled. + OPENSSL_NO_VENDOR = 1; + # Agave uses deny(warnings) which breaks when nixpkgs updates rustc. + # Cap lints to warnings so the build doesn't fail on new compiler lints. + RUSTFLAGS = "--cap-lints warn"; + # Use the pre-built rocksdb from nixpkgs instead of compiling from source. + # This avoids GCC 13+ compatibility issues with missing includes. + ROCKSDB_LIB_DIR = "${rocksdb}/lib"; + }; + + # Disabling tests because: + # + # ``` + # running 3 tests + # test args::tests::test_max_genesis_archive_unpacked_size_constant ... ok + # test bigtable::tests::test_missing_blocks ... ok + # error: test failed, to rerun pass `-p agave-ledger-tool --bin agave-ledger-tool` + # + # Caused by: + # process didn't exit successfully: `/build/source/target/x86_64-unknown-linux-gnu/release/deps/agave_ledger_tool-b8aca978c218ed51` (signal: 4, SIGILL: illegal instruction) + # ``` + # + # Almost certainly caused by the ledger-tool test calling `Command::cargo_bin` which assumes a good bit about the current environment. + doCheck = false; + + meta = { + description = "Solana Network Validator"; + homepage = "https://github.com/anza-xyz/agave"; + changelog = "https://github.com/anza-xyz/agave/releases/tag/${finalAttrs.version}"; + license = with lib.licenses; [ + asl20 + ]; + maintainers = with lib.maintainers; [ + TomMD + ]; + mainProgram = "agave"; + }; +}) diff --git a/pkgs/by-name/sp/spacevim/init.nix b/pkgs/by-name/sp/spacevim/init.nix deleted file mode 100644 index c99e37d8b39b..000000000000 --- a/pkgs/by-name/sp/spacevim/init.nix +++ /dev/null @@ -1,48 +0,0 @@ -# The Nix expression is a 1:1 mapping of the spacevim toml config which you can find on their website: spacevim.org/quick-start-guide/#configuration - -{ - custom_plugins = [ - { - merged = false; - name = "lilydjwg/colorizer"; - } - ]; - layers = [ - { name = "default"; } - { - enable = true; - name = "colorscheme"; - } - { name = "fzf"; } - { - default_height = 30; - default_position = "top"; - name = "shell"; - } - { name = "edit"; } - { name = "VersionControl"; } - { name = "git"; } - { - auto-completion-return-key-behavior = "complete"; - auto-completion-tab-key-behavior = "cycle"; - autocomplete_method = "coc"; - name = "autocomplete"; - } - { name = "lang#ruby"; } - { name = "lang#nix"; } - { name = "lang#java"; } - { name = "lang#kotlin"; } - { name = "lang#sh"; } - { name = "lang#html"; } - ]; - options = { - buffer_index_type = 4; - colorscheme = "gruvbox"; - colorscheme_bg = "dark"; - enable_guicolors = true; - enable_statusline_mode = true; - enable_tabline_filetype_icon = true; - statusline_separator = "fire"; - timeoutlen = 500; - }; -} diff --git a/pkgs/by-name/sp/spacevim/package.nix b/pkgs/by-name/sp/spacevim/package.nix deleted file mode 100644 index eee05b1cf28e..000000000000 --- a/pkgs/by-name/sp/spacevim/package.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - fetchFromGitHub, - formats, - fzf, - git, - lib, - makeWrapper, - neovim, - nix-update-script, - ripgrep, - runCommand, - stdenv, - vim-full, - spacevim_config ? import ./init.nix, -}: - -let - format = formats.toml { }; - spacevimdir = runCommand "SpaceVim.d" { } '' - mkdir -p $out - cp ${format.generate "init.toml" spacevim_config} $out/init.toml - ''; -in -stdenv.mkDerivation (finalAttrs: { - pname = "spacevim"; - version = "2.4.0"; - src = fetchFromGitHub { - owner = "SpaceVim"; - repo = "SpaceVim"; - rev = "v${finalAttrs.version}"; - hash = "sha256-qiNadhQJjU9RY14X8+pd4Ul+NLoNqbxuh3Kenw1dHDc="; - }; - - nativeBuildInputs = [ makeWrapper ]; - dontBuild = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - - cp -r $(pwd) $out/SpaceVim - - # trailing slash very important for SPACEVIMDIR - makeWrapper "${vim-full}/bin/vim" "$out/bin/spacevim" \ - --add-flags "-u $out/SpaceVim/vimrc" --set SPACEVIMDIR "${spacevimdir}/" \ - --prefix PATH : ${ - lib.makeBinPath [ - fzf - git - ripgrep - ] - } - makeWrapper "${neovim}/bin/nvim" "$out/bin/spacenvim" \ - --add-flags "-u $out/SpaceVim/init.vim" --set SPACEVIMDIR "${spacevimdir}/" \ - --prefix PATH : ${ - lib.makeBinPath [ - fzf - git - ripgrep - ] - } - runHook postInstall - ''; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Modular Vim/Neovim configuration"; - longDescription = '' - SpaceVim is a modular configuration of Vim and Neovim. It's inspired by - spacemacs. It manages collections of plugins in layers, which help to - collect related packages together to provide features. This approach - helps keep the configuration organized and reduces overhead for the user - by keeping them from having to think about what packages to install. - ''; - homepage = "https://spacevim.org/"; - license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.PerchunPak ]; - platforms = lib.platforms.all; - mainProgram = "spacevim"; - }; -}) diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix index b78b02c821b0..5e73829b1769 100644 --- a/pkgs/by-name/sp/spotify-player/package.nix +++ b/pkgs/by-name/sp/spotify-player/package.nix @@ -49,16 +49,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [ rustPlatform.buildRustPackage (finalAttrs: { pname = "spotify-player"; - version = "0.21.3"; + version = "0.22.0"; src = fetchFromGitHub { owner = "aome510"; repo = "spotify-player"; tag = "v${finalAttrs.version}"; - hash = "sha256-0kc7OIno0BQ2Kcvi0keelKr1R7+vlAWYBjsYVD3jTf8="; + hash = "sha256-161kaqfJOMI2hJHM18TD2Kd2Z4RVNS9kE7SqElccw0E="; }; - cargoHash = "sha256-KPo2VY7sdOhBiKKvfQVfbTtah5F0Sc6of4Y2xfJ1frU="; + cargoHash = "sha256-6jNH+1ysJhzqMcqkyAMqgJKD5R1dSK1MYwRBaXi0BUk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/st/steam-art-manager/package.nix b/pkgs/by-name/st/steam-art-manager/package.nix index ef4318bac5fc..24d62fe95ab5 100644 --- a/pkgs/by-name/st/steam-art-manager/package.nix +++ b/pkgs/by-name/st/steam-art-manager/package.nix @@ -24,11 +24,11 @@ appimageTools.wrapType2 { --replace 'Icon=Steam Art Manager' 'Icon=steam-art-manager' ''; - meta = with lib; { + meta = { description = "A tool to manage and change Steam library artwork"; homepage = "https://github.com/Tormak9970/Steam-Art-Manager"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ adam-tj ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ adam-tj ]; platforms = [ "x86_64-linux" ]; mainProgram = "steam-art-manager"; }; diff --git a/pkgs/by-name/st/stylua/package.nix b/pkgs/by-name/st/stylua/package.nix index 33f3265bfd5f..c44e162bbd7d 100644 --- a/pkgs/by-name/st/stylua/package.nix +++ b/pkgs/by-name/st/stylua/package.nix @@ -42,7 +42,10 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/johnnymorganz/stylua"; changelog = "https://github.com/johnnymorganz/stylua/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mpl20; - maintainers = [ lib.maintainers.LunNova ]; + maintainers = with lib.maintainers; [ + LunNova + figsoda + ]; mainProgram = "stylua"; }; }) diff --git a/pkgs/by-name/su/suitesparse-graphblas/package.nix b/pkgs/by-name/su/suitesparse-graphblas/package.nix index bea97b098479..ca38bdbb9a95 100644 --- a/pkgs/by-name/su/suitesparse-graphblas/package.nix +++ b/pkgs/by-name/su/suitesparse-graphblas/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "suitesparse-graphblas"; - version = "10.3.0"; + version = "10.3.1"; outputs = [ "out" @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${finalAttrs.version}"; - hash = "sha256-wsvw/95eHF9KeduAgCfvNunRs86m4tiilxle26d1yJs="; + hash = "sha256-m+sjfRdgIwH/FEaHkEp6fl5+fehNcBDLVc4f5H5Lslw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sv/svtplay-dl/package.nix b/pkgs/by-name/sv/svtplay-dl/package.nix index 13e4697fe2eb..52fcb9facbc4 100644 --- a/pkgs/by-name/sv/svtplay-dl/package.nix +++ b/pkgs/by-name/sv/svtplay-dl/package.nix @@ -22,7 +22,7 @@ let requests-mock ; - version = "4.167"; + version = "4.173"; in @@ -35,7 +35,7 @@ buildPythonApplication { owner = "spaam"; repo = "svtplay-dl"; tag = version; - hash = "sha256-iQMH5IMMv8pYb/iXZvBRLVqhbxkihYFayygnmUJhQJk="; + hash = "sha256-Cjp3FX2jg4QkdRh/chQ7cPIOkuCiYZ6gNtykddmYhvM="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index c4497d619f87..339d811c1738 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "syft"; - version = "1.41.1"; + version = "1.41.2"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; tag = "v${finalAttrs.version}"; - hash = "sha256-2mNGKftkqRGrAstjEmVuzix4Ls75vYsop+E9EyBWwrw="; + hash = "sha256-8sGNBf6Mq3V9lJsJ6Q7xwBK7VKBHbxdGdmxlBuGFsuM="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-fofpT8OidlOUR8Q/xlE1axxCKl+FiRe0huTYhS2IPmQ="; + vendorHash = "sha256-3GQ9Ky7U+/SNpvFH9A1eWuqEX/P55+49yXbnYWfCM9Q="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ta/tail-tray/package.nix b/pkgs/by-name/ta/tail-tray/package.nix index 0a42502be8de..96fdb4fe3a26 100644 --- a/pkgs/by-name/ta/tail-tray/package.nix +++ b/pkgs/by-name/ta/tail-tray/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tail-tray"; - version = "0.2.28"; + version = "0.2.29"; src = fetchFromGitHub { owner = "SneWs"; repo = "tail-tray"; tag = "v${finalAttrs.version}"; - hash = "sha256-UhJyrlY9S3CRK3TgFf7nUGF6drj4Zx/yirZ0z4jpqtE="; + hash = "sha256-X2NYzUUP7zuQ+JIeLviOvfGpGlKqrtj5tOszX6gDYTc="; }; nativeBuildInputs = with kdePackages; [ diff --git a/pkgs/by-name/ta/tailor-gui/package.nix b/pkgs/by-name/ta/tailor-gui/package.nix index 2370a71f85b7..f4cb6a9089d2 100644 --- a/pkgs/by-name/ta/tailor-gui/package.nix +++ b/pkgs/by-name/ta/tailor-gui/package.nix @@ -66,7 +66,6 @@ stdenv.mkDerivation { homepage = "https://github.com/AaronErhardt/tuxedo-rs"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ - mrcjkb xaverdh ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ta/tauno-monitor/package.nix b/pkgs/by-name/ta/tauno-monitor/package.nix index 0f57e9be5d8a..1d4bba5e78ac 100644 --- a/pkgs/by-name/ta/tauno-monitor/package.nix +++ b/pkgs/by-name/ta/tauno-monitor/package.nix @@ -13,14 +13,14 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "tauno-monitor"; - version = "0.2.18"; + version = "0.2.19"; pyproject = false; src = fetchFromGitHub { owner = "taunoe"; repo = "tauno-monitor"; tag = "v${finalAttrs.version}"; - hash = "sha256-UkBEronqxvf3wAqMUvTbvIjYZSe4Y53ZU3JklzK4Na0="; + hash = "sha256-MxP+ramtHjzkbkdICJTGdS2N3HG6uhdclA3su3cEXIE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix index a60756fa8c86..f7b43dc6ef11 100644 --- a/pkgs/by-name/te/teleport_17/package.nix +++ b/pkgs/by-name/te/teleport_17/package.nix @@ -7,11 +7,11 @@ }: buildTeleport { - version = "17.7.14"; - hash = "sha256-k8ZleEYaH1Zh4go8QQPbfoAn1fD/YaHfk6Q671pQlIM="; - vendorHash = "sha256-GTv4nb4wfVfcfjnK0dawJIAP0eSzIWibawqygUSzDxc="; + version = "17.7.16"; + hash = "sha256-xO1L4MRGf9OF+wm/9P5IccltO+zvijM8vP5JQwmqLSQ="; + vendorHash = "sha256-BhQOvjSe8URmKWxKPemn/klgLoBFKfWXCYMp82QzaOE="; cargoHash = "sha256-EnIdf/3idwoQGJd6edQtWaXzVC1Gkwf8X2w2Zq80KGA="; - pnpmHash = "sha256-bublGuaTIOh0YdYIgSFfnE3E16sn4ktNCGPXoRIxxHY="; + pnpmHash = "sha256-0BOnrrzX33UncHPM6vc8UWP5GoU7xCDV9FGqBLVYTtM="; wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; inherit buildGoModule withRdpClient extPatches; diff --git a/pkgs/by-name/te/teleport_18/package.nix b/pkgs/by-name/te/teleport_18/package.nix index bd243ebb758d..96209f24b2f3 100644 --- a/pkgs/by-name/te/teleport_18/package.nix +++ b/pkgs/by-name/te/teleport_18/package.nix @@ -7,10 +7,10 @@ }: buildTeleport { - version = "18.6.5"; - hash = "sha256-xNdNyWpH1NpF8O9BLsiov3mmnrXXr/kbi2zbEaGDGNg="; + version = "18.6.6"; + hash = "sha256-I5tnWOnQrcOwhK2SCtkhvR/PkTWxfk0R0yDGJwyxh9E="; vendorHash = "sha256-sXBCfzVjffSyPDIxmAWFp1WINmMPV1HRx9O6JkOgqLM="; - pnpmHash = "sha256-aHiBD/GYK5zal2NeBzaDEftzruPwoSwARz/2uuqyKlY="; + pnpmHash = "sha256-/MJL/VPQxijOyvboUl4+sctAP+5YA4R0luOqmMe8f94="; cargoHash = "sha256-tp+xxa+sYQpvgD2Yv/W0hegRpUubBeFpdngRyByNxJc="; wasm-bindgen-cli = wasm-bindgen-cli_0_2_99; diff --git a/pkgs/by-name/te/tev/package.nix b/pkgs/by-name/te/tev/package.nix index 6601e23ac94f..8f0d5942ab8a 100644 --- a/pkgs/by-name/te/tev/package.nix +++ b/pkgs/by-name/te/tev/package.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { pname = "tev"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "Tom94"; repo = "tev"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-LD6mwa2UKeddAnOp2fGxfgvrpH15an9jmUDRosB8Prc="; + hash = "sha256-ODLtCCCIoHMDxyCRTA0bWK0c5RPOZ3aWIKpYpfZUbGE="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux ( diff --git a/pkgs/by-name/ti/tiledb/package.nix b/pkgs/by-name/ti/tiledb/package.nix index 6e87c2be9991..2991a313f582 100644 --- a/pkgs/by-name/ti/tiledb/package.nix +++ b/pkgs/by-name/ti/tiledb/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, zlib, lz4, @@ -24,7 +23,10 @@ runCommand, curl, capnproto, + nlohmann_json, + c-blosc2, useAVX2 ? stdenv.hostPlatform.avx2Support, + libpqxx, }: let @@ -33,45 +35,23 @@ let chmod -R +w $out cp -r ${rapidcheck.dev}/* $out ''; - catch2 = catch2_3; in stdenv.mkDerivation (finalAttrs: { pname = "tiledb"; - version = "2.28.1"; + version = "2.30.0"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; tag = finalAttrs.version; - hash = "sha256-Cs3Lr8I/Mu02x78d7IySG0XX4u/VAjBs4p4b00XDT5k="; + hash = "sha256-wzeWLwwsZXtrKsmlglZG7YvIki/ba7IwsDBq+40ltcg="; }; - patches = [ - # capnproto was updated to 1.2 in Nixpkgs, bring TileDB codebase up to speed - # patch only affects serialization related code, extracted from https://github.com/TileDB-Inc/TileDB/pull/5616 - (fetchpatch { - url = "https://github.com/TileDB-Inc/TileDB/pull/5616.patch"; - relative = "tiledb/sm/serialization"; - extraPrefix = "tiledb/sm/serialization/"; - hash = "sha256-5z/eJEHl+cnWRf1sMULodJyhmNh5KinDLlL1paMNiy4="; - }) + patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./generate_embedded_data_header.patch ]; - # Fix build with gcc15 - # https://github.com/TileDB-Inc/TileDB/pull/5612 - (fetchpatch { - name = "tiledb-set-c-version-to-c99.patch"; - url = "https://github.com/TileDB-Inc/TileDB/commit/4f946ad57fe823c3f53c06bf29dc18799ec6395a.patch"; - hash = "sha256-chdaa6Ysqeb3p+FcWp7GTnAzgShoPGSCErmIGn+Q4tA="; - }) - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./generate_embedded_data_header.patch ]; - - # libcxx (as of llvm-19) does not yet support `stop_token` and `jthread` - # without the -fexperimental-library flag. Tiledb adds its own - # implementations in the std namespace which conflict with libcxx. This - # test can be re-enabled once libcxx supports stop_token and jthread. - postPatch = lib.optionalString (stdenv.cc.libcxx != null) '' - truncate -s0 tiledb/stdx/test/CMakeLists.txt + postPatch = '' + substituteInPlace tiledb/sm/misc/test/unit_parse_argument.cc \ + --replace-fail '"catch.hpp"' '' ''; env.TILEDB_DISABLE_AUTO_VCPKG = "1"; @@ -89,37 +69,39 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (!useAVX2) "-DCOMPILER_SUPPORTS_AVX2=FALSE"; nativeBuildInputs = [ - catch2 clang-tools cmake python3 doxygen - # Required for serialization - curl - capnproto ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ - zlib - lz4 + boost bzip2 - zstd - spdlog + c-blosc2 + capnproto + catch2_3 + curl + file + libpng + libpqxx + lz4 + nlohmann_json onetbb openssl - boost - libpng - file rapidcheck' - catch2 + spdlog + zlib + zstd ]; nativeCheckInputs = [ gtest - catch2 ]; + strictDeps = true; + # test commands taken from # https://github.com/TileDB-Inc/TileDB/blob/dev/.github/workflows/unit-test-runs.yml checkPhase = '' diff --git a/pkgs/by-name/to/toml2json/package.nix b/pkgs/by-name/to/toml2json/package.nix index 94aebce35b5b..4ad4615abd68 100644 --- a/pkgs/by-name/to/toml2json/package.nix +++ b/pkgs/by-name/to/toml2json/package.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage rec { pname = "toml2json"; - version = "1.3.2"; + version = "1.4.0"; src = fetchCrate { inherit pname version; - hash = "sha256-KzMDJ3WBjr8PNP8+6X8c6/g99375B+MARYIKooqA5jY="; + hash = "sha256-ZqHXtk6bPYm/20DjFhVmrc9+wYAmSEBLxqNgyzPGO2c="; }; - cargoHash = "sha256-6HMaKak3YI8kH9Wp1/e4dt276B4QyfyZMve1wl5mucQ="; + cargoHash = "sha256-qdALBNQ2re3JQ6SWYsF/lHDxuCf2yyeXgdT1YQY0z6A="; meta = { description = "Very small CLI for converting TOML to JSON"; diff --git a/pkgs/by-name/ts/tsgolint/package.nix b/pkgs/by-name/ts/tsgolint/package.nix index d9daa29e6f1a..1bb07ffc62fb 100644 --- a/pkgs/by-name/ts/tsgolint/package.nix +++ b/pkgs/by-name/ts/tsgolint/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "tsgolint"; - version = "0.11.4"; + version = "0.11.5"; src = fetchFromGitHub { owner = "oxc-project"; repo = "tsgolint"; tag = "v${finalAttrs.version}"; - hash = "sha256-/1od2yijBSTi5PFhEQ95KTjQJYYgXRX4v6M/lIfQXtM="; + hash = "sha256-XPx8yU3K2v5+FTANwXX9xs+d/WEz6L19suf1QED/Mbs="; fetchSubmodules = true; }; @@ -49,7 +49,7 @@ buildGoModule (finalAttrs: { ''; proxyVendor = true; - vendorHash = "sha256-pCmPL0OVwclCV5riL8wozCiQA2zRDafBKTxdkt/q3ns="; + vendorHash = "sha256-5NX+rjdPz/ZSVmykOc5ffFg1rplF1pznIWKiydl6kKY="; subPackages = [ "cmd/tsgolint" ]; diff --git a/pkgs/by-name/tu/turntable/package.nix b/pkgs/by-name/tu/turntable/package.nix index 28b2a8689820..60c40022a028 100644 --- a/pkgs/by-name/tu/turntable/package.nix +++ b/pkgs/by-name/tu/turntable/package.nix @@ -14,8 +14,11 @@ libsecret, libglycin, libglycin-gtk4, + libportal, + libportal-gtk4, glib-networking, glycin-loaders, + nix-update-script, # Per the upstream request. Key owned by Aleksana lastfmKey ? "b5027c5178ca2abfcc31bd04397c3c0e", @@ -24,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "turntable"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromCodeberg { owner = "GeopJr"; repo = "Turntable"; tag = "v${finalAttrs.version}"; - hash = "sha256-Rvkzh2Cila6ZhQZyX5zzUrWane6nLAjrwnKk0LPWKuE="; + hash = "sha256-OXZjCkVf1XOh1joDE5SBKaQmblfu+zNr+EXaqWP7HhM="; }; nativeBuildInputs = [ @@ -51,6 +54,8 @@ stdenv.mkDerivation (finalAttrs: { libglycin-gtk4 glycin-loaders glib-networking + libportal + libportal-gtk4 ]; mesonFlags = [ @@ -60,6 +65,8 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "Scrobbles your music to multiple services with playback controls for MPRIS players"; longDescription = '' diff --git a/pkgs/by-name/tu/tuxedo-rs/package.nix b/pkgs/by-name/tu/tuxedo-rs/package.nix index d498219fcc7c..ab63ec33baae 100644 --- a/pkgs/by-name/tu/tuxedo-rs/package.nix +++ b/pkgs/by-name/tu/tuxedo-rs/package.nix @@ -43,7 +43,6 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/AaronErhardt/tuxedo-rs"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ - mrcjkb xaverdh ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index d1ed2f87ea46..cbe56ace9388 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.15"; + version = "0.0.16"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-qaDKr4v8607rFuAbW6ixgvr3qW2xnTF9TKnwMREBh6A="; + hash = "sha256-V2Xyye335nbI0dTaLeIik5WOHFu9mkrhU0gJn+S9Sic="; }; # For Darwin platforms, remove the integration test for file notifications, @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=ty" ]; - cargoHash = "sha256-pvS26gP9Ck1svV7o09xexmgysgopwwI6b2/YC7U1ulQ="; + cargoHash = "sha256-AJ08RQHBFC7sVIG+fHZYLojPGhPxUNPnmdAKC/0z4hg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ua/uasm/package.nix b/pkgs/by-name/ua/uasm/package.nix index 0cf93bfc5dd1..a4e3051775fc 100644 --- a/pkgs/by-name/ua/uasm/package.nix +++ b/pkgs/by-name/ua/uasm/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { description = "Free MASM-compatible assembler based on JWasm"; mainProgram = "uasm"; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ thiagokokada ]; + maintainers = [ ]; license = lib.licenses.watcom; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/un/unicode-emoji/package.nix b/pkgs/by-name/un/unicode-emoji/package.nix index 3ae7f80208f0..f78b6b088c1e 100644 --- a/pkgs/by-name/un/unicode-emoji/package.nix +++ b/pkgs/by-name/un/unicode-emoji/package.nix @@ -49,7 +49,8 @@ let in symlinkJoin { - name = "unicode-emoji-${version}"; + inherit version; + pname = "unicode-emoji"; paths = lib.attrValues srcs; diff --git a/pkgs/by-name/un/unifi/package.nix b/pkgs/by-name/un/unifi/package.nix index d63b917a936e..7d4a314bb6ed 100644 --- a/pkgs/by-name/un/unifi/package.nix +++ b/pkgs/by-name/un/unifi/package.nix @@ -10,12 +10,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "unifi-controller"; - version = "10.0.162"; + version = "10.1.84"; # see https://community.ui.com/releases / https://www.ui.com/download/unifi src = fetchurl { url = "https://dl.ui.com/unifi/${finalAttrs.version}/unifi_sysvinit_all.deb"; - hash = "sha256-1wuI6Dg/cKBEhtcoLipXa1q4UiKtqOpRAc8FF0dY5T4="; + hash = "sha256-GHsaEbHh+t8AYOtc1LAMryWDNdz01EASQdfiiPp2T3E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vd/vdrift/package.nix b/pkgs/by-name/vd/vdrift/package.nix index fd067b02cf67..bb6c52ed3dca 100644 --- a/pkgs/by-name/vd/vdrift/package.nix +++ b/pkgs/by-name/vd/vdrift/package.nix @@ -86,6 +86,7 @@ in exec ${bin}/bin/vdrift "$@" '').overrideAttrs (_: { + inherit (bin) pname version; name = wrappedName; meta = bin.meta // { hydraPlatforms = [ ]; diff --git a/pkgs/by-name/vi/victorialogs/package.nix b/pkgs/by-name/vi/victorialogs/package.nix index 8c158f4bc105..dfe06c09c44b 100644 --- a/pkgs/by-name/vi/victorialogs/package.nix +++ b/pkgs/by-name/vi/victorialogs/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaLogs"; - version = "1.44.0"; + version = "1.45.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaLogs"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ud5jGiQd75RIM+xTpWXULRe34ThssxcazKQ0HKsbgYM="; + hash = "sha256-pfNG9BuKqfoQGJTN8sVEB2UpUh38jot0kBJ8KnxHHMs="; }; vendorHash = null; diff --git a/pkgs/by-name/vi/vivaldi-ffmpeg-codecs/package.nix b/pkgs/by-name/vi/vivaldi-ffmpeg-codecs/package.nix index a23079b6c140..f0bf0210332e 100644 --- a/pkgs/by-name/vi/vivaldi-ffmpeg-codecs/package.nix +++ b/pkgs/by-name/vi/vivaldi-ffmpeg-codecs/package.nix @@ -11,12 +11,12 @@ let sources = { x86_64-linux = fetchurl { - url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_85.snap"; - hash = "sha256-77lcQFFP0eXuaxN2UdsEjFXJt22L6Mp6Fe3ZYPpKVwM="; + url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_82.snap"; + hash = "sha256-G9RcOuFjkLDJUNlw2G8GiONpWHYvyTnv3Nr0JSdW0As="; }; aarch64-linux = fetchurl { - url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_85.snap"; - hash = "sha256-77lcQFFP0eXuaxN2UdsEjFXJt22L6Mp6Fe3ZYPpKVwM="; + url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_83.snap"; + hash = "sha256-6XMdH4dnvYB1FaJLMi/MFnTzkelmOHMedVcIg/Fh7h4="; }; }; in diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix index 595062e3cb95..77fa2e334641 100644 --- a/pkgs/by-name/vl/vlc/package.nix +++ b/pkgs/by-name/vl/vlc/package.nix @@ -315,7 +315,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Cross-platform media player and streaming server"; homepage = "https://www.videolan.org/vlc/"; license = lib.licenses.lgpl21Plus; - maintainers = with lib.maintainers; [ alois31 ]; + maintainers = [ ]; platforms = lib.platforms.linux; mainProgram = "vlc"; }; diff --git a/pkgs/by-name/vr/vrcx/package.nix b/pkgs/by-name/vr/vrcx/package.nix index f33e1fb9ac2e..06d65b96c5d0 100644 --- a/pkgs/by-name/vr/vrcx/package.nix +++ b/pkgs/by-name/vr/vrcx/package.nix @@ -1,33 +1,36 @@ { lib, - fetchFromGitHub, - buildDotnetModule, - dotnetCorePackages, - buildNpmPackage, + stdenv, + nodejs_22, electron_39, makeWrapper, - copyDesktopItems, + fetchFromGitHub, + buildNpmPackage, makeDesktopItem, - stdenv, + copyDesktopItems, + buildDotnetModule, + dotnetCorePackages, }: let + node = nodejs_22; electron = electron_39; dotnet = dotnetCorePackages.dotnet_9; in buildNpmPackage (finalAttrs: { pname = "vrcx"; - version = "2026.01.04"; + version = "2026.01.28"; src = fetchFromGitHub { repo = "VRCX"; owner = "vrcx-team"; tag = "v${finalAttrs.version}"; - hash = "sha256-ibsmlNfW64mzJOhIkJydpJ9ys2PbPfyj2XBGwY5xuww="; + hash = "sha256-D6KYKKDaWk7OMKVNOsA8K2j+kilAtLcRmMz4Xmt5pms="; }; + nodejs = node; makeCacheWritable = true; npmFlags = [ "--ignore-scripts" ]; - npmDepsHash = "sha256-TUdzrEa2dW4rKA/9HGgF6c9JTMiBmNWvc/9R0kIKSls="; + npmDepsHash = "sha256-qa9056EljXLxcrArECf41vygueAAwrbeuA20yoMcYPA="; nativeBuildInputs = [ makeWrapper @@ -75,11 +78,11 @@ buildNpmPackage (finalAttrs: { desktopItems = [ (makeDesktopItem { name = "vrcx"; - desktopName = "VRCX"; - comment = "Friendship management tool for VRChat"; icon = "vrcx"; exec = "vrcx"; terminal = false; + desktopName = "VRCX"; + comment = "Friendship management tool for VRChat"; categories = [ "Utility" "Application" @@ -90,8 +93,8 @@ buildNpmPackage (finalAttrs: { passthru = { backend = buildDotnetModule { - pname = "${finalAttrs.pname}-backend"; inherit (finalAttrs) version src; + pname = "${finalAttrs.pname}-backend"; dotnet-sdk = dotnet.sdk; dotnet-runtime = dotnet.runtime; diff --git a/pkgs/by-name/wa/wayvr/package.nix b/pkgs/by-name/wa/wayvr/package.nix index f63f9cfafde3..c5a673676482 100644 --- a/pkgs/by-name/wa/wayvr/package.nix +++ b/pkgs/by-name/wa/wayvr/package.nix @@ -25,16 +25,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "wayvr"; - version = "26.1.2"; + version = "26.2.0"; src = fetchFromGitHub { owner = "wlx-team"; repo = "wayvr"; tag = "v${finalAttrs.version}"; - hash = "sha256-UZ5zcalez6B+212OqCaEXSoRfhaExuy0W8HX8b4flSU="; + hash = "sha256-RjZ9CmTHacw50TVxl53z4E2Yp/XW/sgf4WjYL6pd1s8="; }; - cargoHash = "sha256-zqB2ybdpQEGdlkNin6mlUfaVRkpOtFl2CVCLAdKDMoQ="; + cargoHash = "sha256-xv6l+zCp3tkJs0c10f+omcwY8/wd2HWlZeFHDiUfkso="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/wh/whisper-ctranslate2/package.nix b/pkgs/by-name/wh/whisper-ctranslate2/package.nix index 100c6839c8a7..08bd23873124 100644 --- a/pkgs/by-name/wh/whisper-ctranslate2/package.nix +++ b/pkgs/by-name/wh/whisper-ctranslate2/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "whisper-ctranslate2"; - version = "0.5.6"; + version = "0.5.7"; pyproject = true; src = fetchFromGitHub { owner = "Softcatala"; repo = "whisper-ctranslate2"; tag = finalAttrs.version; - hash = "sha256-IgHTSOlF6fBX0oLWejKO5510e9M7ZTQf4CiIlb2xalM="; + hash = "sha256-fbdvbmrZWQoqri6iZMDbElXX/sfv6gu0NDjglviLxO4="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/wh/whistle/package.nix b/pkgs/by-name/wh/whistle/package.nix index 5cd3e09b78a3..6db44914276e 100644 --- a/pkgs/by-name/wh/whistle/package.nix +++ b/pkgs/by-name/wh/whistle/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "whistle"; - version = "2.9.109"; + version = "2.10.0"; src = fetchFromGitHub { owner = "avwo"; repo = "whistle"; rev = "v${version}"; - hash = "sha256-JmpEwtHOFS0HwVxFLi2V9TbA9F7f0ZpXnJaNP9DMHjQ="; + hash = "sha256-hx6TGi8ZQ16FczqMWLa6qXbwsdJf8sVgJR8scmfgucQ="; }; - npmDepsHash = "sha256-eFPL+0B8r1mKVqcOmgEBVpHdlVp5ZEpvpDRc+6Rvrqc="; + npmDepsHash = "sha256-+v60LaJqwbN0g9oBTCcI0ZuhKiS700QRHfgKf6Fuo8Y="; dontNpmBuild = true; diff --git a/pkgs/by-name/wi/winbox4/build-from-zip.nix b/pkgs/by-name/wi/winbox4/build-from-zip.nix index 9e2773396c7e..a4986035dbe2 100644 --- a/pkgs/by-name/wi/winbox4/build-from-zip.nix +++ b/pkgs/by-name/wi/winbox4/build-from-zip.nix @@ -21,6 +21,7 @@ libxcb-image, libxcb, zlib, + dbus, metaCommon ? { }, }: @@ -54,6 +55,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { libxcb-render-util libxcb-wm zlib + dbus ]; installPhase = '' diff --git a/pkgs/by-name/wi/winbox4/package.nix b/pkgs/by-name/wi/winbox4/package.nix index bc787fd3cd2e..c9ff3ab8142e 100644 --- a/pkgs/by-name/wi/winbox4/package.nix +++ b/pkgs/by-name/wi/winbox4/package.nix @@ -5,7 +5,7 @@ }: let pname = "winbox"; - version = "4.0beta44"; + version = "4.0rc3"; metaCommon = { description = "Graphical configuration utility for RouterOS-based devices"; @@ -23,13 +23,13 @@ let x86_64-zip = callPackage ./build-from-zip.nix { inherit pname version metaCommon; - hash = "sha256-LPq7KPOj59NUhoQCxpAVW8qbjXJGxRw8fRJT7/qDtZM="; + hash = "sha256-BbdKrGMfHhm9DHCmQwfZhsjpJXamNYJ4Mh4z/fwDFlM="; }; x86_64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - hash = "sha256-96lb8a70dmqieKn5Nr61sZg/aVDLz0sY64sfN83rU+0="; + hash = "sha256-KBKl4KAOeXlZIW5NtFV2k/yf6Evbwf02viX4Z73Jub8="; }; in (if stdenvNoCC.hostPlatform.isDarwin then x86_64-dmg else x86_64-zip).overrideAttrs (oldAttrs: { diff --git a/pkgs/by-name/wl/wl-clipboard-rs/package.nix b/pkgs/by-name/wl/wl-clipboard-rs/package.nix index 9ec4f6b47f29..7c602a17fec0 100644 --- a/pkgs/by-name/wl/wl-clipboard-rs/package.nix +++ b/pkgs/by-name/wl/wl-clipboard-rs/package.nix @@ -82,7 +82,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; mainProgram = "wl-clip"; maintainers = with lib.maintainers; [ - thiagokokada donovanglover ]; }; diff --git a/pkgs/by-name/wo/wolfebin/package.nix b/pkgs/by-name/wo/wolfebin/package.nix index 60f5f8314563..baaab4817215 100644 --- a/pkgs/by-name/wo/wolfebin/package.nix +++ b/pkgs/by-name/wo/wolfebin/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/thejoshwolfe/wolfebin"; description = "Quick and easy file sharing"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ andrewrk ]; + maintainers = [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/wp/wpprobe/package.nix b/pkgs/by-name/wp/wpprobe/package.nix index defc1635c6d4..de38d1b499f4 100644 --- a/pkgs/by-name/wp/wpprobe/package.nix +++ b/pkgs/by-name/wp/wpprobe/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "wpprobe"; - version = "0.10.12"; + version = "0.10.14"; src = fetchFromGitHub { owner = "Chocapikk"; repo = "wpprobe"; tag = "v${finalAttrs.version}"; - hash = "sha256-fIPgWHPAjMQcKvH8fJhQUx08JfUfhOZAHSQCZ4YKK3k="; + hash = "sha256-+Q/TMlZ3VNsuiVDCJ1UbF+pJS3RA8cJOX/3vcQ5jNPk="; }; vendorHash = "sha256-pAKFrdja+rH0kiJH6hToZwLjE8lLBHFAUCjnCLbgxVo="; diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix index 7249c1b43c9e..0b4e02b97069 100644 --- a/pkgs/by-name/xl/xlights/package.nix +++ b/pkgs/by-name/xl/xlights/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "xlights"; - version = "2026.01"; + version = "2026.02"; src = fetchurl { url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage"; - hash = "sha256-injxqVC4NhlbnY2JHdNczlOZzKfFiwqAdUAdbPG5bKw="; + hash = "sha256-Xj845VEWXcrcH7Onx6Cr/vKXwv1DdC270nKJW+RMo+I="; }; meta = { diff --git a/pkgs/by-name/za/zabbix-cli/package.nix b/pkgs/by-name/za/zabbix-cli/package.nix index 60eb5bf7bf02..325024f10479 100644 --- a/pkgs/by-name/za/zabbix-cli/package.nix +++ b/pkgs/by-name/za/zabbix-cli/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, python3Packages, testers, zabbix-cli, @@ -19,6 +20,15 @@ python3Packages.buildPythonApplication (finalAttrs: { hash = "sha256-Y4IR/le+7X3MYmrVnZMr+Gu59LkCB5UfMJ2s9ovSjLM="; }; + patches = [ + # Fix MarkupMode import with Typer >= 0.20.1 + # https://github.com/unioslo/zabbix-cli/pull/333 + (fetchpatch { + url = "https://github.com/unioslo/zabbix-cli/commit/b68f672f557ccb06fef3fd5a2d724633f1eb3c68.patch"; + hash = "sha256-wc59c28aT8IsI4nvEH+CxfdvPAsN2R1uoLgN8tx+mBE="; + }) + ]; + build-system = with python3Packages; [ hatchling ]; diff --git a/pkgs/by-name/ze/zeno/package.nix b/pkgs/by-name/ze/zeno/package.nix index 13d796348221..3bfb4abca608 100644 --- a/pkgs/by-name/ze/zeno/package.nix +++ b/pkgs/by-name/ze/zeno/package.nix @@ -5,16 +5,16 @@ }: buildGoModule (finalAttrs: { pname = "zeno"; - version = "2.0.19"; + version = "2.0.20"; src = fetchFromGitHub { owner = "internetarchive"; repo = "Zeno"; tag = "v${finalAttrs.version}"; - hash = "sha256-6Or+DREyqljXTUJn5+NrFH2YktOUafHMx5jAL02Tm+4="; + hash = "sha256-yW9UwEvJxc6k0ggZwibfWXMoJEE9EfmU8VdP5gwH97U="; }; - vendorHash = "sha256-J9ufthZuIULHXkgHj80fDa68fiFJkGSXkhyiPpDYPJU="; + vendorHash = "sha256-vColnYyyYtDtRoAyn4Bc713U8+UoI+HY8LzmJrHUZoE="; env.CGO_ENABLED = true; ldFlags = [ diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix index 3a64173a8521..69ecd4b21a6f 100644 --- a/pkgs/development/compilers/zig/generic.nix +++ b/pkgs/development/compilers/zig/generic.nix @@ -175,7 +175,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://ziglang.org/"; changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ andrewrk ]; + maintainers = [ ]; teams = [ lib.teams.zig ]; mainProgram = "zig"; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index f27ae2919f7a..fc9122f5cd72 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "qtstyleplugin-kvantum${lib.optionalString isQt5 "5"}"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${finalAttrs.version}"; - hash = "sha256-G1yqToqYVnV/ag//b4C3jUvh2ayIhV3bEavfhpiF0p0="; + hash = "sha256-5V8r8OylZb1hZI/8Yx7+KEUcyOpKxsL+r1loDj1Kdr0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/multipart_form/default.nix b/pkgs/development/ocaml-modules/multipart_form/default.nix index 98166d7d1577..b4049bdfe851 100644 --- a/pkgs/development/ocaml-modules/multipart_form/default.nix +++ b/pkgs/development/ocaml-modules/multipart_form/default.nix @@ -14,13 +14,13 @@ uutf, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "multipart_form"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { - url = "https://github.com/dinosaure/multipart_form/releases/download/v${version}/multipart_form-${version}.tbz"; - hash = "sha256-IqGGnDJtE0OKrtt+ah1Cy9zx4wavEl9eXXjZSh/M2JE="; + url = "https://github.com/dinosaure/multipart_form/releases/download/v${finalAttrs.version}/multipart_form-${finalAttrs.version}.tbz"; + hash = "sha256-lQdAZ5vmBOhkH1V3MuqYi+UGpyJPsSkoU6kEGYvchWA="; }; propagatedBuildInputs = [ @@ -42,4 +42,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) diff --git a/pkgs/development/perl-modules/ImageExifTool/default.nix b/pkgs/development/perl-modules/ImageExifTool/default.nix index f9f7adbfff81..b2c9435cf7d2 100644 --- a/pkgs/development/perl-modules/ImageExifTool/default.nix +++ b/pkgs/development/perl-modules/ImageExifTool/default.nix @@ -60,7 +60,6 @@ buildPerlPackage rec { artistic2 ]; maintainers = with lib.maintainers; [ - kiloreux anthonyroussel ]; mainProgram = "exiftool"; diff --git a/pkgs/development/python-modules/acunetix/default.nix b/pkgs/development/python-modules/acunetix/default.nix index 9d72f39efe37..855d5c906feb 100644 --- a/pkgs/development/python-modules/acunetix/default.nix +++ b/pkgs/development/python-modules/acunetix/default.nix @@ -4,12 +4,13 @@ buildPythonPackage, fetchFromGitHub, requests, + setuptools, }: -buildPythonPackage { +buildPythonPackage (finalAttrs: { pname = "acunetix"; version = "0.0.7"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "hikariatama"; @@ -19,7 +20,9 @@ buildPythonPackage { hash = "sha256-ycdCz8CNSP0USxv657jf6Vz4iF//reCeO2tG+und86A="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiofiles requests ]; @@ -35,4 +38,4 @@ buildPythonPackage { license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/basedmypy/default.nix b/pkgs/development/python-modules/basedmypy/default.nix deleted file mode 100644 index 6946de3a51c2..000000000000 --- a/pkgs/development/python-modules/basedmypy/default.nix +++ /dev/null @@ -1,143 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - nix-update-script, - pythonAtLeast, - pythonOlder, - stdenv, - - # build-system - setuptools, - types-psutil, - types-setuptools, - - # propagates - basedtyping, - mypy-extensions, - tomli, - typing-extensions, - - # optionals - lxml, - psutil, - - # tests - attrs, - filelock, - pytest-xdist, - pytestCheckHook, -}: - -buildPythonPackage (finalAttrs: { - pname = "basedmypy"; - version = "2.10.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "KotlinIsland"; - repo = "basedmypy"; - tag = "v${finalAttrs.version}"; - hash = "sha256-IzRKOReSgio5S5PG8iD9VQF9R1GEqBAIDeeCtq+ZVXg="; - }; - - postPatch = '' - substituteInPlace \ - pyproject.toml \ - --replace-warn 'types-setuptools==' 'types-setuptools>=' - '' - # __closed__ returns None at runtime (not a bool) - + '' - substituteInPlace test-data/unit/lib-stub/typing_extensions.pyi \ - --replace-fail "__closed__: bool" "__closed__: None" - ''; - - build-system = [ - basedtyping - mypy-extensions - types-psutil - types-setuptools - typing-extensions - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - - dependencies = [ - basedtyping - mypy-extensions - typing-extensions - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - - optional-dependencies = { - dmypy = [ psutil ]; - reports = [ lxml ]; - }; - - # Compile mypy with mypyc, which makes mypy about 4 times faster. The compiled - # version is also the default in the wheels on Pypi that include binaries. - # is64bit: unfortunately the build would exhaust all possible memory on i686-linux. - env.MYPY_USE_MYPYC = stdenv.buildPlatform.is64bit; - - # when testing reduce optimisation level to reduce build time by 20% - env.MYPYC_OPT_LEVEL = 1; - - pythonImportsCheck = [ - "mypy" - "mypy.api" - "mypy.fastparse" - "mypy.types" - "mypyc" - "mypyc.analysis" - ] - ++ lib.optionals (!stdenv.hostPlatform.isi686) [ - # ImportError: cannot import name 'map_instance_to_supertype' from partially initialized module 'mypy.maptype' (most likely due to a circular import) - "mypy.report" - ]; - - nativeCheckInputs = [ - attrs - filelock - pytest-xdist - pytestCheckHook - setuptools - tomli - ] - ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; - - disabledTests = lib.optionals (pythonAtLeast "3.12") [ - # cannot find distutils, and distutils cannot find types - # https://github.com/NixOS/nixpkgs/pull/364818#discussion_r1895715378 - "test_c_unit_test" - ]; - - disabledTestPaths = [ - # fails to find typing_extensions - "mypy/test/testcmdline.py" - "mypy/test/testdaemon.py" - # fails to find setuptools - "mypyc/test/test_commandline.py" - # fails to find hatchling - "mypy/test/testpep561.py" - ] - ++ lib.optionals stdenv.hostPlatform.isi686 [ - # https://github.com/python/mypy/issues/15221 - "mypyc/test/test_run.py" - ] - ++ - lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64 && pythonOlder "3.13") - [ - # mypy/test/testsolve.py::SolveSuite::test_simple_constraints_with_dynamic_type: [Any | A] != [Any] - "mypy/test/testsolve.py" - ]; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Based Python static type checker with baseline, sane default settings and based typing features"; - homepage = "https://kotlinisland.github.io/basedmypy/"; - changelog = "https://github.com/KotlinIsland/basedmypy/blob/${finalAttrs.src.tag}/CHANGELOG.md"; - license = lib.licenses.mit; - mainProgram = "mypy"; - maintainers = with lib.maintainers; [ PerchunPak ]; - }; -}) diff --git a/pkgs/development/python-modules/basedtyping/default.nix b/pkgs/development/python-modules/basedtyping/default.nix deleted file mode 100644 index cec4ffae28e0..000000000000 --- a/pkgs/development/python-modules/basedtyping/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - nix-update-script, - - # build-system - poetry-core, - - # propagates - typing-extensions, - - # tests - pytestCheckHook, -}: - -buildPythonPackage (finalAttrs: { - pname = "basedtyping"; - version = "0.1.10"; - pyproject = true; - - src = fetchFromGitHub { - owner = "KotlinIsland"; - repo = "basedtyping"; - tag = "v${finalAttrs.version}"; - hash = "sha256-IpIMO75jqJDzDgRPVEi6g7AprGeBeKbVH99XPDYUzTM="; - }; - - build-system = [ - poetry-core - ]; - - dependencies = [ - typing-extensions - ]; - - pythonImportsCheck = [ - "basedtyping" - "basedtyping.runtime_only" - "basedtyping.transformer" - ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Utilities for basedmypy"; - homepage = "https://github.com/KotlinIsland/basedtyping"; - changelog = "https://github.com/KotlinIsland/basedtyping/releases/tag/${finalAttrs.src.tag}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ PerchunPak ]; - }; -}) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index a252219192fd..4de282bb36e9 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -358,13 +358,13 @@ buildPythonPackage (finalAttrs: { pname = "boto3-stubs"; - version = "1.42.44"; + version = "1.42.45"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit (finalAttrs) version; - hash = "sha256-4eWmFFgtmgTeR1OTVv5h4t/1OicWKNblnUVaRrolv0g="; + hash = "sha256-UWHrEHrDnfWI0kTZBfU35C+V7Q3eLTuVc1NAZmCq1gs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/claude-agent-sdk/default.nix b/pkgs/development/python-modules/claude-agent-sdk/default.nix index d70b69b30b7b..67b851c70beb 100644 --- a/pkgs/development/python-modules/claude-agent-sdk/default.nix +++ b/pkgs/development/python-modules/claude-agent-sdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "claude-agent-sdk"; - version = "0.1.27"; + version = "0.1.33"; pyproject = true; src = fetchFromGitHub { owner = "anthropics"; repo = "claude-agent-sdk-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-ydzgpdHa6mHwKUrgL7Odh4V7b3H2zUmHF+Og4LTxI2I="; + hash = "sha256-AnwkyP5qTL+pYfrFvjCNPsy15whfj8dJjZC9Qma03+c="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index a4ab5b29051e..eaac95161e88 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "cli-helpers"; - version = "2.9.0"; + version = "2.10.0"; format = "setuptools"; src = fetchPypi { pname = "cli_helpers"; inherit version; - hash = "sha256-qYh0XsQx3a5wf3ON0NE4kLdKAKKqBCjqzX/B4Dsgahc="; + hash = "sha256-Dgk2F5t4bADGtzhjtbklKIn3pUUl8UAU7HJ+Qf8iryg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cron-descriptor/default.nix b/pkgs/development/python-modules/cron-descriptor/default.nix index 5665f0e226b3..5e230ca87932 100644 --- a/pkgs/development/python-modules/cron-descriptor/default.nix +++ b/pkgs/development/python-modules/cron-descriptor/default.nix @@ -21,10 +21,9 @@ buildPythonPackage rec { build-system = [ setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - typing-extensions - ]; + dependencies = [ typing-extensions ]; + + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "cron_descriptor" ]; diff --git a/pkgs/development/python-modules/datasketch/default.nix b/pkgs/development/python-modules/datasketch/default.nix new file mode 100644 index 000000000000..8d2ff1f78571 --- /dev/null +++ b/pkgs/development/python-modules/datasketch/default.nix @@ -0,0 +1,88 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + # build + hatchling, + # runtime + cassandra-driver, + motor, + numpy, + pybloomfilter3, + redis, + scipy, + # check + pytestCheckHook, + aiounittest, + mock, + pymongo, + pytest-asyncio, + pytest-rerunfailures, + +}: + +buildPythonPackage (finalAttrs: { + pname = "datasketch"; + version = "1.9.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ekzhu"; + repo = "datasketch"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ijBkbY6OioK5RP8zAeCnwlbrwE0OHa4tbEnCOabLTqs="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--cov-report=xml" "" + ''; + + build-system = [ hatchling ]; + + dependencies = [ + numpy + scipy + ]; + + optional-dependencies = rec { + cassandra = [ cassandra-driver ]; + redis = [ redis ]; + experimental_aio = [ + motor + aiounittest + ]; + bloom = [ pybloomfilter3 ]; + all = cassandra ++ redis ++ experimental_aio ++ bloom; + }; + + nativeCheckInputs = [ + pytestCheckHook + cassandra-driver + mock + motor + redis + pybloomfilter3 + pymongo + pytest-rerunfailures + pytest-asyncio + ]; + + disabledTestPaths = [ + # these tests import mockredis, which has been abandoned for many years + "test/test_lsh.py" + "test/test_lshensemble.py" + ]; + disabledTests = [ + # flaky + "test_soft_remove_and_pop_and_clean" + ]; + + meta = { + changelog = "https://github.com/ekzhu/datasketch/releases/tag/v${finalAttrs.version}"; + description = "MinHash, LSH, LSH Forest, Weighted MinHash, HyperLogLog, HyperLogLog++, LSH Ensemble and HNSW"; + homepage = "https://ekzhu.com/datasketch/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jokatzke ]; + }; +}) diff --git a/pkgs/development/python-modules/dukpy/default.nix b/pkgs/development/python-modules/dukpy/default.nix index b3be6438855e..5e022acb209a 100644 --- a/pkgs/development/python-modules/dukpy/default.nix +++ b/pkgs/development/python-modules/dukpy/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "dukpy"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "amol-"; repo = "dukpy"; tag = version; - hash = "sha256-5+SdGHYBron6EwpCf5ByaK8KuqQXhvN73wQUptvgPzc="; + hash = "sha256-ZoBkCpilqPwDy0njwXqUIVgKt16jDCdnbDk7EfxzWOM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index 2f448cef5b47..2eaed7120864 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -35,14 +35,14 @@ buildPythonPackage (finalAttrs: { pname = "huggingface-hub"; - version = "1.3.4"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "huggingface_hub"; tag = "v${finalAttrs.version}"; - hash = "sha256-q6BTpNawUPZ9LWSxJkq/GaLNLdmhAeJehyWVMvdtH24="; + hash = "sha256-jXXwjGJoPUSDb1ptgX3SvMKRz65vtho5XkV+QuowV0s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index c89fe78e55d5..b096ab7ca3fe 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "limits"; - version = "5.6.0"; + version = "5.8.0"; pyproject = true; src = fetchFromGitHub { owner = "alisaifee"; repo = "limits"; tag = version; - hash = "sha256-JmxoFc+AWV4qLgexpAysMGRKx2Q6K6AqNoaGkWU28Ro="; + hash = "sha256-svCvfQcidmfTPpe/GPrPxDhIPbmyoeIlXBR2vttTyHI="; postFetch = '' rm "$out/limits/_version.pyi" ''; diff --git a/pkgs/development/python-modules/litestar/default.nix b/pkgs/development/python-modules/litestar/default.nix index c790f834d1a8..e62261a30573 100644 --- a/pkgs/development/python-modules/litestar/default.nix +++ b/pkgs/development/python-modules/litestar/default.nix @@ -62,14 +62,14 @@ buildPythonPackage (finalAttrs: { pname = "litestar"; - version = "2.19.0"; + version = "2.20.0"; pyproject = true; src = fetchFromGitHub { owner = "litestar-org"; repo = "litestar"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZKvHsHkGEqDEDUz1JosBd3Thc+9D/gZmcACkyOWN8As="; + hash = "sha256-a72CUCwxeBluJI7kYShg0RuPEA58j52AkgHnokI4E28="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/mkdocs-autorefs/default.nix b/pkgs/development/python-modules/mkdocs-autorefs/default.nix index 0e27715fc230..e81f8e75b5f5 100644 --- a/pkgs/development/python-modules/mkdocs-autorefs/default.nix +++ b/pkgs/development/python-modules/mkdocs-autorefs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "mkdocs-autorefs"; - version = "1.4.3"; + version = "1.4.4"; pyproject = true; src = fetchFromGitHub { owner = "mkdocstrings"; repo = "autorefs"; tag = version; - hash = "sha256-/UPhoJL026jpdvC22uRFiAGN4pU/uqcDrROZmkTFWv0="; + hash = "sha256-kEDnCAqn9musqbY4efUrAHcKc/LAhH1zkLAI9fP/7eg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index de52849391ba..49f1437c3816 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -443,8 +443,8 @@ in "sha256-92qhSUqTiLgbtvCdi/Mmgve18mcYR00ABL+bNy7/OnY="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.42.38" - "sha256-ni/jZ4xTnnVLnPYo7Q4ypDFmGWBySDjjCgLULW0tMr0="; + buildMypyBoto3Package "ec2" "1.42.45" + "sha256-q3YTS3urB2ZNYiVxJLZOR7fwMhKrq6mLyqBESkfEdiY="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.42.3" @@ -467,8 +467,8 @@ in "sha256-lNlav7BQkVjbYE9cdnvcdNki9IDo6tTlerD+lt69Rio="; mypy-boto3-eks = - buildMypyBoto3Package "eks" "1.42.42" - "sha256-pXTA2pR+HeMrI9BRE3GUGBQwCCzaqXoIukf9Ht/sQ6k="; + buildMypyBoto3Package "eks" "1.42.45" + "sha256-CYyXR5dTt71HA0emAFKI2fv1IRLXDXumeGZ0vOjvnUU="; mypy-boto3-elastic-inference = buildMypyBoto3Package "elastic-inference" "1.36.0" @@ -610,8 +610,8 @@ in "sha256-rb8qotqFW+ZcesRS0TUl+NMsrOS7CTQosZ633jSE38k="; mypy-boto3-imagebuilder = - buildMypyBoto3Package "imagebuilder" "1.42.3" - "sha256-GfZopebKhtFZH+6sMwsBFlvbKpjyaDHdYaDvDlqq984="; + buildMypyBoto3Package "imagebuilder" "1.42.45" + "sha256-q8toJ7n/MSEt+w/n21rBEXHV7JAMJEno32RBmznPcKY="; mypy-boto3-importexport = buildMypyBoto3Package "importexport" "1.42.3" @@ -762,8 +762,8 @@ in "sha256-UfEbkTcu9ecQoqoXbM6uWxNAh5B/Z6Wj26WHSaLiEj8="; mypy-boto3-lakeformation = - buildMypyBoto3Package "lakeformation" "1.42.29" - "sha256-Yb24aPwMfxgh4ftE8k6mCvvJCTuUCxD5J+GElQBMD+U="; + buildMypyBoto3Package "lakeformation" "1.42.45" + "sha256-CG1b4lkqvsQLguhkYuJ5CH5Gu0IrC1mbsYYQ2Itjys4="; mypy-boto3-lambda = buildMypyBoto3Package "lambda" "1.42.37" @@ -942,8 +942,8 @@ in "sha256-npzoHPz/LS8q5fQOUT/niFRTZSEbOR8QquY7lt9huYE="; mypy-boto3-neptunedata = - buildMypyBoto3Package "neptunedata" "1.42.3" - "sha256-zUywjiBVarel6KBr6QIf2nxByggN2sFQK+4J/4rKUVs="; + buildMypyBoto3Package "neptunedata" "1.42.45" + "sha256-shRjfC+W/3ooNeJyGK1U7gdMfx7jRBJjDpiCDwmHONU="; mypy-boto3-network-firewall = buildMypyBoto3Package "network-firewall" "1.42.3" @@ -1366,8 +1366,8 @@ in "sha256-RQkxMKk7svSYMoPac44m9X0YyEEQWCz/geSRD2qjlI8="; mypy-boto3-transfer = - buildMypyBoto3Package "transfer" "1.42.43" - "sha256-rGnE1SfoFMgojEeHIz9kk3a76El0wccnm+4m2Cl1+hE="; + buildMypyBoto3Package "transfer" "1.42.45" + "sha256-Aimr6OVNbdCszU1sytZtRtyNn+J4gycTc3q8/9TKgs0="; mypy-boto3-translate = buildMypyBoto3Package "translate" "1.42.3" diff --git a/pkgs/development/python-modules/pinocchio/default.nix b/pkgs/development/python-modules/pinocchio/default.nix index 95bda9dc0959..9044a4e3153b 100644 --- a/pkgs/development/python-modules/pinocchio/default.nix +++ b/pkgs/development/python-modules/pinocchio/default.nix @@ -9,6 +9,7 @@ coal, casadi, matplotlib, + pybind11, python, buildStandalone ? true, @@ -35,6 +36,7 @@ toPythonModule ( checkInputs = super.checkInputs ++ [ matplotlib + pybind11 ]; nativeCheckInputs = super.nativeCheckInputs ++ [ diff --git a/pkgs/development/python-modules/pybloomfilter3/default.nix b/pkgs/development/python-modules/pybloomfilter3/default.nix new file mode 100644 index 000000000000..59d4a513df0b --- /dev/null +++ b/pkgs/development/python-modules/pybloomfilter3/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + # build + setuptools, + cython, + # check + pytest, +}: + +buildPythonPackage (finalAttrs: { + pname = "pybloomfilter3"; + version = "0.7.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "cavoq"; + repo = "pybloomfiltermmap3"; + rev = "237631c181423c42043ba8003a305dd1d8e0b700"; # repo has no tags or branches + hash = "sha256-vUaU0U5Smmm+k+i54uKu/R2qpoCbdq3LrjU4/BBEMq8="; + }; + + build-system = [ + setuptools + cython + ]; + + # tests are not discovered by pytestCheckHook + nativeCheckInputs = [ pytest ]; + checkPhase = '' + runHook preCheck + python -m unittest discover -s tests -p "*.py" + runHook postCheck + ''; + + meta = { + changelog = "https://github.com/prashnts/pybloomfilter3/blob/${finalAttrs.src.rev}/CHANGELOG"; + description = "Fast Python Bloom Filter using Mmap"; + homepage = "https://github.com/prashnts/pybloomfilter3"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jokatzke ]; + }; +}) diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 0cf107869b86..a22252ebe71f 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -9,12 +9,12 @@ buildPythonPackage (finalAttrs: { pname = "pyexploitdb"; - version = "0.3.12"; + version = "0.3.13"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-WTu7Oq4I+3gTXxJ5djIF+/TDFvlvsEFz59wz+4GnUdc="; + hash = "sha256-fZCdH29PGU8GSo+JHWLqiaJj5zWIDmxTQTSf0UbLdmo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyiceberg-core/default.nix b/pkgs/development/python-modules/pyiceberg-core/default.nix index b3a60ba2842d..e251ad4b6778 100644 --- a/pkgs/development/python-modules/pyiceberg-core/default.nix +++ b/pkgs/development/python-modules/pyiceberg-core/default.nix @@ -6,32 +6,38 @@ # tests datafusion, + fastavro, pyarrow, + pydantic-core, + pyiceberg, pytestCheckHook, + + # passthru + pyiceberg-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyiceberg-core"; - version = "0.6.0"; + version = "0.8.0"; pyproject = true; src = fetchFromGitHub { owner = "apache"; repo = "iceberg-rust"; - tag = "v${version}"; - hash = "sha256-vRSZnMkZptGkLZBN1RRu0YGRQCOgJioBIghXnvU9UXc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-q5eghj469gT9FkbBMgrHcV1bMCTAgAzz1ir7zEx1DAk="; }; - sourceRoot = "${src.name}/bindings/python"; + sourceRoot = "${finalAttrs.src.name}/bindings/python"; cargoDeps = rustPlatform.fetchCargoVendor { - inherit + inherit (finalAttrs) pname version src sourceRoot ; - hash = "sha256-QfNVqyZ/O3vZAf689Fg5qPY6jcN4G1zo2eS2AEcdIL4="; + hash = "sha256-R/SgYjlxRvlkgn/n8O87Nko0BxenioACqonGa1c9h9E="; }; nativeBuildInputs = [ @@ -42,20 +48,32 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyiceberg_core" ]; nativeCheckInputs = [ + datafusion + fastavro + pyiceberg pyarrow pytestCheckHook + ] + ++ pyiceberg.optional-dependencies.pyarrow + ++ pyiceberg.optional-dependencies.sql-sqlite; + + disabledTests = [ + # AttributeError: 'function' object has no attribute 'cache_clear' + "test_read_manifest_entry" ]; - disabledTestPaths = [ - # Circular dependency on pyiceberg - "tests/test_datafusion_table_provider.py" - ]; + # Circular dependency on pyiceberg + doCheck = false; + + passthru.tests.pytest = pyiceberg-core.overridePythonAttrs { + doCheck = true; + }; meta = { description = "Iceberg-rust powered core for pyiceberg"; homepage = "https://github.com/apache/iceberg-rust/tree/main/bindings/python"; - changelog = "https://github.com/apache/iceberg-rust/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/apache/iceberg-rust/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyiceberg/default.nix b/pkgs/development/python-modules/pyiceberg/default.nix index 958f177d4af9..874b44bc91c5 100644 --- a/pkgs/development/python-modules/pyiceberg/default.nix +++ b/pkgs/development/python-modules/pyiceberg/default.nix @@ -6,7 +6,6 @@ # build-system cython, - poetry-core, setuptools, # dependencies @@ -19,7 +18,6 @@ pyroaring, requests, rich, - sortedcontainers, strictyaml, tenacity, zstandard, @@ -27,18 +25,16 @@ # optional-dependencies adlfs, google-cloud-bigquery, - # bodo, - # daft, datafusion, duckdb, pyarrow, boto3, + azure-identity, google-auth, gcsfs, huggingface-hub, thrift, kerberos, - # thrift-sasl, pandas, polars, pyiceberg-core, @@ -62,40 +58,26 @@ pythonAtLeast, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "iceberg-python"; - version = "0.10.0"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "apache"; repo = "iceberg-python"; - tag = "pyiceberg-${version}"; - hash = "sha256-uR8nmKVjYjiArcNaf/Af2kGh14p59VV9g2mKPKmiJnc="; + tag = "pyiceberg-${finalAttrs.version}"; + hash = "sha256-sej0RJuoTnpX0DXC54RTacZNJIxzorcG4xlxByNUxc4="; }; - patches = [ - # Build script fails to build the cython extension on python 3.11 (no issues with python 3.12): - # distutils.errors.DistutilsSetupError: each element of 'ext_modules' option must be an Extension instance or 2-tuple - # This error vanishes if Cython and setuptools imports are swapped - # https://stackoverflow.com/a/53356077/11196710 - ./reorder-imports-in-build-script.patch - ]; - build-system = [ cython - poetry-core setuptools ]; # Prevents the cython build to fail silently env.CIBUILDWHEEL = "1"; - pythonRelaxDeps = [ - "cachetools" - "rich" - ]; - dependencies = [ cachetools click @@ -106,7 +88,6 @@ buildPythonPackage rec { pyroaring requests rich - sortedcontainers strictyaml tenacity zstandard @@ -135,6 +116,9 @@ buildPythonPackage rec { dynamodb = [ boto3 ]; + entra-auth = [ + azure-identity + ]; gcp-auth = [ google-auth ]; @@ -190,9 +174,6 @@ buildPythonPackage rec { sql-sqlite = [ sqlalchemy ]; - zstandard = [ - zstandard - ]; }; pythonImportsCheck = [ @@ -215,12 +196,14 @@ buildPythonPackage rec { pytestCheckHook requests-mock ] - ++ optional-dependencies.bigquery - ++ optional-dependencies.hive - ++ optional-dependencies.pandas - ++ optional-dependencies.pyarrow - ++ optional-dependencies.s3fs - ++ optional-dependencies.sql-sqlite + ++ finalAttrs.passthru.optional-dependencies.adlfs + ++ finalAttrs.passthru.optional-dependencies.bigquery + ++ finalAttrs.passthru.optional-dependencies.entra-auth + ++ finalAttrs.passthru.optional-dependencies.hive + ++ finalAttrs.passthru.optional-dependencies.pandas + ++ finalAttrs.passthru.optional-dependencies.pyarrow + ++ finalAttrs.passthru.optional-dependencies.s3fs + ++ finalAttrs.passthru.optional-dependencies.sql-sqlite ++ moto.optional-dependencies.server; pytestFlags = [ @@ -228,6 +211,10 @@ buildPythonPackage rec { "-Wignore::ResourceWarning" ]; + preCheck = '' + rm -rf pyiceberg + ''; + disabledTestPaths = [ # Several errors: # - FileNotFoundError: [Errno 2] No such file or directory: '/nix/store/...-python3.12-pyspark-3.5.3/lib/python3.12/site-packages/pyspark/./bin/spark-submit' @@ -237,6 +224,12 @@ buildPythonPackage rec { ]; disabledTests = [ + # assert "Expected '<=' | '<>' | '<' | '>=' | '>' | '==' | '=' | '!=', found '.'" in str(exc_info.value) + "test_quoted_column_with_dots" + + # AssertionError: assert 'grant_type=c...scope=catalog' == 'grant_type=c...scope=catalog' + "test_auth_header" + # KeyError: 'authorization' "test_token_200" "test_token_200_without_optional_fields" @@ -304,6 +297,8 @@ buildPythonPackage rec { "test_identity_transform_columns_projection" "test_in_memory_catalog_context_manager" "test_inspect_partition_for_nested_field" + "test_inspect_partitions_respects_partition_evolution" + "test_partition_column_projection_with_schema_evolution" ] ++ lib.optionals (pythonAtLeast "3.13") [ # AssertionError: @@ -316,8 +311,8 @@ buildPythonPackage rec { meta = { description = "Python library for programmatic access to Apache Iceberg"; homepage = "https://github.com/apache/iceberg-python"; - changelog = "https://github.com/apache/iceberg-python/releases/tag/pyiceberg-${version}"; + changelog = "https://github.com/apache/iceberg-python/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyiceberg/reorder-imports-in-build-script.patch b/pkgs/development/python-modules/pyiceberg/reorder-imports-in-build-script.patch deleted file mode 100644 index a19d7bbe8fd1..000000000000 --- a/pkgs/development/python-modules/pyiceberg/reorder-imports-in-build-script.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/build-module.py b/build-module.py -index d91375e..4d307e8 100644 ---- a/build-module.py -+++ b/build-module.py -@@ -23,10 +23,10 @@ allowed_to_fail = os.environ.get("CIBUILDWHEEL", "0") != "1" - - - def build_cython_extensions() -> None: -- import Cython.Compiler.Options -- from Cython.Build import build_ext, cythonize - from setuptools import Extension - from setuptools.dist import Distribution -+ import Cython.Compiler.Options -+ from Cython.Build import build_ext, cythonize - - Cython.Compiler.Options.annotate = True - diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix index fe70a2028eec..35f7065a71dd 100644 --- a/pkgs/development/python-modules/pypdf/default.nix +++ b/pkgs/development/python-modules/pypdf/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "pypdf"; - version = "6.6.2"; + version = "6.7.0"; pyproject = true; src = fetchFromGitHub { @@ -36,7 +36,7 @@ buildPythonPackage rec { tag = version; # fetch sample files used in tests fetchSubmodules = true; - hash = "sha256-5XgxfVtSh4Q8FksGp7dXk+RCGQi0oqg0jpdn9K/gFq8="; + hash = "sha256-Kd5jBsq6sE5qWdIieVWdAKFA3QiDRsTBwoFerNY9ZRU="; }; outputs = [ diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index 09f108713fd2..7903a717fc30 100644 --- a/pkgs/development/python-modules/pyperf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pyperf"; - version = "2.9.0"; + version = "2.10.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-2+D+747BpGXfGRu6JXYUl2LRWoyZhcn+qTq2Jdh1w2I="; + hash = "sha256-3ZPM/aeSFHJSk+lfH6bgDLSmStzxMmA5SG1OH5HKqmI="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyprobables/default.nix b/pkgs/development/python-modules/pyprobables/default.nix index c2213a11ba12..3460535d3d0c 100644 --- a/pkgs/development/python-modules/pyprobables/default.nix +++ b/pkgs/development/python-modules/pyprobables/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyprobables"; - version = "0.6.2"; + version = "0.7.0"; pyproject = true; src = fetchFromGitHub { owner = "barrust"; repo = "pyprobables"; tag = "v${version}"; - hash = "sha256-CxxpiYtqoAm81YjL6nTFIk4MnBG+1n3wbnW8u29lQlw="; + hash = "sha256-wUeNmkDzDBXGtMBplS2Hv6rK+M3eijVpYtHMhjIpsy8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 94a5d129c0c7..dfd971232cdd 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -44,6 +44,10 @@ buildPythonPackage (finalAttrs: { hash = "sha256-CEz1v4e4NadSZ+qhotFtLB4y/KdhDZbDOohN8D9FB30="; }; + patches = [ + ./fix-pyproject.patch + ]; + env.PBR_VERSION = finalAttrs.version; build-system = [ @@ -75,11 +79,22 @@ buildPythonPackage (finalAttrs: { checkPhase = '' runHook preCheck stestr run -E \ - "openstackclient.tests.unit.(volume.v3.test_volume.(TestVolumeCreate|TestVolumeShow)|common.test_module.TestModuleList)" + "openstackclient.tests.unit.common.test_module.TestModuleList.(test_module_list_no_options|test_module_list_all)" runHook postCheck ''; - pythonImportsCheck = [ "openstackclient" ]; + pythonImportsCheck = [ + "openstackclient" + "openstackclient.api" + "openstackclient.common" + "openstackclient.compute" + "openstackclient.identity" + "openstackclient.image" + "openstackclient.network" + "openstackclient.object" + "openstackclient.volume" + "openstackclient.tests" + ]; optional-dependencies = { # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst diff --git a/pkgs/development/python-modules/python-openstackclient/fix-pyproject.patch b/pkgs/development/python-modules/python-openstackclient/fix-pyproject.patch new file mode 100644 index 000000000000..4ce54df89254 --- /dev/null +++ b/pkgs/development/python-modules/python-openstackclient/fix-pyproject.patch @@ -0,0 +1,18 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 37fb8d0c..21571714 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -730,10 +730,9 @@ volume_transfer_request_show = "openstackclient.volume.v3.volume_transfer_reques + volume_summary = "openstackclient.volume.v3.volume:VolumeSummary" + volume_revert = "openstackclient.volume.v3.volume:VolumeRevertToSnapshot" + +-[tool.setuptools] +-packages = [ +- "openstackclient" +-] ++[tool.setuptools.packages.find] ++where = ["."] ++include = ["openstackclient*"] + + [tool.mypy] + python_version = "3.10" diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 866de1537f0b..fa4a152c7276 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "reolink-aio"; - version = "0.18.2"; + version = "0.19.0"; pyproject = true; src = fetchFromGitHub { owner = "starkillerOG"; repo = "reolink_aio"; tag = finalAttrs.version; - hash = "sha256-DkFMXBsgQvi2tRe0ddpKkvQ3xxbvZgNPvXtjoK+sMME="; + hash = "sha256-ZYtqvfXVCPRQSHR74ZL9uT3C/p9R9OZom/zMj5onE+0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/scenedetect/default.nix b/pkgs/development/python-modules/scenedetect/default.nix index e3f66fa3e6a3..81f35e60424d 100644 --- a/pkgs/development/python-modules/scenedetect/default.nix +++ b/pkgs/development/python-modules/scenedetect/default.nix @@ -20,20 +20,25 @@ let hash = "sha256-7ws7F7CkEJAa0PgfMEOwnpF4Xl2BQCn9+qFQb5MMlZ0="; }; in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "scenedetect"; - version = "0.6.6"; + version = "0.6.7.1"; pyproject = true; src = fetchFromGitHub { owner = "Breakthrough"; repo = "PySceneDetect"; - tag = "v${version}-release"; - hash = "sha256-G5NLk6eOpclfrzzHad2KT3uZqydSJU0oF/4L2NIdZe0="; + tag = "v${finalAttrs.version}-release"; + hash = "sha256-bLR04wn4O23fHC12ZvWwDI7gLGvMhm+YnBOy4zYMPSM="; }; - build-system = [ setuptools ]; + build-system = [ + setuptools + ]; + pythonRelaxDeps = [ + "click" + ]; dependencies = [ av click @@ -43,9 +48,7 @@ buildPythonPackage rec { tqdm ]; - pythonImportsCheck = [ - "scenedetect" - ]; + pythonImportsCheck = [ "scenedetect" ]; preCheck = '' cp -r ${testsResources}/tests/resources tests/ @@ -62,9 +65,9 @@ buildPythonPackage rec { meta = { description = "Python and OpenCV-based scene cut/transition detection program & library"; homepage = "https://www.scenedetect.com"; - changelog = "https://github.com/Breakthrough/PySceneDetect/releases/tag/v${version}-release"; + changelog = "https://github.com/Breakthrough/PySceneDetect/releases/tag/${finalAttrs.src.tag}"; mainProgram = "scenedetect"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ DataHearth ]; }; -} +}) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 793c81f65451..fb3d7b78649f 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "tencentcloud-sdk-python"; - version = "3.1.45"; + version = "3.1.46"; pyproject = true; src = fetchFromGitHub { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = finalAttrs.version; - hash = "sha256-sfvRrI8MFvX56qBjp7f8hmQQDg/3weGwL+6Kx5rcRao="; + hash = "sha256-TZJr2TF7Fs2SvOs7Jtl/Vaa73MgC7Gb1KTgbOhL1Xko="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index dbcf47cd39d1..5d08730ee66e 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -7,15 +7,15 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "tplink-omada-client"; - version = "1.5.3"; + version = "1.5.5"; pyproject = true; src = fetchPypi { pname = "tplink_omada_client"; - inherit version; - hash = "sha256-JcH39WqEk0HNQIQ6jiN2Ml3PEX+mNLBVSaRENiut29A="; + inherit (finalAttrs) version; + hash = "sha256-uefZ1MIt0xuLo1JZEYIJhrwY4V8KG0Rb16+ZY7PwEwI="; }; build-system = [ hatchling ]; @@ -33,9 +33,9 @@ buildPythonPackage rec { meta = { description = "Library for the TP-Link Omada SDN Controller API"; homepage = "https://github.com/MarkGodwin/tplink-omada-api"; - changelog = "https://github.com/MarkGodwin/tplink-omada-api/releases/tag/release%2Fv${version}"; + changelog = "https://github.com/MarkGodwin/tplink-omada-api/releases/tag/release%2Fv${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "omada"; }; -} +}) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index c0679aa8779f..1efce3f23db1 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -25,23 +25,28 @@ # torch torch, accelerate, - # hf_xet - hf-xet, + # deepspeed + # deepspeed, + # codecarbon + # codecarbon, # retrieval faiss, datasets, - # tokenizers - # ftfy - ftfy, - # modelcreation - cookiecutter, + # ja + fugashi, + ipadic, + sudachipy, + # sudachidict_core, + # unidic_lite, + unidic, + # rhoknp, # sagemaker sagemaker, # optuna optuna, # ray ray, - # hub-kernels + # kernels kernels, # serving openai, @@ -52,8 +57,9 @@ rich, # audio librosa, + # pyctcdecode, phonemizer, - # speech + # kenlm, torchaudio, # vision pillow, @@ -80,21 +86,22 @@ gitpython, urllib3, libcst, - pandas, - # torchhub - importlib-metadata, + # opentelemetry + opentelemetry-api, + opentelemetry-exporter-otlp, + opentelemetry-sdk, }: buildPythonPackage (finalAttrs: { pname = "transformers"; - version = "5.0.0"; + version = "5.1.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "transformers"; tag = "v${finalAttrs.version}"; - hash = "sha256-ART1ARd+hfC0GQNDa225SWF0zTFUKE4eDxFYbWFaTl8="; + hash = "sha256-DMm85M47hMWhqbwY3k3F5nbkbctM23K6wnmIUa2O43g="; }; build-system = [ setuptools ]; @@ -114,13 +121,13 @@ buildPythonPackage (finalAttrs: { optional-dependencies = lib.fix (self: { ja = [ - # fugashi - # ipadic + fugashi + ipadic # unidic_lite - # unidic - # sudachipy - # sudachidict_core + unidic # rhoknp + sudachipy + # sudachidict_core ]; sklearn = [ scikit-learn ]; torch = [ @@ -128,14 +135,10 @@ buildPythonPackage (finalAttrs: { accelerate ]; accelerate = [ accelerate ]; - hf_xet = [ hf-xet ]; retrieval = [ faiss datasets ]; - tokenizers = [ tokenizers ]; - ftfy = [ ftfy ]; - modelcreation = [ cookiecutter ]; sagemaker = [ sagemaker ]; deepspeed = [ # deepspeed @@ -143,8 +146,11 @@ buildPythonPackage (finalAttrs: { ++ self.accelerate; optuna = [ optuna ]; ray = [ ray ] ++ ray.optional-dependencies.tune; - hub-kernels = [ kernels ]; - integrations = self.hub-kernels ++ self.optuna ++ self.ray; + kernels = [ kernels ]; + codecarbon = [ + # codecarbon + ]; + integrations = self.kernels ++ self.optuna ++ self.codecarbon ++ self.ray; serving = [ openai pydantic @@ -155,22 +161,17 @@ buildPythonPackage (finalAttrs: { ] ++ self.torch; audio = [ + torchaudio librosa # pyctcdecode phonemizer # kenlm ]; - speech = [ torchaudio ] ++ self.audio; - torch-speech = [ torchaudio ] ++ self.audio; - vision = [ pillow ]; + vision = [ + torchvision + pillow + ]; timm = [ timm ]; - torch-vision = [ torchvision ] ++ self.vision; - natten = [ - # natten - ]; - codecarbon = [ - # codecarbon - ]; video = [ av ]; num2words = [ num2words ]; sentencepiece = [ @@ -193,24 +194,15 @@ buildPythonPackage (finalAttrs: { urllib3 libcst rich - pandas - ]; - torchhub = [ - filelock - huggingface-hub - importlib-metadata - numpy - packaging - protobuf - regex - sentencepiece - torch - tokenizers - tqdm ]; benchmark = [ # optimum-benchmark ]; + open-telemetry = [ + opentelemetry-api + opentelemetry-exporter-otlp + opentelemetry-sdk + ]; }); # Many tests require internet access. @@ -226,6 +218,7 @@ buildPythonPackage (finalAttrs: { license = lib.licenses.asl20; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ + GaetanLepage pashashocky happysalada ]; diff --git a/pkgs/development/python-modules/wagtail-factories/default.nix b/pkgs/development/python-modules/wagtail-factories/default.nix index 9dd763b793cf..1a0e33cf342a 100644 --- a/pkgs/development/python-modules/wagtail-factories/default.nix +++ b/pkgs/development/python-modules/wagtail-factories/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "wagtail-factories"; - version = "4.3.0"; + version = "4.4.0"; pyproject = true; src = fetchFromGitHub { repo = "wagtail-factories"; owner = "wagtail"; tag = "v${version}"; - hash = "sha256-Rbu8D0vmUyF76YzF1QSQC5c0s12GxRrHNuUhMxcZdQY="; + hash = "sha256-IPUnRFsl2qzcuX2FNqQ1xBY7ou7CBWRhIfS/TmUGrpc="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/wagtail-localize/default.nix b/pkgs/development/python-modules/wagtail-localize/default.nix index 70d1be1957a9..2b22e924a455 100644 --- a/pkgs/development/python-modules/wagtail-localize/default.nix +++ b/pkgs/development/python-modules/wagtail-localize/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "wagtail-localize"; - version = "1.12.2"; + version = "1.13"; pyproject = true; src = fetchFromGitHub { repo = "wagtail-localize"; owner = "wagtail"; tag = "v${version}"; - hash = "sha256-DY3owyxJrEPMP4Lfrcyo48gg6be25xSbv87BxW5sPE4="; + hash = "sha256-JhLfrK4CBdTR85JuAjf9vGByQVgCIYT3IrM6AYxxNTE="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 1df2ea37c8a3..c789c453137f 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sbt"; - version = "1.12.1"; + version = "1.12.2"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz"; - hash = "sha256-7wQT39wXegcZ75scsYQemdQa8pyYd89gHx5naVFCw+k="; + hash = "sha256-l7t331CsM+P4yH0UFcHWa7WFhvb+Ayt4CP14P5SVMfA="; }; postPatch = '' diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index 3867f78ad12d..0a7bf8f797a1 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -10,7 +10,7 @@ buildGoModule (finalAttrs: { pname = "kustomize"; - version = "5.8.0"; + version = "5.8.1"; ldflags = let @@ -26,13 +26,13 @@ buildGoModule (finalAttrs: { owner = "kubernetes-sigs"; repo = "kustomize"; rev = "kustomize/v${finalAttrs.version}"; - hash = "sha256-BOM0m/bigELUf6xHjLbI8wzSscF0lhwCjIxa87xBbWM="; + hash = "sha256-IFof+h6GBlI19ygufNvQ6HgwGbmS0xR5CmrFafknHf0="; }; # avoid finding test and development commands modRoot = "kustomize"; proxyVendor = true; - vendorHash = "sha256-kwvfxHXL189PSK7+PnOr+1TSjuX3uHkV4VnG3gSW5v0="; + vendorHash = "sha256-0nlI8QmZCzSZXlQKs5ZkAwrRMKaQUoFpDuj60gURlf8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/mysql-shell/8.nix b/pkgs/development/tools/mysql-shell/8.nix index 00065a42ac5f..2e909658bbde 100644 --- a/pkgs/development/tools/mysql-shell/8.nix +++ b/pkgs/development/tools/mysql-shell/8.nix @@ -38,8 +38,8 @@ let pyyaml ]; - mysqlShellVersion = "8.4.6"; - mysqlServerVersion = "8.4.6"; + mysqlShellVersion = "8.4.8"; + mysqlServerVersion = "8.4.8"; in stdenv.mkDerivation (finalAttrs: { pname = "mysql-shell"; @@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { srcs = [ (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz"; - hash = "sha256-oeUj3IvpbRilreEGmYZhKFygG29bRsCLJlQRDkDfL7c="; + hash = "sha256-vp2Wzfh/J2lSos3ZYPEGuWCohg5GwRXtOcG18uA4eiA="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-IUmWUW5rZcRvmolE+LjMaGPFa5abv1osIhTzm9BKt/w="; + hash = "sha256-0mNO/uJVvVHRSDalOIuvQOOsDR6OukfJuov8Uasr0tE="; }) ]; diff --git a/pkgs/development/tools/mysql-shell/innovation.nix b/pkgs/development/tools/mysql-shell/innovation.nix index 9dd624e54263..8834c6d69ebd 100644 --- a/pkgs/development/tools/mysql-shell/innovation.nix +++ b/pkgs/development/tools/mysql-shell/innovation.nix @@ -38,8 +38,8 @@ let pyyaml ]; - mysqlShellVersion = "9.4.0"; - mysqlServerVersion = "9.4.0"; + mysqlShellVersion = "9.6.0"; + mysqlServerVersion = "9.6.0"; in stdenv.mkDerivation (finalAttrs: { pname = "mysql-shell-innovation"; @@ -48,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { srcs = [ (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz"; - hash = "sha256-a7UJxU5YtUq776SeKW5yIPXnz+RGkUujYV9ZSWfPqSE="; + hash = "sha256-JABh2GnVrhiMmjM4RZKImenZY8y9Z4Zaii5Lb8tnF4w="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-BpiDGA3Lxf/MrKqtPSA+apFNZx9N805PYYVa+2vQxPE="; + hash = "sha256-WnCr/poMsxtaS9k7/6QZDkFPOZlf7WAELsqFGpnUwf4="; }) ]; diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index cf1624fec9a0..af24dcb64838 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { doCheck = true; nativeCheckInputs = [ clang ]; - RUSTFMT = "${rustfmt-nightly}/bin/rustfmt"; + env.RUSTFMT = "${rustfmt-nightly}/bin/rustfmt"; preCheck = '' # for the ci folder, notably diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 100335d6e7dc..32473cad4ec3 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -11,6 +11,7 @@ libuv, lief, llhttp, + merve, nghttp2, nghttp3, ngtcp2, @@ -125,6 +126,7 @@ let useSharedAdaAndSimd = !stdenv.hostPlatform.isStatic && lib.versionAtLeast version "22.2"; useSharedLief = !stdenv.hostPlatform.isStatic && lib.versionAtLeast version "25.6"; + useSharedMerve = !stdenv.hostPlatform.isStatic && lib.versionAtLeast version "25.6.1"; useSharedSQLite = !stdenv.hostPlatform.isStatic && lib.versionAtLeast version "22.5"; useSharedZstd = !stdenv.hostPlatform.isStatic && lib.versionAtLeast version "22.15"; @@ -165,6 +167,9 @@ let // (lib.optionalAttrs useSharedLief { inherit lief; }) + // (lib.optionalAttrs useSharedMerve { + inherit merve; + }) // (lib.optionalAttrs useSharedZstd { inherit zstd; }); diff --git a/pkgs/development/web/nodejs/v25.nix b/pkgs/development/web/nodejs/v25.nix index 11afa0071dc2..28609675644c 100644 --- a/pkgs/development/web/nodejs/v25.nix +++ b/pkgs/development/web/nodejs/v25.nix @@ -23,8 +23,8 @@ let [ ]; in buildNodejs { - version = "25.6.0"; - sha256 = "9db6848c802b1981c0faeb71a5b8cc79913f82a747f7f1d50260c6d2f781ef7e"; + version = "25.6.1"; + sha256 = "cf756781c8b4dc5ee030f87ddf9d51b8d5bf219ad56cbd9855c4a3bdc832c78e"; patches = ( if (stdenv.hostPlatform.emulatorAvailable buildPackages) then diff --git a/pkgs/os-specific/linux/universal-pidff/default.nix b/pkgs/os-specific/linux/universal-pidff/default.nix index dde28298e15b..e84f603596cd 100644 --- a/pkgs/os-specific/linux/universal-pidff/default.nix +++ b/pkgs/os-specific/linux/universal-pidff/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "universal-pidff"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "JacKeTUs"; repo = "universal-pidff"; tag = version; - hash = "sha256-qjnQTkQiufHPEwMH+F+XE+VBc/DSTX6d0vxot35xbUc="; + hash = "sha256-8kAoy2wcQbP6DOzSwp0Mg1aJ8R1ZQpc+OZfDUTEPHBo="; }; postPatch = '' diff --git a/pkgs/servers/kanidm/1_8.nix b/pkgs/servers/kanidm/1_8.nix index 8f2d586cc91c..f6b401d06c62 100644 --- a/pkgs/servers/kanidm/1_8.nix +++ b/pkgs/servers/kanidm/1_8.nix @@ -1,5 +1,5 @@ import ./generic.nix { - version = "1.8.5"; - hash = "sha256-lJX/eObXi468iFOzeFjAnNkPiQ8VbBnfqD1518LDm2s="; - cargoHash = "sha256-LjlXd2zJ2eXr/dyCsbwlzv3Qntg2b0mudtWGtc0V7Lc="; + version = "1.8.6"; + hash = "sha256-+NZs8HHHmWGmlNNymIlbV7E28RiaGLmvtZkCWZJQvMk="; + cargoHash = "sha256-NKCQRIxvWAT5saMO85noYZtm7h0OPFhWFqudvkQPYTE="; } diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix index 8b6814a737fb..68f086894c53 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-exploretraces-app"; - version = "1.3.0"; - zipHash = "sha256-7dSaO+m67oQ3WlL+SC+IsuzFeZ2GtSBJORggd4YENxU="; + version = "1.3.2"; + zipHash = "sha256-JXDZ7rC5Y38qJVmiEq2oz1DoWGIh9VX0bCZxdwlbDMo="; meta = { description = "Opinionated traces app"; license = lib.licenses.agpl3Only; diff --git a/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix b/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix index 4b6e9d911e13..6a37c00aea93 100644 --- a/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pgbouncer-exporter"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "pgbouncer_exporter"; rev = "v${version}"; - hash = "sha256-YvkD6X2aSXeOW7O5RqAVM1Fo6KE8OCh0+QzgoW8QAVg="; + hash = "sha256-cLCoEREGZ81a6CBcSyuQ4x4lDMusHoP7BB0MyPaTVJ8="; }; - vendorHash = "sha256-IBIJWA/arARPV0ErAQdGJXbPAaryCN22mHwKL08M8QA="; + vendorHash = "sha256-qAsmPMANBiswF2/+rCZnqFETD0snnPHQGUaVOXErLfc="; meta = { description = "Prometheus exporter for PgBouncer"; diff --git a/pkgs/shells/fish/plugins/async-prompt.nix b/pkgs/shells/fish/plugins/async-prompt.nix index c8fab1f1c931..e96a8465cc0a 100644 --- a/pkgs/shells/fish/plugins/async-prompt.nix +++ b/pkgs/shells/fish/plugins/async-prompt.nix @@ -19,6 +19,9 @@ buildFishPlugin rec { description = "Make your prompt asynchronous to improve the reactivity"; homepage = "https://github.com/acomagu/fish-async-prompt"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.samasaur ]; + maintainers = with lib.maintainers; [ + figsoda + samasaur + ]; }; } diff --git a/pkgs/shells/fish/plugins/autopair.nix b/pkgs/shells/fish/plugins/autopair.nix index a68f54d284be..0c53dcc120a2 100644 --- a/pkgs/shells/fish/plugins/autopair.nix +++ b/pkgs/shells/fish/plugins/autopair.nix @@ -20,6 +20,7 @@ buildFishPlugin rec { homepage = "https://github.com/jorgebucaran/autopair.fish"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ + figsoda kidonng ]; }; diff --git a/pkgs/tools/system/nvtop/build-nvtop.nix b/pkgs/tools/system/nvtop/build-nvtop.nix index 9a0673e4a71d..25de0091ba2c 100644 --- a/pkgs/tools/system/nvtop/build-nvtop.nix +++ b/pkgs/tools/system/nvtop/build-nvtop.nix @@ -42,7 +42,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nvtop"; - version = "3.3.1"; + version = "3.3.2"; # between generation of multiple update PRs for each package flavor and manual updates I choose manual updates # nixpkgs-update: no auto update @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Syllo"; repo = "nvtop"; rev = finalAttrs.version; - hash = "sha256-+SvEp8pbauSLbDuPZqGMTyL2EZecz1VKCJgC+xjV/vQ="; + hash = "sha256-w3g/9VbZz1qrEMaBBHEf9Y93z0vo8LbWnENL2wEEaSw="; }; cmakeFlags = with lib.strings; [ diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index 14465e3fb4f2..6effd6d9f41d 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -27,7 +27,9 @@ stdenv.mkDerivation rec { preConfigure = "patchShebangs ./build-aux/help2man"; # Prevents attempts of running 'help2man' on cross-built binaries. - PERL = if stdenv.hostPlatform == stdenv.buildPlatform then null else "missing"; + env = lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { + PERL = "missing"; + }; meta = { homepage = "https://www.gnu.org/software/sed/"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ea4b85070a0a..04fed99158ef 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -353,6 +353,7 @@ mapAliases { banking = saldo; # Added 2025-08-29 barrier = throw "'barrier' has been removed as it is unmaintained. Consider 'deskflow' or 'input-leap' instead."; # Added 2025-09-29 base16-builder = throw "'base16-builder' has been removed due to being unmaintained"; # Added 2025-06-03 + basedmypy = throw "basedmypy has been deprecated by upstream. Use instead 'basedpyright' or 'ty'"; # added 2026-02-03 baserow = throw "baserow has been removed, due to lack of maintenance"; # Added 2025-08-02 bazel_5 = throw "bazel_5 has been removed as it is EOL"; # Added 2025-08-09 bazel_6 = throw "bazel_6 has been removed as it will be EOL by the release of Nixpkgs 25.11"; # Added 2025-08-19 @@ -428,6 +429,7 @@ mapAliases { certmgr-selfsigned = throw "'certmgr-selfsigned' has been renamed to/replaced by 'certmgr'"; # Converted to throw 2025-10-27 cgit-pink = throw "cgit-pink has been removed, as it is unmaintained upstream"; # Added 2026-01-21 challenger = throw "'challenger' has been renamed to/replaced by 'taler-challenger'"; # Converted to throw 2025-10-27 + charis-sil = throw "'charis-sil' has renamed to/replaced by 'charis'"; # Added 2025-12-01 charmcraft = throw "charmcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # Added 2025-09-18 charybdis = throw "charybdis was removed since its upstream repo was archived in 2021"; # Added 2026-01-13 chatgpt-retrieval-plugin = throw "chatgpt-retrieval-plugin has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28 @@ -632,6 +634,7 @@ mapAliases { eris-go = throw "'eris-go' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01 eriscmd = throw "'eriscmd' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01 erlang-ls = throw "'erlang-ls' has been removed as it has been archived upstream. Consider using 'erlang-language-platform' instead"; # Added 2025-10-02 + etBook = warnAlias "'etBook' has been renamed to 'et-book'" et-book; # Added 2026-02-08 ethercalc = throw "'ethercalc' has been removed from nixpkgs as the project was old, unmaintained, and could not be packaged well in nixpkgs"; # Added 2025-11-28 ethersync = warnAlias "'ethersync' has been renamed to 'teamtype'" teamtype; # Added 2025-10-31 evolve-core = throw "'evolve-core' has been removed, as it hindered the removal of flutter329"; # Added 2026-01-25 @@ -1227,6 +1230,7 @@ mapAliases { lxde.lxsession = throw "'lxsession' has been moved to top-level. Use 'lxsession' directly"; # Added 2025-08-31 lxde.lxtask = throw "'lxtask' has been moved to top-level. Use 'lxtask' directly"; # Added 2025-08-31 lxdvdrip = throw "'lxdvdrip' has been removed due to lack of upstream maintenance."; # Added 2025-06-09 + LycheeSlicer = warnAlias "'LycheeSlicer' has been renamed to 'lycheeslicer'" lycheeslicer; # Added 2026-02-08 mac = throw "'mac' has been renamed to/replaced by 'monkeysAudio'"; # Converted to throw 2025-10-27 MACS2 = throw "'MACS2' has been renamed to/replaced by 'macs2'"; # Converted to throw 2025-10-27 magma_2_6_2 = throw "'magma_2_6_2' has been removed, use the latest 'magma' package instead."; # Added 2025-07-20 @@ -1257,6 +1261,7 @@ mapAliases { mediastreamer-openh264 = throw "'mediastreamer-openh264' has been moved to 'linphonePackages.msopenh264'"; # Added 2025-09-20 meilisearch_1_11 = throw "'meilisearch_1_11' has been removed, as it is no longer supported"; # Added 2025-10-03 melmatcheq.lv2 = melmatcheq-lv2; # Added 2025-09-27 + melonDS = warnAlias "'melonDS' has been renamed to 'melonds'" melonds; # Added 2026-02-08 meshlab-unstable = throw "meshlab-unstable has been removed, as it was behind meshlab"; # Added 2025-09-21 meteo = throw "'meteo' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09 microcodeAmd = throw "'microcodeAmd' has been renamed to/replaced by 'microcode-amd'"; # Converted to throw 2025-10-27 @@ -1746,6 +1751,7 @@ mapAliases { sourcehut = throw "'sourcehut.*' has been removed due to being broken and unmaintained"; # Added 2025-06-15 SP800-90B_EntropyAssessment = throw "'SP800-90B_EntropyAssessment' has been renamed to/replaced by 'sp800-90b-entropyassessment'"; # Converted to throw 2025-10-27 space-orbit = throw "'space-orbit' has been removed because it is unmaintained; Debian upstream stopped tracking it in 2011."; # Added 2025-06-08 + spacevim = throw "'spacevim' has been removed due to being archived upstream."; # Added 2026-02-10 SPAdes = throw "'SPAdes' has been renamed to/replaced by 'spades'"; # Converted to throw 2025-10-27 spago = spago-legacy; # Added 2025-09-23, pkgs.spago should become spago@next which hasn't been packaged yet spark2014 = throw "'spark2014' has been renamed to/replaced by 'gnatprove'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b94f5117e6d..200db9b7981a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -503,7 +503,13 @@ with pkgs; protobuf = protobuf_25.override { abseil-cpp = abseil-cpp_202407; }; - stdenv = if stdenv.cc.isClang then llvmPackages_19.stdenv else stdenv; + stdenv = + if stdenv.cc.isClang then + llvmPackages_19.stdenv + else if stdenv.cc.isGNU then + gcc14Stdenv + else + stdenv; }; }) mysql-shell_8 @@ -515,7 +521,13 @@ with pkgs; protobuf = protobuf_25.override { abseil-cpp = abseil-cpp_202407; }; - stdenv = if stdenv.cc.isClang then llvmPackages_19.stdenv else stdenv; + stdenv = + if stdenv.cc.isClang then + llvmPackages_19.stdenv + else if stdenv.cc.isGNU then + gcc14Stdenv + else + stdenv; }; # this is used by most `fetch*` functions @@ -2981,8 +2993,6 @@ with pkgs; marimo = with python3Packages; toPythonApplication marimo; - mbutil = python310Packages.callPackage ../applications/misc/mbutil { }; - mcstatus = with python3Packages; toPythonApplication mcstatus; miniupnpd = callPackage ../tools/networking/miniupnpd { }; @@ -3090,10 +3100,6 @@ with pkgs; nvfetcher = haskell.lib.compose.justStaticExecutables haskellPackages.nvfetcher; - mkgmap = callPackage ../applications/misc/mkgmap { }; - - mkgmap-splitter = callPackage ../applications/misc/mkgmap/splitter { }; - op-geth = callPackage ../applications/blockchains/optimism/geth.nix { }; optimism = callPackage ../applications/blockchains/optimism { }; @@ -6222,8 +6228,6 @@ with pkgs; mypy-protobuf = with python3Packages; toPythonApplication mypy-protobuf; - basedmypy = with python3Packages; toPythonApplication basedmypy; - ### DEVELOPMENT / LIBRARIES abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dafe08eda5f4..6ef15bdd189e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -740,7 +740,7 @@ with self; pname = "AnyEvent-BDB"; version = "1.1"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-BDB-${version}.tar.gz"; hash = "sha256-k+NgEJQEZGJuXzG5+u3WXhLtjRq/Fs4FL+vyP0la78g="; }; buildInputs = [ CanaryStability ]; @@ -841,7 +841,7 @@ with self; pname = "AnyEvent-IRC"; version = "0.97"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EL/ELMEX/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/E/EL/ELMEX/AnyEvent-IRC-${version}.tar.gz"; hash = "sha256-v9fPZFw8jGEUcQVxKGEUR+IPGt8BUWxpYky9i8d/W/A="; }; propagatedBuildInputs = [ @@ -2432,7 +2432,7 @@ with self; pname = "BDB"; version = "1.92"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/BDB-${version}.tar.gz"; hash = "sha256-o/LKnSuu/BqqQJCLL5y5KS/aPn15fji7146rudna62s="; }; env.NIX_CFLAGS_COMPILE = "-I${pkgs.db4.dev}/include"; @@ -5758,7 +5758,7 @@ with self; pname = "Compress-LZF"; version = "3.8"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Compress-LZF-${version}.tar.gz"; hash = "sha256-XR9d9IzhO03uHMnyeOzb+Bd4d7C5iBWk6zyRw0ZnFvI="; }; meta = { @@ -9405,7 +9405,7 @@ with self; pname = "Deliantra"; version = "2.01"; src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Deliantra-${version}.tar.gz"; hash = "sha256-JxbZsfBWJ9YJQs4GNLnBolEJsWSBgoXUW2Ca6FluKxc="; }; propagatedBuildInputs = [ @@ -18472,7 +18472,7 @@ with self; pname = "LaTeXML"; version = "0.8.8"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BR/BRMILLER/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/B/BR/BRMILLER/LaTeXML-${version}.tar.gz"; hash = "sha256-fSu+LOJSuvhro/OIzQ3sOqSDj0nWErnsfMT/iBBbrcw="; }; outputs = [ @@ -18587,7 +18587,7 @@ with self; pname = "libapreq2"; version = "2.17"; src = fetchurl { - url = "mirror://apache/httpd/libapreq/${pname}-${version}.tar.gz"; + url = "mirror://apache/httpd/libapreq/libapreq2-${version}.tar.gz"; hash = "sha256-BGSH8ITBL6HIIq/8X33lbv7ZtIkFpCbmMaa5ScEU2Gw="; }; outputs = [ "out" ]; @@ -26546,7 +26546,7 @@ with self; pname = "Object-Event"; version = "1.23"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EL/ELMEX/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/E/EL/ELMEX/Object-Event-${version}.tar.gz"; hash = "sha256-q2u4BQj0/dry1RsgyodqqwOFgqhrUijmQ1QRNIr1PII="; }; propagatedBuildInputs = [ @@ -33132,7 +33132,7 @@ with self; pname = "Term-ReadPassword"; version = "0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PH/PHOENIX/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/P/PH/PHOENIX/Term-ReadPassword-${version}.tar.gz"; hash = "sha256-4ahmNFs1+f/vfQA34T1tTLKAMQCJ+YwgcTiAvHD7QyM="; }; @@ -35460,7 +35460,7 @@ with self; pname = "Test-UNIXSock"; version = "0.4"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FU/FUJIWARA/${pname}-${version}.tar.gz"; + url = "mirror://cpan/authors/id/F/FU/FUJIWARA/Test-UNIXSock-${version}.tar.gz"; hash = "sha256-NzC0zBA0Es+/b+JHvbwwC+l94wnMmxxcvVc3E7hojz8="; }; buildInputs = [ ModuleBuildTiny ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b532e9637486..870ba29ca8b2 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -79,6 +79,8 @@ mapAliases { Babel = throw "'Babel' has been renamed to/replaced by 'babel'"; # Converted to throw 2025-10-29 backports-functools-lru-cache = throw "'backports-functools-lru-cache' has been removed from nixpkgs as it was not longer used in python2"; # Added 2026-01-14 backports_shutil_get_terminal_size = throw "'backports_shutil_get_terminal_size' has been renamed to/replaced by 'backports-shutil-get-terminal-size'"; # Converted to throw 2025-10-29 + basedmypy = throw "basedmypy has been deprecated by upstream. Use instead 'basedpyright' or 'ty'"; # added 2026-02-03 + basedtyping = throw "basedtyping has been deprecated by upstream."; # added 2026-02-03 basewood-av = throw "'basewood-av' has been removed due to being archived upstream and unused"; # added 2025-11-26 bash_kernel = throw "'bash_kernel' has been renamed to/replaced by 'bash-kernel'"; # Converted to throw 2025-10-29 beancount_docverif = throw "'beancount_docverif' has been renamed to/replaced by 'beancount-docverif'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d74fd3a72014..4d9ac01c44af 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1806,10 +1806,6 @@ self: super: with self; { base64io = callPackage ../development/python-modules/base64io { }; - basedmypy = callPackage ../development/python-modules/basedmypy { }; - - basedtyping = callPackage ../development/python-modules/basedtyping { }; - baseline = callPackage ../development/python-modules/baseline { }; baselines = callPackage ../development/python-modules/baselines { }; @@ -3616,6 +3612,8 @@ self: super: with self; { datashaper = callPackage ../development/python-modules/datashaper { }; + datasketch = callPackage ../development/python-modules/datasketch { }; + datauri = callPackage ../development/python-modules/datauri { }; datefinder = callPackage ../development/python-modules/datefinder { }; @@ -13161,6 +13159,8 @@ self: super: with self; { pybloom-live = callPackage ../development/python-modules/pybloom-live { }; + pybloomfilter3 = callPackage ../development/python-modules/pybloomfilter3 { }; + pyblu = callPackage ../development/python-modules/pyblu { }; pybluez = callPackage ../development/python-modules/pybluez { inherit (pkgs) bluez; };