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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-06-25 06:01:17 +00:00 committed by GitHub
commit ae24e28a98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
38 changed files with 171 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nixos/tests/traefik.nix
View File

@ -11,14 +11,20 @@ import ./make-test-python.nix ({ pkgs, ... }: {
environment.systemPackages = [ pkgs.curl ];
};
traefik = { config, pkgs, ... }: {
virtualisation.oci-containers.containers.nginx = {
extraOptions = [
"-l" "traefik.enable=true"
"-l" "traefik.http.routers.nginx.entrypoints=web"
"-l" "traefik.http.routers.nginx.rule=Host(`nginx.traefik.test`)"
];
image = "nginx-container";
imageFile = pkgs.dockerTools.examples.nginx;
virtualisation.oci-containers = {
backend = "docker";
containers.nginx = {
extraOptions = [
"-l"
"traefik.enable=true"
"-l"
"traefik.http.routers.nginx.entrypoints=web"
"-l"
"traefik.http.routers.nginx.rule=Host(`nginx.traefik.test`)"
];
image = "nginx-container";
imageFile = pkgs.dockerTools.examples.nginx;
};
};
networking.firewall.allowedTCPPorts = [ 80 ];

8
pkgs/applications/graphics/solvespace/default.nix
View File

@ -7,6 +7,7 @@
, at-spi2-core
, cairo
, dbus
, eigen
, freetype
, fontconfig
, glew
@ -18,6 +19,7 @@
, libpng
, libselinux
, libsepol
, libspnav
, libthai
, libxkbcommon
, pangomm
@ -29,13 +31,13 @@
stdenv.mkDerivation rec {
pname = "solvespace";
version = "3.0";
version = "3.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-aaYqUZ0c1lCL91fmxtKFAAE2uUWrjnDB3WdcqdutXhE=";
hash = "sha256-sSDht8pBrOG1YpsWfC/CLTTWh2cI5pn2PXGH900Z0yA=";
fetchSubmodules = true;
};
@ -49,6 +51,7 @@ stdenv.mkDerivation rec {
at-spi2-core
cairo
dbus
eigen
freetype
fontconfig
glew
@ -60,6 +63,7 @@ stdenv.mkDerivation rec {
libpng
libselinux
libsepol
libspnav
libthai
libxkbcommon
pangomm

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

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "binance";
version = "1.35.0";
version = "1.36.0";
src = fetchurl {
url = "https://github.com/binance/desktop/releases/download/v${version}/${pname}-${version}-amd64-linux.deb";
sha256 = "sha256-6c7nrdViunnvPqqbt5/LQp2iS4EgZOCQ9PLcG+bY1YQ=";
sha256 = "sha256-Q1cvEQ/yxytzrPfiyeTZSCPecnmSdhy+ds/gtie4vwo=";
};
nativeBuildInputs = [

6
pkgs/applications/networking/blocky/default.nix
View File

@ -6,20 +6,20 @@
buildGoModule rec {
pname = "blocky";
version = "0.18";
version = "0.19";
src = fetchFromGitHub {
owner = "0xERR0R";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rFHDoNrEmMSNEc3RLdSeRk9mF05drUYfJFQKHAk5alE=";
sha256 = "sha256-jOOakRuiNbdCGmbaQFuHcLsHhV26jaQY+1GgDj9ocs0=";
};
# needs network connection and fails at
# https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go
doCheck = false;
vendorSha256 = "sha256-rrqDjh5e3KX5+saYjnMPG0bhr5YEOPfz0QCRf6omNZI=";
vendorSha256 = "sha256-fsMBL9qyhIrV6eAsqpSaNniibMdYRVBnl2KCzStvMGQ=";
meta = with lib; {
description = "Fast and lightweight DNS proxy as ad-blocker for local network with many features.";

8
pkgs/applications/networking/cluster/fluxcd/default.nix
View File

@ -1,9 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
let
version = "0.31.1";
sha256 = "1dhs96r9yi37i5q9wqg7198f6kl59jlj3g1q76r0snqyl16g2jwf";
manifestsSha256 = "0wwlwai1hhz69kgaccw3w8ad6bwdd46pm4ns8nqm04927b0b2dqb";
version = "0.31.2";
sha256 = "1w373gwxxvnqsfm5r63r1bcmlrii5wy6yhbs5li0bw2anhnb0iir";
manifestsSha256 = "0lqfrry1kg52ikyhzgwg57zqzq24aspp2d7whyzir3dglvf999lb";
manifests = fetchzip {
url =
@ -23,7 +23,7 @@ in buildGoModule rec {
inherit sha256;
};
vendorSha256 = "sha256-sPyz6ISFLe+6CJoAcG17KSfo63vuTj30IWw+S2NCszY=";
vendorSha256 = "sha256-Z7O/ReEZwmK5KKAHzi4B3d31ynA51XzbTKsrzCXAFPo=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests

17
pkgs/applications/networking/cluster/temporal-cli/default.nix
View File

@ -1,26 +1,17 @@
{ lib, fetchFromGitHub, fetchpatch, buildGoModule, testers, temporal-cli }:
{ lib, fetchFromGitHub, buildGoModule, testers, temporal-cli }:
buildGoModule rec {
pname = "temporal-cli";
version = "1.16.1";
version = "1.16.2";
src = fetchFromGitHub {
owner = "temporalio";
repo = "tctl";
rev = "v${version}";
sha256 = "sha256-WNdu/62/VmxTmzAvzx3zIlcAAlEmpN0yKzQOSUtrL8s=";
sha256 = "sha256-KLcCFQJlFeioIhqrbkhgoNPcbAYvy1ESG8x9Y/I7+nw=";
};
patches = [
# Fix tests
(fetchpatch {
name = "fix-tests.patch";
url = "https://github.com/temporalio/tctl/pull/203/commits/2b113da137a3a925e8fbd7c18bdaaefc31397db4.patch";
sha256 = "sha256-HFPwbmLZ2uPHzaHvYoB4MTZvMVyzvUKggA76/bh50DQ=";
})
];
vendorSha256 = "sha256-WF3T+HNisfR0JoKkHCC77kmHmsGZ9NfQ7UCwOmpCG/o=";
vendorSha256 = "sha256-kczmoP32/V0HHeC3Mr+giuMB+McVTNeC2F+t1ohY4/U=";
ldflags = [ "-s" "-w" ];

8
pkgs/applications/networking/cluster/velero/default.nix
View File

@ -2,23 +2,25 @@
buildGoModule rec {
pname = "velero";
version = "1.8.1";
version = "1.9.0";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "velero";
rev = "v${version}";
sha256 = "sha256-oiYr9JQlJVxjZxGhZyOIUy934KedBmDhzK+71qmaD58=";
sha256 = "sha256-zoHMyOhHEunJ8LirUxOT1qNY3jB28BEiQ+3GdqriTtQ=";
};
ldflags = [
"-s" "-w"
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version}"
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.ImageRegistry=velero"
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean"
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none"
];
vendorSha256 = "sha256-DyQ+MHRNZFg80Yz/SCxhnF4NVbIsyhz4mApx0+kgHoA=";
vendorSha256 = "sha256-PDXufnddHEA0qCfzJ0O+h3u50gWNkQAnWMZjSVQ0oHc=";
excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ];

4
pkgs/applications/networking/flexget/default.nix
View File

@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.3.17";
version = "3.3.18";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "refs/tags/v${version}";
hash = "sha256-xVHk6fQBY8EQsZJDZYoQ+WXDpLGJrRTVR6xhF1DWv0I=";
hash = "sha256-vZOeWxCcrTRT28Bn2r/I7/ojQ6uUV3xZlAZLbrAH5tc=";
};
postPatch = ''

4
pkgs/applications/networking/sniffers/sngrep/default.nix
View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "sngrep";
version = "1.4.10";
version = "1.5.0";
src = fetchFromGitHub {
owner = "irontec";
repo = pname;
rev = "v${version}";
sha256 = "sha256-P618QLk85W0oPisAGiRfpCgHCddKutUkGjwdfgsV4Es=";
sha256 = "sha256-GxC9+O72GHE8Tc6FReO7EdpZTSaqn9mBpZCYaKybJls=";
};
nativeBuildInputs = [

8
pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix
View File

@ -10,15 +10,17 @@
rustPlatform.buildRustPackage rec {
pname = "git-quickfix";
version = "0.0.5";
version = "0.1.0";
src = fetchFromGitHub {
owner = "siedentop";
repo = pname;
rev = "v${version}";
sha256 = "sha256-LDA94pH5Oodf80mEENoURh+MJSg122SVWFVo9i1TEQg=";
sha256 = "sha256-IAjet/bDG/Hf/whS+yrEQSquj8s5DEmFis+5ysLLuxs=";
};
doCheck = false;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
Security
@ -26,7 +28,7 @@ rustPlatform.buildRustPackage rec {
libiconv
];
cargoSha256 = "sha256-QTPy0w45AawEU4fHf2FMGpL3YM+iTNnyiI4+mDJzWaE=";
cargoSha256 = "sha256-eTAEf2nRrJ7i2Dw5BBZlLLu8mK2G/wUk40ivtfxk1pI=";
meta = with lib; {
description = "Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch";

4
pkgs/development/libraries/science/math/m4rie/default.nix
View File

@ -5,14 +5,14 @@
}:
stdenv.mkDerivation rec {
version = "20200115";
version = "20200125";
pname = "m4rie";
src = fetchFromBitbucket {
owner = "malb";
repo = "m4rie";
rev = "release-${version}";
sha256 = "0s8if80x5d6mikbcfsbbxg347136spahp9f3x8i1hflbwl8xj9k8";
sha256 = "sha256-bjAcxfXsC6+jPYC472CN78jm4UljJQlkWyvsqckCDh0=";
};
doCheck = true;

1
pkgs/development/libraries/v8/8_x.nix
View File

@ -148,6 +148,7 @@ stdenv.mkDerivation rec {
install -D d8 $out/bin/d8
install -D -m644 obj/libv8_monolith.a $out/lib/libv8.a
install -D -m644 icudtl.dat $out/share/v8/icudtl.dat
ln -s libv8.a $out/lib/libv8_monolith.a
cp -r ../../include $out
mkdir -p $out/lib/pkgconfig

1
pkgs/development/libraries/v8/default.nix
View File

@ -148,6 +148,7 @@ stdenv.mkDerivation rec {
install -D d8 $out/bin/d8
install -D -m644 obj/libv8_monolith.a $out/lib/libv8.a
install -D -m644 icudtl.dat $out/share/v8/icudtl.dat
ln -s libv8.a $out/lib/libv8_monolith.a
cp -r ../../include $out
mkdir -p $out/lib/pkgconfig

6
pkgs/development/python-modules/audible/default.nix
View File

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "audible";
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "mkb79";
repo = "Audible";
rev = "v${version}";
sha256 = "0fsb5av4s7fvpn0iryl8jj3lwffwlxgbwj46l3fidy0l58nq3b1d";
rev = "refs/tags/v${version}";
sha256 = "sha256-SIEDBuMCC/Hap2mGVbKEFic96ClN369SEsV06Sg+poY=";
};
propagatedBuildInputs = [ beautifulsoup4 httpx pbkdf2 pillow pyaes rsa ];

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "miniaudio";
version = "1.50";
version = "1.51";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "irmen";
repo = "pyminiaudio";
rev = "refs/tags/v${version}";
sha256 = "sha256-GqpOuL+q5v9sKCpbNpPH4uC7k2HBs0RkTWaIC5A2eHI=";
sha256 = "sha256-nWx/1+b28/pvyTe8jSAOmw+vfzjuD7FFmVVUzH8DAyw=";
};
buildInputs = lib.optionals stdenv.isDarwin [

6
pkgs/development/python-modules/pygmt/default.nix
View File

@ -17,15 +17,15 @@
buildPythonPackage rec {
pname = "pygmt";
version = "0.6.0";
version = "0.6.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "GenericMappingTools";
repo = "pygmt";
rev = "v${version}";
sha256 = "sha256-QzqQKnANReSHIsDbiKSZ1ZgMgbj3NAfq4bmRQktnRjQ=";
rev = "refs/tags/v${version}";
sha256 = "sha256-/hZUDvMhF/ojTXBcap5lL6X2bYu+opf+TwYNjANgtiw=";
};
postPatch = ''

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

@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "timetagger";
version = "22.6.2";
version = "22.6.4";
src = fetchFromGitHub {
owner = "almarklein";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-8Rl7g0OwjabBI9ekh3+vb+20KsqttvwwzZU0U1ee8dQ=";
sha256 = "sha256-wLbC7NlDNgAyCnGjawfrnRPN/4DOcHVd93pIWrILs68=";
};
propagatedBuildInputs = [

4
pkgs/development/tools/analysis/tflint/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tflint";
version = "0.37.0";
version = "0.38.1";
src = fetchFromGitHub {
owner = "terraform-linters";
repo = pname;
rev = "v${version}";
sha256 = "sha256-2fcrKwbYuCOZE++Sin0zNuGaBQQd0dNs1MRL/doOLOw=";
sha256 = "sha256-sBvfcAOkfZ5V7SrLBWrSQr5zXwqbwOBmYehujk0y6eg=";
};
vendorSha256 = "sha256-2v070TwDWkN4HZ/EOu85lotA9qIKLgpwD9TrfH7pGY4=";

6
pkgs/development/tools/bazelisk/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "bazelisk";
version = "1.11.0";
version = "1.12.0";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
sha256 = "sha256-9J49+1fI3wmHQqYgdoGgaAuVMA9eG7wrFe7dQEectvI=";
sha256 = "sha256-RWVD6tngFE3i8JDB9b0JZz8Bd+u97b4ilmEF0N8Pm4Y=";
};
vendorSha256 = "sha256-+zJEB9FyVvxHdwR/dAn56jrMbgVBhlbziVFe2WCQFfE=";
vendorSha256 = "sha256-6rJa/c5uCnBQh0VVlzefXXPuJNFi+R8X2r+o7GBLIiE=";
doCheck = false;

6
pkgs/development/tools/beancount-language-server/default.nix
View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "beancount-language-server";
version = "1.1.1";
version = "1.2.5";
src = fetchFromGitHub {
owner = "polarmutex";
repo = "beancount-language-server";
rev = "v${version}";
sha256 = "sha256-CkwNxamkErRo3svJNth2F8NSqlJNX+1S/srKu6Z+mX4=";
sha256 = "sha256-AbljduMz4mz5InsHKCq0K6i9F/lBgvdy0+W8aclr0R0=";
};
cargoSha256 = "sha256-NTUs9ADTn+KoE08FikRHrdptZkrUqnjVIlcr8RtDvic=";
cargoSha256 = "sha256-jrxVMGJk4o9aROtFZBc8G/HP5xm9MjVyewww1DzrRdM=";
doInstallCheck = true;
postInstallCheck = ''

6
pkgs/development/tools/buf/default.nix
View File

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "buf";
version = "1.5.0";
version = "1.6.0";
src = fetchFromGitHub {
owner = "bufbuild";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Jcj1tpcG64mSVn444isGsK9AcITh171ibECukv3bXDI=";
sha256 = "sha256-sqByTrhtaytBMD8ULOP+xoacxMD6sw3n2XYVZ1hWIJ4=";
};
vendorSha256 = "sha256-aHGV8UfPn7xsySPXRSzsEpcaz1Ll49Mj1S9izvaIRWY=";
vendorSha256 = "sha256-H000xhqjSFXGW3Saa/ryYdVcDl2ieeSW3dq3DPVX+c0=";
patches = [
# Skip a test that requires networking to be available to work.

15
pkgs/development/tools/build-managers/bazel/bazel_4/default.nix
View File

@ -257,7 +257,7 @@ stdenv.mkDerivation rec {
runLocal = name: attrs: script:
let
attrs' = removeAttrs attrs [ "buildInputs" ];
buildInputs = [ python3 which ] ++ (attrs.buildInputs or []);
buildInputs = attrs.buildInputs or [];
in
runCommandCC name ({
inherit buildInputs;
@ -323,13 +323,13 @@ stdenv.mkDerivation rec {
in (if !stdenv.hostPlatform.isDarwin then {
# `extracted` doesn’t work on darwin
shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; };
shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; bazel = bazel_self; };
} else {}) // {
bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; };
cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; };
java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; };
protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; };
pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; };
bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self; };
cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self; };
java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self; };
protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self; };
pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self; };
bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
@ -591,6 +591,7 @@ stdenv.mkDerivation rec {
# The binary _must_ exist with this naming if your project contains a .bazelversion
# file.
cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel
wrapProgram $out/bin/bazel $wrapperfile --suffix PATH : ${defaultShellPath}
mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch}
mkdir $out/share

16
pkgs/development/tools/build-managers/bazel/bazel_5/default.nix
View File

@ -219,7 +219,7 @@ stdenv.mkDerivation rec {
runLocal = name: attrs: script:
let
attrs' = removeAttrs attrs [ "buildInputs" ];
buildInputs = [ python3 which ] ++ (attrs.buildInputs or []);
buildInputs = attrs.buildInputs or [];
in
runCommandCC name ({
inherit buildInputs;
@ -285,13 +285,13 @@ stdenv.mkDerivation rec {
in (if !stdenv.hostPlatform.isDarwin then {
# `extracted` doesn’t work on darwin
shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; };
shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; bazel = bazel_self;};
} else {}) // {
bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; };
cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; };
java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; };
protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; };
pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; };
bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self;};
cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self;};
java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self;};
protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self; };
pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self;};
bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
@ -586,6 +586,7 @@ stdenv.mkDerivation rec {
# The binary _must_ exist with this naming if your project contains a .bazelversion
# file.
cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel
wrapProgram $out/bin/bazel $wrapperfile --suffix PATH : ${defaultShellPath}
mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch}
mkdir $out/share
@ -662,4 +663,3 @@ stdenv.mkDerivation rec {
dontStrip = true;
dontPatchELF = true;
}

