mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-03 11:02:05 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
4ea74538ce
|
|
@ -6254,6 +6254,12 @@
|
|||
githubId = 34393802;
|
||||
name = "Malte Voos";
|
||||
};
|
||||
malbarbo = {
|
||||
email = "malbarbo@gmail.com";
|
||||
github = "malbarbo";
|
||||
githubId = 1678126;
|
||||
name = "Marco A L Barbosa";
|
||||
};
|
||||
malyn = {
|
||||
email = "malyn@strangeGizmo.com";
|
||||
github = "malyn";
|
||||
|
|
|
|||
|
|
@ -217,13 +217,13 @@ rec {
|
|||
);
|
||||
|
||||
driver = setupDriverForTest {
|
||||
inherit testScript enableOCR skipLint;
|
||||
inherit testScript enableOCR skipLint passthru;
|
||||
testName = name;
|
||||
qemu_pkg = pkgs.qemu_test;
|
||||
nodes = nodes pkgs.qemu_test;
|
||||
};
|
||||
driverInteractive = setupDriverForTest {
|
||||
inherit testScript enableOCR skipLint;
|
||||
inherit testScript enableOCR skipLint passthru;
|
||||
testName = name;
|
||||
qemu_pkg = pkgs.qemu;
|
||||
nodes = nodes pkgs.qemu;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ rec {
|
|||
# *not* a parent of b.device. If we add a slash at the end of each string,
|
||||
# though, this is not a problem: "/aaa/" is not a prefix of "/aaaa/".
|
||||
normalisePath = path: "${path}${optionalString (!(hasSuffix "/" path)) "/"}";
|
||||
normalise = mount: mount // { device = normalisePath mount.device;
|
||||
normalise = mount: mount // { device = normalisePath (toString mount.device);
|
||||
mountPoint = normalisePath mount.mountPoint;
|
||||
depends = map normalisePath mount.depends;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ import ./make-test-python.nix (
|
|||
podman.wait_for_unit("sockets.target")
|
||||
|
||||
with subtest("DNS works"): # also tests inter-container tcp routing
|
||||
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
|
||||
podman.succeed("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg")
|
||||
podman.succeed(
|
||||
"podman run -d --name=webserver -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin -w ${webroot} scratchimg ${python3}/bin/python -m http.server 8000"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ import ./make-test-python.nix (
|
|||
client.succeed("docker version")
|
||||
|
||||
# via socket would be nicer
|
||||
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
|
||||
podman.succeed("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg")
|
||||
|
||||
client.succeed(
|
||||
"docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ import ./make-test-python.nix (
|
|||
start_all()
|
||||
|
||||
with subtest("Run container as root with runc"):
|
||||
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
|
||||
podman.succeed("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg")
|
||||
podman.succeed(
|
||||
"podman run --runtime=runc -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
|
||||
)
|
||||
|
|
@ -57,7 +57,7 @@ import ./make-test-python.nix (
|
|||
podman.succeed("podman rm sleeping")
|
||||
|
||||
with subtest("Run container as root with crun"):
|
||||
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
|
||||
podman.succeed("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg")
|
||||
podman.succeed(
|
||||
"podman run --runtime=crun -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
|
||||
)
|
||||
|
|
@ -66,7 +66,7 @@ import ./make-test-python.nix (
|
|||
podman.succeed("podman rm sleeping")
|
||||
|
||||
with subtest("Run container as root with the default backend"):
|
||||
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
|
||||
podman.succeed("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg")
|
||||
podman.succeed(
|
||||
"podman run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
|
||||
)
|
||||
|
|
@ -78,7 +78,7 @@ import ./make-test-python.nix (
|
|||
podman.succeed("loginctl enable-linger alice")
|
||||
|
||||
with subtest("Run container rootless with runc"):
|
||||
podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
|
||||
podman.succeed(su_cmd("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg"))
|
||||
podman.succeed(
|
||||
su_cmd(
|
||||
"podman run --runtime=runc -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
|
||||
|
|
@ -89,7 +89,7 @@ import ./make-test-python.nix (
|
|||
podman.succeed(su_cmd("podman rm sleeping"))
|
||||
|
||||
with subtest("Run container rootless with crun"):
|
||||
podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
|
||||
podman.succeed(su_cmd("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg"))
|
||||
podman.succeed(
|
||||
su_cmd(
|
||||
"podman run --runtime=crun -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
|
||||
|
|
@ -100,7 +100,7 @@ import ./make-test-python.nix (
|
|||
podman.succeed(su_cmd("podman rm sleeping"))
|
||||
|
||||
with subtest("Run container rootless with the default backend"):
|
||||
podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg"))
|
||||
podman.succeed(su_cmd("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg"))
|
||||
podman.succeed(
|
||||
su_cmd(
|
||||
"podman run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
|
||||
|
|
@ -112,7 +112,7 @@ import ./make-test-python.nix (
|
|||
|
||||
with subtest("Run container with init"):
|
||||
podman.succeed(
|
||||
"tar cv -C ${pkgs.pkgsStatic.busybox} . | podman import - busybox"
|
||||
"tar cvf busybox.tar -C ${pkgs.pkgsStatic.busybox} . && podman import busybox.tar busybox"
|
||||
)
|
||||
pid = podman.succeed("podman run --rm busybox readlink /proc/self").strip()
|
||||
assert pid == "1"
|
||||
|
|
@ -124,7 +124,7 @@ import ./make-test-python.nix (
|
|||
|
||||
with subtest("Run container via docker cli"):
|
||||
podman.succeed("docker network create default")
|
||||
podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
|
||||
podman.succeed("tar cvf scratchimg.tar --files-from /dev/null && podman import scratchimg.tar scratchimg")
|
||||
podman.succeed(
|
||||
"docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
|
||||
)
|
||||
|
|
|
|||
32
pkgs/applications/misc/neo4j-desktop/default.nix
Normal file
32
pkgs/applications/misc/neo4j-desktop/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ appimageTools, lib, fetchurl }:
|
||||
let
|
||||
pname = "neo4j-desktop";
|
||||
version = "1.4.5";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3-eu-west-1.amazonaws.com/dist.neo4j.org/${pname}/linux-offline/${name}-x86_64.AppImage";
|
||||
sha256 = "sha256-TCkjYhvGhgqgrDEMvC4Ww/sDxRhHC70YgfDlCIFitMo";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit src; name = pname; };
|
||||
in appimageTools.wrapType2 {
|
||||
inherit name src;
|
||||
|
||||
extraPkgs = pkgs: with pkgs; [ libsecret ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
cp -r ${appimageContents}/usr/share/icons $out/share
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A GUI front-end for Neo4j";
|
||||
homepage = "https://neo4j.com/";
|
||||
license = licenses.unfree;
|
||||
maintainers = [ maintainers.bobvanderlinden ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -99,11 +99,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "appgate-sdp";
|
||||
version = "5.4.0";
|
||||
version = "5.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb";
|
||||
sha256 = "sha256-2DzZ5JnFGBeaHtDf7CAXb/qv6kVI+sYMW5Nc25E3eNA=";
|
||||
sha256 = "sha256-wAhcTRO/Cd4MG1lfPNDq92yGcu3NOfymucddy92VaXo=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -174,6 +174,12 @@ let
|
|||
sha256 = "1bxdhxmiy6h4acq26lq43x2mxx6rawmfmlgsh5j7w8kyhkw5af0c";
|
||||
revert = true;
|
||||
})
|
||||
# To fix building from a release tarball (which we do):
|
||||
(githubPatch {
|
||||
# Revert back to generating chromium_git_revision.h via version.py
|
||||
commit = "bd524d08f8465364d12d32a84fd1aa983aecc502";
|
||||
sha256 = "1jsxidg5jzwkrcpx3lylx4gyg56zjyd7sc957kaaqqc853bn83b4";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
|
@ -26,7 +26,7 @@ in writeScript "update-${name}" ''
|
|||
HOME=`mktemp -d`
|
||||
export GNUPGHOME=`mktemp -d`
|
||||
|
||||
gpg --import ${./mozilla.asc}
|
||||
gpg --receive-keys 14F26682D0916CDD81E37B6D61B7B526D98F0353
|
||||
|
||||
tmpfile=`mktemp`
|
||||
url=${baseUrl}
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@ in
|
|||
rec {
|
||||
firefox = common rec {
|
||||
pname = "firefox";
|
||||
ffversion = "89.0";
|
||||
ffversion = "89.0.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
|
||||
sha512 = "5089720feda15d054d0aa4c3bdeb84760314dadd6381d7360e688d8e396154868220c6315add650d8d2a42652cb8a9bfeb833885812ef0bd70a74ee58ad18aa3";
|
||||
sha512 = "67da387b3b6c5a110c83208f9a15d6064adf423bbebfb0fcad2d85f6c4b615b27da0cbd5486b817f0d5e040bc3e70d74d9af72599b24384397fef1dd153bd3f3";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
@ -51,6 +51,7 @@ rec {
|
|||
tests = [ nixosTests.firefox-esr ];
|
||||
updateScript = callPackage ./update.nix {
|
||||
attrPath = "firefox-esr-78-unwrapped";
|
||||
versionSuffix = "esr";
|
||||
versionKey = "ffversion";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
, gnused
|
||||
, gnugrep
|
||||
, curl
|
||||
, gnupg
|
||||
, attrPath
|
||||
, runtimeShell
|
||||
, baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/"
|
||||
|
|
@ -15,7 +16,12 @@
|
|||
|
||||
writeScript "update-${attrPath}" ''
|
||||
#!${runtimeShell}
|
||||
PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused xidel ]}
|
||||
PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnupg gnused xidel ]}
|
||||
|
||||
set -eux
|
||||
HOME=`mktemp -d`
|
||||
export GNUPGHOME=`mktemp -d`
|
||||
gpg --receive-keys 14F26682D0916CDD81E37B6D61B7B526D98F0353
|
||||
|
||||
url=${baseUrl}
|
||||
|
||||
|
|
@ -31,5 +37,11 @@ writeScript "update-${attrPath}" ''
|
|||
sort --version-sort | \
|
||||
tail -n 1`
|
||||
|
||||
update-source-version ${attrPath} "$version" "" "" --version-key=${versionKey}
|
||||
curl --silent --show-error -o "$HOME"/shasums "$url$version/SHA512SUMS"
|
||||
curl --silent --show-error -o "$HOME"/shasums.asc "$url$version/SHA512SUMS.asc"
|
||||
gpgv --keyring="$GNUPGHOME"/pubring.kbx "$HOME"/shasums.asc "$HOME"/shasums
|
||||
|
||||
hash=$(grep '\.source\.tar\.xz$' "$HOME"/shasums | grep '^[^ ]*' -o)
|
||||
|
||||
update-source-version ${attrPath} "$version" "$hash" "" --version-key=${versionKey}
|
||||
''
|
||||
|
|
|
|||
|
|
@ -401,7 +401,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://www.torproject.org/";
|
||||
changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}";
|
||||
platforms = attrNames srcs;
|
||||
maintainers = with maintainers; [ offline matejc thoughtpolice joachifm hax404 cap KarlJoad ];
|
||||
maintainers = with maintainers; [ offline matejc thoughtpolice joachifm hax404 KarlJoad ];
|
||||
mainProgram = "tor-browser";
|
||||
hydraPlatforms = [];
|
||||
# MPL2.0+, GPL+, &c. While it's not entirely clear whether
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubeone";
|
||||
version = "1.2.1";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubermatic";
|
||||
repo = "kubeone";
|
||||
rev = "v${version}";
|
||||
sha256 = "1abm7735c4pjv31pfggkvia7br19zbhjpp2w0n5zckwrjm9hxns6";
|
||||
sha256 = "sha256-oInE8fwE+7a+F4NevKPuYQqCP9GkPhqayLu8HCmVbLs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "01rl4sd9prfw4ivx7dwrr9irjr0xryihp4fzpcjd2zg8f1ibkwsn";
|
||||
vendorSha256 = "sha256-VvO5YnDofdEku9+RC6PPHWSZY8qZt9N3JNzlm5omNAc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "octant";
|
||||
version = "0.20.0";
|
||||
version = "0.21.0";
|
||||
|
||||
src =
|
||||
let
|
||||
|
|
@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
in
|
||||
fetchsrc version {
|
||||
x86_64-linux = "sha256-VFlZP5d6/YhzVIhveqMc4HfapBt0K/XjtqjCQNc514A=";
|
||||
aarch64-linux = "sha256-RfdMfimmoHG4ixBtUVJ/V+mDhQ9aD+yeohkeUMUP8Zg=";
|
||||
x86_64-darwin = "sha256-2Qgl3RdA4mMRTqR7o3Q86Zip5wtgvFp1vZn689FUtSI=";
|
||||
aarch64-darwin = "sha256-+eZVg+B5YYf+XnDhNd6OU4+yFM9GtyiavcAr/EXh7XE=";
|
||||
x86_64-linux = "sha256-Ben2wAquHADWBv1MEfPWxs96pLz1bK2F6bLoYVTSkng=";
|
||||
aarch64-linux = "sha256-1kK0Gu4cQYk+QDJJJiiDan4SnP3Xjr8nLOBtv26UDV4=";
|
||||
x86_64-darwin = "sha256-gOkHpUTWKrikKYZmkfgck3Lf3g5Pakcn0i2A9Hd07UE=";
|
||||
aarch64-darwin = "sha256-Xpl8odVXw4WzF7CEZ+Bbxa6oQDBv9VMzHCNOjIcFGzE=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
pname = "octant-desktop";
|
||||
version = "0.20.0";
|
||||
version = "0.21.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
|
|
@ -15,8 +15,8 @@ let
|
|||
src = fetchurl {
|
||||
url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/Octant-${version}.${suffix}";
|
||||
sha256 = {
|
||||
x86_64-linux = "sha256-mPD5qa/IYsakjcoPnWVpkmhgkhnRK0qTGQ6hanzDt/Y=";
|
||||
x86_64-darwin = "sha256-nxpwBRUeLSPqNEFjF8hKzRhA2ahqh/KyAitnSxYdyJ8=";
|
||||
x86_64-linux = "sha256-Woridi8uGsxvccdeaDzVLs+2YrRKUnm3WbX5LhorM1Y=";
|
||||
x86_64-darwin = "sha256-NF3bm8WFEs4kgrUp+7qCbj6Z6pUMRUp7h4nhJQDJnoY=";
|
||||
}.${system};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -30,9 +30,11 @@ OCTANT_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/vmwa
|
|||
OCTANT_LINUX_X64_SHA256=$(fetch_arch "$OCTANT_VER" "Linux-64bit")
|
||||
OCTANT_LINUX_AARCH64_SHA256=$(fetch_arch "$OCTANT_VER" "Linux-arm64")
|
||||
OCTANT_DARWIN_X64_SHA256=$(fetch_arch "$OCTANT_VER" "macOS-64bit")
|
||||
OCTANT_DARWIN_AARCH64_SHA256=$(fetch_arch "$OCTANT_VER" "macOS-arm64")
|
||||
|
||||
sed -i "s/version = \".*\"/version = \"$OCTANT_VER\"/" "$NIX_DRV"
|
||||
|
||||
replace_sha "x86_64-linux" "$OCTANT_LINUX_X64_SHA256"
|
||||
replace_sha "aarch64-linux" "$OCTANT_LINUX_AARCH64_SHA256"
|
||||
replace_sha "x86_64-darwin" "$OCTANT_DARWIN_X64_SHA256"
|
||||
replace_sha "aarch64-darwin" "$OCTANT_DARWIN_AARCH64_SHA256"
|
||||
|
|
|
|||
|
|
@ -2,22 +2,20 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.30.3";
|
||||
version = "0.30.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kGeGqn0Jgim3gpZUwhIMPV84XD8yYEyH5YMtzidxWRU=";
|
||||
sha256 = "sha256-McV04oE8/LaH9lOU0aKsmS1KpWUC9I/t59WqAYZrIVY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-OgNNq1qRhCufcWemLxh50pzs432RxZpWWcyBB7xeiOs=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
preBuild = ''
|
||||
buildFlagsArray+=("-ldflags" "-s -w -X main.VERSION=v${version}")
|
||||
'';
|
||||
ldflags = [ "-s" "-w" "-X main.VERSION=v${version}" ];
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hyprspace";
|
||||
version = "0.1.2";
|
||||
version = "0.1.4";
|
||||
|
||||
propagatedBuildInputs = lib.optional stdenv.isDarwin iproute2mac;
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildGoModule rec {
|
|||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YQJaK6i4GWEGSlf/1+hzjVhdN6ZjZC55v8w9KEedNg4=";
|
||||
sha256 = "sha256-Rw82m0NJcWgtcXRIb1YNv+Kpe2YufKMNAn1Ph9RB3W8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ErqK2jDTpqUyvll+epdGKRYCJvyvCa90W1GVbbhF0a4=";
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mutt";
|
||||
version = "2.0.7";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-lXaIxqUhVhmS1PLyfPn+sjnHxsAELGBhwOR0p90mzJE=";
|
||||
sha256 = "0dqd6gg1wwhxjgdfl8j0kf93mw43kvd6wrwrzkscq2wjrsy5p0w0";
|
||||
};
|
||||
|
||||
patches = optional smimeSupport (fetchpatch {
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "testssl.sh";
|
||||
version = "3.0.4";
|
||||
version = "3.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drwetter";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Rcvkzw1DfoRXrk0vlpL6CojEHYfYga3voc2hm4qxdmw=";
|
||||
sha256 = "sha256-p2jPpPHtOOmv0CCsXOECgMT9sqa4ZykcJwuGOSkYLaY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
|||
TLS/SSL ciphers, protocols as well as recent cryptographic flaws and more.
|
||||
'';
|
||||
homepage = "https://testssl.sh/";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ etu ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ghr";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tcnksm";
|
||||
repo = "ghr";
|
||||
rev = "v${version}";
|
||||
sha256 = "1nm5kdjkqayxh06j9nr5daic9sw9nx9w06y9gaqhdrw9byvjpr1a";
|
||||
sha256 = "sha256-pF1TPvQLPa5BbXZ9rRCq7xWofXCBRa9CDgNxX/kaTMo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "14avsngzhl1b8a05i43ph6sxh9vj0jls0acxr9j7r0h3f0vpamcj";
|
||||
vendorSha256 = "sha256-+e9Q4Pw9pJyOXVz85KhOSuybj1PBcJi51fGR3a2Gixk=";
|
||||
|
||||
# Tests require a Github API token, and networking
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -17,19 +17,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "podman";
|
||||
version = "3.1.2";
|
||||
version = "3.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "podman";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PS41e7myv5xCSJIeT+SRj4rLVCXpthq7KeHisYoSiOE=";
|
||||
sha256 = "sha256-nnVMK4ST9Z2Oi1yLiFRIc9qAlJF4UEtE90iseHhKGlQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./remove-unconfigured-runtime-warn.patch
|
||||
];
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
doCheck = false;
|
||||
|
|
@ -61,7 +57,7 @@ buildGoModule rec {
|
|||
installPhase = ''
|
||||
runHook preInstall
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
mv bin/{podman-remote,podman}
|
||||
mv bin/{darwin/podman,podman}
|
||||
'' + ''
|
||||
install -Dm555 bin/podman $out/bin/podman
|
||||
installShellCompletion --bash completions/bash/*
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
Remove warning "WARN[0000] Found default OCIruntime /nix/store/.../bin/crun path which is missing from [engine.runtimes] in containers.conf
|
||||
|
||||
It doesn't make sense as we promote using the podman wrapper where runtime paths will vary because they are nix store paths.
|
||||
---
|
||||
vendor/github.com/containers/common/pkg/config/config.go | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go
|
||||
index 4a98c7e92..4a95a2a49 100644
|
||||
--- a/vendor/github.com/containers/common/pkg/config/config.go
|
||||
+++ b/vendor/github.com/containers/common/pkg/config/config.go
|
||||
@@ -605,8 +605,7 @@ func (c *EngineConfig) findRuntime() string {
|
||||
return name
|
||||
}
|
||||
}
|
||||
- if path, err := exec.LookPath(name); err == nil {
|
||||
- logrus.Warningf("Found default OCIruntime %s path which is missing from [engine.runtimes] in containers.conf", path)
|
||||
+ if _, err := exec.LookPath(name); err == nil {
|
||||
return name
|
||||
}
|
||||
}
|
||||
--
|
||||
2.30.0
|
||||
25
pkgs/data/fonts/times-newer-roman/default.nix
Normal file
25
pkgs/data/fonts/times-newer-roman/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "unstable-2018-09-11";
|
||||
in
|
||||
fetchzip {
|
||||
name = "times-newer-roman-${version}";
|
||||
|
||||
url = "https://web.archive.org/web/20210609022835/https://timesnewerroman.com/assets/TimesNewerRoman.zip";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/opentype
|
||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
|
||||
'';
|
||||
|
||||
hash = "sha256-Hx59RYLLwfimEQjEEes0lCpg6iql46DFwhQ7kVGiEzc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A font that looks just like Times New Roman, except each character is 5-10% wider";
|
||||
homepage = "https://timesnewerroman.com/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ samuelgrf ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-dash-to-panel";
|
||||
version = "40";
|
||||
version = "43";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "home-sweet-gnome";
|
||||
repo = "dash-to-panel";
|
||||
rev = "v${version}";
|
||||
sha256 = "07jq8d16nn62ikis896nyfn3q02f5srj754fmiblhz472q4ljc3p";
|
||||
sha256 = "08n6lwcj943p0vzi2vif7j3nza6xg5z1yka68vwc34ia9ys352m7";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
101
pkgs/development/compilers/scryer-prolog/cargo.patch
Normal file
101
pkgs/development/compilers/scryer-prolog/cargo.patch
Normal file
|
|
@ -0,0 +1,101 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index ef25833..d9de212 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -41,9 +41,9 @@ checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
|
||||
|
||||
[[package]]
|
||||
name = "az"
|
||||
-version = "0.3.1"
|
||||
+version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "41a6b78289a33e09b00818ca8c90ab17c5dabb6e74f4b29a6de679c0e0886ade"
|
||||
+checksum = "e9bcd47d94aa4eb8c076b50fc61a75020789394ffb9bd74a180b3379130f6569"
|
||||
|
||||
[[package]]
|
||||
name = "base64"
|
||||
@@ -384,9 +384,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gmp-mpfr-sys"
|
||||
-version = "1.2.2"
|
||||
+version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "63d7f805cf9df081683d463f62864bda8b8e3ce7162a8e11cd0c49f27b8ce89b"
|
||||
+checksum = "ad4e8e85ec9fb902b4564deeb17b1a263d3ba1334bef56154418aa045b159508"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"winapi 0.3.8",
|
||||
@@ -766,15 +766,6 @@ version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
|
||||
|
||||
-[[package]]
|
||||
-name = "openssl-src"
|
||||
-version = "111.9.0+1.1.1g"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "a2dbe10ddd1eb335aba3780eb2eaa13e1b7b441d2562fd962398740927f39ec4"
|
||||
-dependencies = [
|
||||
- "cc",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "openssl-sys"
|
||||
version = "0.9.58"
|
||||
@@ -784,7 +775,6 @@ dependencies = [
|
||||
"autocfg 1.0.0",
|
||||
"cc",
|
||||
"libc",
|
||||
- "openssl-src",
|
||||
"pkg-config",
|
||||
"vcpkg",
|
||||
]
|
||||
@@ -1159,9 +1149,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rug"
|
||||
-version = "1.8.0"
|
||||
+version = "1.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "72315b6d9cb7d886fb99724330c47ceb29e923df657c31da3849fe88c0ded710"
|
||||
+checksum = "e538d00da450a8e48aac7e6322e67b2dc86ec71a1feeac0e3954c4f07f01bc45"
|
||||
dependencies = [
|
||||
"az",
|
||||
"gmp-mpfr-sys",
|
||||
@@ -1232,7 +1222,7 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
|
||||
|
||||
[[package]]
|
||||
name = "scryer-prolog"
|
||||
-version = "0.8.126"
|
||||
+version = "0.8.127"
|
||||
dependencies = [
|
||||
"base64 0.12.3",
|
||||
"blake2",
|
||||
@@ -1243,6 +1233,7 @@ dependencies = [
|
||||
"divrem",
|
||||
"downcast",
|
||||
"git-version",
|
||||
+ "gmp-mpfr-sys",
|
||||
"hostname",
|
||||
"indexmap",
|
||||
"lazy_static",
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index c359e1b..75c4325 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -41,10 +41,14 @@ ring = "0.16.13"
|
||||
ripemd160 = "0.8.0"
|
||||
sha3 = "0.8.2"
|
||||
blake2 = "0.8.1"
|
||||
-openssl = { version = "0.10.29", features = ["vendored"] }
|
||||
+openssl = { version = "0.10.29" }
|
||||
native-tls = "0.2.4"
|
||||
chrono = "0.4.11"
|
||||
select = "0.4.3"
|
||||
roxmltree = "0.11.0"
|
||||
base64 = "0.12.3"
|
||||
sodiumoxide = "0.2.6"
|
||||
+
|
||||
+[dependencies.gmp-mpfr-sys]
|
||||
+version = "1.4"
|
||||
+features = ["use-system-libs"]
|
||||
36
pkgs/development/compilers/scryer-prolog/default.nix
Normal file
36
pkgs/development/compilers/scryer-prolog/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, gmp
|
||||
, libmpc
|
||||
, mpfr
|
||||
, openssl
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "scryer-prolog";
|
||||
version = "0.8.127";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mthom";
|
||||
repo = "scryer-prolog";
|
||||
rev = "v${version}";
|
||||
sha256 = "0307yclslkdx6f0h0101a3da47rhz6qizf4i8q8rjh4id8wpdsn8";
|
||||
};
|
||||
|
||||
# Use system openssl, gmp, mpc and mpfr.
|
||||
cargoPatches = [ ./cargo.patch ];
|
||||
|
||||
cargoSha256 = "0gb0l2wwf8079jwggn9zxk8pz8pxg3b7pin1d7dsbd4ij52lzyi2";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl gmp libmpc mpfr ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A modern Prolog implementation written mostly in Rust.";
|
||||
homepage = "https://github.com/mthom/scryer-prolog";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ malbarbo ];
|
||||
};
|
||||
}
|
||||
45
pkgs/development/guile-modules/guile-gcrypt/default.nix
Normal file
45
pkgs/development/guile-modules/guile-gcrypt/default.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitea
|
||||
, guile
|
||||
, libgcrypt
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, texinfo
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "guile-gcrypt";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "notabug.org";
|
||||
owner = "cwebber";
|
||||
repo = "guile-gcrypt";
|
||||
rev = "v${version}";
|
||||
sha256 = "LKXIwO8v/T/h1JKARWD5ta57sgRcVu7hcYYwr3wUQ1g=";
|
||||
};
|
||||
|
||||
postConfigure = ''
|
||||
sed -i '/moddir\s*=/s%=.*%=''${out}/share/guile/site%' Makefile;
|
||||
sed -i '/godir\s*=/s%=.*%=''${out}/share/guile/ccache%' Makefile;
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook pkg-config texinfo
|
||||
];
|
||||
buildInputs = [
|
||||
guile
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
libgcrypt
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bindings to Libgcrypt for GNU Guile";
|
||||
homepage = "https://notabug.org/cwebber/guile-gcrypt";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ethancedwards8 ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
42
pkgs/development/python-modules/epson-projector/default.nix
Normal file
42
pkgs/development/python-modules/epson-projector/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, aiohttp
|
||||
, async-timeout
|
||||
, pyserial-asyncio
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "epson-projector";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "epson_projector";
|
||||
inherit version;
|
||||
sha256 = "4ade1c7a0f7008d23b08bd886c8790c44cf7d60453d1eb5a8077c92aaf790d30";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
pyserial-asyncio
|
||||
];
|
||||
|
||||
# tests need real device
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"epson_projector"
|
||||
"epson_projector.const"
|
||||
"epson_projector.projector_http"
|
||||
"epson_projector.projector_serial"
|
||||
"epson_projector.projector_tcp"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Epson projector support for Python";
|
||||
homepage = "https://github.com/pszafer/epson_projector";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
34
pkgs/development/python-modules/pmsensor/default.nix
Normal file
34
pkgs/development/python-modules/pmsensor/default.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pyserial
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pmsensor";
|
||||
version = "0.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7fc03aafb791ca70d847c9ab97cf181bc7d8f7345efb4b0c3f66c07b9c7dee69";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyserial
|
||||
];
|
||||
|
||||
# no tests implemented
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pmsensor.co2sensor"
|
||||
"pmsensor.serial_pm"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to read data from environment sensors";
|
||||
homepage = "https://github.com/open-homeautomation/pmsensor";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
39
pkgs/development/python-modules/sense-energy/default.nix
Normal file
39
pkgs/development/python-modules/sense-energy/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, aiohttp
|
||||
, requests
|
||||
, websocket-client
|
||||
, websockets
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sense-energy";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scottbonline";
|
||||
repo = "sense";
|
||||
rev = version;
|
||||
sha256 = "1lbarsa9wpm7hnhgf2g253w0gs80cn989dnj4aqmic57x5isikhz";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
requests
|
||||
websocket-client
|
||||
websockets
|
||||
];
|
||||
|
||||
# no tests implemented
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "sense_energy" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "API for the Sense Energy Monitor";
|
||||
homepage = "https://github.com/scottbonline/sense";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
40
pkgs/development/python-modules/xtensor-python/default.nix
Normal file
40
pkgs/development/python-modules/xtensor-python/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, gtest
|
||||
, xtensor
|
||||
, pybind11
|
||||
, numpy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xtensor-python";
|
||||
version = "0.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xtensor-stack";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "17la76hn4r1jv67dzz8x2pzl608r0mnvz854407mchlzj6rhsxza";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pybind11 ];
|
||||
|
||||
propagatedBuildInputs = [ xtensor numpy ];
|
||||
|
||||
dontUseSetuptoolsBuild = true;
|
||||
dontUsePipInstall = true;
|
||||
dontUseSetuptoolsCheck = true;
|
||||
|
||||
checkInputs = [
|
||||
gtest
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/xtensor-stack/xtensor-python";
|
||||
description = "Python bindings for the xtensor C++ multi-dimensional array library";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ lsix ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kustomize-sops";
|
||||
version = "2.5.5";
|
||||
version = "2.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "viaduct-ai";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lNC8TwX462Lnt/uiKWt9hNa81g3tdenvvuNQJNkj7hM=";
|
||||
sha256 = "sha256-UEtWEOuekFbMUJFWYdXfzbCWCz4I7vVdb9UBQbMXF/A=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-uStmUhiZuUguxUx2L8ifSNnbMCs7Jk+6tq7qZdACjag=";
|
||||
vendorSha256 = "sha256-kNJkSivSj8LMeXobKazLy9MCTtWzrBn99GmvaH+qIUU=";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-cache";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matthiaskrgr";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-/xP6TQcLyY1XC8r5SCkwej/I6fMaV5PqNNuvK1WbmeM=";
|
||||
sha256 = "sha256-y6rvdY9511XScxLWPrH9aUFgSmRYmGqKE56MPBTH9OM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-1ZNbqydRsXmMGLhqPrgNAE8bhpZCMAJO/YQbOvtiS/s=";
|
||||
cargoSha256 = "sha256-H6MBAXrKu4hZwx3lGHN6YMuYzeb21Zq0tVlF/lsQmLI=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +1,23 @@
|
|||
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, CoreServices, Security, libiconv }:
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, CoreServices, Security, libiconv, SystemConfiguration }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-udeps";
|
||||
version = "0.1.21";
|
||||
version = "0.1.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "est31";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Voei7j3WRDu70NkcJvjqPJ4ikOUupOhvFNEHHRyF6/Q=";
|
||||
sha256 = "sha256-z92q0uwL832Ph7sTpWpaa8e9Xrik9wnjQ7LBy/hY8KE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-zMya7bEehNKIfwQtJ252sflg06P4Ra8/lgBjn4UUqRg=";
|
||||
cargoSha256 = "sha256-4HguNyPIjpFqa80dDVFgXDK7pHOuFJdpFNxLARXxT2g=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
# TODO figure out how to use provided curl instead of compiling curl from curl-sys
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv ];
|
||||
++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv SystemConfiguration ];
|
||||
|
||||
# Requires network access
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -222,7 +222,7 @@
|
|||
"emoncms_history" = ps: with ps; [ ];
|
||||
"emonitor" = ps: with ps; [ aioemonitor ];
|
||||
"emulated_hue" = ps: with ps; [ aiohttp-cors ];
|
||||
"emulated_kasa" = ps: with ps; [ ]; # missing inputs: sense_energy
|
||||
"emulated_kasa" = ps: with ps; [ sense-energy ];
|
||||
"emulated_roku" = ps: with ps; [ ]; # missing inputs: emulated_roku
|
||||
"enigma2" = ps: with ps; [ openwebifpy ];
|
||||
"enocean" = ps: with ps; [ ]; # missing inputs: enocean
|
||||
|
|
@ -232,7 +232,7 @@
|
|||
"envirophat" = ps: with ps; [ smbus-cffi ]; # missing inputs: envirophat
|
||||
"envisalink" = ps: with ps; [ pyenvisalink ];
|
||||
"ephember" = ps: with ps; [ ]; # missing inputs: pyephember
|
||||
"epson" = ps: with ps; [ ]; # missing inputs: epson-projector
|
||||
"epson" = ps: with ps; [ epson-projector ];
|
||||
"epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter
|
||||
"eq3btsmart" = ps: with ps; [ construct ]; # missing inputs: python-eq3bt
|
||||
"esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors ifaddr zeroconf ];
|
||||
|
|
@ -503,7 +503,7 @@
|
|||
"meteoclimatic" = ps: with ps; [ pymeteoclimatic ];
|
||||
"metoffice" = ps: with ps; [ ]; # missing inputs: datapoint
|
||||
"mfi" = ps: with ps; [ ]; # missing inputs: mficlient
|
||||
"mhz19" = ps: with ps; [ ]; # missing inputs: pmsensor
|
||||
"mhz19" = ps: with ps; [ pmsensor ];
|
||||
"microsoft" = ps: with ps; [ ]; # missing inputs: pycsspeechtts
|
||||
"microsoft_face" = ps: with ps; [ aiohttp-cors ];
|
||||
"microsoft_face_detect" = ps: with ps; [ aiohttp-cors ];
|
||||
|
|
@ -733,13 +733,13 @@
|
|||
"search" = ps: with ps; [ aiohttp-cors ];
|
||||
"season" = ps: with ps; [ ephem ];
|
||||
"sendgrid" = ps: with ps; [ sendgrid ];
|
||||
"sense" = ps: with ps; [ ]; # missing inputs: sense_energy
|
||||
"sense" = ps: with ps; [ sense-energy ];
|
||||
"sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat
|
||||
"sensibo" = ps: with ps; [ ]; # missing inputs: pysensibo
|
||||
"sensor" = ps: with ps; [ sqlalchemy ];
|
||||
"sentry" = ps: with ps; [ sentry-sdk ];
|
||||
"serial" = ps: with ps; [ pyserial-asyncio ];
|
||||
"serial_pm" = ps: with ps; [ ]; # missing inputs: pmsensor
|
||||
"serial_pm" = ps: with ps; [ pmsensor ];
|
||||
"sesame" = ps: with ps; [ ]; # missing inputs: pysesame2
|
||||
"seven_segments" = ps: with ps; [ pillow ];
|
||||
"seventeentrack" = ps: with ps; [ ]; # missing inputs: py17track
|
||||
|
|
|
|||
|
|
@ -371,7 +371,9 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"elgato"
|
||||
"emonitor"
|
||||
"emulated_hue"
|
||||
"emulated_kasa"
|
||||
"enphase_envoy"
|
||||
"epson"
|
||||
"esphome"
|
||||
"everlights"
|
||||
"ezviz"
|
||||
|
|
@ -501,6 +503,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"met"
|
||||
"met_eireann"
|
||||
"meteoclimatic"
|
||||
"mhz19"
|
||||
"microsoft_face"
|
||||
"microsoft_face_detect"
|
||||
"microsoft_face_identify"
|
||||
|
|
@ -596,6 +599,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"script"
|
||||
"search"
|
||||
"season"
|
||||
"sense"
|
||||
"sensor"
|
||||
"sentry"
|
||||
"sharkiq"
|
||||
|
|
|
|||
85
pkgs/tools/misc/asdf-vm/default.nix
Normal file
85
pkgs/tools/misc/asdf-vm/default.nix
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
{ stdenv, lib, fetchFromGitHub, makeWrapper, installShellFiles, bash, coreutils, curl, git, writeScript }:
|
||||
|
||||
let
|
||||
asdfReshimFile = writeScript "asdf-reshim" ''
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# asdf-vm create "shim" file like this:
|
||||
#
|
||||
# exec $ASDF_DIR/bin/asdf exec "node" "$@"
|
||||
#
|
||||
# So we should reshim all installed versions every time shell initialized,
|
||||
# because $out always change
|
||||
|
||||
asdfDir="''${ASDF_DIR:-$HOME/.asdf}"
|
||||
asdfDataDir="''${ASDF_DATA_DIR:-$HOME/.asdf}"
|
||||
|
||||
prevAsdfDirFilePath="$asdfDataDir/.nix-prev-asdf-dir-path"
|
||||
|
||||
if [ -r "$prevAsdfDirFilePath" ]; then
|
||||
prevAsdfDir="$(cat "$prevAsdfDirFilePath")"
|
||||
else
|
||||
prevAsdfDir=""
|
||||
fi
|
||||
|
||||
if [ "$prevAsdfDir" != "$asdfDir" ]; then
|
||||
rm -rf "$asdfDataDir"/shims
|
||||
"$asdfDir"/bin/asdf reshim
|
||||
echo "$asdfDir" > "$prevAsdfDirFilePath"
|
||||
fi
|
||||
'';
|
||||
|
||||
asdfPrepareFile = writeScript "asdf-prepare" ''
|
||||
ASDF_DIR="@asdfDir@"
|
||||
|
||||
source "$ASDF_DIR/asdf.sh"
|
||||
${asdfReshimFile}
|
||||
'';
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "asdf-vm";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asdf-vm";
|
||||
repo = "asdf";
|
||||
rev = "v${version}";
|
||||
sha256 = "07lh5k1krzm7fbkv0jlwbzz5ycn2jg7s12dnqwmy82qqic0sl6fl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
bash
|
||||
curl
|
||||
git
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/asdf-vm
|
||||
cp -r . $out/share/asdf-vm
|
||||
|
||||
mkdir -p $out/etc/profile.d
|
||||
substitute ${asdfPrepareFile} $out/etc/profile.d/asdf-prepare.sh \
|
||||
--replace "@asdfDir@" "$out/share/asdf-vm"
|
||||
|
||||
mkdir -p $out/bin
|
||||
makeWrapper $out/share/asdf-vm/bin/asdf $out/bin/asdf \
|
||||
--set ASDF_DIR $out/share/asdf-vm
|
||||
|
||||
installShellCompletion --cmd asdf \
|
||||
--zsh completions/_asdf \
|
||||
--fish completions/asdf.fish \
|
||||
--bash completions/asdf.bash
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Extendable version manager with support for Ruby, Node.js, Erlang & more";
|
||||
homepage = "https://asdf-vm.com/";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.c4605 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
25
pkgs/tools/misc/infracost/default.nix
Normal file
25
pkgs/tools/misc/infracost/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, terraform }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "infracost";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "infracost";
|
||||
rev = "v${version}";
|
||||
repo = "infracost";
|
||||
sha256 = "sha256-3dR4NZ1PiMuHNO+xl3zxeBLPOZTLAbJ0VtYJNYpJuXI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-YHewZsIiDPsgJVYwQX/FovlD+UzJflXy/0oglk8ZkKk=";
|
||||
|
||||
checkInputs = [ terraform ];
|
||||
checkPhase = "make test";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cloud cost estimates for Terraform in your CLI and pull requests";
|
||||
homepage = "https://github.com/infracost/infracost";
|
||||
license = [ licenses.asl20 ];
|
||||
maintainers = [ maintainers.davegallant ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "less";
|
||||
version = "563";
|
||||
version = "581.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.greenwoodsoftware.com/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "16lsvk88vwjwp5ax1wnll44wxwnzs8lb2fn90xx2si64kwmnsnyf";
|
||||
url = "https://www.greenwoodsoftware.com/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0fyqslvrasv19qjvqrwfwz2n7mnm93y61x9bcx09ga90mxyb8d6f";
|
||||
};
|
||||
|
||||
configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc.
|
||||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ ncurses ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.greenwoodsoftware.com/less/";
|
||||
homepage = "https://www.greenwoodsoftware.com/less/";
|
||||
description = "A more advanced file pager than ‘more’";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.gpl3;
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-release";
|
||||
version = "0.13.11";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sunng87";
|
||||
repo = "cargo-release";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-v0XKLwxUIxBt9hIUzprz+VsxCRifH1/SbNcI0sH2ENM=";
|
||||
sha256 = "sha256-vb2YpoF/mO/FQpXxVfJxECep5H7DCOKNcud9XqL3Bug=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-zbET6UsV29hAL83rw3XRgrcM5FABFNI3w3Kbd61FS7E=";
|
||||
cargoSha256 = "sha256-F4Cr20EiWIu4ghE/rDzNEHhZGJWlC9jFXi6/rc4BFy8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ]
|
||||
|
|
|
|||
|
|
@ -11915,7 +11915,7 @@ in
|
|||
cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { };
|
||||
cargo-sync-readme = callPackage ../development/tools/rust/cargo-sync-readme {};
|
||||
cargo-udeps = callPackage ../development/tools/rust/cargo-udeps {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
|
||||
};
|
||||
cargo-valgrind = callPackage ../development/tools/rust/cargo-valgrind { };
|
||||
cargo-watch = callPackage ../development/tools/rust/cargo-watch {
|
||||
|
|
@ -11990,6 +11990,8 @@ in
|
|||
};
|
||||
scalafmt = callPackage ../development/tools/scalafmt { };
|
||||
|
||||
scryer-prolog = callPackage ../development/compilers/scryer-prolog { };
|
||||
|
||||
sdcc = callPackage ../development/compilers/sdcc {
|
||||
gputils = null;
|
||||
};
|
||||
|
|
@ -12687,6 +12689,8 @@ in
|
|||
|
||||
guile-fibers = callPackage ../development/guile-modules/guile-fibers { };
|
||||
|
||||
guile-gcrypt = callPackage ../development/guile-modules/guile-gcrypt { };
|
||||
|
||||
guile-git = callPackage ../development/guile-modules/guile-git { };
|
||||
|
||||
guile-gnome = callPackage ../development/guile-modules/guile-gnome {
|
||||
|
|
@ -12718,6 +12722,8 @@ in
|
|||
|
||||
inav-blackbox-tools = callPackage ../tools/misc/inav-blackbox-tools { };
|
||||
|
||||
infracost = callPackage ../tools/misc/infracost { };
|
||||
|
||||
msp430GccSupport = callPackage ../development/misc/msp430/gcc-support.nix { };
|
||||
|
||||
msp430Newlib = callPackage ../development/misc/msp430/newlib.nix { };
|
||||
|
|
@ -12757,6 +12763,7 @@ in
|
|||
|
||||
xidel = callPackage ../tools/text/xidel { };
|
||||
|
||||
asdf-vm = callPackage ../tools/misc/asdf-vm { };
|
||||
|
||||
### DEVELOPMENT / TOOLS
|
||||
|
||||
|
|
@ -19731,6 +19738,8 @@ in
|
|||
|
||||
neo4j = callPackage ../servers/nosql/neo4j { };
|
||||
|
||||
neo4j-desktop = callPackage ../applications/misc/neo4j-desktop { };
|
||||
|
||||
check-esxi-hardware = callPackage ../servers/monitoring/plugins/esxi.nix {};
|
||||
|
||||
net-snmp = callPackage ../servers/monitoring/net-snmp { };
|
||||
|
|
@ -22515,6 +22524,8 @@ in
|
|||
|
||||
theme-vertex = callPackage ../data/themes/vertex { };
|
||||
|
||||
times-newer-roman = callPackage ../data/fonts/times-newer-roman { };
|
||||
|
||||
tipa = callPackage ../data/fonts/tipa { };
|
||||
|
||||
ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { };
|
||||
|
|
|
|||
|
|
@ -2299,6 +2299,8 @@ in {
|
|||
|
||||
ephem = callPackage ../development/python-modules/ephem { };
|
||||
|
||||
epson-projector = callPackage ../development/python-modules/epson-projector { };
|
||||
|
||||
eradicate = callPackage ../development/python-modules/eradicate { };
|
||||
|
||||
escapism = callPackage ../development/python-modules/escapism { };
|
||||
|
|
@ -5242,6 +5244,8 @@ in {
|
|||
|
||||
pkuseg = callPackage ../development/python-modules/pkuseg { };
|
||||
|
||||
pmsensor = callPackage ../development/python-modules/pmsensor { };
|
||||
|
||||
ppdeep = callPackage ../development/python-modules/ppdeep { };
|
||||
|
||||
pyatag = callPackage ../development/python-modules/pyatag { };
|
||||
|
|
@ -7722,6 +7726,8 @@ in {
|
|||
|
||||
sendgrid = callPackage ../development/python-modules/sendgrid { };
|
||||
|
||||
sense-energy = callPackage ../development/python-modules/sense-energy { };
|
||||
|
||||
sentencepiece = callPackage ../development/python-modules/sentencepiece {
|
||||
inherit (pkgs) sentencepiece;
|
||||
};
|
||||
|
|
@ -9187,6 +9193,8 @@ in {
|
|||
|
||||
xstatic-pygments = callPackage ../development/python-modules/xstatic-pygments { };
|
||||
|
||||
xtensor-python = callPackage ../development/python-modules/xtensor-python { };
|
||||
|
||||
xvfbwrapper = callPackage ../development/python-modules/xvfbwrapper {
|
||||
inherit (pkgs.xorg) xorgserver;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue