JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-10-01 06:01:38 +00:00 committed by GitHub
commit 6baf6700f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 211 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/audio/sc68/default.nix
View File

@ -13,12 +13,12 @@
stdenv.mkDerivation rec {
pname = "sc68";
version = "unstable-2020-05-18";
version = "unstable-2021-08-23";
src = fetchsvn {
url = "svn://svn.code.sf.net/p/sc68/code/";
rev = "693";
sha256 = "0liz5yjwiy41y160ag83zz9s5l8mk72fscxgvjv9g5qf4gwffnfa";
rev = "694";
sha256 = "1yycnr4ndzfhbmki41c30zskwyizpb9wb8sf0gxcprllmbq6a421";
};
preConfigure = "tools/svn-bootstrap.sh";

4
pkgs/applications/misc/dasel/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "dasel";
version = "1.21.0";
version = "1.21.1";
src = fetchFromGitHub {
owner = "TomWright";
repo = pname;
rev = "v${version}";
sha256 = "sha256-XomB//VX4ovE2AWh6wQxuGoLSSIxoXnxy4Agbip6PYw=";
sha256 = "sha256-M63KFQ+g4b0HiWlv1Kym0ulqZcCMdfU9SoLhpaI4q/o=";
};
vendorSha256 = "sha256-yP4iF3403WWgWAmBHiuOpDsIAUx4+KR8uKPfjy3qXt8=";

6
pkgs/applications/networking/cluster/helmsman/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helmsman";
version = "3.7.3";
version = "3.7.5";
src = fetchFromGitHub {
owner = "Praqma";
repo = "helmsman";
rev = "v${version}";
sha256 = "sha256-7WN4YjhPbsFZfoFuZzsN85a+kdEVlEzQ9CfWh4nxxTs=";
sha256 = "sha256-QJXCVcEf23oaTDemoCV/2aaajbubfXg0AfZrlSTS4Ag=";
};
vendorSha256 = "sha256-XHgdVFGIzbPPYgv/T4TtvDDbKAe3niev4S5tu/nwSqg=";
vendorSha256 = "sha256-4imZrZfpR/5tw9ZFSTr7Gx4G9O1iHNE9YRYMOJFKvHU=";
doCheck = false;

4
pkgs/applications/networking/cluster/kubecfg/default.nix
View File

@ -1,6 +1,6 @@
{ lib, buildGoPackage, fetchFromGitHub, ... }:
let version = "0.20.0"; in
let version = "0.21.0"; in
buildGoPackage {
pname = "kubecfg";
@ -10,7 +10,7 @@ buildGoPackage {
owner = "bitnami";
repo = "kubecfg";
rev = "v${version}";
sha256 = "sha256-7lBIqaozVBoiYYOTqAxq9h2N+Y3JFwLaunCykILOmPU=";
sha256 = "sha256-Wu7+Xmb7ha3OG37DzLg2+/Sr9hB5oD3OIkC9h9Fa4QA=";
};
goPackagePath = "github.com/bitnami/kubecfg";

6
pkgs/applications/networking/cluster/minikube/default.nix
View File

@ -11,9 +11,9 @@
buildGoModule rec {
pname = "minikube";
version = "1.23.0";
version = "1.23.2";
vendorSha256 = "sha256-KhUmyQn97rXX49EFqUrR7UEm0J5gIdogUJMVW1Wjrdw=";
vendorSha256 = "sha256-Q6DadAmx/8TM+MrdaKgAjn0sVrKqTYoWdsmnN77yfKA=";
doCheck = false;
@ -21,7 +21,7 @@ buildGoModule rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
sha256 = "sha256-Cf77qaAsavkSpSoBJz3kcPzL2SL7X9O9lCTYcm1tFFQ=";
sha256 = "sha256-PIgzGikVIno2Gd+kSjF4kLHuUKgPrPHoIJxAGblI8RQ=";
};
nativeBuildInputs = [ installShellFiles pkg-config which ];

4
pkgs/applications/networking/cluster/multus-cni/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "multus-cni";
version = "3.7.2";
version = "3.8";
src = fetchFromGitHub {
owner = "k8snetworkplumbingwg";
repo = pname;
rev = "v${version}";
sha256 = "sha256-eVYRbMijOEa+DNCm4w/+WVrTI9607NF9/l5YKkXJuFs=";
sha256 = "sha256-wG6SRts3+bmeMkfScyNorsBvRl/hxe+CUnL0rwfknpc=";
};
ldflags = let

2
pkgs/applications/radio/soapysdr/default.nix
View File

@ -50,6 +50,6 @@ in stdenv.mkDerivation {
description = "Vendor and platform neutral SDR support library";
license = licenses.boost;
maintainers = with maintainers; [ markuskowa ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

6
pkgs/applications/version-management/git-and-tools/glab/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "glab";
version = "1.20.0";
version = "1.21.1";
src = fetchFromGitHub {
owner = "profclems";
repo = pname;
rev = "v${version}";
sha256 = "sha256-MHNhl6lrBqHZ6M4fVOnSDxEcF6RqfWHWx5cvUhRXJKw=";
sha256 = "sha256-naCCJ9s63UPDxRWbVjVikXtGUlM4Lp7vyDHlESEtXeI=";
};
vendorSha256 = "sha256-9+WBKc8PI0v6bnkC+78Ygv/eocQ3D7+xBb8lcv16QTE=";
vendorSha256 = "sha256-iiHDxiP6Dg7MK5jhSwly5oEhFZ8ByCx5WEyrbzL/u4w=";
runVend = true;
ldflags = [

6
pkgs/applications/version-management/git-and-tools/lab/default.nix
View File

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "lab";
version = "0.22.0";
version = "0.23.0";
src = fetchFromGitHub {
owner = "zaquestion";
repo = "lab";
rev = "v${version}";
sha256 = "sha256-CyXEmlsc40JtwDjRYNWqN+3cuoG8K07jAQdd1rktvS8=";
sha256 = "0g8v3cli8rvr0zsxiv4w0afzqmh0d85a832c4hc75b3f9amkr0dl";
};
subPackages = [ "." ];
vendorSha256 = "sha256-PSS7OPbM+XsylqDlWc4h+oZrOua2kSWKLEuyjqo/cxM=";
vendorSha256 = "09xn5vycb9shygs13pfwxlb89j6rhrbplm10mfgxi4kzlvm7agl6";
doCheck = false;

4
pkgs/applications/version-management/git-repo/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "git-repo";
version = "2.16.8";
version = "2.17";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
sha256 = "sha256-5EIuaGc93ll9YXLlleZ2HhT0maa+xtozk0LtneYYcDM=";
sha256 = "sha256-/6BAGZo8GwsmXXGLJ2oTxIbgOCwP5p6Vh4wABSvAGZM=";
};
# Fix 'NameError: name 'ssl' is not defined'

17
pkgs/applications/virtualization/qemu/default.nix
View File

@ -103,6 +103,17 @@ stdenv.mkDerivation rec {
url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch";
sha256 = "0wk0rrcqywhrw9hygy6ap0lfg314m9z1wr2hn8338r5gfcw75mav";
})
] ++ lib.optionals stdenv.isDarwin [
# The Hypervisor.framework support patch converted something that can be applied:
# * https://patchwork.kernel.org/project/qemu-devel/list/?series=548227
# The base revision is whatever commit there is before the series starts:
# * https://github.com/patchew-project/qemu/commits/patchew/20210916155404.86958-1-agraf%40csgraf.de
# The target revision is what patchew has as the series tag from patchwork:
# * https://github.com/patchew-project/qemu/releases/tag/patchew%2F20210916155404.86958-1-agraf%40csgraf.de
(fetchpatch {
url = "https://github.com/patchew-project/qemu/compare/7adb961995a3744f51396502b33ad04a56a317c3..d2603c06d9c4a28e714b9b70fe5a9d0c7b0f934d.diff";
sha256 = "sha256-nSi5pFf9+EefUmyJzSEKeuxOt39ztgkXQyUB8fTHlcY=";
})
];
postPatch = ''
@ -167,6 +178,12 @@ stdenv.mkDerivation rec {
doCheck = false; # tries to access /dev
dontWrapGApps = true;
# QEMU attaches entitlements with codesign and strip removes those,
# voiding the entitlements and making it non-operational.
# The alternative is to re-sign with entitlements after stripping:
# * https://github.com/qemu/qemu/blob/v6.1.0/scripts/entitlement.sh#L25
dontStrip = stdenv.isDarwin;
postFixup = ''
# the .desktop is both invalid and pointless
rm -f $out/share/applications/qemu.desktop

10
pkgs/development/compilers/koka/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, pkgsHostTarget, cmake, makeWrapper, mkDerivation, fetchFromGitHub
, alex, array, base, bytestring, cond, containers, directory, extra
, filepath, haskeline, hpack, hspec, hspec-core, json, lib, mtl
, filepath, hpack, hspec, hspec-core, isocline, json, lib, mtl
, parsec, process, regex-compat, text, time }:
let
version = "2.1.9";
version = "2.3.1";
src = fetchFromGitHub {
owner = "koka-lang";
repo = "koka";
rev = "v${version}";
sha256 = "0xny4x1a2lzwgmng60bni7rxfjx5ns70qbfp703qwms54clvj5wy";
sha256 = "18f4hsqgc6c0cnayabj311n438fjhf217j1kjaysa8w4k4pxl58z";
fetchSubmodules = true;
};
kklib = stdenv.mkDerivation {
@ -33,14 +33,13 @@ mkDerivation rec {
isExecutable = true;
libraryToolDepends = [ hpack ];
executableHaskellDepends = [
array base bytestring cond containers directory haskeline mtl
array base bytestring cond containers directory isocline mtl
parsec process text time kklib
];
executableToolDepends = [ alex makeWrapper ];
postInstall = ''
mkdir -p $out/share/koka/v${version}
cp -a lib $out/share/koka/v${version}
cp -a contrib $out/share/koka/v${version}
cp -a kklib $out/share/koka/v${version}
wrapProgram "$out/bin/koka" \
--set CC "${lib.getBin cc}/bin/${cc.targetPrefix}cc" \
@ -50,6 +49,7 @@ mkDerivation rec {
prePatch = "hpack";
description = "Koka language compiler and interpreter";
homepage = "https://github.com/koka-lang/koka";
changelog = "${homepage}/blob/master/doc/spec/news.mdk";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ siraben sternenseemann ];
}

10
pkgs/development/coq-modules/paramcoq/default.nix
View File

@ -3,9 +3,13 @@
with lib; mkCoqDerivation {
pname = "paramcoq";
inherit version;
defaultVersion = if versions.range "8.7" "8.13" coq.coq-version
then "1.1.2+coq${coq.coq-version}" else null;
displayVersion = { paramcoq = "1.1.2"; };
defaultVersion = with versions; switch coq.version [
{ case = range "8.13" "8.14"; out = "1.1.3+coq${coq.coq-version}"; }
{ case = range "8.7" "8.13"; out = "1.1.2+coq${coq.coq-version}"; }
] null;
displayVersion = { paramcoq = "..."; };
release."1.1.3+coq8.14".sha256 = "00zqq9dc2p5v0ib1jgizl25xkwxrs9mrlylvy0zvb96dpridjc71";
release."1.1.3+coq8.13".sha256 = "06ndly736k4pmdn4baqa7fblp6lx7a9pxm9gvz1vzd6ic51825wp";
release."1.1.2+coq8.13".sha256 = "02vnf8p04ynf3qk8myvjzsbga15395235mpdpj54pvxis3h5qq22";
release."1.1.2+coq8.12".sha256 = "0qd72r45if4h7c256qdfiimv75zyrs0w0xqij3m866jxaq591v4i";
release."1.1.2+coq8.11".sha256 = "09c6813988nvq4fpa45s33k70plnhxsblhm7cxxkg0i37mhvigsa";

15
pkgs/development/interpreters/bqn/cbqn/001-remove-vendoring.diff Normal file
View File

@ -0,0 +1,15 @@
diff --git a/makefile b/makefile
index a5f3d75..f617e25 100644
--- a/makefile
+++ b/makefile
@@ -109,9 +109,7 @@ ${bd}/%.o: src/builtins/%.c
src/gen/customRuntime:
- @echo "Copying precompiled bytecode from the bytecode branch"
- git checkout remotes/origin/bytecode src/gen/{compiler,formatter,runtime0,runtime1,src}
- git reset src/gen/{compiler,formatter,runtime0,runtime1,src}
+ echo "src/gen/ files retrieved externally"
${bd}/load.o: src/gen/customRuntime
-include $(bd)/*.d

78
pkgs/development/interpreters/bqn/cbqn/default.nix Normal file
View File

@ -0,0 +1,78 @@
{ lib
, stdenv
, fetchFromGitHub
, bqn-path ? null
}:
let
mlochbaum-bqn = fetchFromGitHub {
owner = "mlochbaum";
repo = "BQN";
rev = "97cbdc67fe6a9652c42daefadd658cc41c1e5ae3";
hash = "sha256-F2Bv3n3C7zAhqKCMB6hT2iIWTjEqFdLBMyX6/w7V1SY=";
};
in
stdenv.mkDerivation rec {
pname = "cbqn";
version = "0.0.0+unstable=2021-09-29";
src = fetchFromGitHub {
owner = "dzaima";
repo = "CBQN";
rev = "1c83483d5395e097f60de299274ebe0df590217e";
hash = "sha256-C34DpXab08mBm2oCQuaeq4fJPtQ5rVa/HlpL/nB9XjQ=";
};
cbqn-bytecode = fetchFromGitHub {
owner = "dzaima";
repo = "CBQN";
rev = "fdf0b93409d68d5ffd86c5670db27c240e6039e0";
hash = "sha256-A0zvpg+G37WNgyfrJuc5rH6L7Wntdbrz8pYEPreqgKE=";
};
dontConfigure = true;
patches = [
# self-explaining
./001-remove-vendoring.diff
];
postPatch = ''
sed -i '/SHELL =.*/ d' makefile
'';
preBuild =
if bqn-path == null
then ''
cp ${cbqn-bytecode}/src/gen/{compiler,formatter,runtime0,runtime1,src} src/gen/
''
else ''
${bqn-path} genRuntime ${mlochbaum-bqn}
'';
makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
"single-o3"
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin/
cp BQN -t $out/bin/
ln -s $out/bin/BQN $out/bin/bqn
ln -s $out/bin/BQN $out/bin/cbqn
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/dzaima/CBQN/";
description = "BQN implementation in C";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.all;
};
}
# TODO: factor BQN
# TODO: test suite (dependent on BQN from mlochbaum)

31
pkgs/development/misc/resholve/test.nix
View File

@ -3,6 +3,8 @@
, callPackage
, resholve
, resholvePackage
, resholveScript
, resholveScriptBin
, shunit2
, coreutils
, gnused
@ -22,35 +24,6 @@
}:
let
inherit (callPackage ./default.nix { })
resholve resholvePackage resholveScript resholveScriptBin;
# ourCoreutils = coreutils.override { singleBinary = false; };
/*
TODO: wrapped copy of find so that we can eventually test
our ability to see through wrappers. Unused for now.
Note: grep can serve the negative case; grep doesn't match, and
egrep is a shell wrapper for grep.
*/
# wrapfind = runCommand "wrapped-find" { } ''
# source ${makeWrapper}/nix-support/setup-hook
# makeWrapper ${findutils}/bin/find $out/bin/wrapped-find
# '';
/* TODO:
unrelated, but is there already a function (or would
there be demand for one?) along the lines of:
wrap = { drv, executable(s?), args ? { } }: that:
- generates a sane output name
- sources makewrapper
- retargets real executable if already wrapped
- wraps the executable
I wonder because my first thought here was overrideAttrs,
but I realized rebuilding just for a custom wrapper is an
ongoing waste of time. If it is a common pattern in the
wild, it would be a nice QoL improvement.
*/
in
rec {

4
pkgs/development/python-modules/apispec/default.nix
View File

@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "apispec";
version = "5.1.0";
version = "5.1.1";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "9ac7a7a6000339a02d05404ef561e013375f170de01d8b238782f8fb83082b5b";
sha256 = "d167890e37f14f3f26b588ff2598af35faa5c27612264ea1125509c8ff860834";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/doc8/default.nix
View File

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "doc8";
version = "0.9.0";
version = "0.9.1";
src = fetchPypi {
inherit pname version;
sha256 = "380b660474be40ce88b5f04fa93470449124dbc850a0318f2ef186162bc1360b";
sha256 = "0e967db31ea10699667dd07790f98cf9d612ee6864df162c64e4954a8e30f90d";
};
buildInputs = [ pbr ];

4
pkgs/development/python-modules/gdown/default.nix
View File

@ -10,11 +10,11 @@
buildPythonApplication rec {
pname = "gdown";
version = "3.13.1";
version = "3.14.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-vh1NKRPk1e5cT3cVj8IrzmpaZ9yY2KtWrTGsCU9KkP4=";
sha256 = "sha256-pxmdfmt3YQnyUWEYadDde6IC5Nm5faNugvn8omLMXSE=";
};
propagatedBuildInputs = [ filelock requests tqdm setuptools six ];

4
pkgs/development/python-modules/maxminddb/default.nix
View File

@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
version = "2.1.0";
version = "2.2.0";
pname = "maxminddb";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "c47b8acba98d03b8c762684d899623c257976f3eb0c9d557ff865d20cddc9d6b";
sha256 = "e37707ec4fab115804670e0fb7aedb4b57075a8b6f80052bdc648d3c005184e5";
};
buildInputs = [ libmaxminddb ];

4
pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix
View File

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "sphinxcontrib-plantuml";
version = "0.21";
version = "0.22";
src = fetchPypi {
inherit pname version;
sha256 = "53e1808dc2b1f3ec20c177fa3fa6d438d75ef572a25a489e330bb01130508d87";
sha256 = "a42c7a13ab1ae9ed18e8e8b0f76b8d35dc476fdebe6e634354fe6fd0f261f686";
};
# No tests included.

4
pkgs/development/tools/sslmate/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "sslmate";
version = "1.8.0";
version = "1.9.0";
src = fetchurl {
url = "https://packages.sslmate.com/other/${pname}-${version}.tar.gz";
sha256 = "sha256-A1TkGi6b1psWflN0ogM1r/pYSVXcOi6aQEb6xtOsAsk=";
sha256 = "sha256-PkASJIRJH1kXjegOFMz36QzqT+qUBWslx/iavjFoW5g=";
};
makeFlags = [ "PREFIX=$(out)" ];

19
pkgs/misc/emulators/emu2/default.nix
View File

@ -1,14 +1,17 @@
{ lib, stdenv, fetchFromGitHub }:
{ lib
, stdenv
, fetchFromGitHub
}:
stdenv.mkDerivation rec {
pname = "emu2";
version = "unstable-2020-06-04";
version = "0.0.0+unstable=2021-09-22";
src = fetchFromGitHub {
owner = "dmsc";
repo = "emu2";
rev = "f9599d347aab07d9281400ec8b214aabd187fbcd";
sha256 = "0d8fb3wp477kfi0p4mmr69lxsbgb4gl9pqmm68g9ixzrfch837v4";
owner = "dmsc";
repo = "emu2";
rev = "8d01b53f154d6bfc9561a44b9c281b46e00a4e87";
hash = "sha256-Jafl0Pw2k5RCF9GgpdAWcQ+HBTsiX7dOKSMCWPHQ+2E=";
};
makeFlags = [ "PREFIX=$(out)" ];
@ -17,7 +20,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/dmsc/emu2/";
description = "A simple text-mode x86 + DOS emulator";
platforms = platforms.linux;
maintainers = with maintainers; [ dramaturg ];
license = licenses.gpl2;
maintainers = with maintainers; [ AndersonTorres ];
license = licenses.gpl2Plus;
};
}