22
pkgs/development/tools/lc3tools/0004-configure-use-cc.patch Normal file
View File

@ -0,0 +1,22 @@
diff --git a/configure b/configure
index dfc1b3e..55577af 100755
--- a/configure
+++ b/configure
@@ -18,7 +18,7 @@ esac
# Some binaries that we'll need, and the places that we might find them.
IFS=:
-binlist="uname:flex:gcc:wish:rm:cp:mkdir:chmod:sed"
+binlist="uname:flex:cc:wish:rm:cp:mkdir:chmod:sed"
pathlist=$PATH
libpathlist=$LIBS
incpathlist=$INCLUDES
@@ -109,7 +109,7 @@ fi
# Splice it all in to Makefile.def to create the Makefile.
rm -f Makefile
-sed -e "s __GCC__ $gcc g" -e "s __FLEX__ $flex g" -e "s __EXE__ $EXE g" \
+sed -e "s __GCC__ $cc g" -e "s __FLEX__ $flex g" -e "s __EXE__ $EXE g" \
-e "s*__OS_SIM_LIBS__*$OS_SIM_LIBS*g" -e "s __RM__ $rm g" \
-e "s __CP__ $cp g" -e "s __MKDIR__ $mkdir g" -e "s __CHMOD__ $chmod g" \
-e "s __USE_READLINE__ $USE_READLINE g" -e "s*__RLLPATH__*$RLLPATH*g" \

