diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 933ae5a0490d..84bcf419fa6b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10120,6 +10120,11 @@ name = "Kirill Samoylenkov"; keys = [ { fingerprint = "955B 97C5 78A3 DF03 D818 25EB 8E40 5DD2 CF84 CCE0"; } ]; }; + gefla = { + name = "Gerd Flaig"; + github = "gefla"; + githubId = 56790; + }; genga898 = { email = "genga898@gmail.com"; github = "genga898"; diff --git a/nixos/modules/installer/sd-card/sd-image.nix b/nixos/modules/installer/sd-card/sd-image.nix index 527a23dbe1e4..4dc4154a550e 100644 --- a/nixos/modules/installer/sd-card/sd-image.nix +++ b/nixos/modules/installer/sd-card/sd-image.nix @@ -400,7 +400,7 @@ in # Figure out device names for the boot device and root filesystem. rootPart=$(${lib.getExe' pkgs.util-linux "findmnt"} -n -o SOURCE /) bootDevice=$(${lib.getExe' pkgs.util-linux "lsblk"} -npo PKNAME $rootPart) - partNum=$(${lib.getExe' pkgs.util-linux "lsblk"} -npo MAJ:MIN $rootPart | ${lib.getExe pkgs.gawk} -F: '{print $2}') + partNum=$(${lib.getExe' pkgs.util-linux "lsblk"} -npo PARTN $rootPart) # Resize the root partition and the filesystem to fit the disk echo ",+," | ${lib.getExe' pkgs.util-linux "sfdisk"} -N$partNum --no-reread $bootDevice diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index f336ecbced79..c2fc4ba41814 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -44,7 +44,6 @@ rec { homepage = "https://www.vim.org"; license = lib.licenses.vim; maintainers = with lib.maintainers; [ - das_j equirosa philiptaron ]; diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index 39a0e28fcbb6..0b0ef219330f 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -17,16 +17,16 @@ buildGoModule rec { pname = "netmaker"; - version = "1.1.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "gravitl"; repo = "netmaker"; rev = "v${version}"; - hash = "sha256-acsIe3N6F76KktfPOHreFwDatyuv1q7ui6MMhVXfj7c="; + hash = "sha256-Zt6bQgmummfaC0cbW2GgSlu2TatHHrd8UEY/CZsJoDU="; }; - vendorHash = "sha256-Ur8cuE0jToOme79BTaYbaLDl2cRMjsr1DTvZjm8zmtc="; + vendorHash = "sha256-m+z0bzE/XMb8YHX4Q6UtPfeG0B2OSp9azMhVX51ECgM="; inherit subPackages; diff --git a/pkgs/applications/video/kodi/addons/arteplussept/default.nix b/pkgs/applications/video/kodi/addons/arteplussept/default.nix index 2e5f33c14afb..fba7acdd5735 100644 --- a/pkgs/applications/video/kodi/addons/arteplussept/default.nix +++ b/pkgs/applications/video/kodi/addons/arteplussept/default.nix @@ -12,11 +12,11 @@ buildKodiAddon rec { pname = "arteplussept"; namespace = "plugin.video.arteplussept"; - version = "1.5.3"; + version = "1.6.0"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; - hash = "sha256-a0HMYqeCYTTPgTgZfLcycHEqf/CPxdP03TePpE6nEK8="; + hash = "sha256-5gGRYzRBFPrZKtTLUcwIF/Exq6fwkymP1W6iyGdo5nc="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/radioparadise/default.nix b/pkgs/applications/video/kodi/addons/radioparadise/default.nix index 4a054bbe34c8..70a9c0c1890e 100644 --- a/pkgs/applications/video/kodi/addons/radioparadise/default.nix +++ b/pkgs/applications/video/kodi/addons/radioparadise/default.nix @@ -10,11 +10,11 @@ buildKodiAddon rec { pname = "radioparadise"; namespace = "script.radioparadise"; - version = "2.4.0"; + version = "2.5.0"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/script.radioparadise/script.radioparadise-${version}.zip"; - sha256 = "sha256-qM+YzWesgAIiqL2YbKgJ0wSTTghtPPBcMGzsKF7tVAY="; + sha256 = "sha256-7mBKWgyjXcGPbUknE7F7czxicMDoYmv06Am1RgbOjgE="; }; propagatedBuildInputs = [ diff --git a/pkgs/build-support/kernel/make-initrd-ng-tool.nix b/pkgs/build-support/kernel/make-initrd-ng-tool.nix index c373530285c7..2b765682780d 100644 --- a/pkgs/build-support/kernel/make-initrd-ng-tool.nix +++ b/pkgs/build-support/kernel/make-initrd-ng-tool.nix @@ -16,7 +16,6 @@ rustPlatform.buildRustPackage { description = "Tool for copying binaries and their dependencies"; mainProgram = "make-initrd-ng"; maintainers = with lib.maintainers; [ - das_j elvishjerricco k900 ]; diff --git a/pkgs/by-name/ac/acli/sources.json b/pkgs/by-name/ac/acli/sources.json index 861fa1f4dfe4..003455632aa1 100644 --- a/pkgs/by-name/ac/acli/sources.json +++ b/pkgs/by-name/ac/acli/sources.json @@ -1,17 +1,17 @@ { - "version": "1.3.22-stable", + "version": "1.3.23-stable", "sources": { "aarch64-darwin": { - "url": "https://acli.atlassian.com/darwin/1.3.22-stable/acli_1.3.22-stable_darwin_arm64.tar.gz", - "sha256": "3a9a6ff1bb0bce5902780e26e748b18b9adb4489df67d88ea878f4b7673944ad" + "url": "https://acli.atlassian.com/darwin/1.3.23-stable/acli_1.3.23-stable_darwin_arm64.tar.gz", + "sha256": "af78f7bb06b137ddab785257fb74367ac3304629c7d240af0117a700c7b56b64" }, "aarch64-linux": { - "url": "https://acli.atlassian.com/linux/1.3.22-stable/acli_1.3.22-stable_linux_arm64.tar.gz", - "sha256": "1a9e86d0b46a62a8f1992c1ef98b3af7e9a9ee3f76d0efa215fe1f2d1b2fd139" + "url": "https://acli.atlassian.com/linux/1.3.23-stable/acli_1.3.23-stable_linux_arm64.tar.gz", + "sha256": "5d4e8580cf2aae681bc02bb4f61c8a62f3efa8fa2b051b3a5f4f560a90279a60" }, "x86_64-linux": { - "url": "https://acli.atlassian.com/linux/1.3.22-stable/acli_1.3.22-stable_linux_amd64.tar.gz", - "sha256": "de9e0a60a556e4119428b9072f6ca787e75b9f9a538aa71ebcc8084deb8ca1a6" + "url": "https://acli.atlassian.com/linux/1.3.23-stable/acli_1.3.23-stable_linux_amd64.tar.gz", + "sha256": "1678a6d0ac36904b1b7788191b5740962a3dc8694aa6f3eee9ccd8f4774996e5" } } } diff --git a/pkgs/by-name/al/alembic/package.nix b/pkgs/by-name/al/alembic/package.nix index 12e36c6b2719..43ce605db4c8 100644 --- a/pkgs/by-name/al/alembic/package.nix +++ b/pkgs/by-name/al/alembic/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "alembic"; - version = "1.8.8"; + version = "1.8.12"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; tag = finalAttrs.version; - hash = "sha256-R69UYyvLnMwv1JzEQ6S6elvR83Rmvc8acBJwSV/+hCk="; + hash = "sha256-cH/hfGnl037Q2kWzGz68RZW9MOqU/M2I+/osyyGlN/s="; }; # note: out is unused (but required for outputDoc anyway) diff --git a/pkgs/by-name/as/asterisk-module-sccp/package.nix b/pkgs/by-name/as/asterisk-module-sccp/package.nix index 32952fc436b2..8f6336033b44 100644 --- a/pkgs/by-name/as/asterisk-module-sccp/package.nix +++ b/pkgs/by-name/as/asterisk-module-sccp/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Replacement for the SCCP channel driver in Asterisk"; homepage = "https://github.com/chan-sccp/chan-sccp"; license = lib.licenses.gpl1Only; - maintainers = with lib.maintainers; [ das_j ]; + maintainers = [ ]; # https://github.com/chan-sccp/chan-sccp/issues/609 broken = lib.versionAtLeast (lib.getVersion asterisk) "21"; }; diff --git a/pkgs/by-name/bi/biglybt/package.nix b/pkgs/by-name/bi/biglybt/package.nix index 03d2bef1af38..1bcdf1f03b85 100644 --- a/pkgs/by-name/bi/biglybt/package.nix +++ b/pkgs/by-name/bi/biglybt/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "biglybt"; - version = "3.9.0.0"; + version = "4.1.0.0"; src = fetchurl { url = "https://github.com/BiglySoftware/BiglyBT/releases/download/v${finalAttrs.version}/GitHub_BiglyBT_unix.tar.gz"; - hash = "sha256-NBXEY5f2kVPoZit7Gy4rM61bwQSdXovg0gURukhxJJ4="; + hash = "sha256-P9CscKANZUZd49tPelT8fZVVaf5P5CKnq5eAbE7H6eU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bu/buildkite-agent-metrics/package.nix b/pkgs/by-name/bu/buildkite-agent-metrics/package.nix index 07416741c1ed..ff7e56eda33f 100644 --- a/pkgs/by-name/bu/buildkite-agent-metrics/package.nix +++ b/pkgs/by-name/bu/buildkite-agent-metrics/package.nix @@ -5,7 +5,7 @@ }: buildGoModule (finalAttrs: { pname = "buildkite-agent-metrics"; - version = "5.12.3"; + version = "5.12.4"; __darwinAllowLocalNetworking = true; @@ -18,10 +18,10 @@ buildGoModule (finalAttrs: { owner = "buildkite"; repo = "buildkite-agent-metrics"; rev = "v${finalAttrs.version}"; - hash = "sha256-h6RPAqRNCcsT49d+D+q3FShoPZK4z7e8JCkB1FOHgNY="; + hash = "sha256-0pQhybD6RREqpB6Fa4L5HnPb54mh0QEylqHhl6mgGSQ="; }; - vendorHash = "sha256-2os2V1iyw1k6XwX2wLz0abMnu+X5p+Aqau7ajC3JIRc="; + vendorHash = "sha256-kaObR5j6vsqRnU2jP4hJjC+Ek8X5v82T0AJsiHx6lvc="; # This is a Google Cloud Function and is not needed for compiling the binary excludedPackages = [ "./cloud_function" ]; diff --git a/pkgs/by-name/cd/cdktn-cli/package.nix b/pkgs/by-name/cd/cdktn-cli/package.nix index ff20b260f462..4f2532cead61 100644 --- a/pkgs/by-name/cd/cdktn-cli/package.nix +++ b/pkgs/by-name/cd/cdktn-cli/package.nix @@ -4,33 +4,42 @@ buildGoModule, faketty, fetchFromGitHub, - fetchYarnDeps, - fixup-yarn-lock, + fetchPnpmDeps, go, makeWrapper, nodejs, nix-update-script, patchelf, + pnpm_10, + pnpmConfigHook, removeReferencesTo, - testers, - yarn, versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "cdktn-cli"; - version = "0.23.3"; + version = "0.24.0"; src = fetchFromGitHub { owner = "open-constructs"; repo = "cdk-terrain"; tag = "v${finalAttrs.version}"; - hash = "sha256-k3xAaJiqldRZubAFrRuNM1e+3kH/5vv0maEeT/gdqK0="; + hash = "sha256-8vUGGg31MkuXdyvZo83GIoLZeJlOKIFgg3KlYU2F8hY="; }; - offlineCache = fetchYarnDeps { - yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-9nhv31ljJ8DphOot3TAsYhbV6cx7Ovfe+ll+V2vJWx8="; + pnpmWorkspaces = [ "cdktn-cli..." ]; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) + pname + version + src + pnpmInstallFlags + pnpmWorkspaces + ; + fetcherVersion = 3; + hash = "sha256-2DTexRQg/n454cKaYitFT3KAT8BR+153KxlYMaa1NXM="; + pnpm = pnpm_10; }; hcl2json-go-modules = @@ -55,26 +64,27 @@ stdenv.mkDerivation (finalAttrs: { env.GOWORK = "off"; }).goModules; + pnpmInstallFlags = [ "--shamefully-hoist" ]; strictDeps = true; disallowedReferences = [ go ]; nativeBuildInputs = [ faketty - fixup-yarn-lock go makeWrapper nodejs patchelf + pnpm_10 + pnpmConfigHook removeReferencesTo - yarn ]; postPatch = '' - # wasm_exec has moved to lib in newer versions of Go - substituteInPlace packages/@cdktn/hcl-tools/prebuild.sh \ - --replace-fail "misc/wasm/wasm_exec.js" "lib/wasm/wasm_exec.js" - substituteInPlace packages/@cdktn/hcl2json/prebuild.sh \ - --replace-fail "misc/wasm/wasm_exec.js" "lib/wasm/wasm_exec.js" + # Fix tests (workaround for https://github.com/open-constructs/cdk-terrain/issues/381) + substituteInPlace jest.preset.js \ + --replace-fail "...nxPreset," "...nxPreset, transform: {}," + + patchShebangs packages ''; preConfigure = '' @@ -87,24 +97,12 @@ stdenv.mkDerivation (finalAttrs: { export CHECKPOINT_DISABLE=1 ''; - configurePhase = '' - runHook preConfigure - - export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror $offlineCache - fixup-yarn-lock yarn.lock - yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install - patchShebangs node_modules packages - - runHook postConfigure - ''; - buildPhase = '' runHook preBuild - bash ./tools/align-version.sh + node tools/align-version.mjs - faketty yarn --offline build + faketty pnpm --filter "cdktn-cli..." run build runHook postBuild ''; @@ -114,9 +112,9 @@ stdenv.mkDerivation (finalAttrs: { runHook preCheck # Skip tests that require terraform (unfree) - yarn --offline workspace cdktn-cli jest \ + pnpm --filter cdktn-cli exec jest \ --testPathIgnorePatterns \ - "src/test/cmds/(convert|init).test.ts" + "src/test/cmds/convert.test.ts" runHook postCheck ''; @@ -124,14 +122,15 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - yarn --offline --production install + pnpm install --force --offline --production --ignore-scripts --shamefully-hoist --filter "cdktn-cli..." - mkdir -p "$out/lib/node_modules/cdktn-cli" - cp -rL node_modules packages/cdktn-cli/bundle packages/cdktn-cli/package.json "$out/lib/node_modules/cdktn-cli/" + mkdir -p "$out/lib/cdktn" + cp -r node_modules packages package.json "$out/lib/cdktn/" makeWrapper "${lib.getExe nodejs}" "$out/bin/cdktn" \ + --set-default CHECKPOINT_DISABLE 1 \ --add-flags "--no-warnings=DEP0040" \ - --add-flags "$out/lib/node_modules/cdktn-cli/bundle/bin/cdktn.js" + --add-flags "$out/lib/cdktn/packages/cdktn-cli/bundle/bin/cdktn.js" runHook postInstall ''; @@ -139,8 +138,8 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' # Go isn't needed at runtime, so remove these to decrease the closure size remove-references-to -t ${go} \ - "$out/lib/node_modules/cdktn-cli/node_modules/@cdktn/hcl-tools/main.wasm" \ - "$out/lib/node_modules/cdktn-cli/node_modules/@cdktn/hcl2json/main.wasm" + "$out/lib/cdktn/packages/@cdktn/hcl-tools/main.wasm" \ + "$out/lib/cdktn/packages/@cdktn/hcl2json/main.wasm" ''; nativeInstallCheckInputs = [ diff --git a/pkgs/by-name/ch/chameleon-cli/package.nix b/pkgs/by-name/ch/chameleon-cli/package.nix index 773490dab190..96c223a532dd 100644 --- a/pkgs/by-name/ch/chameleon-cli/package.nix +++ b/pkgs/by-name/ch/chameleon-cli/package.nix @@ -23,14 +23,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "chameleon-cli"; - version = "2.2.0-unstable-2026-07-04"; + version = "2.2.0-unstable-2026-08-10"; src = fetchFromGitHub { owner = "RfidResearchGroup"; repo = "ChameleonUltra"; - rev = "f349dbeeaa315776b272ae8fb851cc4042d55f07"; + rev = "0c1d5791b46e8ac1a87cb8e356f180b1394fb827"; rootDir = "software"; - hash = "sha256-D8/hdOcDnkAmwQeWR+faukAISlm6ZTauf8zoSi9sCsI="; + hash = "sha256-vbY1kU67fnVUlQYSx3oG/xKPKRWSUBVXfR9hk+MaoyA="; }; postPatch = '' diff --git a/pkgs/by-name/ch/chessx/package.nix b/pkgs/by-name/ch/chessx/package.nix index 47d996717eaa..5e0da14f00d4 100644 --- a/pkgs/by-name/ch/chessx/package.nix +++ b/pkgs/by-name/ch/chessx/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "chessx"; - version = "1.6.2"; + version = "1.6.10"; src = fetchurl { url = "mirror://sourceforge/chessx/chessx-${finalAttrs.version}.tgz"; - hash = "sha256-uwkdhJywLWMJl4/ihMnxqFwnTzUSL+kca5wwiabiD4A="; + hash = "sha256-d8bvP4nYw+oTel9LsNzYOyYQRvrL3gbq7iI0N60ccy8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ci/cidrgrep/package.nix b/pkgs/by-name/ci/cidrgrep/package.nix index 4138935d5b4f..4f160b86f0b4 100644 --- a/pkgs/by-name/ci/cidrgrep/package.nix +++ b/pkgs/by-name/ci/cidrgrep/package.nix @@ -26,6 +26,6 @@ buildGoModule { homepage = "https://github.com/tomdoherty/cidrgrep"; mainProgram = "cidrgrep"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ das_j ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/cl/clojure-mcp-light/package.nix b/pkgs/by-name/cl/clojure-mcp-light/package.nix new file mode 100644 index 000000000000..04df61ffad55 --- /dev/null +++ b/pkgs/by-name/cl/clojure-mcp-light/package.nix @@ -0,0 +1,76 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + nix-update-script, + babashka, + runtimeShell, + parinfer-rust, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "clojure-mcp-light"; + version = "0.2.2"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "bhauman"; + repo = "clojure-mcp-light"; + tag = "v${finalAttrs.version}"; + hash = "sha256-PzYQ6WBlApjGbiAy+FS7QC+Mriqr9Jq6d5cr0LZ2Unk="; + }; + + buildInputs = [ + babashka + parinfer-rust + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = + let + scripts = [ + { + name = "clj-nrepl-eval"; + module = "clojure-mcp-light.nrepl-eval"; + } + { + name = "clj-paren-repair"; + module = "clojure-mcp-light.paren-repair"; + } + { + name = "clj-paren-repair-claude-hook"; + module = "clojure-mcp-light.hook"; + } + ]; + mkScript = { name, module }: '' + cat > $out/bin/${name} <