6
pkgs/servers/dns/coredns/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "coredns";
version = "1.8.4";
version = "1.8.5";
src = fetchFromGitHub {
owner = "coredns";
repo = "coredns";
rev = "v${version}";
sha256 = "sha256-mPZvREBwSyy7dhVl2mJt58T09a0CYaMfJn7GEvfuupI=";
sha256 = "sha256-Tegpc6SspDoVPVD6fXNciVEp4/X1z3HMRWxfjc463PM=";
};
vendorSha256 = "sha256-DTw7SVZGl7QdlSpqWx11bjeNUwfb4VlwsGxqPVz6vhI=";
vendorSha256 = "sha256-fWK8sGd3yycgFz4ipAmYJ3ye4OtbjpSzuK4fwIjfor8=";
doCheck = false;

4
pkgs/servers/gpsd/default.nix
View File

@ -32,11 +32,11 @@
stdenv.mkDerivation rec {
pname = "gpsd";
version = "3.23";
version = "3.23.1";
src = fetchurl {
url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-UiwjYqfrLXrDfqoVBPEq3tHDc0eah7oGzGeVl0tWe7w=";
sha256 = "sha256-C5kc6aRlOMTqRQ96juQo/0T7T41mX93y/+QP4K6abAk=";
};
# TODO: render & install HTML documentation using asciidoctor

4
pkgs/servers/sql/postgresql/default.nix
View File

@ -244,9 +244,9 @@ in self: {
};
postgresql_14 = self.callPackage generic {
version = "14beta3";
version = "14.0";
psqlSchema = "14";
sha256 = "1yjbc8q4hk9pvlfr3lwhk2zp4bavxqpil83ncl871nwk06c6b8if";
sha256 = "08m14zcrcvc2i0xl10p0wgzycsmfmk27gny40a8mwdx74s8xfapf";
this = self.postgresql_14;
thisAttr = "postgresql_14";
inherit self;

4
pkgs/servers/sql/postgresql/ext/pg_cron.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "pg_cron";
version = "1.3.1";
version = "1.4.1";
buildInputs = [ postgresql ];
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "citusdata";
repo = pname;
rev = "v${version}";
sha256 = "0vhqm9xi84v21ijlbi3fznj799j81mmc9kaawhwn0djhxcs2symd";
sha256 = "1fknr7z1m24dpp4hm5s6y5phdns7yvvj88cl481wjhw8bigz6kns";
};
installPhase = ''

6
pkgs/servers/traefik/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "traefik";
version = "2.5.2";
version = "2.5.3";
src = fetchzip {
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
sha256 = "1q93l7jb0vs1d324453gk307hlhav2g0xjqkcz3f43rxhb0jbwpk";
sha256 = "sha256-Bq7wuc127aC/GO5wsgNkwvZsRbxFnZk2fzTWTygl6Sw=";
stripRoot = false;
};
vendorSha256 = "054l0b6xlbl9sh2bisnydm9dha30jrafybb06ggzbjffsqcgj7qw";
vendorSha256 = "sha256-NyIPT2NmJFB1wjNNteAEpTPYSYQZtEWJBOvG0YtxUGc=";
doCheck = false;

4
pkgs/tools/networking/s3cmd/default.nix
View File

@ -2,13 +2,13 @@
buildPythonApplication rec {
pname = "s3cmd";
version = "2.1.0";
version = "2.2.0";
src = fetchFromGitHub {
owner = "s3tools";
repo = "s3cmd";
rev = "v${version}";
sha256 = "0p6mbgai7f0c12pkw4s7d649gj1f8hywj60pscxvj9jsna3iifhs";
sha256 = "0w4abif05mp52qybh4hjg6jbbj2caljq5xdhfiha3g0s5zsq46ri";
};
propagatedBuildInputs = [ python_magic python-dateutil ];

19
pkgs/tools/security/scorecard/default.nix
View File

@ -2,23 +2,28 @@
buildGoModule rec {
pname = "scorecard";
version = "2.1.3";
version = "2.2.8";
src = fetchFromGitHub {
owner = "ossf";
repo = pname;
rev = "v${version}";
sha256 = "sha256-lTaFSQ3yyzQGdiKwev38iEpV+ELKg9f1rMYdbqVuiSs=";
sha256 = "sha256-U29NCZFXOhu0xLfDlJ1Q7m8TbAm+C6+ecYFhcI5gg6s=";
};
vendorSha256 = "sha256-eFu954gwoL5z99cJGhSnvliAzwxv3JJxfjmBF+cx7Dg=";
subPackages = [ "." ];
ldflags = [ "-s" "-w" "-X github.com/ossf/scorecard/v2/cmd.gitVersion=v${version}" ];
vendorSha256 = "sha256-hOATCXjBE0doHnY2BaRKZocQ6SIigL0q4m9eEJGKh6Q=";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
subPackages = [ "." ];
ldflags = [
"-s"
"-w"
"-X github.com/ossf/scorecard/v2/pkg.gitVersion=v${version}"
"-X github.com/ossf/scorecard/v2/pkg.gitTreeState=clean"
];
preCheck = ''
# Feed in all but the e2e tests for testing
# This is because subPackages above limits what is built to just what we

15
pkgs/top-level/all-packages.nix
View File

@ -8770,7 +8770,7 @@ with pkgs;
rescuetime = libsForQt5.callPackage ../applications/misc/rescuetime { };
inherit (callPackage ../development/misc/resholve { })
resholve resholvePackage;
resholve resholvePackage resholveScript resholveScriptBin;
restool = callPackage ../os-specific/linux/restool {};
@ -12828,6 +12828,19 @@ with pkgs;
babashka = callPackage ../development/interpreters/clojure/babashka.nix { };
# BQN interpreters and compilers
cbqn = cbqn-phase2;
# And the classic bootstrapping process
cbqn-phase0 = callPackage ../development/interpreters/bqn/cbqn {
bqn-path = null;
};
cbqn-phase1 = callPackage ../development/interpreters/bqn/cbqn {
bqn-path = "${cbqn-phase0}/bin/bqn";
};
cbqn-phase2 = callPackage ../development/interpreters/bqn/cbqn {
bqn-path = "${cbqn-phase1}/bin/bqn";
};
chibi = callPackage ../development/interpreters/chibi { };
ceptre = callPackage ../development/interpreters/ceptre { };