10
pkgs/development/tools/lc3tools/default.nix
View File

@ -19,6 +19,9 @@ stdenv.mkDerivation {
# lc3sim-tk looks for lc3sim in $out/bin instead of $out
./0003-lc3sim-tk-path.patch
# use `cc` instead of `gcc`; on macOS the latter is not present
./0004-configure-use-cc.patch
];
nativeBuildInputs = [ unzip ];
@ -40,8 +43,15 @@ stdenv.mkDerivation {
'';
meta = with lib; {
longDescription = ''
The LC-3 tools package contains the lc3as assembler, the lc3sim simulator,
and lc3sim-tk, a Tcl/Tk-based GUI frontend to the simulator.
'';
description = "Toolchain and emulator for the LC-3 architecture";
homepage = "https://highered.mheducation.com/sites/0072467509/student_view0/lc-3_simulator.html";
license = licenses.gpl2;
maintainers = with maintainers; [ anna328p ];
mainProgram = "lc3sim-tk";
platforms = with lib.platforms; unix ++ windows;
};
}

4
pkgs/development/tools/misc/checkbashisms/default.nix
View File

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, perl, installShellFiles }:
stdenv.mkDerivation rec {
version = "2.21.1";
version = "2.22.1";
pname = "checkbashisms";
src = fetchurl {
url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz";
hash = "sha256-1ZbIiUrFd38uMVLy7YayLLm5RrmcovsA++JTb8PbTFI=";
hash = "sha256-Nd1eYCnSe+NblujG44uKpvunkaITcdrC3g+M3uX+M9U=";
};
nativeBuildInputs = [ installShellFiles ];

6
pkgs/development/tools/okteto/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "okteto";
version = "2.3.3";
version = "2.4.0";
src = fetchFromGitHub {
owner = "okteto";
repo = "okteto";
rev = version;
sha256 = "sha256-rKhXzmBV59bj/Dj2ORU1ggOohAs56iB15es924pHXp4=";
sha256 = "sha256-+shhY7/chtq4xPwYSlcVgL/RGMNA0ahTCqT9pVQqpG4=";
};
vendorSha256 = "sha256-XT/ZLydN1oeuRupD3gjvY6+hOB/Lq5CQwhfr9/iT7JI=";
vendorSha256 = "sha256-W1/QBMnMdZWokWSFmHhPqmOu827bpGXS8+GFp5Iu9Ig=";
postPatch = ''
# Disable some tests that need file system & network access.

8
pkgs/servers/monitoring/grafana/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
version = "9.0.0";
version = "9.0.1";
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ];
@ -10,15 +10,15 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "sha256-vPPaOepx4uwOWOjeE+dWULxmJPk5To9UY3rnoEqeAJA=";
sha256 = "sha256-+03bfSpUT5sb0oFf9BomglcVb5bRqAwZ1MKCPmRtAss=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "0xl5z31mkgbwkwcpvr0v0hmc0ynvxjn39w4sb1vc572kjbwqpvkr";
sha256 = "1kw9l3gip4lqfrc0asgsd1lf5sxa7zj67isyvhb14qdsf9rs3b2d";
};
vendorSha256 = "sha256-E3uSwdgoPgQPQ/uCIuTxcYeNRYbQR7q7SrUrh/ypENk=";
vendorSha256 = "sha256-eB0SswtqAb0xoLcq021KaH4CdgLbWmhODyifQDVl5XI=";
nativeBuildInputs = [ wire ];

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

