diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index be77793c7964..1e93b6a0d41e 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -6,6 +6,7 @@ }: { + config, fetchurl, stdenv, lib, @@ -22,7 +23,6 @@ writeShellScript, common-updater-scripts, curl, - openssl_1_1, openssl_3_5, bzip2, sqlite, @@ -33,7 +33,6 @@ let packageAttribute = "sublime4${lib.optionalString dev "-dev"}"; binaries = [ "sublime_text" - "plugin_host-3.3" "plugin_host-3.${if lib.versionAtLeast buildVersion "4205" then "14" else "8"}" crashHandlerBinary ]; @@ -55,7 +54,6 @@ let libxtst glib libglvnd - openssl_1_1 gtk3 cairo pango @@ -88,6 +86,10 @@ let buildPhase = '' runHook preBuild + # Remove old plugin host because it depends on EOL openssl 1.1 + rm plugin_host-3.3 + echo '{"disable_plugin_host_3.3": true}' > Packages/Preferences.sublime-settings + for binary in ${builtins.concatStringsSep " " binaries}; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ @@ -221,11 +223,20 @@ stdenv.mkDerivation (finalAttrs: { demin-dmitriy zimbatm ]; + mainProgram = "subl"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "aarch64-linux" "x86_64-linux" ]; + # FIXME: gated behind allowAliases to workaround https://github.com/NixOS/nixpkgs/issues/523712 + problems = + lib.optionalAttrs config.allowAliases { + removal.message = "We have removed Python 3.3 package support ahead of upstream schedule but if you do not use any old packages, this should just work."; + } + // lib.optionalAttrs (lib.versionOlder buildVersion "4205") { + broken.message = "Packages, including core ones, do not run without plug-in host depending on insecure OpenSSL."; + }; }; }) diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index 808b49421289..01037d6d0d17 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-tCasNLg/Tu3uP69Mve9Kcqam1+JQkA/XyCMPy6aNPJM="; + hash = "sha256-TEEv8R6VXuOhcX2OgTKY7A8L2akisJLsx6I6bUdV3a0="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-o+y3Oz/lZd9gEQL3q+ivzkWchQ/dJ5QuU9fJwRpEYrE="; + hash = "sha256-wis4QqTuCiRAVpoGp+Ds83lWPsNUUPmXbZcYiWuY2zg="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-vovdNDX0m55a7sazBCixnun89gb/dknzUbeMSU5q8KU="; + hash = "sha256-2njmUMYxFAaKzCdwM//S5D0fqVZhIKG0JzbT1ye4Sr4="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-JbLeoeAzOUVbmpM1CN5QajsK8QT8KjZRUD4UxR6C7bU="; + hash = "sha256-+cJhcXufpiNrpdL+HH3mW+rrzb7Si/4LGvoce1o0c/w="; }; }; in { name = "claude-code"; publisher = "anthropic"; - version = "2.1.185"; + version = "2.1.186"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 905ac24feb33..e6145f602e5b 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1710,8 +1710,8 @@ let mktplcRef = { name = "dependi"; publisher = "fill-labs"; - version = "0.7.22"; - hash = "sha256-XY0fbWHGZ3Gs7wRZdtq005l2/Ucvs/EmemLjMgRma7I="; + version = "0.7.25"; + hash = "sha256-DvLksbhruNHIav2EOCxajhqJC7sYsveUnCyPVLABj0Y="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/fill-labs.dependi/changelog"; @@ -2346,8 +2346,8 @@ let mktplcRef = { name = "vscode-vibrancy-continued"; publisher = "illixion"; - version = "1.1.79"; - hash = "sha256-Yja0W+wIizOOyF9um8t1V7g0DMdv9fVlR4uJCE/pbjk="; + version = "1.1.82"; + hash = "sha256-xSSvWi/7Glx+V9I9CjHNFXpoR2PuJgT7ln4fxpJv8fE="; }; meta = { downloadPage = "https://marketplace.visualstudio.com/items?itemName=illixion.vscode-vibrancy-continued"; diff --git a/pkgs/applications/emulators/libretro/cores/snes9x2010.nix b/pkgs/applications/emulators/libretro/cores/snes9x2010.nix index 09ff8759c46b..5ff0ec0c70e8 100644 --- a/pkgs/applications/emulators/libretro/cores/snes9x2010.nix +++ b/pkgs/applications/emulators/libretro/cores/snes9x2010.nix @@ -5,13 +5,13 @@ }: mkLibretroCore rec { core = "snes9x2010"; - version = "0-unstable-2026-06-10"; + version = "0-unstable-2026-06-15"; src = fetchFromGitHub { owner = "libretro"; repo = "snes9x2010"; - rev = "780e4259f096797931a3030d08ffaeec62f2a593"; - hash = "sha256-l7+WCiY7Pf0/5GzsmHT/C67uNF8JEzblDlr7oKiYcgA="; + rev = "2f6beca3ada61bdb4dabf7afe8cb9293a699224a"; + hash = "sha256-iM1xR4g3Bhv2XTj+CNA/KY3grjacrPfjpf/jfJkwYbs="; }; makeFlags = [ "GIT_VERSION=${builtins.substring 0 7 src.rev}" ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 10c8f7e39e53..73d22db7e07d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -580,11 +580,11 @@ "vendorHash": "sha256-sPQR+LDZRMXygLUd9xj6/bI+8DhAPKbkytlTzmrEOBU=" }, "hashicorp_google": { - "hash": "sha256-xAzkBYqQR1VdERjt9zJFyItTj8dpfywHO8xex0biXPQ=", + "hash": "sha256-/O0K2qf1kk8kfRl/FQ3eNAs96Z7Te4yg6boVHdYtLJo=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v7.36.0", + "rev": "v7.37.0", "spdx": "MPL-2.0", "vendorHash": "sha256-Ub+Dvddw5jcSy2hR72OSsy4EgHphhCW1kekPyrQGc9E=" }, @@ -1040,13 +1040,13 @@ "vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI=" }, "opentelekomcloud_opentelekomcloud": { - "hash": "sha256-gWzDgZdZJJ2kHIXIw12+1YaCUkcO+0Biu0dY2F88FJQ=", + "hash": "sha256-HrqJQso8wWF7+WiQUNtR522lCpz5pYZIq2Q3RZkakU0=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.68", + "rev": "v1.36.69", "spdx": "MPL-2.0", - "vendorHash": "sha256-ECuzdph5/lKBqIoXUwpIulyl6KYFxJLzdKn/G9UZJpk=" + "vendorHash": "sha256-4Kndye/lGV0IjSyaOpJsj6pP0Hznf20LFQvEwY3+ajE=" }, "opsgenie_opsgenie": { "hash": "sha256-Y67kcg/ovvZc22l1CBz0Mqu7DAIit5F0jQNfQrl2EGI=", diff --git a/pkgs/by-name/ac/acr/package.nix b/pkgs/by-name/ac/acr/package.nix index b792eab73932..c36a415c2442 100644 --- a/pkgs/by-name/ac/acr/package.nix +++ b/pkgs/by-name/ac/acr/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "acr"; - version = "2.2.6"; + version = "2.2.8"; src = fetchFromGitHub { owner = "radareorg"; repo = "acr"; rev = finalAttrs.version; - hash = "sha256-fV4aBc/PZD1Grtq/KugTuzYAu/nsOntgDwsnFuAvHMc="; + hash = "sha256-uhjvtwDHXClYNqQVu7ATekWe6Xcy7DvNChlOf0au6T8="; }; preConfigure = '' diff --git a/pkgs/by-name/al/algia/package.nix b/pkgs/by-name/al/algia/package.nix index dce0559cd5ab..6c0264b62da1 100644 --- a/pkgs/by-name/al/algia/package.nix +++ b/pkgs/by-name/al/algia/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "algia"; - version = "0.0.122"; + version = "0.0.125"; src = fetchFromGitHub { owner = "mattn"; repo = "algia"; tag = "v${finalAttrs.version}"; - hash = "sha256-G6FEmLmZRUYVpj1ipNtMNi166GKUapIl/hAkPyvFLN0="; + hash = "sha256-MPCCu34bJoj0QctG4Xe6B1BIUyLaTQ7N8IG15jMZCTE="; }; - vendorHash = "sha256-JTTWVs0KwceiLy6tpyd48zORiXLc18zwgG1c+ceivKU="; + vendorHash = "sha256-mim8EImPFHF2vf1vCi9jgECbVAOB32oXxsPMgUwYDBA="; meta = { description = "CLI application for nostr"; diff --git a/pkgs/by-name/au/ausweisapp/package.nix b/pkgs/by-name/au/ausweisapp/package.nix index 1392c62ec91e..b2c982e2e148 100644 --- a/pkgs/by-name/au/ausweisapp/package.nix +++ b/pkgs/by-name/au/ausweisapp/package.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ausweisapp"; - version = "2.5.1"; + version = "2.5.3"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = finalAttrs.version; - hash = "sha256-R+2swDzIHlgE0kVonoYQih8r8p38RN7bqkbb+WB1hCc="; + hash = "sha256-pr41KbejZCOvfXH2uHO5MA/VklSNU38EL6AgznvGqeY="; }; postPatch = '' diff --git a/pkgs/by-name/ba/babeld/package.nix b/pkgs/by-name/ba/babeld/package.nix index 63592e1ddb78..63e0d2061451 100644 --- a/pkgs/by-name/ba/babeld/package.nix +++ b/pkgs/by-name/ba/babeld/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "babeld"; - version = "1.13.1"; + version = "1.14"; src = fetchurl { url = "https://www.irif.fr/~jch/software/files/babeld-${finalAttrs.version}.tar.gz"; - hash = "sha256-FfJNJtoMz8Bzq83vAwnygeRoTyqnESb4JlcsTIRejdk="; + hash = "sha256-xO0TwEiAzMOoWplkXctkE0vqyKsGB/4ypNB+EFetc7c="; }; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 14f7d8b96727..f3b4d3c12d59 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -21,13 +21,13 @@ buildNpmPackage rec { pname = "bruno"; - version = "3.4.2"; + version = "3.5.0"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; tag = "v${version}"; - hash = "sha256-eDLHXOKhQBdRWZ9QGAVk4nky8vywYFAjUXCskFTunUo="; + hash = "sha256-Vdd/z3xYuU8axfEfuDOKPTfV0xiZXJ15G5z16VoGYLQ="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json @@ -36,7 +36,7 @@ buildNpmPackage rec { nodejs = nodejs_22; - npmDepsHash = "sha256-+wr86nNT9cT7Qy0gUfkFq0xFQaaWCrDTc1tg7A80pk4="; + npmDepsHash = "sha256-4VsSXiHj/INCu4ryZ+JxPbfDpsgIb5eYvOUYz+gbKEE="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix index ecde76a9503e..f0f813ab2995 100644 --- a/pkgs/by-name/cl/clash-rs/package.nix +++ b/pkgs/by-name/cl/clash-rs/package.nix @@ -13,13 +13,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "clash-rs"; - version = "0.10.6"; + version = "0.10.7"; src = fetchFromGitHub { owner = "Watfaq"; repo = "clash-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-ncMJxVNHAgeXWhqZgWt3nth4BXqrrBaAEWmOVF/KsPg="; + hash = "sha256-tY/GB6J8kr6Ni9ScOpKkDYLaLffvtaIxH8tXK24LHt8="; }; patches = [ @@ -27,13 +27,13 @@ rustPlatform.buildRustPackage (finalAttrs: { ./skip-npm-ci.patch ]; - cargoHash = "sha256-WI+wg6cu0cBFrZYyN3GXlfHOmo/cVo2uMLn1D5YTOCQ="; + cargoHash = "sha256-SlkqNu6Vk1D9aU4GgyNDW9Or3z8KSbEjwCUK9w3Jyx0="; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/clash-dashboard"; - hash = "sha256-8fDeO7Yx+m2s0mzTO7MkQOQ0UYs8B2vFnNevHHZFghc="; + hash = "sha256-H8G3GuEh4JXZV1zxTfo89tl6D6WA5hWGOF9i8qP0njw="; }; npmRoot = "clash-dashboard"; diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json index 6397e5bddff9..a9a23a745d73 100644 --- a/pkgs/by-name/cl/claude-code/manifest.json +++ b/pkgs/by-name/cl/claude-code/manifest.json @@ -1,47 +1,47 @@ { - "version": "2.1.185", - "commit": "9d0bb50cc439a8bbfdbf96567a55bd0e353e9333", - "buildDate": "2026-06-20T06:46:16Z", + "version": "2.1.186", + "commit": "6a56aff51d9e9faf62f26f2748501c2e32eec5e8", + "buildDate": "2026-06-22T16:51:01Z", "platforms": { "darwin-arm64": { "binary": "claude", - "checksum": "a280c23b210525218f5bd86f001c9dbc89b9e07410175c5a9355044bfadc0af1", - "size": 215952608 + "checksum": "463a79cc34a9787cff1b3361b4ec9e2dff928c18b077f41f0bb412e4cda78637", + "size": 216811232 }, "darwin-x64": { "binary": "claude", - "checksum": "ade7a13c3027f754b4cdac80bcdd6ba470f7becb27cdcf8b6ba9a70cf9e77af7", - "size": 223491328 + "checksum": "9e17e23d451cbbc64cf4b9536c1d25efd86808512617c855091fa608f77c9899", + "size": 224349952 }, "linux-arm64": { "binary": "claude", - "checksum": "db880812272504455df73160d92fadf9370eda684c219cebf8e62b0a262cb2f8", - "size": 230930144 + "checksum": "817e5ff483568b78c49171be317b9b9190cade77248a5776e912789312961cb6", + "size": 231782112 }, "linux-x64": { "binary": "claude", - "checksum": "e1246338699f04ee0e627dee3f6d4ed7a0bab48e0514bde69c6dad43bc303952", - "size": 233584424 + "checksum": "6a6d5d23486597c93138941c9b68caa0fbcd2dcedbf49e29a9c8d83e3a1cb329", + "size": 234436392 }, "linux-arm64-musl": { "binary": "claude", - "checksum": "eada6422a437a112d1928cb9e80203180b58b3d0c0c6aee1edb6f041fda39415", - "size": 224309448 + "checksum": "24906d06ab4cf312eb30a8d656a8d8c7fb22099ea8eb974e38ecfbc25d6631aa", + "size": 225161416 }, "linux-x64-musl": { "binary": "claude", - "checksum": "5f12eea1e3fd35bfa3f75db0647189bdfe64f45ab0d69e76a427d38ce684dd38", - "size": 228568464 + "checksum": "d0cb255cfb03513f6099af40f045b5852a1d8a1b59d0f405d84d2a01da6c9598", + "size": 229420432 }, "win32-x64": { "binary": "claude.exe", - "checksum": "0206cfb94a323d91e0ff51edf63c9e4d9951c8e48dbdee627fefa6f6a0b56643", - "size": 225108640 + "checksum": "6a286f0795d6dd46187b86e9124f819af35319169901cd883b80a75c47469516", + "size": 225908896 }, "win32-arm64": { "binary": "claude.exe", - "checksum": "b42889d60c89cb0a65dd4d047ad4396304f01368693f968d1827c08474eccc59", - "size": 219771552 + "checksum": "245869d5e5242aabfde49b091628aa4b3e7546f2cac52e1d6feb221a820910bc", + "size": 220571808 } } } diff --git a/pkgs/by-name/de/decker/package.nix b/pkgs/by-name/de/decker/package.nix index eea90322726f..e625a37afee9 100644 --- a/pkgs/by-name/de/decker/package.nix +++ b/pkgs/by-name/de/decker/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "decker"; - version = "1.66"; + version = "1.67"; src = fetchFromGitHub { owner = "JohnEarnest"; repo = "Decker"; rev = "v${finalAttrs.version}"; - hash = "sha256-GKhIm9TC0l1u4dblnemqM72uXY9ah4QWCJiyv1bu14I="; + hash = "sha256-g9gAMWp00rGWEWBdOfpCJWKCAQyy8eoWTvtwQnVUT7s="; }; buildInputs = [ diff --git a/pkgs/by-name/ev/everspace/package.nix b/pkgs/by-name/ev/everspace/package.nix deleted file mode 100644 index d8c8b86efb3a..000000000000 --- a/pkgs/by-name/ev/everspace/package.nix +++ /dev/null @@ -1,140 +0,0 @@ -{ - # Packaging Dependencies - lib, - stdenv, - requireFile, - autoPatchelfHook, - unzip, - copyDesktopItems, - makeDesktopItem, - - # Everspace Dependencies - cairo, - gdk-pixbuf, - pango, - gtk2-x11, - libGL, - openal, - - # Unreal Engine 4 Dependencies - libxxf86vm, - libxscrnsaver, - libxrender, - libxrandr, - libxi, - libxfixes, - libxext, - libxcursor, - libxau, - libx11, - libxcb, -}: - -# Known issues: -# - Video playback (upon starting a new game) does not work (screen is black) -stdenv.mkDerivation rec { - pname = "everspace"; - version = "1.3.5.3655"; - - src = requireFile { - name = "everspace_1_3_5_3655_32896.sh"; - url = "https://www.gog.com/"; - sha256 = "0jlvxq14k1pxmbr08y8kar0ijlqxcnkfqlvw883j96v9zr34ynj3"; - }; - - nativeBuildInputs = [ - autoPatchelfHook - copyDesktopItems - unzip - ]; - - buildInputs = [ - cairo - gdk-pixbuf - pango - gtk2-x11 - openal - (lib.getLib stdenv.cc.cc) - ]; - - runtimeDependencies = [ - libGL - - # ue4 - libx11 - libxscrnsaver - libxau - libxcursor - libxext - libxfixes - libxi - libxrandr - libxrender - libxxf86vm - libxcb - ]; - - unpackPhase = '' - runHook preUnpack - - # The shell script contains a zip file. Unzipping it works but will result - # in some error output and an error exit code. - unzip "$src" || true - - runHook postUnpack - ''; - - postPatch = '' - ## Remove Bundled Libs ## - - # vlc libs - # - # TODO: This is probably what breaks video playback. It would be cleaner - # to remove the bundled libs and replace them with system libs but there - # are so many. Copy-pasting the list from the vlc package is a good start - # but still leaves us with many unresolved dependencies. - rm -rf ./data/noarch/game/RSG/Plugins/VlcMedia - - # openal - rm -rf ./data/noarch/game/Engine/Binaries/ThirdParty/OpenAL - ''; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/opt" - cp -r "./data/noarch" "$out/opt/everspace" - - mkdir -p "$out/bin" - ln -s "$out/opt/everspace/game/RSG/Binaries/Linux/RSG-Linux-Shipping" "$out/bin/everspace" - - mkdir -p "$out/share/pixmaps" - ln -s "$out/opt/everspace/support/icon.png" "$out/share/pixmaps/everspace-gog.png" - - runHook postInstall - ''; - - desktopItems = [ - (makeDesktopItem { - type = "Application"; - name = "everspace-gog"; - desktopName = "EVERSPACE™"; - comment = meta.description; - exec = "everspace"; - icon = "everspace-gog"; - categories = [ "Game" ]; - }) - ]; - - meta = { - description = "Action-focused single-player space shooter with roguelike elements"; - homepage = "https://classic.everspace-game.com/"; - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ jtrees ]; - platforms = [ "x86_64-linux" ]; - sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/fe/featherpad/package.nix b/pkgs/by-name/fe/featherpad/package.nix index 58b30ae6fde4..aaa315bd7265 100644 --- a/pkgs/by-name/fe/featherpad/package.nix +++ b/pkgs/by-name/fe/featherpad/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "featherpad"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; tag = "V${finalAttrs.version}"; - hash = "sha256-h/Opw4PmIEZdIx+gXoXriA0h1YxyImiZJFFPr1KUo/A="; + hash = "sha256-BPZkVmOxVJ8VoQ9+0Ca63pDIOfdwsaO24AEq0jkYCY0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fl/flux9s/package.nix b/pkgs/by-name/fl/flux9s/package.nix index 7ef314704e29..921d9db9075c 100644 --- a/pkgs/by-name/fl/flux9s/package.nix +++ b/pkgs/by-name/fl/flux9s/package.nix @@ -9,14 +9,14 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "flux9s"; - version = "0.9.0"; + version = "0.10.2"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-cto3Fu2UW8+Pq6OK5miw+cAwzqiotTGWPD0Yyckh1/M="; + hash = "sha256-a+kGFxhqeo8Na5T4IZkyhFyPqT6FvOLP3oiuJUuJIOY="; }; - cargoHash = "sha256-uOa/qWBtTQf7jJWJhFJBmYWQ5mU/3P/YuACbnVbHdJc="; + cargoHash = "sha256-M2UCpSwKVFGXACcYkxJ8TzRHYgTLqt29RBMMdRvHZv8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index c3d2e420c035..c4251bf2aecb 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { pname = "flyctl"; - version = "0.4.59"; + version = "0.4.60"; src = fetchFromGitHub { owner = "superfly"; @@ -22,7 +22,7 @@ buildGoModule rec { cd "$out" git rev-parse HEAD > COMMIT ''; - hash = "sha256-UDwVwfx/FTLszEK/vTv0P07TBBPsNR+e+jAGxqNwSDk="; + hash = "sha256-ToKKn3Scj++VLv0SCMNQHkbffs2aADto0tLv80aFqzc="; }; proxyVendor = true; diff --git a/pkgs/by-name/fn/fn-cli/package.nix b/pkgs/by-name/fn/fn-cli/package.nix index ce0bbfd105f2..70c410d93ba3 100644 --- a/pkgs/by-name/fn/fn-cli/package.nix +++ b/pkgs/by-name/fn/fn-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "fn"; - version = "0.6.60"; + version = "0.6.61"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = finalAttrs.version; - hash = "sha256-DsDUVumixQh5R3wVYGU5cfcIICnbLWMQMbZRz3xSnk0="; + hash = "sha256-uw4fH3PyuAnNEhrvw0dl2jJxP4jau3tVuAjzSgeu1Lw="; }; vendorHash = null; diff --git a/pkgs/by-name/fu/fuc/package.nix b/pkgs/by-name/fu/fuc/package.nix index e06fb465092b..26a3a512761c 100644 --- a/pkgs/by-name/fu/fuc/package.nix +++ b/pkgs/by-name/fu/fuc/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "fuc"; - version = "3.1.1"; + version = "3.1.7"; src = fetchFromGitHub { owner = "SUPERCILEX"; repo = "fuc"; tag = finalAttrs.version; - hash = "sha256-fDSAqsKEx+th4tiJ3VlROqF4hhHzusqiw9enAmnOPlQ="; + hash = "sha256-LtS2+iqu4+z6K/PZeggLdo4S/F+5AtV5j9Q6hDAcEiQ="; }; - cargoHash = "sha256-OoTWGeF96BpPDx1Y9AEVOIBK7kCz6pjw24pLiNcKmOc="; + cargoHash = "sha256-SSJg/Ns64+NgqrB4mJ5/xa40tZfGZ2VGdvNP7SSKv0E="; env.RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/by-name/ge/geesefs/package.nix b/pkgs/by-name/ge/geesefs/package.nix index 1affc960cde0..be5ea1e7a896 100644 --- a/pkgs/by-name/ge/geesefs/package.nix +++ b/pkgs/by-name/ge/geesefs/package.nix @@ -5,7 +5,7 @@ }: let - version = "0.43.7"; + version = "0.43.8"; in buildGoModule { pname = "geesefs"; @@ -15,7 +15,7 @@ buildGoModule { owner = "yandex-cloud"; repo = "geesefs"; rev = "v${version}"; - hash = "sha256-D9ZFjsmM4x1TVHRGcu6uredWjhwEsNjTr+kwQDmpyGE="; + hash = "sha256-NDe3GnB0xVly6Elfpa60+Wx3RyWhfPfssf1l7Tt20zY="; }; # hashes differ per architecture otherwise. diff --git a/pkgs/by-name/gh/ghciwatch/package.nix b/pkgs/by-name/gh/ghciwatch/package.nix index f1edb436b638..f52ac38d9122 100644 --- a/pkgs/by-name/gh/ghciwatch/package.nix +++ b/pkgs/by-name/gh/ghciwatch/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ghciwatch"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "MercuryTechnologies"; repo = "ghciwatch"; rev = "v${finalAttrs.version}"; - hash = "sha256-ho6j9/MKvLNbgWqGNTCHLacyka6Nf8qchjG4YnsK7wA="; + hash = "sha256-x+8cA3wO8LOB1/bMKZlKTkuts1IobEsAhRIJQWwrpjs="; }; - cargoHash = "sha256-BUtUcqYYYiA3ulrCXlA6stcONxTvilKEDO+Vq3Pvok8="; + cargoHash = "sha256-ysB1BJbMJ8KSCGSQzs9AnOA4SnnRcukC5R/vU45pbRM="; # integration tests are not run but the macros need this variable to be set env.GHC_VERSIONS = ""; diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix index 82f09a7d0c1c..3cab6eaa7ee1 100644 --- a/pkgs/by-name/gi/github-mcp-server/package.nix +++ b/pkgs/by-name/gi/github-mcp-server/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "github-mcp-server"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "github"; repo = "github-mcp-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-FVKnslJhjFoxyEWFQE7kXpS5bZ43WxpSflH9/e2XmV4="; + hash = "sha256-5INN7B/F1KcyZwZ3xeOBiCnfAdK1PXVnMZf3t8JIk6I="; }; vendorHash = "sha256-J1hC4hdEKLENXLJrsyV41TaJ9+2CuPz5KoIMm2mXvTE="; diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 4bc1561e336c..b9a1210b604f 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -179,11 +179,11 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "149.0.7827.155"; + version = "149.0.7827.196"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-g0PHfyCIpOQ2bw3+Tmiu+jt+eTJs0so71+tjxhHwZVY="; + hash = "sha256-B4XIuL7q/kGRd/w2vPmfkvsvFtvHevhL5IfC5u14IuY="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -289,11 +289,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "149.0.7827.156"; + version = "149.0.7827.197"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/acfqxa67egsofsrqnco2a4sd4pta_149.0.7827.156/GoogleChrome-149.0.7827.156.dmg"; - hash = "sha256-fd7IqNxvaMO28Yhlc4gk8M+P7Sq+ZrplRXbnrxPDcvw="; + url = "http://dl.google.com/release2/chrome/fs52wiq74uymls47lfo23m5l2q_149.0.7827.197/GoogleChrome-149.0.7827.197.dmg"; + hash = "sha256-kXN4dPtx0MkTKO3VJnoyTqT8uS4JDXJ16DmojZ3zT+o="; }; dontPatch = true; diff --git a/pkgs/by-name/gt/gtkradiant/package.nix b/pkgs/by-name/gt/gtkradiant/package.nix deleted file mode 100644 index 41754b8568f8..000000000000 --- a/pkgs/by-name/gt/gtkradiant/package.nix +++ /dev/null @@ -1,286 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchsvn, - scons, - pkg-config, - python3, - glib, - libxml2, - gtk2, - libGLU, - gnome2, - runCommand, - writeScriptBin, - runtimeShell, - makeDesktopItem, - copyDesktopItems, -}: - -let - q3Pack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q3Pack/trunk"; - rev = 144; - sha256 = "sha256-U1GtMv775JEOAJ1W2kSaRNPDCnW39W+KqVDTTG2yISY="; - }; - urtPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/UrTPack/trunk"; - rev = 144; - sha256 = "sha256-DQjENyQa1kEieU3ZWyMt2e4oEN0X2K3lxP79sBI91iI="; - }; - etPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/ETPack/trunk"; - rev = 144; - sha256 = "sha256-mqaWOYfF/F6ABh7nKA36YvsywZIdwJ9IitFi2Xp5rgk="; - }; - qlPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/QLPack/trunk"; - rev = 144; - sha256 = "sha256-lrn4nu3JI7j+t9jYd+UFE55GOCbc6+Sh2fZfVlEr1WM="; - }; - q2Pack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q2Pack/trunk"; - rev = 144; - sha256 = "sha256-ad8dRV+28Zz5yQsJU7hvteSIn9wWpehuqxMspw3yvvU="; - }; - quetooPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/QuetooPack/trunk"; - rev = 144; - sha256 = "sha256-SOblPJgdVEZrTYtvDlcF7paIm3UitSVFQ9+RahXkO64="; - }; - jaPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/JAPack/trunk"; - rev = 144; - sha256 = "sha256-P6lI+nNrPwoWJl5ThUHIA3Iw1nWVo2djaaWHAF5HuDo="; - }; - stvefPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/STVEFPack/trunk"; - rev = 144; - sha256 = "sha256-quNyVC6fg1FIBsLWx0LzRK2JfxKMNJeUEIkWGhGJHhI="; - }; - wolfPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/WolfPack/trunk"; - rev = 144; - sha256 = "sha256-693k6KiIchQddVGBhRJf7ikv6ut5L9rcLt0FTZ7pSvw="; - }; - unvanquishedPack = fetchsvn { - url = "https://github.com/Unvanquished/unvanquished-mapeditor-support.git/trunk/build/gtkradiant/"; - rev = 212; - sha256 = "sha256-weBlnSBezPppbhsMOT66vubioTxpDC+AcKIOC2Xitdo="; - }; - q1Pack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q1Pack/trunk"; - rev = 144; - sha256 = "sha256-JfmDIUoDY7dYdMgwwUMgcwNhWxuxsdkv1taw8DXhPY4="; - }; - darkPlacesPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/DarkPlacesPack/trunk"; - rev = 57; - sha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; - }; - doom3Pack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/Doom3Pack/trunk"; - rev = 56; - sha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; - }; - halfLifePack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/HalfLifePack/trunk"; - rev = 1; - sha256 = "sha256-CrbN3iOG89j71y4ZJ4gNZEA5CYxphLLGbZwv6Tbjui0="; - }; - her2Pack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/Her2Pack/trunk"; - rev = 55; - sha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; - }; - jk2Pack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/JK2Pack/trunk"; - rev = 77; - sha256 = "sha256-3g/p9OC0j2va9CXXtsQf0lP6VJ1WyI5k2W9xNRwYjS8="; - }; - nexuizPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/NexuizPack/trunk"; - rev = 49; - sha256 = "sha256-nAV7rZKDgAxlEmu2RfBFNsHv9Xgas1IlDgioligvY+c="; - }; - preyPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/PreyPack/trunk"; - rev = 19; - sha256 = "sha256-wbKEnSaFO40HxhMsbYKy76MxXDvY9O1lTcr3M7fXxW0="; - }; - q2wPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q2WPack/trunk"; - rev = 126; - sha256 = "sha256-Q6IyL2qUr+6ktP34oYkFqN5MeFxCXOkcjrPg5J95ftg="; - }; - q4Pack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q4Pack/trunk"; - rev = 54; - sha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; - }; - ravenPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/RavenPack/trunk"; - rev = 1; - sha256 = "sha256-bYRjCkdaznaO7+WDB6cgL3szTB+MXwt3IKH3L2rGjLs="; - }; - reactionPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/ReactionPack/trunk"; - rev = 69; - sha256 = "sha256-aXSM0ubyhgamLBzfNZ6RzRSdzKwfHWLt/6OS/i9mMVo="; - }; - sof2Pack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/Sof2Pack/trunk"; - rev = 1; - sha256 = "sha256-EnGhYghXe6hU5vvdF+Z9geTiHDukBEr1+CQgunxxGic="; - }; - tremulousPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/TremulousPack/trunk"; - rev = 46; - sha256 = "sha256-NU+ynpqydFxdZSkh7Szm6DTqyMYVS+PU70Mp98ZjdOs="; - }; - ufoaiPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/UFOAIPack/trunk"; - rev = 69; - sha256 = "sha256-nAd7fFZJJ82rDPVlTiZkkTGXi5tw7BSKk+akFBXSWvY="; - }; - warsowPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/WarsowPack/trunk"; - rev = 53; - sha256 = "sha256-IQ12fEKnq0cJxef+ddvTXcwM8lQ8nlUoMJy81XJ7ANY="; - }; - packs = runCommand "gtkradiant-packs" { } '' - mkdir -p $out - ln -s ${q3Pack} $out/Q3Pack - ln -s ${urtPack} $out/UrTPack - ln -s ${etPack} $out/ETPack - ln -s ${qlPack} $out/QLPack - ln -s ${q2Pack} $out/Q2Pack - ln -s ${quetooPack} $out/QuetooPack - ln -s ${jaPack} $out/JAPack - ln -s ${stvefPack} $out/STVEFPack - ln -s ${wolfPack} $out/WolfPack - ln -s ${unvanquishedPack} $out/UnvanquishedPack - ln -s ${q1Pack} $out/Q1Pack - ln -s ${darkPlacesPack} $out/DarkPlacesPack - ln -s ${doom3Pack} $out/Doom3Pack - ln -s ${halfLifePack} $out/HalfLifePack - ln -s ${her2Pack} $out/Her2Pack - ln -s ${jk2Pack} $out/JK2Pack - ln -s ${nexuizPack} $out/NexuizPack - ln -s ${preyPack} $out/PreyPack - ln -s ${q2wPack} $out/Q2WPack - ln -s ${q4Pack} $out/Q4Pack - ln -s ${ravenPack} $out/RavenPack - ln -s ${reactionPack} $out/ReactionPack - ln -s ${sof2Pack} $out/Sof2Pack - ln -s ${tremulousPack} $out/TermulousPack - ln -s ${ufoaiPack} $out/UFOAIPack - ln -s ${warsowPack} $out/WarsowPack - ''; - -in -stdenv.mkDerivation (finalAttrs: { - pname = "gtkradiant"; - - version = "unstable-2023-04-24"; - - src = fetchFromGitHub { - owner = "TTimo"; - repo = "GtkRadiant"; - rev = "ddbaf03d723a633d53fa442c2f802f7ad164dd6c"; - sha256 = "sha256-qI+KGx73AbM5PLFR2JDXKDbiqmU0gS/43rhjRKm/Gms="; - }; - - nativeBuildInputs = - let - python = python3.withPackages ( - ps: with ps; [ - urllib3 - ] - ); - svn = writeScriptBin "svn" '' - #!${runtimeShell} -e - if [ "$1" = checkout ]; then - # link predownloaded pack to destination - mkdir -p $(dirname $3) - ln -s ${packs}/$(basename $3) $3 - # verify existence - test -e $(readlink $3) - elif [ "$1" = update ]; then - # verify existence - test -e $(readlink $2) - else - echo "$@" - exit 1 - fi - ''; - in - [ - scons - pkg-config - python - svn - copyDesktopItems - ]; - - buildInputs = [ - glib - libxml2 - gtk2 - libGLU - gnome2.gtkglext - ]; - - enableParallelBuilding = true; - - # GCC 14 makes these errors by default - env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration -Wno-error=int-conversion -std=gnu17"; - - desktopItems = [ - (makeDesktopItem { - name = "gtkradiant"; - exec = "gtkradiant"; - desktopName = "GtkRadiant"; - comment = finalAttrs.meta.description; - categories = [ "Development" ]; - icon = "gtkradiant"; - # includes its own splash screen - startupNotify = false; - }) - ]; - - postInstall = '' - mkdir -p $out/{bin,lib} - cp -ar install $out/lib/gtkradiant - for pack in ${packs}/* ; do - name=$(basename "$pack") - if ! [ -e $out/lib/gtkradiant/installs/$name ]; then - ln -s $pack $out/lib/gtkradiant/installs/$name - fi - done - - cat >$out/bin/gtkradiant <. From some reason + # the whole file has to be deleted, otherwise the tests are not disabled. + preCheck = '' + rm tests/masking_tool_test.py + ''; + + pythonImportsCheck = [ + "scippneutron" + ]; + + meta = { + description = "Neutron scattering toolkit built using scipp for Data Reduction. Not facility or instrument specific"; + homepage = "https://scipp.github.io/scippneutron"; + changelog = "https://github.com/scipp/scippneutron/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +}) diff --git a/pkgs/development/python-modules/scippnexus/default.nix b/pkgs/development/python-modules/scippnexus/default.nix new file mode 100644 index 000000000000..449fd04b3490 --- /dev/null +++ b/pkgs/development/python-modules/scippnexus/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + + # dependencies + h5py, + scipp, + scipy, + + # tests + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "scippnexus"; + version = "26.1.1"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "scipp"; + repo = "scippnexus"; + tag = finalAttrs.version; + hash = "sha256-sff/LZFoNOcmoVeQkuHZNGPZS9RMV8QrXIlmJiFJCeI="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + h5py + scipp + scipy + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "scippnexus" + ]; + + meta = { + description = "H5py-like utility for NeXus files with seamless scipp integration"; + homepage = "https://scipp.github.io/scippnexus/"; + changelog = "https://github.com/scipp/scippnexus/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +}) diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index 20d681ec3ce1..9d69ef3eb595 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -9,13 +9,13 @@ buildPythonPackage (finalAttrs: { pname = "tplink-omada-client"; - version = "1.5.7"; + version = "1.5.8"; pyproject = true; src = fetchPypi { pname = "tplink_omada_client"; inherit (finalAttrs) version; - hash = "sha256-sl6E6HJ8hrMW4IHoOZ16bQTPHuc96noY4LsyI5NkO/Y="; + hash = "sha256-JFAx2rDV0ughzilXBLIyPvFia79rL0ZcNFXp9hPJysU="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index 479fd09413a6..3afa6bda55a0 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "uarray"; - version = "0.9.4"; + version = "0.9.5"; pyproject = true; src = fetchFromGitHub { owner = "Quansight-Labs"; repo = "uarray"; tag = version; - hash = "sha256-gCoSpyFPQTIi86y+4xtRb+vsRkjZ2O6KcCj8mj8tcTQ="; + hash = "sha256-Jut/V0/na+dcVpD7buW0DIS+KpA+dGRRb6QpPDt2/hY="; }; preBuild = '' diff --git a/pkgs/development/python-modules/victron-vrm/default.nix b/pkgs/development/python-modules/victron-vrm/default.nix index 597fb0b22cca..737df70ea7b9 100644 --- a/pkgs/development/python-modules/victron-vrm/default.nix +++ b/pkgs/development/python-modules/victron-vrm/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "victron-vrm"; - version = "0.1.11"; + version = "0.1.12"; pyproject = true; src = fetchFromGitHub { owner = "KSoft-Si"; repo = "vrm-client"; tag = "v${version}"; - hash = "sha256-t8YwoQzrcxX24xN2luvJLYaIZSoD3+guYETWeYE4tRw="; + hash = "sha256-In4yL5e6DZkP/8JeM1FhoMuhsqQ6uZE3fFLyfnLzgZQ="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/wavedrom/default.nix b/pkgs/development/python-modules/wavedrom/default.nix index 2a041f5fb4e3..965ea7fcdae1 100644 --- a/pkgs/development/python-modules/wavedrom/default.nix +++ b/pkgs/development/python-modules/wavedrom/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, cairosvg, fetchPypi, + setuptools, pillow, pytestCheckHook, pyyaml, @@ -13,19 +14,24 @@ xmldiff, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wavedrom"; version = "2.0.3.post3"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-MntNXcpZPIElfCAv6lFvepCHR/sRUnw1nwNPW3r39Hs="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ attrdict pyyaml svgwrite @@ -53,4 +59,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ airwoodix ]; }; -} +}) diff --git a/pkgs/development/python-modules/waybackpy/default.nix b/pkgs/development/python-modules/waybackpy/default.nix index bbac0d042879..f95c25cf6976 100644 --- a/pkgs/development/python-modules/waybackpy/default.nix +++ b/pkgs/development/python-modules/waybackpy/default.nix @@ -2,21 +2,26 @@ lib, buildPythonPackage, fetchPypi, + setuptools, click, urllib3, requests, pytest, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "waybackpy"; version = "3.0.6"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-SXo3F1arp2ROt62g69TtsVy4xTvBNMyXO/AjoSyv+D8="; }; + build-system = [ setuptools ]; + dependencies = [ click urllib3 @@ -33,4 +38,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ chpatrick ]; }; -} +}) diff --git a/pkgs/development/python-modules/wcag-contrast-ratio/default.nix b/pkgs/development/python-modules/wcag-contrast-ratio/default.nix index 27deecbf62b7..5a41c559a17b 100644 --- a/pkgs/development/python-modules/wcag-contrast-ratio/default.nix +++ b/pkgs/development/python-modules/wcag-contrast-ratio/default.nix @@ -2,20 +2,25 @@ lib, buildPythonPackage, fetchPypi, + setuptools, hypothesis, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wcag-contrast-ratio"; version = "0.9"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-aRkrjlwKfQ3F/xGH7rPjmBQWM6S95RxpyH9Y/oftNhw="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ hypothesis pytestCheckHook @@ -31,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/web-cache/default.nix b/pkgs/development/python-modules/web-cache/default.nix index 816ee85cab5a..aaa4ec066e94 100644 --- a/pkgs/development/python-modules/web-cache/default.nix +++ b/pkgs/development/python-modules/web-cache/default.nix @@ -2,21 +2,27 @@ lib, buildPythonPackage, fetchPypi, + setuptools, isPy3k, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "web-cache"; version = "1.1.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; + disabled = !isPy3k; src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "web_cache"; - sha256 = "1d8f1s3i0s3h1jqvjq6cp639hhbbpxvyq7cf9dwzrvvvr0s0m8fm"; + hash = "sha256-1aEKNMh77/x5S44d7He/a0GYhrnMYLmxDHBoEIcODrU="; }; + build-system = [ setuptools ]; + # No tests in downloaded archive doCheck = false; @@ -28,4 +34,4 @@ buildPythonPackage rec { license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ moni ]; }; -} +}) diff --git a/pkgs/development/python-modules/wheezy-captcha/default.nix b/pkgs/development/python-modules/wheezy-captcha/default.nix index 13380be1b8d2..0132bd07a011 100644 --- a/pkgs/development/python-modules/wheezy-captcha/default.nix +++ b/pkgs/development/python-modules/wheezy-captcha/default.nix @@ -2,20 +2,25 @@ lib, buildPythonPackage, fetchPypi, + setuptools, pillow, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "wheezy.captcha"; version = "3.2.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-UtTpgrPK5eRr7sq97jptjdJyvAyrM2oU07+GZr2Ad7s="; }; - propagatedBuildInputs = [ pillow ]; + build-system = [ setuptools ]; + + dependencies = [ pillow ]; pythonImportsCheck = [ "wheezy.captcha" ]; @@ -25,4 +30,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ Flakebi ]; }; -} +}) diff --git a/pkgs/development/python-modules/winsspi/default.nix b/pkgs/development/python-modules/winsspi/default.nix index f9e12c9c973a..fdcb27c6c319 100644 --- a/pkgs/development/python-modules/winsspi/default.nix +++ b/pkgs/development/python-modules/winsspi/default.nix @@ -2,20 +2,25 @@ lib, buildPythonPackage, fetchPypi, + setuptools, minikerberos, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "winsspi"; version = "0.0.11"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-AXC6SJ+iWPGqTmdgoWKEbD8tDUUcg2aD609hO2bdQfM="; }; - propagatedBuildInputs = [ minikerberos ]; + build-system = [ setuptools ]; + + dependencies = [ minikerberos ]; # Module doesn't have tests doCheck = false; @@ -28,4 +33,4 @@ buildPythonPackage rec { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/woodblock/default.nix b/pkgs/development/python-modules/woodblock/default.nix index 14e28aff13fb..3046ca43ea2c 100644 --- a/pkgs/development/python-modules/woodblock/default.nix +++ b/pkgs/development/python-modules/woodblock/default.nix @@ -2,21 +2,26 @@ lib, buildPythonPackage, fetchPypi, + setuptools, click, multimethod, numpy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "woodblock"; version = "0.1.7"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; - sha256 = "c0347ece920b7009d94551983a01f42db02920ca8d7b0ff36d24a337e2c937f7"; + inherit (finalAttrs) pname version; + hash = "sha256-wDR+zpILcAnZRVGYOgH0LbApIMqNew/zbSSjN+LJN/c="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ click multimethod numpy @@ -34,4 +39,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index 18714d430f77..d4af451e1b32 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -18,14 +18,14 @@ buildPythonPackage (finalAttrs: { pname = "xiaomi-ble"; - version = "1.14.3"; + version = "1.14.4"; pyproject = true; src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "xiaomi-ble"; tag = "v${finalAttrs.version}"; - hash = "sha256-MUAowfbJ3vktUUDNLR5UWrbYq/xXmODwVIxv7GeB1EM="; + hash = "sha256-SoB9sa3TkFLNomYuVZszKIIc0h/XDzRdfusWlruhDQ0="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/xml-marshaller/default.nix b/pkgs/development/python-modules/xml-marshaller/default.nix index 67aad175937f..cd96138b2341 100644 --- a/pkgs/development/python-modules/xml-marshaller/default.nix +++ b/pkgs/development/python-modules/xml-marshaller/default.nix @@ -2,22 +2,27 @@ buildPythonPackage, fetchPypi, lib, + setuptools, lxml, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xml-marshaller"; version = "1.0.2"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { pname = "xml_marshaller"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-QvBALLDD8o5nZQ5Z4bembhadK6jcydWKQpJaSmGqqJM="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ lxml six ]; @@ -30,4 +35,4 @@ buildPythonPackage rec { license = lib.licenses.psfl; maintainers = with lib.maintainers; [ mazurel ]; }; -} +}) diff --git a/pkgs/development/python-modules/xmljson/default.nix b/pkgs/development/python-modules/xmljson/default.nix index 42aba72a328f..e4cf1e3e6d05 100644 --- a/pkgs/development/python-modules/xmljson/default.nix +++ b/pkgs/development/python-modules/xmljson/default.nix @@ -2,21 +2,28 @@ buildPythonPackage, fetchPypi, lib, + setuptools, lxml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xmljson"; version = "0.2.1"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; - sha256 = "b4158e66aa1e62ee39f7f80eb2fe4f767670ba3c0d5de9804420dc53427fdec8"; + inherit (finalAttrs) pname version; + hash = "sha256-tBWOZqoeYu459/gOsv5PdnZwujwNXemARCDcU0J/3sg="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ lxml ]; + pythonImportsCheck = [ "xmljson" ]; + meta = { description = "Converts XML into dictionary structures and vice-versa"; mainProgram = "xml2json"; @@ -24,4 +31,4 @@ buildPythonPackage rec { license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ rakesh4g ]; }; -} +}) diff --git a/pkgs/development/python-modules/xmodem/default.nix b/pkgs/development/python-modules/xmodem/default.nix index feb8e524b60b..1a9115e52ae4 100644 --- a/pkgs/development/python-modules/xmodem/default.nix +++ b/pkgs/development/python-modules/xmodem/default.nix @@ -2,23 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pytest, which, lrzsz, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xmodem"; version = "0.4.7"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "tehmaze"; repo = "xmodem"; - tag = version; - sha256 = "sha256-kwPA/lYiv6IJSKGRuH13tBofZwp19vebwQniHK7A/i8="; + tag = finalAttrs.version; + hash = "sha256-kwPA/lYiv6IJSKGRuH13tBofZwp19vebwQniHK7A/i8="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytest which @@ -29,10 +34,12 @@ buildPythonPackage rec { pytest ''; + pythonImportsCheck = [ "xmodem" ]; + meta = { description = "Pure python implementation of the XMODEM protocol"; maintainers = with lib.maintainers; [ emantor ]; homepage = "https://github.com/tehmaze/xmodem"; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/development/python-modules/yamlordereddictloader/default.nix b/pkgs/development/python-modules/yamlordereddictloader/default.nix index c29cc6acd681..c2158ff92a70 100644 --- a/pkgs/development/python-modules/yamlordereddictloader/default.nix +++ b/pkgs/development/python-modules/yamlordereddictloader/default.nix @@ -2,20 +2,25 @@ lib, buildPythonPackage, fetchPypi, + setuptools, pyyaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "yamlordereddictloader"; version = "0.4.2"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Nq8vYhD8/12k/EwS4dgV+XPc60EETnleHwYRXWNLyhM="; }; - propagatedBuildInputs = [ pyyaml ]; + build-system = [ setuptools ]; + + dependencies = [ pyyaml ]; # no tests doCheck = false; @@ -28,4 +33,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 6ee55d20421f..92769ad70ac3 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -23,8 +23,8 @@ let [ ]; in buildNodejs { - version = "22.23.0"; - sha256 = "3acfae100c7b855a4c76520ee0f95cadcace3f4254f16b7d4887f178fc95d4a0"; + version = "22.23.1"; + sha256 = "b27385d6845089bdb91285d94b06c2a5cf1c37f8173a3c4e10824cc1ffadeaba"; patches = ( if (stdenv.hostPlatform.emulatorAvailable buildPackages) then diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index ef7d104f20e4..98750c6c2ad2 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -477,14 +477,12 @@ optionalAttrs allowAliases aliases runCommand name { nativeBuildInputs = [ json2x ]; - value = builtins.toJSON value; + inherit value; preferLocalBuild = true; __structuredAttrs = true; } '' - valuePath="$TMPDIR/value" - printf "%s" "$value" > "$valuePath" - json2x toml "$valuePath" "$out" + json2x toml --unwrap value "$NIX_ATTRS_JSON_FILE" "$out" '' ) { }; diff --git a/pkgs/pkgs-lib/formats/json2x/src/main.rs b/pkgs/pkgs-lib/formats/json2x/src/main.rs index b9025c67f42a..e3e71e584af0 100644 --- a/pkgs/pkgs-lib/formats/json2x/src/main.rs +++ b/pkgs/pkgs-lib/formats/json2x/src/main.rs @@ -10,6 +10,9 @@ use argh::{FromArgValue, FromArgs}; /// Convert a JSON file to another format #[derive(FromArgs)] struct Args { + /// convert only value of this attribute + #[argh(option)] + unwrap: Option, /// format of the output file, possible values: toml #[argh(positional)] format: Format, @@ -29,16 +32,27 @@ enum Format { fn main() -> anyhow::Result<()> { let args: Args = argh::from_env(); - let input = read_to_string(&args.input) + let json_text = read_to_string(&args.input) .with_context(|| format!("failed to read {}", args.input.display()))?; - let input: serde_json::Value = serde_json::from_str(&input) + let parsed_json: serde_json::Value = serde_json::from_str(&json_text) .with_context(|| format!("failed to parse {}", args.input.display()))?; + let output_value = if let Some(unwrap_key) = args.unwrap { + parsed_json + .as_object() + .ok_or_else(|| anyhow::anyhow!("{} does not contain an object", args.input.display()))? + .get(&unwrap_key) + // The key is missing from structured attrs when the value is null, treat missing value as Value::Null. + .unwrap_or(&serde_json::Value::Null) + } else { + &parsed_json + }; let mut output = File::create(&args.output) .with_context(|| format!("failed to create {}", args.output.display()))?; match args.format { Format::Toml => { - let content = toml::to_string(&input).context("failed to serialize value to toml")?; + let content = + toml::to_string(output_value).context("failed to serialize value to toml")?; output .write_all(content.as_bytes()) .with_context(|| format!("failed to write to {}", args.output.display()))?; diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix index ee6d817287c2..1b10f1361038 100644 --- a/pkgs/pkgs-lib/tests/formats.nix +++ b/pkgs/pkgs-lib/tests/formats.nix @@ -845,6 +845,11 @@ runBuildTests { ''; }; + tomlNull = shouldFail { + format = formats.toml { }; + input = null; + }; + cdnAtoms = shouldPass { format = formats.cdn { }; input = { diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-brand-icons/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-brand-icons/package.nix index 7b59798efd22..fdddebbed451 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-brand-icons/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-brand-icons/package.nix @@ -6,13 +6,13 @@ buildNpmPackage (finalAttrs: { pname = "custom-brand-icons"; - version = "2026.06.2"; + version = "2026.06.3"; src = fetchFromGitHub { owner = "elax46"; repo = "custom-brand-icons"; tag = finalAttrs.version; - hash = "sha256-tv8XrKiNEOQiaL+volIwdKiUSn/Y8L3Ot0z9A9HtH9w="; + hash = "sha256-fZwffVMrO+b/r6yb2XsDhjeokyXSShiIYkc6zFZ8lwg="; }; npmDepsHash = "sha256-ZTl9+vXEBR3pvksaLWof8y1WnoL2tAL3KuPzZn7VjjE="; diff --git a/pkgs/servers/sql/postgresql/ext/hypopg.nix b/pkgs/servers/sql/postgresql/ext/hypopg.nix index 0f89f16833dc..b2a7adf5adea 100644 --- a/pkgs/servers/sql/postgresql/ext/hypopg.nix +++ b/pkgs/servers/sql/postgresql/ext/hypopg.nix @@ -8,13 +8,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "hypopg"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "HypoPG"; repo = "hypopg"; tag = finalAttrs.version; - hash = "sha256-J1ltvNHB2v2I9IbYjM8w2mhXvBX31NkMasCL0O7bV8w="; + hash = "sha256-d8j1mvn/9R8LEQCqstBxddRqQYZ9k4hcOrlQp7cPtYI="; }; passthru = { diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index f01ccee39e42..226bc4adaabd 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -5,7 +5,6 @@ nixDependencies, generateSplicesForMkScope, fetchFromGitHub, - fetchpatch2, runCommand, pkgs, pkgsi686Linux, @@ -125,25 +124,48 @@ let lib.teams.security-review ]; + # Comment out functional tests from meson.build file + # This is to prevent test list reordering between releases in `tests/functional/**/meson.build` + # `tests` is a list of `{ file; test; }` + removeFunctionalTests = + tests: src: + # empty implies noop + if tests == [ ] then + src + else + runCommand src.name { inherit src; } '' + cp -r "$src" "$out" + chmod -R u+w "$out" + ${lib.concatMapStringsSep "\n" ( + { file, test }: + ''substituteInPlace "$out/${file}" --replace-fail "'${test}'," "# '${test}',"'' + ) tests} + ''; + # Disables tests that have been flaky due to the darwin sandbox and fork safety # with missing shebangs. # See: # - https://github.com/NixOS/nix/pull/14778 # - https://github.com/NixOS/nixpkgs/issues/476794 # - https://github.com/NixOS/nix/issues/13106 - patches_common = lib.optional ( - stdenv.system == "aarch64-darwin" - ) ./patches/skip-flaky-darwin-tests.patch; - - # Lowdown 3.0 compatibility patch for nix 2.31–2.33; fetched from the - # upstream backport (same diff on every maintenance branch after - # fetchpatch strips metadata). Nix 2.34.4+ and the git snapshot - # already include the fix in their tagged source. - lowdown30Patch = pkgs.fetchpatch { - name = "nix-lowdown-3.0-support.patch"; - url = "https://github.com/NixOS/nix/commit/472c35c561bd9e8db1465e0677f1efe2cb88c568.patch"; - hash = "sha256-ZCQgI/euBN8t9rgdCsGRgrcEWG3T5MUc+bQc4tIcHuI="; - }; + commonDisabledTests = lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [ + { + file = "tests/functional/meson.build"; + test = "nix-shell.sh"; + } + { + file = "tests/functional/meson.build"; + test = "user-envs.sh"; + } + { + file = "tests/functional/ca/meson.build"; + test = "nix-shell.sh"; + } + { + file = "tests/functional/flakes/meson.build"; + test = "shebang.sh"; + } + ]; # Lowdown 3.0 compatibility patch for nix 2.28 and 2.30, which have a # different markdown.cc layout (no LOWDOWN_TERM_NORELLINK branch) and @@ -156,9 +178,14 @@ lib.makeExtensible ( { nix_2_28 = commonMeson { version = "2.28.7"; - hash = "sha256-Fq4+7uYz6bdE1HvPqn+qZcYX1rNilVKT7YAAPLA8170="; + src = removeFunctionalTests commonDisabledTests (fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + rev = "2.28.7"; + hash = "sha256-Fq4+7uYz6bdE1HvPqn+qZcYX1rNilVKT7YAAPLA8170="; + }); self_attribute_name = "nix_2_28"; - patches = patches_common ++ [ + patches = [ lowdown30PatchOld ]; }; @@ -168,14 +195,14 @@ lib.makeExtensible ( version = "2.30.5"; inherit teams; otherSplices = generateSplicesForNixComponents "nixComponents_2_30"; - src = fetchFromGitHub { + src = removeFunctionalTests commonDisabledTests (fetchFromGitHub { owner = "NixOS"; repo = "nix"; tag = version; hash = "sha256-tGiV71RxtCNcUNX86ZwmOIghG4pLwm5nlRKd89er7Gk="; - }; + }); }).appendPatches - (patches_common ++ [ lowdown30PatchOld ]); + [ lowdown30PatchOld ]; nix_2_30 = addTests "nix_2_30" self.nixComponents_2_30.nix-everything; @@ -200,30 +227,33 @@ lib.makeExtensible ( version = "2.34.7"; inherit teams; otherSplices = generateSplicesForNixComponents "nixComponents_2_34"; - src = fetchFromGitHub { + src = removeFunctionalTests commonDisabledTests (fetchFromGitHub { owner = "NixOS"; repo = "nix"; tag = version; hash = "sha256-uj5KNW8Vdm60FCUxD2KsrCVH/WwoemvczWmmrb3Gvlo="; - }; + }); }).appendPatches - patches_common; + [ ]; nix_2_34 = addTests "nix_2_34" self.nixComponents_2_34.nix-everything; nixComponents_git = - (nixDependencies.callPackage ./modular/packages.nix rec { - version = "2.35pre20260504_${lib.substring 0 8 src.rev}"; - inherit teams; - otherSplices = generateSplicesForNixComponents "nixComponents_git"; + let src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "53ab7375a110825814837005aaf5a256edea6eae"; - hash = "sha256-ILPe+2GSPjmsZvEegUh0lJ1yWSsQnU1eJvfvIdJ8ins="; + rev = "f8bb823a23bf6d62f4c8feb792a77702d7a49fe1"; + hash = "sha256-eWBQ01zjUjTF6VyWzmt6fN6jI+vlCDtqYaJG1McIKpc="; }; + in + (nixDependencies.callPackage ./modular/packages.nix { + version = "2.35pre20260619_${lib.substring 0 8 src.rev}"; + inherit teams; + otherSplices = generateSplicesForNixComponents "nixComponents_git"; + src = removeFunctionalTests commonDisabledTests src; }).appendPatches - patches_common; + [ ]; git = addTests "git" self.nixComponents_git.nix-everything; diff --git a/pkgs/tools/package-management/nix/patches/skip-flaky-darwin-tests.patch b/pkgs/tools/package-management/nix/patches/skip-flaky-darwin-tests.patch deleted file mode 100644 index 60d1a4ac78d7..000000000000 --- a/pkgs/tools/package-management/nix/patches/skip-flaky-darwin-tests.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/tests/functional/ca/meson.build -+++ b/tests/functional/ca/meson.build -@@ -27 +27 @@ suites += { -- 'nix-shell.sh', -+ # 'nix-shell.sh', ---- a/tests/functional/flakes/meson.build -+++ b/tests/functional/flakes/meson.build -@@ -27 +27 @@ suites += { -- 'shebang.sh', -+ # 'shebang.sh', ---- a/tests/functional/meson.build -+++ b/tests/functional/meson.build -@@ -65 +65 @@ suites = [ -- 'user-envs.sh', -+ # 'user-envs.sh', -@@ -92 +92 @@ suites = [ -- 'nix-shell.sh', -+ # 'nix-shell.sh', diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3b9b111da441..8bde1465e300 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -734,6 +734,7 @@ mapAliases { 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 eureka-ideas = throw "'eureka-ideas' has been removed as it has been unmaintained upstream since April 2023"; # Added 2026-02-07 + everspace = throw "'everspace' has been removed, as it relies on gtk2 libraries"; # Added 2026-06-15 evolve-core = throw "'evolve-core' has been removed, as it hindered the removal of flutter329"; # Added 2026-01-25 eww-wayland = throw "'eww-wayland' has been renamed to/replaced by 'eww'"; # Converted to throw 2025-10-27 ex_doc = warnAlias "'ex_doc' is deprecated in favor of using the beamPackages sets. Use 'beamPackages.ex_doc' instead." beamPackages.ex_doc; # added 2026-06-15 @@ -987,6 +988,7 @@ mapAliases { gtkextra = throw "'gtkextra' has been removed due to lack of maintenance upstream."; # Added 2025-06-10 gtkgnutella = gtk-gnutella; # Added 2026-05-21 gtklp = throw "'gtklp' has been removed, as it depended on GTK 2. Consider using 'system-config-printer' instead."; # Added 2026-05-22 + gtkradiant = throw "'gtkradiant' has been removed, as it relies on gtk2"; # Added 2026-06-18 gtuber = throw "'gtuber' has been removed due to being discontinued by upstream."; # Added 2025-12-12 gui-for-clash = throw "'gui-for-clash' has been removed, as it is unmaintained"; # Added 2026-05-28 guile-disarchive = throw "'guile-disarchive' has been renamed to/replaced by 'disarchive'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c3545b3c6df9..91d58bcde31c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3518,6 +3518,8 @@ self: super: with self; { cybox = callPackage ../development/python-modules/cybox { }; + cyclebane = callPackage ../development/python-modules/cyclebane { }; + cycler = callPackage ../development/python-modules/cycler { }; cyclonedds-python = callPackage ../development/python-modules/cyclonedds-python { }; @@ -6859,6 +6861,8 @@ self: super: with self; { griffe = callPackage ../development/python-modules/griffe { }; + griffecli = callPackage ../development/python-modules/griffecli { }; + griffelib = callPackage ../development/python-modules/griffelib { }; grip = callPackage ../development/python-modules/grip { }; @@ -17789,6 +17793,8 @@ self: super: with self; { scikits-odes-sundials = callPackage ../development/python-modules/scikits-odes-sundials { }; + sciline = callPackage ../development/python-modules/sciline { }; + scim2-client = callPackage ../development/python-modules/scim2-client { }; scim2-filter-parser = callPackage ../development/python-modules/scim2-filter-parser { }; @@ -17801,6 +17807,10 @@ self: super: with self; { scipp = callPackage ../development/python-modules/scipp { }; + scippneutron = callPackage ../development/python-modules/scippneutron { }; + + scippnexus = callPackage ../development/python-modules/scippnexus { }; + scipy = callPackage ../development/python-modules/scipy { }; scipy-stubs = callPackage ../development/python-modules/scipy-stubs { };