Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
1c7931d7e1
@ -22,7 +22,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
''
|
||||
machine.wait_for_unit("isso.service")
|
||||
|
||||
machine.wait_for_open_port(port)
|
||||
machine.wait_for_open_port(${toString port})
|
||||
|
||||
machine.succeed("curl --fail http://localhost:${toString port}/?uri")
|
||||
machine.succeed("curl --fail http://localhost:${toString port}/js/embed.min.js")
|
||||
|
||||
@ -4,16 +4,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "librespot";
|
||||
version = "0.3.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "librespot-org";
|
||||
repo = "librespot";
|
||||
rev = "v${version}";
|
||||
sha256 = "1fv2sk89rf1vraq823bxddlxj6b4gqhfpc36xr7ibz2405zickfv";
|
||||
sha256 = "sha256-DtF6asSlLdC2m/0JTBo4YUx9HgsojpfiqVdqaIwniKA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "1sal85gsbnrabxi39298w9njdc08csnwl40akd6k9fsc0fmpn1b0";
|
||||
cargoSha256 = "sha256-tbDlWP0sUIa0W9HhdYNOvo9cGeqFemclhA7quh7f/Rw=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snd";
|
||||
version = "22.2";
|
||||
version = "22.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/snd/snd-${version}.tar.gz";
|
||||
sha256 = "sha256-MZ8Vm/d+0r7YsXdySKcH5rqXBh4iFLyUe44LBOD58E0=";
|
||||
sha256 = "sha256-a/nYq6Cfbx93jfA6I8it+U0U36dOAFSpRis32spPks4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -15,11 +15,11 @@ let
|
||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0vwnx7fs46fkas75pnhjc81wy3hr24k2gs82i30ailaxw5r63j81";
|
||||
x86_64-darwin = "0bxc74vfkw9zhxfahzhcghlnybvj8k15jbni489lf636a45xrlcc";
|
||||
aarch64-linux = "10z6nv67yjd15ilxgfpjf07qbdp0cbd5761a5gcymiam4r22l6hq";
|
||||
aarch64-darwin = "133nccm0hcgcd2503psxwaaq4v4l16q7w7kbcz1y5lynlvwazjrx";
|
||||
armv7l-linux = "1sx3l42ls62v3apjap25ccg4mcbi71spfj5xh7y6rffzi65xwdrv";
|
||||
x86_64-linux = "1jvi34ym7d6j5zl9d7wg3rcy34f4ji907mixfmvs7g0z1vlra2sv";
|
||||
x86_64-darwin = "19nnkx2l4rvm23r8ii2a0jn8lvanmshwsjrsgmi7dcnf68143601";
|
||||
aarch64-linux = "17rx5v3kzwzkzhckly8s413370mrh7rcyhpnppmn39gkvy68ydhs";
|
||||
aarch64-darwin = "0ff0yn3kcb35s775w0k2l3szs137ph593qa7y3p2h4sbfsrgljxz";
|
||||
armv7l-linux = "0qhik2qhbwpjrbkpdc8cblvrh1hqld69il78zmayq1bbkqzhhmp5";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
sourceRoot = if stdenv.isDarwin then "" else ".";
|
||||
@ -29,7 +29,7 @@ in
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.70.0";
|
||||
version = "1.70.1";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "hydrus";
|
||||
version = "493";
|
||||
version = "495";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hydrusnetwork";
|
||||
repo = "hydrus";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-sROmWFH3sDBDh1VSVLTM71Y9qD8CndvwW7PKzkavIuc=";
|
||||
sha256 = "sha256-MuSK19oSrRJZebATRpDW1CmUq4NKcpuoPmOuLyvL8A8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -52,6 +52,11 @@ stdenv.mkDerivation rec {
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkg-config
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace $dev/lib/cmake/OpenImageIO/OpenImageIOTargets-*.cmake \
|
||||
--replace "\''${_IMPORT_PREFIX}/lib/lib" "$out/lib/lib"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.openimageio.org";
|
||||
description = "A library and tools for reading and writing images";
|
||||
|
||||
@ -82,9 +82,9 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
in ''
|
||||
mkdir -p $out/etc/udev/rules.d/
|
||||
./tools/sane-desc -m udev+hwdb -s doc/descriptions:doc/descriptions-external > $out/etc/udev/rules.d/49-libsane.rules || \
|
||||
cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules
|
||||
mkdir -p $out/etc/udev/rules.d/ $out/etc/udev/hwdb.d
|
||||
./tools/sane-desc -m udev+hwdb -s doc/descriptions:doc/descriptions-external > $out/etc/udev/rules.d/49-libsane.rules
|
||||
./tools/sane-desc -m udev+hwdb -s doc/descriptions -m hwdb > $out/etc/udev/hwdb.d/20-sane.hwdb
|
||||
# the created 49-libsane references /bin/sh
|
||||
substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \
|
||||
--replace "RUN+=\"/bin/sh" "RUN+=\"${runtimeShell}"
|
||||
|
||||
@ -16,11 +16,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crow-translate";
|
||||
version = "2.9.10";
|
||||
version = "2.9.12";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz";
|
||||
hash = "sha256-FIQuvayhk2XrkpbVxwfXRMyFnOxKv8bs1ayeboQHliY=";
|
||||
hash = "sha256-JkAykc5j5HMkK48qAm876A2zBD095CG/yR4TyXAdevM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "arkade";
|
||||
version = "0.8.30";
|
||||
version = "0.8.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "arkade";
|
||||
rev = version;
|
||||
sha256 = "sha256-KTZ8UJ0aQmjreio7ancJnZ0KGANAQIPYNSQGXHHSqX4=";
|
||||
sha256 = "sha256-Yat9RIsbMCGVwu7xqC2xNUPZACpMG+ATsQN7d2n0eFU=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
|
||||
|
||||
let
|
||||
version = "0.31.5";
|
||||
sha256 = "0dv34y79229n63i5as0qxf3lmlsfyk8p277i09hrq1vn86wnjdm7";
|
||||
manifestsSha256 = "1p5f05lgbv2hhl5dbank2mmhmhlkxn1rfnh09x02j22ldrvk3zzl";
|
||||
version = "0.32.0";
|
||||
sha256 = "1gxfnf47i26kzgsaxbl2pf02hn5dwb290qs894hz196jc2021a7n";
|
||||
manifestsSha256 = "19jdmdipbshqv06xzkx5p4ym0x2jgrvnvsq38dg6b4y0iwzd9nmm";
|
||||
|
||||
manifests = fetchzip {
|
||||
url =
|
||||
@ -23,7 +23,7 @@ in buildGoModule rec {
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-bTvVf6fsrWLayOwwxBo2iOz5Di4dHEiV45uGkAyWrMU=";
|
||||
vendorSha256 = "sha256-pVK+VFfAk0jFp6u5mVB2p8CamPkD3/KRhYNy3zHUVCE=";
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${manifests} source/cmd/flux/manifests
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "glooctl";
|
||||
version = "1.12.0";
|
||||
version = "1.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solo-io";
|
||||
repo = "gloo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LRCdKz7vaxxQTFveHbF2WrSinPtjWP96GhqtSMLIiDs=";
|
||||
hash = "sha256-0neq2EjlHddjLHyNlnqFjXCZpv8r7DGMeYNCzJUEFFg=";
|
||||
};
|
||||
|
||||
subPackages = [ "projects/gloo/cli/cmd" ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "helmsman";
|
||||
version = "3.13.0";
|
||||
version = "3.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Praqma";
|
||||
repo = "helmsman";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QyxluxAwhEZrgfMWlxB7sUZi6XGCFNGhhWRw3RmnhKM=";
|
||||
sha256 = "sha256-AfJf+o73iR0aHNFfB7f0S+cc5VeEOAjD0Ou44WHTTAg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-gkzDecVvHZPFWDSi8nLw2mkR4HK0+pClpaHcdFFOnF8=";
|
||||
vendorSha256 = "sha256-Ijy9UxT746Bi6x+aXxKNRxzAo5yRTV/6nbVjk9i4ffk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "k0sctl";
|
||||
version = "0.13.1";
|
||||
version = "0.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "k0sproject";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1SlVGQLU/7UmcvyKD/BaJSBCdOWACteQtR2Os4THPaU=";
|
||||
sha256 = "sha256-uKN+vH7BGz8lUDrmPeLp941KPkkTfOkK4Ib9GZR9D0M=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-vTcFJ7L8FW0IZBNarje/Oc3+jSRMga8+/nPLvqus2vY=";
|
||||
vendorSha256 = "sha256-CZ8DmgYXQcpd43qm6YsVHFePuUochHgJG7/ffEK8LL8=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -5,13 +5,13 @@ buildGoModule rec {
|
||||
/* Do not use "dev" as a version. If you do, Tilt will consider itself
|
||||
running in development environment and try to serve assets from the
|
||||
source tree, which is not there once build completes. */
|
||||
version = "0.30.5";
|
||||
version = "0.30.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tilt-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-K7vQ2Pz35/ye5AhUez/fN7PhW3KRv5/4duG4JpvO5vY=";
|
||||
sha256 = "sha256-i4i406Ys3MY77t4oN+kIeWopdjtfysm4xDFkTpuo+X0=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "velero";
|
||||
@ -31,7 +31,7 @@ buildGoModule rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
|
||||
$out/bin/velero completion bash > velero.bash
|
||||
$out/bin/velero completion zsh > velero.zsh
|
||||
installShellCompletion velero.{bash,zsh}
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dnscontrol";
|
||||
version = "3.17.0";
|
||||
version = "3.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eXm2oOHtNnDK4mikge8Ubjkg4b4mG7HMT17nL/CdU88=";
|
||||
sha256 = "sha256-G4FfKTlMuJ0YKsNQnMFjXq6ZBuLJjlCg7GqFPHcsHFM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-14SnK5CeMTmt0ZQ+CI14FACcMaNNbBWvAYfbQoJ2K/A=";
|
||||
vendorSha256 = "sha256-g2T3TmwkF1ft5XRimZLrTmm0Km5HcX/0aQtUjA5TZzw=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
@ -6,19 +6,20 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "zeronet-conservancy";
|
||||
version = "0.7.6";
|
||||
version = "0.7.7";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeronet-conservancy";
|
||||
repo = "zeronet-conservancy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tWNU7UJVWB+aRLam6WKV/HaRRTIQvlEgxe4xJYKpXJY=";
|
||||
sha256 = "sha256-6qBdq6DoIKZUUGflz7kWu3S3pMJB4vkGUytpU5EatP0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket-client
|
||||
gevent-websocket rencode bitcoinlib maxminddb pyopenssl rich
|
||||
gevent-websocket rencode bitcoinlib maxminddb pyopenssl rich defusedxml
|
||||
pyaes
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ghorg";
|
||||
version = "1.8.1";
|
||||
version = "1.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gabrie30";
|
||||
repo = "ghorg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rnlSwqZ3Kigfmkt2ws5bmX/ipqxFUPZYDpdnkZZE59Y=";
|
||||
sha256 = "sha256-O5+OKY0o9vIO0uQGDlA0PMugfLAf45B/iHrrC2p0G+4=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "git-credential-1password";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "develerik";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-F3XhBVTV8TgVNrOePm3F+uWspkllBlZ/yRyUxrCG0xw=";
|
||||
sha256 = "sha256-Bz/EW+K4XtDap3cu3/+9nJePcdxMXakj8HDPsbCx1FU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-2CNGAuvO8IeNUhFnMEj8NjZ2Qm0y+i/0ktNCd3A8Ans=";
|
||||
vendorSha256 = "sha256-cPHA6rVUQg41sS79UBFf85OfLn53C8/OZVGT5xVdBdw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A git credential helper for 1Password";
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "git-machete";
|
||||
version = "3.11.4";
|
||||
version = "3.11.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "virtuslab";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nP7TOxTvf2twfS3rLYjiR6iRTS+lA6iJttqzlj4rGm0=";
|
||||
sha256 = "sha256-W2OYJO3UnBcZRoIyTRj3Wz7J91zDWrrYPH5OnYvXi24=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lefthook";
|
||||
version = "1.0.5";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "evilmartians";
|
||||
repo = "lefthook";
|
||||
sha256 = "sha256-/y9UUVwJ/u1F9+hMxWqGENscTuf8GP4VZl7hTk3zyrM=";
|
||||
sha256 = "sha256-SIXenrdIprAFOvz68Kn9qwmxLtDNkMUHxkXYFIyKo0Y=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-LCBQyVSkUywceIlioYRNuRc6FrbPKuhgfw5OocR3NvI=";
|
||||
vendorSha256 = "sha256-NTZz0EDIjGdh8dD9jxbNVdWb7NFJsdtnMp7H6Ni0EbQ=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "subgit";
|
||||
version = "3.3.13";
|
||||
version = "3.3.15";
|
||||
|
||||
meta = {
|
||||
description = "A tool for a smooth, stress-free SVN to Git migration";
|
||||
@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://subgit.com/download/subgit-${version}.zip";
|
||||
sha256 = "sha256-+sG7yD2aVLV9i7iPZTMMsY1CQ1VuJ8w+jPguuTulR8c=";
|
||||
sha256 = "sha256-2/J/d4GrlLXR/7QBxgIMepzP+xxkeLvrCBwLl7Ke8wI=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,10 +18,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# 'require' replaced with 'dofile' to work around
|
||||
# https://github.com/mpv-player/mpv/issues/7399 until fixed in mpvacious
|
||||
substituteInPlace subs2srs.lua \
|
||||
--replace "require('osd_styler')" "dofile('"$out/share/mpv/scripts/mpvacious/osd_styler.lua"')" \
|
||||
--replace "'curl'" "'${curl}/bin/curl'" \
|
||||
--replace "'wl-copy'" "'${wl-clipboard}/bin/wl-copy'" \
|
||||
--replace "xclip" "${xclip}/bin/xclip"
|
||||
@ -36,7 +33,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.scriptName = "mpvacious/subs2srs.lua";
|
||||
passthru.scriptName = "mpvacious";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Adds mpv keybindings to create Anki cards from movies and TV shows";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-circle";
|
||||
version = "22.07.11";
|
||||
version = "22.08.07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-0wDSK1sBYEQ+3wr5BkZvvtFdG66uMzHYAtyvpaZZlTI=";
|
||||
sha256 = "sha256-nYRiAp8cHDyWGlb/s6ysiI2w2Oo7yj1HnKPo0EOqvhY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "numix-icon-theme-square";
|
||||
version = "22.07.11";
|
||||
version = "22.08.07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "numixproject";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ZLQYS9KQETgjSSdwWiA2tiQGS5hiEt4Gl0hUw5RI/S0=";
|
||||
sha256 = "sha256-AWDahl9DUAEYY7OW9E323LOdM37INcAbEXA19FYRObE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mercury";
|
||||
version = "22.01.1";
|
||||
version = "22.01.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz";
|
||||
sha256 = "sha256-Cg0ixQtpmus6Q3fuc45OLheKCCTiTW3z1XJzxQ1OL6c=";
|
||||
sha256 = "sha256-1bS0t7OkpjoYcx2XA0tE8TG/WJttGxDo68S+zvAA0Eg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1,46 +1,76 @@
|
||||
{ stdenv, clangStdenv, lib, fetchFromGitHub, cmake, zlib, openexr,
|
||||
openimageio, llvm, boost165, flex, bison, partio, pugixml,
|
||||
util-linux, python3
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, clang
|
||||
, libclang
|
||||
, zlib
|
||||
, openexr
|
||||
, openimageio2
|
||||
, llvm
|
||||
, boost
|
||||
, flex
|
||||
, bison
|
||||
, partio
|
||||
, pugixml
|
||||
, util-linux
|
||||
, python3
|
||||
}:
|
||||
|
||||
let boost_static = boost165.override { enableStatic = true; };
|
||||
in clangStdenv.mkDerivation rec {
|
||||
# In theory this could use GCC + Clang rather than just Clang,
|
||||
# but https://github.com/NixOS/nixpkgs/issues/29877 stops this
|
||||
let
|
||||
|
||||
boost_static = boost.override { enableStatic = true; };
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "openshadinglanguage";
|
||||
version = "1.10.9";
|
||||
version = "1.11.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "imageworks";
|
||||
owner = "AcademySoftwareFoundation";
|
||||
repo = "OpenShadingLanguage";
|
||||
rev = "Release-1.10.9";
|
||||
sha256 = "1dwf10f2fpxc55pymwkapql20nc462mq61hv21c527994c2qp1ll";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2OOkLnHLz+vmSeEDQl12SrJBTuWwbnvoTatnvm8lpbA=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_BOOST_WAVE=ON"
|
||||
"-DENABLERTTI=ON"
|
||||
"-DENABLE_RTTI=ON"
|
||||
|
||||
# Build system implies llvm-config and llvm-as are in the same directory.
|
||||
# Override defaults.
|
||||
"-DLLVM_DIRECTORY=${llvm}"
|
||||
"-DLLVM_CONFIG=${llvm.dev}/bin/llvm-config"
|
||||
|
||||
# Set C++11 to C++14 required for LLVM10+
|
||||
"-DCMAKE_CXX_STANDARD=14"
|
||||
];
|
||||
|
||||
preConfigure = "patchShebangs src/liboslexec/serialize-bc.bash ";
|
||||
|
||||
nativeBuildInputs = [ cmake boost_static flex bison];
|
||||
buildInputs = [
|
||||
zlib openexr openimageio llvm
|
||||
partio pugixml
|
||||
util-linux # needed just for hexdump
|
||||
python3 # CMake doesn't check this?
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
clang
|
||||
cmake
|
||||
flex
|
||||
];
|
||||
# TODO: How important is partio? CMake doesn't seem to find it
|
||||
|
||||
buildInputs = [
|
||||
boost_static
|
||||
libclang
|
||||
llvm
|
||||
openexr
|
||||
openimageio2
|
||||
partio
|
||||
pugixml
|
||||
python3.pkgs.pybind11
|
||||
util-linux # needed just for hexdump
|
||||
zlib
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64);
|
||||
description = "Advanced shading language for production GI renderers";
|
||||
homepage = "http://opensource.imageworks.com/?p=osl";
|
||||
homepage = "https://opensource.imageworks.com/osl.html";
|
||||
maintainers = with maintainers; [ hodapp ];
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -27,14 +27,14 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "vyper";
|
||||
version = "0.3.5";
|
||||
version = "0.3.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-ldNuADfWy1OWTPD7pTcpU5dX/mX2pV/QqSjJxkc5S28=";
|
||||
sha256 = "sha256-8jw92ttKhXubzDr0tt9/OoCsPEyB9yPRsueK+j4PO6Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,18 +4,18 @@ let
|
||||
|
||||
pkg = buildGoModule rec {
|
||||
pname = "arduino-cli";
|
||||
version = "0.21.1";
|
||||
version = "0.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arduino";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-IXzN6CnZCzrkcLVNmKc1WB0V+TTa56CBzASzK0FQO8c=";
|
||||
sha256 = "sha256-NuYPqJ/Fvt1P6KFXTIQaAvXYJgTwWrMspPags0Q06cE=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-VWoKHIRQfs4dbsOzV3AQpqWsCPDm/rVKGMsc4xZvbhU=";
|
||||
vendorSha256 = "sha256-u5YCwnciXlWgqQd9CXfXNipLLlNE3p8+bL6WaTvOkVA=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nanopb";
|
||||
version = "0.4.5";
|
||||
version = "0.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0cjfkwwzi018kc0b7lia7z2jdfgibqc99mf8rvj2xq2pfapp9kf1";
|
||||
sha256 = "sha256-B9J+GkgOBR4iZaP6/2ykcjbkifoyhkuukkjK/CLBZj0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3 python3.pkgs.wrapPython ];
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libupnp";
|
||||
version = "1.14.12";
|
||||
version = "1.14.13";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "pupnp";
|
||||
repo = "pupnp";
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-ZJ74x5+4dDb5sJ1cPtlin6iunGyu8boNSpfLFB1mCME=";
|
||||
sha256 = "sha256-3pvJDReyZilJ8pAHYw6d+6ammv4EliLgA+VOSBsvF20=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pyotherside";
|
||||
version = "1.5.9";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thp";
|
||||
repo = "pyotherside";
|
||||
rev = version;
|
||||
sha256 = "1k1fdsinysgx5gp6q62jiwcyiklakmjv6wbi1s2659am96vz3zj8";
|
||||
sha256 = "sha256-IIvL704snJIJbigAgJZ3WWg5a/mX/8qzgFN+dBEClG8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rdkafka";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edenhill";
|
||||
repo = "librdkafka";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-r5H02HLqiixbShgXDEaYEe4OrQK2En5zuLtMOajEIBM=";
|
||||
sha256 = "sha256-G6rTvb2Z2O1Df5/6upEB9Eh049sx+LWhhDKvsZdDqsc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config python3 which ];
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "suitesparse-graphblas";
|
||||
version = "7.1.2";
|
||||
version = "7.2.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "DrTimothyAldenDavis";
|
||||
repo = "GraphBLAS";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fz8e2//bJB9SANEw29VrUeaqvmh/aSu6+ZnkMb6C40k=";
|
||||
sha256 = "sha256-N3TBuKWQRisXE5DQ0c+N2cv0darQ8mz4g2oe7pKst9E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
checkInputs = [ cppcheck gtest ];
|
||||
buildInputs = [ sqlite ];
|
||||
checkInputs = [ cppcheck ];
|
||||
buildInputs = [ sqlite gtest ];
|
||||
doCheck = true;
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sundials";
|
||||
version = "6.2.0";
|
||||
version = "6.3.0";
|
||||
|
||||
outputs = [ "out" "examples" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz";
|
||||
hash = "sha256-GV1Vk3cvxIP2Pwh5TXnkurMMLsWObOSw+2vMDgxI8x0=";
|
||||
hash = "sha256-iaIr6oIP8lCqcjn2NKsH+jTv4dLc/eKcyNOvEUVboqc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -66,10 +66,10 @@ stdenv.mkDerivation rec {
|
||||
#
|
||||
# build error:
|
||||
#
|
||||
# /private/tmp/nix-build-sundials-6.2.0.drv-0/ccD2dUtR.s:21:15: error: index must be an integer in range [-256, 255].
|
||||
# /private/tmp/nix-build-sundials-6.3.0.drv-0/ccD2dUtR.s:21:15: error: index must be an integer in range [-256, 255].
|
||||
# ldr x0, [x0, ___stack_chk_guard];momd
|
||||
# ^
|
||||
# /private/tmp/nix-build-sundials-6.2.0.drv-0/ccD2dUtR.s:46:15: error: index must be an integer in range [-256, 255].
|
||||
# /private/tmp/nix-build-sundials-6.3.0.drv-0/ccD2dUtR.s:46:15: error: index must be an integer in range [-256, 255].
|
||||
# ldr x0, [x0, ___stack_chk_guard];momd
|
||||
#
|
||||
# See also a proposed solution: https://github.com/NixOS/nixpkgs/pull/151983
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "Vc";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VcDevel";
|
||||
repo = "Vc";
|
||||
rev = version;
|
||||
sha256 = "sha256-rh2vcn58xDsbxxABrxneCq6TKIyT51KxGB7sOtHpvYE=";
|
||||
sha256 = "sha256-fv0FHAl0xvAFybR/jwhX2LkozwEDy1TNcbVAmRRnLVU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "websocket++";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zaphoyd";
|
||||
repo = "websocketpp";
|
||||
rev = version;
|
||||
sha256 = "12ffczcrryh74c1xssww35ic6yiy2l2xgdd30lshiq9wnzl2brgy";
|
||||
sha256 = "sha256-9fIwouthv2GcmBe/UPvV7Xn9P2o0Kmn2hCI4jCh0hPM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
|
||||
description = "C++/Boost Asio based websocket client/server library";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ revol-xut ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-keyvault-keys";
|
||||
version = "4.5.1";
|
||||
version = "4.6.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-2ojnH+ySoU+1jOyIaKv366BAGI3Nzjac4QUK3RllhvY=";
|
||||
hash = "sha256-D37DHSpOszn/nZavfysPW6O9KLXu4GGjjxt4hybJSa4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -4,12 +4,12 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.9.5";
|
||||
version = "1.9.7";
|
||||
pname = "bids-validator";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-izjda65OYnwaPX30JqdCL5fFh5IW5eJeAIrP4l9I3kE=";
|
||||
sha256 = "sha256-q8dnOSoN9Gu9yl/UJNRXeTBBKTnfJhHwqN6+QVTlexI=";
|
||||
};
|
||||
|
||||
# needs packages which are not available in nixpkgs
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "easy-thumbnails";
|
||||
version = "2.8.1";
|
||||
version = "2.8.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1a283fe8a3569c3feab4605e8279929d75c85c1151b2fd627f95b1863b5fc6c2";
|
||||
sha256 = "sha256-ij7GG7jHL6x/degRqW4815QqyJyrVasWVJ1tLOnN6qU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastjsonschema";
|
||||
version = "2.15.3";
|
||||
version = "2.16.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
repo = "python-fastjsonschema";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-WKnjSlKtMGpWKPbPr7hpS6Dg0+9i/nWVYmar0N3Q9Pc=";
|
||||
sha256 = "sha256-Gojayel/xQ5gRI0nbwsroeSMdRndjb+8EniX1Qs4nbg=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Flask-Caching";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-MwDvzNo1nWnODmgkuQy1cf+JWjkHwxJmwDQsykvEA0A=";
|
||||
sha256 = "sha256-EN8gCgPwMq9gB3vv5Bd53ZSJi2fIIEDTTochC3G6Jjg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -44,12 +44,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flask-security-too";
|
||||
version = "4.1.4";
|
||||
version = "4.1.5";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Flask-Security-Too";
|
||||
inherit version;
|
||||
sha256 = "sha256-j6My1CD+GY2InHlN0IXPcNqfq+ytdoDD3y+5s2o3WRI=";
|
||||
sha256 = "sha256-98jKcHDv/+mls7QVWeGvGcmoYOGCspxM7w5/2RjJxoM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -17,23 +17,21 @@
|
||||
, psutil
|
||||
, pyarrow
|
||||
, pytest-xdist
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery";
|
||||
version = "3.2.0";
|
||||
version = "3.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-l/tDBuMky4aQnOMqmUToHSH7yyingMXN8BtuTUfUwyI=";
|
||||
hash = "sha256-S2gYVMAaQnK4AmHd8biofYAvxVmM7UTc/HuDPLAsDhg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'pyarrow >= 3.0.0, < 9.0dev' 'pyarrow >= 3.0.0, < 10.0dev'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
google-cloud-core
|
||||
google-cloud-bigquery-storage
|
||||
|
||||
89
pkgs/development/python-modules/webdav4/default.nix
Normal file
89
pkgs/development/python-modules/webdav4/default.nix
Normal file
@ -0,0 +1,89 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, cheroot
|
||||
, colorama
|
||||
, fetchFromGitHub
|
||||
, fsspec
|
||||
, httpx
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
, wsgidav
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "webdav4";
|
||||
version = "0.9.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skshetry";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7v4dcwbTCGiEMkAQHtH9+zQj745dI0QqoEqdxRYRuO4=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
httpx
|
||||
python-dateutil
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
cheroot
|
||||
colorama
|
||||
pytestCheckHook
|
||||
wsgidav
|
||||
] ++ passthru.optional-dependencies.fsspec;
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
fsspec = [
|
||||
fsspec
|
||||
];
|
||||
http2 = [
|
||||
httpx.optional-dependencies.http2
|
||||
];
|
||||
all = [
|
||||
fsspec
|
||||
httpx.optional-dependencies.http2
|
||||
];
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace " --cov" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"webdav4"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# ValueError: Invalid dir_browser htdocs_path
|
||||
"test_retry_reconnect_on_failure"
|
||||
"test_open"
|
||||
"test_open_binary"
|
||||
"test_close_connection_if_nothing_is_read"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Tests requires network access
|
||||
"tests/test_client.py"
|
||||
"tests/test_fsspec.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for interacting with WebDAV";
|
||||
homepage = "https://skshetry.github.io/webdav4/";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
55
pkgs/development/python-modules/wsgidav/default.nix
Normal file
55
pkgs/development/python-modules/wsgidav/default.nix
Normal file
@ -0,0 +1,55 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, cheroot
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, defusedxml
|
||||
, jinja2
|
||||
, json5
|
||||
, python-pam
|
||||
, pyyaml
|
||||
, requests
|
||||
, webtest
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wsgidav";
|
||||
version = "4.0.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mar10";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LQdS9d2DB4PXqRSzmtZCSyCQI47ncLCG+RSB+goZYoA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
defusedxml
|
||||
jinja2
|
||||
json5
|
||||
python-pam
|
||||
pyyaml
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
cheroot
|
||||
pytestCheckHook
|
||||
requests
|
||||
webtest
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"wsgidav"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generic and extendable WebDAV server based on WSGI";
|
||||
homepage = "https://wsgidav.readthedocs.io/";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cirrus-cli";
|
||||
version = "0.83.0";
|
||||
version = "0.84.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cirruslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ud4kdnKesn98CYIsB6S5FjJ3yOT3axTcVlrGroMNDPE=";
|
||||
sha256 = "sha256-14S0Y1ax0bg7nD4iCEujwLIZSjpWYaLWidpYVwQB0dw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-XVGFJv9TYjuwVubTcFVI2b+M2ZDE1Jv4u/dxowcLL2s=";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clickhouse-backup";
|
||||
version = "1.4.9";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlexAkulov";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-I/4o9hynmB9Bj3WDgrNesy9noUgtV8pMOcSaA2EsX2o=";
|
||||
sha256 = "sha256-j4z9Ldufrc1LiO1OgcBrAW17n9sXzJ2930uawdw07Pk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-N4zAdylb7etNknR0/VjIVkuI6kTWlk137HNT03Y2gWs=";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "timescaledb-parallel-copy";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timescale";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0r8c78l8vg7l24c3vzs2qr2prfjpagvdkp95fh9gyz76nvik29ba";
|
||||
sha256 = "sha256-HxaGKJnLZjPPJXoccAx0XUsCrZiG09c40zeSbHYXm04=";
|
||||
};
|
||||
|
||||
vendorSha256 = "03siay3hv1sgmmp7w4f9b0xb8c6bnbx0v4wy5grjl5k04zhnj76b";
|
||||
vendorSha256 = "sha256-muxtr80EjnRoHG/TCEQwrBwlnARsfqWoYlR0HavMe6U=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bulk, parallel insert of CSV records into PostgreSQL";
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kubie";
|
||||
version = "0.17.1";
|
||||
version = "0.17.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "sbstp";
|
||||
repo = "kubie";
|
||||
sha256 = "sha256-rLebv1lw1zaq401dPK4GbisYkES3/5lIiReTBPvgoJo=";
|
||||
sha256 = "sha256-fHZtJSxPA2OVNuJalRblsZFCCaYe5pXq0oQG1t6vqt0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-o1wnweT+wvZNnOT3ZNMJGuiZm7pkhZLssUuIfYeWnBc=";
|
||||
cargoSha256 = "sha256-yExKz1ckqIaN3fvX6/AJgq1ScDHF1bkYKeoiodFSK0o=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -2,30 +2,21 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "circleci-cli";
|
||||
version = "0.1.17142";
|
||||
version = "0.1.20397";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CircleCI-Public";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-69GGJfnOHry+N3hKZapKz6eFSerqIHt4wRAhm/q/SOQ=";
|
||||
sha256 = "sha256-2z5xax9RmBWYV7xNGNZQJKdPY5pUdcFCU+cQoGamvVk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-7u2y1yBVpXf+D19tslD4s3B1KmABl4OWNzzLaBNL/2U=";
|
||||
vendorSha256 = "sha256-EswzTlvFbFZK76cl0TKxIcr8Qa7/RcQCvvw+Si323Hs=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" "-X github.com/CircleCI-Public/circleci-cli/version.Commit=${src.rev}" "-X github.com/CircleCI-Public/circleci-cli/version.packageManager=nix" ];
|
||||
|
||||
preBuild = ''
|
||||
substituteInPlace data/data.go \
|
||||
--replace 'packr.New("circleci-cli-box", "../_data")' 'packr.New("circleci-cli-box", "${placeholder "out"}/share/circleci-cli")'
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 -t $out/share/circleci-cli _data/data.yml
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
# Box blurb edited from the AUR package circleci-cli
|
||||
description = ''
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "svls";
|
||||
version = "0.2.4";
|
||||
version = "0.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dalance";
|
||||
repo = "svls";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-m7xV5sQZnRytT3QY1a9qihZV0Ub6zKjfDytZ+TDwdFg=";
|
||||
sha256 = "sha256-SeVLQ05vPywSOnOEhJhQXYhdptmIhvYbbf9SX5eVzik=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-993XWYSUC2KuV2/dgTYAatoy5lGIveT3lL7eOYsbCig=";
|
||||
cargoSha256 = "sha256-jp84LqFuK6Du2mWmgvadD7p8n/zcLKAKBOMQiERTKBI=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "SystemVerilog language server";
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
, pkg-config
|
||||
, SystemConfiguration
|
||||
, Security
|
||||
, CoreFoundation
|
||||
, curl
|
||||
, libiconv
|
||||
, openssl
|
||||
@ -13,16 +14,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-crev";
|
||||
version = "0.23.2";
|
||||
version = "0.23.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crev-dev";
|
||||
repo = "cargo-crev";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-q/GbEsGQip7+wXxbVFfm9l3tdCT2o4yhWVTY1qmnEic=";
|
||||
sha256 = "sha256-wMF2uF6h06c/vBBXr2IGk/9RsOxnxvffEtIOR+s+iVk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-pqOVKLh+ovUy+rJIz0tjp56qhilZTno4t4dZyCY1r7c=";
|
||||
cargoSha256 = "sha256-UF0bEV77IqGBmqGCqg2cHzom7JDRqlLpoSxbNQsKKiY=";
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
@ -32,7 +33,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
nativeBuildInputs = [ perl pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ SystemConfiguration Security libiconv curl ];
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ SystemConfiguration Security CoreFoundation libiconv curl ];
|
||||
|
||||
checkInputs = [ git ];
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-nextest";
|
||||
version = "0.9.33";
|
||||
version = "0.9.34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextest-rs";
|
||||
repo = "nextest";
|
||||
rev = "cargo-nextest-${version}";
|
||||
sha256 = "sha256-RWlpco03YKlYv9QaGaySudBUG+rZaKURdgMeqFwrq1E=";
|
||||
sha256 = "sha256-lGsQcOK/sm6/EEgB/o/zVWJfjIUppH08s/gwqejzS+U=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-azT4enQOdj2/rznU3fA8tr+4a/mRLj/HNsyDNRYLonM=";
|
||||
cargoSha256 = "sha256-lj8spttijptuC1y3MfKBAQ3SAKW3D5tOmI8+1+wsWE0=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stagit";
|
||||
version = "1.1";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.codemadness.org/stagit";
|
||||
rev = version;
|
||||
sha256 = "sha256-wnXvK1OYd6FxJuZai5a0Mvz4gWpjlhLgGrcKlvn2lbs=";
|
||||
sha256 = "sha256-mVYR8THGGfaTsx3aaSbQBxExRo87K47SD+PU5cZ8z58=";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uftrace";
|
||||
version = "0.11";
|
||||
version = "0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "namhyung";
|
||||
repo = "uftrace";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uRtMJIZJKGQTGqs8QX60FCeXg3j5hv/V/qw4m8eGYD4=";
|
||||
sha256 = "sha256-YjeZGjSctnhbHqWikdVhiEl0hr/qrA4S4JbCJscXe7A=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
||||
@ -17,17 +17,16 @@ let
|
||||
, platformCanUseHDCPBlob ? false # set this to true if the platform is able to use hdcp.bin
|
||||
, extraMakeFlags ? []
|
||||
, extraMeta ? {}
|
||||
, version ? "2.7"
|
||||
, ... } @ args:
|
||||
|
||||
# delete hdcp.bin if either: the platform is thought to
|
||||
# not need it or unfreeIncludeHDCPBlob is false
|
||||
let deleteHDCPBlobBeforeBuild = !platformCanUseHDCPBlob || !unfreeIncludeHDCPBlob; in
|
||||
|
||||
stdenv.mkDerivation ({
|
||||
stdenv.mkDerivation (rec {
|
||||
|
||||
pname = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}";
|
||||
inherit version;
|
||||
version = "2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ARM-software";
|
||||
|
||||
@ -24,7 +24,7 @@ in stdenv.mkDerivation {
|
||||
sha256 = "sha256-8LftT22XzmmWxgYez+BAHDX4HOyl5DrwrpuO2+bqqcY=";
|
||||
};
|
||||
|
||||
patches = [ ./test_sleep.patch ];
|
||||
patches = [ ./fix_paths.patch ./test_sleep.patch ];
|
||||
|
||||
hardeningEnable = [ "pie" ];
|
||||
|
||||
|
||||
29
pkgs/os-specific/solo5/fix_paths.patch
Normal file
29
pkgs/os-specific/solo5/fix_paths.patch
Normal file
@ -0,0 +1,29 @@
|
||||
diff --git a/toolchain/cc.in b/toolchain/cc.in
|
||||
index 337562a..0ec9315 100644
|
||||
--- a/toolchain/cc.in
|
||||
+++ b/toolchain/cc.in
|
||||
@@ -30,9 +30,9 @@
|
||||
# symbols.
|
||||
|
||||
prog="$(basename $0)"
|
||||
-I="$(dirname $0)/../include"
|
||||
+I="$(realpath $0 | xargs dirname)/../include"
|
||||
[ ! -d "${I}" ] && echo "$prog: Could not determine include path" 1>&2 && exit 1
|
||||
-L="$(dirname $0)/../lib/@@CONFIG_TARGET_TRIPLE@@"
|
||||
+L="$(realpath $0 | xargs dirname)/../lib/@@CONFIG_TARGET_TRIPLE@@"
|
||||
[ ! -d "${L}" ] && echo "$prog: Could not determine library path" 1>&2 && exit 1
|
||||
# we can't really tell if 'cc' is called with no input, but work around the
|
||||
# most obvious cases and stop them from "succeeding" and producing an "a.out"
|
||||
diff --git a/toolchain/ld.in b/toolchain/ld.in
|
||||
index 01dffa8..13dca2c 100644
|
||||
--- a/toolchain/ld.in
|
||||
+++ b/toolchain/ld.in
|
||||
@@ -28,7 +28,7 @@
|
||||
# linking a unikernel. No default for ABI is provided, as it is expected that a
|
||||
# caller directly using 'ld' knows what they are doing.
|
||||
|
||||
-L="$(dirname $0)/../lib/@@CONFIG_TARGET_TRIPLE@@"
|
||||
+L="$(realpath $0 | xargs dirname)/../lib/@@CONFIG_TARGET_TRIPLE@@"
|
||||
[ ! -d "${L}" ] && echo "$0: Could not determine library path" 1>&2 && exit 1
|
||||
# ld accepts -z solo5-abi=ABI, but does not provide a default ABI
|
||||
# this is intentional
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "consul";
|
||||
version = "1.13.0";
|
||||
version = "1.13.1";
|
||||
rev = "v${version}";
|
||||
|
||||
# Note: Currently only release tags are supported, because they have the Consul UI
|
||||
@ -17,7 +17,7 @@ buildGoModule rec {
|
||||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
inherit rev;
|
||||
sha256 = "sha256-bPLVQ5XvOk6cWtjHNtvZ3McM2SKVbjY6280rIldInpQ=";
|
||||
sha256 = "sha256-Svclb+tLb0gk3xhoslVvAZZf0LR2M5nR9BmMYLBBHck=";
|
||||
};
|
||||
|
||||
passthru.tests.consul = nixosTests.consul;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pure-ftpd";
|
||||
version = "1.0.50";
|
||||
version = "1.0.51";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${version}.tar.gz";
|
||||
sha256 = "08zas1kg5pnckl28gs7q29952pjfyj8rj59bq96hscqbni7gkqmb";
|
||||
sha256 = "sha256-QWD2a3ZhXuojl+rE6j8KFGt5KCB7ebxMwvma17e9lRM=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl pam ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sql_exporter";
|
||||
version = "0.4.2";
|
||||
version = "0.4.4";
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -10,7 +10,7 @@ buildGoModule rec {
|
||||
owner = "justwatchcom";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ujon6TLniQrYRxJe4+ZTu4/dI2K94r9M/lBmMizDZrA=";
|
||||
sha256 = "sha256-A3hMSnfxiEgFYueARuldEHT/5ROCIwWjqQj2FdkVYqo=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dolt";
|
||||
version = "0.40.21";
|
||||
version = "0.40.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolthub";
|
||||
repo = "dolt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oqFOAFJheVJOsFmMo5o0RDaPCPrGrGYnNcUgv4Ead8E=";
|
||||
sha256 = "sha256-MPfi6rfqlbrnl3CE0YKtIAUagqCB6f3cJtZ7mGUQ5Ng=";
|
||||
};
|
||||
|
||||
modRoot = "./go";
|
||||
subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
|
||||
vendorSha256 = "sha256-3W5ZNpZ9TNsqQ/atwMUPHbViyQ5YolwwTNznaRXNoso=";
|
||||
vendorSha256 = "sha256-Iy01voXaCzbBEbJRxcLDzr5BKj4PHfcib3KH21VzFS4=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wmutils-core";
|
||||
version = "1.6";
|
||||
version = "1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wmutils";
|
||||
repo = "core";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Nv8ZTi3qVQyOkwyErjtE6/lLCubcLM2BRTY48r1HhHo=";
|
||||
sha256 = "sha256-OKAvJovGu9rMxEe5g4kdL7Foj41kl3zUYIJa04jf0dI=";
|
||||
};
|
||||
|
||||
buildInputs = [ libxcb xcbutil xcb-util-cursor ];
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, stdenv, fetchFromGitHub, go-md2man }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.3.0";
|
||||
version = "1.5.0";
|
||||
pname = "zfs-prune-snapshots";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bahamas10";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-udzC4AUXk7h7HpRcz0V+kPECzATAYZtX8z2fvKPCZ/c=";
|
||||
sha256 = "sha256-gCf/ZIeIh84WQNs5wZO1/l3zpnl2sNxsFO7cOa92JUM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ go-md2man ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "wallutils";
|
||||
version = "5.11.0";
|
||||
version = "5.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xyproto";
|
||||
repo = "wallutils";
|
||||
rev = version;
|
||||
sha256 = "sha256-5yx6++uciCoT+gcqGnag9V1eYdfwHIQ8WrsuGU4A51E=";
|
||||
sha256 = "sha256-FL66HALXsf7shoUKIZp6HORyuxhOfgTrY+PQAe92yk8=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/xyproto/wallutils";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fortune-mod";
|
||||
version = "3.14.0";
|
||||
version = "3.14.1";
|
||||
|
||||
# We use fetchurl instead of fetchFromGitHub because the release pack has some
|
||||
# special files.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/shlomif/fortune-mod/releases/download/${pname}-${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-jjBxCfjLjnhdKeMgJwEPytCVKQ4R4wHeF8/3Z/F6UgQ=";
|
||||
sha256 = "sha256-NnAj9dsB1ZUuTm2W8mPdK2h15Dtro8ve6c+tPoKUsXs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
|
||||
@ -16,11 +16,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "parted";
|
||||
version = "3.4";
|
||||
version = "3.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/parted/parted-${version}.tar.xz";
|
||||
sha256 = "sha256-4SmAIkctpVibfyvh1e48G2bsPZbfutA9xkKv0AnaU0I=";
|
||||
sha256 = "sha256-STjdXBwSX2x4sfSz4pdSbxjudKpD1FwkhXix0kcMBaI=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" "info" ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "profile-sync-daemon";
|
||||
version = "6.44";
|
||||
version = "6.45";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "graysky2";
|
||||
repo = "profile-sync-daemon";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7sEC2b4mzgbDTFgpH5abZ/kiwEmGdbKkTLiD73Efdls=";
|
||||
hash = "sha256-gUGtoa0NUCzhghEMPgb020UdXjFQMZkx4ZmPJDXNGJc=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "boundary";
|
||||
version = "0.9.1";
|
||||
version = "0.10.1";
|
||||
|
||||
src =
|
||||
let
|
||||
@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
|
||||
aarch64-darwin = "darwin_arm64";
|
||||
};
|
||||
sha256 = selectSystem {
|
||||
x86_64-linux = "sha256-58CcM1bKjH3uEzJ27SBHrZQEUTEFj3U4BS5udd9IL4w=";
|
||||
aarch64-linux = "sha256-/orLwUCco+iSgvGhJ0s0N4BjA4FYsEi9HgeKHHqKw74=";
|
||||
x86_64-darwin = "sha256-twsrQkRWfhFZzc+CTetIUx1hGczrAH91C/0jKPe6kPg=";
|
||||
aarch64-darwin = "sha256-g7pALQ4y4LymAggyHuJSJn0Owhs2BzoNQb1rb9+ZJmw=";
|
||||
x86_64-linux = "sha256-JAwJOu90mrZhWhxQvfRlaWk7dYTC21Z5KQlKWCDJMQg=";
|
||||
aarch64-linux = "sha256-nUIWMt5HPexIlQu5n6LFt1I0WogEdnEhLav6UuLRBXo=";
|
||||
x86_64-darwin = "sha256-rZ2WqbcdcWZ7WXfYowmLZPer3pm74ssK15DEPRA9pPw=";
|
||||
aarch64-darwin = "sha256-zpxdm1Ix+AUl2YCfgI7U9HC01tXtMEV4T/jSDNGDaq8=";
|
||||
};
|
||||
in
|
||||
fetchzip {
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dnscrypt-proxy2";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -12,7 +12,7 @@ buildGoModule rec {
|
||||
owner = "DNSCrypt";
|
||||
repo = "dnscrypt-proxy";
|
||||
rev = version;
|
||||
sha256 = "sha256-BtH/h2HejXDWSoqWRTjZXMLYDRoMe8lSUDX6Gay1gA8=";
|
||||
sha256 = "sha256-vFUbsgLgwQGb/2rValFRuZXguxyAJzOBMLnbVs0swes=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
buildGoModule rec {
|
||||
pname = "kapp";
|
||||
version = "0.51.0";
|
||||
version = "0.52.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "carvel-kapp";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TfTnq6cGlCm8Fv/pf6wAFrxbW2CJyZFze+woxy70OzA=";
|
||||
sha256 = "sha256-sCQD0hZTJaeueBTu4XPiPVC5dhPWkTQn0mKwWVT5H/0=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ callPackage, lib, stdenv, fetchurl, jre, makeWrapper }:
|
||||
|
||||
let this = stdenv.mkDerivation rec {
|
||||
version = "5.4.0";
|
||||
version = "6.0.1";
|
||||
pname = "openapi-generator-cli";
|
||||
|
||||
jarfilename = "${pname}-${version}.jar";
|
||||
@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}";
|
||||
sha256 = "sha256-8+0xIxDjkDJLM7ov//KQzoEpNSB6FJPsXAmNCkQb5Rw=";
|
||||
sha256 = "sha256-upJ5kA0f78nwuXcmS3CffUgcJ41ngAkLNmc7ZcsakSI=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitleaks";
|
||||
version = "8.10.2";
|
||||
version = "8.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zricethezav";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FiR1zJ9aOdysp5807vZ9aX3O7l8GhDXlFDWuyk5zJQw=";
|
||||
sha256 = "sha256-uLCV0eSsQhx9/U/iaAPI25w4Q6pI0PeHAPAQvOJwSWI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-X8z9iKRR3PptNHwy1clZG8QsClsjbW45nZb2fHGfSYk=";
|
||||
|
||||
70
pkgs/tools/security/social-engineer-toolkit/default.nix
Normal file
70
pkgs/tools/security/social-engineer-toolkit/default.nix
Normal file
@ -0,0 +1,70 @@
|
||||
{ lib, fetchFromGitHub, python3Packages, makeWrapper, metasploit }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "social-engineer-toolkit";
|
||||
version = "8.0.3";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trustedsec";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "ePbmUvnzLO0Wfuhym3bNSPV1x8rcCPqKMeWSRcbJGAo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setoolkit \
|
||||
--replace "src/core/config.baseline" "$out/share/social-engineer-toolkit/src/core/config.baseline"
|
||||
substituteInPlace src/core/setcore.py \
|
||||
--replace '"src/core/set.version"' "\"$out/share/social-engineer-toolkit/src/core/set.version\"" \
|
||||
--replace "/opt/metasploit-framework" "${metasploit}/bin"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pexpect
|
||||
pycrypto
|
||||
requests
|
||||
pyopenssl
|
||||
pefile
|
||||
impacket
|
||||
qrcode
|
||||
pillow
|
||||
# Has been abandoned upstream. Features using this library are broken
|
||||
# pymssql
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dt $out/bin setoolkit seautomate seproxy
|
||||
mkdir -p $out/share/social-engineer-toolkit
|
||||
cp -r modules readme src $out/share/social-engineer-toolkit/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--chdir ${placeholder "out"}/share/social-engineer-toolkit"
|
||||
"--prefix PYTHONPATH : \"${placeholder "out"}/share/social-engineer-toolkit\""
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open-source penetration testing framework designed for social engineering";
|
||||
longDescription = ''
|
||||
The Social-Engineer Toolkit is an open-source penetration testing framework
|
||||
designed for social engineering. SET has a number of custom attack vectors
|
||||
that allow you to make a believable attack quickly.
|
||||
'';
|
||||
homepage = "https://github.com/trustedsec/social-engineer-toolkit";
|
||||
mainProgram = "setoolkit";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ emilytrau ];
|
||||
};
|
||||
}
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yubihsm-shell";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Yubico";
|
||||
repo = "yubihsm-shell";
|
||||
rev = version;
|
||||
sha256 = "D0kXiwc+i6mKA4oHuHjgXUmLMsmY5o/VI+1aCWtNjC0=";
|
||||
sha256 = "sha256-rSIdI6ECLte+dEbT8NOUqS8jkozRhbo+eqFrdhTIKpY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stress-ng";
|
||||
version = "0.13.09";
|
||||
version = "0.14.03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ColinIanKing";
|
||||
repo = pname;
|
||||
rev = "V${version}";
|
||||
hash = "sha256-BOOB5fA/Cy1gsRA4j8aj3lVY2y4OvIfoiRqOIY9nZzM=";
|
||||
hash = "sha256-6aA0dWP6q6SJ8TYGctDE2rhDCO5QuAO4cx4J9id9hjY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -9473,7 +9473,9 @@ with pkgs;
|
||||
|
||||
oshka = callPackage ../development/tools/oshka {};
|
||||
|
||||
osl = callPackage ../development/compilers/osl { };
|
||||
osl = libsForQt5.callPackage ../development/compilers/osl {
|
||||
boost = boost165;
|
||||
};
|
||||
|
||||
osqp = callPackage ../development/libraries/science/math/osqp { };
|
||||
|
||||
@ -14262,7 +14264,7 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
cargo-crev = callPackage ../development/tools/rust/cargo-crev {
|
||||
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
|
||||
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation;
|
||||
};
|
||||
cargo-cross = callPackage ../development/tools/rust/cargo-cross { };
|
||||
cargo-deny = callPackage ../development/tools/rust/cargo-deny {
|
||||
@ -21273,6 +21275,8 @@ with pkgs;
|
||||
|
||||
soapyuhd = callPackage ../applications/radio/soapyuhd { };
|
||||
|
||||
social-engineer-toolkit = callPackage ../tools/security/social-engineer-toolkit { };
|
||||
|
||||
socket_wrapper = callPackage ../development/libraries/socket_wrapper { };
|
||||
|
||||
soco-cli = callPackage ../tools/audio/soco-cli { };
|
||||
|
||||
@ -11424,6 +11424,8 @@ in {
|
||||
|
||||
webcolors = callPackage ../development/python-modules/webcolors { };
|
||||
|
||||
webdav4 = callPackage ../development/python-modules/webdav4 { };
|
||||
|
||||
webdavclient3 = callPackage ../development/python-modules/webdavclient3 { };
|
||||
|
||||
webencodings = callPackage ../development/python-modules/webencodings { };
|
||||
@ -11530,6 +11532,8 @@ in {
|
||||
|
||||
wsgi-intercept = callPackage ../development/python-modules/wsgi-intercept { };
|
||||
|
||||
wsgidav = callPackage ../development/python-modules/wsgidav { };
|
||||
|
||||
wsgiprox = callPackage ../development/python-modules/wsgiprox { };
|
||||
|
||||
wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user