@ -1,33 +1,34 @@
{ lib, fetchzip, buildGoModule, go-bindata, nixosTests }:
{ lib, fetchFromGitHub, buildGoModule, nixosTests }:
buildGoModule rec {
pname = "traefik";
version = "2.6.3";
version = "2.7.1";
src = fetchzip {
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
sha256 = "sha256-OaKgX3qwiJM/EPprV1r3CbUnxOaWl7BTMcS5v+tmHoo=";
stripRoot = false;
src = fetchFromGitHub {
owner = "traefik";
repo = "traefik";
rev = "v${version}";
sha256 = "sha256-uTE0Z7lgxKNq1wQSMUSp9dMfxV+aIm7cwYSkZBUdnug=";
};
vendorSha256 = "sha256-tqrfCpZ/fRYZBZ/SBAvvJebLBeD2M/AVJEPiseehJHY=";
vendorSha256 = "sha256-WlLntYrXs1kOu26yNeZI1xpb6FsHPiA/bNzaxCZTG4Y=";
subPackages = [ "cmd/traefik" ];
nativeBuildInputs = [ go-bindata ];
passthru.tests = { inherit (nixosTests) traefik; };
preBuild = ''
go generate
CODENAME=$(awk -F "=" '/CODENAME=/ { print $2}' script/binary)
buildFlagsArray+=("-ldflags=\
-X github.com/traefik/traefik/v2/pkg/version.Version=${version} \
-X github.com/traefik/traefik/v2/pkg/version.Codename=$CODENAME")
buildFlagsArray+=("-ldflags= -s -w \
-X github.com/traefik/traefik/v${lib.versions.major version}/pkg/version.Version=${version} \
-X github.com/traefik/traefik/v${lib.versions.major version}/pkg/version.Codename=$CODENAME")
'';
doCheck = false;
passthru.tests = { inherit (nixosTests) traefik; };
meta = with lib; {
homepage = "https://traefik.io";
description = "A modern reverse proxy";

7
pkgs/tools/admin/lxd/default.nix
View File

@ -1,4 +1,4 @@
{ lib, hwdata, pkg-config, lxc, buildGo118Package, fetchurl, fetchpatch
{ lib, hwdata, pkg-config, lxc, buildGo118Package, fetchurl
, makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq, attr
, squashfsTools, iproute2, iptables, libcap
, dqlite, raft-canonical, sqlite-replication, udev
@ -11,7 +11,7 @@
buildGo118Package rec {
pname = "lxd";
version = "5.2";
version = "5.3";
goPackagePath = "github.com/lxc/lxd";
@ -20,7 +20,7 @@ buildGo118Package rec {
"https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"
"https://github.com/lxc/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz"
];
sha256 = "sha256-4i0rNKGEjTOyCAsrHII1WvttNv3+SeZ/RLN0ntvALkw=";
sha256 = "sha256-DRdKCfp0nL3lg5O/Wm7vX2grO/DBuyhHRi85XI5laZU=";
};
postPatch = ''
@ -60,6 +60,7 @@ buildGo118Package rec {
meta = with lib; {
description = "Daemon based on liblxc offering a REST API to manage containers";
homepage = "https://linuxcontainers.org/lxd/";
changelog = "https://github.com/lxc/lxd/releases/tag/lxd-${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fpletz marsam ];
platforms = platforms.linux;

4
pkgs/tools/admin/trinsic-cli/default.nix
View File

@ -2,11 +2,11 @@
rustPlatform.buildRustPackage rec {
pname = "trinsic-cli";
version = "1.4.0";
version = "1.5.0";
src = fetchurl {
url = "https://github.com/trinsic-id/sdk/releases/download/v${version}/trinsic-cli-vendor-${version}.tar.gz";
sha256 = "sha256-Dxmjbd1Q2JNeET22Fte7bygd+oH3ZfovRTJh5xforuw=";
sha256 = "sha256-Z9orGhxbu/ehyaYhY35lYWcZQWNVk+zLSoqwAZwnpLY=";
};
cargoVendorDir = "vendor";

4
pkgs/tools/filesystems/bindfs/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, fuse, pkg-config }:
stdenv.mkDerivation rec {
version = "1.15.1";
version = "1.16.0";
pname = "bindfs";
src = fetchurl {
url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz";
sha256 = "sha256-BN01hKbN+a9DRNQDxiGFyp+rMc465aJdAQG8EJNsaKs=";
sha256 = "sha256-AuvvqqZOGwRPxcdDxYKarSHtb3FF9NsHI7zEXwhXgfY=";
};
nativeBuildInputs = [ pkg-config ];

16
pkgs/tools/filesystems/gcsfuse/default.nix
View File

@ -1,32 +1,32 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
pname = "gcsfuse";
version = "0.41.1";
version = "0.41.4";
src = fetchFromGitHub {
owner = "googlecloudplatform";
repo = "gcsfuse";
rev = "v${version}";
sha256 = "sha256-5Kfd033SG1ldF+2QCZ01aa7ts0mA8uPXiLmqZIr94YQ=";
sha256 = "sha256-8QzSvR/uelp9iBLK+DsUXsH6fBOIoeXePeN7Spht6SE=";
};
goPackagePath = "github.com/googlecloudplatform/gcsfuse";
vendorSha256 = null;
subPackages = [ "." "tools/mount_gcsfuse" ];
ldflags = [ "-s" "-w" "-X main.gcsfuseVersion=${version}" ];
postInstall = ''
ln -s $out/bin/mount_gcsfuse $out/bin/mount.gcsfuse
ln -s $out/bin/mount_gcsfuse $out/bin/mount.fuse.gcsfuse
'';
ldflags = [ "-s" "-w" "-X main.gcsfuseVersion=${version}" ];
meta = with lib;{
description = "A user-space file system for interacting with Google Cloud Storage";
homepage = "https://cloud.google.com/storage/docs/gcs-fuse";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = [];
maintainers = with maintainers; [ aaronjheng ];
};
}

4
pkgs/tools/misc/diffoscope/default.nix
View File

@ -11,11 +11,11 @@
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
version = "216";
version = "217";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
sha256 = "sha256-KSmC2mNNzsC2H5xOOQ/3gODsSvFQD95XGtrzbDud0W0=";
sha256 = "sha256-JS6lzxOsE3K4gH3VHsRY5Iucq5PBH3jFD5lSmNZWEG4=";
};
outputs = [ "out" "man" ];

6
pkgs/tools/nix/alejandra/default.nix
View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "alejandra";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "kamadorueda";
repo = "alejandra";
rev = version;
sha256 = "sha256-0AolxQtKj3Oek0WSbODDpPVO5Ih8PXHOA3qXEKPB4dQ=";
sha256 = "sha256-A0ruEdPeKIzGYxyXNACnzaKtQUVc30s2ExTUzdFTcWM=";
};
cargoSha256 = "sha256-USI98hozlTaTj07tMbCQEWDgRkHsd4PFW1HUpKsNZJA=";
cargoSha256 = "sha256-BmpFyVF2fxV3rExI7rpOQlVwHEJNlof44dnUshaO/no=";
passthru.tests = {
version = testers.testVersion { package = alejandra; };

1
pkgs/tools/package-management/appimagekit/default.nix
View File

@ -96,6 +96,7 @@ in stdenv.mkDerivation rec {
"-DUSE_SYSTEM_LIBARCHIVE=ON"
"-DUSE_SYSTEM_GTEST=ON"
"-DUSE_SYSTEM_MKSQUASHFS=ON"
"-DTOOLS_PREFIX=${stdenv.cc.targetPrefix}"
];
postInstall = ''

6
pkgs/tools/security/rekor/default.nix
View File

@ -4,13 +4,13 @@ let
generic = { pname, packageToBuild, description }:
buildGoModule rec {
inherit pname;
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "sigstore";
repo = "rekor";
rev = "v${version}";
sha256 = "sha256-QBS9vGKYe7aox0RhgiJ3wp7UmnxAmtox45xKOC0vhj0=";
sha256 = "sha256-EaOLqStoZJMTSS6g56UhFQRhuwYBjh/XLRX6JjD17+g=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -23,7 +23,7 @@ let
'';
};
vendorSha256 = "sha256-OZyRIi6y47c9eS8GLClgV4JGbSsvjd6KvED3N8LIe6I=";
vendorSha256 = "sha256-bvn5TKfTcB/0p47r5kW1P4OlnbWYQpESo9t8IC9f+fM=";
nativeBuildInputs = [ installShellFiles ];

4
pkgs/tools/system/btop/default.nix
View File

@ -8,8 +8,8 @@
stdenv.mkDerivation rec {
pname = "btop";
version = "1.2.6";
hash = "sha256-q1Dpdw7bVSG10xtoUpelRgMrWe71vCWajjsAHjAZzQ4=";
version = "1.2.7";
hash = "sha256-zQpt/CEWW3oPqPo6SPuawyfLa50y6M4hL07uRO7YjLo=";
src = fetchFromGitHub {
owner = "aristocratos";