Merge master into staging-next

authored by github-actions[bot] and committed by GitHub 40936b49 c37aa21a

+155 -61
+11 -5
doc/builders/testers.chapter.md
··· 14 14 Examples: 15 15 16 16 ```nix 17 - passthru.tests.version = testVersion { package = hello; }; 17 + passthru.tests.version = testers.testVersion { package = hello; }; 18 18 19 - passthru.tests.version = testVersion { 19 + passthru.tests.version = testers.testVersion { 20 20 package = seaweedfs; 21 21 command = "weed version"; 22 22 }; 23 23 24 - passthru.tests.version = testVersion { 24 + passthru.tests.version = testers.testVersion { 25 25 package = key; 26 26 command = "KeY --help"; 27 27 # Wrong '2.5' version in the code. Drop on next version. 28 28 version = "2.5"; 29 29 }; 30 + 31 + passthru.tests.version = testers.testVersion { 32 + package = ghr; 33 + # The output needs to contain the 'version' string without any prefix or suffix. 34 + version = "v${version}"; 35 + }; 30 36 ``` 31 37 32 38 ## `testEqualDerivation` {#tester-testEqualDerivation} ··· 42 48 Example: 43 49 44 50 ```nix 45 - testEqualDerivation 51 + testers.testEqualDerivation 46 52 "The hello package must stay the same when enabling checks." 47 53 hello 48 54 (hello.overrideAttrs(o: { doCheck = true; })) ··· 73 79 Example: 74 80 75 81 ```nix 76 - tests.fetchgit = invalidateFetcherByDrvHash fetchgit { 82 + tests.fetchgit = testers.invalidateFetcherByDrvHash fetchgit { 77 83 name = "nix-source"; 78 84 url = "https://github.com/NixOS/nix"; 79 85 rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";
+1
nixos/modules/services/web-apps/mediawiki.nix
··· 449 449 --dbuser ${cfg.database.user} \ 450 450 ${optionalString (cfg.database.passwordFile != null) "--dbpassfile ${cfg.database.passwordFile}"} \ 451 451 --passfile ${cfg.passwordFile} \ 452 + --dbtype ${cfg.database.type} \ 452 453 ${cfg.name} \ 453 454 admin 454 455
+2 -2
pkgs/applications/blockchains/fulcrum/default.nix
··· 11 11 12 12 stdenv.mkDerivation rec { 13 13 pname = "fulcrum"; 14 - version = "1.7.0"; 14 + version = "1.8.0"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "cculianu"; 18 18 repo = "Fulcrum"; 19 19 rev = "v${version}"; 20 - sha256 = "sha256-FIa6eAE6yyJR5UdlCXB2Gx3DqN528POxb0eYOCpVjJk="; 20 + sha256 = "sha256-g80XL7dzq2Ed08zAcgBjrHfL1Qqxhr5sL9koaE4fl/I="; 21 21 }; 22 22 23 23 nativeBuildInputs = [ pkg-config qmake ];
+12
pkgs/applications/editors/vim/plugins/generated.nix
··· 10628 10628 meta.homepage = "https://github.com/kana/vim-niceblock/"; 10629 10629 }; 10630 10630 10631 + vim-nickel = buildVimPluginFrom2Nix { 10632 + pname = "vim-nickel"; 10633 + version = "2022-03-16"; 10634 + src = fetchFromGitHub { 10635 + owner = "nickel-lang"; 10636 + repo = "vim-nickel"; 10637 + rev = "2f0f5f8ce2a8e719a5e39d7210ca914ae403374c"; 10638 + sha256 = "1li3wc5164mcqrvj42dc8zh3j8wml10gpgffapnjilwa5c85kv3q"; 10639 + }; 10640 + meta.homepage = "https://github.com/nickel-lang/vim-nickel/"; 10641 + }; 10642 + 10631 10643 vim-ninja-feet = buildVimPluginFrom2Nix { 10632 10644 pname = "vim-ninja-feet"; 10633 10645 version = "2021-05-27";
+1
pkgs/applications/editors/vim/plugins/vim-plugin-names
··· 892 892 https://github.com/jistr/vim-nerdtree-tabs/,, 893 893 https://github.com/nfnty/vim-nftables/,, 894 894 https://github.com/kana/vim-niceblock/,, 895 + https://github.com/nickel-lang/vim-nickel/,main, 895 896 https://github.com/tommcdo/vim-ninja-feet/,, 896 897 https://github.com/LnL7/vim-nix/,, 897 898 https://github.com/symphorien/vim-nixhash/,,
+2 -2
pkgs/applications/misc/rofi-emoji/default.nix
··· 19 19 20 20 stdenv.mkDerivation rec { 21 21 pname = "rofi-emoji"; 22 - version = "3.0.1"; 22 + version = "3.1.0"; 23 23 24 24 src = fetchFromGitHub { 25 25 owner = "Mange"; 26 26 repo = pname; 27 27 rev = "v${version}"; 28 - sha256 = "sha256-pYNeAz8MKBM3VSkQfP4hgTbEy9haGmBmPf/nu9tvKts="; 28 + sha256 = "sha256-YMQG0XO6zVei6GfBdgI7jtB7px12e+xvOMxZ1QHf5kQ="; 29 29 }; 30 30 31 31 patches = [
+3 -3
pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "cloudfoundry-cli"; 5 - version = "8.4.0"; 5 + version = "8.5.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "cloudfoundry"; 9 9 repo = "cli"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-+UP1abTDYLn+lhMvo9G57X0nlColai7isNswog+3Y40="; 11 + sha256 = "sha256-+fQnit2J3WQpir4HldkWKCex6byfp2IqEWCi4oJ5HgU="; 12 12 }; 13 - vendorSha256 = "sha256-opVnj6dTtHrPYM1v+EFw39XDMF/fampAn7n+JvlBcJk="; 13 + vendorSha256 = "sha256-Wz5OoCrIY/xEXk+eqXtqtgVGD8oGUPmhzT5mOcZRD8w="; 14 14 15 15 subPackages = [ "." ]; 16 16
+3 -3
pkgs/applications/networking/cluster/glooctl/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "glooctl"; 5 - version = "1.12.15"; 5 + version = "1.12.17"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "solo-io"; 9 9 repo = "gloo"; 10 10 rev = "v${version}"; 11 - hash = "sha256-HOWBigwW5JagFG1MfcFIXSzveGAj1BWjLbJL9ESLgAQ="; 11 + hash = "sha256-6lwjfJOW1T+pRU9nrZ9Pit0N0je+t829jeKmlDn9TgA="; 12 12 }; 13 13 14 14 subPackages = [ "projects/gloo/cli/cmd" ]; 15 - vendorSha256 = "sha256-6AgsnPrkLtUgvPMcXDZ9qVngnlN/65pwjdtBPdf0Jzw="; 15 + vendorSha256 = "sha256-584gGED37p5QycoquFwp3hNR9x70kB1EsO5aoZTEJ1Y="; 16 16 17 17 nativeBuildInputs = [ installShellFiles ]; 18 18
+2 -2
pkgs/applications/networking/instant-messengers/discord/default.nix
··· 1 1 { branch ? "stable", callPackage, fetchurl, lib, stdenv }: 2 2 let 3 3 versions = if stdenv.isLinux then { 4 - stable = "0.0.19"; 4 + stable = "0.0.20"; 5 5 ptb = "0.0.29"; 6 6 canary = "0.0.139"; 7 7 } else { ··· 14 14 x86_64-linux = { 15 15 stable = fetchurl { 16 16 url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; 17 - sha256 = "GfSyddbGF8WA6JmHo4tUM27cyHV5kRAyrEiZe1jbA5A="; 17 + sha256 = "3f7yuxigEF3e8qhCetCHKBtV4XUHsx/iYiaCCXjspYw="; 18 18 }; 19 19 ptb = fetchurl { 20 20 url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
+2 -2
pkgs/applications/radio/limesuite/default.nix
··· 5 5 6 6 stdenv.mkDerivation rec { 7 7 pname = "limesuite"; 8 - version = "20.10.0"; 8 + version = "22.09.0"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "myriadrf"; 12 12 repo = "LimeSuite"; 13 13 rev = "v${version}"; 14 - sha256 = "04wzfhzqmxjsa6bgcr4zd518fln9rbwnbabf48kha84d70vzkdlx"; 14 + sha256 = "sha256-HV0ejx7ImJ7GvAyCi0a7OPB0/2UiLQxxhYR2bc2uYCA="; 15 15 }; 16 16 17 17 nativeBuildInputs = [ cmake ];
+2 -2
pkgs/applications/version-management/git-and-tools/ghr/default.nix
··· 22 22 doCheck = false; 23 23 doInstallCheck = true; 24 24 25 - passthru.tests.testVersion = testers.testVersion { 25 + passthru.tests.version = testers.testVersion { 26 26 package = ghr; 27 - version = "ghr version v${version}"; 27 + version = "v${version}"; 28 28 }; 29 29 30 30 meta = with lib; {
+2 -2
pkgs/development/libraries/armadillo/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "armadillo"; 5 - version = "11.2.3"; 5 + version = "11.2.4"; 6 6 7 7 src = fetchurl { 8 8 url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; 9 - sha256 = "sha256-TC6XzmBwf8HzSPRPevDLbSRm0KrQ0OpL9dXcGA5sukE="; 9 + sha256 = "sha256-3EyRlUqxFJC/ZNLfzFSoAvFDk8dWqNVFrBVe7v+n/ZM="; 10 10 }; 11 11 12 12 nativeBuildInputs = [ cmake ];
+2 -2
pkgs/development/libraries/libwpe/default.nix
··· 12 12 13 13 stdenv.mkDerivation rec { 14 14 pname = "libwpe"; 15 - version = "1.12.2"; 15 + version = "1.12.3"; 16 16 17 17 src = fetchurl { 18 18 url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; 19 - sha256 = "sha256-SsT9CotWK3Ib/9D0aunwbCtaMRRAdYGXi+h1qdZRZCo="; 19 + sha256 = "sha256-uE/b+8hJzk/fCEuyi1jlRjsbS2zI8gDcd7QfhUXVMp0="; 20 20 }; 21 21 22 22 nativeBuildInputs = [
+10 -2
pkgs/development/perl-modules/Po4a/default.nix
··· 1 - { lib, fetchurl, docbook_xsl, docbook_xsl_ns, gettext, libxslt, glibcLocales, docbook_xml_dtd_412, docbook_sgml_dtd_41, texlive, opensp 1 + { stdenv, lib, fetchurl, docbook_xsl, docbook_xsl_ns, gettext, libxslt, glibcLocales, docbook_xml_dtd_412, docbook_sgml_dtd_41, texlive, opensp 2 2 , perl, buildPerlPackage, ModuleBuild, TextWrapI18N, LocaleGettext, TermReadKey, SGMLSpm, UnicodeLineBreak, PodParser, YAMLTiny }: 3 3 4 4 buildPerlPackage rec { ··· 9 9 sha256 = "0eb510a66f59de68cf7a205342036cc9fc08b39334b91f1456421a5f3359e68b"; 10 10 }; 11 11 nativeBuildInputs = [ docbook_xsl docbook_xsl_ns ModuleBuild ]; 12 - propagatedBuildInputs = [ TextWrapI18N LocaleGettext SGMLSpm UnicodeLineBreak PodParser YAMLTiny ]; 12 + propagatedBuildInputs = lib.optional (!stdenv.hostPlatform.isMusl) TextWrapI18N ++ [ LocaleGettext SGMLSpm UnicodeLineBreak PodParser YAMLTiny ]; 13 13 # TODO: TermReadKey was temporarily removed from propagatedBuildInputs to unfreeze the build 14 14 buildInputs = [ gettext libxslt glibcLocales docbook_xml_dtd_412 docbook_sgml_dtd_41 texlive.combined.scheme-basic opensp ]; 15 15 LC_ALL = "en_US.UTF-8"; ··· 19 19 export PERL_MB_OPT="--install_base=$out --prefix=$out" 20 20 ''; 21 21 buildPhase = "perl Build.PL --install_base=$out --install_path=\"lib=$out/${perl.libPrefix}\"; ./Build build"; 22 + 23 + # Disabling tests on musl 24 + # Void linux package have investigated the failure and tracked it down to differences in gettext behavior. They decided to disable tests. 25 + # https://github.com/void-linux/void-packages/pull/34029#issuecomment-973267880 26 + # Alpine packagers have not worried about running the tests until now: 27 + # https://git.alpinelinux.org/aports/tree/main/po4a/APKBUILD#n11 28 + doCheck = !stdenv.hostPlatform.isMusl; 29 + 22 30 checkPhase = '' 23 31 export SGML_CATALOG_FILES=${docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat 24 32 ./Build test
+3 -3
pkgs/development/tools/build-managers/scala-cli/sources.json
··· 1 1 { 2 - "version": "0.1.12", 2 + "version": "0.1.14", 3 3 "assets": { 4 4 "x86_64-darwin": { 5 5 "asset": "scala-cli-x86_64-apple-darwin.gz", 6 - "sha256": "1gg5w676h1dm6rmbjbc8fjrz8q2kpq1062xn0r3gm6jwjgjsbw6v" 6 + "sha256": "1h20bd8rabpxgjp6czbn9m5yhmz77vkvpbsxmnf6src942ihb7sn" 7 7 }, 8 8 "x86_64-linux": { 9 9 "asset": "scala-cli-x86_64-pc-linux.gz", 10 - "sha256": "1ihfkfgfwsvryk2hpiflakmi512m8xjaksny33fymn52cpv8n2gw" 10 + "sha256": "1n4f920qpwhnarky1dh79sk1r3ayriinf4ah53704xvscc083c70" 11 11 } 12 12 } 13 13 }
+2 -2
pkgs/development/tools/continuous-integration/cirrus-cli/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "cirrus-cli"; 8 - version = "0.85.0"; 8 + version = "0.86.0"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "cirruslabs"; 12 12 repo = pname; 13 13 rev = "v${version}"; 14 - sha256 = "sha256-hFL7ImtaQrNeoxNLE/RL79SHRBHSit1dQ6Wn8gq8dns="; 14 + sha256 = "sha256-ilQNwxqi7PMj6zgJ7SbpKfHDiTEjfIey3jV/Owrbddc="; 15 15 }; 16 16 17 17 vendorSha256 = "sha256-GRCcKIUimPFdeAhnz6RC5arZ0E+z+SpaAC1uDaxpJkI=";
+3 -3
pkgs/development/tools/gomplate/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "gomplate"; 5 - version = "3.11.2"; 5 + version = "3.11.3"; 6 6 owner = "hairyhenderson"; 7 7 rev = "v${version}"; 8 8 9 9 src = fetchFromGitHub { 10 10 inherit owner rev; 11 11 repo = pname; 12 - sha256 = "sha256-NIepoz1JToaX2EJCL/kqkpBJigJVy2Tkz0jGn4ukfvI="; 12 + sha256 = "sha256-NvTwiGyBHhHiVHdWeXnJONNkHkrvsc1zmHPK8rSHaQw="; 13 13 }; 14 14 15 - vendorSha256 = "sha256-fXbwNX+GoujciZVxxe7Tl21MxWhyAD4cW/p8PCAAElw="; 15 + vendorSha256 = "sha256-BIcOErtlcnE70Mo6fjmA/btvSpw95RaKLqNWsgyJgpc="; 16 16 17 17 postPatch = '' 18 18 # some tests require network access
+2 -2
pkgs/development/tools/jsonnet-language-server/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "jsonnet-language-server"; 5 - version = "0.9.0"; 5 + version = "0.9.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "grafana"; 9 9 repo = "jsonnet-language-server"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-Qp01JcgDdIK1yqXJCasZkh6rWXujdCHSFVxHSVySj50="; 11 + sha256 = "sha256-JNRMV52sSA45lp1UdJ4wBGrhlGIFhYHhgZU0lop1HcI="; 12 12 }; 13 13 14 14 vendorSha256 = "sha256-tsVevkMHuCv70A9Ohg9L+ghH5+v52X4sToI4bMlDzzo=";
+2 -2
pkgs/development/tools/misc/hound/default.nix
··· 8 8 9 9 buildGoModule rec { 10 10 pname = "hound"; 11 - version = "0.5.1"; 11 + version = "0.6.0"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "hound-search"; 15 15 repo = "hound"; 16 16 rev = "v${version}"; 17 - sha256 = "sha256-1URhb+ZrtP5eGS2o7lBxvAxQJR/J6oE+pCbJ7sQb0X4="; 17 + sha256 = "sha256-M1c4lsD7DQo5+RCCDdyn9FeGuGngMsg1qSrxM2wCzpg="; 18 18 }; 19 19 20 20 vendorSha256 = "sha256-ZgF/PB3VTPx367JUkhOkSEK1uvqENNG0xuNXvCGENnQ=";
+41 -2
pkgs/development/tools/omnisharp-roslyn/default.nix
··· 5 5 , lib 6 6 , patchelf 7 7 , stdenv 8 + , runCommand 9 + , expect 8 10 }: 9 11 let 10 12 inherit (dotnetCorePackages) sdk_6_0; 11 13 in 12 - buildDotnetModule rec { 14 + let finalPackage = buildDotnetModule rec { 13 15 pname = "omnisharp-roslyn"; 14 16 version = "1.39.1"; 15 17 ··· 72 74 rm $out/lib/omnisharp-roslyn/System.Configuration.ConfigurationManager.dll 73 75 ''; 74 76 77 + passthru.tests = { 78 + no-sdk = runCommand "no-sdk" { nativeBuildInputs = [ finalPackage expect ]; meta.timeout = 60; } '' 79 + HOME=$TMPDIR 80 + expect <<"EOF" 81 + spawn OmniSharp 82 + expect_before timeout { 83 + send_error "timeout!\n" 84 + exit 1 85 + } 86 + expect "\"ERROR\",\"Name\":\"OmniSharp.MSBuild.Discovery.Providers.SdkInstanceProvider\"" 87 + expect eof 88 + catch wait result 89 + if { [lindex $result 3] == 0 } { 90 + exit 1 91 + } 92 + EOF 93 + touch $out 94 + ''; 95 + 96 + with-sdk = runCommand "with-sdk" { nativeBuildInputs = [ finalPackage sdk_6_0 expect ]; meta.timeout = 60; } '' 97 + HOME=$TMPDIR 98 + expect <<"EOF" 99 + spawn OmniSharp 100 + expect_before timeout { 101 + send_error "timeout!\n" 102 + exit 1 103 + } 104 + expect "{\"Event\":\"started\"," 105 + send \x03 106 + expect eof 107 + catch wait result 108 + exit [lindex $result 3] 109 + EOF 110 + touch $out 111 + ''; 112 + }; 113 + 75 114 meta = with lib; { 76 115 description = "OmniSharp based on roslyn workspaces"; 77 116 homepage = "https://github.com/OmniSharp/omnisharp-roslyn"; ··· 83 122 maintainers = with maintainers; [ tesq0 ericdallo corngood mdarocha ]; 84 123 mainProgram = "OmniSharp"; 85 124 }; 86 - } 125 + }; in finalPackage
+1
pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
··· 54 54 tree-sitter-lua = lib.importJSON ./tree-sitter-lua.json; 55 55 tree-sitter-make = lib.importJSON ./tree-sitter-make.json; 56 56 tree-sitter-markdown = lib.importJSON ./tree-sitter-markdown.json; 57 + tree-sitter-nickel = lib.importJSON ./tree-sitter-nickel.json; 57 58 tree-sitter-nix = lib.importJSON ./tree-sitter-nix.json; 58 59 tree-sitter-norg = lib.importJSON ./tree-sitter-norg.json; 59 60 tree-sitter-ocaml = lib.importJSON ./tree-sitter-ocaml.json;
+11
pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json
··· 1 + { 2 + "url": "https://github.com/nickel-lang/tree-sitter-nickel", 3 + "rev": "9d83db400b6c11260b9106f131f93ddda8131933", 4 + "date": "2022-07-06T11:43:01+02:00", 5 + "path": "/nix/store/i7arz4binnq34j1k0hwlpl4apd9b4j4x-tree-sitter-nickel", 6 + "sha256": "0rm63fnxja59zzkm7gz4vbzics8mdf7d6ijazcy9394kdqrcdzi6", 7 + "fetchLFS": false, 8 + "fetchSubmodules": false, 9 + "deepClone": false, 10 + "leaveDotGit": false 11 + }
+4
pkgs/development/tools/parsing/tree-sitter/update.nix
··· 339 339 orga = "ambroisie"; 340 340 repo = "tree-sitter-tiger"; 341 341 }; 342 + "tree-sitter-nickel" = { 343 + orga = "nickel-lang"; 344 + repo = "tree-sitter-nickel"; 345 + }; 342 346 }; 343 347 344 348 allGrammars =
+3 -3
pkgs/development/tools/rust/cargo-nextest/default.nix
··· 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "cargo-nextest"; 5 - version = "0.9.35"; 5 + version = "0.9.36"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "nextest-rs"; 9 9 repo = "nextest"; 10 10 rev = "cargo-nextest-${version}"; 11 - sha256 = "sha256-tNpE0bEnN4eJZ0nTkGFNrUW5Lam+GK6gUqQZBBYSeEI="; 11 + sha256 = "sha256-gp/XEhSNdoEs3+KXbbgbjRg29xHyHuAbYLBVvNDIgLw="; 12 12 }; 13 13 14 - cargoSha256 = "sha256-p6K3GumMpLlnFsTegnH/ij+VDTjAB/dXYea0cWtCOGw="; 14 + cargoSha256 = "sha256-mz2zJwA05Wg6g+u7LfANMt+wwoZIQzb2mH3Y+b4SBr0="; 15 15 16 16 buildInputs = lib.optionals stdenv.isDarwin [ Security ]; 17 17
+3 -3
pkgs/development/tools/rust/cargo-spellcheck/default.nix
··· 8 8 9 9 rustPlatform.buildRustPackage rec { 10 10 pname = "cargo-spellcheck"; 11 - version = "0.11.2"; 11 + version = "0.12.1"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "drahnr"; 15 15 repo = pname; 16 16 rev = "v${version}"; 17 - sha256 = "sha256-ZiRa4XYnY4fwbMenRLnvFQms66tIyGbm5saK8gN39ag="; 17 + sha256 = "sha256-PyNO+kBxTYeqXgZh1XhE18G9ZK7suo/acKSE57zCbcY="; 18 18 }; 19 19 20 - cargoSha256 = "sha256-gWQbhFPdBDhPZY1LHxFlWO9xG4AXfyhZp0UnZ3Y86/Y="; 20 + cargoSha256 = "sha256-i6AvKF34Gh3QhwvYVd+QTYCPMW9D0/vhz7WoY5d4kHU="; 21 21 22 22 buildInputs = lib.optional stdenv.isDarwin Security; 23 23
+6
pkgs/os-specific/linux/musl/default.nix
··· 67 67 url = "https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch"; 68 68 sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n"; 69 69 }) 70 + 71 + # fix parsing lines with optional fields in fstab etc. NOTE: Remove for the next release since it has been merged upstream 72 + (fetchurl { 73 + url = "https://git.musl-libc.org/cgit/musl/patch/?id=751bee0ee727e8d8b003c87cff77ac76f1dbecd6"; 74 + sha256 = "sha256-qCw132TCSaZrkISmtDb8Q8ufyt8sAJdwACkvfwuoi/0="; 75 + }) 70 76 ]; 71 77 CFLAGS = [ "-fstack-protector-strong" ] 72 78 ++ lib.optional stdenv.hostPlatform.isPower "-mlong-double-64";
+2 -2
pkgs/servers/etcd/3.4.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "etcd"; 5 - version = "3.4.20"; 5 + version = "3.4.21"; 6 6 7 7 vendorSha256 = "sha256-P3EQTraMdZ2fAHDue5cKAxyHbh6nNeFV9ykT0rH7KPs="; 8 8 ··· 12 12 owner = "etcd-io"; 13 13 repo = "etcd"; 14 14 rev = "v${version}"; 15 - sha256 = "sha256-JfwjkgD57FqSmwgWZ5NbxshmY5JZUUWsk3bdYx15BKo="; 15 + sha256 = "sha256-+IU1l23sN9v48ZhJLGncUa3t5kPHBFcqQ/ojaZXzMU4="; 16 16 }; 17 17 18 18 buildPhase = ''
+5
pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
··· 21 21 url = "https://github.com/hydrian/TTRSS-Auth-LDAP/commit/557811efa15bab3b5044c98416f9e37264f11c9a.patch"; 22 22 sha256 = "sha256-KtDY0J1OYNTLwK7834lI+2XL1N1FkOk5zhinGY90/4A="; 23 23 }) 24 + # https://github.com/hydrian/TTRSS-Auth-LDAP/pull/34 25 + (fetchpatch { 26 + url = "https://github.com/hydrian/TTRSS-Auth-LDAP/commit/b1a873f6a7d18231d2ac804d0146d6e048c8382c.patch"; 27 + sha256 = "sha256-t5bDQM97dGwr7tHSS9cSO7qApf2M8KNaIuIxbAjExrs="; 28 + }) 24 29 ]; 25 30 26 31 installPhase = ''
+2 -2
pkgs/tools/admin/boulder/default.nix
··· 7 7 8 8 buildGoModule rec { 9 9 pname = "boulder"; 10 - version = "2022-09-06"; 10 + version = "2022-09-14"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "letsencrypt"; ··· 19 19 git rev-parse --short=8 HEAD 2>/dev/null >$out/COMMIT 20 20 find "$out" -name .git -print0 | xargs -0 rm -rf 21 21 ''; 22 - hash = "sha256-BteHJAjIMPckbNIxgZCSSZV2iUc/yKVd0Px+S9ZwwUI="; 22 + hash = "sha256-AviTVALFI1+0cFohLLdaKR1Lw3b9yURIIlrzweuiN7w="; 23 23 }; 24 24 25 25 vendorHash = null;
+2 -2
pkgs/tools/misc/barman/default.nix
··· 4 4 }: 5 5 python3Packages.buildPythonApplication rec { 6 6 pname = "barman"; 7 - version = "3.0.1"; 7 + version = "3.1.0"; 8 8 9 9 src = fetchFromGitHub { 10 10 owner = "EnterpriseDB"; 11 11 repo = pname; 12 12 rev = "refs/tags/release/${version}"; 13 - sha256 = "sha256-e6euOtvJx+xUq5pWmWK6l7nv/twOa+0OABUTYvMd8Ow="; 13 + sha256 = "sha256-xRyKCpO2eBe5lI0pQW8wUee/5ZMDEo7/FLORrp3Sduk="; 14 14 }; 15 15 16 16 patches = [
+3 -3
pkgs/tools/misc/fclones/default.nix
··· 8 8 9 9 rustPlatform.buildRustPackage rec { 10 10 pname = "fclones"; 11 - version = "0.27.3"; 11 + version = "0.28.0"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "pkolaczk"; 15 15 repo = pname; 16 16 rev = "v${version}"; 17 - sha256 = "sha256-IAo7FKHh4oRPEmToEJca6b6E+TZvTeICPRYxol6Ppwo="; 17 + sha256 = "sha256-OOFmyTEiaZnCx15gkoMGooC4qlevKMBS7umawiKVZqE="; 18 18 }; 19 19 20 - cargoSha256 = "sha256-S4F/2kf9jbOA3o3kj5Ouo3QvCULbVILh3QbBLXUeOzc="; 20 + cargoSha256 = "sha256-jWYiZ6YNeGtmcHgqCgC8A7dEdJ29n3W/RdE0wQbOUOA="; 21 21 22 22 buildInputs = lib.optionals stdenv.isDarwin [ 23 23 AppKit
+5 -5
pkgs/tools/networking/boundary/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "boundary"; 5 - version = "0.10.3"; 5 + version = "0.10.5"; 6 6 7 7 src = 8 8 let ··· 15 15 aarch64-darwin = "darwin_arm64"; 16 16 }; 17 17 sha256 = selectSystem { 18 - x86_64-linux = "sha256-MflcfTX0Ap8KEP0NDSZMHKM+fPsCoorUcUHV3WDXmBE="; 19 - aarch64-linux = "sha256-WeSmRpi50dfnv5quLPQTYNKQcQlBwno1iwPUyTeJrW4="; 20 - x86_64-darwin = "sha256-Ff4mu/g2K1wAeBj2IpOMT80gKcIP/dZjhWA8czokpxc="; 21 - aarch64-darwin = "sha256-Ove3Tgj7FnR5ZTzVZlmFDRoUaVlO2xA6CzMqIdobZxQ="; 18 + x86_64-linux = "sha256-lVv+mC9pNYzQes9k8KqkrHULuwETSHUCBF0FNw7kR+8="; 19 + aarch64-linux = "sha256-0GVANhtzrAJUl4hktgiCdzUMhlhh7jyMAWS7/DyVuiU="; 20 + x86_64-darwin = "sha256-N14Lynd/Q/eIGrM6ljAKnZdse/ShkvPaKSz6Q9DtYC0="; 21 + aarch64-darwin = "sha256-iScNf6YM5nUjBqWMWb0eM5j9f3WiVvWOtjq7eoABfUM="; 22 22 }; 23 23 in 24 24 fetchzip {