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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-02-01 12:01:09 +00:00 committed by GitHub
commit 809093c51c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 173 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
maintainers/maintainer-list.nix
View File

@ -12163,6 +12163,7 @@
};
toastal = {
email = "toastal+nix@posteo.net";
matrix = "@toastal:matrix.org";
github = "toastal";
githubId = 561087;
name = "toastal";

16
nixos/modules/services/networking/i2pd.nix
View File

@ -222,14 +222,12 @@ let
in concatStringsSep "\n" inTunOpts))];
in pkgs.writeText "i2pd-tunnels.conf" opts;
i2pdSh = pkgs.writeScriptBin "i2pd" ''
#!/bin/sh
exec ${cfg.package}/bin/i2pd \
${if cfg.address == null then "" else "--host="+cfg.address} \
--service \
--conf=${i2pdConf} \
--tunconf=${tunnelConf}
'';
i2pdFlags = concatStringsSep " " (
optional (cfg.address != null) ("--host=" + cfg.address) ++ [
"--service"
("--conf=" + i2pdConf)
("--tunconf=" + tunnelConf)
]);
in
@ -686,7 +684,7 @@ in
User = "i2pd";
WorkingDirectory = homeDir;
Restart = "on-abort";
ExecStart = "${i2pdSh}/bin/i2pd";
ExecStart = "${cfg.package}/bin/i2pd ${i2pdFlags}";
};
};
};

2
nixos/modules/services/networking/murmur.nix
View File

