diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 75d20137c8f1..d438be2e70e5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17500,6 +17500,12 @@ { fingerprint = "838A FE0D 55DC 074E 360F 943A 84B6 9CE6 F3F6 B767"; } ]; }; + mcuste = { + email = "github@muratcanuste.com"; + github = "mcuste"; + githubId = 10829864; + name = "Murat Can Üste"; + }; mcwitt = { email = "mcwitt@gmail.com"; github = "mcwitt"; diff --git a/nixos/modules/services/networking/technitium-dns-server.nix b/nixos/modules/services/networking/technitium-dns-server.nix index 143b0c43cfdc..32aa247989aa 100644 --- a/nixos/modules/services/networking/technitium-dns-server.nix +++ b/nixos/modules/services/networking/technitium-dns-server.nix @@ -65,6 +65,7 @@ in DynamicUser = true; StateDirectory = "technitium-dns-server"; + LogsDirectory = "technitium"; Restart = "always"; RestartSec = 10; @@ -102,5 +103,8 @@ in }; }; - meta.maintainers = with lib.maintainers; [ fabianrig ]; + meta.maintainers = with lib.maintainers; [ + fabianrig + awildleon + ]; } diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index a3bc7a312ec7..33f308b23834 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,10 +1,10 @@ { "chromium": { - "version": "150.0.7871.114", + "version": "150.0.7871.124", "chromedriver": { - "version": "150.0.7871.115", - "hash_darwin": "sha256-3QytnwfqPqpYL2TMTMykvT+yAfZqWiRHMbMEK+whe0Q=", - "hash_darwin_aarch64": "sha256-jJ1URVS4led/1rTODm3t8wewJ8oIOzKIrq1utn5JJ3s=" + "version": "150.0.7871.125", + "hash_darwin": "sha256-HJTBS6eRmAsxrn7WW4hCxMCXdzn+1PYz1W0uZHJ38yk=", + "hash_darwin_aarch64": "sha256-VCgkc6MeMPbt0F2ZVTJNn9yJbSYNhy1zr8KzPVaVi0I=" }, "deps": { "depot_tools": { @@ -21,8 +21,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "f405107495a07cb1bfcf687d4af8d91117098db6", - "hash": "sha256-VdDnFbE+/leFzR/PqR3ColKKqwkvuY/LsFje0nrwiXU=", + "rev": "9261fd0a595ac4964ea84e6bd4a025c1173a2ffa", + "hash": "sha256-YKkZfxFZ7mitD6YqJZW+NQByq71UVb0jCFIBXj0SyzU=", "recompress": true }, "src/third_party/clang-format/script": { @@ -92,8 +92,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "8d3c5a8caebd836b99fa32062951a401910eba33", - "hash": "sha256-7X8FSWCA+BpAXbUPvjPyiGagmVXsadRGAY5haAEzRL8=" + "rev": "13e691adf3d4d3ebee2f7239731a07d3b9704956", + "hash": "sha256-fbjREn3D+quRRADGwR7V65BZt5b+1DgnsG4ZMhwGq6o=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -552,8 +552,8 @@ }, "src/third_party/libyuv": { "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "3c5fa6ef272f6077d76816ee3d6a697ef1d6d272", - "hash": "sha256-FXFSC9dRb/KhSQdhJUqKEUpZbzU8ZpVnoSXtF/HPiJI=" + "rev": "8aeb3a9ca36341a640528e59b34b5d641080dca8", + "hash": "sha256-FGl0xK7ooaRFzFBxuV6oOu3h1x2b/myLLO2En3xgVCk=" }, "src/third_party/lss": { "url": "https://chromium.googlesource.com/linux-syscall-support.git", @@ -657,8 +657,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "14d05ec761901b6e9e9193af8b347ab3a7f6fed0", - "hash": "sha256-KZGrztOKaT368KSCxiJAqnsgINpNODUlaXnH/maQNIA=" + "rev": "bee4c917220040e147f14964635ff92ce6c5a3f6", + "hash": "sha256-SWmoX+sNaw4KnlTBPt63uBSYfQavJejB3+Vlw/gtWX8=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -827,8 +827,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "ce0af5c0d181678bcda077c68d4beaec2854ad16", - "hash": "sha256-gjuH2HQAC0poQileS8JLusocBDoShuaQ9pbaAXmFj4g=" + "rev": "209c9cea0db17d8caf23e9d2c7de08c351609744", + "hash": "sha256-3jUyRERu1r+Fl2uSAaRchV2L99XLp8XO9DHctk0lMjY=" }, "src/agents/shared": { "url": "https://chromium.googlesource.com/chromium/agents.git", @@ -838,7 +838,7 @@ } }, "ungoogled-chromium": { - "version": "150.0.7871.114", + "version": "150.0.7871.124", "deps": { "depot_tools": { "rev": "f4fadaf6a5ba1bced9d3d9021060667b563bf583", @@ -850,16 +850,16 @@ "hash": "sha256-/1A+DkzAQj2zGPe/A/G0Z3VrYJXUxq4Hd/+d/o5p3G8=" }, "ungoogled-patches": { - "rev": "150.0.7871.114-1", - "hash": "sha256-qvAtrj013U44vU+U3JLuItAPbgtHwm9Kq7hU2NLYDaE=" + "rev": "150.0.7871.124-1", + "hash": "sha256-3dwDG3YuX/l5bOLcC3lICM2qmGnwVAPPJraDRaHZSe8=" }, "npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "f405107495a07cb1bfcf687d4af8d91117098db6", - "hash": "sha256-VdDnFbE+/leFzR/PqR3ColKKqwkvuY/LsFje0nrwiXU=", + "rev": "9261fd0a595ac4964ea84e6bd4a025c1173a2ffa", + "hash": "sha256-YKkZfxFZ7mitD6YqJZW+NQByq71UVb0jCFIBXj0SyzU=", "recompress": true }, "src/third_party/clang-format/script": { @@ -929,8 +929,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "8d3c5a8caebd836b99fa32062951a401910eba33", - "hash": "sha256-7X8FSWCA+BpAXbUPvjPyiGagmVXsadRGAY5haAEzRL8=" + "rev": "13e691adf3d4d3ebee2f7239731a07d3b9704956", + "hash": "sha256-fbjREn3D+quRRADGwR7V65BZt5b+1DgnsG4ZMhwGq6o=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -1389,8 +1389,8 @@ }, "src/third_party/libyuv": { "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "3c5fa6ef272f6077d76816ee3d6a697ef1d6d272", - "hash": "sha256-FXFSC9dRb/KhSQdhJUqKEUpZbzU8ZpVnoSXtF/HPiJI=" + "rev": "8aeb3a9ca36341a640528e59b34b5d641080dca8", + "hash": "sha256-FGl0xK7ooaRFzFBxuV6oOu3h1x2b/myLLO2En3xgVCk=" }, "src/third_party/lss": { "url": "https://chromium.googlesource.com/linux-syscall-support.git", @@ -1494,8 +1494,8 @@ }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "14d05ec761901b6e9e9193af8b347ab3a7f6fed0", - "hash": "sha256-KZGrztOKaT368KSCxiJAqnsgINpNODUlaXnH/maQNIA=" + "rev": "bee4c917220040e147f14964635ff92ce6c5a3f6", + "hash": "sha256-SWmoX+sNaw4KnlTBPt63uBSYfQavJejB3+Vlw/gtWX8=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -1664,8 +1664,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "ce0af5c0d181678bcda077c68d4beaec2854ad16", - "hash": "sha256-gjuH2HQAC0poQileS8JLusocBDoShuaQ9pbaAXmFj4g=" + "rev": "209c9cea0db17d8caf23e9d2c7de08c351609744", + "hash": "sha256-3jUyRERu1r+Fl2uSAaRchV2L99XLp8XO9DHctk0lMjY=" }, "src/agents/shared": { "url": "https://chromium.googlesource.com/chromium/agents.git", diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index d5fe7bb3f3c5..528010186535 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -25,7 +25,6 @@ gst-libav, gst-plugins-good, libnice, - enableE2E ? true, enableSecrets ? true, libsecret, enableRST ? true, @@ -41,16 +40,16 @@ extraPythonPackages ? ps: [ ], }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "gajim"; - version = "2.4.6"; + version = "2.4.7.1"; src = fetchFromGitLab { domain = "dev.gajim.org"; owner = "gajim"; repo = "gajim"; - tag = version; - hash = "sha256-QHfJ52uMDlE/rqqy7y2JIQLMOPaTp7eh4DEsPLBx6p8="; + tag = "${finalAttrs.version}+win"; + hash = "sha256-/X2Xp1ZnPLTZc1Hf4Kp6R/+mezU6qoUhaT9OskYlnOY="; }; pyproject = true; @@ -115,12 +114,9 @@ python3.pkgs.buildPythonApplication rec { httpx h2 truststore + pysequoia ] ++ httpx.optional-dependencies.socks - ++ lib.optionals enableE2E [ - pycrypto - python-gnupg - ] ++ lib.optional enableRST docutils ++ extraPythonPackages python3.pkgs; @@ -145,14 +141,17 @@ python3.pkgs.buildPythonApplication rec { meta = { homepage = "http://gajim.org/"; description = "Jabber client written in PyGTK"; + changelog = "https://dev.gajim.org/gajim/gajim/-/blob/${finalAttrs.src.tag}/ChangeLog"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ raskin hlad vbgl ]; + donationPage = "https://liberapay.com/Gajim"; downloadPage = "http://gajim.org/download/"; platforms = lib.platforms.linux; mainProgram = "gajim"; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gajim" finalAttrs.version; }; -} +}) diff --git a/pkgs/by-name/bo/bobby/package.nix b/pkgs/by-name/bo/bobby/package.nix new file mode 100644 index 000000000000..5b61c8e5ffb9 --- /dev/null +++ b/pkgs/by-name/bo/bobby/package.nix @@ -0,0 +1,84 @@ +{ + cargo, + desktop-file-utils, + fetchFromGitHub, + glib, + gtk4, + lib, + libadwaita, + meson, + ninja, + nix-update-script, + pkg-config, + rustc, + rustPlatform, + sqlite, + stdenv, + wrapGAppsHook4, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "bobby"; + version = "50.0.2"; + + src = fetchFromGitHub { + owner = "hbons"; + repo = "bobby"; + tag = "v${finalAttrs.version}"; + hash = "sha256-/N7CmzPwUdGkHIZujCGW3LvsGM6DdXrcm2kH6XlVGDA="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-TT3ceAy44sfyKZ7wmH3C4nj5TyfiJlu4vBWAaGs+pGg="; + }; + + buildInputs = [ + glib + gtk4 + libadwaita + sqlite + ]; + + # favor sqlite from nixpkgs instead of a vendored variant in rusqlite + postPatch = '' + substituteInPlace Cargo.toml \ + --replace-fail ', features = ["bundled"]' "" + ''; + + nativeBuildInputs = [ + cargo + desktop-file-utils # for `update-desktop-database` + gtk4 # for `gtk-update-icon-cache` + meson + ninja + pkg-config + rustc + rustPlatform.cargoSetupHook + wrapGAppsHook4 # fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system + ]; + + mesonCheckFlags = [ + "--print-errorlogs" + ]; + + doCheck = true; + + passthru.updateScript = nix-update-script { }; + + __structuredAttrs = true; + strictDeps = true; + + meta = { + changelog = "https://github.com/hbons/Bobby/blob/${finalAttrs.src.tag}/data/studio.planetpeanut.Bobby.metainfo.xml"; + description = "Browse SQLite files"; + donationPage = "https://planetpeanut.studio/sponsors"; + homepage = "https://apps.gnome.org/Bobby/"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + aiyion + ]; + teams = [ lib.teams.gnome-circle ]; + mainProgram = "bobby"; + }; +}) diff --git a/pkgs/by-name/bo/bookstack/package.nix b/pkgs/by-name/bo/bookstack/package.nix index e039d2c5f30d..dc23a741a899 100644 --- a/pkgs/by-name/bo/bookstack/package.nix +++ b/pkgs/by-name/bo/bookstack/package.nix @@ -8,16 +8,16 @@ php83.buildComposerProject2 (finalAttrs: { pname = "bookstack"; - version = "26.05.1"; + version = "26.05.2"; src = fetchFromGitHub { owner = "bookstackapp"; repo = "bookstack"; tag = "v${finalAttrs.version}"; - hash = "sha256-g68wTZ5jRwXEKvAF9nLfKfWGf1FDD15msSkXzzJkVDQ="; + hash = "sha256-AYOl84DY13A5HnyUVY97kelYgoTJyq8nzeaHoksWXtI="; }; - vendorHash = "sha256-YJwJp+OtrCDgGFsZAjdlSx0LoxQFbylqCNW90MF8Kzo="; + vendorHash = "sha256-m98QXFqvdomVEVs2P8gnoKaYEBNYe/CchSvBEc448ko="; passthru = { phpPackage = php83; diff --git a/pkgs/by-name/dd/ddev/package.nix b/pkgs/by-name/dd/ddev/package.nix index 36ffba5f1a09..9afe4d5c8d6f 100644 --- a/pkgs/by-name/dd/ddev/package.nix +++ b/pkgs/by-name/dd/ddev/package.nix @@ -20,13 +20,13 @@ let in buildGoModule (finalAttrs: { pname = "ddev"; - version = "1.25.2"; + version = "1.25.3"; src = fetchFromGitHub { owner = "ddev"; repo = "ddev"; rev = "v${finalAttrs.version}"; - hash = "sha256-JcZTKGjYTvrUT6IAKfVJsJj3e4Q60uiIdK3Y9GzeIVw="; + hash = "sha256-IsFay9UqvRdllLzyQLg3YUPFlg6MugYVWRXxUpBV9n0="; }; postPatch = '' diff --git a/pkgs/by-name/dg/dgraph/package.nix b/pkgs/by-name/dg/dgraph/package.nix index 530c08230f09..b2f4a1100b9c 100644 --- a/pkgs/by-name/dg/dgraph/package.nix +++ b/pkgs/by-name/dg/dgraph/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "dgraph"; - version = "25.3.3"; + version = "25.3.8"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "dgraph"; tag = "v${finalAttrs.version}"; - hash = "sha256-Zkx9dWEWRhUj/hwcgDyH3ikbcvjVHJnALNERunXytag="; + hash = "sha256-RrOlJVkekZ3xWGtjc013YyCycJmlPowVzqrttnZD8BI="; }; - vendorHash = "sha256-I+eLpWdS4Dc3XPbeJ8jlSc/ZIw6yveovcIXnfihke3s="; + vendorHash = "sha256-gD91KGWLqd6a7YkqQSeW1eS2MQI+1/RbI5X1/Xwrz90="; doCheck = false; diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index 1ca0250cacc6..344d7db401f6 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -30,13 +30,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "element-desktop"; - version = "1.12.22"; + version = "1.12.23"; src = fetchFromGitHub { owner = "element-hq"; repo = "element-web"; tag = "v${finalAttrs.version}"; - hash = "sha256-TtC4KUnaKy/gmh5CbkPTWKCFjdeKvt8esFt3awdkA/g="; + hash = "sha256-IdQZqwGk05APb38hEoin74/5FeRgjCLrdli+R6iaoUA="; }; pnpmDeps = fetchPnpmDeps { @@ -46,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: { src ; inherit pnpm; - fetcherVersion = 3; - hash = "sha256-Cxc2/NpOpkXavDvBgaU6Douud7AO06jt1KjuaLnZh8M="; + fetcherVersion = 4; + hash = "sha256-WVQaq7kqlEdKodOkErUCeYLh0xnH1NTHzgNyjn1+1y0="; }; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; diff --git a/pkgs/by-name/el/element-web-unwrapped/package.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix index 3cb26541f8c4..45dd152435f0 100644 --- a/pkgs/by-name/el/element-web-unwrapped/package.nix +++ b/pkgs/by-name/el/element-web-unwrapped/package.nix @@ -25,21 +25,21 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "element-web"; - version = "1.12.22"; + version = "1.12.23"; src = fetchFromGitHub { owner = "element-hq"; repo = "element-web"; tag = "v${finalAttrs.version}"; - hash = "sha256-TtC4KUnaKy/gmh5CbkPTWKCFjdeKvt8esFt3awdkA/g="; + hash = "sha256-IdQZqwGk05APb38hEoin74/5FeRgjCLrdli+R6iaoUA="; }; pnpmDeps = fetchPnpmDeps { pname = "element"; inherit (finalAttrs) version src; inherit pnpm; - fetcherVersion = 3; - hash = "sha256-Cxc2/NpOpkXavDvBgaU6Douud7AO06jt1KjuaLnZh8M="; + fetcherVersion = 4; + hash = "sha256-WVQaq7kqlEdKodOkErUCeYLh0xnH1NTHzgNyjn1+1y0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index 13ac763dd27b..d6435e15ccd7 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -18,16 +18,7 @@ let packageOverrides = self: super: { esphome-dashboard = self.callPackage ./dashboard.nix { }; - paho-mqtt = super.paho-mqtt.overridePythonAttrs (oldAttrs: rec { - version = "1.6.1"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - tag = "v${version}"; - hash = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg="; - }; - build-system = with self; [ setuptools ]; - doCheck = false; - }); + paho-mqtt = self.paho-mqtt_1; }; }; in diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix index b079226da18d..53fc9eea0f50 100644 --- a/pkgs/by-name/ew/eww/package.nix +++ b/pkgs/by-name/ew/eww/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "eww"; - version = "0.6.0-unstable-2026-03-05"; + version = "0.6.0-unstable-2026-07-05"; src = fetchFromGitHub { owner = "elkowar"; repo = "eww"; - rev = "865cf631d5bbb5f9fccc99b3f4cc80b9eeada18c"; - hash = "sha256-fL12XFMsf/efSlbzQc7cCI366CwETkM6sWpEfcF9s6A="; + rev = "4ded06345553e4c2bcf8179fc7438e53c5e54d89"; + hash = "sha256-fnI8XgBowMxs/j9FGf+pQI2U8YjN8pTRqkVmFm8PBHE="; }; cargoHash = "sha256-Kf99eojqXvdbZ3eRS8GBgyLYNpZKJGIJtsOsvhhSVDk="; diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix index d9afbec8e06e..6b6bd3e8eaf4 100644 --- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix +++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix @@ -16,13 +16,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefly-iii-data-importer"; - version = "2.3.2"; + version = "2.3.4"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "data-importer"; tag = "v${finalAttrs.version}"; - hash = "sha256-JLN13SCpMXByu3rWSclcsLBGCLFMzHGHOM+bWLJ2MPw="; + hash = "sha256-869oPalwVdc7Ge8zcG6OniTZ6zhLOknlvFQkEHzLg0M="; }; buildInputs = [ php ]; @@ -42,12 +42,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-QobjMMPEhLvsTwlJJvf4nUi1PcZEDOaU8EzexluOI90="; + vendorHash = "sha256-GEioAwqo9BHzoP4/uetqiQgv+O9Qzqyo/AcW9VP23n0="; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-NkxCvC0EPMLi7GV5GG1+5niL3KIaqBsleo11/gzaX/s="; + hash = "sha256-FEEC89/7cEuKU4mY27Pm5nr5EkOoL7BWZRAOpCZK61I="; }; composerRepository = php.mkComposerRepository { diff --git a/pkgs/by-name/fi/firezone-gui-client/package.nix b/pkgs/by-name/fi/firezone-gui-client/package.nix index 4a5530b6878a..bbc69b367a77 100644 --- a/pkgs/by-name/fi/firezone-gui-client/package.nix +++ b/pkgs/by-name/fi/firezone-gui-client/package.nix @@ -19,7 +19,7 @@ libayatana-appindicator, webkitgtk_4_1, wrapGAppsHook3, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, nodejs, @@ -27,12 +27,12 @@ copyDesktopItems, }: let - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "firezone"; repo = "firezone"; tag = "gui-client-${version}"; - hash = "sha256-KozSy44Opx6cukA0QTXeMpI3fP49iyabFzPLIJckOZ4="; + hash = "sha256-Ew6oLVL7u9RtidHNsz29lzH9WPxKNneEoVACuLdP7yo="; }; frontend = stdenvNoCC.mkDerivation rec { @@ -41,10 +41,10 @@ let pnpmDeps = fetchPnpmDeps { inherit pname version; - pnpm = pnpm_9; + pnpm = pnpm_10; src = "${src}/rust/gui-client"; - fetcherVersion = 3; - hash = "sha256-akanXiWehhQRx6WHN75PjYvFxFiSsJ5dJaguJBTM9J0="; + fetcherVersion = 4; + hash = "sha256-770+06rpf/P9hOFLgEWc0/BKjIxHyCWB2E3tqdEskAA="; }; pnpmRoot = "rust/gui-client"; @@ -52,7 +52,7 @@ let nativeBuildInputs = [ pnpmConfigHook - pnpm_9 + pnpm_10 nodejs ]; @@ -79,7 +79,7 @@ rustPlatform.buildRustPackage rec { pname = "firezone-gui-client"; inherit version src; - cargoHash = "sha256-TDP1Z4MeQaSER8MGnCEQfIhRsakaSCeJ7boUMBYkkI0="; + cargoHash = "sha256-LHHaklGIMuDuZwikXiQzLPbmkUbPyYR04UBQTBxq2ps="; sourceRoot = "${src.name}/rust"; buildAndTestSubdir = "gui-client"; env.RUSTFLAGS = "--cfg system_certs"; diff --git a/pkgs/by-name/fl/flytectl/package.nix b/pkgs/by-name/fl/flytectl/package.nix new file mode 100644 index 000000000000..4a284a00ad29 --- /dev/null +++ b/pkgs/by-name/fl/flytectl/package.nix @@ -0,0 +1,65 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + stdenv, + testers, + flytectl, +}: +buildGoModule (finalAttrs: { + pname = "flytectl"; + version = "0.9.8"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "flyteorg"; + repo = "flyte"; + tag = "flytectl/v${finalAttrs.version}"; + hash = "sha256-p6fU+BLvhwK+4zDNBy4jwtvIll+s4jXmpYIF1mfeoB4="; + }; + + vendorHash = "sha256-h4L8BFzRiph4SBffVRH9TU5j7k+CZGshOV160mENAL0="; + + sourceRoot = "${finalAttrs.src.name}/flytectl"; + + subPackages = [ "." ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/flyteorg/flyte/flytestdlib/version.Version=v${finalAttrs.version}" + "-X github.com/flyteorg/flyte/flytestdlib/version.Build=${finalAttrs.src.tag}" + "-X github.com/flyteorg/flyte/flytestdlib/version.BuildTime=1970-01-01" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + # Tests require network and file system access + doCheck = false; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd flytectl \ + --bash <($out/bin/flytectl completion bash) \ + --fish <($out/bin/flytectl completion fish) \ + --zsh <($out/bin/flytectl completion zsh) + ''; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "flytectl version"; + version = "v${finalAttrs.version}"; + }; + + meta = { + description = "Command-line interface for Flyte, a cloud-native workflow orchestration platform"; + downloadPage = "https://github.com/flyteorg/flyte"; + homepage = "https://flyte.org/"; + changelog = "https://github.com/flyteorg/flyte/releases/tag/flytectl%2Fv${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.mcuste ]; + mainProgram = "flytectl"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index 29c9b2a22a96..474e72baff85 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "15.0.4"; - hash = "sha256-8AMq5CT4q7aaF5gj9d5+JINp5rrI5U98juI9BA0wVVo="; + version = "15.0.5"; + hash = "sha256-S+x/YEfQrYIzHLnZ7LDLnkMYVN3TajwS7SHydM8uMPQ="; npmDepsHash = "sha256-BZSYjEsjUqMYWu3EUP+K35hqSOniv8Y6ek5bEC2vTPg="; vendorHash = "sha256-00QiJ8W76FdG96fmsIRLkaYlMQTZoIRmRd/qYGyPuig="; lts = true; diff --git a/pkgs/by-name/go/gotenberg/package.nix b/pkgs/by-name/go/gotenberg/package.nix index 18c8991f7cf8..1f1ebbe5b267 100644 --- a/pkgs/by-name/go/gotenberg/package.nix +++ b/pkgs/by-name/go/gotenberg/package.nix @@ -24,7 +24,7 @@ let in buildGo126Module (finalAttrs: { pname = "gotenberg"; - version = "8.32.0"; + version = "8.34.0"; outputs = [ "out" @@ -35,10 +35,10 @@ buildGo126Module (finalAttrs: { owner = "gotenberg"; repo = "gotenberg"; tag = "v${finalAttrs.version}"; - hash = "sha256-o29kpKVAlKu6ER7b6ni9DMN3kGzEUnoqvHETXBNhJVs="; + hash = "sha256-HFRymNfhQOBzXBWZhiujr8sn4m/hpfjcBGg/3/C67DU="; }; - vendorHash = "sha256-kHNjWq53uCVOP3JGc57MK2FKjtlqZpJz7Za+wTb/F1U="; + vendorHash = "sha256-njyxP+1S1ebaF9xJ1kBL9HrTWMTdEhu8MwUF6FYKHvs="; postPatch = '' find ./pkg -name '*_test.go' -exec sed -i -e 's#/tests#${finalAttrs.src}#g' {} \; diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix index 921923d1c323..bd7675168fe5 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.6.4"; + version = "26.7.0"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip"; - hash = "sha256-rb3Wdzc3g8jMvUffOfMfJ4Uw9HJomznXzLtPOrHoWU8="; + hash = "sha256-QfPCgwUZYwiCWZgL8DVlVAYE3AoZnDHn99j+f/oo0Hs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/librewolf-unwrapped/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json index ee4e908f7de4..bcc4927bcbc6 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/src.json +++ b/pkgs/by-name/li/librewolf-unwrapped/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "152.0.5-1", + "packageVersion": "152.0.6-1", "source": { - "rev": "152.0.5-1", - "hash": "sha256-5f/JkPWOUlfxND9JrPJv9j7UZvfndxi5vLPWZNJwHzk=" + "rev": "152.0.6-1", + "hash": "sha256-O5s1t/ZZVYL/9ik4zyi/kKAQEbSERO6vD1NJzEUmnU4=" }, "firefox": { - "version": "152.0.5", - "hash": "sha512-bPLcfyimo0MPKGbfTKNQY8ut8jTIKjT6ZR4C2QnldB5QzZhv7xvZfUhrUSRMtjmysQNRRog0e/f5T9FtJkzE8g==" + "version": "152.0.6", + "hash": "sha512-xNh3g31wB/thHDjUnZtt07xMXJypALVOci4UDOfs0JJPabXO3H+MH+YC5+/h1xWbAZ3ieZnikjXNYxghuxPmsA==" } } diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index ce1ae9e3c291..1a6b09e464b2 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -177,9 +177,6 @@ effectiveStdenv.mkDerivation (finalAttrs: { # upstream plans on adding targets at the cmakelevel, remove those # additional steps after that postInstall = '' - # Match previous binary name for this package - ln -sf $out/bin/llama-cli $out/bin/llama - mkdir -p $out/include cp $src/include/llama.h $out/include/ diff --git a/pkgs/by-name/ma/mate-power-manager/package.nix b/pkgs/by-name/ma/mate-power-manager/package.nix index 9f67b36f661b..a46e9e41daee 100644 --- a/pkgs/by-name/ma/mate-power-manager/package.nix +++ b/pkgs/by-name/ma/mate-power-manager/package.nix @@ -56,7 +56,16 @@ stdenv.mkDerivation (finalAttrs: { mate-panel ]; - configureFlags = [ "--enable-applets" ]; + configureFlags = [ + "--enable-applets" + "--sbindir=$(out)/bin" + ]; + + postPatch = '' + # Fixes polkit popup after `nixos-rebuild switch`. + substituteInPlace src/gpm-brightness.c \ + --replace-fail 'SBINDIR "/mate-power-backlight-helper' '"/run/current-system/sw/bin/mate-power-backlight-helper' + ''; enableParallelBuilding = true; diff --git a/pkgs/by-name/ra/radarr/deps.json b/pkgs/by-name/ra/radarr/deps.json index 85245045429c..993445ebd52e 100644 --- a/pkgs/by-name/ra/radarr/deps.json +++ b/pkgs/by-name/ra/radarr/deps.json @@ -808,9 +808,9 @@ }, { "pname": "Servarr.FFprobe", - "version": "5.1.4.112", - "hash": "sha256-OdPIvZcrGj0XaqFJQCnrPt0zgPPvB5nd7WpYFF9Bnh0=", - "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/783c2dce-dbc3-4218-8816-4a5e12af4d84/nuget/v3/flat2/servarr.ffprobe/5.1.4.112/servarr.ffprobe.5.1.4.112.nupkg" + "version": "5.1.10.124", + "hash": "sha256-7/xXsQNQGIAF+KtVln2x5QnLs0L1zyDmusyJESOsNP8=", + "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/783c2dce-dbc3-4218-8816-4a5e12af4d84/nuget/v3/flat2/servarr.ffprobe/5.1.10.124/servarr.ffprobe.5.1.10.124.nupkg" }, { "pname": "SharpZipLib", diff --git a/pkgs/by-name/ra/radarr/package.nix b/pkgs/by-name/ra/radarr/package.nix index 15c4af170792..571bd6e1abe2 100644 --- a/pkgs/by-name/ra/radarr/package.nix +++ b/pkgs/by-name/ra/radarr/package.nix @@ -21,7 +21,7 @@ applyPatches, }: let - version = "6.2.1.10461"; + version = "6.3.0.10514"; # The dotnet8 compatibility patches also change `yarn.lock`, so we must pass # the already patched lockfile to `fetchYarnDeps`. src = applyPatches { @@ -29,7 +29,7 @@ let owner = "Radarr"; repo = "Radarr"; tag = "v${version}"; - hash = "sha256-gDEMahF0uhwlOisD0gWzY3M17mXftKBm9gN5Uaatqsk="; + hash = "sha256-1CAcsqhdAH2dOcOMVyIlaqEmCKDwXNUJf3SuVuJEZ7E="; }; postPatch = '' mv src/NuGet.config NuGet.Config diff --git a/pkgs/by-name/ra/rage/package.nix b/pkgs/by-name/ra/rage/package.nix index 4dd1e7472c63..d8bcaf5cd37a 100644 --- a/pkgs/by-name/ra/rage/package.nix +++ b/pkgs/by-name/ra/rage/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rage"; - version = "0.11.2"; + version = "0.11.4"; src = fetchFromGitHub { owner = "str4d"; repo = "rage"; rev = "v${finalAttrs.version}"; - hash = "sha256-uBRXdDdfKTlw006LfCrIvbng7b/fhJDHrmHDLLxdmAU="; + hash = "sha256-ZfP/vVp/Cl6oelZvxz7B9vNYvXtPH92lnqq3pseHLYo="; }; - cargoHash = "sha256-b5x6ESGsF0Mn5dNVagBSopuawbrNcJuMK1//Ns+xuJs="; + cargoHash = "sha256-dMzybfNJYrN8aa+Q5RRDRE9f0hKRs+ZmQ7B2YRUtZ/s="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ru/rura/package.nix b/pkgs/by-name/ru/rura/package.nix new file mode 100644 index 000000000000..793aef7442a1 --- /dev/null +++ b/pkgs/by-name/ru/rura/package.nix @@ -0,0 +1,38 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, + testers, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "rura"; + version = "1.3.0"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "tlipinski"; + repo = "rura"; + tag = "v${finalAttrs.version}"; + hash = "sha256-cwL3Dw1qPYcKFzy0CV/XI7jZWHZZoZumdbB2kK+9jdc="; + }; + + cargoHash = "sha256-T/7v1WxTfsilw5i592EoRWxpkaL4bnluXmCModO1WQg="; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + }; + + meta = { + description = "Interactive TUI scratchpad for building shell pipelines"; + homepage = "https://github.com/tlipinski/rura"; + changelog = "https://github.com/tlipinski/rura/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ frantathefranta ]; + mainProgram = "rura"; + }; +}) diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs index 6dd05161628f..2d582a7d479c 100644 --- a/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs +++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/main.rs @@ -2381,7 +2381,7 @@ won't take effect until you reboot the system. match logind.list_users() { Err(err) => { eprintln!("Unable to list users with logind: {err}"); - die(); + exit_code = 4; } Ok(users) => { for (uid, name, user_dbus_path) in users { diff --git a/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json b/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json index 55abcf33388d..ca48dcf1154e 100644 --- a/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json +++ b/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json @@ -19,4 +19,4 @@ "version": "6.0.0", "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=" } -] \ No newline at end of file +] diff --git a/pkgs/by-name/te/technitium-dns-server-library/package.nix b/pkgs/by-name/te/technitium-dns-server-library/package.nix index 1a7f086d303c..c5db4bfb27f8 100644 --- a/pkgs/by-name/te/technitium-dns-server-library/package.nix +++ b/pkgs/by-name/te/technitium-dns-server-library/package.nix @@ -7,13 +7,13 @@ }: buildDotnetModule rec { pname = "technitium-dns-server-library"; - version = "15.2.0"; + version = "15.3.0"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "TechnitiumLibrary"; tag = "dns-server-v${version}"; - hash = "sha256-PC8j7JT4JiisGGfHORke63boLC4W1gLoaQQ3jPz5Qtc="; + hash = "sha256-BQWDzMEiChY8uX1wUUZNWFDomGqUyDrZ6+UEncC5G5U="; name = "${pname}-${version}"; }; diff --git a/pkgs/by-name/te/technitium-dns-server/dnssec-do-bit-fix.patch b/pkgs/by-name/te/technitium-dns-server/dnssec-do-bit-fix.patch deleted file mode 100644 index aaafec50add1..000000000000 --- a/pkgs/by-name/te/technitium-dns-server/dnssec-do-bit-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/DnsServerCore/Dns/ZoneManagers/AuthZoneManager.cs b/DnsServerCore/Dns/ZoneManagers/AuthZoneManager.cs -index 352ea6c0..41a9a1c7 100644 ---- a/DnsServerCore/Dns/ZoneManagers/AuthZoneManager.cs -+++ b/DnsServerCore/Dns/ZoneManagers/AuthZoneManager.cs -@@ -3536,7 +3536,7 @@ namespace DnsServerCore.Dns.ZoneManagers - } - } - -- return new DnsDatagram(request.Identifier, true, DnsOpcode.StandardQuery, true, false, request.RecursionDesired, isRecursionAllowed, false, false, rCode, request.Question, answer, authority, additional, udpPayloadSize: _dnsServer.UdpPayloadSize, options: eDnsOptions); -+ return new DnsDatagram(request.Identifier, true, DnsOpcode.StandardQuery, true, false, request.RecursionDesired, isRecursionAllowed, false, false, rCode, request.Question, answer, authority, additional, _dnsServer.UdpPayloadSize, request.DnssecOk ? EDnsHeaderFlags.DNSSEC_OK : EDnsHeaderFlags.None, eDnsOptions); - } - } - diff --git a/pkgs/by-name/te/technitium-dns-server/nuget-deps.json b/pkgs/by-name/te/technitium-dns-server/nuget-deps.json index 3c5b4c6e4f0a..dfb73aa03e2b 100644 --- a/pkgs/by-name/te/technitium-dns-server/nuget-deps.json +++ b/pkgs/by-name/te/technitium-dns-server/nuget-deps.json @@ -6,8 +6,8 @@ }, { "pname": "Microsoft.AspNetCore.Authentication.OpenIdConnect", - "version": "10.0.7", - "hash": "sha256-hr1QgB9miQO2rXj5heibTX/fa3Tj/Nci8G/pDcrq11c=" + "version": "10.0.9", + "hash": "sha256-+fRq6oetJlK32C2R/nRBThcO+S6HTX6AIcfg12keAxU=" }, { "pname": "Microsoft.IdentityModel.Abstractions", @@ -59,4 +59,4 @@ "version": "8.0.1", "hash": "sha256-hW4f9zWs0afxPbcMqCA/FAGvBZbBFSkugIOurswomHg=" } -] \ No newline at end of file +] diff --git a/pkgs/by-name/te/technitium-dns-server/package.nix b/pkgs/by-name/te/technitium-dns-server/package.nix index f143be229523..6ddd88f61f89 100644 --- a/pkgs/by-name/te/technitium-dns-server/package.nix +++ b/pkgs/by-name/te/technitium-dns-server/package.nix @@ -10,13 +10,13 @@ }: buildDotnetModule rec { pname = "technitium-dns-server"; - version = "15.2.0"; + version = "15.3.0"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "DnsServer"; tag = "v${version}"; - hash = "sha256-464jhswTOJnQnxetl9hH5U3aDP0RXzJTicot9nWzpAo="; + hash = "sha256-nopmnQpozvN0p/SyUCH3Yej/oAhDvNdfJssUA1JyGsk="; name = "${pname}-${version}"; }; @@ -41,12 +41,6 @@ buildDotnetModule rec { libmsquic ]; - # Confirmed correct by upstream, remove when fixed in a release: - # https://github.com/TechnitiumSoftware/DnsServer/issues/1967 - patches = [ - ./dnssec-do-bit-fix.patch - ]; - passthru.tests = { inherit (nixosTests) technitium-dns-server; }; diff --git a/pkgs/by-name/un/undocker/package.nix b/pkgs/by-name/un/undocker/package.nix index 133a969d21c8..f89745d4410a 100644 --- a/pkgs/by-name/un/undocker/package.nix +++ b/pkgs/by-name/un/undocker/package.nix @@ -1,18 +1,15 @@ { lib, buildGoModule, - fetchFromGitea, + fetchgit, gnumake, }: let version = "1.2.3"; - hash = "sha256-hyP85pYtXxucAliilUt9Y2qnrfPeSjeGsYEFJndJWyA="; - src = fetchFromGitea { - domain = "git.jakstys.lt"; - owner = "motiejus"; - repo = "undocker"; + src = fetchgit { + url = "https://git.jakstys.lt/motiejus/undocker.git"; rev = "v${version}"; - hash = hash; + hash = "sha256-hyP85pYtXxucAliilUt9Y2qnrfPeSjeGsYEFJndJWyA="; }; in buildGoModule { @@ -21,7 +18,7 @@ buildGoModule { nativeBuildInputs = [ gnumake ]; - buildPhase = "make VSN=v${version} VSNHASH=${hash} undocker"; + buildPhase = "make VSN=v${version} VSNHASH=${src.rev} undocker"; installPhase = "install -D undocker $out/bin/undocker"; diff --git a/pkgs/by-name/vc/vcv-rack/fix-segfault-on-linux.patch b/pkgs/by-name/vc/vcv-rack/fix-segfault-on-linux.patch new file mode 100644 index 000000000000..09dbe3b94ff4 --- /dev/null +++ b/pkgs/by-name/vc/vcv-rack/fix-segfault-on-linux.patch @@ -0,0 +1,13 @@ +--- a/src/window/Window.cpp ++++ b/src/window/Window.cpp +@@ -819,6 +819,10 @@ + glfwInitHint(GLFW_COCOA_MENUBAR, GLFW_FALSE); + #endif + ++#if defined ARCH_LIN ++ glfwInitHint(GLFW_PLATFORM, GLFW_PLATFORM_X11); ++#endif ++ + glfwSetErrorCallback(errorCallback); + err = glfwInit(); + if (err != GLFW_TRUE) { diff --git a/pkgs/by-name/vc/vcv-rack/package.nix b/pkgs/by-name/vc/vcv-rack/package.nix index d7dcbe4c22ca..3d0b35ea1b16 100644 --- a/pkgs/by-name/vc/vcv-rack/package.nix +++ b/pkgs/by-name/vc/vcv-rack/package.nix @@ -31,6 +31,7 @@ stdenv, wrapGAppsHook3, zstd, + versionCheckHook, }: let @@ -169,11 +170,9 @@ stdenv.mkDerivation (finalAttrs: { ./rack-minimize-vendoring.patch ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - (fetchpatch { - name = "fix-segfault-on-linux.patch"; - url = "https://github.com/VCVRack/Rack/pull/1944.patch"; - hash = "sha256-dlndyCfCznGDzlWNWrQTgh+FtmsrrL2DVuRE0xCxUck="; - }) + # https://github.com/VCVRack/Rack/pull/1944 + # https://github.com/VCVRack/Rack/commit/9f0eb9a0da8e9d6f1729f823555fdac2135214f0 + ./fix-segfault-on-linux.patch ]; prePatch = '' @@ -208,6 +207,10 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail \ "LightButton>" \ "struct rack::componentlibrary::LightButton>" + + # Set RACK_VERSION to avoid git describe, which fails in the Nix build sandbox. + substituteInPlace Makefile \ + --replace-fail 'RACK_VERSION ?= $' 'RACK_VERSION ?= ${finalAttrs.version}#$' '' + lib.optionalString stdenv.hostPlatform.isLinux '' # Fix reference to zenity @@ -218,7 +221,6 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail '__yield();' 'asm volatile("yield");' '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - # * Set VERSION from finalAttrs to avoid build using git to determine version # * Darwin needs to build the dist target, which builds the .app container, # yet we want to exclude the documentation from dist target. # * Skip stripping the binary to avoid "unsupported load command" error, which @@ -226,7 +228,6 @@ stdenv.mkDerivation (finalAttrs: { # * Replace path to Fundamental module with path to produced build artifact # to avoid downloading a pre-compiled version substituteInPlace Makefile \ - --replace-fail 'VERSION ?= $' 'VERSION ?= ${finalAttrs.version}#$' \ --replace-fail 'DIST_HTML :=' '#DIST_HTML :=' \ --replace-fail '$(STRIP)' '#$(STRIP)' \ --replace-fail 'FUNDAMENTAL_FILENAME := Fundamental' 'FUNDAMENTAL_FILENAME := plugins/Fundamental/dist/Fundamental' @@ -306,7 +307,7 @@ stdenv.mkDerivation (finalAttrs: { install -D -m755 -t $out/lib libRack.so mkdir -p $out/share/vcv-rack - cp -r res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt $out/share/vcv-rack + cp -r res translations cacert.pem Core.json template.vcv LICENSE-GPLv3.txt $out/share/vcv-rack cp -r plugins/Fundamental/dist/Fundamental-*.vcvplugin $out/share/vcv-rack/Fundamental.vcvplugin # Extract pngs from the Apple icon image and create @@ -348,6 +349,9 @@ stdenv.mkDerivation (finalAttrs: { --add-flags "-s $out/Applications/'VCV Rack ${lib.versions.major finalAttrs.version} Free.app'/Contents/Resources" ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + meta = { description = "Open-source virtual modular synthesizer"; homepage = "https://vcvrack.com/"; diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix index 45746fc8744e..c183555b6bff 100644 --- a/pkgs/by-name/vi/vicinae/package.nix +++ b/pkgs/by-name/vi/vicinae/package.nix @@ -21,13 +21,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vicinae"; - version = "0.22.3"; + version = "0.23.1"; src = fetchFromGitHub { owner = "vicinaehq"; repo = "vicinae"; tag = "v${finalAttrs.version}"; - hash = "sha256-1c6rl+PMI61l3H2a8Ks1qbFGW2psHs0FamJd/Vzq6NY="; + hash = "sha256-qFDb6I9w9F/KfRVHmwezykv7y/Tb8BjJQD2v5AxlEfU="; }; apiDeps = fetchNpmDeps { diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix index 0f1bbf22d5f6..5d0aa4dcef05 100644 --- a/pkgs/by-name/vi/vikunja/package.nix +++ b/pkgs/by-name/vi/vikunja/package.nix @@ -47,6 +47,11 @@ let pnpm_10 ]; + postPatch = '' + substituteInPlace src/version.json \ + --replace-fail '"dev"' '"${finalAttrs.version}"' + ''; + doCheck = true; postBuild = '' diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix index f1a058129fb1..e56f5a9bfe32 100644 --- a/pkgs/by-name/we/wealthfolio/package.nix +++ b/pkgs/by-name/we/wealthfolio/package.nix @@ -9,7 +9,7 @@ nodejs, openssl, pkg-config, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, rustPlatform, @@ -19,20 +19,20 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "wealthfolio"; - version = "3.4.0"; + version = "3.5.2"; src = fetchFromGitHub { owner = "afadil"; repo = "wealthfolio"; rev = "v${finalAttrs.version}"; - hash = "sha256-SYI0LosdR82rUubxl0pNi1huEDcR6bxcaHbjCVT/T/0="; + hash = "sha256-WU87VmnbzUno1CmIVwBLYjmTZybM4qSuRmBH/2n/Tfo="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) src pname version; - pnpm = pnpm_9; - fetcherVersion = 3; - hash = "sha256-LXPQpQFXwPEHxktLoRiWTi8NbtzrS5ItUmoKJki3zcs"; + pnpm = pnpm_10; + fetcherVersion = 4; + hash = "sha256-EDnHlaW3Ad32N8wl38ryo6pYvKU2T1OH6IkOuTLI7Vs="; }; cargoRoot = "."; @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { src cargoRoot ; - hash = "sha256-cCaZ5X57WAaO9F2lP2/wdilXc0Al0Vr3ntyV1/Q5sj8="; + hash = "sha256-KoS2EouZ0Uf3cijUUOpwYBYEjEB5VxIArU1CuCji2+I="; }; nativeBuildInputs = [ @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { nodejs pkg-config pnpmConfigHook - pnpm_9 + pnpm_10 rustPlatform.cargoSetupHook wrapGAppsHook3 ]; diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix index dc157a42d4ff..6f6171c1834b 100644 --- a/pkgs/by-name/wi/wivrn/package.nix +++ b/pkgs/by-name/wi/wivrn/package.nix @@ -56,13 +56,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "wivrn"; - version = "26.6.1"; + version = "26.6.2"; src = fetchFromGitHub { owner = "wivrn"; repo = "wivrn"; rev = "v${finalAttrs.version}"; - hash = "sha256-eXU7hYLYchAb6AbCyINfTmOp0NdxK35Kg9tcid2ucg4="; + hash = "sha256-5e0XeP5DCdVrSQeDgNuCZP5McRbwybnpKuJw9cxHNPI="; }; monado = applyPatches { diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index e042326ba5ff..eab3b229eda7 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -85,7 +85,7 @@ in # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang. clangStdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.52.4"; + version = "2.52.5"; name = "webkitgtk-${finalAttrs.version}+abi=${abiVersion}"; outputs = [ @@ -100,19 +100,10 @@ clangStdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-z0B2ocoqZHiO3KjEUtjrto1eKWXliP5Go4igFlE+3OQ="; + hash = "sha256-ilMamr0iFZNuioqRTAd7WGwCKLMdZS8gUoao7JDzNks="; }; - patches = [ - # Fix build with system malloc - # See: https://bugs.webkit.org/show_bug.cgi?id=316083 - (fetchpatch { - url = "https://github.com/WebKit/WebKit/commit/a6bc685a685c8f16c919dc6310a62a26971d396e.patch"; - hash = "sha256-X3E9SYykYomoBeAL4vS1Iuw2fPdO8fI7MvAW/kEhTMc="; - name = "fix-build-with-system-malloc.patch"; - }) - ] - ++ lib.optionals clangStdenv.hostPlatform.isLinux [ + patches = lib.optionals clangStdenv.hostPlatform.isLinux [ (replaceVars ./fix-bubblewrap-paths.patch { inherit (builtins) storeDir; inherit (addDriverRunpath) driverLink; diff --git a/pkgs/development/python-modules/paho-mqtt/1.nix b/pkgs/development/python-modules/paho-mqtt/1.nix new file mode 100644 index 000000000000..6932b26dff79 --- /dev/null +++ b/pkgs/development/python-modules/paho-mqtt/1.nix @@ -0,0 +1,62 @@ +{ + buildPythonPackage, + esphome, + fetchFromGitHub, + lib, + pytestCheckHook, + setuptools, +}: + +let + testing = fetchFromGitHub { + owner = "eclipse"; + repo = "paho.mqtt.testing"; + rev = "a4dc694010217b291ee78ee13a6d1db812f9babd"; + hash = "sha256-SQoNdkWMjnasPjpXQF2yV97MUra8gb27pc3rNoA8Rjw="; + }; +in +buildPythonPackage (finalAttrs: { + pname = "paho-mqtt"; + version = "1.6.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "eclipse"; + repo = "paho.mqtt.python"; + tag = "v${finalAttrs.version}"; + hash = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "paho.mqtt" ]; + + doCheck = false; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + ln -s ${testing} paho.mqtt.testing + + # paho.mqtt not in top-level dir to get caught by this + export PYTHONPATH=".:$PYTHONPATH" + ''; + + disabledTests = [ + # Fails during teardown + # RuntimeError: Client 01-zero-length-clientid.py exited with code None, expected 0 + "test_01_zero_length_clientid" + ]; + + __darwinAllowLocalNetworking = true; + + meta = { + changelog = "https://github.com/eclipse/paho.mqtt.python/blob/${finalAttrs.src.tag}/ChangeLog.txt"; + description = "MQTT version 5.0/3.1.1 client class"; + homepage = "https://eclipse.org/paho"; + license = lib.licenses.epl20; + inherit (esphome.meta) maintainers; + }; +}) diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix index ac25b8275f16..b0ea0015bb42 100644 --- a/pkgs/development/python-modules/paho-mqtt/default.nix +++ b/pkgs/development/python-modules/paho-mqtt/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchFromGitHub, hatchling, + openssl, pytestCheckHook, }: @@ -27,11 +28,17 @@ buildPythonPackage rec { hash = "sha256-VMq+WTW+njK34QUUTE6fR2j2OmHxVzR0wrC92zYb1rY="; }; + postPatch = '' + substituteInPlace tests/ssl/gen.sh \ + --replace-fail "c_rehash certs" "#c_rehash certs" + ''; + build-system = [ hatchling ]; nativeCheckInputs = [ + openssl pytestCheckHook ]; @@ -44,6 +51,10 @@ buildPythonPackage rec { # paho.mqtt not in top-level dir to get caught by this export PYTHONPATH=".:$PYTHONPATH" + + pushd tests/ssl + HOME="$(mktemp -d)" ./gen.sh + popd ''; disabledTests = [ diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 147503fe1c30..6cbfffe22095 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -12,13 +12,13 @@ let # override options if they need using lib.mkForce (that has 50 priority) mkKernelOverride = lib.mkOverride 90; - suffix = "zen1"; + suffix = "zen2"; in buildLinux ( args // rec { - version = "7.1.2"; + version = "7.1.3"; pname = "linux-zen"; modDirVersion = lib.versions.pad 3 "${version}-${suffix}"; isZen = true; @@ -27,7 +27,7 @@ buildLinux ( owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "0d02lgwl0x415xrbznsldd7j1krpzlnbd2ciis3shz8zhmbhfg1f"; + sha256 = "0af939wq8gfgwrb4s3jjbkqh2pn3zkgk1w48m0hf5fc0qi8ify8x"; }; # This is based on the following source: diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e2846976d6c4..dfc6aad91108 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7723,10 +7723,10 @@ with self; CryptOpenSSLX509 = buildPerlPackage { pname = "Crypt-OpenSSL-X509"; - version = "1.915"; + version = "2.1.3"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JO/JONASBN/Crypt-OpenSSL-X509-1.915.tar.gz"; - hash = "sha256-xNvBbE/CloV4I3v8MkWH/9eSSacQFQJlLbnjjUSJUX8="; + url = "mirror://cpan/authors/id/J/JO/JONASBN/Crypt-OpenSSL-X509-2.1.3.tar.gz"; + hash = "sha256-CtllF1dGroRrBRCwOKofltLduMhg/pfOpvvcegVfn54="; }; env.NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; env.NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7d5837504aa1..df0fd218e28e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12188,6 +12188,8 @@ self: super: with self; { paho-mqtt = callPackage ../development/python-modules/paho-mqtt/default.nix { }; + paho-mqtt_1 = callPackage ../development/python-modules/paho-mqtt/1.nix { }; + paintcompiler = callPackage ../development/python-modules/paintcompiler { }; palace = callPackage ../development/python-modules/palace { };