lol

Merge staging-next into staging

authored by

nixpkgs-ci[bot] and committed by
GitHub
62ee7d82 f88c95a3

+1034 -735
+2
nixos/modules/services/misc/paperless.nix
··· 331 331 ExecStart = "${cfg.package}/bin/celery --app paperless beat --loglevel INFO"; 332 332 Restart = "on-failure"; 333 333 LoadCredential = lib.optionalString (cfg.passwordFile != null) "PAPERLESS_ADMIN_PASSWORD:${cfg.passwordFile}"; 334 + PrivateNetwork = cfg.database.createLocally; # defaultServiceConfig enables this by default, needs to be disabled for remote DBs 334 335 }; 335 336 environment = env; 336 337 ··· 407 408 User = cfg.user; 408 409 ExecStart = "${cfg.package}/bin/paperless-ngx document_consumer"; 409 410 Restart = "on-failure"; 411 + PrivateNetwork = cfg.database.createLocally; # defaultServiceConfig enables this by default, needs to be disabled for remote DBs 410 412 }; 411 413 environment = env; 412 414 # Allow the consumer to access the private /tmp directory of the server.
+8 -1
nixos/modules/services/web-servers/nginx/default.nix
··· 1333 1333 restartTriggers = optionals cfg.enableReload [ configFile ]; 1334 1334 # Block reloading if not all certs exist yet. 1335 1335 # Happens when config changes add new vhosts/certs. 1336 - unitConfig.ConditionPathExists = optionals (sslServices != []) (map (certName: certs.${certName}.directory + "/fullchain.pem") vhostCertNames); 1336 + unitConfig = { 1337 + ConditionPathExists = optionals (sslServices != []) (map (certName: certs.${certName}.directory + "/fullchain.pem") vhostCertNames); 1338 + # Disable rate limiting for this, because it may be triggered quickly a bunch of times 1339 + # if a lot of certificates are renewed in quick succession. The reload itself is cheap, 1340 + # so even doing a lot of them in a short burst is fine. 1341 + # FIXME: there's probably a better way to do this. 1342 + StartLimitIntervalSec = 0; 1343 + }; 1337 1344 serviceConfig = { 1338 1345 Type = "oneshot"; 1339 1346 TimeoutSec = 60;
+4 -1
nixos/tests/headscale.nix
··· 13 13 in 14 14 { 15 15 name = "headscale"; 16 - meta.maintainers = with lib.maintainers; [ misterio77 ]; 16 + meta.maintainers = with lib.maintainers; [ 17 + kradalby 18 + misterio77 19 + ]; 17 20 18 21 nodes = 19 22 let
+2 -3
pkgs/applications/audio/espeak-ng/default.nix
··· 9 9 libtool, 10 10 pkg-config, 11 11 ronn, 12 - substituteAll, 12 + replaceVars, 13 13 buildPackages, 14 14 mbrolaSupport ? true, 15 15 mbrola, ··· 45 45 ] 46 46 ++ lib.optionals mbrolaSupport [ 47 47 # Hardcode correct mbrola paths. 48 - (substituteAll { 49 - src = ./mbrola.patch; 48 + (replaceVars ./mbrola.patch { 50 49 inherit mbrola; 51 50 }) 52 51 ];
+2 -3
pkgs/applications/display-managers/lightdm/default.nix
··· 4 4 buildPackages, 5 5 fetchFromGitHub, 6 6 nix-update-script, 7 - substituteAll, 7 + replaceVars, 8 8 plymouth, 9 9 pam, 10 10 pkg-config, ··· 85 85 # Hardcode plymouth to fix transitions. 86 86 # For some reason it can't find `plymouth` 87 87 # even when it's in PATH in environment.systemPackages. 88 - (substituteAll { 89 - src = ./fix-paths.patch; 88 + (replaceVars ./fix-paths.patch { 90 89 plymouth = "${plymouth}/bin/plymouth"; 91 90 }) 92 91 ];
+2 -3
pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix
··· 3 3 codeium, 4 4 fetchFromGitHub, 5 5 melpaBuild, 6 - substituteAll, 6 + replaceVars, 7 7 gitUpdater, 8 8 }: 9 9 ··· 19 19 }; 20 20 21 21 patches = [ 22 - (substituteAll { 23 - src = ./0000-set-codeium-command-executable.patch; 22 + (replaceVars ./0000-set-codeium-command-executable.patch { 24 23 codeium = lib.getExe' codeium "codeium_language_server"; 25 24 }) 26 25 ];
+2 -2
pkgs/applications/editors/neovim/wrapper.nix
··· 23 23 # certain plugins need a custom configuration (available in passthru.initLua) 24 24 # to work with nix. 25 25 # if true, the wrapper automatically appends those snippets when necessary 26 - , autoconfigure ? false 26 + , autoconfigure ? true 27 27 28 28 # append to PATH runtime deps of plugins 29 - , autowrapRuntimeDeps ? false 29 + , autowrapRuntimeDeps ? true 30 30 31 31 # should contain all args but the binary. Can be either a string or list 32 32 , wrapperArgs ? []
+12 -19
pkgs/applications/editors/vim/plugins/overrides.nix
··· 11 11 fetchurl, 12 12 neovimUtils, 13 13 replaceVars, 14 - substituteAll, 15 14 # Language dependencies 16 15 fetchYarnDeps, 17 16 mkYarnModules, ··· 58 57 tmux, 59 58 tup, 60 59 typescript, 60 + typescript-language-server, 61 61 vim, 62 62 which, 63 63 xdg-utils, ··· 188 188 189 189 aw-watcher-vim = super.aw-watcher-vim.overrideAttrs { 190 190 patches = [ 191 - (substituteAll { 192 - src = ./patches/aw-watcher-vim/program_paths.patch; 191 + (replaceVars ./patches/aw-watcher-vim/program_paths.patch { 193 192 curl = lib.getExe curl; 194 193 }) 195 194 ]; ··· 1103 1102 super.fruzzy.overrideAttrs (old: { 1104 1103 buildInputs = [ nim1 ]; 1105 1104 patches = [ 1106 - (substituteAll { 1107 - src = ./patches/fruzzy/get_version.patch; 1105 + (replaceVars ./patches/fruzzy/get_version.patch { 1108 1106 inherit (old) version; 1109 1107 }) 1110 1108 ]; ··· 1243 1241 1244 1242 gx-nvim = super.gx-nvim.overrideAttrs { 1245 1243 patches = lib.optionals stdenv.hostPlatform.isLinux [ 1246 - (substituteAll { 1247 - src = ./patches/gx-nvim/fix-paths.patch; 1244 + (replaceVars ./patches/gx-nvim/fix-paths.patch { 1248 1245 inherit xdg-utils; 1249 1246 }) 1250 1247 ]; ··· 1530 1527 # https://github.com/NixOS/nixpkgs/pull/105810#issuecomment-740007985 1531 1528 # https://github.com/camspiers/lens.vim/pull/40/files 1532 1529 patches = [ 1533 - (substituteAll { 1534 - src = ./patches/lens-vim/remove_duplicate_g_lens_animate.patch; 1535 - inherit languagetool; 1536 - }) 1530 + ./patches/lens-vim/remove_duplicate_g_lens_animate.patch 1537 1531 ]; 1538 1532 }; 1539 1533 ··· 1662 1656 in 1663 1657 super.markdown-preview-nvim.overrideAttrs { 1664 1658 patches = [ 1665 - (substituteAll { 1666 - src = ./markdown-preview-nvim/fix-node-paths.patch; 1659 + (replaceVars ./markdown-preview-nvim/fix-node-paths.patch { 1667 1660 node = "${nodejs}/bin/node"; 1668 1661 }) 1669 1662 ]; ··· 2573 2566 "openscad.utilities" 2574 2567 ]; 2575 2568 patches = [ 2576 - (substituteAll { 2577 - src = ./patches/openscad.nvim/program_paths.patch; 2569 + (replaceVars ./patches/openscad.nvim/program_paths.patch { 2578 2570 htop = lib.getExe htop; 2579 2571 openscad = lib.getExe openscad; 2580 2572 zathura = lib.getExe zathura; ··· 2683 2675 2684 2676 Preview-nvim = super.Preview-nvim.overrideAttrs { 2685 2677 patches = [ 2686 - (substituteAll { 2687 - src = ./patches/preview-nvim/hardcode-mdt-binary-path.patch; 2678 + (replaceVars ./patches/preview-nvim/hardcode-mdt-binary-path.patch { 2688 2679 mdt = lib.getExe md-tui; 2689 2680 }) 2690 2681 ]; ··· 3308 3299 nvim-lspconfig 3309 3300 plenary-nvim 3310 3301 ]; 3302 + runtimeDeps = [ 3303 + typescript-language-server 3304 + ]; 3311 3305 }; 3312 3306 3313 3307 nvzone-typr = super.nvzone-typr.overrideAttrs { ··· 3534 3528 # let g:grammarous#show_first_error = 1 3535 3529 # see https://github.com/rhysd/vim-grammarous/issues/39 3536 3530 patches = [ 3537 - (substituteAll { 3538 - src = ./patches/vim-grammarous/set_default_languagetool.patch; 3531 + (replaceVars ./patches/vim-grammarous/set_default_languagetool.patch { 3539 3532 inherit languagetool; 3540 3533 }) 3541 3534 ];
+5
pkgs/applications/editors/vscode/vscodium.nix
··· 57 57 58 58 updateScript = ./update-vscodium.sh; 59 59 60 + # Editing the `codium` binary (and shell scripts) within the app bundle causes the bundle's signature 61 + # to be invalidated, which prevents launching starting with macOS Ventura, because VSCodium is notarized. 62 + # See https://eclecticlight.co/2022/06/17/app-security-changes-coming-in-ventura/ for more information. 63 + dontFixup = stdenv.hostPlatform.isDarwin; 64 + 60 65 meta = with lib; { 61 66 description = '' 62 67 Open source source code editor developed by Microsoft for Windows,
+2 -3
pkgs/applications/emulators/wine/packages.nix
··· 5 5 pkgsi686Linux, 6 6 pkgsCross, 7 7 callPackage, 8 - substituteAll, 8 + replaceVars, 9 9 moltenvk, 10 10 wineRelease ? "stable", 11 11 supportFlags, ··· 80 80 mingwW64.buildPackages.gcc 81 81 ]; 82 82 monos = [ mono ]; 83 - buildScript = substituteAll { 84 - src = ./builder-wow.sh; 83 + buildScript = replaceVars ./builder-wow.sh { 85 84 # pkgconfig has trouble picking the right architecture 86 85 pkgconfig64remove = lib.makeSearchPathOutput "dev" "lib/pkgconfig" [ 87 86 pkgs.glib
+2 -3
pkgs/applications/graphics/gimp/default.nix
··· 2 2 stdenv, 3 3 lib, 4 4 fetchurl, 5 - substituteAll, 5 + replaceVars, 6 6 autoreconfHook, 7 7 pkg-config, 8 8 intltool, ··· 74 74 patches = [ 75 75 # to remove compiler from the runtime closure, reference was retained via 76 76 # gimp --version --verbose output 77 - (substituteAll { 78 - src = ./remove-cc-reference.patch; 77 + (replaceVars ./remove-cc-reference.patch { 79 78 cc_version = stdenv.cc.cc.name; 80 79 }) 81 80
+3 -5
pkgs/applications/graphics/inkscape/default.nix
··· 41 41 , potrace 42 42 , python3 43 43 , runCommand 44 - , substituteAll 44 + , replaceVars 45 45 , wrapGAppsHook3 46 46 , libepoxy 47 47 , zlib ··· 92 92 url = "https://gitlab.com/inkscape/inkscape/-/commit/eb6dadcf1a5c660167ba43f3606c8e7cc6529787.patch"; 93 93 hash = "sha256-FvbJV/YrBwhHg0kFdbhyd/Y9g7YV2nPIrRqZt7yJ50Q="; 94 94 }) 95 - (substituteAll { 96 - src = ./fix-python-paths.patch; 95 + (replaceVars ./fix-python-paths.patch { 97 96 # Python is used at run-time to execute scripts, 98 97 # e.g., those from the "Effects" menu. 99 98 python3 = lib.getExe python3Env; 100 99 }) 101 - (substituteAll { 100 + (replaceVars ./fix-ps2pdf-path.patch { 102 101 # Fix path to ps2pdf binary 103 - src = ./fix-ps2pdf-path.patch; 104 102 inherit ghostscript; 105 103 }) 106 104 ];
+2 -3
pkgs/applications/graphics/inkscape/extensions/textext/default.nix
··· 2 2 lib, 3 3 writeScript, 4 4 fetchFromGitHub, 5 - substituteAll, 5 + replaceVars, 6 6 inkscape, 7 7 pdflatex, 8 8 lualatex, ··· 33 33 patches = [ 34 34 # Make sure we can point directly to pdflatex in the extension, 35 35 # instead of relying on the PATH (which might not have it) 36 - (substituteAll { 37 - src = ./fix-paths.patch; 36 + (replaceVars ./fix-paths.patch { 38 37 inherit pdflatex lualatex; 39 38 }) 40 39
+129 -129
pkgs/applications/networking/browsers/chromium/info.json
··· 766 766 } 767 767 }, 768 768 "ungoogled-chromium": { 769 - "version": "131.0.6778.264", 769 + "version": "132.0.6834.83", 770 770 "deps": { 771 771 "depot_tools": { 772 - "rev": "20b9bdcace7ed561d6a75728c85373503473cb6b", 773 - "hash": "sha256-vlBENaVTtbwDJtSswuszcUlx+icZYJeP6ew6MO1cAv0=" 772 + "rev": "41d43a2a2290450aeab946883542f8049b155c87", 773 + "hash": "sha256-m/6b4VZZTUQOeED1mYvZOQCx8Re+Zd4O8SKDMjJ9Djo=" 774 774 }, 775 775 "gn": { 776 - "rev": "95b0f8fe31a992a33c040bbe3867901335c12762", 777 - "hash": "sha256-a8yCdBsl0nBMPS+pCLwrkAvQNP/THx/z/GySyOgx4Jk=" 776 + "rev": "feafd1012a32c05ec6095f69ddc3850afb621f3a", 777 + "hash": "sha256-zZoD5Bx7wIEP2KJkHef6wHrxU3px+8Vseq29QcK32bg=" 778 778 }, 779 779 "ungoogled-patches": { 780 - "rev": "131.0.6778.264-1", 781 - "hash": "sha256-u/2iKhrJRbvOtv5Yi/AfSpR7Xu4NjBTF5G03wsVGEKo=" 780 + "rev": "132.0.6834.83-1", 781 + "hash": "sha256-yL7eMNTL1FDoqXcwuHx5BzjjESjzsIfdzHCTZW9jXUo=" 782 782 }, 783 - "npmHash": "sha256-b1l8SwjAfoColoa3zhTMPEF/rRuxzT3ATHE77rWU5EA=" 783 + "npmHash": "sha256-H1/h3x+Cgp1x94Ze3UPPHxRVpylZDvpMXMOuS+jk2dw=" 784 784 }, 785 785 "DEPS": { 786 786 "src": { 787 787 "url": "https://chromium.googlesource.com/chromium/src.git", 788 - "rev": "2d05e31515360f4da764174f7c448b33e36da871", 789 - "hash": "sha256-aAb+lMefY4+zADsVeyLIhNI4AQfGmzu+7Y8o3t2csmU=", 788 + "rev": "03d59cf5ecf1d8444838ff9a1e96231304d4ff9c", 789 + "hash": "sha256-2FuT20iW8Mp4AehdEFT5Ua3La5z8bmT1FdLaUZRL0CE=", 790 790 "recompress": true 791 791 }, 792 792 "src/third_party/clang-format/script": { ··· 796 796 }, 797 797 "src/third_party/libc++/src": { 798 798 "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", 799 - "rev": "6a68fd412b9aecd515a20a7cf84d11b598bfaf96", 800 - "hash": "sha256-7skqaen0XqbRvAGXQ0/3kea3vRInktdP3DOBeIBiGlQ=" 799 + "rev": "8e31ad42561900383e10dbefc1d3e8f38cedfbe9", 800 + "hash": "sha256-kmhTlz/qjvN0Qlra7Wz05O6X058hPPn0nVvAxFXQDC4=" 801 801 }, 802 802 "src/third_party/libc++abi/src": { 803 803 "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", 804 - "rev": "9a1d90c3b412d5ebeb97a6e33d98e1d0dd923221", 805 - "hash": "sha256-zPm+Rif9fITazDvvm6SvLq8gwcPzPbuaXlRbyYqv7JA=" 804 + "rev": "cec7f478354a8c8599f264ed8bb6043b5468f72d", 805 + "hash": "sha256-CwiK9Td8aRS08RywItHKFvibzDAUYYd0YNRKxYPLTD8=" 806 806 }, 807 807 "src/third_party/libunwind/src": { 808 808 "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", 809 - "rev": "efc3baa2d1ece3630fcfa72bef93ed831bcaec4c", 810 - "hash": "sha256-0OBelaxkKdajYXrGgz08nyPZhxqpsnFXiF3m8DGQkDo=" 809 + "rev": "5b01ea4a6f3b666b7d190e7cb7c31db2ed4d94ce", 810 + "hash": "sha256-uA+t5Ecc/iK3mllHR8AMVGRfU/7z1G3yrw0TamPQiOY=" 811 + }, 812 + "src/third_party/llvm-libc/src": { 813 + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git", 814 + "rev": "ca74a72e2b32ad804522bbef04dfe32560a10206", 815 + "hash": "sha256-av9JdqLOQbezgRS4P8QXmvfB5l47v04WRagNJJgT5u4=" 811 816 }, 812 817 "src/chrome/test/data/perf/canvas_bench": { 813 818 "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", ··· 826 831 }, 827 832 "src/docs/website": { 828 833 "url": "https://chromium.googlesource.com/website.git", 829 - "rev": "4811f9e01c4cfcbf9c6957015063eaaa0d92be91", 830 - "hash": "sha256-98wwIeMTF2Wg2sJ07U1OUV83wR9nJOjGubp7Vnk3kj8=" 834 + "rev": "be9c3dfd3781964fc0bab0d6c91d9ad117b71b02", 835 + "hash": "sha256-CqveHvjPEcRWnzi8w13xr2OainrmABNO8uj0GzKmQqo=" 831 836 }, 832 837 "src/media/cdm/api": { 833 838 "url": "https://chromium.googlesource.com/chromium/cdm.git", ··· 836 841 }, 837 842 "src/net/third_party/quiche/src": { 838 843 "url": "https://quiche.googlesource.com/quiche.git", 839 - "rev": "e0175250977c2b2b95087afc0857883538a1386c", 840 - "hash": "sha256-1O+hnZF73AY44jcmajJlpaQY5PV4+x0hYwqf1TtMahY=" 844 + "rev": "9616efc903b7469161996006c8cf963238e26503", 845 + "hash": "sha256-Z2uFWfZDYcY0m4R6mFMZJLnnVHu3/hQOAkCPQ5049SQ=" 841 846 }, 842 847 "src/testing/libfuzzer/fuzzers/wasm_corpus": { 843 848 "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git", 844 - "rev": "f650ff816f2ef227f61ea2e9f222aa69708ab367", 845 - "hash": "sha256-qWsGQNUptbz0jYvUuxP7woNf5QQrfn9k3uvr82Yk0QM=" 849 + "rev": "1df5e50a45db9518a56ebb42cb020a94a090258b", 850 + "hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY=" 846 851 }, 847 852 "src/third_party/accessibility_test_framework/src": { 848 853 "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git", ··· 851 856 }, 852 857 "src/third_party/angle": { 853 858 "url": "https://chromium.googlesource.com/angle/angle.git", 854 - "rev": "ac6cda4cbd716102ded6a965f79573b41581898d", 855 - "hash": "sha256-7Zfc262U42G6BUlxnLp6sQ78VlWBt0pTzkYwXY0rqaE=" 859 + "rev": "ce13a00a2b049a1ef5e0e70a3d333ce70838ef7b", 860 + "hash": "sha256-fMIHpa2QFsQQ19LGyhvV3Ihh6Ls8wwwhqTtpLoTEaf4=" 856 861 }, 857 862 "src/third_party/angle/third_party/glmark2/src": { 858 863 "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", ··· 866 871 }, 867 872 "src/third_party/angle/third_party/VK-GL-CTS/src": { 868 873 "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", 869 - "rev": "179dd9f858f0f5b0e52b61aefc621dc82e2ad34a", 870 - "hash": "sha256-B7X9PTlMQdolsvEfuCNaKnRFcvsPNZtn5FOcJBY6sCA=" 874 + "rev": "f674555ab03e6355e0981a647c115097e9fe5324", 875 + "hash": "sha256-2ZhG4cJf85zO7x+SGG6RD2qgOxZVosxAIbuZt9GYUKs=" 871 876 }, 872 877 "src/third_party/anonymous_tokens/src": { 873 878 "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", ··· 881 886 }, 882 887 "src/third_party/dav1d/libdav1d": { 883 888 "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", 884 - "rev": "389450f61ea0b2057fc9ea393d3065859c4ba7f2", 885 - "hash": "sha256-FK3tOLq5NcKQuStY5o8Lv2CXpjYHJm7n+NnyLFMOCxo=" 889 + "rev": "93f12c117a4e1c0cc2b129dcc52e84dbd9b84200", 890 + "hash": "sha256-Q2CaWvDqOmfaPG6a+SUHG5rFHalPEf4Oq/ytT3xuSOk=" 886 891 }, 887 892 "src/third_party/dawn": { 888 893 "url": "https://dawn.googlesource.com/dawn.git", 889 - "rev": "740d2502dbbd719a76c5a8d3fb4dac1b5363f42e", 890 - "hash": "sha256-R41YVv4uWCU6SsACXPRppeCDguTs+/NVJckvMGGTgJE=" 894 + "rev": "73dbf565079c89a531e6e01c4e8fc048a8a9660b", 895 + "hash": "sha256-6P3Mw60+xZVsFbrhG6UkTlz8xvvEOptV3Ar1sos0CsU=" 891 896 }, 892 897 "src/third_party/dawn/third_party/glfw": { 893 898 "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", ··· 896 901 }, 897 902 "src/third_party/dawn/third_party/dxc": { 898 903 "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", 899 - "rev": "080aeb7199e66e4b0a2b6383fd26a9f8d2cccbf5", 900 - "hash": "sha256-YHEBGqfftgK68wWAWVTxtbl1GECBT1qTNe7irYkM/8k=" 904 + "rev": "ac36a797d3470e8ee906b98457a59270d01db30d", 905 + "hash": "sha256-rhUNPA5b0H3PBsOpXbAeRLpS0tNQkiHbjRBWmJycSAY=" 901 906 }, 902 907 "src/third_party/dawn/third_party/dxheaders": { 903 908 "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", ··· 921 926 }, 922 927 "src/third_party/dawn/third_party/webgpu-cts": { 923 928 "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", 924 - "rev": "815ff2bb4038144dea89c33021bc4429f22a130f", 925 - "hash": "sha256-28uZotrv+/MBBo+pcBWY3Csqrdv5Y4DxGbGEwK9Cwdw=" 929 + "rev": "8690defa74b6975c10e85c113f121d4b2a3f2564", 930 + "hash": "sha256-ArbHGjkHd1sko7gDPFksYz7XHKNge+e6tVy6oKPuqzg=" 926 931 }, 927 932 "src/third_party/highway/src": { 928 933 "url": "https://chromium.googlesource.com/external/github.com/google/highway.git", 929 - "rev": "8295336dd70f1201d42c22ab5b0861de38cf8fbf", 930 - "hash": "sha256-PXsXIqWB4NNiFhanRjMIFSWYuW/IRuQo8mMPUBEentY=" 934 + "rev": "00fe003dac355b979f36157f9407c7c46448958e", 935 + "hash": "sha256-IS7m1wBwpPBUNhx2GttY1fzvmLIeAp3o2gXfrFpRdvY=" 931 936 }, 932 937 "src/third_party/google_benchmark/src": { 933 938 "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git", 934 - "rev": "344117638c8ff7e239044fd0fa7085839fc03021", 935 - "hash": "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=" 939 + "rev": "761305ec3b33abf30e08d50eb829e19a802581cc", 940 + "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w=" 936 941 }, 937 942 "src/third_party/boringssl/src": { 938 943 "url": "https://boringssl.googlesource.com/boringssl.git", 939 - "rev": "cd95210465496ac2337b313cf49f607762abe286", 940 - "hash": "sha256-172yvjgbFWQyd0PBRl74PJzpY/mDGC85D7PdeogNodU=" 944 + "rev": "571c76e919c0c48219ced35bef83e1fc83b00eed", 945 + "hash": "sha256-ib9wbV6S64OFc4zx0wQsQ84+5RxbETK0PS9Wm1BFQ1U=" 941 946 }, 942 947 "src/third_party/breakpad/breakpad": { 943 948 "url": "https://chromium.googlesource.com/breakpad/breakpad.git", 944 - "rev": "6b0c5b7ee1988a14a4af94564e8ae8bba8a94374", 945 - "hash": "sha256-kTkwRfaqw5ZCHEvu2YPZ+1vCfekHkY5pY3m9snDN64g=" 949 + "rev": "47f7823bdf4b1f39e462b2a497a674860e922e38", 950 + "hash": "sha256-cFXUi2oO/614jF0GV7oW0ss62dXWFHDNWNT8rWHAiQc=" 946 951 }, 947 952 "src/third_party/cast_core/public/src": { 948 953 "url": "https://chromium.googlesource.com/cast_core/public", 949 - "rev": "71f51fd6fa45fac73848f65421081edd723297cd", 950 - "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=" 954 + "rev": "fbc5e98031e1271a0a566fcd4d9092b2d3275d05", 955 + "hash": "sha256-o5/Lbhh6HHSWCVCEyDwDCgs+PLm67si981w0HuIWY7c=" 951 956 }, 952 957 "src/third_party/catapult": { 953 958 "url": "https://chromium.googlesource.com/catapult.git", 954 - "rev": "44791916611acec1cd74c492c7453e46d9b0dbd2", 955 - "hash": "sha256-SkF+RIIlU8Vl3AmN6kARkLuVz/X5vygNOtGN2K3Sr+M=" 959 + "rev": "b91cf840ac3255ef03b23cc93621369627422a1a", 960 + "hash": "sha256-65cZPyqZUdSnYPJYUMYeJgx3mUC6L/qb9P2bDqd2Zkk=" 956 961 }, 957 962 "src/third_party/ced/src": { 958 963 "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", ··· 961 966 }, 962 967 "src/third_party/chromium-variations": { 963 968 "url": "https://chromium.googlesource.com/chromium-variations.git", 964 - "rev": "7d681838b57a25ca6659b9cc0111f879147c416b", 965 - "hash": "sha256-zio8SqKEqOYYjVWZnzfrPqngqym2lZu9M/hgSi3ey0Q=" 969 + "rev": "c170abb48f7715c237f4c06eaed0fe6f8a4c6f8d", 970 + "hash": "sha256-mg5mu2jcy0xyNJ650ywWUMC94keRsqhZQuPZclHmyLI=" 966 971 }, 967 972 "src/third_party/cld_3/src": { 968 973 "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git", ··· 981 986 }, 982 987 "src/third_party/cpuinfo/src": { 983 988 "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", 984 - "rev": "1e83a2fdd3102f65c6f1fb602c1b320486218a99", 985 - "hash": "sha256-28cFACca+NYE8oKlP5aWXNCLeEjhWqJ6gRnFI+VxDvg=" 989 + "rev": "8df44962d437a0477f07ba6b8843d0b6a48646a4", 990 + "hash": "sha256-FlvmSjY8kt5XHymDLaZdPuZ4k5xcagJk8w/U6adTkWI=" 986 991 }, 987 992 "src/third_party/crc32c/src": { 988 993 "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", ··· 991 996 }, 992 997 "src/third_party/cros_system_api": { 993 998 "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", 994 - "rev": "b08c5ad457bddea2664ba20fb25beb3d1799fed2", 995 - "hash": "sha256-cwpcY8YTXk+VVIFphO5ihc5rvbG3ZY9iHeK81P5DHBs=" 999 + "rev": "554629b9242e6ae832ef14e3384654426f7fcc06", 1000 + "hash": "sha256-fvGypRhgl2uX9YE2cwjL7d3pYBa3Imd5p0RLhMYRgrc=" 996 1001 }, 997 1002 "src/third_party/crossbench": { 998 1003 "url": "https://chromium.googlesource.com/crossbench.git", 999 - "rev": "b4d7ae714c548c3e139b95a85582dc15ece1d2f7", 1000 - "hash": "sha256-1RDDbvce5WR32if3cFYxiU9HS04x3BYIgOFJPMVJSBo=" 1004 + "rev": "ae6f165652e0ea983d73f5d04b7470d08c869e4f", 1005 + "hash": "sha256-/K6eM9s+fd2wjCrK0g0CgFNy0zxEN9SxTvmE50hMtXw=" 1001 1006 }, 1002 1007 "src/third_party/depot_tools": { 1003 1008 "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", 1004 - "rev": "20b9bdcace7ed561d6a75728c85373503473cb6b", 1005 - "hash": "sha256-vlBENaVTtbwDJtSswuszcUlx+icZYJeP6ew6MO1cAv0=" 1009 + "rev": "41d43a2a2290450aeab946883542f8049b155c87", 1010 + "hash": "sha256-m/6b4VZZTUQOeED1mYvZOQCx8Re+Zd4O8SKDMjJ9Djo=" 1006 1011 }, 1007 1012 "src/third_party/devtools-frontend/src": { 1008 1013 "url": "https://chromium.googlesource.com/devtools/devtools-frontend", 1009 - "rev": "5284f1c63b2b08c47b8915ce713a1aace991dfe9", 1010 - "hash": "sha256-1Nh9SVIAde4jxgwFucbtZpl6rMyPM4Plfi+dhwP0wI8=" 1014 + "rev": "f2f3682c9db8ca427f8c64f0402cc2c5152c6c24", 1015 + "hash": "sha256-mBWZdbgZfO01Pt2lZSHX/d5r+8A/+qCZA8MRtZdeTrs=" 1011 1016 }, 1012 1017 "src/third_party/dom_distiller_js/dist": { 1013 1018 "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", ··· 1016 1021 }, 1017 1022 "src/third_party/eigen3/src": { 1018 1023 "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", 1019 - "rev": "7eea0a9213e801ad9479a6499fd0330ec1db8693", 1020 - "hash": "sha256-JkOjOnLrDOcYHi3hptT1BDRvsKpTtOsBHT8YLb1hlJM=" 1024 + "rev": "b396a6fbb2e173f52edb3360485dedf3389ef830", 1025 + "hash": "sha256-UroGjERR5TW9KbyLwR/NBpytXrW1tHfu6ZvQPngROq4=" 1021 1026 }, 1022 1027 "src/third_party/farmhash/src": { 1023 1028 "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", ··· 1031 1036 }, 1032 1037 "src/third_party/ffmpeg": { 1033 1038 "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", 1034 - "rev": "686d6944501a6ee9c849581e3fe343273d4af3f6", 1035 - "hash": "sha256-j5mpWn4j+U4rRlXbq8okUUXrRKycZkiV+UntiS90ChM=" 1039 + "rev": "591ae4b02eaff9a03e2ec863da895128b0b49910", 1040 + "hash": "sha256-wwHxNuZe2hBmGBpVg/iQJBoL350jfPYPTPqDn3RiqZE=" 1036 1041 }, 1037 1042 "src/third_party/flac": { 1038 1043 "url": "https://chromium.googlesource.com/chromium/deps/flac.git", ··· 1066 1071 }, 1067 1072 "src/third_party/freetype/src": { 1068 1073 "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", 1069 - "rev": "f02bffad0fd57f3acfa835c3f2899c5b71ff8be0", 1070 - "hash": "sha256-Lc2hbmZnnXQa0vzlJCizNBQ5WCOI5sJglTTe5gWVYUA=" 1074 + "rev": "0ae7e607370cc66218ccfacf5de4db8a35424c2f", 1075 + "hash": "sha256-+nbRZi3vAMTURhhFVUu5+59fVIv0GH3YZog2JavyVLY=" 1071 1076 }, 1072 1077 "src/third_party/freetype-testing/src": { 1073 1078 "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git", ··· 1116 1121 }, 1117 1122 "src/third_party/googletest/src": { 1118 1123 "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", 1119 - "rev": "62df7bdbc10887e094661e07ec2595b7920376fd", 1120 - "hash": "sha256-Iv/7r79cKC1pFkxPPHK/IHv/HFx18XZ4YVr+C2CX8+M=" 1124 + "rev": "d144031940543e15423a25ae5a8a74141044862f", 1125 + "hash": "sha256-n7tiIFAj8AiSCa9Tw+1j+ro9cSt5vagZpkbBBUUtYQY=" 1121 1126 }, 1122 1127 "src/third_party/hunspell_dictionaries": { 1123 1128 "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git", ··· 1141 1146 }, 1142 1147 "src/third_party/libFuzzer/src": { 1143 1148 "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git", 1144 - "rev": "487e79376394754705984c5de7c4ce7f82f2bd7c", 1145 - "hash": "sha256-xQXfRIcQmAVP0k2mT7Blv1wBxL6wDaWTbIPGcTiMZRo=" 1149 + "rev": "a7128317fe7935a43d6c9f39df54f21113951941", 1150 + "hash": "sha256-jPS+Xi/ia0sMspxSGN38zasmVS/HslxH/qOFsV9TguE=" 1146 1151 }, 1147 1152 "src/third_party/fuzztest/src": { 1148 1153 "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", ··· 1161 1166 }, 1162 1167 "src/third_party/libaom/source/libaom": { 1163 1168 "url": "https://aomedia.googlesource.com/aom.git", 1164 - "rev": "840f8797871cc587f7113ea9d2483a1156d57c0e", 1165 - "hash": "sha256-2XHqNAmv2L3TEFXu4Q6rnASLmuE93QplSVKNqyhlKUk=" 1169 + "rev": "be60f06ab420d6a65c477213f04c8b0f2e12ba2e", 1170 + "hash": "sha256-9VhEVOG9cReDOGoX+x5G/jJ8Y5RDoQIiLMoZtt5c9pI=" 1166 1171 }, 1167 1172 "src/third_party/libavif/src": { 1168 1173 "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git", 1169 - "rev": "2c36aed375fff68611641b57d919b191f33431d5", 1170 - "hash": "sha256-fApdfzEtQnmio6BVzkcr/VkwojrNs+cx/+Am80H9dXw=" 1174 + "rev": "1cdeff7ecf456492c47cf48fc0cef6591cdc95da", 1175 + "hash": "sha256-lUuVyh2srhWMNUp4lEivyDic3MSZf5s63iAb84We80M=" 1171 1176 }, 1172 1177 "src/third_party/crabbyavif/src": { 1173 1178 "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git", 1174 - "rev": "ffad64ff4e349f926ad5ffcc882e205a94156d77", 1175 - "hash": "sha256-M2ExAgLm/NZ2soQEv3Ap/qx/B3+nd3NdDqYOL0E/pc8=" 1176 - }, 1177 - "src/third_party/libavifinfo/src": { 1178 - "url": "https://aomedia.googlesource.com/libavifinfo.git", 1179 - "rev": "8d8b58a3f517ef8d1794baa28ca6ae7d19f65514", 1180 - "hash": "sha256-61OPjdMCIbHvWncmBzNw6sqlHcuc1kyqm9k1j4UTcZ0=" 1179 + "rev": "c3548280e0a516ed7cad7ff1591b5807cef64aa4", 1180 + "hash": "sha256-hO5epHYNYI6pGwVSUv1Hp3qb7qOv8uOs4u+IdhDxd8Q=" 1181 1181 }, 1182 1182 "src/third_party/nearby/src": { 1183 1183 "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", 1184 - "rev": "1b382075dd1bd545655af7ebef949b3090061b74", 1185 - "hash": "sha256-kpyJiFXtk8eK8EkgzUbG0GS+znEeqzlB62qy9tPpEC8=" 1184 + "rev": "8e87a6e51c93e7836ecdbcc0a520c7992f3ece13", 1185 + "hash": "sha256-DO3FW5Q233ctFKk4K5F8oZec9kfrVl6uxAwMn0niKz4=" 1186 1186 }, 1187 1187 "src/third_party/beto-core/src": { 1188 1188 "url": "https://beto-core.googlesource.com/beto-core.git", ··· 1206 1206 }, 1207 1207 "src/third_party/cros-components/src": { 1208 1208 "url": "https://chromium.googlesource.com/external/google3/cros_components.git", 1209 - "rev": "902e8ca804ae6c05f505e510c16647c32ce4d1cb", 1210 - "hash": "sha256-j2m9zVajkAdPF1ehLX0Gxp4LyMunhFDDCzrCm2WzArc=" 1209 + "rev": "9129cf4b2a5ca775c280243257a0b4856a93c7fb", 1210 + "hash": "sha256-owXaTIj0pbhUeJkirxaRoCmgIN9DwNzY3h771kaN+Fc=" 1211 1211 }, 1212 1212 "src/third_party/libdrm/src": { 1213 1213 "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git", ··· 1256 1256 }, 1257 1257 "src/third_party/libvpx/source/libvpx": { 1258 1258 "url": "https://chromium.googlesource.com/webm/libvpx.git", 1259 - "rev": "906334ac1de2b0afa666472dce5545b82c1251fb", 1260 - "hash": "sha256-7GInV/uHuK6bUa1dSBuxJn6adyjfoOqSqfmfTvQbAoc=" 1259 + "rev": "727319a77ffe68e9aacb08e09ae7151b3a8f70a3", 1260 + "hash": "sha256-QGm37X4uid8zv+vRu0pVTvoQd2WcKztrj3tJkDjx82o=" 1261 1261 }, 1262 1262 "src/third_party/libwebm/source": { 1263 1263 "url": "https://chromium.googlesource.com/webm/libwebm.git", ··· 1271 1271 }, 1272 1272 "src/third_party/libyuv": { 1273 1273 "url": "https://chromium.googlesource.com/libyuv/libyuv.git", 1274 - "rev": "a8e59d207483f75b87dd5fc670e937672cdf5776", 1275 - "hash": "sha256-gTNmhYuYmt/JmWSAVbcE4PqG3kW/JaL7XEWXbiNVfMM=" 1274 + "rev": "6ac7c8f25170c85265fca69fd1fe5d31baf3344f", 1275 + "hash": "sha256-vPVq7RzqO7gBUgYuNX0Fwxqok9jtXXJZgbhVFchG5Ws=" 1276 1276 }, 1277 1277 "src/third_party/lss": { 1278 1278 "url": "https://chromium.googlesource.com/linux-syscall-support.git", ··· 1306 1306 }, 1307 1307 "src/third_party/openscreen/src": { 1308 1308 "url": "https://chromium.googlesource.com/openscreen", 1309 - "rev": "4f27c4f1698522dfcea36dca948a13e2eaf4c26c", 1310 - "hash": "sha256-dosSqpFlvli60ZJ0vexVZOK/FmzOYq5BDrZKZW0lMfc=" 1309 + "rev": "cb6fd42532fc3a831d6863d5006217e32a67c417", 1310 + "hash": "sha256-IlGxfw6Mhc7FYvhU2+Ngt9qflqr4JMC2OcplvksGI+U=" 1311 1311 }, 1312 1312 "src/third_party/openscreen/src/buildtools": { 1313 1313 "url": "https://chromium.googlesource.com/chromium/src/buildtools", ··· 1321 1321 }, 1322 1322 "src/third_party/pdfium": { 1323 1323 "url": "https://pdfium.googlesource.com/pdfium.git", 1324 - "rev": "7a8409531fbb58d7d15ae331e645977b113d7ced", 1325 - "hash": "sha256-KlqgaOxKJQHHjU1g1VCcJEBhv809DdEUedrxdk8N99I=" 1324 + "rev": "84a8011ec69d0e2de271c05be7d62979608040d9", 1325 + "hash": "sha256-d8qJECIdq01ct+sS7cHVKFulYJarwahKCEcVf762JNI=" 1326 1326 }, 1327 1327 "src/third_party/perfetto": { 1328 1328 "url": "https://android.googlesource.com/platform/external/perfetto.git", 1329 - "rev": "24764a1d9c2fce1e9816ffae691f00353ade330d", 1330 - "hash": "sha256-FAaxTuIYExmL3PSWwcvLpnPD4qsGDGr4/CIyi0NSrnI=" 1329 + "rev": "ea011a2c2d3aecdc4f1674887e107a56d2905edd", 1330 + "hash": "sha256-3vervpsq/QLMrR7RcJMwwh+CdFvSEj8yAzj6s9d1XMo=" 1331 1331 }, 1332 1332 "src/third_party/protobuf-javascript/src": { 1333 1333 "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript", ··· 1346 1346 }, 1347 1347 "src/third_party/quic_trace/src": { 1348 1348 "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git", 1349 - "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc", 1350 - "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=" 1349 + "rev": "413da873d93a03d3662f24b881ea459a79f9c589", 1350 + "hash": "sha256-N1uFoNd3mz/LH1z06581Ds7BUyc67SNXUPzqomYREr8=" 1351 1351 }, 1352 1352 "src/third_party/pywebsocket3/src": { 1353 1353 "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git", ··· 1366 1366 }, 1367 1367 "src/third_party/skia": { 1368 1368 "url": "https://skia.googlesource.com/skia.git", 1369 - "rev": "f14f6b1ab7cf544c0190074488d17821281cfa4d", 1370 - "hash": "sha256-0p57otDuIShl6MngYs22XA1QYxptDVa3vCwJsH59H34=" 1369 + "rev": "c17fe9bc158c29de3cdd655ac73d14f52c17810a", 1370 + "hash": "sha256-mRfkEm+NzEX0DkJejk1THx4G7v0sIFmRrAnt3Zl5uco=" 1371 1371 }, 1372 1372 "src/third_party/smhasher/src": { 1373 1373 "url": "https://chromium.googlesource.com/external/smhasher.git", ··· 1386 1386 }, 1387 1387 "src/third_party/swiftshader": { 1388 1388 "url": "https://swiftshader.googlesource.com/SwiftShader.git", 1389 - "rev": "7a9a492a38b7c701f7c96a15a76046aed8f8c0c3", 1390 - "hash": "sha256-6uBO4jwPSqhT4j+KTE0Za7B4prrE2kstsHNtHwTJX+Q=" 1389 + "rev": "d5c4284774115bb1e32c012a2be1b5fbeb1ab1f9", 1390 + "hash": "sha256-h2BHyaOM0oscfX5cu8s4N1yyOkg/yQbvwD1DxF+RAQc=" 1391 1391 }, 1392 1392 "src/third_party/text-fragments-polyfill/src": { 1393 1393 "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", ··· 1396 1396 }, 1397 1397 "src/third_party/tflite/src": { 1398 1398 "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", 1399 - "rev": "689e8a82f8070a372981b7476fb673e243330d71", 1400 - "hash": "sha256-tImVDNyS5hCN6A1ODeVuB7XLCNr3EdxN8x961nPCM9g=" 1399 + "rev": "658227d3b535287dc6859788bde6076c4fe3fe7c", 1400 + "hash": "sha256-gOUt/NljRK5wMFwy2aLqZ5NHwk4y/GxbQ+AZ3MxM0M8=" 1401 1401 }, 1402 1402 "src/third_party/vulkan-deps": { 1403 1403 "url": "https://chromium.googlesource.com/vulkan-deps", 1404 - "rev": "73fd75175922012f21557239b7743a152ea7f1fd", 1405 - "hash": "sha256-D8UIXXQX6dTxbuqFgd6AbmErr1r9839yiN6MrJlsqPw=" 1404 + "rev": "0b56dd5952b25fad65139b64096fcd187048ed38", 1405 + "hash": "sha256-LVWvbMLjkMyAUM+0UpQ4oRsfcRU5F/xY60wiwxth4Ko=" 1406 1406 }, 1407 1407 "src/third_party/glslang/src": { 1408 1408 "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", 1409 - "rev": "2acc4ea0028bc703be2d4e9bc8a4032d015d6516", 1410 - "hash": "sha256-mwcvSRycM8bq3dDWk4yfkL8Tg5bfEap6lrr1Oxemzy4=" 1409 + "rev": "9c644fcb5b9a1a9c975c50a790fd14c5451292b0", 1410 + "hash": "sha256-twWSeJp9bNbLYFszCWv9BCztfbXUBKSWV55/U+hd2hw=" 1411 1411 }, 1412 1412 "src/third_party/spirv-cross/src": { 1413 1413 "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", ··· 1416 1416 }, 1417 1417 "src/third_party/spirv-headers/src": { 1418 1418 "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", 1419 - "rev": "50bc4debdc3eec5045edbeb8ce164090e29b91f3", 1420 - "hash": "sha256-Zv5QZ8MmP45MH5e6EBDNPmP0vcjjNXJHKva5MNh5ovA=" 1419 + "rev": "996c728cf7dcfb29845cfa15222822318f047810", 1420 + "hash": "sha256-FrT/kVIMjcu2zv+7kDeNKM77NnOyMBb8pV0w8DBP42A=" 1421 1421 }, 1422 1422 "src/third_party/spirv-tools/src": { 1423 1423 "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", 1424 - "rev": "42b315c15b1ff941b46bb3949c105e5386be8717", 1425 - "hash": "sha256-xb0TlPyXP2wu7jMrWZu+z8WC5mk0CbYgvkZEt3r+mww=" 1424 + "rev": "9117e042b93d4ff08d2406542708170f77aaa2a3", 1425 + "hash": "sha256-m/a1i26u8lzpKuQHyAy6ktWWjbLZEaio1awz8VovTGE=" 1426 1426 }, 1427 1427 "src/third_party/vulkan-headers/src": { 1428 1428 "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", 1429 - "rev": "14345dab231912ee9601136e96ca67a6e1f632e7", 1430 - "hash": "sha256-ny/UVx4r+Fj39ZEepaWqDPplAJcrBQEQlkqsSofwLJ0=" 1429 + "rev": "cbcad3c0587dddc768d76641ea00f5c45ab5a278", 1430 + "hash": "sha256-exXzafLgrgxyRvaF+4pCF+OLtPT2gDmcvzazQ4EQ1eA=" 1431 1431 }, 1432 1432 "src/third_party/vulkan-loader/src": { 1433 1433 "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", 1434 - "rev": "bd1c8ea9c6ac51e4c3a6ddb9d602bb204678eb5f", 1435 - "hash": "sha256-Ze/DGiD8Zj3mY+5Pi+tf6xMrX2YBqfl4Nc37b/JgmnI=" 1434 + "rev": "b0177a972b8d47e823a4500cf88df88a8c27add7", 1435 + "hash": "sha256-NDp2TLeMLAHb92R+PjaPDTx8ckIlpSsS3BNx3lerB68=" 1436 1436 }, 1437 1437 "src/third_party/vulkan-tools/src": { 1438 1438 "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", 1439 - "rev": "c9a5acda16dc2759457dc856b5d7df00ac5bf4a2", 1440 - "hash": "sha256-0JzqUW6XbhPbLGs/smuNG6zQoWP8iaAO5VglGSyN94g=" 1439 + "rev": "15f2de809304aba619ee327f3273425418ca83de", 1440 + "hash": "sha256-PiWKL045DAOGm+Hl/UyO6vmD4fVfuf2fSvXK6gSYbwo=" 1441 1441 }, 1442 1442 "src/third_party/vulkan-utility-libraries/src": { 1443 1443 "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", 1444 - "rev": "8c907ea21fe0147f791d79051b18e21bc8c4ede0", 1445 - "hash": "sha256-2abhzNt/rKbAhGQZhUhQ2LoemtU1Yh1fx9rrijOtjy4=" 1444 + "rev": "87ab6b39a97d084a2ef27db85e3cbaf5d2622a09", 1445 + "hash": "sha256-luDw6g/EMSK67Et2wNta74PHGQU6Y7IRpDlSpgDYV6Q=" 1446 1446 }, 1447 1447 "src/third_party/vulkan-validation-layers/src": { 1448 1448 "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", 1449 - "rev": "cbb4ab171fc7cd0b636a76ee542e238a8734f4be", 1450 - "hash": "sha256-nKpS0ddAsN2KhOg6J/SwB8ZlVXrJTVixD4DuUkyxb6c=" 1449 + "rev": "bc2c38412f739c298d6f5c076c064e6b5696959f", 1450 + "hash": "sha256-WWV+P++0Czeqg5p2UTqIP81pY8oz7cS7E7Z/sc0km6g=" 1451 1451 }, 1452 1452 "src/third_party/vulkan_memory_allocator": { 1453 1453 "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", ··· 1486 1486 }, 1487 1487 "src/third_party/webgpu-cts/src": { 1488 1488 "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", 1489 - "rev": "ae8b3ca40fbeee0bc67ef41a6c5b6dd5af839344", 1490 - "hash": "sha256-7u5Ay43GtcVTt3Cwg/5OaYQdG6SXXYtUun7DVN+XChE=" 1489 + "rev": "b9f32fd2943dd2b3d0033bf938c9d843f4b5c9a9", 1490 + "hash": "sha256-Dd5uWNtnBIc2jiMkh9KjI5O1tJtmMvdlMA2nf+VOkQQ=" 1491 1491 }, 1492 1492 "src/third_party/webrtc": { 1493 1493 "url": "https://webrtc.googlesource.com/src.git", 1494 - "rev": "79aff54b0fa9238ce3518dd9eaf9610cd6f22e82", 1495 - "hash": "sha256-xkMnUduSG88EWiwq6PITN0KgAKjFd4QOis3dgxedK30=" 1494 + "rev": "afaf497805cbb502da89991c2dcd783201efdd08", 1495 + "hash": "sha256-S8kGTd3+lf5OTayCMOqqrjxH4tcbT0NLZBpKmTCysMs=" 1496 1496 }, 1497 1497 "src/third_party/wuffs/src": { 1498 1498 "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", ··· 1511 1511 }, 1512 1512 "src/third_party/xnnpack/src": { 1513 1513 "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", 1514 - "rev": "3986629de01e518a3f2359bf5629ef2b7ef72330", 1515 - "hash": "sha256-x8GQUj75mQXswI3b29tS9u25Zx3peYqDM8v1/wkC9cs=" 1514 + "rev": "d1d33679661a34f03a806af2b813f699db3004f9", 1515 + "hash": "sha256-aDPlmLxNY9M5+Qb8VtdfxphHXU/X6JwYhkUSXkLh/FE=" 1516 1516 }, 1517 1517 "src/tools/page_cycler/acid3": { 1518 1518 "url": "https://chromium.googlesource.com/chromium/deps/acid3.git", ··· 1521 1521 }, 1522 1522 "src/third_party/zstd/src": { 1523 1523 "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", 1524 - "rev": "20707e3718ee14250fb8a44b3bf023ea36bd88df", 1525 - "hash": "sha256-/IUfh0De9m7ACrisqKlpxZsb+asoAWGXCaK6L+s24Q8=" 1524 + "rev": "7fb5347e88f10472226c9aa1962a148e55d8c480", 1525 + "hash": "sha256-4J/F2v2W3mMdhqQ4q35gYkGaqTKlcG6OxUt3vQ8pcLs=" 1526 1526 }, 1527 1527 "src/v8": { 1528 1528 "url": "https://chromium.googlesource.com/v8/v8.git", 1529 - "rev": "9c09e7876ff830e1f9a731aa930040d1028ff5a1", 1530 - "hash": "sha256-OKa0W4s3VfaQ/MBHkrkZ8/LeRGqjGh9hTaqet7S4o58=" 1529 + "rev": "e51f1d7dbd113aa01ddfb30890c8a89b11fcd96c", 1530 + "hash": "sha256-KJirPTvmC6vRTvrl6Nl0SQSieX/OhgfIiTblMxgoAvU=" 1531 1531 } 1532 1532 } 1533 1533 }
+5 -5
pkgs/applications/networking/browsers/librewolf/src.json
··· 1 1 { 2 - "packageVersion": "134.0-1", 2 + "packageVersion": "134.0.1-1", 3 3 "source": { 4 - "rev": "134.0-1", 5 - "sha256": "bu9ec9gK4b1OkC2Z1ycr/lmhrSB5TcIqcHXaZxf0Vmw=" 4 + "rev": "134.0.1-1", 5 + "hash": "sha256-YtZb+VaJu+zofIjJUUx6FjVsEb1sCgFsGlxgP++Yki0=" 6 6 }, 7 7 "firefox": { 8 - "version": "134.0", 9 - "sha512": "EnWmhtwKJ7SN9K4FYWURUS9nbgNHTjCVslIerCWjhdNFqj6HhnFtvoEq9J4H1ysydyR5CJ1kiWjiAEygycNTRA==" 8 + "version": "134.0.1", 9 + "hash": "sha512-P0DKWnU6ZuCK9OixLXX+q2ewVn7P/TT1zwE/Sa64CczUWMgBHpRW3JAsJOr2JgeBF4dFFOtAzuVXTq/Ok+53LQ==" 10 10 } 11 11 }
+15 -11
pkgs/applications/networking/browsers/librewolf/src.nix
··· 8 8 in 9 9 { 10 10 inherit (src) packageVersion; 11 - source = fetchFromGitea { 12 - domain = "codeberg.org"; 13 - owner = "librewolf"; 14 - repo = "source"; 15 - fetchSubmodules = true; 16 - inherit (src.source) rev sha256; 17 - }; 18 - firefox = fetchurl { 19 - url = "mirror://mozilla/firefox/releases/${src.firefox.version}/source/firefox-${src.firefox.version}.source.tar.xz"; 20 - inherit (src.firefox) sha512; 21 - }; 11 + source = fetchFromGitea ( 12 + src.source 13 + // { 14 + domain = "codeberg.org"; 15 + owner = "librewolf"; 16 + repo = "source"; 17 + fetchSubmodules = true; 18 + } 19 + ); 20 + firefox = fetchurl ( 21 + src.firefox 22 + // { 23 + url = "mirror://mozilla/firefox/releases/${src.firefox.version}/source/firefox-${src.firefox.version}.source.tar.xz"; 24 + } 25 + ); 22 26 }
+2 -2
pkgs/applications/office/paperwork/openpaperwork-core.nix
··· 1 1 { 2 2 buildPythonPackage, 3 3 lib, 4 - fetchFromGitLab, 4 + callPackage, 5 5 6 6 isPy3k, 7 7 isPyPy, ··· 17 17 18 18 buildPythonPackage rec { 19 19 pname = "openpaperwork-core"; 20 - inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; 20 + inherit (callPackage ./src.nix { }) version src; 21 21 format = "pyproject"; 22 22 23 23 sourceRoot = "${src.name}/openpaperwork-core";
+2 -2
pkgs/applications/office/paperwork/openpaperwork-gtk.nix
··· 1 1 { 2 2 buildPythonPackage, 3 3 lib, 4 - fetchFromGitLab, 4 + callPackage, 5 5 6 6 isPy3k, 7 7 isPyPy, ··· 17 17 18 18 buildPythonPackage rec { 19 19 pname = "openpaperwork-gtk"; 20 - inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; 20 + inherit (callPackage ./src.nix { }) version src; 21 21 format = "pyproject"; 22 22 23 23 sourceRoot = "${src.name}/openpaperwork-gtk";
+2 -2
pkgs/applications/office/paperwork/paperwork-backend.nix
··· 1 1 { 2 2 buildPythonPackage, 3 3 lib, 4 - fetchFromGitLab, 4 + callPackage, 5 5 pyenchant, 6 6 scikit-learn, 7 7 pypillowfight, ··· 28 28 29 29 buildPythonPackage rec { 30 30 pname = "paperwork-backend"; 31 - inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; 31 + inherit (callPackage ./src.nix { }) version src; 32 32 format = "pyproject"; 33 33 34 34 sourceRoot = "${src.name}/paperwork-backend";
+2 -2
pkgs/applications/office/paperwork/paperwork-gtk.nix
··· 1 1 { 2 2 lib, 3 + callPackage, 3 4 python3Packages, 4 5 gtk3, 5 6 cairo, ··· 9 10 dbus, 10 11 libnotify, 11 12 wrapGAppsHook3, 12 - fetchFromGitLab, 13 13 which, 14 14 gettext, 15 15 gobject-introspection, ··· 32 32 imagemagick 33 33 perlPackages.Po4a 34 34 ]; 35 - inherit (import ./src.nix { inherit fetchFromGitLab; }) version src sample_documents; 35 + inherit (callPackage ./src.nix { }) version src sample_documents; 36 36 in 37 37 38 38 python3Packages.buildPythonApplication rec {
+2 -2
pkgs/applications/office/paperwork/paperwork-shell.nix
··· 1 1 { 2 2 buildPythonPackage, 3 3 lib, 4 - fetchFromGitLab, 4 + callPackage, 5 5 6 6 isPy3k, 7 7 isPyPy, ··· 21 21 22 22 buildPythonPackage rec { 23 23 pname = "paperwork-shell"; 24 - inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; 24 + inherit (callPackage ./src.nix { }) version src; 25 25 format = "pyproject"; 26 26 27 27 sourceRoot = "${src.name}/paperwork-shell";
+28 -8
pkgs/applications/office/paperwork/src.nix
··· 1 - { fetchFromGitLab }: 1 + { 2 + fetchFromGitLab, 3 + srcOnly, 4 + fetchpatch, 5 + }: 2 6 rec { 3 7 version = "2.2.5"; 4 - src = fetchFromGitLab { 5 - domain = "gitlab.gnome.org"; 6 - repo = "paperwork"; 7 - group = "World"; 8 - owner = "OpenPaperwork"; 9 - rev = version; 10 - sha256 = "sha256-PRh0ohmPLwpM76qYfbExFqq4OK6Hm0fbdzrjXungSoY="; 8 + src = srcOnly { 9 + pname = "paperwork-patched-src"; 10 + inherit version; 11 + src = fetchFromGitLab { 12 + domain = "gitlab.gnome.org"; 13 + repo = "paperwork"; 14 + group = "World"; 15 + owner = "OpenPaperwork"; 16 + rev = version; 17 + sha256 = "sha256-PRh0ohmPLwpM76qYfbExFqq4OK6Hm0fbdzrjXungSoY="; 18 + }; 19 + patches = [ 20 + # fix installing translations 21 + # remove on next release 22 + ( 23 + assert version == "2.2.5"; 24 + fetchpatch { 25 + url = "https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/commit/b8e2633ace0f3d9d57e68c27db8f594b8a5ddd7e.patch"; 26 + hash = "sha256-VUT86kF0ZHLGK457ZrrIBMeiZqg/rPRpbkBA/ua9rU8="; 27 + } 28 + ) 29 + ]; 11 30 }; 31 + 12 32 sample_documents = fetchFromGitLab { 13 33 domain = "gitlab.gnome.org"; 14 34 repo = "paperwork-test-documents";
+2 -2
pkgs/applications/science/biology/samtools/default.nix
··· 10 10 11 11 stdenv.mkDerivation rec { 12 12 pname = "samtools"; 13 - version = "1.19.2"; 13 + version = "1.21"; 14 14 15 15 src = fetchurl { 16 16 url = "https://github.com/samtools/samtools/releases/download/${version}/${pname}-${version}.tar.bz2"; 17 - hash = "sha256-cfYEmWaOTAjn10X7/yTBXMigl3q6sazV0rtBm9sGXpY="; 17 + hash = "sha256-BXJLCDprbwMF/K5SQ6BWzDbPgmMJw8uTR6a4nuP8Wto="; 18 18 }; 19 19 20 20 # tests require `bgzip` from the htslib package
+2 -2
pkgs/applications/video/vdr/softhddevice/default.nix
··· 15 15 }: 16 16 stdenv.mkDerivation rec { 17 17 pname = "vdr-softhddevice"; 18 - version = "2.4.1"; 18 + version = "2.4.2"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "ua0lnj"; 22 22 repo = "vdr-plugin-softhddevice"; 23 - sha256 = "sha256-bddPyOx8tCG+us9QQxO1t7rZK1HfZy3TFWtd5mPw2o4="; 23 + sha256 = "sha256-T/A85lkKCjBaEaXGxVTurc1VY01mBCTv8t8m5qzvtpY="; 24 24 rev = "v${version}"; 25 25 }; 26 26
+6 -5
pkgs/applications/virtualization/virtualbox/default.nix
··· 38 38 libvpx, 39 39 nettools, 40 40 dbus, 41 - substituteAll, 41 + replaceVars, 42 42 gsoap, 43 43 zlib, 44 44 xz, ··· 235 235 # these issues by patching the code to set QT_PLUGIN_PATH to the necessary paths, 236 236 # after the code that unsets it. Note that qtsvg is included so that SVG icons from 237 237 # the user's icon theme can be loaded. 238 - ++ optional (!headless && enableHardening) (substituteAll { 239 - src = ./qt-env-vars.patch; 240 - qtPluginPath = "${qtbase}/bin/${qtbase.qtPluginPrefix}:${qtsvg}/bin/${qtbase.qtPluginPrefix}:${qtwayland}/bin/${qtbase.qtPluginPrefix}"; 241 - }) 238 + ++ optional (!headless && enableHardening) ( 239 + replaceVars ./qt-env-vars.patch { 240 + qtPluginPath = "${qtbase}/bin/${qtbase.qtPluginPrefix}:${qtsvg}/bin/${qtbase.qtPluginPrefix}:${qtwayland}/bin/${qtbase.qtPluginPrefix}"; 241 + } 242 + ) 242 243 # While the KVM patch should not break any other behavior if --with-kvm is not specified, 243 244 # we don't take any chances and only apply it if people actually want to use KVM support. 244 245 ++ optional enableKvm (
+2 -3
pkgs/build-support/mitm-cache/default.nix
··· 4 4 fetchFromGitHub, 5 5 callPackage, 6 6 rustPlatform, 7 - substituteAll, 7 + replaceVars, 8 8 openssl, 9 9 Security, 10 10 python3Packages, ··· 27 27 28 28 cargoHash = "sha256-6eYOSSlswJGR2IrFo17qVnwI+h2FkyTjLFvwf62nG2c="; 29 29 30 - setupHook = substituteAll { 31 - src = ./setup-hook.sh; 30 + setupHook = replaceVars ./setup-hook.sh { 32 31 inherit openssl; 33 32 ephemeral_port_reserve = python3Packages.ephemeral-port-reserve; 34 33 };
+6 -8
pkgs/by-name/al/almo/package.nix
··· 5 5 gcc, 6 6 python312Packages, 7 7 }: 8 - let 9 - version = "0.9.5-alpha"; 10 - in 11 - stdenv.mkDerivation { 8 + stdenv.mkDerivation (finalAttrs: { 12 9 pname = "almo"; 13 - inherit version; 10 + version = "0.9.6-alpha"; 14 11 15 12 src = fetchFromGitHub { 16 13 owner = "abap34"; 17 14 repo = "almo"; 18 - tag = "v${version}"; 19 - sha256 = "sha256-Cz+XDJmdp+utzwm1c7ThTNS6kfNF6r4B16tnGQSCVMc="; 15 + tag = "v${finalAttrs.version}"; 16 + hash = "sha256-eNigZUeUz6ZjQsn+0S6+Orv0WoLbqGgoA3+wG5ZcSBI="; 20 17 }; 21 18 22 19 buildInputs = [ ··· 45 42 license = lib.licenses.mit; 46 43 platforms = lib.platforms.all; 47 44 homepage = "https://github.com/abap34/almo"; 45 + changelog = "https://github.com/abap34/almo/releases/tag/${finalAttrs.src.tag}"; 48 46 maintainers = with lib.maintainers; [ momeemt ]; 49 47 mainProgram = "almo"; 50 48 }; 51 - } 49 + })
+2 -2
pkgs/by-name/al/alpine-make-rootfs/package.nix
··· 16 16 }: 17 17 stdenvNoCC.mkDerivation rec { 18 18 pname = "alpine-make-rootfs"; 19 - version = "0.7.1"; 19 + version = "0.7.2"; 20 20 21 21 src = fetchFromGitHub { 22 22 owner = "alpinelinux"; 23 23 repo = "alpine-make-rootfs"; 24 24 rev = "v${version}"; 25 - hash = "sha256-3j++mbQc6ozayZISgDFS9r35ovP0qLoflT6ahp8SUbc="; 25 + hash = "sha256-sNqaMBtbklSBcKxsc3ROI30bE1PUzJJeZqLqC9p3H+U="; 26 26 }; 27 27 28 28 nativeBuildInputs = [ makeWrapper ];
+2 -2
pkgs/by-name/ar/arc-browser/package.nix
··· 10 10 11 11 stdenvNoCC.mkDerivation (finalAttrs: { 12 12 pname = "arc-browser"; 13 - version = "1.77.0-57419"; 13 + version = "1.78.1-57736"; 14 14 15 15 src = fetchurl { 16 16 url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; 17 - hash = "sha256-euPJvD/BM0jVh3oBMsZNAZeyxTNRA4dmwIYNhwTjHoI="; 17 + hash = "sha256-n81GMJ1Lhx8z/wwicyEKCbJM7WVi0mepSbefSXMuM3g="; 18 18 }; 19 19 20 20 nativeBuildInputs = [ undmg ];
+48
pkgs/by-name/bc/bcc/bashreadline.py-remove-dependency-on-elftools.patch
··· 1 + From 25c77bff079c331ae12d9e4499c82fdabf301610 Mon Sep 17 00:00:00 2001 2 + From: Dominique Martinet <asmadeus@codewreck.org> 3 + Date: Sun, 21 Jul 2024 20:59:51 +0900 4 + Subject: [PATCH] bashreadline.py: remove dependency on elftools 5 + 6 + This helper is only here to differentiate between very old bash 7 + versions or semi-recent ones; since we'll only catter to newer 8 + bash versions we don't need to bother with elftools here: 9 + just hardcode the newer symbol. 10 + --- 11 + tools/bashreadline.py | 14 +------------- 12 + 1 file changed, 1 insertion(+), 13 deletions(-) 13 + 14 + diff --git a/tools/bashreadline.py b/tools/bashreadline.py 15 + index 7e8324a2c0ea..e4b20aeb2371 100755 16 + --- a/tools/bashreadline.py 17 + +++ b/tools/bashreadline.py 18 + @@ -17,7 +17,6 @@ 19 + # 12-Feb-2016 Allan McAleavy migrated to BPF_PERF_OUTPUT 20 + 21 + from __future__ import print_function 22 + -from elftools.elf.elffile import ELFFile 23 + from bcc import BPF 24 + from time import strftime 25 + import argparse 26 + @@ -33,18 +32,7 @@ args = parser.parse_args() 27 + 28 + name = args.shared if args.shared else "/bin/bash" 29 + 30 + - 31 + -def get_sym(filename): 32 + - with open(filename, 'rb') as f: 33 + - elf = ELFFile(f) 34 + - symbol_table = elf.get_section_by_name(".dynsym") 35 + - for symbol in symbol_table.iter_symbols(): 36 + - if symbol.name == "readline_internal_teardown": 37 + - return "readline_internal_teardown" 38 + - return "readline" 39 + - 40 + - 41 + -sym = get_sym(name) 42 + +sym = "readline_internal_teardown" 43 + 44 + # load BPF program 45 + bpf_text = """ 46 + -- 47 + 2.45.2 48 +
+10 -3
pkgs/by-name/bc/bcc/package.nix
··· 15 15 netperf, 16 16 nixosTests, 17 17 python3Packages, 18 + readline, 18 19 stdenv, 19 20 zip, 20 21 }: 21 22 22 23 python3Packages.buildPythonApplication rec { 23 24 pname = "bcc"; 24 - version = "0.32.0"; 25 + version = "0.33.0"; 25 26 26 27 disabled = !stdenv.hostPlatform.isLinux; 27 28 ··· 29 30 owner = "iovisor"; 30 31 repo = "bcc"; 31 32 tag = "v${version}"; 32 - hash = "sha256-urEHDDBBIdopQiT/QI5WtTbIO45pBk6bTNpfs8q/2hA="; 33 + hash = "sha256-6dT3seLuEVQNKWiYGLK1ajXzW7pb62S/GQ0Lp4JdGjc="; 33 34 }; 34 35 format = "other"; 35 36 ··· 50 51 # This is needed until we fix 51 52 # https://github.com/NixOS/nixpkgs/issues/40427 52 53 ./fix-deadlock-detector-import.patch 54 + # Quick & dirty fix for bashreadline 55 + # https://github.com/NixOS/nixpkgs/issues/328743 56 + ./bashreadline.py-remove-dependency-on-elftools.patch 53 57 ]; 54 58 55 59 propagatedBuildInputs = [ python3Packages.netaddr ]; ··· 85 89 86 90 # https://github.com/iovisor/bcc/issues/3996 87 91 substituteInPlace src/cc/libbcc.pc.in \ 88 - --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ 92 + --replace-fail '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ 93 + 94 + substituteInPlace tools/bashreadline.py \ 95 + --replace-fail '/bin/bash' '${readline}/lib/libreadline.so' 89 96 ''; 90 97 91 98 preInstall = ''
+25
pkgs/by-name/bi/bitwuzla/package.nix
··· 14 14 cryptominisat, 15 15 zlib, 16 16 pkg-config, 17 + cmake, 17 18 }: 18 19 19 20 stdenv.mkDerivation (finalAttrs: { ··· 34 35 pkg-config 35 36 git 36 37 ninja 38 + cmake 37 39 ]; 38 40 buildInputs = [ 39 41 cadical ··· 48 50 # note: the default value for default_library fails to link dynamic dependencies 49 51 # but setting it to shared works even in pkgsStatic 50 52 "-Ddefault_library=shared" 53 + "-Dcryptominisat=true" 51 54 52 55 (lib.strings.mesonEnable "testing" finalAttrs.finalPackage.doCheck) 53 56 ]; ··· 56 59 checkInputs = [ gtest ]; 57 60 # two tests fail on darwin 58 61 doCheck = stdenv.hostPlatform.isLinux; 62 + doInstallCheck = true; 63 + installCheckPhase = '' 64 + runHook preInstallCheck 65 + 66 + export needle=11011110101011011011111011101111 67 + 68 + cat > file.smt2 <<EOF 69 + (declare-fun a () (_ BitVec 32)) 70 + (assert (= a #b$needle)) 71 + (check-sat) 72 + (get-model) 73 + EOF 74 + 75 + # check each backend 76 + ( 77 + set -euxo pipefail; 78 + $out/bin/bitwuzla -S cms -j 3 -m file.smt2 | tee /dev/stderr | grep $needle; 79 + $out/bin/bitwuzla -S cadical -m file.smt2 | tee /dev/stderr | grep $needle; 80 + ) 81 + 82 + runHook postInstallCheck 83 + ''; 59 84 60 85 meta = { 61 86 description = "SMT solver for fixed-size bit-vectors, floating-point arithmetic, arrays, and uninterpreted functions";
+1 -3
pkgs/by-name/co/comic-mandown/package.nix
··· 6 6 }: 7 7 let 8 8 mandown' = python3Packages.mandown.overridePythonAttrs (prev: { 9 - propagatedBuildInputs = 10 - prev.propagatedBuildInputs 11 - ++ lib.optionals withGUI prev.optional-dependencies.gui; 9 + dependencies = prev.dependencies ++ lib.optionals withGUI prev.optional-dependencies.gui; 12 10 }); 13 11 mandownApp = python3Packages.toPythonApplication mandown'; 14 12 in
+2 -2
pkgs/by-name/cs/csharpier/package.nix
··· 2 2 3 3 buildDotnetGlobalTool { 4 4 pname = "csharpier"; 5 - version = "0.30.5"; 5 + version = "0.30.6"; 6 6 executables = "dotnet-csharpier"; 7 7 8 - nugetHash = "sha256-8NuhwRhvEZtmPtgbLLNbTOLUoDAihtkKE8aw5UQ0O5A="; 8 + nugetHash = "sha256-A39F3ohTHZo8yYoyBOAUeW0bk98Za74Esz0Tx0tXgDI="; 9 9 10 10 meta = with lib; { 11 11 description = "Opinionated code formatter for C#";
+123
pkgs/by-name/da/daggerfall-unity/package.nix
··· 1 + { 2 + alsa-lib, 3 + autoPatchelfHook, 4 + copyDesktopItems, 5 + fetchurl, 6 + fetchzip, 7 + lib, 8 + libGL, 9 + libXScrnSaver, 10 + libXcursor, 11 + libXi, 12 + libXinerama, 13 + libXrandr, 14 + libXxf86vm, 15 + libpulseaudio, 16 + libudev0-shim, 17 + makeDesktopItem, 18 + nix-update-script, 19 + stdenv, 20 + vulkan-loader, 21 + pname ? "daggerfall-unity", 22 + includeUnfree ? false, 23 + }: 24 + let 25 + docFiles = 26 + [ 27 + (fetchurl { 28 + url = "https://www.dfworkshop.net/static_files/daggerfallunity/Daggerfall%20Unity%20Manual.pdf"; 29 + hash = "sha256-FywlD0K5b4vUWzyzANlF9575XTDLivbsym7F+qe0Dm8="; 30 + name = "Daggerfall Unity Manual.pdf"; 31 + meta.license = lib.licenses.mit; 32 + }) 33 + ] 34 + ++ lib.optionals includeUnfree [ 35 + (fetchurl { 36 + url = "https://cdn.bethsoft.com/bethsoft.com/manuals/Daggerfall/daggerfall-en.pdf"; 37 + hash = "sha256-24KSP/E7+KvSRTMDq63NVlVWTFZnQj1yya8wc36yrC0="; 38 + meta.license = lib.licenses.unfree; 39 + }) 40 + ]; 41 + in 42 + stdenv.mkDerivation (finalAttrs: { 43 + inherit pname; 44 + version = "1.1.1"; 45 + 46 + src = fetchzip { 47 + url = "https://github.com/Interkarma/daggerfall-unity/releases/download/v${finalAttrs.version}/dfu_linux_64bit-v${finalAttrs.version}.zip"; 48 + hash = "sha256-JuhhVLpREM9e9UtlDttvFUhHWpH7Sh79OEo1OM4ggKA="; 49 + stripRoot = false; 50 + }; 51 + 52 + nativeBuildInputs = [ 53 + autoPatchelfHook 54 + copyDesktopItems 55 + ]; 56 + 57 + buildInputs = [ 58 + alsa-lib 59 + libGL 60 + libXScrnSaver 61 + libXcursor 62 + libXi 63 + libXinerama 64 + libXrandr 65 + libXxf86vm 66 + libpulseaudio 67 + libudev0-shim 68 + vulkan-loader 69 + ]; 70 + 71 + strictDeps = true; 72 + 73 + installPhase = '' 74 + runHook preInstall 75 + 76 + mkdir --parents "$out/share/doc/" 77 + cp --recursive * "$out" 78 + 79 + ${lib.strings.concatMapStringsSep "\n" (file: '' 80 + cp "${file}" "$out/share/doc/${file.name}" 81 + '') docFiles} 82 + 83 + runHook postInstall 84 + ''; 85 + 86 + appendRunpaths = [ (lib.makeLibraryPath finalAttrs.buildInputs) ]; 87 + 88 + desktopItems = [ 89 + (makeDesktopItem { 90 + name = "daggerfall-unity"; 91 + desktopName = "Daggerfall Unity"; 92 + comment = finalAttrs.meta.description; 93 + icon = "UnityPlayer"; 94 + exec = "DaggerfallUnity.x86_64"; 95 + categories = [ "Game" ]; 96 + }) 97 + ]; 98 + 99 + passthru.updateScript = nix-update-script { 100 + extraArgs = [ "--version-regex=^v(\\d+(\\.\\d+)*)$" ]; 101 + }; 102 + 103 + meta = { 104 + homepage = "https://www.dfworkshop.net/"; 105 + description = "Open source recreation of Daggerfall in the Unity engine"; 106 + longDescription = '' 107 + Daggerfall Unity is an open source recreation of Daggerfall in the Unity engine created by Daggerfall Workshop. 108 + 109 + Experience the adventure and intrigue of Daggerfall with all of its original charm along with hundreds of fixes, quality of life enhancements, and extensive mod support. 110 + 111 + Includes Daggerfall Unity manual. 112 + 113 + ${lib.optionalString includeUnfree '' 114 + This "unfree" variant also includes the manual for Daggerfall (the game, not the open source engine). 115 + ''} 116 + ''; 117 + changelog = "https://github.com/Interkarma/daggerfall-unity/releases/tag/v${finalAttrs.version}"; 118 + mainProgram = "DaggerfallUnity.x86_64"; 119 + license = lib.licenses.mit; 120 + maintainers = with lib.maintainers; [ l0b0 ]; 121 + platforms = [ "x86_64-linux" ]; 122 + }; 123 + })
+2 -2
pkgs/by-name/db/dblab/package.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "dblab"; 8 - version = "0.30.0"; 8 + version = "0.30.1"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "danvergara"; 12 12 repo = "dblab"; 13 13 rev = "v${version}"; 14 - hash = "sha256-TRMzKvJh5+s4+uLdLsORbnJvopHYEi28sIi2wo/eLBQ="; 14 + hash = "sha256-a0452fNr78FDhVoBF8RkKbtamvc5e6gEbTOeRdgGQs4="; 15 15 }; 16 16 17 17 vendorHash = "sha256-n1Z3sNvNLX1QpfpDSGDygjbC6IE85SBJHvyliy11OjU=";
+2 -2
pkgs/by-name/dn/dnscontrol/package.nix
··· 9 9 10 10 buildGoModule rec { 11 11 pname = "dnscontrol"; 12 - version = "4.15.4"; 12 + version = "4.15.5"; 13 13 14 14 src = fetchFromGitHub { 15 15 owner = "StackExchange"; 16 16 repo = "dnscontrol"; 17 17 rev = "v${version}"; 18 - hash = "sha256-Jwv8gIcQD62OV8i5DvIcurcsc6Wkis+kl95lnj8NXds="; 18 + hash = "sha256-pb2r9XBQmS1pcCV9qBzGEPLfIgMaOFLh+5oW6Wks/sc="; 19 19 }; 20 20 21 21 vendorHash = "sha256-x/FxspmR89Q2yZI0sP1D9OVUFEjMlpT/0IPusy5zHuo=";
+2 -2
pkgs/by-name/do/doctl/package.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "doctl"; 5 - version = "1.120.1"; 5 + version = "1.120.2"; 6 6 7 7 vendorHash = null; 8 8 ··· 31 31 owner = "digitalocean"; 32 32 repo = "doctl"; 33 33 rev = "v${version}"; 34 - sha256 = "sha256-14oBTAE5/bBSYce9esn9gdMW13CUhB5IKkw9v3Gn6Nc="; 34 + sha256 = "sha256-zIpwR9tgv1vO2xI5DaLTY/eFuv91G4tlQAtJBi0pXfA="; 35 35 }; 36 36 37 37 meta = with lib; {
+2 -2
pkgs/by-name/do/doomretro/package.nix
··· 15 15 in 16 16 stdenv.mkDerivation (finalAttrs: { 17 17 pname = "doomretro"; 18 - version = "5.6.1"; 18 + version = "5.6.2"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "bradharding"; 22 22 repo = "doomretro"; 23 23 rev = "v${finalAttrs.version}"; 24 - hash = "sha256-v/a7Jc82QpH58c6pkki8xXZBi0v54oz03A2A/Oz3udU="; 24 + hash = "sha256-w0stnSYIoxquy3PfbehpwlG5bnGVZWGy/8yNBpxYUSY="; 25 25 }; 26 26 27 27 nativeBuildInputs = [
-4
pkgs/by-name/ea/earbuds/package.nix
··· 54 54 # versionCheckProgramArg = [ "--version" ]; 55 55 # doInstallCheck = true; 56 56 57 - passthru = { 58 - updateScript = nix-update-script { }; 59 - }; 60 - 61 57 postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' 62 58 installShellCompletion --cmd earbuds \ 63 59 --bash <($out/bin/earbuds --generate bash) \
+2 -2
pkgs/by-name/fa/fatrace/package.nix
··· 8 8 9 9 stdenv.mkDerivation rec { 10 10 pname = "fatrace"; 11 - version = "0.17.0"; 11 + version = "0.18.0"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "martinpitt"; 15 15 repo = pname; 16 16 rev = version; 17 - sha256 = "sha256-MRHM+hyuRevK4L3u6dGw1S3O7w+BJBsprJVcSz6Q9xg="; 17 + sha256 = "sha256-QkavhxORENQSLUg4tq+W1WB7zSYYinWOOYPqNbv+pEI="; 18 18 }; 19 19 20 20 buildInputs = [
+2 -2
pkgs/by-name/ga/gama-tui/package.nix
··· 6 6 7 7 buildGoModule rec { 8 8 pname = "gama-tui"; 9 - version = "1.2.0"; 9 + version = "1.2.1"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "termkit"; 13 13 repo = "gama"; 14 14 tag = "v${version}"; 15 - hash = "sha256-ZMM+Nt/9Bqmx7kzlhZM8I++BYZhwilRjNXSTAmOrxk4="; 15 + hash = "sha256-ISgORjzH7ZigQYm7PSA4ZClhpw2GU7yor580fEf5UNc="; 16 16 }; 17 17 18 18 vendorHash = "sha256-PTyrSXLMr244+ZTvjBBUc1gmwYXBAs0bXZS2t3aSWFQ=";
+3 -3
pkgs/by-name/gm/gmailctl/package.nix
··· 7 7 8 8 buildGoModule rec { 9 9 pname = "gmailctl"; 10 - version = "0.10.7"; 10 + version = "0.11.0"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "mbrt"; 14 14 repo = "gmailctl"; 15 15 rev = "v${version}"; 16 - hash = "sha256-OpRkBHNWRrBhh6nGrV7dZT01xsSlbANCk+g7b8SidG0="; 16 + hash = "sha256-euYl7GKidkOFsSxrEnSBIdBNZOKuBBaS3LNQOZy9R9g="; 17 17 }; 18 18 19 - vendorHash = "sha256-+r0WHrKARcxW1hUY1HwAXk0X6ZQrbgBj9+GjIJV5DS0="; 19 + vendorHash = "sha256-OXz6GlpC9yhe4pRuVxTUUruJyxBQ63JC4a8xwtuDM/o="; 20 20 21 21 nativeBuildInputs = [ 22 22 installShellFiles
+3 -3
pkgs/by-name/go/gocryptfs/package.nix
··· 12 12 13 13 buildGoModule rec { 14 14 pname = "gocryptfs"; 15 - version = "2.4.0"; 15 + version = "2.5.0"; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "rfjakob"; 19 19 repo = pname; 20 20 rev = "v${version}"; 21 - sha256 = "sha256-lStaMj2f8lQZx2E42o4ikPmFQzydlN3PFKwFvUx37SI="; 21 + sha256 = "sha256-+JMit0loxT5KOupqL5bkO3pcAfuiN8YAw0ueUh9mUJI="; 22 22 }; 23 23 24 - vendorHash = "sha256-ir7FR7ndbPhzUOCVPrYO0SEe03wDFIP74I4X6HJxtE8="; 24 + vendorHash = "sha256-9qYmErARMIxnbECANO66m6fPwoR8YQlJzP/VcK9tfP4="; 25 25 26 26 nativeBuildInputs = [ 27 27 makeWrapper
+37
pkgs/by-name/ha/handheld-daemon/0001-remove-selinux-fixes.patch
··· 1 + diff --git a/src/hhd/plugins/power/power.py b/src/hhd/plugins/power/power.py 2 + index 5ece857..be41542 100644 3 + --- a/src/hhd/plugins/power/power.py 4 + +++ b/src/hhd/plugins/power/power.py 5 + @@ -79,12 +79,6 @@ def create_subvol(): 6 + ) 7 + return 8 + 9 + - # Fixup selinux for swap 10 + - subprocess.run( 11 + - ["semanage", "fcontext", "-a", "-t", "var_t", HHD_SWAP_SUBVOL], 12 + - ) 13 + - subprocess.run(["restorecon", HHD_SWAP_SUBVOL]) 14 + - 15 + logger.info(f"Creating swap subvolume {HHD_SWAP_SUBVOL}") 16 + os.system(f"btrfs subvolume create {HHD_SWAP_SUBVOL}") 17 + 18 + @@ -153,19 +147,6 @@ def create_temporary_swap(): 19 + subprocess.run(["chmod", "600", HHD_SWAP_FILE], check=True) 20 + subprocess.run(["mkswap", HHD_SWAP_FILE], check=True) 21 + 22 + - # Fixup selinux for swap 23 + - subprocess.run( 24 + - [ 25 + - "semanage", 26 + - "fcontext", 27 + - "-a", 28 + - "-t", 29 + - "swapfile_t", 30 + - HHD_SWAP_FILE, 31 + - ], 32 + - ) 33 + - subprocess.run(["restorecon", HHD_SWAP_FILE]) 34 + - 35 + # Enable swap 36 + subprocess.run(["swapon", HHD_SWAP_FILE], check=True) 37 +
+18 -4
pkgs/by-name/ha/handheld-daemon/package.nix
··· 11 11 efibootmgr, 12 12 dbus, 13 13 lsof, 14 + btrfs-progs, 15 + util-linux, 14 16 }: 15 17 python3Packages.buildPythonApplication rec { 16 18 pname = "handheld-daemon"; 17 - version = "3.9.0"; 19 + version = "3.10.2"; 18 20 pyproject = true; 19 21 20 22 src = fetchFromGitHub { 21 23 owner = "hhd-dev"; 22 24 repo = "hhd"; 23 25 tag = "v${version}"; 24 - hash = "sha256-y3CxdWqQEwdNYs4m1NEUeRjTvvhEpS5S739wyFlluWo="; 26 + hash = "sha256-6BjXqqNe2u/rh1cnuJ13L/1KimprcyatIr53b0GOBSM="; 25 27 }; 28 + 29 + # Handheld-daemon runs some selinux-related utils which are not in nixpkgs. 30 + # NixOS doesn't support selinux so we can safely remove them 31 + patches = [ ./0001-remove-selinux-fixes.patch ]; 26 32 27 33 # This package relies on several programs expected to be on the user's PATH. 28 34 # We take a more reproducible approach by patching the absolute path to each of these required ··· 41 47 substituteInPlace src/hhd/controller/physical/imu.py \ 42 48 --replace-fail '"modprobe' '"${lib.getExe' kmod "modprobe"}' 43 49 44 - substituteInPlace src/hhd/plugins/overlay/power.py \ 45 - --replace-fail '"efibootmgr"' '"${lib.getExe' efibootmgr "id"}"' 50 + substituteInPlace src/hhd/plugins/power/power.py \ 51 + --replace-fail '"efibootmgr"' '"${lib.getExe' efibootmgr "id"}"' \ 52 + --replace-fail '"systemctl"' '"${lib.getExe' systemd "systemctl"}"' \ 53 + --replace-fail '"stat"' '"${lib.getExe' coreutils "stat"}"' \ 54 + --replace-fail '"swapon"' '"${lib.getExe' util-linux "swapon"}"' \ 55 + --replace-fail '"swapoff"' '"${lib.getExe' util-linux "swapoff"}"' \ 56 + --replace-fail '"fallocate"' '"${lib.getExe' util-linux "fallocate"}"' \ 57 + --replace-fail '"chmod"' '"${lib.getExe' coreutils "chmod"}"' \ 58 + --replace-fail '"mkswap"' '"${lib.getExe' util-linux "mkswap"}"' \ 59 + --replace-fail '"btrfs",' '"${lib.getExe' btrfs-progs "btrfs"}",' 46 60 47 61 substituteInPlace src/hhd/device/oxp/serial.py \ 48 62 --replace-fail "udevadm" "${lib.getExe' systemd "udevadm"}"
+6 -6
pkgs/by-name/ht/httpie-desktop/package.nix
··· 7 7 8 8 appimageTools.wrapType2 rec { 9 9 pname = "httpie-desktop"; 10 - version = "2024.1.2"; 10 + version = "2025.1.0"; 11 11 12 12 src = 13 13 if stdenv.hostPlatform.system == "aarch64-linux" then 14 14 fetchurl { 15 15 url = "https://github.com/httpie/desktop/releases/download/v${version}/HTTPie-${version}-arm64.AppImage"; 16 - hash = "sha256-RhIyLakCkMUcXvu0sgl5MtV4YXXkqqH1UUS7bptUzww="; 16 + hash = "sha256-YadVCoBNFFco4773COyJOGHtbFKW1zMzi5kazWqIGbY="; 17 17 } 18 18 else 19 19 fetchurl { 20 20 url = "https://github.com/httpie/desktop/releases/download/v${version}/HTTPie-${version}.AppImage"; 21 - hash = "sha256-OOP1l7J2BgO3nOPSipxfwfN/lOUsl80UzYMBosyBHrM="; 21 + hash = "sha256-8Ecamw+rmY3iun8ytMsJW3gGHLNcyuZ7VkOiNfiDEyk="; 22 22 }; 23 23 24 24 extraInstallCommands = ··· 34 34 --replace-fail 'Exec=AppRun' 'Exec=httpie-desktop' 35 35 ''; 36 36 37 - meta = with lib; { 37 + meta = { 38 38 description = "Cross-platform API testing client for humans. Painlessly test REST, GraphQL, and HTTP APIs"; 39 39 homepage = "https://github.com/httpie/desktop"; 40 - license = licenses.unfree; 41 - maintainers = with maintainers; [ luftmensch-luftmensch ]; 40 + license = lib.licenses.unfree; 41 + maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; 42 42 mainProgram = "httpie-desktop"; 43 43 platforms = [ 44 44 "x86_64-linux"
+2 -2
pkgs/by-name/ko/kotlin-language-server/package.nix
··· 10 10 11 11 stdenv.mkDerivation rec { 12 12 pname = "kotlin-language-server"; 13 - version = "1.3.12"; 13 + version = "1.3.13"; 14 14 src = fetchzip { 15 15 url = "https://github.com/fwcd/kotlin-language-server/releases/download/${version}/server.zip"; 16 - hash = "sha256-poWaU0vZS1cpMbbvN7/s1RRUKhekdfTi08fF/IZsVGs="; 16 + hash = "sha256-ypiOeXA+14Js31WPGJAdSjskQJR9sBPVWGecLkKHiN4="; 17 17 }; 18 18 19 19 dontBuild = true;
+2 -2
pkgs/by-name/ku/kubecm/package.nix
··· 6 6 7 7 buildGoModule rec { 8 8 pname = "kubecm"; 9 - version = "0.32.1"; 9 + version = "0.32.2"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "sunny0826"; 13 13 repo = "kubecm"; 14 14 rev = "v${version}"; 15 - hash = "sha256-qB3Xzw6nWViBd2QMa3gBLrYhflalkjyLqeyl+7ICoSA="; 15 + hash = "sha256-cW96teV0k0MJq6WJ37Ao4tDOOsB48uU2+WTD07n5EuQ="; 16 16 }; 17 17 18 18 vendorHash = "sha256-Fr31wLvzIoN2wIU2EmUrsqiMcPpdJpQI3ZfB//JYIXE=";
+2 -2
pkgs/by-name/la/last/package.nix
··· 9 9 10 10 stdenv.mkDerivation rec { 11 11 pname = "last"; 12 - version = "1607"; 12 + version = "1608"; 13 13 14 14 src = fetchFromGitLab { 15 15 owner = "mcfrith"; 16 16 repo = "last"; 17 17 rev = "refs/tags/${version}"; 18 - hash = "sha256-AHaKE9il4GZ5JhCqmScqG/rTHEOA8+A421pbdrDHZeY="; 18 + hash = "sha256-enTw68QklAJ6iz5L8y0R6ss6gAUFERfqdUMhJnPtePk="; 19 19 }; 20 20 21 21 nativeBuildInputs = [
+1
pkgs/by-name/li/libixion/package.nix
··· 23 23 nativeBuildInputs = [ 24 24 autoreconfHook 25 25 pkg-config 26 + python3.pythonOnBuildForHost 26 27 ]; 27 28 28 29 buildInputs = [
+7 -3
pkgs/by-name/li/liblangtag/package.nix
··· 43 43 cp "${language_subtag_registry}" data/language-subtag-registry 44 44 ''; 45 45 46 - configureFlags = lib.optional ( 47 - stdenv.hostPlatform.libc == "glibc" 48 - ) "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias"; 46 + configureFlags = 47 + [ 48 + "ac_cv_va_copy=1" 49 + ] 50 + ++ lib.optional ( 51 + stdenv.hostPlatform.libc == "glibc" 52 + ) "--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias"; 49 53 50 54 buildInputs = [ 51 55 gettext
+1 -1
pkgs/by-name/li/libossp_uuid/package.nix
··· 14 14 }; 15 15 16 16 configureFlags = [ 17 - "ac_cv_va_copy=yes" 17 + "ac_cv_va_copy=C99" 18 18 ] ++ lib.optional stdenv.hostPlatform.isFreeBSD "--with-pic"; 19 19 20 20 patches = [ ./shtool.patch ];
+2 -2
pkgs/by-name/lx/lxgw-wenkai-screen/package.nix
··· 6 6 7 7 stdenvNoCC.mkDerivation (finalAttrs: { 8 8 pname = "lxgw-wenkai-screen"; 9 - version = "1.501"; 9 + version = "1.510"; 10 10 11 11 src = fetchurl { 12 12 url = "https://github.com/lxgw/LxgwWenKai-Screen/releases/download/v${finalAttrs.version}/LXGWWenKaiScreen.ttf"; 13 - hash = "sha256-em3uh53neN8v1ueiw1rWVtC0bteD7IG3X1g9tkjBRJA="; 13 + hash = "sha256-JAU87Jb3gqS1mXYprWKYt5xnzMVlZR992PNmsqnTF3U="; 14 14 }; 15 15 16 16 dontUnpack = true;
+2 -2
pkgs/by-name/ma/materialgram/package.nix
··· 11 11 unwrapped = telegram-desktop.unwrapped.overrideAttrs ( 12 12 finalAttrs: previousAttrs: { 13 13 pname = "materialgram-unwrapped"; 14 - version = "5.9.0.1"; 14 + version = "5.10.3.1"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "kukuruzka165"; 18 18 repo = "materialgram"; 19 19 rev = "refs/tags/v${finalAttrs.version}"; 20 - hash = "sha256-QmXwO8Dn+ATWGwN5smxOB2kxmJZETSMbqwFoR0t3luc="; 20 + hash = "sha256-vnsQHvBQLc5ZCeGDW3msAPNHgWB7llgEIraNpdb/Fks="; 21 21 fetchSubmodules = true; 22 22 }; 23 23
+5
pkgs/by-name/oc/octopus/package.nix
··· 40 40 hash = "sha256-vG1HUkuNUZkhBumoJJy3AyFU6cZOo1YGmaOYcU6bPOM="; 41 41 }; 42 42 43 + patches = [ 44 + # Discover all MPI languages components to avoid scalpack discovery failure 45 + ./scalapack-mpi-alias.patch 46 + ]; 47 + 43 48 nativeBuildInputs = [ 44 49 which 45 50 perl
+13
pkgs/by-name/oc/octopus/scalapack-mpi-alias.patch
··· 1 + diff --git a/CMakeLists.txt b/CMakeLists.txt 2 + index 70d89efb5e..47ba750d7a 100644 3 + --- a/CMakeLists.txt 4 + +++ b/CMakeLists.txt 5 + @@ -131,7 +131,7 @@ set(Octopus_ext_libs) 6 + find_package(GSL) 7 + if (OCTOPUS_MPI) 8 + set(MPI_DETERMINE_LIBRARY_VERSION ON) 9 + - find_package(MPI 3 COMPONENTS Fortran) 10 + + find_package(MPI 3) 11 + # Further set MKL variables 12 + if (MPI_Fortran_LIBRARY_VERSION_STRING MATCHES Intel) 13 + set(MKL_MPI intelmpi CACHE STRING "Octopus: Overloaded")
+3 -3
pkgs/by-name/op/opnborg/package.nix
··· 5 5 }: 6 6 buildGoModule rec { 7 7 pname = "opnborg"; 8 - version = "0.1.54"; 8 + version = "0.1.63"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "paepckehh"; 12 12 repo = "opnborg"; 13 13 rev = "v${version}"; 14 - hash = "sha256-N6tZqHyL3bOkXJrn4qMVpUR3tQHa8DiurRqy6BJnK+Y="; 14 + hash = "sha256-t/bcqHsRLE4Mxoe/0pziIHHrPf2ijUkYjr1vq8C1ZzQ="; 15 15 }; 16 16 17 - vendorHash = "sha256-REXJryUcu+/AdVx1aK0nJ98Wq/EdhrZqL24kC1wK6mc="; 17 + vendorHash = "sha256-kFO4Ju1EbUEc/CZpujmJpM1R1vRI5J4s6UIa2+IhTKE="; 18 18 19 19 ldflags = [ 20 20 "-s"
+3 -3
pkgs/by-name/ov/ov/package.nix
··· 12 12 13 13 buildGoModule rec { 14 14 pname = "ov"; 15 - version = "0.37.0"; 15 + version = "0.38.0"; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "noborus"; 19 19 repo = "ov"; 20 20 tag = "v${version}"; 21 - hash = "sha256-PZYYr2763L/BOn05TSDr3tkjQQkg2Niic3rJrFSevu0="; 21 + hash = "sha256-xbGo/Hgg5XmJACRa4t4QC2vHse5gJ2D4fmmDKurmfNw="; 22 22 }; 23 23 24 - vendorHash = "sha256-Xntel9WXwCY5iqC9JvrE/iSIXff504fCUP5kYc6pf7Y="; 24 + vendorHash = "sha256-YS4HraVJ++ZLvNRVUynsZsA1lVYo91IuMKmRxCBQeKU="; 25 25 26 26 ldflags = [ 27 27 "-s"
+21 -4
pkgs/by-name/pb/pbzip2/package.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchurl, 5 + fetchpatch, 5 6 bzip2, 6 7 }: 7 8 ··· 18 19 sha256 = "1rnvgcdixjzbrmcr1nv9b6ccrjfrhryaj7jwz28yxxv6lam3xlcg"; 19 20 }; 20 21 21 - buildInputs = [ bzip2 ]; 22 + patches = [ 23 + # https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals 24 + # https://bugs.launchpad.net/pbzip2/+bug/2081588 25 + (fetchpatch { 26 + url = "https://github.com/freebsd/freebsd-ports/raw/974d3ff054965d2bd2ab884a0579ed06c5a08b07/archivers/pbzip2/files/patch-BZ2StreamScanner.cpp"; 27 + extraPrefix = ""; 28 + hash = "sha256-dvXdp+5S41akavy+mvPGHpUxHxenXS7bbTVBVkIJj0s="; 29 + }) 30 + (fetchpatch { 31 + url = "https://github.com/freebsd/freebsd-ports/raw/974d3ff054965d2bd2ab884a0579ed06c5a08b07/archivers/pbzip2/files/patch-BZ2StreamScanner.h"; 32 + extraPrefix = ""; 33 + hash = "sha256-/twP8HyHP4cAVgb5cUPq0CgDxUgDYPdd9haH9wDOrz8="; 34 + }) 35 + ]; 22 36 23 - preBuild = "substituteInPlace Makefile --replace g++ c++"; 37 + postPatch = '' 38 + substituteInPlace pbzip2.cpp \ 39 + --replace-fail '"PRIuMAX"' '" PRIuMAX "' 40 + ''; 24 41 25 - installFlags = [ "PREFIX=$(out)" ]; 42 + buildInputs = [ bzip2 ]; 26 43 27 - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal"; 44 + installFlags = [ "PREFIX=$(out)" ]; 28 45 29 46 meta = with lib; { 30 47 homepage = "http://compression.ca/pbzip2/";
+2 -2
pkgs/by-name/pr/prometheus-frr-exporter/package.nix
··· 5 5 }: 6 6 7 7 let 8 - version = "1.3.2"; 8 + version = "1.3.3"; 9 9 src = fetchFromGitHub { 10 10 owner = "tynany"; 11 11 repo = "frr_exporter"; 12 12 rev = "v${version}"; 13 - hash = "sha256-Cy9m9ZwYWXelMsr6n6WWjBw4LlEZxkdy5ZMJKoJ8HZI="; 13 + hash = "sha256-HjVod7h2Q21StSRd2ntYunBFKBmZ4qi+Hl515zI4gbc="; 14 14 }; 15 15 in 16 16 buildGoModule {
+2 -2
pkgs/by-name/pr/proton-ge-bin/package.nix
··· 6 6 }: 7 7 stdenvNoCC.mkDerivation (finalAttrs: { 8 8 pname = "proton-ge-bin"; 9 - version = "GE-Proton9-22"; 9 + version = "GE-Proton9-23"; 10 10 11 11 src = fetchzip { 12 12 url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; 13 - hash = "sha256-mPoKv3mvazqiVCLEKS3LXAl2s4EYy7FPoSPexCvMawQ="; 13 + hash = "sha256-eC1vYUfSsESPSaQK6wnOgXMf6fzn+NZ7SU/al5kY6CY="; 14 14 }; 15 15 16 16 outputs = [
+3 -3
pkgs/by-name/ps/pscale/package.nix
··· 9 9 10 10 buildGoModule rec { 11 11 pname = "pscale"; 12 - version = "0.219.0"; 12 + version = "0.220.0"; 13 13 14 14 src = fetchFromGitHub { 15 15 owner = "planetscale"; 16 16 repo = "cli"; 17 17 rev = "v${version}"; 18 - sha256 = "sha256-kiypZpTw2DAF0fB7kqdRgDrvFtenexnVPq3kFNWBEgQ="; 18 + sha256 = "sha256-moCBa0XVOAG+cpLChYCMtvB39/qkWN8JMPBEruRDXzo="; 19 19 }; 20 20 21 - vendorHash = "sha256-/BYWAE2VpHy+HTmHOz4GhstcD+Y6R0tjeF9/8+LiZT0="; 21 + vendorHash = "sha256-yeeB1v7ZnyZVDD3hMEOxCnwJL25qF8IGYVypj1mXGVg="; 22 22 23 23 ldflags = [ 24 24 "-s"
+3 -3
pkgs/by-name/ra/railway/package.nix
··· 12 12 in 13 13 rustPlatform.buildRustPackage rec { 14 14 pname = "railway"; 15 - version = "3.20.1"; 15 + version = "3.20.2"; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "railwayapp"; 19 19 repo = "cli"; 20 20 rev = "v${version}"; 21 - hash = "sha256-a+p8cJKfkux0GupUuoZGfTFrrkW7fzUwmL4W6tr50ek="; 21 + hash = "sha256-AFcgONdWHHIK4/3zON6PRJaTXEXiE/0/Ha2rZpABiyw="; 22 22 }; 23 23 24 - cargoHash = "sha256-PKUN0scv7J4znaSAC2lc0AO4LzD4l59kuSKvLGRyXME="; 24 + cargoHash = "sha256-kyjEACPrHWeAbpzi/7Lq+8Fvw/ClBGN6Jn2hebert/g="; 25 25 26 26 nativeBuildInputs = [ pkg-config ]; 27 27
+5 -1
pkgs/by-name/re/refinery-cli/package.nix
··· 18 18 hash = "sha256-gHW+5WWzk1H2O5B2sWdl6QcOeUbNvbdZZBD10SmE1GA="; 19 19 }; 20 20 21 - cargoHash = "sha256-Go7+LZSze/IrNwEl+11Dm5O9RcREyPSkHPjlE9SPO70="; 21 + # The `time` crate doesn't build on Rust 1.80+ 22 + # https://github.com/NixOS/nixpkgs/issues/332957 23 + cargoPatches = [ ./time-crate.patch ]; 24 + 25 + cargoHash = "sha256-RGhcI0TiZWKkzXpiozGLIulQ6YpzWt6lRCPMTTLZDfE="; 22 26 23 27 nativeBuildInputs = [ pkg-config ]; 24 28
+83
pkgs/by-name/re/refinery-cli/time-crate.patch
··· 1 + diff --git a/Cargo.lock b/Cargo.lock 2 + index 59dad7c..eb5b122 100644 3 + --- a/Cargo.lock 4 + +++ b/Cargo.lock 5 + @@ -460,9 +460,12 @@ dependencies = [ 6 + 7 + [[package]] 8 + name = "deranged" 9 + -version = "0.3.8" 10 + +version = "0.3.11" 11 + source = "registry+https://github.com/rust-lang/crates.io-index" 12 + -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" 13 + +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" 14 + +dependencies = [ 15 + + "powerfmt", 16 + +] 17 + 18 + [[package]] 19 + name = "derive_utils" 20 + @@ -1236,6 +1239,12 @@ dependencies = [ 21 + "num-traits", 22 + ] 23 + 24 + +[[package]] 25 + +name = "num-conv" 26 + +version = "0.1.0" 27 + +source = "registry+https://github.com/rust-lang/crates.io-index" 28 + +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" 29 + + 30 + [[package]] 31 + name = "num-integer" 32 + version = "0.1.45" 33 + @@ -1414,6 +1423,12 @@ dependencies = [ 34 + "postgres-protocol", 35 + ] 36 + 37 + +[[package]] 38 + +name = "powerfmt" 39 + +version = "0.2.0" 40 + +source = "registry+https://github.com/rust-lang/crates.io-index" 41 + +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" 42 + + 43 + [[package]] 44 + name = "ppv-lite86" 45 + version = "0.2.17" 46 + @@ -1900,12 +1915,14 @@ dependencies = [ 47 + 48 + [[package]] 49 + name = "time" 50 + -version = "0.3.28" 51 + +version = "0.3.37" 52 + source = "registry+https://github.com/rust-lang/crates.io-index" 53 + -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" 54 + +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" 55 + dependencies = [ 56 + "deranged", 57 + "itoa", 58 + + "num-conv", 59 + + "powerfmt", 60 + "serde", 61 + "time-core", 62 + "time-macros", 63 + @@ -1913,16 +1930,17 @@ dependencies = [ 64 + 65 + [[package]] 66 + name = "time-core" 67 + -version = "0.1.1" 68 + +version = "0.1.2" 69 + source = "registry+https://github.com/rust-lang/crates.io-index" 70 + -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" 71 + +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" 72 + 73 + [[package]] 74 + name = "time-macros" 75 + -version = "0.2.14" 76 + +version = "0.2.19" 77 + source = "registry+https://github.com/rust-lang/crates.io-index" 78 + -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" 79 + +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" 80 + dependencies = [ 81 + + "num-conv", 82 + "time-core", 83 + ]
+2 -2
pkgs/by-name/ro/robotframework-tidy/package.nix
··· 6 6 7 7 python3.pkgs.buildPythonApplication rec { 8 8 pname = "robotframework-tidy"; 9 - version = "4.15.0"; 9 + version = "4.16.0"; 10 10 pyproject = true; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "MarketSquare"; 14 14 repo = "robotframework-tidy"; 15 15 tag = version; 16 - hash = "sha256-PNf0K1+kjijvJ53UCKkC2LyjBJOroDPdtYjcXbRU1VI="; 16 + hash = "sha256-QTDbxq78p5O5jORyHThUcNx0/VWm0ZRBS8S//Ya9Oig="; 17 17 }; 18 18 19 19 build-system = with python3.pkgs; [ setuptools ];
+19 -2
pkgs/by-name/sc/scalapack/package.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchFromGitHub, 5 + fetchpatch, 5 6 cmake, 6 7 mpiCheckPhaseHook, 7 8 mpi, ··· 18 19 src = fetchFromGitHub { 19 20 owner = "Reference-ScaLAPACK"; 20 21 repo = pname; 21 - rev = "v${version}"; 22 - sha256 = "sha256-KDMW/D7ubGaD2L7eTwULJ04fAYDPAKl8xKPZGZMkeik="; 22 + tag = "v${version}"; 23 + hash = "sha256-KDMW/D7ubGaD2L7eTwULJ04fAYDPAKl8xKPZGZMkeik="; 23 24 }; 24 25 25 26 passthru = { inherit (blas) isILP64; }; 26 27 27 28 __structuredAttrs = true; 29 + 30 + patches = [ 31 + (fetchpatch { 32 + name = "version-string"; 33 + url = "https://github.com/Reference-ScaLAPACK/scalapack/commit/76cc1ed3032e9a4158a4513c9047c3746b269f04.patch"; 34 + hash = "sha256-kmllLa9GUeTrHRYeS0yIk9I8LwaIoEytdyQGRuinn3A="; 35 + }) 36 + ]; 28 37 29 38 # Required to activate ILP64. 30 39 # See https://github.com/Reference-ScaLAPACK/scalapack/pull/19 ··· 75 84 # Increase individual test timeout from 1500s to 10000s because hydra's builds 76 85 # sometimes fail due to this 77 86 checkFlags = [ "ARGS=--timeout 10000" ]; 87 + 88 + postFixup = '' 89 + # _IMPORT_PREFIX, used to point to lib, points to dev output. Every package using the generated 90 + # cmake file will thus look for the library in the dev output instead of out. 91 + # Use the absolute path to $out instead to fix the issue. 92 + substituteInPlace $dev/lib/cmake/scalapack-${version}/scalapack-targets-release.cmake \ 93 + --replace "\''${_IMPORT_PREFIX}" "$out" 94 + ''; 78 95 79 96 meta = with lib; { 80 97 homepage = "http://www.netlib.org/scalapack/";
+2 -2
pkgs/by-name/sp/spotdl/package.nix
··· 6 6 7 7 python3.pkgs.buildPythonApplication rec { 8 8 pname = "spotdl"; 9 - version = "4.2.10"; 9 + version = "4.2.11"; 10 10 pyproject = true; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "spotDL"; 14 14 repo = "spotify-downloader"; 15 15 tag = "v${version}"; 16 - hash = "sha256-F97g5AhyXXYEICb/0RcfVPype8PVfFAKFEX0Xyg1QoI="; 16 + hash = "sha256-9PlqnpUlV5b8g+lctGjVL1Xgf25SS5xqkDaa1bSlxpk="; 17 17 }; 18 18 19 19 build-system = with python3.pkgs; [ poetry-core ];
+2 -2
pkgs/by-name/st/stats/package.nix
··· 8 8 9 9 stdenvNoCC.mkDerivation (finalAttrs: { 10 10 pname = "stats"; 11 - version = "2.11.23"; 11 + version = "2.11.26"; 12 12 13 13 src = fetchurl { 14 14 url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; 15 - hash = "sha256-tlKiRvLTIt0lKc/fOQBj07lFjgOSkKNE4iNlNwxfTCU="; 15 + hash = "sha256-WRbBqgjNn9W9qRFlbuNAOr8L6lzI1DpTsTCgCQiKSnU="; 16 16 }; 17 17 18 18 sourceRoot = ".";
+2 -2
pkgs/by-name/su/summon/package.nix
··· 6 6 7 7 buildGoModule rec { 8 8 pname = "summon"; 9 - version = "0.10.1"; 9 + version = "0.10.2"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "cyberark"; 13 13 repo = "summon"; 14 14 rev = "v${version}"; 15 - hash = "sha256-Y61lVqsKZiHLJF0X4DIq6U7eRXJ0+6I/dBPwXYb2GmQ="; 15 + hash = "sha256-W0KTZPxPY8sFZD1dB6fSo+YB0EDMD71TsPs98EbgM1Q="; 16 16 }; 17 17 18 18 vendorHash = "sha256-StcJvUtMfBh7p1sD8ucvHNJ572whRfqz3id6XsFoXtk=";
+2 -2
pkgs/by-name/to/tomboy-ng/package.nix
··· 19 19 }: 20 20 stdenv.mkDerivation (finalAttrs: { 21 21 pname = "tomboy-ng"; 22 - version = "0.41"; 22 + version = "0.42"; 23 23 24 24 src = fetchFromGitHub { 25 25 owner = "tomboy-notes"; 26 26 repo = "tomboy-ng"; 27 27 rev = "v${finalAttrs.version}"; 28 - hash = "sha256-W5pW2QwAFKhs8O5TqUbe2i+uMGDU1G4wZ+f+rfn9+ds="; 28 + hash = "sha256-ppvEZeVHJ4DHIdEXfLOWcb4Wbsi6YVKqm6NGQ7lPtdg="; 29 29 }; 30 30 kcontrols = fetchFromGitHub { 31 31 owner = "davidbannon";
+13
pkgs/by-name/um/umu-launcher-unwrapped/no-umu-version-json.patch
··· 1 + diff --git a/Makefile.in b/Makefile.in 2 + index b82053d..37db8c9 100644 3 + --- a/Makefile.in 4 + +++ b/Makefile.in 5 + @@ -50,7 +50,7 @@ fix_shebangs: 6 + umu/umu_version.json: umu/umu_version.json.in 7 + $(info :: Updating $(@) ) 8 + cp $(<) $(<).tmp 9 + - sed 's|##UMU_VERSION##|$(shell git describe --always --long --tags)|g' -i $(<).tmp 10 + + sed 's|##UMU_VERSION##|@version@|g' -i $(<).tmp 11 + mv $(<).tmp $(@) 12 + 13 + .PHONY: version
+70
pkgs/by-name/um/umu-launcher-unwrapped/package.nix
··· 1 + { 2 + python3Packages, 3 + fetchFromGitHub, 4 + lib, 5 + bash, 6 + hatch, 7 + scdoc, 8 + replaceVars, 9 + fetchpatch2, 10 + }: 11 + python3Packages.buildPythonPackage rec { 12 + pname = "umu-launcher-unwrapped"; 13 + version = "1.1.4"; 14 + 15 + src = fetchFromGitHub { 16 + owner = "Open-Wine-Components"; 17 + repo = "umu-launcher"; 18 + tag = version; 19 + hash = "sha256-TOsVK6o2V8D7CLzVOkLs8AClrZmlVQTfeii32ZIQCu4="; 20 + }; 21 + 22 + # Both patches can be safely removed with the next release 23 + patches = [ 24 + # Patch to avoid running `git describe` 25 + # Fixed by https://github.com/Open-Wine-Components/umu-launcher/pull/289 upstream 26 + (replaceVars ./no-umu-version-json.patch { inherit version; }) 27 + # Patch to use PREFIX in the installer call 28 + (fetchpatch2 { 29 + url = "https://github.com/Open-Wine-Components/umu-launcher/commit/602a2f84a05a63f7b1b1c4d8ca85d99fdaec2cd2.diff"; 30 + hash = "sha256-BMinTXr926V3HlzHHabxHKvy8quEvxsZKu1hoTGQT00="; 31 + }) 32 + ]; 33 + 34 + nativeBuildInputs = [ 35 + python3Packages.build 36 + hatch 37 + scdoc 38 + python3Packages.installer 39 + ]; 40 + 41 + pythonPath = [ 42 + python3Packages.filelock 43 + python3Packages.xlib 44 + ]; 45 + 46 + pyproject = false; 47 + configureScript = "./configure.sh"; 48 + 49 + makeFlags = [ 50 + "PYTHONDIR=$(PREFIX)/${python3Packages.python.sitePackages}" 51 + "PYTHON_INTERPRETER=${lib.getExe python3Packages.python}" 52 + # Override RELEASEDIR to avoid running `git describe` 53 + "RELEASEDIR=${pname}-${version}" 54 + "SHELL_INTERPRETER=${lib.getExe bash}" 55 + ]; 56 + 57 + meta = { 58 + description = "Unified launcher for Windows games on Linux using the Steam Linux Runtime and Tools"; 59 + changelog = "https://github.com/Open-Wine-Components/umu-launcher/releases/tag/${version}"; 60 + homepage = "https://github.com/Open-Wine-Components/umu-launcher"; 61 + license = lib.licenses.gpl3; 62 + mainProgram = "umu-run"; 63 + maintainers = with lib.maintainers; [ 64 + diniamo 65 + MattSturgeon 66 + fuzen 67 + ]; 68 + platforms = lib.platforms.linux; 69 + }; 70 + }
+19
pkgs/by-name/um/umu-launcher/package.nix
··· 1 + { 2 + buildFHSEnv, 3 + lib, 4 + umu-launcher-unwrapped, 5 + }: 6 + buildFHSEnv { 7 + pname = "umu-launcher"; 8 + inherit (umu-launcher-unwrapped) version meta; 9 + 10 + targetPkgs = pkgs: [ pkgs.umu-launcher-unwrapped ]; 11 + 12 + executableName = umu-launcher-unwrapped.meta.mainProgram; 13 + runScript = lib.getExe umu-launcher-unwrapped; 14 + 15 + extraInstallCommands = '' 16 + ln -s ${umu-launcher-unwrapped}/lib $out/lib 17 + ln -s ${umu-launcher-unwrapped}/share $out/share 18 + ''; 19 + }
+2 -2
pkgs/by-name/ve/velero/package.nix
··· 8 8 9 9 buildGoModule rec { 10 10 pname = "velero"; 11 - version = "1.15.1"; 11 + version = "1.15.2"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "vmware-tanzu"; 15 15 repo = "velero"; 16 16 rev = "v${version}"; 17 - hash = "sha256-ypNpIEj6hw77cjXkYJ9zsKY0bFP7Nwa2skd1wdONsJY="; 17 + hash = "sha256-WClNupUW1Nd5Xnx58KYDRLz1/2kNCOR4AoAsUv78yPE="; 18 18 }; 19 19 20 20 ldflags = [
+2 -2
pkgs/by-name/we/weasis/package.nix
··· 18 18 in 19 19 stdenv.mkDerivation rec { 20 20 pname = "weasis"; 21 - version = "4.4.0"; 21 + version = "4.5.1"; 22 22 23 23 # Their build instructions indicate to use the packaging script 24 24 src = fetchzip { 25 25 url = "https://github.com/nroduit/Weasis/releases/download/v${version}/weasis-native.zip"; 26 - hash = "sha256-+Bi9rTuM9osKzbKVA4exqsFm8p9+1OHgJqRSNnCC6QQ="; 26 + hash = "sha256-aGoTSOZ1W8JHQ0+FcJ9RZ47A1LfXJOoGNmVDiUd9zxE="; 27 27 stripRoot = false; 28 28 }; 29 29
+4 -4
pkgs/by-name/xo/xonsh/unwrapped.nix
··· 3 3 coreutils, 4 4 fetchFromGitHub, 5 5 git, 6 - gitUpdater, 7 6 glibcLocales, 7 + nix-update-script, 8 8 pythonPackages, 9 9 }: 10 10 ··· 12 12 13 13 argset = { 14 14 pname = "xonsh"; 15 - version = "0.19.0"; 15 + version = "0.19.1"; 16 16 pyproject = true; 17 17 18 18 # PyPI package ships incomplete tests ··· 20 20 owner = "xonsh"; 21 21 repo = "xonsh"; 22 22 rev = "refs/tags/${argset.version}"; 23 - hash = "sha256-rt402MKnhjC/AYz9Rm6B5RkivcVxveVW2rM/nT/xcNo="; 23 + hash = "sha256-20egNKlJjJO1wdy1anApz0ADBnaHPUSqhfrsPe3QQIs="; 24 24 }; 25 25 26 26 nativeBuildInputs = with pythonPackages; [ ··· 112 112 shellPath = "/bin/xonsh"; 113 113 python = pythonPackages.python; # To the wrapper 114 114 wrapper = throw "The top-level xonsh package is now wrapped. Use it directly."; 115 - updateScript = gitUpdater { }; 115 + updateScript = nix-update-script { }; 116 116 }; 117 117 118 118 meta = {
+3 -3
pkgs/by-name/zb/zbus-xmlgen/package.nix
··· 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "zbus_xmlgen"; 5 - version = "5.0.1"; 5 + version = "5.0.2"; 6 6 7 7 src = fetchCrate { 8 8 inherit pname version; 9 - hash = "sha256-of+/HA8u+/hRnzXZqlQzL+6A4Hkka7pN+Wl2YdrACQY="; 9 + hash = "sha256-H3QA1Eh1AL1CtiUykEjJ7Ltskcen8tIfbGg6jy7Xic8="; 10 10 }; 11 11 12 - cargoHash = "sha256-+nTXAyBelqP0HQnJ6aGFiX2NobJ/MwEav/3gDry9y2U="; 12 + cargoHash = "sha256-bglcui1OLp2USRpL2kOxU8fw+aLAbbDv5hrg5fxz4cQ="; 13 13 14 14 nativeBuildInputs = [ makeBinaryWrapper ]; 15 15 nativeCheckInputs = [ rustfmt ];
+3 -5
pkgs/desktops/deepin/go-package/dde-daemon/default.nix
··· 1 1 { 2 2 lib, 3 3 fetchFromGitHub, 4 - substituteAll, 4 + replaceVars, 5 5 buildGoModule, 6 6 pkg-config, 7 7 deepin-gettext-tools, ··· 48 48 49 49 patches = [ 50 50 ./0001-dont-set-PATH.diff 51 - (substituteAll { 52 - src = ./0002-fix-custom-wallpapers-path.diff; 51 + (replaceVars ./0002-fix-custom-wallpapers-path.diff { 53 52 inherit coreutils; 54 53 }) 55 - (substituteAll { 56 - src = ./0003-aviod-use-hardcode-path.diff; 54 + (replaceVars ./0003-aviod-use-hardcode-path.diff { 57 55 inherit dbus; 58 56 }) 59 57 ];
+2 -3
pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchFromGitHub, 5 - substituteAll, 5 + replaceVars, 6 6 glib, 7 7 gnome-shell, 8 8 gettext, ··· 22 22 }; 23 23 24 24 patches = [ 25 - (substituteAll { 26 - src = ./fix-gi-path.patch; 25 + (replaceVars ./fix-gi-path.patch { 27 26 gnomeShell = gnome-shell; 28 27 }) 29 28 ];
+2 -3
pkgs/desktops/gnome/extensions/arcmenu/default.nix
··· 4 4 fetchFromGitLab, 5 5 glib, 6 6 gettext, 7 - substituteAll, 7 + replaceVars, 8 8 gnome-menus, 9 9 }: 10 10 ··· 20 20 }; 21 21 22 22 patches = [ 23 - (substituteAll { 24 - src = ./fix_gmenu.patch; 23 + (replaceVars ./fix_gmenu.patch { 25 24 gmenu_path = "${gnome-menus}/lib/girepository-1.0"; 26 25 }) 27 26 ];
+2 -3
pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchFromGitHub, 5 - substituteAll, 5 + replaceVars, 6 6 gjs, 7 7 vte, 8 8 gnome, ··· 25 25 }; 26 26 27 27 patches = [ 28 - (substituteAll { 29 - src = ./fix_vte_and_gjs.patch; 28 + (replaceVars ./fix_vte_and_gjs.patch { 30 29 inherit gjs vte; 31 30 }) 32 31 ];
+7 -13
pkgs/desktops/gnome/extensions/extensionOverrides.nix
··· 17 17 , nvme-cli 18 18 , procps 19 19 , smartmontools 20 - , substituteAll 20 + , replaceVars 21 21 , touchegg 22 22 , util-linux 23 23 , vte ··· 72 72 (patchExtension "eepresetselector@ulville.github.io" (old: { 73 73 patches = [ 74 74 # Needed to find the currently set preset 75 - (substituteAll { 76 - src = ./extensionOverridesPatches/eepresetselector_at_ulville.github.io.patch; 75 + (replaceVars ./extensionOverridesPatches/eepresetselector_at_ulville.github.io.patch { 77 76 easyeffects_gsettings_path = "${glib.getSchemaPath easyeffects}"; 78 77 }) 79 78 ]; ··· 81 80 82 81 (patchExtension "freon@UshakovVasilii_Github.yahoo.com" (old: { 83 82 patches = [ 84 - (substituteAll { 85 - src = ./extensionOverridesPatches/freon_at_UshakovVasilii_Github.yahoo.com.patch; 83 + (replaceVars ./extensionOverridesPatches/freon_at_UshakovVasilii_Github.yahoo.com.patch { 86 84 inherit hddtemp liquidctl lm_sensors procps smartmontools; 87 85 netcat = netcat-gnu; 88 86 nvmecli = nvme-cli; ··· 103 101 (patchExtension "gtk4-ding@smedius.gitlab.com" (old: { 104 102 nativeBuildInputs = [ wrapGAppsHook3 ]; 105 103 patches = [ 106 - (substituteAll { 104 + (replaceVars ./extensionOverridesPatches/gtk4-ding_at_smedius.gitlab.com.patch { 107 105 inherit gjs; 108 106 util_linux = util-linux; 109 107 xdg_utils = xdg-utils; 110 - src = ./extensionOverridesPatches/gtk4-ding_at_smedius.gitlab.com.patch; 111 108 nautilus_gsettings_path = "${glib.getSchemaPath nautilus}"; 112 109 }) 113 110 ]; ··· 129 126 130 127 (patchExtension "system-monitor@gnome-shell-extensions.gcampax.github.com" (old: { 131 128 patches = [ 132 - (substituteAll { 133 - src = ./extensionOverridesPatches/system-monitor_at_gnome-shell-extensions.gcampax.github.com.patch; 129 + (replaceVars ./extensionOverridesPatches/system-monitor_at_gnome-shell-extensions.gcampax.github.com.patch { 134 130 gtop_path = "${libgtop}/lib/girepository-1.0"; 135 131 }) 136 132 ]; ··· 138 134 139 135 (patchExtension "system-monitor-next@paradoxxx.zero.gmail.com" (old: { 140 136 patches = [ 141 - (substituteAll { 142 - src = ./extensionOverridesPatches/system-monitor-next_at_paradoxxx.zero.gmail.com.patch; 137 + (replaceVars ./extensionOverridesPatches/system-monitor-next_at_paradoxxx.zero.gmail.com.patch { 143 138 gtop_path = "${libgtop}/lib/girepository-1.0"; 144 139 }) 145 140 ]; ··· 148 143 149 144 (patchExtension "Vitals@CoreCoding.com" (old: { 150 145 patches = [ 151 - (substituteAll { 152 - src = ./extensionOverridesPatches/vitals_at_corecoding.com.patch; 146 + (replaceVars ./extensionOverridesPatches/vitals_at_corecoding.com.patch { 153 147 gtop_path = "${libgtop}/lib/girepository-1.0"; 154 148 }) 155 149 ];
+2 -3
pkgs/desktops/gnome/extensions/no-title-bar/default.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchFromGitHub, 5 - substituteAll, 5 + replaceVars, 6 6 glib, 7 7 gettext, 8 8 xorg, ··· 25 25 ]; 26 26 27 27 patches = [ 28 - (substituteAll { 29 - src = ./fix-paths.patch; 28 + (replaceVars ./fix-paths.patch { 30 29 xprop = "${xorg.xprop}/bin/xprop"; 31 30 xwininfo = "${xorg.xwininfo}/bin/xwininfo"; 32 31 })
+2 -3
pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix
··· 1 1 { 2 2 lib, 3 3 stdenv, 4 - substituteAll, 4 + replaceVars, 5 5 fetchFromGitHub, 6 6 libpulseaudio, 7 7 python3, ··· 21 21 22 22 patches = [ 23 23 # Fix paths to libpulse and python 24 - (substituteAll { 25 - src = ./fix-paths.patch; 24 + (replaceVars ./fix-paths.patch { 26 25 libpulse = "${libpulseaudio}/lib/libpulse.so"; 27 26 python = python3.interpreter; 28 27 })
+2 -3
pkgs/desktops/lomiri/applications/lomiri/default.nix
··· 6 6 fetchpatch2, 7 7 gitUpdater, 8 8 linkFarm, 9 - substituteAll, 9 + replaceVars, 10 10 nixosTests, 11 11 ayatana-indicator-datetime, 12 12 bash, ··· 117 117 }) 118 118 119 119 ./9901-lomiri-Disable-Wizard.patch 120 - (substituteAll { 121 - src = ./9902-Layout-fallback-file.patch; 120 + (replaceVars ./9902-Layout-fallback-file.patch { 122 121 nixosLayoutFile = "/etc/" + finalAttrs.finalPackage.passthru.etcLayoutsFile; 123 122 }) 124 123 ];
+2 -3
pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
··· 5 5 nix-update-script, 6 6 meson, 7 7 ninja, 8 - substituteAll, 8 + replaceVars, 9 9 pkg-config, 10 10 vala, 11 11 libadwaita, ··· 31 31 }; 32 32 33 33 patches = [ 34 - (substituteAll { 35 - src = ./fix-paths.patch; 34 + (replaceVars ./fix-paths.patch { 36 35 tzdata = tzdata; 37 36 }) 38 37 ];
+2 -3
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
··· 2 2 , stdenv 3 3 , fetchFromGitHub 4 4 , nix-update-script 5 - , substituteAll 5 + , replaceVars 6 6 , meson 7 7 , ninja 8 8 , pkg-config ··· 38 38 # https://github.com/elementary/switchboard-plug-keyboard/issues/324 39 39 ./hide-install-unlisted-engines-button.patch 40 40 41 - (substituteAll { 42 - src = ./fix-paths.patch; 41 + (replaceVars ./fix-paths.patch { 43 42 inherit onboard libgnomekbd; 44 43 }) 45 44 ];
+2 -3
pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
··· 3 3 stdenv, 4 4 fetchFromGitHub, 5 5 nix-update-script, 6 - substituteAll, 6 + replaceVars, 7 7 meson, 8 8 ninja, 9 9 pkg-config, ··· 32 32 }; 33 33 34 34 patches = [ 35 - (substituteAll { 36 - src = ./fix-paths.patch; 35 + (replaceVars ./fix-paths.patch { 37 36 touchegg = touchegg; 38 37 }) 39 38 ];
+2 -3
pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
··· 6 6 meson, 7 7 ninja, 8 8 pkg-config, 9 - substituteAll, 9 + replaceVars, 10 10 vala, 11 11 libadwaita, 12 12 libgee, ··· 31 31 }; 32 32 33 33 patches = [ 34 - (substituteAll { 35 - src = ./fix-paths.patch; 34 + (replaceVars ./fix-paths.patch { 36 35 inherit networkmanagerapplet; 37 36 }) 38 37 ];
+2 -3
pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
··· 3 3 , fetchFromGitHub 4 4 , nix-update-script 5 5 , linkFarm 6 - , substituteAll 6 + , replaceVars 7 7 , elementary-greeter 8 8 , pkg-config 9 9 , meson ··· 43 43 patches = [ 44 44 ./sysconfdir-install.patch 45 45 # Needed until https://github.com/elementary/greeter/issues/360 is fixed 46 - (substituteAll { 47 - src = ./hardcode-fallback-background.patch; 46 + (replaceVars ./hardcode-fallback-background.patch { 48 47 default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}"; 49 48 }) 50 49 ];
+2 -3
pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix
··· 3 3 stdenv, 4 4 fetchFromGitHub, 5 5 unstableGitUpdater, 6 - substituteAll, 6 + replaceVars, 7 7 file-roller, 8 8 }: 9 9 ··· 19 19 }; 20 20 21 21 patches = [ 22 - (substituteAll { 23 - src = ./exec-path.patch; 22 + (replaceVars ./exec-path.patch { 24 23 file_roller = file-roller; 25 24 }) 26 25 ];
+2 -3
pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
··· 2 2 , stdenv 3 3 , fetchFromGitHub 4 4 , nix-update-script 5 - , substituteAll 5 + , replaceVars 6 6 , meson 7 7 , ninja 8 8 , pkg-config ··· 32 32 }; 33 33 34 34 patches = [ 35 - (substituteAll { 36 - src = ./fix-paths.patch; 35 + (replaceVars ./fix-paths.patch { 37 36 bc = "${bc}/bin/bc"; 38 37 }) 39 38 ];
+2 -3
pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
··· 3 3 stdenv, 4 4 fetchFromGitHub, 5 5 nix-update-script, 6 - substituteAll, 6 + replaceVars, 7 7 pkg-config, 8 8 meson, 9 9 ninja, ··· 32 32 }; 33 33 34 34 patches = [ 35 - (substituteAll { 36 - src = ./fix-paths.patch; 35 + (replaceVars ./fix-paths.patch { 37 36 elementary_calendar = elementary-calendar; 38 37 }) 39 38 ];
+2 -3
pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
··· 6 6 pkg-config, 7 7 meson, 8 8 ninja, 9 - substituteAll, 9 + replaceVars, 10 10 vala, 11 11 gtk3, 12 12 granite, ··· 30 30 }; 31 31 32 32 patches = [ 33 - (substituteAll { 34 - src = ./fix-paths.patch; 33 + (replaceVars ./fix-paths.patch { 35 34 gkbd_keyboard_display = "${libgnomekbd}/bin/gkbd-keyboard-display"; 36 35 }) 37 36 ];
+2 -3
pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchFromGitHub, 5 - substituteAll, 5 + replaceVars, 6 6 nix-update-script, 7 7 gnome-power-manager, 8 8 pkg-config, ··· 32 32 }; 33 33 34 34 patches = [ 35 - (substituteAll { 36 - src = ./fix-paths.patch; 35 + (replaceVars ./fix-paths.patch { 37 36 gnome_power_manager = gnome-power-manager; 38 37 }) 39 38 ];
+2 -3
pkgs/desktops/plasma-5/plasma-nm/default.nix
··· 1 1 { 2 2 mkDerivation, 3 - substituteAll, 3 + replaceVars, 4 4 extra-cmake-modules, 5 5 kdoctools, 6 6 kcmutils, ··· 75 75 ]; 76 76 77 77 patches = [ 78 - (substituteAll { 79 - src = ./0002-openvpn-binary-path.patch; 78 + (replaceVars ./0002-openvpn-binary-path.patch { 80 79 inherit openvpn; 81 80 }) 82 81 ];
+1
pkgs/development/libraries/gtkspell/default.nix
··· 34 34 nativeBuildInputs = [ 35 35 autoreconfHook 36 36 docbook_xsl 37 + gtk2 # GLIB_GNU_GETTEXT 37 38 gtk-doc 38 39 intltool 39 40 pkg-config
+4 -4
pkgs/development/php-packages/tideways/default.nix
··· 23 23 stdenvNoCC.mkDerivation (finalAttrs: { 24 24 pname = "tideways-php"; 25 25 extensionName = "tideways"; 26 - version = "5.16.2"; 26 + version = "5.17.0"; 27 27 28 28 src = 29 29 finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} ··· 43 43 sources = { 44 44 "x86_64-linux" = fetchurl { 45 45 url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-x86_64.tar.gz"; 46 - hash = "sha256-bSLBk4VWRvErmSqXOEFE0N0K06+NRLmsJ76HegFYah8="; 46 + hash = "sha256-zWmGGSSvV48dSU+Ox2ypPcIxVzr0oru9Eaoh1hQ+WgI="; 47 47 }; 48 48 "aarch64-linux" = fetchurl { 49 49 url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-arm64.tar.gz"; 50 - hash = "sha256-nXTk0DlGSEq0bp4+Hls3+epV6JY4H50D6IO/M3evFpE="; 50 + hash = "sha256-xGkyLBy5oXVXs3VHT6fVg82H7Dmfc8VGHV9CEfw3ETY="; 51 51 }; 52 52 "aarch64-darwin" = fetchurl { 53 53 url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-macos-arm.tar.gz"; 54 - hash = "sha256-IqQ0gtLAx8lVBccaDsum81FmkYXHKQ5zf27F2Y+H45g="; 54 + hash = "sha256-StVPDWGKseagnkEi9dUX2dvu0+tIN8xxUTWmxKW1kDM="; 55 55 }; 56 56 }; 57 57
+18 -27
pkgs/development/python-modules/comicon/default.nix
··· 1 1 { 2 - lib, 3 2 buildPythonPackage, 4 - fetchFromGitHub, 5 - fetchpatch2, 6 - poetry-core, 7 - pythonOlder, 8 3 ebooklib, 4 + fetchFromGitHub, 5 + lib, 9 6 lxml, 7 + nix-update-script, 10 8 pillow, 9 + poetry-core, 11 10 pypdf, 12 11 python-slugify, 12 + pythonOlder, 13 13 }: 14 14 15 15 buildPythonPackage rec { 16 16 pname = "comicon"; 17 - version = "1.3.0"; 17 + version = "1.4.0"; 18 18 pyproject = true; 19 19 disabled = pythonOlder "3.10"; 20 20 ··· 22 22 owner = "potatoeggy"; 23 23 repo = "comicon"; 24 24 tag = "v${version}"; 25 - hash = "sha256-0AGCTnStyBVL7DVkrUFyD60xnuuO1dcl+Twdyy+uq1Y="; 25 + hash = "sha256-jZ/ZhSFg0ZPTYI10s8Cn1s9UZRFFnuLjS96lnUFVekQ="; 26 26 }; 27 27 28 - patches = [ 29 - # Upstream forgot to bump the version before tagging 30 - # See https://github.com/potatoeggy/comicon/commit/d698f0f03b1a391f988176885686e9fca135676e 31 - (fetchpatch2 { 32 - name = "comicon-version-bump.patch"; 33 - url = "https://github.com/potatoeggy/comicon/commit/d698f0f03b1a391f988176885686e9fca135676e.diff"; 34 - hash = "sha256-ZHltw4OSYuHF8mH0kBZDsuozPy08Bm7nme+XSwfGNn8="; 35 - }) 36 - ]; 37 - 38 - nativeBuildInputs = [ 28 + build-system = [ 39 29 poetry-core 40 30 ]; 41 31 42 - pythonRelaxDeps = [ 43 - "pillow" 44 - "pypdf" 45 - ]; 46 - 47 - propagatedBuildInputs = [ 32 + dependencies = [ 48 33 ebooklib 49 34 lxml 50 35 pillow ··· 52 37 python-slugify 53 38 ]; 54 39 40 + pythonRelaxDeps = [ 41 + "pillow" 42 + ]; 43 + 55 44 doCheck = false; # test artifacts are not public 56 45 57 46 pythonImportsCheck = [ "comicon" ]; 58 47 59 - meta = with lib; { 48 + passthru.updateScript = nix-update-script { }; 49 + 50 + meta = { 60 51 changelog = "https://github.com/potatoeggy/comicon/releases/tag/v${version}"; 61 52 description = "Lightweight comic converter library between CBZ, PDF, and EPUB"; 62 53 homepage = "https://github.com/potatoeggy/comicon"; 63 - license = licenses.agpl3Only; 64 - maintainers = with maintainers; [ Scrumplex ]; 54 + license = lib.licenses.agpl3Only; 55 + maintainers = with lib.maintainers; [ Scrumplex ]; 65 56 }; 66 57 }
+7
pkgs/development/python-modules/flaxlib/default.nix
··· 49 49 pytestCheckHook 50 50 ]; 51 51 52 + env = { 53 + # https://github.com/google/flax/issues/4491 54 + # Upstream should update Cargo.lock 55 + # Enabling `PYO3_USE_ABI3_FORWARD_COMPATIBILITY` allows us to temporarily avoid the issue 56 + PYO3_USE_ABI3_FORWARD_COMPATIBILITY = true; 57 + }; 58 + 52 59 # This package does not have tests (yet ?) 53 60 doCheck = false; 54 61
+4 -8
pkgs/development/python-modules/geventhttpclient/default.nix
··· 15 15 16 16 buildPythonPackage rec { 17 17 pname = "geventhttpclient"; 18 - version = "2.3.1"; 18 + version = "2.3.3"; 19 19 pyproject = true; 20 20 21 - disabled = pythonOlder "3.6"; 21 + disabled = pythonOlder "3.9"; 22 22 23 23 src = fetchFromGitHub { 24 24 owner = "geventhttpclient"; ··· 26 26 tag = version; 27 27 # TODO: unvendor llhttp 28 28 fetchSubmodules = true; 29 - hash = "sha256-uOGnwPbvTam14SFTUT0UrwxHfP4a5cn3a7EhLoGBUrA="; 29 + hash = "sha256-0ltTmF09EKs+55Mitfe5vxPjmCtnhla6q6SAvhyIQPk="; 30 30 }; 31 31 32 32 build-system = [ setuptools ]; ··· 48 48 49 49 __darwinAllowLocalNetworking = true; 50 50 51 - preCheck = '' 52 - rm -rf geventhttpclient 53 - ''; 54 - 55 51 pytestFlagsArray = [ "-m 'not network'" ]; 56 52 57 53 pythonImportsCheck = [ "geventhttpclient" ]; ··· 59 55 meta = with lib; { 60 56 homepage = "https://github.com/geventhttpclient/geventhttpclient"; 61 57 description = "High performance, concurrent HTTP client library using gevent"; 62 - changelog = "https://github.com/geventhttpclient/geventhttpclient/releases/tag/${version}"; 58 + changelog = "https://github.com/geventhttpclient/geventhttpclient/releases/tag/${src.tag}"; 63 59 license = licenses.mit; 64 60 maintainers = with maintainers; [ koral ]; 65 61 };
+2 -2
pkgs/development/python-modules/llama-cloud/default.nix
··· 10 10 11 11 buildPythonPackage rec { 12 12 pname = "llama-cloud"; 13 - version = "0.1.8"; 13 + version = "0.1.9"; 14 14 pyproject = true; 15 15 16 16 disabled = pythonOlder "3.8"; ··· 18 18 src = fetchPypi { 19 19 pname = "llama_cloud"; 20 20 inherit version; 21 - hash = "sha256-cZm6siQKnMMwdAAD+ndkj0P25TPaQRqCUKSnBYT5EVM="; 21 + hash = "sha256-/AO9M4odoEt2B6RNgqYrPrF42ArwWlNlPoAdb4u2ffc="; 22 22 }; 23 23 24 24 build-system = [ poetry-core ];
+19 -18
pkgs/development/python-modules/mandown/default.nix
··· 1 1 { 2 - lib, 2 + beautifulsoup4, 3 3 buildPythonPackage, 4 - fetchFromGitHub, 5 - poetry-core, 6 - beautifulsoup4, 7 4 comicon, 8 5 feedparser, 6 + fetchFromGitHub, 9 7 filetype, 8 + lib, 10 9 lxml, 11 10 natsort, 12 11 nix-update-script, 13 12 pillow, 13 + poetry-core, 14 + pyside6, 14 15 python-slugify, 15 16 requests, 16 17 typer, 17 - pyside6, 18 18 }: 19 19 20 20 buildPythonPackage rec { 21 21 pname = "mandown"; 22 - version = "1.10.1"; 22 + version = "1.11.1"; 23 23 pyproject = true; 24 24 25 25 src = fetchFromGitHub { 26 26 owner = "potatoeggy"; 27 27 repo = "mandown"; 28 28 tag = "v${version}"; 29 - hash = "sha256-6i0a2jEJy7aL6W801Xki7jmHhO5kkFL8rJI+y+MhWVo="; 29 + hash = "sha256-xoRUGtZMM1l3gCtF1wFHBo3vTEGJcNxqkO/yeTuEke8="; 30 30 }; 31 31 32 - nativeBuildInputs = [ 32 + build-system = [ 33 33 poetry-core 34 34 ]; 35 35 36 - pythonRelaxDeps = [ 37 - "pillow" 38 - "typer" 39 - ]; 40 - 41 - propagatedBuildInputs = [ 36 + dependencies = [ 42 37 beautifulsoup4 43 38 comicon 44 39 feedparser ··· 49 44 python-slugify 50 45 requests 51 46 typer 47 + ]; 48 + 49 + pythonRelaxDeps = [ 50 + "pillow" 51 + "typer" 52 52 ]; 53 53 54 54 optional-dependencies = { 55 55 gui = [ pyside6 ]; 56 - updateScript = nix-update-script { }; 57 56 }; 58 57 59 58 pythonImportsCheck = [ "mandown" ]; 60 59 61 - meta = with lib; { 60 + passthru.updateScript = nix-update-script { }; 61 + 62 + meta = { 62 63 changelog = "https://github.com/potatoeggy/mandown/releases/tag/v${version}"; 63 64 description = "Comic/manga/webtoon downloader and CBZ/EPUB/MOBI/PDF converter"; 64 65 homepage = "https://github.com/potatoeggy/mandown"; 65 - license = licenses.agpl3Only; 66 - maintainers = with maintainers; [ Scrumplex ]; 66 + license = lib.licenses.agpl3Only; 67 + maintainers = with lib.maintainers; [ Scrumplex ]; 67 68 }; 68 69 }
+2 -2
pkgs/development/python-modules/mozart-api/default.nix
··· 18 18 19 19 buildPythonPackage rec { 20 20 pname = "mozart-api"; 21 - version = "4.1.1.116.4"; 21 + version = "4.1.1.116.5"; 22 22 pyproject = true; 23 23 24 24 disabled = pythonOlder "3.11"; ··· 26 26 src = fetchPypi { 27 27 pname = "mozart_api"; 28 28 inherit version; 29 - hash = "sha256-9yg02AQdHMR/Yz0dpjSb3umdNRNTo7S04Q2BY/vu7WQ="; 29 + hash = "sha256-4ALRG0yKCRwztQ9A6fMVaht6c8tDrMSh+CfsLRZbdcw="; 30 30 }; 31 31 32 32 build-system = [ poetry-core ];
+1
pkgs/development/python-modules/pyannotate/default.nix
··· 43 43 ++ lib.optionals (pythonAtLeast "3.11") [ 44 44 # Tests are using lib2to3 45 45 "pyannotate_tools/fixes/tests/test_annotate*.py" 46 + "pyannotate_tools/annotations/tests/dundermain_test.py" 46 47 ]; 47 48 48 49 meta = with lib; {
+2 -2
pkgs/development/python-modules/pytapo/default.nix
··· 12 12 13 13 buildPythonPackage rec { 14 14 pname = "pytapo"; 15 - version = "3.3.37"; 15 + version = "3.3.38"; 16 16 pyproject = true; 17 17 18 18 disabled = pythonOlder "3.7"; 19 19 20 20 src = fetchPypi { 21 21 inherit pname version; 22 - hash = "sha256-InDbfWzRb+Q+E6feeatHIliq83g83oUfo3Yze/BAJdM="; 22 + hash = "sha256-o3onR27lKg2QAa1Tgdidv6iOzqb/XlkJPq+vkkIhnAY="; 23 23 }; 24 24 25 25 build-system = [ setuptools ];
+6 -6
pkgs/development/python-modules/robotframework/default.nix
··· 10 10 11 11 buildPythonPackage rec { 12 12 pname = "robotframework"; 13 - version = "7.1.1"; 13 + version = "7.2"; 14 14 pyproject = true; 15 15 16 16 disabled = pythonOlder "3.8"; ··· 19 19 owner = "robotframework"; 20 20 repo = "robotframework"; 21 21 tag = "v${version}"; 22 - hash = "sha256-AJMJb8FN+KynxJXI7s7PwyM/+UpXCtWTcRK/fhCg+io="; 22 + hash = "sha256-G+mmSeTLr6h0e2YCJOpbYaRNZ5M6PXWBYXdn9xGitkM="; 23 23 }; 24 24 25 - nativeBuildInputs = [ setuptools ]; 25 + build-system = [ setuptools ]; 26 26 27 27 nativeCheckInputs = [ jsonschema ]; 28 28 ··· 30 30 ${python.interpreter} utest/run.py 31 31 ''; 32 32 33 - meta = with lib; { 33 + meta = { 34 34 changelog = "https://github.com/robotframework/robotframework/blob/master/doc/releasenotes/rf-${version}.rst"; 35 35 description = "Generic test automation framework"; 36 36 homepage = "https://robotframework.org/"; 37 - license = licenses.asl20; 38 - maintainers = with maintainers; [ bjornfor ]; 37 + license = lib.licenses.asl20; 38 + maintainers = with lib.maintainers; [ bjornfor ]; 39 39 }; 40 40 }
+1 -1
pkgs/development/python-modules/tesserocr/default.nix
··· 61 61 homepage = "https://github.com/sirfz/tesserocr"; 62 62 license = licenses.mit; 63 63 maintainers = with maintainers; [ mtrsk ]; 64 - platforms = platforms.linux; 64 + platforms = platforms.unix; 65 65 }; 66 66 }
+1 -4
pkgs/development/python-modules/wandb/default.nix
··· 105 105 106 106 meta = { 107 107 mainProgram = "gpu_stats"; 108 - # ld: library not found for -lIOReport 109 - # TODO: succeeds on https://github.com/NixOS/nixpkgs/pull/348827, so try again once it lands on master 110 - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; 111 108 }; 112 109 }; 113 110 ··· 302 299 "test_disabled_context_manager" 303 300 "test_mode_disabled" 304 301 ] 305 - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ 302 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ 306 303 # AssertionError: assert not copy2_mock.called 307 304 "test_copy_or_overwrite_changed_no_copy" 308 305
+10
pkgs/development/python-modules/webrtc-noise-gain/default.nix
··· 28 28 hash = "sha256-GbdG2XM11zgPk2VZ0mu7qMv256jaMyJDHdBCBUnynMY="; 29 29 }; 30 30 31 + postPatch = with stdenv.hostPlatform.uname; '' 32 + # Configure the correct host platform for cross builds 33 + substituteInPlace setup.py --replace-fail \ 34 + "system = platform.system().lower()" \ 35 + 'system = "${lib.toLower system}"' 36 + substituteInPlace setup.py --replace-fail \ 37 + "machine = platform.machine().lower()" \ 38 + 'machine = "${lib.toLower processor}"' 39 + ''; 40 + 31 41 nativeBuildInputs = [ 32 42 pybind11 33 43 setuptools
+7 -4
pkgs/development/python-modules/yamale/default.nix
··· 11 11 12 12 buildPythonPackage rec { 13 13 pname = "yamale"; 14 - version = "5.3.0"; 14 + version = "6.0.0"; 15 15 pyproject = true; 16 16 17 17 disabled = pythonOlder "3.6"; ··· 20 20 owner = "23andMe"; 21 21 repo = "yamale"; 22 22 tag = version; 23 - hash = "sha256-fYH+0OUJ9EnsAQh/VUOUVms1jwqpcLBj/c5uLj/1gVc="; 23 + hash = "sha256-Ij9jhGMYHUStZ/xR5GUg/eF6YQdtIfpLU7g1pev6wJU="; 24 24 }; 25 25 26 26 build-system = [ setuptools ]; 27 27 28 28 dependencies = [ 29 29 pyyaml 30 - ruamel-yaml 31 30 ]; 32 31 33 - nativeCheckInputs = [ pytestCheckHook ]; 32 + optional-dependencies = { 33 + ruamel = [ ruamel-yaml ]; 34 + }; 35 + 36 + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.ruamel; 34 37 35 38 pythonImportsCheck = [ "yamale" ]; 36 39
+2 -3
pkgs/kde/gear/audiocd-kio/default.nix
··· 5 5 flac, 6 6 libogg, 7 7 libvorbis, 8 - substituteAll, 8 + replaceVars, 9 9 lame, 10 10 opusTools, 11 11 }: ··· 13 13 pname = "audiocd-kio"; 14 14 15 15 patches = [ 16 - (substituteAll { 17 - src = ./encoder-paths.patch; 16 + (replaceVars ./encoder-paths.patch { 18 17 lame = lib.getExe lame; 19 18 opusenc = "${opusTools}/bin/opusenc"; 20 19 })
+2 -3
pkgs/kde/gear/kdeconnect-kde/default.nix
··· 1 1 { 2 2 lib, 3 3 mkKdeDerivation, 4 - substituteAll, 4 + replaceVars, 5 5 sshfs, 6 6 qtconnectivity, 7 7 qtmultimedia, ··· 15 15 pname = "kdeconnect-kde"; 16 16 17 17 patches = [ 18 - (substituteAll { 19 - src = ./hardcode-sshfs-path.patch; 18 + (replaceVars ./hardcode-sshfs-path.patch { 20 19 sshfs = lib.getExe sshfs; 21 20 }) 22 21 ];
+2 -3
pkgs/kde/gear/kdenetwork-filesharing/default.nix
··· 1 1 { 2 2 lib, 3 3 mkKdeDerivation, 4 - substituteAll, 4 + replaceVars, 5 5 samba, 6 6 shadow, 7 7 qtdeclarative, ··· 10 10 pname = "kdenetwork-filesharing"; 11 11 12 12 patches = [ 13 - (substituteAll { 14 - src = ./dependency-paths.patch; 13 + (replaceVars ./dependency-paths.patch { 15 14 inherit samba; 16 15 usermod = lib.getExe' shadow "usermod"; 17 16 })
+2 -3
pkgs/kde/gear/kdenlive/default.nix
··· 1 1 { 2 2 mkKdeDerivation, 3 - substituteAll, 3 + replaceVars, 4 4 qtsvg, 5 5 qtmultimedia, 6 6 qtnetworkauth, ··· 17 17 pname = "kdenlive"; 18 18 19 19 patches = [ 20 - (substituteAll { 21 - src = ./dependency-paths.patch; 20 + (replaceVars ./dependency-paths.patch { 22 21 inherit mediainfo mlt glaxnimate; 23 22 ffmpeg = ffmpeg-full; 24 23 })
+2 -3
pkgs/kde/plasma/drkonqi/default.nix
··· 4 4 systemd, 5 5 gdb, 6 6 python3, 7 - substituteAll, 7 + replaceVars, 8 8 }: 9 9 let 10 10 gdb' = gdb.override { ··· 20 20 pname = "drkonqi"; 21 21 22 22 patches = [ 23 - (substituteAll { 24 - src = ./gdb-path.patch; 23 + (replaceVars ./gdb-path.patch { 25 24 gdb = "${gdb'}/bin/gdb"; 26 25 }) 27 26 ];
+2 -3
pkgs/kde/plasma/kde-gtk-config/default.nix
··· 1 1 { 2 2 lib, 3 3 mkKdeDerivation, 4 - substituteAll, 4 + replaceVars, 5 5 procps, 6 6 xsettingsd, 7 7 pkg-config, ··· 17 17 # aren't found. 18 18 patches = [ 19 19 ./0001-gsettings-schemas-path.patch 20 - (substituteAll { 21 - src = ./dependency-paths.patch; 20 + (replaceVars ./dependency-paths.patch { 22 21 pgrep = lib.getExe' procps "pgrep"; 23 22 xsettingsd = lib.getExe xsettingsd; 24 23 })
+2 -3
pkgs/kde/plasma/krdp/default.nix
··· 1 1 { 2 2 lib, 3 3 mkKdeDerivation, 4 - substituteAll, 4 + replaceVars, 5 5 openssl, 6 6 pkg-config, 7 7 qtkeychain, ··· 14 14 pname = "krdp"; 15 15 16 16 patches = [ 17 - (substituteAll { 18 - src = ./hardcode-openssl-path.patch; 17 + (replaceVars ./hardcode-openssl-path.patch { 19 18 openssl = lib.getExe openssl; 20 19 }) 21 20 ];
+4 -7
pkgs/kde/plasma/plasma-desktop/default.nix
··· 5 5 makeWrapper, 6 6 glib, 7 7 gsettings-desktop-schemas, 8 - substituteAll, 8 + replaceVars, 9 9 util-linux, 10 10 pkg-config, 11 11 qtsvg, ··· 31 31 pname = "plasma-desktop"; 32 32 33 33 patches = [ 34 - (substituteAll { 35 - src = ./hwclock-path.patch; 34 + (replaceVars ./hwclock-path.patch { 36 35 hwclock = "${lib.getBin util-linux}/bin/hwclock"; 37 36 }) 38 - (substituteAll { 39 - src = ./kcm-access.patch; 37 + (replaceVars ./kcm-access.patch { 40 38 gsettings = "${gsettings-wrapper}/bin/gsettings"; 41 39 }) 42 40 ./tzdir.patch 43 41 ./no-discover-shortcut.patch 44 - (substituteAll { 45 - src = ./wallpaper-paths.patch; 42 + (replaceVars ./wallpaper-paths.patch { 46 43 wallpapers = "${lib.getBin breeze}/share/wallpapers"; 47 44 }) 48 45 ];
+2 -3
pkgs/kde/plasma/plasma-disks/default.nix
··· 1 1 { 2 2 mkKdeDerivation, 3 3 lib, 4 - substituteAll, 4 + replaceVars, 5 5 smartmontools, 6 6 }: 7 7 mkKdeDerivation { 8 8 pname = "plasma-disks"; 9 9 10 10 patches = [ 11 - (substituteAll { 11 + (replaceVars ./smartctl-path.patch { 12 12 smartctl = lib.getExe smartmontools; 13 - src = ./smartctl-path.patch; 14 13 }) 15 14 ]; 16 15 }
+2 -3
pkgs/kde/plasma/plasma-nm/default.nix
··· 1 1 { 2 2 mkKdeDerivation, 3 - substituteAll, 3 + replaceVars, 4 4 pkg-config, 5 5 qtwebengine, 6 6 mobile-broadband-provider-info, ··· 11 11 pname = "plasma-nm"; 12 12 13 13 patches = [ 14 - (substituteAll { 15 - src = ./0002-openvpn-binary-path.patch; 14 + (replaceVars ./0002-openvpn-binary-path.patch { 16 15 inherit openvpn; 17 16 }) 18 17 ];
+19 -9
pkgs/servers/headscale/default.nix
··· 4 4 fetchFromGitHub, 5 5 installShellFiles, 6 6 nixosTests, 7 + postgresql, 7 8 }: 8 9 buildGoModule rec { 9 10 pname = "headscale"; 10 - version = "0.23.0"; 11 + version = "0.24.0"; 11 12 12 13 src = fetchFromGitHub { 13 14 owner = "juanfont"; 14 15 repo = "headscale"; 15 16 rev = "v${version}"; 16 - hash = "sha256-5tlnVNpn+hJayxHjTpbOO3kRInOYOFz0pe9pwjXZlBE="; 17 + hash = "sha256-s9zzhN8NTC6YxOO6fyO+A0jleeY8bhN1wcbf4pvGkpI="; 17 18 }; 18 19 19 - # Merged post-v0.23.0, so should be removed with next release. 20 - patches = [ ./patches/config-loosen-up-BaseDomain-and-ServerURL-checks.patch ]; 20 + vendorHash = "sha256-SBfeixT8DQOrK2SWmHHSOBtzRdSZs+pwomHpw6Jd+qc="; 21 21 22 - vendorHash = "sha256-+8dOxPG/Q+wuHgRwwWqdphHOuop0W9dVyClyQuh7aRc="; 22 + subPackages = [ "cmd/headscale" ]; 23 23 24 - ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"]; 24 + ldflags = [ 25 + "-s" 26 + "-w" 27 + "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}" 28 + ]; 29 + 30 + nativeBuildInputs = [ installShellFiles ]; 25 31 26 - nativeBuildInputs = [installShellFiles]; 32 + nativeCheckInputs = [ postgresql ]; 33 + 27 34 checkFlags = ["-short"]; 28 35 29 36 postInstall = '' ··· 33 40 --zsh <($out/bin/headscale completion zsh) 34 41 ''; 35 42 36 - passthru.tests = {inherit (nixosTests) headscale;}; 43 + passthru.tests = { inherit (nixosTests) headscale; }; 37 44 38 45 meta = with lib; { 39 46 homepage = "https://github.com/juanfont/headscale"; ··· 56 63 ''; 57 64 license = licenses.bsd3; 58 65 mainProgram = "headscale"; 59 - maintainers = with maintainers; [nkje jk kradalby misterio77 ghuntley]; 66 + maintainers = with maintainers; [ 67 + kradalby 68 + misterio77 69 + ]; 60 70 }; 61 71 }
-204
pkgs/servers/headscale/patches/config-loosen-up-BaseDomain-and-ServerURL-checks.patch
··· 1 - From 6ba8990b0b982b261b0b549080a2f7f780cc70d6 Mon Sep 17 00:00:00 2001 2 - From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt> 3 - Date: Thu, 21 Nov 2024 06:28:45 +0200 4 - Subject: [PATCH] config: loosen up BaseDomain and ServerURL checks 5 - 6 - Requirements [here][1]: 7 - 8 - > OK: 9 - > server_url: headscale.com, base: clients.headscale.com 10 - > server_url: headscale.com, base: headscale.net 11 - > 12 - > Not OK: 13 - > server_url: server.headscale.com, base: headscale.com 14 - > 15 - > Essentially we have to prevent the possibility where the headscale 16 - > server has a URL which can also be assigned to a node. 17 - > 18 - > So for the Not OK scenario: 19 - > 20 - > if the server is: server.headscale.com, and a node joins with the name 21 - > server, it will be assigned server.headscale.com and that will break 22 - > the connection for nodes which will now try to connect to that node 23 - > instead of the headscale server. 24 - 25 - Fixes #2210 26 - 27 - [1]: https://github.com/juanfont/headscale/issues/2210#issuecomment-2488165187 28 - --- 29 - hscontrol/types/config.go | 44 +++++++++++-- 30 - hscontrol/types/config_test.go | 64 ++++++++++++++++++- 31 - .../testdata/base-domain-in-server-url.yaml | 2 +- 32 - 3 files changed, 102 insertions(+), 8 deletions(-) 33 - 34 - diff --git a/hscontrol/types/config.go b/hscontrol/types/config.go 35 - index 50ce2f075f4c..b10118aaeade 100644 36 - --- a/hscontrol/types/config.go 37 - +++ b/hscontrol/types/config.go 38 - @@ -28,8 +28,9 @@ const ( 39 - maxDuration time.Duration = 1<<63 - 1 40 - ) 41 - 42 - -var errOidcMutuallyExclusive = errors.New( 43 - - "oidc_client_secret and oidc_client_secret_path are mutually exclusive", 44 - +var ( 45 - + errOidcMutuallyExclusive = errors.New("oidc_client_secret and oidc_client_secret_path are mutually exclusive") 46 - + errServerURLSuffix = errors.New("server_url cannot be part of base_domain in a way that could make the DERP and headscale server unreachable") 47 - ) 48 - 49 - type IPAllocationStrategy string 50 - @@ -814,10 +815,10 @@ func LoadServerConfig() (*Config, error) { 51 - // - DERP run on their own domains 52 - // - Control plane runs on login.tailscale.com/controlplane.tailscale.com 53 - // - MagicDNS (BaseDomain) for users is on a *.ts.net domain per tailnet (e.g. tail-scale.ts.net) 54 - - // 55 - - // TODO(kradalby): remove dnsConfig.UserNameInMagicDNS check when removed. 56 - - if !dnsConfig.UserNameInMagicDNS && dnsConfig.BaseDomain != "" && strings.Contains(serverURL, dnsConfig.BaseDomain) { 57 - - return nil, errors.New("server_url cannot contain the base_domain, this will cause the headscale server and embedded DERP to become unreachable from the Tailscale node.") 58 - + if !dnsConfig.UserNameInMagicDNS && dnsConfig.BaseDomain != "" { 59 - + if err := isSafeServerURL(serverURL, dnsConfig.BaseDomain); err != nil { 60 - + return nil, err 61 - + } 62 - } 63 - 64 - return &Config{ 65 - @@ -910,6 +911,37 @@ func LoadServerConfig() (*Config, error) { 66 - }, nil 67 - } 68 - 69 - +// BaseDomain cannot be a suffix of the server URL. 70 - +// This is because Tailscale takes over the domain in BaseDomain, 71 - +// causing the headscale server and DERP to be unreachable. 72 - +// For Tailscale upstream, the following is true: 73 - +// - DERP run on their own domains. 74 - +// - Control plane runs on login.tailscale.com/controlplane.tailscale.com. 75 - +// - MagicDNS (BaseDomain) for users is on a *.ts.net domain per tailnet (e.g. tail-scale.ts.net). 76 - +func isSafeServerURL(serverURL, baseDomain string) error { 77 - + server, err := url.Parse(serverURL) 78 - + if err != nil { 79 - + return err 80 - + } 81 - + 82 - + serverDomainParts := strings.Split(server.Host, ".") 83 - + baseDomainParts := strings.Split(baseDomain, ".") 84 - + 85 - + if len(serverDomainParts) <= len(baseDomainParts) { 86 - + return nil 87 - + } 88 - + 89 - + s := len(serverDomainParts) 90 - + b := len(baseDomainParts) 91 - + for i := range len(baseDomainParts) { 92 - + if serverDomainParts[s-i-1] != baseDomainParts[b-i-1] { 93 - + return nil 94 - + } 95 - + } 96 - + 97 - + return errServerURLSuffix 98 - +} 99 - + 100 - type deprecator struct { 101 - warns set.Set[string] 102 - fatals set.Set[string] 103 - diff --git a/hscontrol/types/config_test.go b/hscontrol/types/config_test.go 104 - index e6e8d6c2e0b1..68a13f6c0f40 100644 105 - --- a/hscontrol/types/config_test.go 106 - +++ b/hscontrol/types/config_test.go 107 - @@ -1,6 +1,7 @@ 108 - package types 109 - 110 - import ( 111 - + "fmt" 112 - "os" 113 - "path/filepath" 114 - "testing" 115 - @@ -141,7 +142,7 @@ func TestReadConfig(t *testing.T) { 116 - return LoadServerConfig() 117 - }, 118 - want: nil, 119 - - wantErr: "server_url cannot contain the base_domain, this will cause the headscale server and embedded DERP to become unreachable from the Tailscale node.", 120 - + wantErr: errServerURLSuffix.Error(), 121 - }, 122 - { 123 - name: "base-domain-not-in-server-url", 124 - @@ -337,3 +338,64 @@ tls_letsencrypt_challenge_type: TLS-ALPN-01 125 - err = LoadConfig(tmpDir, false) 126 - assert.NoError(t, err) 127 - } 128 - + 129 - +// OK 130 - +// server_url: headscale.com, base: clients.headscale.com 131 - +// server_url: headscale.com, base: headscale.net 132 - +// 133 - +// NOT OK 134 - +// server_url: server.headscale.com, base: headscale.com. 135 - +func TestSafeServerURL(t *testing.T) { 136 - + tests := []struct { 137 - + serverURL, baseDomain, 138 - + wantErr string 139 - + }{ 140 - + { 141 - + serverURL: "https://example.com", 142 - + baseDomain: "example.org", 143 - + }, 144 - + { 145 - + serverURL: "https://headscale.com", 146 - + baseDomain: "headscale.com", 147 - + }, 148 - + { 149 - + serverURL: "https://headscale.com", 150 - + baseDomain: "clients.headscale.com", 151 - + }, 152 - + { 153 - + serverURL: "https://headscale.com", 154 - + baseDomain: "clients.subdomain.headscale.com", 155 - + }, 156 - + { 157 - + serverURL: "https://headscale.kristoffer.com", 158 - + baseDomain: "mybase", 159 - + }, 160 - + { 161 - + serverURL: "https://server.headscale.com", 162 - + baseDomain: "headscale.com", 163 - + wantErr: errServerURLSuffix.Error(), 164 - + }, 165 - + { 166 - + serverURL: "https://server.subdomain.headscale.com", 167 - + baseDomain: "headscale.com", 168 - + wantErr: errServerURLSuffix.Error(), 169 - + }, 170 - + { 171 - + serverURL: "http://foo\x00", 172 - + wantErr: `parse "http://foo\x00": net/url: invalid control character in URL`, 173 - + }, 174 - + } 175 - + 176 - + for _, tt := range tests { 177 - + testName := fmt.Sprintf("server=%s domain=%s", tt.serverURL, tt.baseDomain) 178 - + t.Run(testName, func(t *testing.T) { 179 - + err := isSafeServerURL(tt.serverURL, tt.baseDomain) 180 - + if tt.wantErr != "" { 181 - + assert.EqualError(t, err, tt.wantErr) 182 - + 183 - + return 184 - + } 185 - + assert.NoError(t, err) 186 - + }) 187 - + } 188 - +} 189 - diff --git a/hscontrol/types/testdata/base-domain-in-server-url.yaml b/hscontrol/types/testdata/base-domain-in-server-url.yaml 190 - index 683e021837c9..2d6a4694a09a 100644 191 - --- a/hscontrol/types/testdata/base-domain-in-server-url.yaml 192 - +++ b/hscontrol/types/testdata/base-domain-in-server-url.yaml 193 - @@ -8,7 +8,7 @@ prefixes: 194 - database: 195 - type: sqlite3 196 - 197 - -server_url: "https://derp.no" 198 - +server_url: "https://server.derp.no" 199 - 200 - dns: 201 - magic_dns: true 202 - -- 203 - 2.47.0 204 -
+2 -2
pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
··· 8 8 buildHomeAssistantComponent rec { 9 9 owner = "wills106"; 10 10 domain = "solax_modbus"; 11 - version = "2024.11.2"; 11 + version = "2025.01.8"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "wills106"; 15 15 repo = "homeassistant-solax-modbus"; 16 16 tag = version; 17 - hash = "sha256-Hy4LHEDp+WPpmWKQQqqLjQ0xSnShQg3a68g8NMJ9o2k="; 17 + hash = "sha256-jvz9CtVCuNu3w/1ebXcI8GNRAWajm51F9SMf13cBhlw="; 18 18 }; 19 19 20 20 dependencies = [ pymodbus ];
+2 -2
pkgs/servers/mir/default.nix
··· 5 5 in 6 6 { 7 7 mir = common { 8 - version = "2.19.2"; 9 - hash = "sha256-E6+FjYJUIgejpat1Kyl0B1JL+mnQd4rXjSQAPTX31qc="; 8 + version = "2.19.3"; 9 + hash = "sha256-WwT0cdLZJlVTTq8REuQrtYWdpRhqEDjYPHDy2oj8Edk="; 10 10 }; 11 11 12 12 mir_2_15 = common {
+3 -3
pkgs/servers/monitoring/prometheus/zfs-exporter.nix
··· 6 6 7 7 buildGoModule rec { 8 8 pname = "zfs_exporter"; 9 - version = "2.3.4"; 9 + version = "2.3.6"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "pdf"; 13 13 repo = pname; 14 14 rev = "v" + version; 15 - hash = "sha256-wPahjWTZLt5GapkOmGdGSicAmSGte2BHf6zZBHd7D3g="; 15 + hash = "sha256-en30/vKZDlqRvQW3n5yeMwLrukObw0d+NfzmdWvfXZE="; 16 16 }; 17 17 18 - vendorHash = "sha256-EUeP7ysMnFeQO8Gaxhhonxk40cUv04MSiEDsaEcjTuM="; 18 + vendorHash = "sha256-fhodh5EcvAX2fruwv0e9VNAti2jKa7kEDQCVSDFl48A="; 19 19 20 20 ldflags = [ 21 21 "-s"
+2 -2
pkgs/tools/system/nvidia-system-monitor-qt/default.nix
··· 26 26 in 27 27 stdenv.mkDerivation rec { 28 28 pname = "nvidia-system-monitor-qt"; 29 - version = "1.6"; 29 + version = "1.6-1"; 30 30 31 31 src = fetchFromGitHub { 32 32 owner = "congard"; 33 33 repo = "nvidia-system-monitor-qt"; 34 34 rev = "v${version}"; 35 - sha256 = "sha256-Gvg7MgCqvfiEfGDQJSR1v5uAB99ZULAuGPGCce/K7HE="; 35 + sha256 = "sha256-JHK7idyk5UxgDyt+SzvYjTLmlNzx6+Z+OPYsRD4NWPg="; 36 36 }; 37 37 38 38 buildInputs = [ qtbase ];
+6 -1
pkgs/top-level/all-packages.nix
··· 7869 7869 inherit (llvmPackages) llvm libclang; 7870 7870 }; 7871 7871 7872 + daggerfall-unity-unfree = daggerfall-unity.override { 7873 + pname = "daggerfall-unity-unfree"; 7874 + includeUnfree = true; 7875 + }; 7876 + 7872 7877 dbt = with python3Packages; toPythonApplication dbt-core; 7873 7878 7874 7879 devbox = callPackage ../development/tools/devbox { buildGoModule = buildGo123Module; }; ··· 18318 18323 }; 18319 18324 18320 18325 weasis = callPackage ../by-name/we/weasis/package.nix { 18321 - jre = jdk21; 18326 + jre = jdk23; 18322 18327 }; 18323 18328 18324 18329 sieveshell = with python3.pkgs; toPythonApplication managesieve;