Merge master into staging-next

authored by nixpkgs-ci[bot] and committed by GitHub 56354abc afd9fac0

+543 -224
+9 -6
.github/workflows/labels.yml
··· 7 7 8 8 on: 9 9 schedule: 10 - - cron: '37 * * * *' 10 + - cron: '07,17,27,37,47,57 * * * *' 11 11 workflow_call: 12 12 workflow_dispatch: 13 13 inputs: ··· 36 36 labels: 37 37 name: label-pr 38 38 runs-on: ubuntu-24.04-arm 39 - if: "!contains(github.event.pull_request.title, '[skip treewide]')" 39 + if: github.event_name != 'schedule' || github.repository_owner == 'NixOS' 40 40 steps: 41 41 - name: Install dependencies 42 42 run: npm install @actions/artifact ··· 105 105 106 106 log('Last updated at', pull_request.updated_at) 107 107 if (new Date(pull_request.updated_at) < cutoff) return done() 108 + log('URL', pull_request.html_url) 108 109 109 110 const run_id = (await github.rest.actions.listWorkflowRuns({ 110 111 ...context.repo, ··· 118 119 119 120 // Newer PRs might not have run Eval to completion, yet. We can skip them, because this 120 121 // job will be run as part of that Eval run anyway. 121 - log('Last eval run', run_id) 122 + log('Last eval run', run_id ?? '<pending>') 122 123 if (!run_id) return; 123 124 124 125 const artifact = (await github.rest.actions.listWorkflowRunArtifacts({ ··· 129 130 130 131 // Instead of checking the boolean artifact.expired, we will give us a minute to 131 132 // actually download the artifact in the next step and avoid that race condition. 132 - log('Artifact expires at', artifact.expires_at) 133 - if (new Date(artifact.expires_at) < new Date(new Date().getTime() + 60 * 1000)) return; 133 + // Older PRs, where the workflow run was already eval.yml, but the artifact was not 134 + // called "comparison", yet, will be skipped as well. 135 + log('Artifact expires at', artifact?.expires_at ?? '<not found>') 136 + if (new Date(artifact?.expires_at ?? 0) < new Date(new Date().getTime() + 60 * 1000)) return; 134 137 135 138 await artifactClient.downloadArtifact(artifact.id, { 136 139 findBy: { ··· 163 166 164 167 const maintainers = new Set(Object.keys( 165 168 JSON.parse(await readFile(`${pull_request.number}/maintainers.json`, 'utf-8')) 166 - )) 169 + ).map(m => Number.parseInt(m, 10))) 167 170 168 171 // And the labels that should be there 169 172 const after = JSON.parse(await readFile(`${pull_request.number}/changed-paths.json`, 'utf-8')).labels
+6 -6
maintainers/maintainer-list.nix
··· 3432 3432 githubId = 75451918; 3433 3433 name = "Charlie Root"; 3434 3434 }; 3435 - bluescreen303 = { 3436 - email = "mathijs@bluescreen303.nl"; 3437 - github = "bluescreen303"; 3438 - githubId = 16330; 3439 - name = "Mathijs Kwik"; 3440 - }; 3441 3435 blusk = { 3442 3436 email = "bluskript@gmail.com"; 3443 3437 github = "bluskript"; ··· 14287 14281 github = "jian-lin"; 14288 14282 githubId = 75130626; 14289 14283 keys = [ { fingerprint = "80EE AAD8 43F9 3097 24B5 3D7E 27E9 7B91 E63A 7FF8"; } ]; 14284 + }; 14285 + link00000000 = { 14286 + email = "crandall.logan@gmail.com"; 14287 + github = "link00000000"; 14288 + githubId = 9771505; 14289 + name = "Logan Crandall"; 14290 14290 }; 14291 14291 link2xt = { 14292 14292 email = "link2xt@testrun.org";
+4 -1
nixos/modules/services/databases/postgresql.md
··· 21 21 services.postgresql.package = pkgs.postgresql_15; 22 22 } 23 23 ``` 24 - Note that you are required to specify the desired version of PostgreSQL (e.g. `pkgs.postgresql_15`). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for [](#opt-services.postgresql.package) such as the most recent release of PostgreSQL. 24 + 25 + The default PostgreSQL version is approximately the latest major version available on the NixOS release matching your [`system.stateVersion`](#opt-system.stateVersion). 26 + This is because PostgreSQL upgrades require a manual migration process (see below). 27 + Hence, upgrades must happen by setting [`services.postgresql.package`](#opt-services.postgresql.package) explicitly. 25 28 26 29 <!-- 27 30 After running {command}`nixos-rebuild`, you can verify
+17 -2
nixos/modules/services/databases/postgresql.nix
··· 120 120 121 121 enableJIT = mkEnableOption "JIT support"; 122 122 123 - package = mkPackageOption pkgs "postgresql" { 124 - example = "postgresql_15"; 123 + package = mkOption { 124 + type = types.package; 125 + example = literalExpression "pkgs.postgresql_15"; 126 + defaultText = literalExpression '' 127 + if versionAtLeast config.system.stateVersion "24.11" then 128 + pkgs.postgresql_16 129 + else if versionAtLeast config.system.stateVersion "23.11" then 130 + pkgs.postgresql_15 131 + else if versionAtLeast config.system.stateVersion "22.05" then 132 + pkgs.postgresql_14 133 + else 134 + pkgs.postgresql_13 135 + ''; 136 + description = '' 137 + The package being used by postgresql. 138 + ''; 125 139 }; 126 140 127 141 finalPackage = mkOption { ··· 656 670 See also https://endoflife.date/postgresql 657 671 ''; 658 672 base = 673 + # XXX Don't forget to keep `defaultText` of `services.postgresql.package` up to date! 659 674 if versionAtLeast config.system.stateVersion "24.11" then 660 675 pkgs.postgresql_16 661 676 else if versionAtLeast config.system.stateVersion "23.11" then
+33 -8
nixos/modules/services/misc/renovate.nix
··· 61 61 }; 62 62 default = { }; 63 63 }; 64 + environment = mkOption { 65 + type = 66 + with types; 67 + attrsOf ( 68 + nullOr (oneOf [ 69 + str 70 + path 71 + package 72 + ]) 73 + ); 74 + description = '' 75 + Extra environment variables to export to the Renovate process 76 + from the systemd unit configuration. 77 + 78 + See https://docs.renovatebot.com/config-overview for available environment variables. 79 + ''; 80 + example = { 81 + LOG_LEVEL = "debug"; 82 + }; 83 + default = { }; 84 + }; 64 85 runtimePackages = mkOption { 65 86 type = with types; listOf package; 66 87 description = "Packages available to renovate."; ··· 82 103 description = '' 83 104 Renovate's global configuration. 84 105 If you want to pass secrets to renovate, please use {option}`services.renovate.credentials` for that. 106 + 107 + See https://docs.renovatebot.com/config-overview for available settings. 85 108 ''; 86 109 }; 87 110 }; 88 111 89 112 config = mkIf cfg.enable { 90 - services.renovate.settings = { 91 - cacheDir = "/var/cache/renovate"; 92 - baseDir = "/var/lib/renovate"; 113 + services.renovate = { 114 + settings = { 115 + cacheDir = "/var/cache/renovate"; 116 + baseDir = "/var/lib/renovate"; 117 + }; 118 + environment = { 119 + RENOVATE_CONFIG_FILE = generateConfig "renovate-config.json" cfg.settings; 120 + HOME = "/var/lib/renovate"; 121 + }; 93 122 }; 94 123 95 124 systemd.services.renovate = { ··· 101 130 config.systemd.package 102 131 pkgs.git 103 132 ] ++ cfg.runtimePackages; 133 + inherit (cfg) environment; 104 134 105 135 serviceConfig = { 106 136 User = "renovate"; ··· 145 175 )} 146 176 exec ${lib.escapeShellArg (lib.getExe cfg.package)} 147 177 ''; 148 - 149 - environment = { 150 - RENOVATE_CONFIG_FILE = generateConfig "renovate-config.json" cfg.settings; 151 - HOME = "/var/lib/renovate"; 152 - }; 153 178 }; 154 179 }; 155 180 }
-1
nixos/tests/mongodb.nix
··· 12 12 { 13 13 name = "mongodb"; 14 14 meta.maintainers = with pkgs.lib.maintainers; [ 15 - bluescreen303 16 15 offline 17 16 phile314 18 17 niklaskorz
+13
pkgs/applications/editors/vim/plugins/generated.nix
··· 18827 18827 meta.hydraPlatforms = [ ]; 18828 18828 }; 18829 18829 18830 + vim-moonfly-colors = buildVimPlugin { 18831 + pname = "vim-moonfly-colors"; 18832 + version = "2025-05-28"; 18833 + src = fetchFromGitHub { 18834 + owner = "bluz71"; 18835 + repo = "vim-moonfly-colors"; 18836 + rev = "ff822100c5d268e0db79e8e725cbd3ade3470de3"; 18837 + sha256 = "14ffclg7yjkyw05bdqwc7rmzf195vjswfpmcfi7sd85rr4d3midz"; 18838 + }; 18839 + meta.homepage = "https://github.com/bluz71/vim-moonfly-colors/"; 18840 + meta.hydraPlatforms = [ ]; 18841 + }; 18842 + 18830 18843 vim-move = buildVimPlugin { 18831 18844 pname = "vim-move"; 18832 18845 version = "2023-10-08";
+1
pkgs/applications/editors/vim/plugins/vim-plugin-names
··· 1445 1445 https://github.com/crusoexia/vim-monokai/,, 1446 1446 https://github.com/phanviet/vim-monokai-pro/,, 1447 1447 https://github.com/patstockwell/vim-monokai-tasty/,HEAD, 1448 + https://github.com/bluz71/vim-moonfly-colors/,HEAD, 1448 1449 https://github.com/matze/vim-move/,, 1449 1450 https://github.com/lifepillar/vim-mucomplete/,, 1450 1451 https://github.com/terryma/vim-multiple-cursors/,,
+2 -2
pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
··· 11 11 mktplcRef = { 12 12 name = "calva"; 13 13 publisher = "betterthantomorrow"; 14 - version = "2.0.516"; 15 - hash = "sha256-0RBydQ2+ec6Swj/DGYVen3g8a6SqhIKLZ9m1Bohjqco="; 14 + version = "2.0.519"; 15 + hash = "sha256-Ndgps72L1mT7a2xoBmeXm/iAbyFMXP+e8SuQ5Q7HqcI="; 16 16 }; 17 17 18 18 nativeBuildInputs = [
-1
pkgs/by-name/an/andyetitmoves/package.nix
··· 95 95 ''; 96 96 homepage = "http://www.andyetitmoves.net/"; 97 97 license = licenses.unfree; 98 - maintainers = with maintainers; [ bluescreen303 ]; 99 98 }; 100 99 }
+3 -3
pkgs/by-name/ba/basedpyright/package.nix
··· 16 16 17 17 buildNpmPackage rec { 18 18 pname = "basedpyright"; 19 - version = "1.29.2"; 19 + version = "1.29.4"; 20 20 21 21 src = fetchFromGitHub { 22 22 owner = "detachhead"; 23 23 repo = "basedpyright"; 24 24 tag = "v${version}"; 25 - hash = "sha256-xzbIAzZS6kCrFDcbh7uFWV8Rbs91yx25RVKeGMSM5Dc="; 25 + hash = "sha256-LT0ZixIxUXqNyK08ue+fbDAk/g+ibJVWQbi/LLrdLuM="; 26 26 }; 27 27 28 - npmDepsHash = "sha256-s2Bavzd1IGuI7HfdKLAsFWHmr1RxBZO/21KXt060jbI="; 28 + npmDepsHash = "sha256-aJte4ApeXJQ9EYn87Uo+Xx7s+wi80I1JsZHeqklHGs4="; 29 29 npmWorkspace = "packages/pyright"; 30 30 31 31 preBuild = ''
+40
pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix
··· 1 + { 2 + lib, 3 + rustPlatform, 4 + fetchFromGitHub, 5 + nix-update-script, 6 + }: 7 + 8 + rustPlatform.buildRustPackage (finalAttrs: { 9 + pname = "bash-pinyin-completion-rs"; 10 + version = "0.2.3"; 11 + 12 + src = fetchFromGitHub { 13 + owner = "AOSC-Dev"; 14 + repo = "bash-pinyin-completion-rs"; 15 + tag = "v${finalAttrs.version}"; 16 + hash = "sha256-h4l4plGMn5WMhU60+m60Uf45UfPNDb0X+E2LK3U3jxw="; 17 + }; 18 + 19 + strictDeps = true; 20 + 21 + cargoHash = "sha256-SAegFsmn91xrWg0o7lHgk+vRqTQhabev9dP+Lbk/h5s="; 22 + 23 + postInstall = '' 24 + substituteInPlace scripts/bash_pinyin_completion \ 25 + --replace-fail 'bash-pinyin-completion-rs' "$out/bin/bash-pinyin-completion-rs" \ 26 + --replace-fail '#!/usr/bin/env bash' "" 27 + install -Dm644 scripts/bash_pinyin_completion $out/etc/bash_completion.d/pinyin_completion.bash 28 + ''; 29 + 30 + passthru.updateScript = nix-update-script { }; 31 + 32 + meta = { 33 + description = "Simple completion script for pinyin, written in rust"; 34 + homepage = "https://github.com/AOSC-Dev/bash-pinyin-completion-rs"; 35 + changelog = "https://github.com/AOSC-Dev/bash-pinyin-completion-rs/releases/tag/v${finalAttrs.version}"; 36 + license = lib.licenses.gpl3Only; 37 + maintainers = with lib.maintainers; [ moraxyc ]; 38 + mainProgram = "bash-pinyin-completion-rs"; 39 + }; 40 + })
+74
pkgs/by-name/bi/biplanes-revival/package.nix
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchFromGitHub, 5 + cmake, 6 + makeWrapper, 7 + ninja, 8 + SDL2, 9 + SDL2_image, 10 + SDL2_mixer, 11 + nix-update-script, 12 + }: 13 + 14 + stdenv.mkDerivation (finalAttrs: { 15 + pname = "biplanes-revival"; 16 + version = "1.2.1"; 17 + 18 + src = fetchFromGitHub { 19 + owner = "regular-dev"; 20 + repo = "biplanes-revival"; 21 + tag = "v${finalAttrs.version}"; 22 + hash = "sha256-rdPcI4j84fVKNwv2OQ9gwC0X2CHlObYfSYkCMlcm4sM="; 23 + fetchSubmodules = true; 24 + }; 25 + 26 + nativeBuildInputs = [ 27 + cmake 28 + makeWrapper 29 + ninja 30 + ]; 31 + 32 + buildInputs = [ 33 + SDL2 34 + SDL2_image 35 + SDL2_mixer 36 + ]; 37 + 38 + strictDeps = true; 39 + 40 + postInstall = '' 41 + id="org.regular_dev.biplanes_revival" 42 + install -Dm644 $src/flatpak-data/$id.desktop -t $out/share/applications 43 + install -Dm644 $src/flatpak-data/$id.metainfo.xml -t $out/share/metainfo 44 + install -Dm644 $src/flatpak-data/$id.svg -t $out/share/icons/hicolor/scalable/apps 45 + 46 + # Move assets directory into the preferred location. 47 + mkdir -p $out/share/biplanes-revival 48 + mv $out/bin/assets $out/share/biplanes-revival 49 + 50 + # Remove TimeUtils headers. 51 + rm -rf $out/include 52 + ''; 53 + 54 + postFixup = '' 55 + # Set assets root, the default is the current working directory. 56 + # The game automatically appends "/assets" to the variable. 57 + wrapProgram $out/bin/BiplanesRevival \ 58 + --set BIPLANES_ASSETS_ROOT "$out/share/biplanes-revival"; 59 + ''; 60 + 61 + env.NIX_CFLAGS_COMPILE = "-I ../deps/TimeUtils/include"; 62 + 63 + passthru.updateScript = nix-update-script { }; 64 + 65 + meta = { 66 + mainProgram = "BiplanesRevival"; 67 + description = "Old cellphone arcade recreated for PC"; 68 + homepage = "https://regular-dev.org/biplanes-revival"; 69 + changelog = "https://github.com/regular-dev/biplanes-revival/releases/tag/v${finalAttrs.version}"; 70 + license = lib.licenses.gpl3Only; 71 + platforms = lib.platforms.unix; 72 + maintainers = with lib.maintainers; [ federicoschonborn ]; 73 + }; 74 + })
+3 -3
pkgs/by-name/bu/buffrs/package.nix
··· 6 6 7 7 rustPlatform.buildRustPackage rec { 8 8 pname = "buffrs"; 9 - version = "0.10.0"; 9 + version = "0.11.0"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "helsing-ai"; 13 13 repo = "buffrs"; 14 14 tag = "v${version}"; 15 - hash = "sha256-lqSaXTuIXeuvS01i/35oLUU39FpVEpMoR3OSRstKhjI="; 15 + hash = "sha256-VHzPOFOkwz3QlDt25gBbishM4ujtEPFjA21WuiNVw00="; 16 16 }; 17 17 18 18 useFetchCargoVendor = true; 19 - cargoHash = "sha256-3urjpHMW46ZnPMsiaRgRyhFOKA+080MauNESRjf/W1Y="; 19 + cargoHash = "sha256-/cdBt23VSmwN/C2XdHeeRjUSqLWiEheqVl+hfEDKIP0="; 20 20 21 21 # Disabling tests meant to work over the network, as they will fail 22 22 # inside the builder.
+14 -2
pkgs/by-name/ch/charmcraft/package.nix
··· 7 7 cacert, 8 8 versionCheckHook, 9 9 writableTmpDirAsHomeHook, 10 + stdenv, 10 11 }: 11 12 let 12 13 version = "4.10.0"; ··· 26 27 substituteInPlace pyproject.toml --replace-fail "setuptools==75.8.0" "setuptools" 27 28 substituteInPlace craft_application/git/_git_repo.py --replace-fail "/snap/core22/current/etc/ssl/certs" "${cacert}/etc/ssl/certs" 28 29 ''; 30 + 31 + disabledTestPaths = [ 32 + # These tests assert outputs of commands that assume Ubuntu-related output. 33 + "tests/unit/services/test_lifecycle.py" 34 + ]; 35 + 36 + disabledTests = 37 + old.disabledTests 38 + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ 39 + "test_process_grammar_full" 40 + ]; 29 41 }); 30 42 }; 31 43 }; 32 44 in 33 45 python.pkgs.buildPythonApplication rec { 34 46 pname = "charmcraft"; 35 - version = "3.5.0"; 47 + version = "3.5.1"; 36 48 37 49 pyproject = true; 38 50 ··· 40 52 owner = "canonical"; 41 53 repo = "charmcraft"; 42 54 tag = version; 43 - hash = "sha256-NIOfjd4r9mDP0x1IpIVJlU+Aza0a17bc3jDxtInrf4A="; 55 + hash = "sha256-4zlUHttny6nIRhx/5aDz2sh1Va0+nN+7cezBGtt5Img="; 44 56 }; 45 57 46 58 postPatch = ''
+2 -2
pkgs/by-name/cl/clightning/package.nix
··· 28 28 in 29 29 stdenv.mkDerivation rec { 30 30 pname = "clightning"; 31 - version = "25.02.2"; 31 + version = "25.05"; 32 32 33 33 src = fetchurl { 34 34 url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; 35 - hash = "sha256-2wp9o1paWJWfxIvm9BDnsKX3GDUXKaPkpB89cwb6Oj8="; 35 + hash = "sha256-ANYzpjVw9kGdsNvXW1A7sEug9utGmJTab87SqJSdgAc="; 36 36 }; 37 37 38 38 # when building on darwin we need cctools to provide the correct libtool
+3 -3
pkgs/by-name/da/databricks-cli/package.nix
··· 10 10 11 11 buildGoModule (finalAttrs: { 12 12 pname = "databricks-cli"; 13 - version = "0.253.0"; 13 + version = "0.255.0"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "databricks"; 17 17 repo = "cli"; 18 18 rev = "v${finalAttrs.version}"; 19 - hash = "sha256-YSup167qj9yCgQEVf54ZYQ/zcprPWdQfkaTxh74eVCw="; 19 + hash = "sha256-UoBlrNvvUbhcx5TGskDDppvnMtS1MnThcn+AVPfCjhg="; 20 20 }; 21 21 22 22 # Otherwise these tests fail asserting that the version is 0.0.0-dev ··· 25 25 --replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}" 26 26 ''; 27 27 28 - vendorHash = "sha256-3tQgYRSCdEhnqUai8R2NFUR3gEDESQx0LfKlvKRF8Ss="; 28 + vendorHash = "sha256-HS6btkCtGToEwIjUwgdNqeHgAK3YMCLK13yAuEzr4Qs="; 29 29 30 30 excludedPackages = [ 31 31 "bundle/internal"
+8 -5
pkgs/by-name/de/debian-devscripts/package.nix
··· 1 1 { 2 2 lib, 3 3 stdenv, 4 - fetchurl, 4 + fetchFromGitLab, 5 5 fetchpatch, 6 6 xz, 7 7 dpkg, ··· 29 29 in 30 30 stdenv.mkDerivation (finalAttrs: { 31 31 pname = "debian-devscripts"; 32 - version = "2.25.14"; 32 + version = "2.25.15"; 33 33 34 - src = fetchurl { 35 - url = "mirror://debian/pool/main/d/devscripts/devscripts_${finalAttrs.version}.tar.xz"; 36 - hash = "sha256-z95BOgGNYFvleqCv8e6B7Tl91xPzgQHkcxIg55maXvQ="; 34 + src = fetchFromGitLab { 35 + domain = "salsa.debian.org"; 36 + owner = "debian"; 37 + repo = "devscripts"; 38 + tag = "v${finalAttrs.version}"; 39 + hash = "sha256-s2QSfJyHsFr1eiia/yFj3jsS5k38xNewEe/g5PFpqag="; 37 40 }; 38 41 39 42 patches = [
-1
pkgs/by-name/du/duperemove/package.nix
··· 57 57 homepage = "https://github.com/markfasheh/duperemove"; 58 58 license = licenses.gpl2Only; 59 59 maintainers = with maintainers; [ 60 - bluescreen303 61 60 thoughtpolice 62 61 ]; 63 62 platforms = platforms.linux;
+3 -3
pkgs/by-name/fa/faircamp/package.nix
··· 15 15 16 16 rustPlatform.buildRustPackage rec { 17 17 pname = "faircamp"; 18 - version = "1.4.0"; 18 + version = "1.4.2"; 19 19 20 20 src = fetchFromGitea { 21 21 domain = "codeberg.org"; 22 22 owner = "simonrepp"; 23 23 repo = "faircamp"; 24 24 rev = version; 25 - hash = "sha256-41mec9AdNdWRJz+5xFU7to/4LxIb7fEgm1EQVMAtyto="; 25 + hash = "sha256-68wo95SjiCBS8cikMGZpnpYx7AqyIQ/szXMorirwVPk="; 26 26 }; 27 27 28 28 useFetchCargoVendor = true; 29 29 30 - cargoHash = "sha256-xLRoI4MN1DApL4jXBXnMzsqTaOVUn2FZy3o2mTetvJ8="; 30 + cargoHash = "sha256-YyzzkWgjEKl46CfAkbFdum+AWCO0YGTXDh86mtHtCQs="; 31 31 32 32 buildFeatures = [ "libvips" ]; 33 33
+13 -24
pkgs/by-name/fb/fbv/package.nix
··· 1 1 { 2 2 lib, 3 3 stdenv, 4 - fetchurl, 5 - fetchpatch, 4 + fetchFromGitHub, 6 5 getopt, 7 6 libjpeg, 8 7 libpng12, 9 - giflib, 10 8 }: 11 9 12 - stdenv.mkDerivation rec { 10 + stdenv.mkDerivation (finalAttrs: { 13 11 pname = "fbv"; 14 - version = "1.0b"; 12 + version = "1.0c"; 15 13 16 - src = fetchurl { 17 - url = "http://s-tech.elsat.net.pl/fbv/fbv-${version}.tar.gz"; 18 - sha256 = "0g5b550vk11l639y8p5sx1v1i6ihgqk0x1hd0ri1bc2yzpdbjmcv"; 14 + src = fetchFromGitHub { 15 + owner = "jstkdng"; 16 + repo = "fbv"; 17 + tag = finalAttrs.version; 18 + hash = "sha256-4tAIFklKsx2uI+FQjq9vdolYm6d6YWugioG6k2ZUMrs="; 19 19 }; 20 20 21 - patches = [ 22 - (fetchpatch { 23 - url = "https://raw.githubusercontent.com/void-linux/void-packages/4a5bfe522ea5afd8203e804dc6a642d0871cd6dd/srcpkgs/fbv/patches/giflib-5.1.patch"; 24 - sha256 = "00q1zcn92yvvyij68bnq0m1sr3a411w914f4nyp6mpz0j5xc6dc7"; 25 - }) 26 - ]; 27 - 28 - patchFlags = [ "-p0" ]; 29 - 30 21 buildInputs = [ 31 22 getopt 32 23 libjpeg 33 24 libpng12 34 - giflib 35 25 ]; 36 - makeFlags = [ "LDFLAGS=-lgif" ]; 37 26 38 27 enableParallelBuilding = true; 39 28 ··· 41 30 mkdir -p $out/{bin,man/man1} 42 31 ''; 43 32 44 - meta = with lib; { 33 + meta = { 45 34 description = "View pictures on a linux framebuffer device"; 46 - homepage = "http://s-tech.elsat.net.pl/fbv/"; 47 - license = licenses.gpl2Only; 48 - maintainers = with maintainers; [ peterhoeg ]; 35 + homepage = "https://github.com/jstkdng/fbv"; 36 + license = lib.licenses.gpl2Only; 37 + maintainers = with lib.maintainers; [ peterhoeg ]; 49 38 mainProgram = "fbv"; 50 39 }; 51 - } 40 + })
+3 -3
pkgs/by-name/go/gollama/package.nix
··· 7 7 8 8 buildGoModule rec { 9 9 pname = "gollama"; 10 - version = "v1.33.2"; 10 + version = "v1.34.0"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "sammcj"; 14 14 repo = "gollama"; 15 15 tag = "v${version}"; 16 - hash = "sha256-WqbF1oWQBivtv3oV6UU8vDgT1re+WVgb89sTggs7uWw="; 16 + hash = "sha256-gWEm5aUVq2yfxuZ6GxITiAAsn5gj1HR9I7seyRX8DoA="; 17 17 }; 18 18 19 - vendorHash = "sha256-bXawl7ZanbVMA/ez+UOwQF1jV9VW5QH+0/2I50Biz4g="; 19 + vendorHash = "sha256-7e1wM2FDaQGAIhb0gERy/RgJupra1B52SgTV0EHD570="; 20 20 21 21 doCheck = false; 22 22
-1
pkgs/by-name/gp/gpac/package.nix
··· 51 51 homepage = "https://gpac.wp.imt.fr"; 52 52 license = licenses.lgpl21; 53 53 maintainers = with maintainers; [ 54 - bluescreen303 55 54 mgdelacroix 56 55 ]; 57 56 platforms = platforms.unix;
+3 -3
pkgs/by-name/id/ida-free/package.nix
··· 22 22 zlib, 23 23 }: 24 24 25 - stdenv.mkDerivation rec { 25 + stdenv.mkDerivation (finalAttrs: rec { 26 26 pname = "ida-free"; 27 27 version = "9.1"; 28 28 ··· 84 84 85 85 # IDA depends on quite some things extracted by the runfile, so first extract everything 86 86 # into $out/opt, then remove the unnecessary files and directories. 87 - IDADIR=$out/opt 87 + IDADIR=$out/opt/${finalAttrs.pname}-${finalAttrs.version} 88 88 89 89 # The installer doesn't honor `--prefix` in all places, 90 90 # thus needing to set `HOME` here. ··· 127 127 platforms = [ "x86_64-linux" ]; # Right now, the installation script only supports Linux. 128 128 sourceProvenance = with sourceTypes; [ binaryNativeCode ]; 129 129 }; 130 - } 130 + })
+2 -2
pkgs/by-name/ju/justbuild/package.nix
··· 33 33 in 34 34 stdenv.mkDerivation rec { 35 35 pname = "justbuild"; 36 - version = "1.5.2"; 36 + version = "1.5.3"; 37 37 38 38 src = fetchFromGitHub { 39 39 owner = "just-buildsystem"; 40 40 repo = "justbuild"; 41 41 rev = "refs/tags/v${version}"; 42 - hash = "sha256-Vde8/oOZ6djf4b/eXykzdsG+a+huWNbTZQFzr/YeXq4="; 42 + hash = "sha256-1qVe2s3MCmFm4hAwFwGn1jj6eVcBnvhvuK3OnNEuxQM="; 43 43 }; 44 44 45 45 bazelapi = fetchurl {
-1
pkgs/by-name/ke/keepassxc/package.nix
··· 142 142 libXi 143 143 libXtst 144 144 libargon2 145 - libsForQt5.kio 146 145 libsForQt5.qtbase 147 146 libsForQt5.qtsvg 148 147 minizip
+2 -2
pkgs/by-name/ko/komikku/package.nix
··· 23 23 24 24 python3.pkgs.buildPythonApplication rec { 25 25 pname = "komikku"; 26 - version = "1.79.1"; 26 + version = "1.80.0"; 27 27 pyproject = false; 28 28 29 29 src = fetchFromGitea { ··· 31 31 owner = "valos"; 32 32 repo = "Komikku"; 33 33 tag = "v${version}"; 34 - hash = "sha256-e3PRnltdYmHwGjjLgQfKXr+A+7spcRj4TzKIdNoMudM="; 34 + hash = "sha256-5+AosFjxaqhIoIz+mbin1oRdjuGj+p117aoHLxYqHDA="; 35 35 }; 36 36 37 37 nativeBuildInputs = [
+38 -5
pkgs/by-name/la/ladybird/package.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchFromGitHub, 5 - fetchurl, 6 5 cacert, 7 6 unicode-emoji, 8 7 unicode-character-database, 9 8 unicode-idna, 10 9 publicsuffix-list, 11 10 cmake, 11 + copyDesktopItems, 12 + makeDesktopItem, 12 13 ninja, 13 14 pkg-config, 14 15 curl, ··· 83 84 84 85 nativeBuildInputs = [ 85 86 cmake 87 + copyDesktopItems 86 88 ninja 87 89 pkg-config 88 90 python3 ··· 141 143 # https://github.com/LadybirdBrowser/ladybird/issues/371#issuecomment-2616415434 142 144 env.NIX_LDFLAGS = "-lGL -lfontconfig"; 143 145 144 - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' 145 - mkdir -p $out/Applications $out/bin 146 - mv $out/bundle/Ladybird.app $out/Applications 147 - ''; 146 + postInstall = 147 + '' 148 + for size in 48x48 128x128; do 149 + mkdir -p $out/share/icons/hicolor/$size/apps 150 + ln -s $out/share/Lagom/icons/$size/app-browser.png \ 151 + $out/share/icons/hicolor/$size/apps/ladybird.png 152 + done 153 + '' 154 + + lib.optionalString stdenv.hostPlatform.isDarwin '' 155 + mkdir -p $out/Applications $out/bin 156 + mv $out/bundle/Ladybird.app $out/Applications 157 + ''; 158 + 159 + desktopItems = [ 160 + (makeDesktopItem { 161 + name = "ladybird"; 162 + desktopName = "Ladybird"; 163 + exec = "Ladybird -- %U"; 164 + icon = "ladybird"; 165 + categories = [ 166 + "Network" 167 + "WebBrowser" 168 + ]; 169 + mimeTypes = [ 170 + "text/html" 171 + "application/xhtml+xml" 172 + "x-scheme-handler/http" 173 + "x-scheme-handler/https" 174 + ]; 175 + actions.new-window = { 176 + name = "New Window"; 177 + exec = "Ladybird --new-window -- %U"; 178 + }; 179 + }) 180 + ]; 148 181 149 182 # Only Ladybird and WebContent need wrapped, if Qt is enabled. 150 183 # On linux we end up wraping some non-Qt apps, like headless-browser.
+19 -24
pkgs/by-name/lg/lgpio/package.nix
··· 6 6 # If we build the python packages, these two are not null 7 7 buildPythonPackage ? null, 8 8 lgpioWithoutPython ? null, 9 - # When building a python Packages, this specifies the python subproject 9 + # When building a python Packages, this specifies the python subproject - a 10 + # folder in the repository. The current options are: 11 + # 12 + # - <empty> 13 + # - PY_LGPIO 14 + # - PY_RGPIO 15 + # 16 + # Where an empty value means 'build the non python project'. 10 17 pyProject ? "", 11 18 }: 12 19 ··· 28 35 swig 29 36 ]; 30 37 31 - preConfigure = 32 - if pyProject != "" then 33 - '' 34 - cd ${pyProject} 35 - '' 36 - else 37 - ""; 38 + preConfigure = lib.optionalString (pyProject != "") '' 39 + cd ${pyProject} 40 + ''; 38 41 # Emulate ldconfig when building the C API 39 - postConfigure = 40 - if pyProject == "" then 41 - '' 42 - substituteInPlace Makefile \ 43 - --replace ldconfig 'echo ldconfig' 44 - '' 45 - else 46 - ""; 42 + postConfigure = lib.optionalString (pyProject == "") '' 43 + substituteInPlace Makefile \ 44 + --replace ldconfig 'echo ldconfig' 45 + ''; 47 46 48 - preBuild = 49 - if pyProject == "PY_LGPIO" then 50 - '' 51 - swig -python lgpio.i 52 - '' 53 - else 54 - ""; 47 + preBuild = lib.optionalString (pyProject == "PY_LGPIO") '' 48 + swig -python lgpio.i 49 + ''; 55 50 56 51 buildInputs = [ 57 52 lgpioWithoutPython ··· 64 59 meta = { 65 60 description = "Linux C libraries and Python modules for manipulating GPIO"; 66 61 homepage = "https://github.com/joan2937/lg"; 67 - license = with lib.licenses; [ unlicense ]; 62 + license = lib.licenses.unlicense; 68 63 maintainers = with lib.maintainers; [ doronbehar ]; 69 64 platforms = lib.platforms.linux; 70 65 };
-2
pkgs/by-name/li/liblockfile/package.nix
··· 27 27 mainProgram = "dotlockfile"; 28 28 homepage = "http://packages.debian.org/unstable/libs/liblockfile1"; 29 29 license = lib.licenses.gpl2Plus; 30 - 31 - maintainers = [ lib.maintainers.bluescreen303 ]; 32 30 platforms = lib.platforms.all; 33 31 }; 34 32 }
-2
pkgs/by-name/lo/lockfileProgs/package.nix
··· 33 33 description = "Programs for locking and unlocking files and mailboxes"; 34 34 homepage = "http://packages.debian.org/sid/lockfile-progs"; 35 35 license = lib.licenses.gpl2Only; 36 - 37 - maintainers = [ lib.maintainers.bluescreen303 ]; 38 36 platforms = lib.platforms.all; 39 37 }; 40 38 }
-1
pkgs/by-name/lo/logcheck/package.nix
··· 49 49 ''; 50 50 homepage = "https://salsa.debian.org/debian/logcheck"; 51 51 license = licenses.gpl2Plus; 52 - maintainers = [ maintainers.bluescreen303 ]; 53 52 }; 54 53 }
+3 -3
pkgs/by-name/ne/netbird/package.nix
··· 31 31 in 32 32 buildGoModule (finalAttrs: { 33 33 pname = "netbird"; 34 - version = "0.46.0"; 34 + version = "0.47.1"; 35 35 36 36 src = fetchFromGitHub { 37 37 owner = "netbirdio"; 38 38 repo = "netbird"; 39 39 tag = "v${finalAttrs.version}"; 40 - hash = "sha256-31aTyk9mwjN8xvxS3TLXt2ss+nyO8oP29lc4Zej/wEs="; 40 + hash = "sha256-q9+yIq+FNcsZbmJjUjUxOEZn5jvfGfAE6Yt6Cc67rrg="; 41 41 }; 42 42 43 - vendorHash = "sha256-g4O0r+zJPiKAj3d+juYkGYPDh3I9aMF/kFjsguhOqIQ="; 43 + vendorHash = "sha256-t/X/muMwHVwg8Or+pFTSEQEsnkKLuApoVUmMhyCImWI="; 44 44 45 45 nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; 46 46
+1 -3
pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
··· 286 286 NIXOS_REBUILD_ATTR, 287 287 flake, 288 288 flake_build_flags | {"no_link": True}, 289 - quiet=True, 290 289 ) 291 290 else: 292 291 build_attr = BuildAttr.from_arg(args.attr, args.file) ··· 294 293 NIXOS_REBUILD_ATTR, 295 294 build_attr, 296 295 build_flags | {"no_out_link": True}, 297 - quiet=True, 298 296 ) 299 297 except CalledProcessError: 300 298 logger.warning( ··· 306 304 new = drv / f"bin/{EXECUTABLE}" 307 305 current = Path(argv[0]) 308 306 if new != current: 309 - logging.debug( 307 + logger.debug( 310 308 "detected newer version of script, re-exec'ing, current=%s, new=%s", 311 309 current, 312 310 new,
+2 -4
pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
··· 51 51 attr: str, 52 52 build_attr: BuildAttr, 53 53 build_flags: Args | None = None, 54 - quiet: bool = False, 55 54 ) -> Path: 56 55 """Build NixOS attribute using classic Nix. 57 56 ··· 64 63 build_attr.to_attr(attr), 65 64 *dict_to_flags(build_flags), 66 65 ] 67 - r = run_wrapper(run_args, stdout=PIPE, stderr=PIPE if quiet else None) 66 + r = run_wrapper(run_args, stdout=PIPE) 68 67 return Path(r.stdout.strip()) 69 68 70 69 ··· 72 71 attr: str, 73 72 flake: Flake, 74 73 flake_build_flags: Args | None = None, 75 - quiet: bool = False, 76 74 ) -> Path: 77 75 """Build NixOS attribute using Flakes. 78 76 ··· 86 84 flake.to_attr(attr), 87 85 *dict_to_flags(flake_build_flags), 88 86 ] 89 - r = run_wrapper(run_args, stdout=PIPE, stderr=PIPE if quiet else None) 87 + r = run_wrapper(run_args, stdout=PIPE) 90 88 return Path(r.stdout.strip()) 91 89 92 90
+1 -10
pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
··· 143 143 nr.NIXOS_REBUILD_ATTR, 144 144 nr.models.BuildAttr(ANY, ANY), 145 145 {"build": True, "no_out_link": True}, 146 - quiet=True, 147 146 ) 148 147 ] 149 148 ) ··· 185 184 186 185 nr.reexec(argv, args, {"build": True}, {"flake": True}) 187 186 mock_build.assert_called_once_with( 188 - "config.system.build.nixos-rebuild", 187 + nr.NIXOS_REBUILD_ATTR, 189 188 nr.models.Flake(ANY, ANY), 190 189 {"flake": True, "no_link": True}, 191 - quiet=True, 192 190 ) 193 191 # do not exec if there is no new version 194 192 mock_execve.assert_not_called() ··· 268 266 ], 269 267 check=True, 270 268 stdout=PIPE, 271 - stderr=None, 272 269 **DEFAULT_RUN_KWARGS, 273 270 ), 274 271 call( ··· 343 340 ], 344 341 check=True, 345 342 stdout=PIPE, 346 - stderr=None, 347 343 **DEFAULT_RUN_KWARGS, 348 344 ) 349 345 ] ··· 408 404 ], 409 405 check=True, 410 406 stdout=PIPE, 411 - stderr=None, 412 407 **DEFAULT_RUN_KWARGS, 413 408 ), 414 409 call( ··· 476 471 ], 477 472 check=True, 478 473 stdout=PIPE, 479 - stderr=None, 480 474 **DEFAULT_RUN_KWARGS, 481 475 ), 482 476 call( ··· 767 761 ], 768 762 check=True, 769 763 stdout=PIPE, 770 - stderr=None, 771 764 **DEFAULT_RUN_KWARGS, 772 765 ), 773 766 call( ··· 1035 1028 ], 1036 1029 check=True, 1037 1030 stdout=PIPE, 1038 - stderr=None, 1039 1031 **DEFAULT_RUN_KWARGS, 1040 1032 ) 1041 1033 ] ··· 1075 1067 ], 1076 1068 check=True, 1077 1069 stdout=PIPE, 1078 - stderr=None, 1079 1070 **DEFAULT_RUN_KWARGS, 1080 1071 ), 1081 1072 call(
+1 -25
pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
··· 36 36 "foo", 37 37 ], 38 38 stdout=PIPE, 39 - stderr=None, 40 39 ) 41 40 42 41 assert n.build( 43 - "config.system.build.attr", 44 - m.BuildAttr(Path("file"), "preAttr"), 45 - quiet=True, 42 + "config.system.build.attr", m.BuildAttr(Path("file"), "preAttr") 46 43 ) == Path("/path/to/file") 47 44 mock_run.assert_called_with( 48 45 ["nix-build", Path("file"), "--attr", "preAttr.config.system.build.attr"], 49 46 stdout=PIPE, 50 - stderr=PIPE, 51 47 ) 52 48 53 49 ··· 78 74 "foo", 79 75 ], 80 76 stdout=PIPE, 81 - stderr=None, 82 - ) 83 - 84 - assert n.build_flake( 85 - "config.system.build.toplevel", 86 - flake, 87 - None, 88 - quiet=True, 89 - ) == Path("/path/to/file") 90 - mock_run.assert_called_with( 91 - [ 92 - "nix", 93 - "--extra-experimental-features", 94 - "nix-command flakes", 95 - "build", 96 - "--print-out-paths", 97 - '.#nixosConfigurations."hostname".config.system.build.toplevel', 98 - ], 99 - stdout=PIPE, 100 - stderr=PIPE, 101 77 ) 102 78 103 79
+2 -2
pkgs/by-name/op/openmolcas/package.nix
··· 69 69 in 70 70 stdenv.mkDerivation rec { 71 71 pname = "openmolcas"; 72 - version = "25.02"; 72 + version = "25.06"; 73 73 74 74 src = fetchFromGitLab { 75 75 owner = "Molcas"; 76 76 repo = "OpenMolcas"; 77 77 rev = "v${version}"; 78 - hash = "sha256-Ty7C7zj1lQixuUzeKLcwQCmcPexZXtIGDzp1wUMKDi0="; 78 + hash = "sha256-/d+jusCFtbAVwvords2B7Cxuxh3FwnR/AWGDeir43oU="; 79 79 }; 80 80 81 81 patches = [
+11 -10
pkgs/by-name/pa/pagemon/package.nix
··· 5 5 ncurses, 6 6 }: 7 7 8 - stdenv.mkDerivation rec { 8 + stdenv.mkDerivation (finalAttrs: { 9 9 pname = "pagemon"; 10 - version = "0.01.18"; 10 + version = "0.02.05"; 11 11 12 12 src = fetchFromGitHub { 13 - sha256 = "1aq1mq3k8n70h81s64w2zg4kksw1y05326bn4y8p94lpaypvxqfd"; 14 - rev = "V${version}"; 13 + owner = "ColinIanKing"; 15 14 repo = "pagemon"; 16 - owner = "ColinIanKing"; 15 + tag = "V${finalAttrs.version}"; 16 + hash = "sha256-Crr1312wZ1IIwvODAUooZ0Lr75W0qdDQrr1sszaNHa4="; 17 17 }; 18 18 19 19 buildInputs = [ ncurses ]; ··· 21 21 makeFlags = [ 22 22 "BINDIR=$(out)/bin" 23 23 "MANDIR=$(out)/share/man/man8" 24 + "BASHDIR=$(out)/share/bash-completion/completions" 24 25 ]; 25 26 26 - meta = with lib; { 27 - inherit (src.meta) homepage; 27 + meta = { 28 + inherit (finalAttrs.src.meta) homepage; 28 29 description = "Interactive memory/page monitor for Linux"; 29 30 mainProgram = "pagemon"; 30 31 longDescription = '' ··· 37 38 pages of memory belonging data, code, heap, stack, anonymous mappings 38 39 or even swapped-out pages. 39 40 ''; 40 - license = licenses.gpl2Plus; 41 - platforms = platforms.linux; 41 + license = lib.licenses.gpl2Plus; 42 + platforms = lib.platforms.linux; 42 43 }; 43 - } 44 + })
+1 -1
pkgs/by-name/pi/pigpio/package.nix
··· 28 28 meta = { 29 29 description = "C library for the Raspberry which allows control of the General Purpose Input Outputs (GPIO)"; 30 30 homepage = "https://github.com/joan2937/pigpio"; 31 - license = with lib.licenses; [ unlicense ]; 31 + license = lib.licenses.unlicense; 32 32 maintainers = with lib.maintainers; [ doronbehar ]; 33 33 platforms = lib.platforms.linux; 34 34 };
+2 -2
pkgs/by-name/pi/piscope/package.nix
··· 23 23 hash = "sha256-VDrx/RLSpMhyD64PmdeWVacb9LleHakcy7D6zFxeyhw="; 24 24 }; 25 25 # Fix FHS paths 26 - postConfigure = '' 26 + postPatch = '' 27 27 substituteInPlace piscope.c \ 28 - --replace /usr/share/piscope $out/share/piscope 28 + --replace-fail /usr/share/piscope $out/share/piscope 29 29 ''; 30 30 31 31 nativeBuildInputs = [
+33
pkgs/by-name/rc/rcon-cli/package.nix
··· 1 + { 2 + buildGoModule, 3 + fetchFromGitHub, 4 + lib, 5 + nix-update-script, 6 + }: 7 + buildGoModule (finalAttrs: { 8 + pname = "rcon-cli"; 9 + version = "1.7.0"; 10 + 11 + src = fetchFromGitHub { 12 + owner = "itzg"; 13 + repo = "rcon-cli"; 14 + tag = finalAttrs.version; 15 + hash = "sha256-1dexjVfbqTzq9RLhVPn0gRcdJTa/AFj8BiQLoD0/L5c="; 16 + }; 17 + 18 + vendorHash = "sha256-xq1Z6cgUqXXVzc/j54Nul6xAXa5gKh3NeenQoMW+Xpg="; 19 + subPackages = [ "." ]; 20 + 21 + passthru.updateScript = nix-update-script { }; 22 + 23 + meta = { 24 + description = "Little RCON cli based on james4k's RCON library for golang"; 25 + homepage = "https://github.com/itzg/rcon-cli"; 26 + changelog = "https://github.com/itzg/rcon-cli/releases/tag/${finalAttrs.version}"; 27 + license = lib.licenses.asl20; 28 + maintainers = with lib.maintainers; [ 29 + link00000000 30 + ]; 31 + mainProgram = "rcon-cli"; 32 + }; 33 + })
+2 -2
pkgs/by-name/rd/rdma-core/package.nix
··· 17 17 18 18 stdenv.mkDerivation (finalAttrs: { 19 19 pname = "rdma-core"; 20 - version = "57.0"; 20 + version = "58.0"; 21 21 22 22 src = fetchFromGitHub { 23 23 owner = "linux-rdma"; 24 24 repo = "rdma-core"; 25 25 rev = "v${finalAttrs.version}"; 26 - hash = "sha256-vE0HKsNQNB+Nfxh7BNGadweZQC+e8HFbI89iJhSg40o="; 26 + hash = "sha256-dCaxZeGmnf46XI0RZjVWy1JsQjpdCw63lbe2RkWNwQs="; 27 27 }; 28 28 29 29 strictDeps = true;
+2 -2
pkgs/by-name/re/remind/package.nix
··· 16 16 17 17 tcl.mkTclDerivation rec { 18 18 pname = "remind"; 19 - version = "05.04.00"; 19 + version = "05.04.01"; 20 20 21 21 src = fetchFromGitea { 22 22 domain = "git.skoll.ca"; 23 23 owner = "Skollsoft-Public"; 24 24 repo = "Remind"; 25 25 rev = version; 26 - hash = "sha256-O+rAXUl5vEBEl/S3FvBzofbcydFul0mF5NhT2Fzf6n8="; 26 + hash = "sha256-PTaEGRYZS+yBINwP7EJE4NfgGpB1RTOsDNtzxljZYZA="; 27 27 }; 28 28 29 29 propagatedBuildInputs = lib.optionals withGui [
-1
pkgs/by-name/sa/safecopy/package.nix
··· 30 30 license = lib.licenses.gpl2Plus; 31 31 32 32 platforms = lib.platforms.linux; 33 - maintainers = [ lib.maintainers.bluescreen303 ]; 34 33 mainProgram = "safecopy"; 35 34 }; 36 35 }
+3 -3
pkgs/by-name/se/seaweedfs/package.nix
··· 8 8 9 9 buildGoModule rec { 10 10 pname = "seaweedfs"; 11 - version = "3.89"; 11 + version = "3.91"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "seaweedfs"; 15 15 repo = "seaweedfs"; 16 16 rev = version; 17 - hash = "sha256-qIbqgcm+qqmbKU+BZ9wrKW16yH7qz5WPijtGz2pusNg="; 17 + hash = "sha256-wKllXSOYxBtWrncTXa/nXYVke9ZNDL8QND5Sk5gmJW4="; 18 18 }; 19 19 20 - vendorHash = "sha256-Y1ST5wKIkVKOhNVV1V9eDZ5DupQNm9mcA90Kqt3dQYQ="; 20 + vendorHash = "sha256-6qMBiXYSpv6ibuH0Ro8y72a2cIdB9RMuD6j/E8ILkvs="; 21 21 22 22 subPackages = [ "weed" ]; 23 23
+3 -2
pkgs/by-name/sn/snapcraft/package.nix
··· 14 14 15 15 python312Packages.buildPythonApplication rec { 16 16 pname = "snapcraft"; 17 - version = "8.9.2"; 17 + version = "8.9.4"; 18 18 19 19 pyproject = true; 20 20 ··· 22 22 owner = "canonical"; 23 23 repo = "snapcraft"; 24 24 tag = version; 25 - hash = "sha256-4Dv2q/aKWnQkQ6ANYev/5fT1fFKh1MytYJtHK0iAzhk="; 25 + hash = "sha256-iiz+sVncztaCNndU+4YMhxECw7R6ks+25apRnd0WgyM="; 26 26 }; 27 27 28 28 patches = [ ··· 111 111 "docutils" 112 112 "jsonschema" 113 113 "pygit2" 114 + "requests" 114 115 "urllib3" 115 116 "validators" 116 117 ];
-1
pkgs/by-name/sp/spice-protocol/package.nix
··· 29 29 description = "Protocol headers for the SPICE protocol"; 30 30 homepage = "https://www.spice-space.org/"; 31 31 license = licenses.bsd3; 32 - maintainers = with maintainers; [ bluescreen303 ]; 33 32 platforms = platforms.all; 34 33 }; 35 34 }
-1
pkgs/by-name/sp/spice/package.nix
··· 108 108 license = licenses.lgpl21; 109 109 110 110 maintainers = with maintainers; [ 111 - bluescreen303 112 111 atemu 113 112 ]; 114 113 platforms = with platforms; linux ++ darwin;
+3 -3
pkgs/by-name/tb/tbls/package.nix
··· 10 10 11 11 buildGoModule rec { 12 12 pname = "tbls"; 13 - version = "1.85.4"; 13 + version = "1.85.5"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "k1LoW"; 17 17 repo = "tbls"; 18 18 tag = "v${version}"; 19 - hash = "sha256-K+GIETe/SpBCgJS7KD8Rw8z1zrmnXdYjjTyl36pUzmg="; 19 + hash = "sha256-djIGgZ5qehrkQZlxe2+3XzRb5FfewZVcquYiitGfFdo="; 20 20 }; 21 21 22 - vendorHash = "sha256-Sqr5UiT4NNiFKNEqZRDbS92AYa9SKWqYTYl4Ljx/raY="; 22 + vendorHash = "sha256-9IvnIFOlLdqmntisNomO5K6PU8gw7CSuEb46zG5ox2A="; 23 23 24 24 excludedPackages = [ "scripts/jsonschema" ]; 25 25
+4 -4
pkgs/by-name/te/texlab/package.nix
··· 14 14 in 15 15 rustPlatform.buildRustPackage rec { 16 16 pname = "texlab"; 17 - version = "5.22.1"; 17 + version = "5.23.0"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "latex-lsp"; 21 21 repo = "texlab"; 22 22 tag = "v${version}"; 23 - hash = "sha256-ldbWENQa7ZiBSx1b1JgChIgadqzHEPvUyOdHVgW6MSU="; 23 + hash = "sha256-bKjogyIPrP3USDHsI4m8u44T+WYF1kyDz8eRpZ4j/xU="; 24 24 }; 25 25 26 26 useFetchCargoVendor = true; 27 - cargoHash = "sha256-omMisd2lY9BPIp/0yJ5Eg3pAIvwIWcEJE0ygTj2yqwo="; 27 + cargoHash = "sha256-Dblnlh9l3tQI4IYWVZdpLz0Hyvg4SY6O5R3Naz515QQ="; 28 28 29 29 outputs = [ "out" ] ++ lib.optional (!isCross) "man"; 30 30 ··· 38 38 # generate the man page 39 39 postInstall = lib.optionalString (!isCross) '' 40 40 # TexLab builds man page separately in CI: 41 - # https://github.com/latex-lsp/texlab/blob/v5.21.0/.github/workflows/publish.yml#L110-L114 41 + # https://github.com/latex-lsp/texlab/blob/v5.23.0/.github/workflows/publish.yml#L110-L114 42 42 help2man --no-info "$out/bin/texlab" > texlab.1 43 43 installManPage texlab.1 44 44 '';
+3 -3
pkgs/by-name/ui/uiua/unstable.nix
··· 1 1 rec { 2 - version = "0.16.2"; 2 + version = "0.17.0-dev.1"; 3 3 tag = version; 4 - hash = "sha256-YX2okLBN+6celACktfLgTO4NJPvEalrS/C885qwAp8A="; 5 - cargoHash = "sha256-aoHqcE+0OaxZAxjAZUdSmAuLaI0kiRfbPhaFjNvFce8="; 4 + hash = "sha256-Tsj0De4qdV8R4XVP5Oihk7HlgG4EysfQ9aUo0MZO94A="; 5 + cargoHash = "sha256-upBPtoivWh07w87jNu5mjS5Yj+slsJtAIMAOjX1MZaM="; 6 6 updateScript = ./update-unstable.sh; 7 7 }
-2
pkgs/by-name/vo/vobcopy/package.nix
··· 28 28 description = "Copies DVD .vob files to harddisk, decrypting them on the way"; 29 29 homepage = "http://vobcopy.org/projects/c/c.shtml"; 30 30 license = lib.licenses.gpl2Plus; 31 - 32 - maintainers = [ lib.maintainers.bluescreen303 ]; 33 31 platforms = lib.platforms.all; 34 32 mainProgram = "vobcopy"; 35 33 };
+4 -3
pkgs/by-name/we/weblate/package.nix
··· 27 27 in 28 28 python.pkgs.buildPythonApplication rec { 29 29 pname = "weblate"; 30 - version = "5.11.4"; 30 + version = "5.12.1"; 31 31 32 32 pyproject = true; 33 33 ··· 40 40 owner = "WeblateOrg"; 41 41 repo = "weblate"; 42 42 tag = "weblate-${version}"; 43 - hash = "sha256-0/PYl8A95r0xulaSawnSyrSqB7SiEBgd9TVP7OIla00="; 43 + hash = "sha256-8tqPxvSvVG1j/TGMozihtBYsn7oly41lP4iK3BwTmVk="; 44 44 }; 45 45 46 46 patches = [ ··· 135 135 siphashc 136 136 social-auth-app-django 137 137 social-auth-core 138 + standardwebhooks 138 139 tesserocr 139 140 translate-toolkit 140 141 translation-finder ··· 149 150 ++ drf-spectacular.optional-dependencies.sidecar 150 151 ++ drf-standardized-errors.optional-dependencies.openapi; 151 152 152 - pythonRelaxDeps = [ "django-otp-webauthn" ]; 153 + pythonRelaxDeps = [ "certifi" ]; 153 154 154 155 optional-dependencies = { 155 156 postgres = with python.pkgs; [ psycopg ];
+14
pkgs/development/lua-modules/overrides.nix
··· 949 949 }) 950 950 ) { }; 951 951 952 + rocks-dev-nvim = prev.rocks-dev-nvim.overrideAttrs (oa: { 953 + 954 + doCheck = true; 955 + nativeCheckInputs = [ 956 + final.nlua 957 + final.busted 958 + ]; 959 + checkPhase = '' 960 + runHook preCheck 961 + busted spec 962 + runHook postCheck 963 + ''; 964 + }); 965 + 952 966 rtp-nvim = prev.rtp-nvim.overrideAttrs (oa: { 953 967 doCheck = lua.luaversion == "5.1"; 954 968 nativeCheckInputs = [
+4 -1
pkgs/development/ocaml-modules/z3/default.nix
··· 36 36 ''; 37 37 38 38 nativeBuildInputs = [ findlib ]; 39 - propagatedBuildInputs = [ zarith ]; 39 + propagatedBuildInputs = [ 40 + z3-with-ocaml.lib 41 + zarith 42 + ]; 40 43 41 44 strictDeps = true; 42 45
+2 -2
pkgs/development/python-modules/altcha/default.nix
··· 8 8 9 9 buildPythonPackage rec { 10 10 pname = "altcha"; 11 - version = "0.1.9"; 11 + version = "0.2.0"; 12 12 pyproject = true; 13 13 14 14 src = fetchFromGitHub { 15 15 owner = "altcha-org"; 16 16 repo = "altcha-lib-py"; 17 17 tag = "v${version}"; 18 - hash = "sha256-54v8c/yp5zhJU151UaTxeJ1FDmbPs2TcfxomrMhFVZc="; 18 + hash = "sha256-QZSj24dyfdgAeHSCWcmWKr35VWjGM3kQyh9o77bHOgY="; 19 19 }; 20 20 21 21 build-system = [ setuptools ];
+13 -4
pkgs/development/python-modules/craft-application/default.nix
··· 127 127 "test_process_grammar_build_for" 128 128 "test_process_grammar_platform" 129 129 "test_process_grammar_default" 130 + "test_create_craft_manifest" 131 + "test_create_project_manifest" 132 + "test_from_packed_artifact" 133 + "test_teardown_session_create_manifest" 130 134 ]; 131 135 132 - disabledTestPaths = [ 133 - # These tests assert outputs of commands that assume Ubuntu-related output. 134 - "tests/unit/services/test_lifecycle.py" 135 - ]; 136 + disabledTestPaths = 137 + [ 138 + # These tests assert outputs of commands that assume Ubuntu-related output. 139 + "tests/unit/services/test_lifecycle.py" 140 + ] 141 + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ 142 + # Hard-coded assumptions around use of "amd64" arch strings. 143 + "tests/unit/services/test_project.py" 144 + ]; 136 145 137 146 passthru.updateScript = nix-update-script { }; 138 147
+2
pkgs/development/python-modules/craft-parts/default.nix
··· 109 109 # These tests have hardcoded "amd64" strings which fail on aarch64 110 110 "tests/unit/executor/test_environment.py" 111 111 "tests/unit/features/overlay/test_executor_environment.py" 112 + # Hard-coded assumptions about arguments relating to 'x86_64' 113 + "tests/unit/plugins/test_dotnet_v2_plugin.py" 112 114 ]; 113 115 114 116 passthru.updateScript = nix-update-script { };
+3 -3
pkgs/development/python-modules/pint-xarray/default.nix
··· 12 12 13 13 buildPythonPackage rec { 14 14 pname = "pint-xarray"; 15 - version = "0.4"; 15 + version = "0.5.0"; 16 16 pyproject = true; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "xarray-contrib"; 20 20 repo = "pint-xarray"; 21 21 tag = "v${version}"; 22 - hash = "sha256-IFHSgrnqS7ZpNhRzzSgHPRUP90WNv84jBH4um/DRMCU="; 22 + hash = "sha256-fvVIQagrL1QvIcN/mePx6cT8mbsvx08vu6tGc4tuLwc="; 23 23 }; 24 24 25 25 build-system = [ ··· 44 44 meta = { 45 45 description = "Interface for using pint with xarray, providing convenience accessors"; 46 46 homepage = "https://github.com/xarray-contrib/pint-xarray"; 47 - changelog = "https://github.com/xarray-contrib/pint-xarray/blob/v${version}/docs/whats-new.rst"; 47 + changelog = "https://github.com/xarray-contrib/pint-xarray/blob/${src.tag}/docs/whats-new.rst"; 48 48 license = lib.licenses.asl20; 49 49 maintainers = with lib.maintainers; [ doronbehar ]; 50 50 };
+2 -2
pkgs/development/python-modules/python-octaviaclient/default.nix
··· 30 30 31 31 buildPythonPackage rec { 32 32 pname = "python-octaviaclient"; 33 - version = "3.11.0"; 33 + version = "3.11.1"; 34 34 pyproject = true; 35 35 36 36 src = fetchPypi { 37 37 pname = "python_octaviaclient"; 38 38 inherit version; 39 - hash = "sha256-IzB40LIn8iW7sO6eB8NgnpFc/vBhfZv4HLMXpgpdP1U="; 39 + hash = "sha256-M+JRUMsTq46+UpqSKFzvtRXsaboUKTuqwWs29v09q04="; 40 40 }; 41 41 42 42 # somehow python-neutronclient cannot be found despite it being supplied
+2 -2
pkgs/development/python-modules/weblate-schemas/default.nix
··· 13 13 14 14 buildPythonPackage rec { 15 15 pname = "weblate-schemas"; 16 - version = "2025.1"; 16 + version = "2025.2"; 17 17 18 18 pyproject = true; 19 19 20 20 src = fetchPypi { 21 21 pname = "weblate_schemas"; 22 22 inherit version; 23 - hash = "sha256-R2G5s51XmZfc3qewNGv5D9K03pvCFeod4RH4VtY9cAA="; 23 + hash = "sha256-C8+p+NHCAbLnHh8ujV5YdbjFSzXsKAoUyNhM3iIRPG4="; 24 24 }; 25 25 26 26 build-system = [ setuptools ];
-1
pkgs/os-specific/linux/i7z/default.nix
··· 58 58 mainProgram = "i7z"; 59 59 homepage = "https://github.com/DimitryAndric/i7z"; 60 60 license = licenses.gpl2Only; 61 - maintainers = with maintainers; [ bluescreen303 ]; 62 61 # broken on ARM 63 62 platforms = [ "x86_64-linux" ]; 64 63 };
-1
pkgs/servers/nosql/mongodb/mongodb.nix
··· 188 188 inherit license; 189 189 190 190 maintainers = with maintainers; [ 191 - bluescreen303 192 191 offline 193 192 ]; 194 193 platforms = subtractLists systems.doubles.i686 systems.doubles.unix;
-1
pkgs/servers/nosql/rethinkdb/default.nix
··· 83 83 platforms = lib.platforms.unix; 84 84 maintainers = with lib.maintainers; [ 85 85 thoughtpolice 86 - bluescreen303 87 86 ]; 88 87 }; 89 88 }
+19
pkgs/servers/varnish/default.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchurl, 5 + fetchpatch2, 5 6 pcre, 6 7 pcre2, 7 8 jemalloc, ··· 55 56 ++ lib.optional stdenv.hostPlatform.isLinux jemalloc; 56 57 57 58 buildFlags = [ "localstatedir=/var/run" ]; 59 + 60 + patches = 61 + lib.optionals (stdenv.isDarwin && lib.versionAtLeast version "7.7") [ 62 + # Fix VMOD section attribute on macOS 63 + # Unreleased commit on master 64 + (fetchpatch2 { 65 + url = "https://github.com/varnishcache/varnish-cache/commit/a95399f5b9eda1bfdba6ee6406c30a1ed0720167.patch"; 66 + hash = "sha256-T7DIkmnq0O+Cr9DTJS4/rOtg3J6PloUo8jHMWoUZYYk="; 67 + }) 68 + # Fix endian.h compatibility on macOS 69 + # PR: https://github.com/varnishcache/varnish-cache/pull/4339 70 + ./patches/0001-fix-endian-h-compatibility-on-macos.patch 71 + ] 72 + ++ lib.optionals (stdenv.isDarwin && lib.versionOlder version "7.6") [ 73 + # Fix duplicate OS_CODE definitions on macOS 74 + # PR: https://github.com/varnishcache/varnish-cache/pull/4347 75 + ./patches/0002-fix-duplicate-os-code-definitions-on-macos.patch 76 + ]; 58 77 59 78 postPatch = '' 60 79 substituteInPlace bin/varnishtest/vtc_main.c --replace /bin/rm "${coreutils}/bin/rm"
+43
pkgs/servers/varnish/patches/0001-fix-endian-h-compatibility-on-macos.patch
··· 1 + From 7a1c7020db85699e0693d637f6e31d49bf9ca3d0 Mon Sep 17 00:00:00 2001 2 + From: Rui Chen <rui@chenrui.dev> 3 + Date: Sun, 25 May 2025 23:54:29 -0400 4 + Subject: [PATCH] libvarnish: Fix endian.h compatibility for macOS builds 5 + 6 + Signed-off-by: Rui Chen <rui@chenrui.dev> 7 + --- 8 + lib/libvarnish/vsha256.c | 12 ++++++++---- 9 + 1 file changed, 8 insertions(+), 4 deletions(-) 10 + 11 + diff --git a/lib/libvarnish/vsha256.c b/lib/libvarnish/vsha256.c 12 + index 29f97fe40..541b6e612 100644 13 + --- a/lib/libvarnish/vsha256.c 14 + +++ b/lib/libvarnish/vsha256.c 15 + @@ -31,7 +31,14 @@ 16 + 17 + #include "config.h" 18 + 19 + -#ifndef __DARWIN_BYTE_ORDER 20 + +#ifdef __APPLE__ 21 + +# include <machine/endian.h> 22 + +# include <libkern/OSByteOrder.h> 23 + +# define htobe32(x) OSSwapHostToBigInt32(x) 24 + +# define htobe64(x) OSSwapHostToBigInt64(x) 25 + +# define VBYTE_ORDER __DARWIN_BYTE_ORDER 26 + +# define VBIG_ENDIAN __DARWIN_BIG_ENDIAN 27 + +#else 28 + # include <endian.h> 29 + # ifdef _BYTE_ORDER 30 + # define VBYTE_ORDER _BYTE_ORDER 31 + @@ -43,9 +50,6 @@ 32 + # else 33 + # define VBIG_ENDIAN __BIG_ENDIAN 34 + # endif 35 + -#else 36 + -# define VBYTE_ORDER __DARWIN_BYTE_ORDER 37 + -# define VBIG_ENDIAN __DARWIN_BIG_ENDIAN 38 + #endif 39 + 40 + #ifndef VBYTE_ORDER 41 + -- 42 + 2.49.0 43 +
+43
pkgs/servers/varnish/patches/0002-fix-duplicate-os-code-definitions-on-macos.patch
··· 1 + From f56b314408d22252bf62d6cd2e098cf8139bd048 Mon Sep 17 00:00:00 2001 2 + From: Sander <hey@sandydoo.me> 3 + Date: Fri, 13 Jun 2025 01:12:59 +0200 4 + Subject: [PATCH] build: fix duplicate OS_CODE definitions on macOS 5 + 6 + `TARGET_OS_MAC` and `__APPLE__` are both true on macOS, which results in 7 + duplicate definitions for `OS_CODE`. 8 + 9 + Upstream removed the check for `TARGET_OS_MAC`, as well as the ancient 10 + compat code, in 11 + https://github.com/madler/zlib/commit/4bd9a71f3539b5ce47f0c67ab5e01f3196dc8ef9. 12 + 13 + This was fixed in varnish >= 7.6 as part of https://github.com/varnishcache/varnish-cache/commit/86df12b6c1ad8208899ea353fdcbea227356fcf8. 14 + --- 15 + lib/libvgz/zutil.h | 11 +---------- 16 + 1 file changed, 1 insertion(+), 10 deletions(-) 17 + 18 + diff --git a/lib/libvgz/zutil.h b/lib/libvgz/zutil.h 19 + index 1c80e3842..294ea2b2d 100644 20 + --- a/lib/libvgz/zutil.h 21 + +++ b/lib/libvgz/zutil.h 22 + @@ -137,17 +137,8 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ 23 + # endif 24 + #endif 25 + 26 + -#if defined(MACOS) || defined(TARGET_OS_MAC) 27 + +#if defined(MACOS) 28 + # define OS_CODE 7 29 + -# ifndef Z_SOLO 30 + -# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os 31 + -# include <unix.h> /* for fdopen */ 32 + -# else 33 + -# ifndef fdopen 34 + -# define fdopen(fd,mode) NULL /* No fdopen() */ 35 + -# endif 36 + -# endif 37 + -# endif 38 + #endif 39 + 40 + #ifdef __acorn 41 + -- 42 + 2.49.0 43 +
-1
pkgs/tools/misc/youtube-dl/default.nix
··· 104 104 ''; 105 105 license = licenses.publicDomain; 106 106 maintainers = with maintainers; [ 107 - bluescreen303 108 107 fpletz 109 108 ]; 110 109 platforms = with platforms; linux ++ darwin;