@ -294,7 +294,7 @@ in
systemd.services.murmur = {
description = "Murmur Chat Service";
wantedBy = [ "multi-user.target" ];
after = [ "network-online.target "];
after = [ "network-online.target" ];
preStart = ''
${pkgs.envsubst}/bin/envsubst \
-o /run/murmur/murmurd.ini \

2
nixos/modules/services/security/vaultwarden/default.nix
View File

@ -131,7 +131,7 @@ in {
users.groups.vaultwarden = { };
systemd.services.vaultwarden = {
aliases = [ "bitwarden_rs" ];
aliases = [ "bitwarden_rs.service" ];
after = [ "network.target" ];
path = with pkgs; [ openssl ];
serviceConfig = {

2
pkgs/applications/misc/skate/default.nix
View File

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-rUOFx0ebZs3xmsSz9oFvjINaHp9gIe7E/5UoJJ47aZc=";
};
vendorSha256 = "sha256-3+KXirGwZvPhqCeglPqHJ9wEt6naJiRE3TAX7/jxJpk=";
vendorSha256 = "sha256-2jyhDSPO/Xg3xBCA93SMSlm7D+ze0MGbNtRpL82IAsk=";
doCheck = false;

2
pkgs/applications/misc/slides/default.nix
View File

@ -21,7 +21,7 @@ buildGoModule rec {
go
];
vendorSha256 = "06vb5xnss6ibgbsny6cadphfkzw8z3np5qgn3hp2wpf3hxgcnnvs";
vendorSha256 = "11gxr22a24icryvglx9pjmqn5bjy8adfhh1nmjnd21nvy0nh4im7";
ldflags = [
"-s"

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

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "nerdctl";
version = "0.16.0";
version = "0.16.1";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ZnSDL1a4I3e7z2w5MdG6tFZH0PT4jCYX34f+mOmO0oA=";
sha256 = "sha256-s116SwgOj5xzfoz/iw17xubEKzPUx912QHk1+C6YhE8=";
};
vendorSha256 = "sha256-Gk3KBHLux7d7olS16liPYO7yYL2wryWLX5bKgCLEhB8=";
vendorSha256 = "sha256-VvK4pHmV1WkIzQDHiFVzjurigP3F4xYl0DJCnImSx3s=";
nativeBuildInputs = [ makeWrapper installShellFiles ];

2
pkgs/applications/networking/cluster/stern/default.nix
View File

@ -13,7 +13,7 @@ buildGoModule rec {
sha256 = "sha256-JredVk2hjnhoaJ9bT7D5k35skBNjcEBLa6GgO8dB2+U=";
};
vendorSha256 = "sha256-ybsDB54kkbONi3b9URtNUusHIdUfzymOpYlNHJz4i2A=";
vendorSha256 = "sha256-GMAYu/BCmDrCUfc0x9TVw6HXJu+eE8eigZoPqPodM3Q=";
subPackages = [ "." ];

14
pkgs/applications/networking/cluster/tektoncd-cli/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tektoncd-cli";
version = "0.20.0";
version = "0.21.0";
src = fetchFromGitHub {
owner = "tektoncd";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-aVR1xNmL6M/m+1znt70vrCtuABCqDz0sDp8mDFI2uIg=";
sha256 = "sha256-VGdYnynEm0ShG96W0uKiWBbUy/EitX3od5Nnho6T0pg=";
};
vendorSha256 = null;
@ -22,10 +22,14 @@ buildGoModule rec {
excludedPackages = "\\(third_party\\|cmd/docs\\)";
preCheck = ''
# Some tests try to write to the home dir
# some tests try to write to the home dir
export HOME="$TMPDIR"
# Change the golden files to match our desired version
sed -i "s/dev/${version}/" pkg/cmd/version/testdata/{TestGetVersions-,TestGetComponentVersions/}*.golden
# the tests expect the clientVersion ldflag not to be set
unset ldflags
# remove tests with networking
rm pkg/cmd/version/version_test.go
'';
postInstall = ''

2
pkgs/applications/networking/seaweedfs/default.nix
View File

@ -16,7 +16,7 @@ buildGoModule rec {
sha256 = "sha256-MsPvda+VaqO3tXH26nVukNWcJ1n+/n5Qk7BMr/DAVUk=";
};
vendorSha256 = "sha256-TYVBfjwaoEBKJmIHdwvj/5g4jYmnmJPE1mCL/yET1GQ=";
vendorSha256 = "sha256-gK4uHLNcperpG2OVdk7XKCUWCC87cyDBf8qigj/z3jA=";
subPackages = [ "weed" ];

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

@ -16,12 +16,12 @@ with lib;
buildGoPackage rec {
pname = "gitea";
version = "1.15.10";
version = "1.16.0";
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
src = fetchurl {
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
sha256 = "1rrxkpahgzxgs4mckdsrss19mdjdicjgskw689hvhc063slb9vlx";
sha256 = "sha256-gvhfdA5JBFY81f0UmVodJMWBYeFSDaDdoV723MSYeB4=";
};
unpackPhase = ''

2
pkgs/applications/version-management/got/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://gameoftrees.org";
license = licenses.isc;
platforms = platforms.all;
platforms = platforms.linux;
maintainers = with maintainers; [ abbe ];
};
}

4
pkgs/development/php-packages/pdo_sqlsrv/default.nix
View File

@ -3,8 +3,8 @@
buildPecl {
pname = "pdo_sqlsrv";
version = "5.9.0";
sha256 = "0n4cnkldvyp1lrpj18ky2ii2dcaa51dsmh8cspixm7w76dxl3khg";
version = "5.10.0";
sha256 = "sha256-BEa7i/8egvz9mT69dl0dxWcVo+dURT9Dzo6f6EdlESo=";
internalDeps = [ php.extensions.pdo ];

4
pkgs/development/php-packages/sqlsrv/default.nix
View File

@ -3,8 +3,8 @@
buildPecl {
pname = "sqlsrv";
version = "5.9.0";
sha256 = "1css440b4qrbblmcswd5wdr2v1rjxlj2iicbmvjq9fg81028w40a";
version = "5.10.0";
sha256 = "sha256-drPwg6Go8QNYHCG6OkbWyiV76uZyjNFYpkpGq1miJrQ=";
buildInputs = [
unixODBC

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

@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "objax";
version = "1.4.0";
version = "1.6.0";
src = fetchFromGitHub {
owner = "google";
repo = "objax";
rev = "v${version}";
sha256 = "09gm61ghn5mi92q5mhx22mcv6aa6z78jsrnfar1hd3nwwyn9dq42";
sha256 = "sha256-/6tZxVDe/3C53Re14odU9VA3mKvSj9X3/xt6bHFLHwQ=";
};
# Avoid propagating the dependency on `jaxlib`, see

2
pkgs/development/tools/air/default.nix
View File

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-8VuCZoAV54TG8MiF6n5O8ZStGujfJ/7w95BYhe5/7dE=";
};
vendorSha256 = "sha256-gUZPX1ymyzf0IuCpK8Nsq2UKPV5f9SAReJ6YxgpxpqE=";
vendorSha256 = "sha256-u/v6RnzBU+zQEy3jjVITjUQiU7AT3wZoeeRFF+KqOvI=";
subPackages = [ "." ];

2
pkgs/development/tools/database/dbmate/default.nix
View File

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-j7u8TidiuaA5SbXoD+p23wwTsePi6/hzNdVS5IJMEh0=";
};
vendorSha256 = "sha256-GEJ8n0VN9Qt73dRj7Qjx1DAomSy+hQEH74Dx2h/hv9M=";
vendorSha256 = "sha256-t8ga2KrahzdDBu33vv1ETB6hVoNpdxjPfiYuvLR2m5g=";
doCheck = false;

48
pkgs/development/tools/electron/default.nix
View File

@ -90,33 +90,33 @@ rec {
headers = "0s253jdmfyfgb5mwslqd50g623fwj3dgsgsq4cn3pl5qfpmcm26x";
};
electron_14 = mkElectron "14.2.4" {
armv7l-linux = "d644d2df745a9809794929762db1faa56b77f519ccc0d430dd2238235739ace3";
aarch64-linux = "1f198a61a5f67954f568e49879e390c94ef9cb05545664e24bac513e05dea0d9";
x86_64-linux = "faf6c0501811e3dec056f536e53f0ec087345b852e7de47ae86ea175cc070a2f";
i686-linux = "1f9baa2f3aa1cd935cc29f67aa273c8b1b65da144af3894bd855ce02a6730fc1";
x86_64-darwin = "4a3c146da911162c7081e280f2c311c41f132e1d3274bc3676ed71cc9392dc5d";
aarch64-darwin = "279cc3c04c7db9f3361b09f442750f4d18c8b2c7f633bca17aa9fb3656bfb74c";
headers = "1zkf1j82psbj9mw8zb9ghl9y6bkw77cxqzkp3q1bbn6wvj41lvyh";
electron_14 = mkElectron "14.2.5" {
armv7l-linux = "d6f7e2fe6088f57ecd455035e0815c20dd1d84b4cbf669e5fa355b96f36eaf2e";
aarch64-linux = "c8a1a7c5c04462bbe6e148587a72b002ab4bb90aecb9686546b22580c0f9fa52";
x86_64-linux = "5820ea6c9cfe02096a75df43cab7cdfe5947d6d90207e98c563bd50c400f8110";
i686-linux = "8099fc3b137e80c5e65493dea2cf3dfb923e86693f3b082429f6fd949560f540";
x86_64-darwin = "258eb29426a5f275c49284be6818f856ffc29d04fa9cef6fafcdcd207092281d";
aarch64-darwin = "38a19828c1d7ff5fb49c5db5a706482f4afbae9fecaedaf9ebea0a5765bf952d";
headers = "172h9ba1s531y3s751inwsia6kr39412yivqkpdc58jmn47nmgb8";
};
electron_15 = mkElectron "15.3.5" {
armv7l-linux = "c5540cd94711a31fe0098da982d4a25ed1b606e0d4213c9f7863826b2c8e7eaf";
aarch64-linux = "6550387135605b64b8549b1034eae672a8f94419032dacbaff7b92934cc0508d";
x86_64-linux = "3b61eaa48f3c5f1983a24152e6b12f39c3a29abb52d17c13891c16a25e3c209a";
i686-linux = "30d6de074bebe985bb07f20788a8378c7fa1ded564e3c1e8183b0113ba76b282";
x86_64-darwin = "fe2c138bb11b3db07d02c1cbf7838765036ac2552582f9ce2265ffe6609ea2e1";
aarch64-darwin = "7c887b8ae24ad7ca9585a001f29108919bc39d27c3818012aeefb8072e23178d";
headers = "0fkvwlnxjy8dwfnxhgk6i4qayhmg7dbqmd9nfi94a7kdbwp714r5";
electron_15 = mkElectron "15.3.6" {
armv7l-linux = "4c105be3dc38ea8899f9fe58c05dfbf20e0d43e9b35ca815c43329d17b714d36";
aarch64-linux = "3d06de32f02e38039c3c9deb418e3b9dbcda30f387f27e54fb1f1be068b80989";
x86_64-linux = "5a9a3e37e92ad67d2a4ebb5ac85cb817d682fe2ca0b37b924d7f40085d246cc9";
i686-linux = "32ff47793c8123fa6220ff9e7c524e3b89c0411e94bdb4d9391038cc58449b5f";
x86_64-darwin = "faff636a6deedc3b7a3c900aef187baaeec2b83ccc405c56e3ea18d68894b82c";
aarch64-darwin = "ae7350a7daa6eb2d21fa001c38217bc46a3894f843962c5cca192b837cc9d81c";
headers = "1mbffk26kdn1id809sdg1kdhrf285zm9ls40b5zaflcljvqg3i2x";
};
electron_16 = mkElectron "16.0.7" {
armv7l-linux = "8a8567c745ab1c2b1de19305da0a0036ba100b27e1fc4eb014aca325aff3193e";
aarch64-linux = "6d27cc9acc3f580118cdd685d629d39c2a1fc094376b719fa0100a7446f8fede";
x86_64-linux = "544cd6d48262f24c8a82d2e8079b20889ec5e83959404fdda9ad00c86e9efa70";
i686-linux = "8b79ce5fbc704eb03c34d4b96765314074a687ae3165cab21f84f77fee36d755";
x86_64-darwin = "e5c825d4cfc1dabd066986fa1cae3ee880f222b053c760b700b24899fb02d4db";
aarch64-darwin = "9fa9dc44e5d71de7a999b3db07a583e0a04252747486c16955232eba498b259d";
headers = "0r4gd2v9rzrg1msxw62rq1s93ifrjj4yb4gfcma5mbj88m3v5p63";
electron_16 = mkElectron "16.0.8" {
armv7l-linux = "be3a598d5f7c677c11831b78a8a82d95132ea760bb643e526426b91fdf27aff7";
aarch64-linux = "465cd93d69ea2e3273339d48bef58e7359b692da5535bff5882e803c22535ec5";
x86_64-linux = "25767a94d4b0927616ed5008889cd65bb073c7005209671b34045f91d698c857";
i686-linux = "1cedf35f501ea1512fe9ae5cae47a72e093b6eb7297f76b726551e4a33a593a5";
x86_64-darwin = "a3c5e5368165304fc9392e3a5b59480965cf0f91f7d889257e6a622f48051cbf";
aarch64-darwin = "dc8414d7b9a967bda530c83a81720519931aebf541cfaed142ee2042c16e683a";
headers = "042gz036dzwbvvxvgbgkdb5nq7p8a7vcan6c35l7imgv1hd4g5v4";
};
}

2
pkgs/servers/headscale/default.nix
View File

@ -44,6 +44,6 @@ buildGoModule rec {
Headscale implements this coordination server.
'';
license = licenses.bsd3;
maintainers = with maintainers; [ nkje jk ];
maintainers = with maintainers; [ nkje jk kradalby ];
};
}

2
pkgs/tools/admin/stripe-cli/default.nix
View File

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-F1+goZURc0f1dWV/PGxSVtqHkuePACq4+UzfMTEVJ0M=";
};
vendorSha256 = "sha256-Duu6lP87KKLC1eGIebycBSIPw7FN6BBxPexize9+jPE=";
vendorSha256 = "sha256-AsEem/KuA+jxioG96Ofn0te93fyZ9sebPkLPA+LAUkk=";
subPackages = [
"cmd/stripe"

6
pkgs/tools/backup/kopia/default.nix
View File

@ -2,16 +2,16 @@
buildGo117Module rec {
pname = "kopia";
version = "0.10.2";
version = "0.10.3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-SYKTkjN+O7s/LFeVJr2HFuvIuEHeqf0KrMQMYftL4U0=";
sha256 = "sha256-FdLQI+MbGaO0Kj6icUmcvPzo3rC7mbHYC1xoGv/FzPk=";
};
vendorSha256 = "sha256-9JR0ndlxtb0jun7KSWuac2uLqwVKrwUqiV6yScBoqzs=";
vendorSha256 = "sha256-7QgD4kMiULE2G+/FIqe19kZGvJDEXBY27bEfxabD+ic=";
doCheck = false;

4
pkgs/tools/filesystems/fuse-overlayfs/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "fuse-overlayfs";
version = "1.8.1";
version = "1.8.2";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
sha256 = "sha256-0vmcn3AOASjN61QzxxGYpPMWlukanh8+vbZQcFpU/vs=";
sha256 = "sha256-FqlSMTCKtcG2HOA6KaPYArK/rxHG9eJSQmNOWIzJzCs=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];

2
pkgs/tools/misc/steampipe/default.nix
View File

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-xLw3y9DYkei0MoErsMpSDhEK73lK9b13st+DqHvvhys=";
};
vendorSha256 = "sha256-MTSkWrutDKmsaTI9/L8wh3tWwra/F3+bP0RyVi4DMqE=";
vendorSha256 = "sha256-hqjjwYBVnuw7Bt2901tPIkfvYLy955IdeMbeSWTjtL0=";
proxyVendor = true;
# tests are failing for no obvious reasons

6
pkgs/tools/networking/corerad/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "corerad";
version = "0.3.4";
version = "1.0.0";
src = fetchFromGitHub {
owner = "mdlayher";
repo = "corerad";
rev = "v${version}";
sha256 = "0sf2r4q57hwdakv0b4skn76b0xy7bwj2j9rpj6frs5fkk6gsi6sm";
sha256 = "sha256-23f+WJcTf+x9GW+hGUU3/j4Qi9MfcsfQuS7aEU4uGU4=";
};
vendorSha256 = "0mbzbgd53mdmq2jpg845mmphb894l6di0ds53n6r3sv777k00sgh";
vendorSha256 = "sha256-SSa+yBZjZ+5vRfzfCtNhF+kRyJ/VMgd9uWqKPwIi8+Y=";
doCheck = false;

2
pkgs/tools/networking/shadowfox/default.nix
View File

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6";
};
vendorSha256 = "06ar9ivry9b01609izjbl6hqgg0cy7aqd8n2cqpyq0g7my0l0lbj";
vendorSha256 = "17m0ssfw9n3g2lkv63qajz3adrk5yp0c9hx66x7dl79snwqd49yg";
doCheck = false;

2
pkgs/tools/networking/subfinder/default.nix
View File

@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "sha256-BtyPy6ow3flHl4jM9cfF+y3JCtLYx2c+a8f7ol3nQj4=";
};
vendorSha256 = "sha256-jIU5UZdmBUqyjva+g7zoijPqHF2p3vzImEFQCP/CFwE=";
vendorSha256 = "sha256-lgbTfIsfYFSToCaDppMGaxfE1Bmk52eShQ+40g2VNw0=";
modRoot = "./v2";

9
pkgs/tools/security/cosign/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cosign";
version = "1.5.0";
version = "1.5.1";
src = fetchFromGitHub {
owner = "sigstore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-mxDLF9DQKySDR1c7jD/D0/xI+/R8a/ZlukliT/R4wCg=";
sha256 = "sha256-hQFkbHOmtk0SqFSPw1+5nCvjq9cKsGzFPtK4jXDrubQ=";
};
buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite)
@ -16,7 +16,7 @@ buildGoModule rec {
nativeBuildInputs = [ pkg-config installShellFiles ];
vendorSha256 = "sha256-xqwwvVGXWFFKKBtH4a/+akFSlZ2hCOC1v1sO0d2p9fs=";
vendorSha256 = "sha256-d3aOX4iMlhlxgYbqCHCIFKXunVha0Fw4ZBmy4OA6EhI=";
excludedPackages = "\\(sample\\|webhook\\|help\\)";
@ -26,6 +26,9 @@ buildGoModule rec {
postPatch = ''
rm pkg/cosign/tuf/client_test.go # Require network access
rm internal/pkg/cosign/fulcio/signer_test.go # Require network access
rm internal/pkg/cosign/rekor/signer_test.go # Require network access
rm pkg/cosign/kubernetes/webhook/validator_test.go # Require network access
'';
postInstall = ''

4
pkgs/tools/security/otpauth/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "otpauth";
version = "0.4.0";
version = "0.4.2";
src = fetchFromGitHub {
owner = "dim13";
repo = "otpauth";
rev = "v${version}";
sha256 = "sha256-LGDeNkCxVLDVpwi5VFFL0DFsf8CexI7Nc5l+l2ASHaw=";
sha256 = "sha256-qSu0kGRi1es9OciN1s9Eh1Z3JkxbcKO8W5cAC7c7n0k=";
};
vendorSha256 = "sha256-TU5crhmQAhSfURdfPe/xaa3RgGyc+UFn2E+jJ0flNsg=";

2
pkgs/tools/security/spire/default.nix
View File

@ -13,7 +13,7 @@ buildGoModule rec {
sha256 = "01ph9jzh18bnidrsbnnxm3gxh0cgfllnjvf7a5haqz51lm6a9pny";
};
vendorSha256 = "17d845lwlbk19lsc937c22b1l0ikimhlagknm2i7mn8s8xrs57q8";
vendorSha256 = "1fd1k5by4wcjmzfgi3gnrwnb38b0wa3w67kzjlx8s0nwapyfgx0b";
subPackages = [ "cmd/spire-agent" "cmd/spire-server" ];

13
pkgs/tools/security/thc-hydra/darwin-remove-ldflag.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/Makefile.am b/Makefile.am
index 1c915f1..83a8e41 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@
WARN_CLANG=-Wformat-nonliteral -Wstrncat-size -Wformat-security -Wsign-conversion -Wconversion -Wfloat-conversion -Wshorten-64-to-32 -Wuninitialized -Wmissing-variable-declarations -Wmissing-declarations
WARN_GCC=-Wformat=2 -Wformat-overflow=2 -Wformat-nonliteral -Wformat-truncation=2 -Wnull-dereference -Wstrict-overflow=2 -Wstringop-overflow=4 -Walloca-larger-than=4096 -Wtype-limits -Wconversion -Wtrampolines -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fno-common -Wcast-align
CFLAGS ?= -g
-OPTS=-I. -O3 $(CFLAGS) -fcommon -Wl,--allow-multiple-definition
+OPTS=-I. -O3 $(CFLAGS) -fcommon
# -Wall -g -pedantic
LIBS=-lm
DESTDIR ?=

6
pkgs/tools/security/thc-hydra/default.nix
View File

@ -12,6 +12,10 @@ stdenv.mkDerivation rec {
sha256 = "sha256-V9rr5fbJWm0pa+Kp8g95XvLPo/uWcDwyU2goImnIq58=";
};
patches = lib.optionals stdenv.isDarwin [
./darwin-remove-ldflag.patch
];
postPatch = let
makeDirs = output: subDir: lib.concatStringsSep " " (map (path: lib.getOutput output path + "/" + subDir) buildInputs);
in ''
@ -43,6 +47,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.thc.org/thc-hydra/";
license = licenses.agpl3;
maintainers = with maintainers; [ offline ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

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

@ -1433,7 +1433,9 @@ with pkgs;
awslogs = callPackage ../tools/admin/awslogs { };
aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator { };
aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator {
buildGoModule = buildGo116Module;
};
aws-env = callPackage ../tools/admin/aws-env { };
@ -3219,7 +3221,9 @@ with pkgs;
gorilla-bin = callPackage ../tools/security/gorilla-bin { };
godu = callPackage ../tools/misc/godu { };
godu = callPackage ../tools/misc/godu {
buildGoModule = buildGo116Module;
};
goss = callPackage ../tools/misc/goss { };
@ -3722,7 +3726,9 @@ with pkgs;
statserial = callPackage ../tools/misc/statserial { };
steampipe = callPackage ../tools/misc/steampipe { };
steampipe = callPackage ../tools/misc/steampipe {
buildGoModule = buildGo117Module;
};
step-ca = callPackage ../tools/security/step-ca {
inherit (darwin.apple_sdk.frameworks) PCSC;
@ -3732,7 +3738,9 @@ with pkgs;
string-machine = callPackage ../applications/audio/string-machine { };
stripe-cli = callPackage ../tools/admin/stripe-cli { };
stripe-cli = callPackage ../tools/admin/stripe-cli {
buildGoModule = buildGo117Module;
};
bash-supergenpass = callPackage ../tools/security/bash-supergenpass { };
@ -5045,7 +5053,9 @@ with pkgs;
vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { };
utahfs = callPackage ../applications/networking/utahfs { };
utahfs = callPackage ../applications/networking/utahfs {
buildGoPackage = buildGo116Package;
};
wakeonlan = callPackage ../tools/networking/wakeonlan { };
@ -6058,7 +6068,9 @@ with pkgs;
go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { };
goofys = callPackage ../tools/filesystems/goofys { };
goofys = callPackage ../tools/filesystems/goofys {
buildGoModule = buildGo116Module;
};
go-sct = callPackage ../tools/X11/go-sct { };
@ -6186,7 +6198,9 @@ with pkgs;
inherit (xorg) libXdmcp;
};
gron = callPackage ../development/tools/gron { };
gron = callPackage ../development/tools/gron {
buildGoModule = buildGo116Module;
};
groonga = callPackage ../servers/search/groonga { };
@ -8365,7 +8379,9 @@ with pkgs;
obexd = callPackage ../tools/bluetooth/obexd { };
obfs4 = callPackage ../tools/networking/obfs4 { };
obfs4 = callPackage ../tools/networking/obfs4 {
buildGoModule = buildGo116Module;
};
oci-image-tool = callPackage ../tools/misc/oci-image-tool { };
@ -9637,7 +9653,9 @@ with pkgs;
skim = callPackage ../tools/misc/skim { };
seaweedfs = callPackage ../applications/networking/seaweedfs { };
seaweedfs = callPackage ../applications/networking/seaweedfs {
buildGoModule = buildGo117Module;
};
sec = callPackage ../tools/admin/sec { };
@ -9791,7 +9809,9 @@ with pkgs;
# Not updated upstream since 2018, doesn't support qt newer than 5.12
sleepyhead = libsForQt512.callPackage ../applications/misc/sleepyhead {};
slides = callPackage ../applications/misc/slides { };
slides = callPackage ../applications/misc/slides {
buildGoModule = buildGo117Module;
};
slirp4netns = callPackage ../tools/networking/slirp4netns { };
@ -9858,7 +9878,9 @@ with pkgs;
spicy = callPackage ../development/tools/spicy { };
spire = callPackage ../tools/security/spire { };
spire = callPackage ../tools/security/spire {
buildGoModule = buildGo117Module;
};
# to match naming of other package repositories
spire-agent = spire.agent;
spire-server = spire.server;
@ -10089,7 +10111,9 @@ with pkgs;
subsonic = callPackage ../servers/misc/subsonic { };
subfinder = callPackage ../tools/networking/subfinder { };
subfinder = callPackage ../tools/networking/subfinder {
buildGoModule = buildGo117Module;
};
subzerod = with python3Packages; toPythonApplication subzerod;
@ -10929,7 +10953,9 @@ with pkgs;
testdisk-qt = testdisk.override { enableQt = true; };
textql = callPackage ../development/tools/textql { };
textql = callPackage ../development/tools/textql {
buildGoPackage = buildGo116Package;
};
html2text = callPackage ../tools/text/html2text { };
@ -11335,7 +11361,9 @@ with pkgs;
yafaray-core = callPackage ../tools/graphics/yafaray-core { };
yajsv = callPackage ../tools/misc/yajsv { };
yajsv = callPackage ../tools/misc/yajsv {
buildGoModule = buildGo116Module;
};
yallback = callPackage ../development/tools/analysis/yallback { };
@ -11889,7 +11917,9 @@ with pkgs;
dasm = callPackage ../development/compilers/dasm { };
dbmate = callPackage ../development/tools/database/dbmate { };
dbmate = callPackage ../development/tools/database/dbmate {
buildGoModule = buildGo117Module;
};
devpi-client = python3Packages.callPackage ../development/tools/devpi-client {};
@ -15097,7 +15127,9 @@ with pkgs;
buildGoModule = buildGo117Module;
};
k2tf = callPackage ../development/tools/misc/k2tf { };
k2tf = callPackage ../development/tools/misc/k2tf {
buildGoModule = buildGo116Module;
};
kafka-delta-ingest = callPackage ../development/tools/kafka-delta-ingest { };
@ -15621,7 +15653,9 @@ with pkgs;
spooles = callPackage ../development/libraries/science/math/spooles {};
spruce = callPackage ../development/tools/misc/spruce { };
spruce = callPackage ../development/tools/misc/spruce {
buildGoModule = buildGo116Module;
};
sqlcheck = callPackage ../development/tools/database/sqlcheck { };
@ -21439,7 +21473,9 @@ with pkgs;
mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { };
mycorrhiza = callPackage ../servers/mycorrhiza { };
mycorrhiza = callPackage ../servers/mycorrhiza {
buildGoModule = buildGo116Module;
};
myserver = callPackage ../servers/http/myserver { };
@ -21994,7 +22030,9 @@ with pkgs;
sambaFull = samba4Full;
sampler = callPackage ../applications/misc/sampler { };
sampler = callPackage ../applications/misc/sampler {
buildGoModule = buildGo116Module;
};
shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; };
@ -22112,7 +22150,9 @@ with pkgs;
urserver = callPackage ../servers/urserver { };
vouch-proxy = callPackage ../servers/vouch-proxy { };
vouch-proxy = callPackage ../servers/vouch-proxy {
buildGoModule = buildGo116Module;
};
victoriametrics = callPackage ../servers/nosql/victoriametrics { };
@ -22872,7 +22912,9 @@ with pkgs;
open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { };
open-vm-tools-headless = open-vm-tools.override { withX = false; };
air = callPackage ../development/tools/air { };
air = callPackage ../development/tools/air {
buildGoModule = buildGo117Module;
};
delve = callPackage ../development/tools/delve { };
@ -26437,7 +26479,9 @@ with pkgs;
shepherd = nodePackages."@nerdwallet/shepherd";
skate = callPackage ../applications/misc/skate { };
skate = callPackage ../applications/misc/skate {
buildGoModule = buildGo117Module;
};
slack = callPackage ../applications/networking/instant-messengers/slack { };
@ -28754,7 +28798,9 @@ with pkgs;
sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { };
shadowfox = callPackage ../tools/networking/shadowfox { };
shadowfox = callPackage ../tools/networking/shadowfox {
buildGoModule = buildGo117Module;
};
shfmt = callPackage ../tools/text/shfmt { };
@ -33886,7 +33932,9 @@ with pkgs;
steamcontroller = callPackage ../misc/drivers/steamcontroller { };
stern = callPackage ../applications/networking/cluster/stern { };
stern = callPackage ../applications/networking/cluster/stern {
buildGoModule = buildGo117Module;
};
streamripper = callPackage ../applications/audio/streamripper { };