Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
19e8f1b28f
@ -1059,6 +1059,16 @@ Superuser created successfully.
|
||||
changelog</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>opencv2</literal> no longer includes the non-free
|
||||
libraries by default, and consequently
|
||||
<literal>pfstools</literal> no longer includes OpenCV support
|
||||
by default. Both packages now support an
|
||||
<literal>enableUnfree</literal> option to re-enable this
|
||||
functionality.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-21.11-notable-changes">
|
||||
|
||||
@ -331,6 +331,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
respectively. As a result `services.datadog-agent` has had breaking changes to the
|
||||
configuration file. For details, see the [upstream changelog](https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst).
|
||||
|
||||
- `opencv2` no longer includes the non-free libraries by default, and consequently `pfstools` no longer includes OpenCV support by default. Both packages now support an `enableUnfree` option to re-enable this functionality.
|
||||
|
||||
## Other Notable Changes {#sec-release-21.11-notable-changes}
|
||||
|
||||
|
||||
|
||||
@ -66,7 +66,7 @@ in
|
||||
RestrictNamespaces = "yes";
|
||||
RestrictRealtime = "yes";
|
||||
RestrictSUIDSGID = "yes";
|
||||
MemoryDenyWriteExecute = "yes";
|
||||
MemoryDenyWriteExecute = "no"; # v8 JIT requires memory segments to be Writable-Executable.
|
||||
LockPersonality = "yes";
|
||||
};
|
||||
};
|
||||
|
||||
@ -108,15 +108,17 @@ let
|
||||
''
|
||||
#! ${pkgs.runtimeShell}
|
||||
|
||||
set -e
|
||||
|
||||
NIX_DISK_IMAGE=$(readlink -f "''${NIX_DISK_IMAGE:-${config.virtualisation.diskImage}}")
|
||||
|
||||
if ! test -e "$NIX_DISK_IMAGE"; then
|
||||
${qemu}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" \
|
||||
${toString config.virtualisation.diskSize}M || exit 1
|
||||
${toString config.virtualisation.diskSize}M
|
||||
fi
|
||||
|
||||
# Create a directory for storing temporary data of the running VM.
|
||||
if [ -z "$TMPDIR" -o -z "$USE_TMPDIR" ]; then
|
||||
if [ -z "$TMPDIR" ] || [ -z "$USE_TMPDIR" ]; then
|
||||
TMPDIR=$(mktemp -d nix-vm.XXXXXXXXXX --tmpdir)
|
||||
fi
|
||||
|
||||
@ -127,7 +129,7 @@ let
|
||||
''
|
||||
# Create a writable copy/snapshot of the boot disk.
|
||||
# A writable boot disk can be booted from automatically.
|
||||
${qemu}/bin/qemu-img create -f qcow2 -F qcow2 -b ${bootDisk}/disk.img "$TMPDIR/disk.img" || exit 1
|
||||
${qemu}/bin/qemu-img create -f qcow2 -F qcow2 -b ${bootDisk}/disk.img "$TMPDIR/disk.img"
|
||||
|
||||
NIX_EFI_VARS=$(readlink -f "''${NIX_EFI_VARS:-${cfg.efiVars}}")
|
||||
|
||||
@ -135,13 +137,13 @@ let
|
||||
''
|
||||
# VM needs writable EFI vars
|
||||
if ! test -e "$NIX_EFI_VARS"; then
|
||||
cp ${bootDisk}/efi-vars.fd "$NIX_EFI_VARS" || exit 1
|
||||
chmod 0644 "$NIX_EFI_VARS" || exit 1
|
||||
cp ${bootDisk}/efi-vars.fd "$NIX_EFI_VARS"
|
||||
chmod 0644 "$NIX_EFI_VARS"
|
||||
fi
|
||||
''}
|
||||
''}
|
||||
|
||||
cd "$TMPDIR" || exit 1
|
||||
cd "$TMPDIR"
|
||||
|
||||
${lib.optionalString (cfg.emptyDiskImages != []) "idx=0"}
|
||||
${flip concatMapStrings cfg.emptyDiskImages (size: ''
|
||||
|
||||
@ -4,10 +4,10 @@
|
||||
}:
|
||||
|
||||
with import ../lib/testing-python.nix { inherit system pkgs; };
|
||||
with import ../lib/qemu-flags.nix { inherit pkgs; };
|
||||
with pkgs.lib;
|
||||
|
||||
let
|
||||
qemu-common = import ../lib/qemu-common.nix { inherit (pkgs) lib pkgs; };
|
||||
|
||||
iso =
|
||||
(import ../lib/eval-config.nix {
|
||||
@ -23,7 +23,7 @@ let
|
||||
makeBootTest = name: extraConfig:
|
||||
let
|
||||
machineConfig = pythonDict ({
|
||||
qemuBinary = qemuBinary pkgs.qemu_test;
|
||||
qemuBinary = qemu-common.qemuBinary pkgs.qemu_test;
|
||||
qemuFlags = "-m 768";
|
||||
} // extraConfig);
|
||||
in
|
||||
@ -65,7 +65,7 @@ let
|
||||
];
|
||||
};
|
||||
machineConfig = pythonDict ({
|
||||
qemuBinary = qemuBinary pkgs.qemu_test;
|
||||
qemuBinary = qemu-common.qemuBinary pkgs.qemu_test;
|
||||
qemuFlags = "-boot order=n -m 2000";
|
||||
netBackendArgs = "tftp=${ipxeBootDir},bootfile=netboot.ipxe";
|
||||
} // extraConfig);
|
||||
|
||||
@ -82,7 +82,7 @@ in
|
||||
# chromium-based browsers refuse to run as root
|
||||
test-support.displayManager.auto.user = "alice";
|
||||
# browsers may hang with the default memory
|
||||
virtualisation.memorySize = "500";
|
||||
virtualisation.memorySize = 500;
|
||||
|
||||
networking.hosts."127.0.0.1" = [ "good.example.com" "bad.example.com" ];
|
||||
security.pki.certificateFiles = [ "${example-good-cert}/ca.crt" ];
|
||||
@ -113,7 +113,7 @@ in
|
||||
# which is why it will not use the system certificate store for the time being.
|
||||
# firefox
|
||||
chromium
|
||||
falkon
|
||||
qutebrowser
|
||||
midori
|
||||
];
|
||||
};
|
||||
@ -152,21 +152,21 @@ in
|
||||
with subtest("Unknown CA is untrusted in curl"):
|
||||
machine.fail("curl -fv https://bad.example.com")
|
||||
|
||||
browsers = [
|
||||
browsers = {
|
||||
# Firefox was disabled here, because we needed to disable p11-kit support in nss,
|
||||
# which is why it will not use the system certificate store for the time being.
|
||||
# "firefox",
|
||||
"chromium",
|
||||
"falkon",
|
||||
"midori"
|
||||
]
|
||||
errors = ["Security Risk", "not private", "Certificate Error", "Security"]
|
||||
#"firefox": "Security Risk",
|
||||
"chromium": "not private",
|
||||
"qutebrowser -T": "Certificate error",
|
||||
"midori": "Security"
|
||||
}
|
||||
|
||||
machine.wait_for_x()
|
||||
for browser, error in zip(browsers, errors):
|
||||
for command, error in browsers.items():
|
||||
browser = command.split()[0]
|
||||
with subtest("Good certificate is trusted in " + browser):
|
||||
execute_as(
|
||||
"alice", f"env P11_KIT_DEBUG=trust {browser} https://good.example.com & >&2"
|
||||
"alice", f"env P11_KIT_DEBUG=trust {command} https://good.example.com & >&2"
|
||||
)
|
||||
wait_for_window_as("alice", browser)
|
||||
machine.wait_for_text("It works!")
|
||||
@ -174,7 +174,7 @@ in
|
||||
execute_as("alice", "xdotool key ctrl+w") # close tab
|
||||
|
||||
with subtest("Unknown CA is untrusted in " + browser):
|
||||
execute_as("alice", f"{browser} https://bad.example.com & >&2")
|
||||
execute_as("alice", f"{command} https://bad.example.com & >&2")
|
||||
machine.wait_for_text(error)
|
||||
machine.screenshot("bad" + browser)
|
||||
machine.succeed("pkill " + browser)
|
||||
|
||||
@ -119,7 +119,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
|
||||
with subtest("The pullImage tool works"):
|
||||
docker.succeed(
|
||||
"docker load --input='${examples.nixFromDockerHub}'",
|
||||
"docker load --input='${examples.testNixFromDockerHub}'",
|
||||
"docker run --rm nix:2.2.1 nix-store --version",
|
||||
"docker rmi nix:2.2.1",
|
||||
)
|
||||
@ -378,5 +378,10 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
docker.succeed(
|
||||
"docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/jane | grep -E ^1000$'"
|
||||
)
|
||||
|
||||
with subtest("exportImage produces a valid tarball"):
|
||||
docker.succeed(
|
||||
"tar -tf ${examples.exportBash} | grep '\./bin/bash' > /dev/null"
|
||||
)
|
||||
'';
|
||||
})
|
||||
|
||||
@ -14,7 +14,7 @@ import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: {
|
||||
];
|
||||
|
||||
# Need some more memory to record audio.
|
||||
virtualisation.memorySize = "500";
|
||||
virtualisation.memorySize = 500;
|
||||
|
||||
# Create a virtual sound device, with mixing
|
||||
# and all, for recording audio.
|
||||
|
||||
69
pkgs/applications/audio/blanket/default.nix
Normal file
69
pkgs/applications/audio/blanket/default.nix
Normal file
@ -0,0 +1,69 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, desktop-file-utils
|
||||
, appstream-glib
|
||||
, python3Packages
|
||||
, glib
|
||||
, gtk3
|
||||
, libhandy
|
||||
, gobject-introspection
|
||||
, gst_all_1
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "blanket";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rafaelmardojai";
|
||||
repo = "blanket";
|
||||
rev = version;
|
||||
sha256 = "00i821zqfbigxmc709322r16z75qsw4rg23yhv35gza9sl65bzkg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
desktop-file-utils
|
||||
appstream-glib
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
libhandy
|
||||
gobject-introspection
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
gst_all_1.gst-plugins-bad
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pygobject3
|
||||
];
|
||||
|
||||
# Broken with gobject-introspection setup hook
|
||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
format = "other";
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs build-aux/meson/postinstall.py
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/rafaelmardojai/blanket";
|
||||
description = "Listen to different sounds";
|
||||
maintainers = with maintainers; [ onny ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "NoiseTorch";
|
||||
version = "0.11.3";
|
||||
version = "0.11.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lawl";
|
||||
repo = "NoiseTorch";
|
||||
rev = version;
|
||||
sha256 = "0rjs6hbi7dvd179lzjmvqy4rv4pbc9amgzb8jfky4yc0zh8xf5z5";
|
||||
sha256 = "sha256-3+Yk7dqD7eyvd1I5CMmrg085ZtFxD2EnGqL5ttwx8eM=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -711,10 +711,10 @@
|
||||
elpaBuild {
|
||||
pname = "crdt";
|
||||
ename = "crdt";
|
||||
version = "0.1.4";
|
||||
version = "0.2.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/crdt-0.1.4.tar";
|
||||
sha256 = "1qqfjvkajwhdhz0jhqixdn68l1rl02pn2fmxizzsv0as20v0ay0r";
|
||||
url = "https://elpa.gnu.org/packages/crdt-0.2.5.tar";
|
||||
sha256 = "092f82kq78c9gih6xri4n3ma5ixw9c8mx12i00c174g0v041r6sp";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -756,10 +756,10 @@
|
||||
elpaBuild {
|
||||
pname = "csv-mode";
|
||||
ename = "csv-mode";
|
||||
version = "1.15";
|
||||
version = "1.16";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/csv-mode-1.15.tar";
|
||||
sha256 = "0pigqhqg5mfza6jdskcr9yvrzdxnd68iyp3vyb8p8wskdacmbiyx";
|
||||
url = "https://elpa.gnu.org/packages/csv-mode-1.16.tar";
|
||||
sha256 = "1i43b2p31xhrf97xbdi35y550ysp69fasa5gcrhg6iyxw176807p";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -831,10 +831,10 @@
|
||||
elpaBuild {
|
||||
pname = "debbugs";
|
||||
ename = "debbugs";
|
||||
version = "0.28";
|
||||
version = "0.29";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/debbugs-0.28.tar";
|
||||
sha256 = "1qks38hpg3drhxzw66n5yxfq0v6fj9ya7d9dc6x0xwfp6r2x0li0";
|
||||
url = "https://elpa.gnu.org/packages/debbugs-0.29.tar";
|
||||
sha256 = "1bn21d9dr9pb3vdak3v07x056xafym89kdpxavjf4avy6bry6s4d";
|
||||
};
|
||||
packageRequires = [ emacs soap-client ];
|
||||
meta = {
|
||||
@ -1022,6 +1022,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
easy-escape = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "easy-escape";
|
||||
ename = "easy-escape";
|
||||
version = "0.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/easy-escape-0.2.1.tar";
|
||||
sha256 = "19blpwka440y6r08hzzaz61gb24jr6a046pai2j1a3jg6x9fr3j5";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/easy-escape.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
easy-kill = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "easy-kill";
|
||||
@ -1101,10 +1116,10 @@
|
||||
elpaBuild {
|
||||
pname = "eev";
|
||||
ename = "eev";
|
||||
version = "20210822";
|
||||
version = "20210925";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/eev-20210822.tar";
|
||||
sha256 = "1682hl8s15snz9vq2r0q7jfpf81gbhlyxp55l2alsmxll4qq72wh";
|
||||
url = "https://elpa.gnu.org/packages/eev-20210925.tar";
|
||||
sha256 = "0kwmjspmvz9lfm6y0kls9v2l55ccni0gviv9jlzxiwynrc01rz4y";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1224,10 +1239,10 @@
|
||||
elpaBuild {
|
||||
pname = "emms";
|
||||
ename = "emms";
|
||||
version = "7.6";
|
||||
version = "7.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/emms-7.6.tar";
|
||||
sha256 = "03cp6mr0kxy41dg4ri5ymbzpkw7bd8zg7hx0a2rb4axiss5qmx7i";
|
||||
url = "https://elpa.gnu.org/packages/emms-7.7.tar";
|
||||
sha256 = "0n9nx4wgjxkr8nsxcq8svg0x0qkqj7bsd2j0ihy4jzj29xmyxl0h";
|
||||
};
|
||||
packageRequires = [ cl-lib nadvice seq ];
|
||||
meta = {
|
||||
@ -1405,16 +1420,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
flymake = callPackage ({ eldoc, elpaBuild, emacs, fetchurl, lib }:
|
||||
flymake = callPackage ({ eldoc, elpaBuild, emacs, fetchurl, lib, project }:
|
||||
elpaBuild {
|
||||
pname = "flymake";
|
||||
ename = "flymake";
|
||||
version = "1.1.1";
|
||||
version = "1.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/flymake-1.1.1.tar";
|
||||
sha256 = "0lk2v34b59b24j3hsmi8d0v7fgpwcipv7ka9i88cdgjmjjmzgz5q";
|
||||
url = "https://elpa.gnu.org/packages/flymake-1.2.1.tar";
|
||||
sha256 = "1j4j1mxqvkpdccrm5khykmdpm8z9p0pxvnsw4cz9b76xzfdzy5pz";
|
||||
};
|
||||
packageRequires = [ eldoc emacs ];
|
||||
packageRequires = [ eldoc emacs project ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/flymake.html";
|
||||
license = lib.licenses.free;
|
||||
@ -1828,10 +1843,10 @@
|
||||
elpaBuild {
|
||||
pname = "ioccur";
|
||||
ename = "ioccur";
|
||||
version = "2.4";
|
||||
version = "2.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ioccur-2.4.el";
|
||||
sha256 = "1isid3kgsi5qkz27ipvmp9v5knx0qigmv7lz12mqdkwv8alns1p9";
|
||||
url = "https://elpa.gnu.org/packages/ioccur-2.5.tar";
|
||||
sha256 = "06a6djln2rry3qnb063yarji3p18hcpp5zrw7q43a45k7qaiaji8";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -1938,10 +1953,10 @@
|
||||
elpaBuild {
|
||||
pname = "ivy-posframe";
|
||||
ename = "ivy-posframe";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ivy-posframe-0.6.1.tar";
|
||||
sha256 = "1nay2sfbwm2fkp3f1y89innd9h6j3q70q9y4yddrwa69cxlj9m23";
|
||||
url = "https://elpa.gnu.org/packages/ivy-posframe-0.6.2.tar";
|
||||
sha256 = "1x6pm0pry2j7yazhxvq1gydbymwll9yg85m8qi4sh8s0pnm0vjzk";
|
||||
};
|
||||
packageRequires = [ emacs ivy posframe ];
|
||||
meta = {
|
||||
@ -2208,10 +2223,10 @@
|
||||
elpaBuild {
|
||||
pname = "map";
|
||||
ename = "map";
|
||||
version = "3.1";
|
||||
version = "3.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/map-3.1.tar";
|
||||
sha256 = "1akkp34psm71ylbf1i02m56ga1dkswhz069j98amixrhw20hq4nx";
|
||||
url = "https://elpa.gnu.org/packages/map-3.2.1.tar";
|
||||
sha256 = "1vy231m2fm5cgz5nib14ib7ifprajhnbmzf6x4id48h2491m1n24";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2855,10 +2870,10 @@
|
||||
elpaBuild {
|
||||
pname = "phps-mode";
|
||||
ename = "phps-mode";
|
||||
version = "0.4.6";
|
||||
version = "0.4.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/phps-mode-0.4.6.tar";
|
||||
sha256 = "0mfwyz9rwnrs0xcd1jmq1ngdhbwygm6hbfhyr14djywxx0b4hpm5";
|
||||
url = "https://elpa.gnu.org/packages/phps-mode-0.4.7.tar";
|
||||
sha256 = "0y5milfjf45bi7gj7brl2lhyla8nsj3dc1a4nfq1wx3zw8arlc50";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2915,10 +2930,10 @@
|
||||
elpaBuild {
|
||||
pname = "project";
|
||||
ename = "project";
|
||||
version = "0.6.1";
|
||||
version = "0.7.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/project-0.6.1.tar";
|
||||
sha256 = "174fli3swbn67qcs9isv70vwrf6r41mak6dbs98gia89rlb71c8v";
|
||||
url = "https://elpa.gnu.org/packages/project-0.7.1.tar";
|
||||
sha256 = "1ip8s924n50mmh068p42zi0ylvv79a2pi9sji1c2pqj2q19d7jr6";
|
||||
};
|
||||
packageRequires = [ emacs xref ];
|
||||
meta = {
|
||||
@ -3411,10 +3426,10 @@
|
||||
elpaBuild {
|
||||
pname = "seq";
|
||||
ename = "seq";
|
||||
version = "2.22";
|
||||
version = "2.23";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/seq-2.22.tar";
|
||||
sha256 = "0zlqcbabzj8crg36ird2l74dbg5k7w1zf5iwva0h2dyvwyf9grma";
|
||||
url = "https://elpa.gnu.org/packages/seq-2.23.tar";
|
||||
sha256 = "1lbxnrzq88z8k9dyylg2636pg9vc8bzfprs1hxwp9ah0zkvsn52p";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -3426,10 +3441,10 @@
|
||||
elpaBuild {
|
||||
pname = "setup";
|
||||
ename = "setup";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/setup-1.0.0.tar";
|
||||
sha256 = "05k65r5mgkpbj6f84qscgq4gjbj4wyn7c60b9xjvadw9b55yvfxk";
|
||||
url = "https://elpa.gnu.org/packages/setup-1.0.1.tar";
|
||||
sha256 = "1n390hiv5a8ij584r24cpbahj2sb12wjh0l3kzhccdxnxskrzgmh";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3576,10 +3591,10 @@
|
||||
elpaBuild {
|
||||
pname = "so-long";
|
||||
ename = "so-long";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/so-long-1.1.1.tar";
|
||||
sha256 = "0qgdnkb702mkm886v0zv0hnm5y7zlifgx9ji6xmdsxycpsfkjz1f";
|
||||
url = "https://elpa.gnu.org/packages/so-long-1.1.2.tar";
|
||||
sha256 = "053msvy2pyispwg4zzpaczfkl6rvnwfklm4jdsbjhqm0kx4vlcs9";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -3786,10 +3801,10 @@
|
||||
elpaBuild {
|
||||
pname = "taxy";
|
||||
ename = "taxy";
|
||||
version = "0.4";
|
||||
version = "0.8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/taxy-0.4.tar";
|
||||
sha256 = "1iy1761v2q0i020x8ch4z3vljx2v62pcy5bifxq8gw5qx0115576";
|
||||
url = "https://elpa.gnu.org/packages/taxy-0.8.tar";
|
||||
sha256 = "00pc6lh35gj8vzcsn17fyazb9jsc4m6nr7cvb32w02isadv8qd3m";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4050,6 +4065,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
vc-got = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "vc-got";
|
||||
ename = "vc-got";
|
||||
version = "1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/vc-got-1.0.tar";
|
||||
sha256 = "1lx52g261zr52gy63vjll8mvczcbdzbsx3wa47qdajrq9bwmj99j";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/vc-got.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
vc-hgcmd = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "vc-hgcmd";
|
||||
@ -4116,10 +4146,10 @@
|
||||
elpaBuild {
|
||||
pname = "verilog-mode";
|
||||
ename = "verilog-mode";
|
||||
version = "2021.4.12.188864585";
|
||||
version = "2021.9.23.89128420";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/verilog-mode-2021.4.12.188864585.tar";
|
||||
sha256 = "0np2q0jhf1fbb1nl5nx1q9hw40yg62bhlddp2raqryxbkvsh0nbv";
|
||||
url = "https://elpa.gnu.org/packages/verilog-mode-2021.9.23.89128420.tar";
|
||||
sha256 = "1sgmkmif44npghz4nnag1w91qrrylq36175cjj87lcdp22s6isgk";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
||||
@ -45,16 +45,16 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
caml = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
caml = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "caml";
|
||||
ename = "caml";
|
||||
version = "4.8";
|
||||
version = "4.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/caml-4.8.tar";
|
||||
sha256 = "02wzjdd1ig8ajy65rf87zaysfddjbhyswifwlcs52ly7p84q72wk";
|
||||
url = "https://elpa.nongnu.org/nongnu/caml-4.9.tar";
|
||||
sha256 = "00ldvz6r10vwwmk6f3az534p0340ywn7knsg2bmvbvh3q51vyl9i";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/caml.html";
|
||||
license = lib.licenses.free;
|
||||
@ -841,10 +841,10 @@
|
||||
elpaBuild {
|
||||
pname = "swift-mode";
|
||||
ename = "swift-mode";
|
||||
version = "8.3.0";
|
||||
version = "8.4.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/swift-mode-8.3.0.tar";
|
||||
sha256 = "1bsyv0dl7c2m3f690g7fij7g4937skxjin456vfrgbzb219pdkcs";
|
||||
url = "https://elpa.nongnu.org/nongnu/swift-mode-8.4.0.tar";
|
||||
sha256 = "1pfp1nvq2gny6kbiq3q0dcms0ysw43zq0aayfwqdj0llkf025dfp";
|
||||
};
|
||||
packageRequires = [ emacs seq ];
|
||||
meta = {
|
||||
@ -946,10 +946,10 @@
|
||||
elpaBuild {
|
||||
pname = "yasnippet-snippets";
|
||||
ename = "yasnippet-snippets";
|
||||
version = "0.2";
|
||||
version = "1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/yasnippet-snippets-0.2.tar";
|
||||
sha256 = "1xhlx2n2sdpcc82cba9r7nbd0gwi7m821p7vk0vnw84dhwy863ic";
|
||||
url = "https://elpa.nongnu.org/nongnu/yasnippet-snippets-1.0.tar";
|
||||
sha256 = "0p2a10wfh1dvmxbjlbj6p241xaldjim2h8vrv9aghvm3ryfixcpb";
|
||||
};
|
||||
packageRequires = [ yasnippet ];
|
||||
meta = {
|
||||
|
||||
@ -4,10 +4,10 @@
|
||||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "20210906";
|
||||
version = "20210920";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-20210906.tar";
|
||||
sha256 = "04aqniwix4w0iap38dsdskndknhw9k6apkmkrc79yfs3c4jcsszq";
|
||||
url = "https://orgmode.org/elpa/org-20210920.tar";
|
||||
sha256 = "01b44npf0rxq7c4ddygc3n3cv3h7afs41az0nfs67a5x7ag6c1jj";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -19,10 +19,10 @@
|
||||
elpaBuild {
|
||||
pname = "org-plus-contrib";
|
||||
ename = "org-plus-contrib";
|
||||
version = "20210906";
|
||||
version = "20210920";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20210906.tar";
|
||||
sha256 = "1v0yy92x8shwp36qfyzmvk8ayz9amkdis967gqacq5jxcyq7mhbn";
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20210920.tar";
|
||||
sha256 = "1m376fnm8hrm83hgx4b0y21lzdrbxjp83bv45plvrjky44qfdwfn";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -32,7 +32,6 @@ in stdenv.mkDerivation rec {
|
||||
git
|
||||
gnused
|
||||
nix
|
||||
nixfmt
|
||||
]
|
||||
}
|
||||
oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"' | sed 's|\\.|-|g')"
|
||||
@ -42,7 +41,6 @@ in stdenv.mkDerivation rec {
|
||||
default_nix="$nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix"
|
||||
newTag=$(echo $latestTag | sed 's|\.|-|g')
|
||||
update-source-version ${pname} "$newTag" --version-key=version --print-changes
|
||||
nixfmt "$default_nix"
|
||||
else
|
||||
echo "${pname} is already up-to-date"
|
||||
fi
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qimgv";
|
||||
version = "0.9.1";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "easymodo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0b2hddps969gjim2r9a22zaxmnzp600av2zz6icq66ksfrx1rpac";
|
||||
sha256 = "1wybpmqvj7vj7cl6r4gif7mkrcdr6zpb939mmz46xsil5vb4pirh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dasel";
|
||||
version = "1.20.0";
|
||||
version = "1.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TomWright";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SJWIjizPf0bRwanpnLpuqsWKjaCwc1wBV2sCPSqGiOs=";
|
||||
sha256 = "sha256-XomB//VX4ovE2AWh6wQxuGoLSSIxoXnxy4Agbip6PYw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-u3KsMi63wOi1fCSLpGxATZNmbhoIAGeVpwcKh+nmi3k=";
|
||||
vendorSha256 = "sha256-yP4iF3403WWgWAmBHiuOpDsIAUx4+KR8uKPfjy3qXt8=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}"
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
install -D psi-notify $out/bin/psi-notify
|
||||
substituteInPlace psi-notify.service --replace psi-notify $out/bin/psi-notify
|
||||
install -D psi-notify.service $out/share/systemd/user/psi-notify.service
|
||||
install -D psi-notify.service $out/lib/systemd/user/psi-notify.service
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.6-k3s1" }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.21.3-k3s1" }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kube3d";
|
||||
version = "4.4.7";
|
||||
version = "4.4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rancher";
|
||||
repo = "k3d";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-S1vHmXUCP1ayPo3vvHAbNCqNm1ueJ0jE4NUBvg5P3MU=";
|
||||
sha256 = "sha256-PdbAkiua9AdcNDCpu4UILsmAz0nb4nLjahYomGSHqnc=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
@ -17,10 +17,9 @@ buildGoModule rec {
|
||||
|
||||
excludedPackages = "\\(tools\\|docgen\\)";
|
||||
|
||||
ldflags = let t = "github.com/rancher/k3d/v4/version"; in
|
||||
[
|
||||
"-s" "-w" "-X ${t}.Version=v${version}" "-X ${t}.K3sVersion=v${k3sVersion}"
|
||||
];
|
||||
ldflags =
|
||||
let t = "github.com/rancher/k3d/v4/version"; in
|
||||
[ "-s" "-w" "-X ${t}.Version=v${version}" "-X ${t}.K3sVersion=v${k3sVersion}" ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.32.2";
|
||||
version = "0.33.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1s6/Xn/NsClG7YvRyzpvzMy8HmDITNCQUJxHaA84470=";
|
||||
sha256 = "sha256-FvgB0jG6PEvhrT9Au/Uv9XSgKx+zNw8zETpg2dJ6QX4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-y84EFmoJS4SeA5YFIVFU0iWa5NnjU5yvOj7OFE+jGN0=";
|
||||
|
||||
@ -4,7 +4,7 @@ with ocamlPackages;
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "jackline";
|
||||
version = "unstable-2021-04-23";
|
||||
version = "unstable-2021-08-10";
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
|
||||
@ -13,8 +13,8 @@ buildDunePackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "hannesm";
|
||||
repo = "jackline";
|
||||
rev = "861c59bb7cd27ad5c7558ff94cb0d0e8dca249e5";
|
||||
sha256 = "00waw5qr0n70i9l9b25r9ryfi836x4qrj046bb4k9qa4d0p8q1sa";
|
||||
rev = "73d87e9a62d534566bb0fbe64990d32d75487f11";
|
||||
sha256 = "0wk574rqfg2vqz27nasxzwf67x51pj5fgl4vkc27r741dg4q6c5a";
|
||||
};
|
||||
|
||||
nativeBuildInpts = [
|
||||
|
||||
@ -4,11 +4,11 @@ with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mpop";
|
||||
version = "1.4.13";
|
||||
version = "1.4.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-s0mEZsZbZQrdGm55IJsnuoY3VnOkXJalknvtaFoyfcE=";
|
||||
sha256 = "046wbglvry54id9wik6c020fs09piv3gig3z0nh5nmyhsxjw4i18";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -1,52 +1,52 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonApplication,
|
||||
substituteAll,
|
||||
fetchFromGitHub,
|
||||
isPy3k,
|
||||
colorama,
|
||||
flask,
|
||||
flask-httpauth,
|
||||
flask-socketio,
|
||||
stem,
|
||||
psutil,
|
||||
pyqt5,
|
||||
pycrypto,
|
||||
pyside2,
|
||||
pytestCheckHook,
|
||||
qrcode,
|
||||
qt5,
|
||||
requests,
|
||||
unidecode,
|
||||
tor,
|
||||
obfs4,
|
||||
{ lib
|
||||
, buildPythonApplication
|
||||
, substituteAll
|
||||
, fetchFromGitHub
|
||||
, isPy3k
|
||||
, colorama
|
||||
, flask
|
||||
, flask-httpauth
|
||||
, flask-socketio
|
||||
, stem
|
||||
, psutil
|
||||
, pyqt5
|
||||
, pycrypto
|
||||
, pynacl
|
||||
, pyside2
|
||||
, pytestCheckHook
|
||||
, qrcode
|
||||
, qt5
|
||||
, requests
|
||||
, unidecode
|
||||
, tor
|
||||
, obfs4
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.3.3";
|
||||
version = "2.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "micahflee";
|
||||
owner = "onionshare";
|
||||
repo = "onionshare";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wU2020RNXlwJ2y9uzcLxIX4EECev1Z9YvNyiBalLj/Y=";
|
||||
sha256 = "sha256-Lclm7mIkaAkQpWcNILTRJtLA43dpiyHtWAeHS2r3+ZQ=";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "Securely and anonymously send and receive files";
|
||||
longDescription = ''
|
||||
OnionShare is an open source tool for securely and anonymously sending
|
||||
and receiving files using Tor onion services. It works by starting a web
|
||||
server directly on your computer and making it accessible as an
|
||||
unguessable Tor web address that others can load in Tor Browser to
|
||||
download files from you, or upload files to you. It doesn't require
|
||||
setting up a separate server, using a third party file-sharing service,
|
||||
or even logging into an account.
|
||||
OnionShare is an open source tool for securely and anonymously sending
|
||||
and receiving files using Tor onion services. It works by starting a web
|
||||
server directly on your computer and making it accessible as an
|
||||
unguessable Tor web address that others can load in Tor Browser to
|
||||
download files from you, or upload files to you. It doesn't require
|
||||
setting up a separate server, using a third party file-sharing service,
|
||||
or even logging into an account.
|
||||
|
||||
Unlike services like email, Google Drive, DropBox, WeTransfer, or nearly
|
||||
any other way people typically send files to each other, when you use
|
||||
OnionShare you don't give any companies access to the files that you're
|
||||
sharing. So long as you share the unguessable web address in a secure way
|
||||
(like pasting it in an encrypted messaging app), no one but you and the
|
||||
person you're sharing with can access the files.
|
||||
Unlike services like email, Google Drive, DropBox, WeTransfer, or nearly
|
||||
any other way people typically send files to each other, when you use
|
||||
OnionShare you don't give any companies access to the files that you're
|
||||
sharing. So long as you share the unguessable web address in a secure way
|
||||
(like pasting it in an encrypted messaging app), no one but you and the
|
||||
person you're sharing with can access the files.
|
||||
'';
|
||||
|
||||
homepage = "https://onionshare.org/";
|
||||
@ -54,8 +54,19 @@ let
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ lourkeur ];
|
||||
};
|
||||
stem' = stem.overrideAttrs (_: rec {
|
||||
version = "1.8.1";
|
||||
|
||||
in rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "onionshare";
|
||||
repo = "stem";
|
||||
rev = version;
|
||||
sha256 = "Dzpvx7CgAr5OtGmfubWAYDLqq5LkGqcwjr3bxpfL/3A=";
|
||||
};
|
||||
});
|
||||
|
||||
in
|
||||
rec {
|
||||
onionshare = buildPythonApplication {
|
||||
pname = "onionshare-cli";
|
||||
inherit version meta;
|
||||
@ -74,9 +85,10 @@ in rec {
|
||||
flask
|
||||
flask-httpauth
|
||||
flask-socketio
|
||||
stem
|
||||
stem'
|
||||
psutil
|
||||
pycrypto
|
||||
pynacl
|
||||
requests
|
||||
unidecode
|
||||
];
|
||||
@ -98,6 +110,7 @@ in rec {
|
||||
disabledTests = [
|
||||
"test_firefox_like_behavior"
|
||||
"test_if_unmodified_since"
|
||||
"test_get_tor_paths_linux" # expects /usr instead of /nix/store
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@ -19,13 +19,13 @@ with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "z3";
|
||||
version = "4.8.10";
|
||||
version = "4.8.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Z3Prover";
|
||||
repo = pname;
|
||||
rev = "z3-${version}";
|
||||
sha256 = "1w1ym2l0gipvjx322npw7lhclv8rslq58gnj0d9i96masi3gbycf";
|
||||
sha256 = "1wbcdc7h3mag8infspvxxja2hiz4igjwxzvss2kqar1rjj4ivfx0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
||||
|
||||
@ -19,11 +19,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "github-desktop";
|
||||
version = "2.9.0";
|
||||
version = "2.9.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux4/GitHubDesktop-linux-${version}-linux4.deb";
|
||||
sha256 = "sha256-kyzvvzSCfo6uaTA0Z1yqAUjr4A5p3OuIpaVQv64WW7M";
|
||||
url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux1/GitHubDesktop-linux-${version}-linux1.deb";
|
||||
sha256 = "sha256-e3XDjVQ5VcsS/MGxNsDs2h77joZAz8mNn+SwrqiUAR0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-multi-rtmp";
|
||||
version = "0.2.6.1";
|
||||
version = "0.2.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sorayuki";
|
||||
repo = "obs-multi-rtmp";
|
||||
rev = version;
|
||||
sha256 = "sha256-ZcvmiE9gbDUHAO36QAIaUdjV14ZfPabD9CW7Ogeqdro=";
|
||||
sha256 = "sha256-pnSIbAWGufcWIARXpX/zwA/Ff35lrinFaMIdFY00c4Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "15iw7982g6vc4jy1l9kk1z9sl5bm1bdbwr74y7nvwjs1nffhig7f";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python python.pkgs.sphinx python.pkgs.sphinx_rtd_theme pkg-config flex bison meson ninja ]
|
||||
nativeBuildInputs = [ makeWrapper python python.pkgs.sphinx python.pkgs.sphinx_rtd_theme pkg-config flex bison meson ninja ]
|
||||
++ lib.optionals gtkSupport [ wrapGAppsHook ]
|
||||
++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]
|
||||
++ lib.optionals stdenv.isDarwin [ sigtool ];
|
||||
|
||||
@ -191,13 +191,13 @@ rec {
|
||||
, postMount ? ""
|
||||
, postUmount ? ""
|
||||
}:
|
||||
let
|
||||
result = vmTools.runInLinuxVM (
|
||||
vmTools.runInLinuxVM (
|
||||
runCommand name
|
||||
{
|
||||
preVM = vmTools.createEmptyImage {
|
||||
size = diskSize;
|
||||
fullName = "docker-run-disk";
|
||||
destination = "./image";
|
||||
};
|
||||
inherit fromImage fromImageName fromImageTag;
|
||||
|
||||
@ -278,12 +278,6 @@ rec {
|
||||
|
||||
${postUmount}
|
||||
'');
|
||||
in
|
||||
runCommand name { } ''
|
||||
mkdir -p $out
|
||||
cd ${result}
|
||||
cp layer.tar json VERSION $out
|
||||
'';
|
||||
|
||||
exportImage = { name ? fromImage.name, fromImage, fromImageName ? null, fromImageTag ? null, diskSize ? 1024 }:
|
||||
runWithOverlay {
|
||||
@ -291,7 +285,13 @@ rec {
|
||||
|
||||
postMount = ''
|
||||
echo "Packing raw image..."
|
||||
tar -C mnt --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf $out .
|
||||
tar -C mnt --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar .
|
||||
'';
|
||||
|
||||
postUmount = ''
|
||||
mv $out/layer.tar .
|
||||
rm -rf $out
|
||||
mv layer.tar $out
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -95,6 +95,15 @@ rec {
|
||||
finalImageTag = "2.2.1";
|
||||
finalImageName = "nix";
|
||||
};
|
||||
# Same example, but re-fetches every time the fetcher implementation changes.
|
||||
# NOTE: Only use this for testing, or you'd be wasting a lot of time, network and space.
|
||||
testNixFromDockerHub = pkgs.invalidateFetcherByDrvHash pullImage {
|
||||
imageName = "nixos/nix";
|
||||
imageDigest = "sha256:85299d86263a3059cf19f419f9d286cc9f06d3c13146a8ebbb21b3437f598357";
|
||||
sha256 = "19fw0n3wmddahzr20mhdqv6jkjn1kanh6n2mrr08ai53dr8ph5n7";
|
||||
finalImageTag = "2.2.1";
|
||||
finalImageName = "nix";
|
||||
};
|
||||
|
||||
# 5. example of multiple contents, emacs and vi happily coexisting
|
||||
editors = buildImage {
|
||||
@ -541,4 +550,7 @@ rec {
|
||||
config.Cmd = [ "hello" ];
|
||||
includeStorePaths = false;
|
||||
};
|
||||
|
||||
# Example export of the bash image
|
||||
exportBash = pkgs.dockerTools.exportImage { fromImage = bash; };
|
||||
}
|
||||
|
||||
@ -257,14 +257,23 @@ rec {
|
||||
eval "$postVM"
|
||||
'';
|
||||
|
||||
|
||||
createEmptyImage = {size, fullName}: ''
|
||||
mkdir $out
|
||||
diskImage=$out/disk-image.qcow2
|
||||
/*
|
||||
A bash script fragment that produces a disk image at `destination`.
|
||||
*/
|
||||
createEmptyImage = {
|
||||
# Disk image size in MiB
|
||||
size,
|
||||
# Name that will be written to ${destination}/nix-support/full-name
|
||||
fullName,
|
||||
# Where to write the image files, defaulting to $out
|
||||
destination ? "$out"
|
||||
}: ''
|
||||
mkdir -p ${destination}
|
||||
diskImage=${destination}/disk-image.qcow2
|
||||
${qemu}/bin/qemu-img create -f qcow2 $diskImage "${toString size}M"
|
||||
|
||||
mkdir $out/nix-support
|
||||
echo "${fullName}" > $out/nix-support/full-name
|
||||
mkdir ${destination}/nix-support
|
||||
echo "${fullName}" > ${destination}/nix-support/full-name
|
||||
'';
|
||||
|
||||
|
||||
|
||||
@ -170,14 +170,14 @@ let
|
||||
priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`
|
||||
};
|
||||
} // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
|
||||
crossVersion = "01c176ac0f57d40cc3b6f8e441062780f073d952"; # Aug 22, 2021
|
||||
crossVersion = "393821c7cf53774233aaf130ff2c8ccec701b0a9"; # Sep 22, 2021
|
||||
|
||||
perl-cross-src = fetchFromGitHub {
|
||||
name = "perl-cross-${crossVersion}";
|
||||
owner = "arsv";
|
||||
repo = "perl-cross";
|
||||
rev = crossVersion;
|
||||
sha256 = "19mwr1snwl4156rlhn74kmpl1wyc7ahhlrjfpnfcj3n63ic0c56y";
|
||||
sha256 = "1fn35b1773aibi2z54m0mar7114737mvfyp81wkdwhakrmzr5nv1";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];
|
||||
@ -214,7 +214,7 @@ in {
|
||||
perldevel = common {
|
||||
perl = pkgs.perldevel;
|
||||
buildPerl = buildPackages.perldevel;
|
||||
version = "5.35.3";
|
||||
sha256 = "06442zc5rvisl120f58jpy95bkf8f1cc4n577nzihdavlbfmnyyn";
|
||||
version = "5.35.4";
|
||||
sha256 = "1ss2r0qq5li6d2qghfv1iah5nl6nraymd7b7ib1iy1395rwyhl4q";
|
||||
};
|
||||
}
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grpc";
|
||||
version = "1.40.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
|
||||
version = "1.41.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc";
|
||||
repo = "grpc";
|
||||
rev = "v${version}";
|
||||
sha256 = "08l2dyf3g3zrffy60ycid6jngvhfaghg792yrkfjcpcif5dqfd9f";
|
||||
sha256 = "1mcgnzwc2mcdpcfhc1b37vff0biwyd3v0a2ack58wgf4336pzlsb";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcyaml";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tlsa";
|
||||
repo = "libcyaml";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LtU1r95YoLuQ2JCphxbMojxKyXnt50XEARGUPftLgsU=";
|
||||
sha256 = "sha256-u5yLrAXaavALNArj6yw+v5Yn4eqXWTHmUxHe+pVCbXM=";
|
||||
};
|
||||
|
||||
buildInputs = [ libyaml ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libfyaml";
|
||||
version = "0.7";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pantoniou";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "10w1n4zzgw33j755pkv73fxdn93kwbzg486b5m9i0bh5d76jp4ax";
|
||||
sha256 = "1367cbny5msapy48z0yysbkawmk1qjqk7cjnqkjszs47riwvjz3h";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
, enableFfmpeg ? false, ffmpeg
|
||||
, enableGStreamer ? false, gst_all_1
|
||||
, enableEigen ? true, eigen
|
||||
, enableUnfree ? false
|
||||
, Cocoa, QTKit
|
||||
}:
|
||||
|
||||
@ -67,7 +68,7 @@ stdenv.mkDerivation rec {
|
||||
(opencvFlag "PNG" enablePNG)
|
||||
(opencvFlag "OPENEXR" enableEXR)
|
||||
(opencvFlag "GSTREAMER" enableGStreamer)
|
||||
];
|
||||
] ++ lib.optional (!enableUnfree) "-DBUILD_opencv_nonfree=OFF";
|
||||
|
||||
hardeningDisable = [ "bindnow" "relro" ];
|
||||
|
||||
@ -82,7 +83,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Open Computer Vision Library with more than 500 algorithms";
|
||||
homepage = "https://opencv.org/";
|
||||
license = licenses.bsd3;
|
||||
license = if enableUnfree then licenses.unfree else licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "re2";
|
||||
version = "2021-04-01";
|
||||
version = "2021-09-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "re2";
|
||||
rev = version;
|
||||
sha256 = "1iia0883lssj7ckbsr0n7yb3gdw24c8wnl2q5hhzlml23h4ipbh3";
|
||||
sha256 = "1fyhypw345xz8zdh53gz6j1fwgrx0gszk1d349ja37dpxh4jp2jh";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
{ lib, buildDunePackage, async, async_ssl, ppx_sexp_conv, ppx_here, uri, conduit }:
|
||||
{ lib, buildDunePackage, async, async_ssl, ppx_sexp_conv, ppx_here, uri, conduit
|
||||
, core, ipaddr, ipaddr-sexp, sexplib
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "conduit-async";
|
||||
@ -11,7 +13,16 @@ buildDunePackage {
|
||||
|
||||
buildInputs = [ ppx_sexp_conv ppx_here ];
|
||||
|
||||
propagatedBuildInputs = [ async async_ssl conduit uri ];
|
||||
propagatedBuildInputs = [
|
||||
async
|
||||
async_ssl
|
||||
conduit
|
||||
uri
|
||||
ipaddr
|
||||
ipaddr-sexp
|
||||
core
|
||||
sexplib
|
||||
];
|
||||
|
||||
meta = conduit.meta // {
|
||||
description = "A network connection establishment library for Async";
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "conduit";
|
||||
version = "4.0.0";
|
||||
version = "4.0.1";
|
||||
useDune2 = true;
|
||||
|
||||
minimumOCamlVersion = "4.03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-v${version}.tbz";
|
||||
sha256 = "74b29d72bf47adc5d5c4cae6130ad5a2a4923118b9c571331bd1cb3c56decd2a";
|
||||
sha256 = "500d95bf2a524f4851e94373e32d26b6e99ee04e5134db69fe6e151c3aad9b1f";
|
||||
};
|
||||
|
||||
buildInputs = [ ppx_sexp_conv ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "cstruct";
|
||||
version = "6.0.0";
|
||||
version = "6.0.1";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
@ -10,7 +10,7 @@ buildDunePackage rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-v${version}.tbz";
|
||||
sha256 = "0xi6cj85z033fqrqdkwac6gg07629vzdhx03c3lhiwwc4lpnv8bq";
|
||||
sha256 = "4a67bb8f042753453c59eabf0e47865631253ba694091ce6062aac05d47a9bed";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ bigarray-compat ];
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib, buildDunePackage, cstruct, sexplib, ppxlib, stdlib-shims
|
||||
, ounit, cppo, ppx_sexp_conv, cstruct-unix, cstruct-sexp
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
if !lib.versionAtLeast (cstruct.version or "1") "3"
|
||||
@ -11,22 +10,10 @@ buildDunePackage {
|
||||
pname = "ppx_cstruct";
|
||||
inherit (cstruct) version src useDune2 meta;
|
||||
|
||||
minimumOCamlVersion = "4.07";
|
||||
|
||||
# prevent ANSI escape sequences from messing up the test cases
|
||||
# https://github.com/mirage/ocaml-cstruct/issues/283
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mirage/ocaml-cstruct/pull/285/commits/60dfed98b4c34455bf339ac60e2ed5ef05feb48f.patch";
|
||||
sha256 = "1x9i62nrlfy9l44vb0a7qjfrg2wyki4c8nmmqnzwpcbkgxi3q6n5";
|
||||
})
|
||||
];
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
propagatedBuildInputs = [ cstruct ppxlib sexplib stdlib-shims ];
|
||||
|
||||
# disable until ppx_sexp_conv uses ppxlib 0.20.0 (or >= 0.16.0)
|
||||
# since the propagation of the older ppxlib breaks the ppx_cstruct
|
||||
# build.
|
||||
doCheck = false;
|
||||
doCheck = true;
|
||||
checkInputs = [ ounit cppo ppx_sexp_conv cstruct-sexp cstruct-unix ];
|
||||
}
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "git";
|
||||
version = "3.4.0";
|
||||
version = "3.5.0";
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
|
||||
sha256 = "6eef1240c7c85a8e495b82ef863c509ad41d75e0c45cf73c34ed1bdafd03413f";
|
||||
sha256 = "bcd5a0aef9957193cbaeeb17c22201e5ca4e815e67bbc696e88efdb38c25ec03";
|
||||
};
|
||||
|
||||
# remove changelog for the carton package
|
||||
|
||||
@ -3,8 +3,6 @@
|
||||
, mimic
|
||||
, paf
|
||||
, ca-certs-nss
|
||||
, cohttp
|
||||
, cohttp-lwt
|
||||
, fmt
|
||||
, ipaddr
|
||||
, logs
|
||||
@ -16,6 +14,12 @@
|
||||
, rresult
|
||||
, tls
|
||||
, uri
|
||||
, bigarray-compat
|
||||
, bigstringaf
|
||||
, domain-name
|
||||
, httpaf
|
||||
, mirage-flow
|
||||
, tls-mirage
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
@ -28,8 +32,6 @@ buildDunePackage {
|
||||
mimic
|
||||
paf
|
||||
ca-certs-nss
|
||||
cohttp
|
||||
cohttp-lwt
|
||||
fmt
|
||||
lwt
|
||||
result
|
||||
@ -41,6 +43,12 @@ buildDunePackage {
|
||||
mirage-time
|
||||
tls
|
||||
uri
|
||||
bigarray-compat
|
||||
bigstringaf
|
||||
domain-name
|
||||
httpaf
|
||||
mirage-flow
|
||||
tls-mirage
|
||||
];
|
||||
|
||||
meta = git.meta // {
|
||||
|
||||
45
pkgs/development/ocaml-modules/letsencrypt/app.nix
Normal file
45
pkgs/development/ocaml-modules/letsencrypt/app.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, buildDunePackage
|
||||
, letsencrypt
|
||||
, letsencrypt-dns
|
||||
, cmdliner
|
||||
, cohttp-lwt-unix
|
||||
, logs
|
||||
, fmt
|
||||
, lwt
|
||||
, mirage-crypto-rng
|
||||
, ptime
|
||||
, bos
|
||||
, fpath
|
||||
, randomconv
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "letsencrypt-app";
|
||||
|
||||
inherit (letsencrypt)
|
||||
src
|
||||
version
|
||||
useDune2
|
||||
minimumOCamlVersion
|
||||
;
|
||||
|
||||
buildInputs = [
|
||||
letsencrypt
|
||||
letsencrypt-dns
|
||||
cmdliner
|
||||
cohttp-lwt-unix
|
||||
logs
|
||||
fmt
|
||||
lwt
|
||||
mirage-crypto-rng
|
||||
ptime
|
||||
bos
|
||||
fpath
|
||||
randomconv
|
||||
];
|
||||
|
||||
meta = letsencrypt.meta // {
|
||||
description = "An ACME client implementation of the ACME protocol (RFC 8555) for OCaml";
|
||||
};
|
||||
}
|
||||
@ -6,11 +6,6 @@
|
||||
, uri
|
||||
, rresult
|
||||
, base64
|
||||
, cmdliner
|
||||
, cohttp
|
||||
, cohttp-lwt
|
||||
, cohttp-lwt-unix
|
||||
, zarith
|
||||
, logs
|
||||
, fmt
|
||||
, lwt
|
||||
@ -20,38 +15,25 @@
|
||||
, x509
|
||||
, yojson
|
||||
, ounit
|
||||
, dns
|
||||
, dns-tsig
|
||||
, ptime
|
||||
, bos
|
||||
, fpath
|
||||
, randomconv
|
||||
, domain-name
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "letsencrypt";
|
||||
version = "0.2.5";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-v${version}.tbz";
|
||||
sha256 = "6e3bbb5f593823d49e83e698c06cf9ed48818695ec8318507b311ae74731e607";
|
||||
sha256 = "8772b7e6dbda0559a03a7b23b75c1431d42ae09a154eefd64b4c7e23b8d92deb";
|
||||
};
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
useDune2 = true;
|
||||
|
||||
buildInputs = [
|
||||
cmdliner
|
||||
cohttp
|
||||
cohttp-lwt-unix
|
||||
zarith
|
||||
fmt
|
||||
mirage-crypto-rng
|
||||
ptime
|
||||
bos
|
||||
fpath
|
||||
randomconv
|
||||
domain-name
|
||||
];
|
||||
|
||||
@ -65,11 +47,8 @@ buildDunePackage rec {
|
||||
asn1-combinators
|
||||
x509
|
||||
uri
|
||||
dns
|
||||
dns-tsig
|
||||
rresult
|
||||
astring
|
||||
cohttp-lwt
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
35
pkgs/development/ocaml-modules/letsencrypt/dns.nix
Normal file
35
pkgs/development/ocaml-modules/letsencrypt/dns.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ lib
|
||||
, buildDunePackage
|
||||
, letsencrypt
|
||||
, logs
|
||||
, fmt
|
||||
, lwt
|
||||
, dns
|
||||
, dns-tsig
|
||||
, domain-name
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "letsencrypt-dns";
|
||||
|
||||
inherit (letsencrypt)
|
||||
version
|
||||
src
|
||||
useDune2
|
||||
minimumOCamlVersion
|
||||
;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
letsencrypt
|
||||
dns
|
||||
dns-tsig
|
||||
domain-name
|
||||
logs
|
||||
lwt
|
||||
fmt
|
||||
];
|
||||
|
||||
meta = letsencrypt.meta // {
|
||||
description = "A DNS solver for the ACME implementation in OCaml";
|
||||
};
|
||||
}
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "macaddr";
|
||||
version = "5.1.0";
|
||||
version = "5.2.0";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
@ -12,7 +12,7 @@ buildDunePackage rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-v${version}.tbz";
|
||||
sha256 = "7e9328222c1a5f39b0751baecd7e27a842bdb0082fd48126eacbbad8816fbf5a";
|
||||
sha256 = "f98d237cc1f783a0ba7dff0c6c69b5f519fec056950e3e3e7c15e5511ee5b7ec";
|
||||
};
|
||||
|
||||
checkInputs = [ ppx_sexp_conv ounit ];
|
||||
|
||||
@ -1,9 +1,17 @@
|
||||
{ buildDunePackage, mirage-block, io-page, logs }:
|
||||
{ buildDunePackage, fetchpatch, mirage-block, io-page, logs }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "mirage-block-combinators";
|
||||
inherit (mirage-block) version src useDune2;
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "cstruct-6.0.0-compat.patch";
|
||||
url = "https://github.com/mirage/mirage-block/pull/49/commits/ff54105b21fb32d0d6977b419db0776e6c2ea166.patch";
|
||||
sha256 = "0bwgypnsyn4d9b46q6r7kh5qfcy58db7krs6z5zw83hc7y20y2sd";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ mirage-block io-page logs ];
|
||||
|
||||
meta = mirage-block.meta // {
|
||||
|
||||
51
pkgs/development/ocaml-modules/paf/cohttp.nix
Normal file
51
pkgs/development/ocaml-modules/paf/cohttp.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{ lib
|
||||
, buildDunePackage
|
||||
, paf
|
||||
, cohttp-lwt
|
||||
, domain-name
|
||||
, httpaf
|
||||
, ipaddr
|
||||
, alcotest-lwt
|
||||
, fmt
|
||||
, logs
|
||||
, mirage-crypto-rng
|
||||
, mirage-time-unix
|
||||
, tcpip
|
||||
, uri
|
||||
, lwt
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "paf-cohttp";
|
||||
|
||||
inherit (paf)
|
||||
version
|
||||
src
|
||||
useDune2
|
||||
minimumOCamlVersion
|
||||
;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
paf
|
||||
cohttp-lwt
|
||||
domain-name
|
||||
httpaf
|
||||
ipaddr
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [
|
||||
alcotest-lwt
|
||||
fmt
|
||||
logs
|
||||
mirage-crypto-rng
|
||||
mirage-time-unix
|
||||
tcpip
|
||||
uri
|
||||
lwt
|
||||
];
|
||||
|
||||
meta = paf.meta // {
|
||||
description = "A CoHTTP client with its HTTP/AF implementation";
|
||||
};
|
||||
}
|
||||
@ -4,7 +4,6 @@
|
||||
, fetchpatch
|
||||
, mirage-stack
|
||||
, mirage-time
|
||||
, httpaf
|
||||
, h2
|
||||
, tls-mirage
|
||||
, mimic
|
||||
@ -28,15 +27,16 @@
|
||||
, ptime
|
||||
, uri
|
||||
, alcotest-lwt
|
||||
, cstruct
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "paf";
|
||||
version = "0.0.3";
|
||||
version = "0.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz";
|
||||
sha256 = "a0bbb84b19e1f0255337fc4d7017f3ea3611b241746e391b11c1d8b1f5f30a2b";
|
||||
sha256 = "e85a018046eb062d2399fdbe8d9d3400a4d5cd51bb62840446503f557c3eeff1";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
@ -45,7 +45,6 @@ buildDunePackage rec {
|
||||
propagatedBuildInputs = [
|
||||
mirage-stack
|
||||
mirage-time
|
||||
httpaf
|
||||
h2
|
||||
tls-mirage
|
||||
mimic
|
||||
@ -60,6 +59,7 @@ buildDunePackage rec {
|
||||
faraday
|
||||
tls
|
||||
x509
|
||||
cstruct
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
39
pkgs/development/ocaml-modules/paf/le.nix
Normal file
39
pkgs/development/ocaml-modules/paf/le.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, buildDunePackage
|
||||
, paf
|
||||
, duration
|
||||
, emile
|
||||
, httpaf
|
||||
, letsencrypt
|
||||
, mirage-stack
|
||||
, mirage-time
|
||||
, tls-mirage
|
||||
}:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "paf-le";
|
||||
|
||||
inherit (paf)
|
||||
version
|
||||
src
|
||||
useDune2
|
||||
minimumOCamlVersion
|
||||
;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
paf
|
||||
duration
|
||||
emile
|
||||
httpaf
|
||||
letsencrypt
|
||||
mirage-stack
|
||||
mirage-time
|
||||
tls-mirage
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = paf.meta // {
|
||||
description = "A CoHTTP client with its HTTP/AF implementation";
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, buildDunePackage, tls, async, cstruct-async, core, cstruct, mirage-crypto-rng-async }:
|
||||
{ lib, buildDunePackage, tls, async, cstruct-async, core, cstruct, mirage-crypto-rng-async, async_find }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "tls-async";
|
||||
@ -12,6 +12,7 @@ buildDunePackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
async
|
||||
async_find
|
||||
core
|
||||
cstruct
|
||||
cstruct-async
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "tls";
|
||||
version = "0.13.2";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz";
|
||||
sha256 = "sha256-IE6Fuvem8A3lZ/M8GLNYNwCG+v7BbPQ4QdYS+fKT50c=";
|
||||
sha256 = "58cf2d517d6eac5b1ccc5eeb656da690aef2125a19c1eca3fbececd858046216";
|
||||
};
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
|
||||
@ -8,11 +8,11 @@ buildDunePackage rec {
|
||||
minimumOCamlVersion = "4.07";
|
||||
|
||||
pname = "x509";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz";
|
||||
sha256 = "9b42f34171261b2193ee662f096566c48c48e087949c186c288f90c9b3b9f498";
|
||||
sha256 = "d91eb4f2790f9d098713c71cc4b5d12706aedb1795666b5e6d667fe5c262f9c3";
|
||||
};
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ lib, buildPythonPackage, python, fetchFromGitHub, isPy3k
|
||||
, notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme
|
||||
{ lib, buildPythonPackage, python, fetchFromGitHub, isPy3k, pytestCheckHook
|
||||
, notmuch2, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme
|
||||
, service-identity, gnupg, sphinx, gawk, procps, future , withManpage ? false
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "alot";
|
||||
version = "0.9.1";
|
||||
version = "0.10";
|
||||
outputs = [ "out" ] ++ lib.optional withManpage "man";
|
||||
|
||||
disabled = !isPy3k;
|
||||
@ -14,7 +14,7 @@ buildPythonPackage rec {
|
||||
owner = "pazz";
|
||||
repo = "alot";
|
||||
rev = version;
|
||||
sha256 = "0s94m17yph1gq9f2svipb3bbwbw1s4j3zf2xkg5h91006v8286r6";
|
||||
sha256 = "sha256-1reAq8X9VwaaZDY5UfvcFzHDKd71J88CqJgH3+ANjis=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
nativeBuildInputs = lib.optional withManpage sphinx;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
notmuch
|
||||
notmuch2
|
||||
urwid
|
||||
urwidtrees
|
||||
twisted
|
||||
@ -35,11 +35,14 @@ buildPythonPackage rec {
|
||||
gpgme
|
||||
];
|
||||
|
||||
# some twisted tests need the network (test_env_set... )
|
||||
doCheck = false;
|
||||
postBuild = lib.optionalString withManpage "make -C docs man";
|
||||
|
||||
checkInputs = [ gawk future mock gnupg procps ];
|
||||
checkInputs = [ gawk future mock gnupg procps pytestCheckHook ];
|
||||
# some twisted tests need internet access
|
||||
disabledTests = [
|
||||
"test_env_set"
|
||||
"test_no_spawn_no_stdin_attached"
|
||||
];
|
||||
|
||||
postInstall = let
|
||||
completionPython = python.withPackages (ps: [ ps.configobj ]);
|
||||
@ -61,7 +64,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/pazz/alot";
|
||||
description = "Terminal MUA using notmuch mail";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ edibopp ];
|
||||
};
|
||||
|
||||
@ -1,32 +1,32 @@
|
||||
{
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
lib,
|
||||
nose,
|
||||
six,
|
||||
typing ? null,
|
||||
isPy27,
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, nose
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "class-registry";
|
||||
version = "2.1.2";
|
||||
version = "3.0.5";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0zjf9nczl1ifzj07bgs6mwxsfd5xck9l0lchv2j0fv2n481xp2v7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "todofixthis";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0gpvq4a6qrr2iki6b4vxarjr1jrsw560m2qzm5bb43ix8c8b7y3q";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ] ++ lib.optional isPy27 typing;
|
||||
checkInputs = [ nose ];
|
||||
checkInputs = [
|
||||
nose
|
||||
];
|
||||
|
||||
# Tests currently failing.
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "class_registry" ];
|
||||
|
||||
meta = {
|
||||
description = "Factory+Registry pattern for Python classes.";
|
||||
meta = with lib; {
|
||||
description = "Factory and registry pattern for Python classes";
|
||||
homepage = "https://class-registry.readthedocs.io/en/latest/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ kevincox ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ kevincox ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "grpcio-tools";
|
||||
version = "1.40.0";
|
||||
version = "1.41.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d440f2bc089ff628618c536904d5bc39d0b44f7afdda4c4c1ecd15fcf385bfba";
|
||||
sha256 = "3891b1df82369acbc8451d4952cd20755f49a82398dce62437511ad17b47290e";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -6,15 +6,17 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hijri-converter";
|
||||
version = "2.2.0";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-25pfMciEJUFjr2ocOb6ByAel6Je6lYdiTWcG3RBI8WA=";
|
||||
sha256 = "sha256-1KENsAnBQXWSu/s96+yt+gTY2NXVG2Spcelp12Gp8+E=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "hijri_converter" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Accurate Hijri-Gregorian date converter based on the Umm al-Qura calendar";
|
||||
homepage = "https://github.com/dralshehri/hijri-converter";
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jsonrpclib-pelix";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "340915c17ebef7451948341542bf4789fc8d8c9fe604e86f00b722b6074a89f0";
|
||||
sha256 = "f6f376c72ec1c0dfd69fcc2721d711f6ca1fe22bf71f99e6884c5e43e9b58c95";
|
||||
};
|
||||
|
||||
doCheck = false; # test_suite="tests" in setup.py but no tests in pypi.
|
||||
|
||||
@ -45,14 +45,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mitmproxy";
|
||||
version = "7.0.3";
|
||||
version = "7.0.4";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-j1lipshccPUpMR+o28hDyaJbrVgj6AHijFqOgVmrBkg=";
|
||||
sha256 = "sha256-424WNG9Yj+Zfo1UTh7emknZ7xTtpFPz7Ph+FpE149FM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,12 +8,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-s3";
|
||||
version = "1.18.48";
|
||||
version = "1.18.50";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a14917021aac10432887b2acb634be8d66401ffb87cdb0fc271aff867929538c";
|
||||
sha256 = "338052d36825c3ecb7575de16374b3c60f49129544120f463398545835af9cd0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pglast";
|
||||
version = "3.4";
|
||||
version = "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d2288d9607097a08529d9165970261c1be956934e8a8f6d9ed2a96d9b8f03fc6";
|
||||
sha256 = "3bb74df084b149e8bf969380d88b1980fbd1aeda7f7057f4dee6751d854d6ae6";
|
||||
};
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-console-scripts";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4a2138d7d567bc581fe081b6a5975849a2a36b3925cb0f066d2380103e13741c";
|
||||
sha256 = "c7f258025110f1337c23499c2f6674b873d4adba2438be55895edf01451c5ce3";
|
||||
};
|
||||
postPatch = ''
|
||||
# setuptools-scm is pinned to <6 because it dropped Python 3.5
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-engineio";
|
||||
version = "4.2.0";
|
||||
version = "4.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miguelgrinberg";
|
||||
repo = "python-engineio";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QfX8Volz5nabGVhQLXfSD/QooxLsU6DvCq1WRkRZ6hU=";
|
||||
sha256 = "sha256-aAoTeQZCtxddVBPwlyv2j4aACMO9p0vQ/ESkkv4E3VE=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -3,19 +3,20 @@
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, mock
|
||||
, msgpack
|
||||
, pytestCheckHook
|
||||
, python-engineio
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-socketio";
|
||||
version = "5.3.0";
|
||||
version = "5.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miguelgrinberg";
|
||||
repo = "python-socketio";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jyTTWxShLDDnbT+MYIJIjwpn3xfIB04je78doIOG+FQ=";
|
||||
sha256 = "sha256-0Q1R8XPciU5AEkj7Exlc906eyA5juYKzzA/Ygnzx7XU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -25,6 +26,7 @@ buildPythonPackage rec {
|
||||
|
||||
checkInputs = [
|
||||
mock
|
||||
msgpack
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyupgrade";
|
||||
version = "2.27.0";
|
||||
version = "2.29.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asottile";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1j14m4mdvpq740bxz3mhs5k02jfp425xig4yb13drx37p4yyl9zn";
|
||||
sha256 = "sha256-Hq58DJe8ZLZSJdhqSxfTaZPnWae2aQFCe7lH+6Y6ABg=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
@ -4,14 +4,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qcelemental";
|
||||
version = "0.22.0";
|
||||
version = "0.23.0";
|
||||
|
||||
checkInputs = [ pytest-runner pytest-cov pytest ];
|
||||
propagatedBuildInputs = [ numpy pydantic pint networkx ];
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1d7fc613fbe30189cfa970a863a5955865b1116ff651d20325c721b6f0ef1f52";
|
||||
sha256 = "642bc86ce937621ddfb1291cbff0851be16b26feb5eec562296999e36181cee3";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sense-energy";
|
||||
version = "0.9.0";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scottbonline";
|
||||
repo = "sense";
|
||||
rev = version;
|
||||
sha256 = "1lbarsa9wpm7hnhgf2g253w0gs80cn989dnj4aqmic57x5isikhz";
|
||||
sha256 = "sha256-XZvx/GWpz49dsiY9pgMfX+6gUfWA8q6IpnzmCRPFHus=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -29,11 +29,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sentry-sdk";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "683e2f677d518b6a203785f5a6c27d3a6b48cca8293d43cc7efc7815ea4dada5";
|
||||
sha256 = "b9844751e40710e84a457c5bc29b21c383ccb2b63d76eeaad72f7f1c808c8828";
|
||||
};
|
||||
|
||||
checkInputs = [ blinker botocore chalice django flask tornado bottle rq falcon sqlalchemy werkzeug trytond
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "translatepy";
|
||||
version = "2.0";
|
||||
version = "2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Animenosekai";
|
||||
repo = "translate";
|
||||
rev = "v${version}";
|
||||
sha256 = "Rt6FvB4kZVaB/jxxqOHsnkReTFCCyiEaZf240n0zVZs=";
|
||||
sha256 = "0xj97s6zglvq2894wpq3xbjxgfkrfk2414vmcszap8h9j2zxz8gf";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
47
pkgs/development/python-modules/vt-py/default.nix
Normal file
47
pkgs/development/python-modules/vt-py/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest-asyncio
|
||||
, pytest-httpserver
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vt-py";
|
||||
version = "0.7.4";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VirusTotal";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "149fgrqnwf8nyv3msj6p614zbdi7m7s785y3fvh8fm8k7lmgqk8w";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest-asyncio
|
||||
pytest-httpserver
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner'" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "vt" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python client library for VirusTotal";
|
||||
homepage = "https://virustotal.github.io/vt-py/";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -8,7 +8,7 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.7.1";
|
||||
version = "1.8.0";
|
||||
pname = "xmlschema";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "sissaschool";
|
||||
repo = "xmlschema";
|
||||
rev = "v${version}";
|
||||
sha256 = "124wq44aqzxrh92ylm44rry9dsyb68drgzbhzacrm511n1j0ziww";
|
||||
sha256 = "1k41zzffg9srhgnvi1s1akaqpwz2z003xbvig8axwlkm7z0d4xiz";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "youtube-search-python";
|
||||
version = "1.4.8";
|
||||
version = "1.4.9";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "aafa940d77ecd37bb7af802da53caed9be8861c6abe3004abb04315155b4a3ad";
|
||||
sha256 = "9c75540d41f6dcfd19f2f70fbe8346406e026a016aae56b87c207a0b4ff571e0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ httpx ];
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
parallel (1.20.1)
|
||||
parallel (1.21.0)
|
||||
pg (1.2.3)
|
||||
pgsync (0.6.7)
|
||||
pgsync (0.6.8)
|
||||
parallel
|
||||
pg (>= 0.18.2)
|
||||
slop (>= 4.8.2)
|
||||
tty-spinner
|
||||
slop (4.9.0)
|
||||
slop (4.9.1)
|
||||
tty-cursor (0.7.1)
|
||||
tty-spinner (0.9.3)
|
||||
tty-cursor (~> 0.7)
|
||||
@ -20,4 +20,4 @@ DEPENDENCIES
|
||||
pgsync
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
2.2.24
|
||||
|
||||
@ -1,15 +1,16 @@
|
||||
{ lib, bundlerApp }:
|
||||
{ lib, bundlerApp, bundlerUpdateScript }:
|
||||
|
||||
bundlerApp rec {
|
||||
gemdir = ./.;
|
||||
pname = "pgsync";
|
||||
exes = [ "pgsync" ];
|
||||
|
||||
passthru.updateScript = bundlerUpdateScript "pgsync";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sync data from one Postgres database to another (like `pg_dump`/`pg_restore`)";
|
||||
homepage = "https://github.com/ankane/pgsync";
|
||||
license = with licenses; mit;
|
||||
maintainers = with maintainers; [ fabianhjr ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,10 +4,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd";
|
||||
sha256 = "1hkfpm78c2vs1qblnva3k1grijvxh87iixcnyd83s3lxrxsjvag4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.20.1";
|
||||
version = "1.21.0";
|
||||
};
|
||||
pg = {
|
||||
groups = ["default"];
|
||||
@ -25,20 +25,20 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0kn7cf048zwbap0mifdpzz8if1ah803vgzbx09dfgjwgvfx5w5w6";
|
||||
sha256 = "1rsm1irmz97v1kxhnq4lbwwiapqa2zkx0n0xlcf68ca8sfcfql1z";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.6.7";
|
||||
version = "0.6.8";
|
||||
};
|
||||
slop = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "09n6sj4p3b43qq6jmghr9zhgny6719bpca8j6rxnlbq9bsnrd8rj";
|
||||
sha256 = "067bvjmjdjs19bvy138hkqqvw8li3732radcd4x5f5dbf30yk3a9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.9.0";
|
||||
version = "4.9.1";
|
||||
};
|
||||
tty-cursor = {
|
||||
groups = ["default"];
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "just";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "casey";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-KC/m+I4uOBS0bJb5yvxSkj+1Jlq+bekLTqHlz4vqv8I=";
|
||||
sha256 = "sha256-AR1bNsyex+kfXdiSF3QgeqK8qwIssLfaaY0qNhnp7ak=";
|
||||
};
|
||||
cargoSha256 = "sha256-et7V7orw2msv30nJ9sntzEQoeN1YqhHMnHOUt4a6e2I=";
|
||||
cargoSha256 = "sha256-Ukhp8mPXD/dDolfSugOCVwRMgkjmDRCoNzthgqrN6p0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terraformer";
|
||||
version = "0.8.16";
|
||||
version = "0.8.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleCloudPlatform";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-W2Lt24wYYVLaQBtljWrReTZyHj6b9SPHKBdxaMJYUcU=";
|
||||
sha256 = "sha256-E71I2fRGg8HTa9vFMQqjIxtqoR0J4Puz2AmlyZMhye8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-bJbPshTB5VOyyhY2iMVe1GLedRFbWBL4Q5eKLBsVrTA=";
|
||||
vendorSha256 = "sha256-x5wyje27029BZMk17sIHzd68Nlh5ifLn+YXv4hPs04Q=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
{ buildGoModule, fetchFromGitHub, lib }:
|
||||
|
||||
buildGoModule {
|
||||
buildGoModule rec {
|
||||
pname = "protoc-gen-doc-unstable";
|
||||
version = "2019-04-22";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pseudomuto";
|
||||
repo = "protoc-gen-doc";
|
||||
rev = "f824a8908ce33f213b2dba1bf7be83384c5c51e8";
|
||||
sha256 = "004axh2gqc4f115mdxxg59d19hph3rr0bq9d08n3nyl315f590kj";
|
||||
rev = "v${version}";
|
||||
sha256 = "1bpb5wv76p0sjffh5d1frbygp3q1p07sdh5c8pznl5bdh5pd7zxq";
|
||||
};
|
||||
|
||||
vendorSha256 = "17qdpsff8jk7ks5v6ix1rb966x3yvq03vk5bs2zbnxfdra7bv3n6";
|
||||
vendorSha256 = "08pk9nxsl28dw3qmrlb7vsm8xbdzmx98qwkxgg93ykrhzx235k1b";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
27
pkgs/development/tools/rust/roogle/default.nix
Normal file
27
pkgs/development/tools/rust/roogle/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "roogle";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hkmatsumoto";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1h0agialbvhhiijkdnr47y7babq432limdl6ag2rmjfs7yishn4r";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-CzFfFKTmBUAafk8PkkWmUkRIyO+yEhmCfN1zsLRq4Iw=";
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/roogle
|
||||
cp -r assets $out/share/roogle
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Rust API search engine which allows you to search functions by names and type signatures";
|
||||
homepage = "https://github.com/hkmatsumoto/roogle";
|
||||
license = with licenses; [ mit /* or */ asl20 ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "taplo-cli";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "0hh9l83z7qymakyf7ka756gwxpzirgdhf6kpzh89bcmpdfz70005";
|
||||
sha256 = "sha256-bGQLAANVahpiiiKKJPNmtr4uT5iKHqyLS5yVm+rSHPg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "0bkpcnbrrfv07czs1gy8r9q1cp6fdfz2vmlfk9lsg3iapvyi5s1c";
|
||||
cargoSha256 = "sha256-T3fbG5HKOG90kawjQK8D0PIonB6ErNfR3hVIZ5N8zgA=";
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.isLinux pkg-config;
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ let
|
||||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "14.17.6";
|
||||
sha256 = "0pmd0haav2ychhcsw44klx6wfn8c7j1rsw08rc8hcm5i3h5wsn7l";
|
||||
version = "14.18.0";
|
||||
sha256 = "0naqv0aglsqy51pyiz42xz7wx5pfsbyscpdl8rir6kmfl1c52j3b";
|
||||
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
# having the full version string here makes it easier to update
|
||||
modDirVersion = "5.14.3-zen1";
|
||||
modDirVersion = "5.14.8-zen1";
|
||||
parts = lib.splitString "-" modDirVersion;
|
||||
version = lib.elemAt parts 0;
|
||||
suffix = lib.elemAt parts 1;
|
||||
@ -19,7 +19,7 @@ buildLinux (args // {
|
||||
owner = "zen-kernel";
|
||||
repo = "zen-kernel";
|
||||
rev = "v${modDirVersion}";
|
||||
sha256 = "sha256-ByewBT+1z83jCuEMmNvtmhHaEk4qjHa2Kgue8wVfPIY=";
|
||||
sha256 = "sha256-hquMBDjP4fBMNdjxxnJJKx/oVNd2DwBPmVpZQeEQvHQ=";
|
||||
};
|
||||
|
||||
structuredExtraConfig = with lib.kernel; {
|
||||
|
||||
@ -1,18 +1,17 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, nixosTests, bash, which, ffmpeg, makeWrapper, coreutils, ... }:
|
||||
|
||||
buildGoModule rec {
|
||||
|
||||
pname = "owncast";
|
||||
version = "0.0.8";
|
||||
version = "0.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "owncast";
|
||||
repo = "owncast";
|
||||
rev = "v${version}";
|
||||
sha256 = "0md4iafa767yxkwh6z8zpcjv9zd79ql2wapx9vzyd973ksvrdaw2";
|
||||
sha256 = "sha256-pJb11ifaiamp7P7d/xCwDKfOFufLmDDroUJPnWlTOkI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-bH2CWIgpOS974/P98n0R9ebGTJ0YoqPlH8UmxSYNHeM=";
|
||||
vendorSha256 = "sha256-NARHYeOVT7sxfL1BdJc/CPCgHNZzjWE7kACJvrEC71Y=";
|
||||
|
||||
propagatedBuildInputs = [ ffmpeg ];
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pgroonga";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1wdm4wwwv7n73fi330szcnyf25zhvj6dgy839aawh84ik118yg2v";
|
||||
sha256 = "0v102hbszq52jvydj2qrysfs1g46wv4vmgwaa9zj0pvknh58lb43";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
installPhase = ''
|
||||
install -D pgroonga.so -t $out/lib/
|
||||
install -D ./{pgroonga-*.sql,pgroonga.control} -t $out/share/postgresql/extension
|
||||
install -D pgroonga.control -t $out/share/postgresql/extension
|
||||
install -D data/pgroonga-*.sql -t $out/share/postgresql/extension
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plpgsql_check";
|
||||
version = "1.16.0";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okbob";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZZvRrt2JaAWruAT4FXB6ChS0jLKpUEDCF2UmAAH4BRQ=";
|
||||
sha256 = "0a3p0hqya0g87rdc0ka024als07xa7xgpv6fs0q3mj80v6416r3v";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "exoscale-cli";
|
||||
version = "1.42.0";
|
||||
version = "1.44.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exoscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-t6/w998mTsFl/V/zcbVxokJk4VZWDoOXsjr93GW7Zh4=";
|
||||
sha256 = "sha256-1ntKm6OA20+/gMVufbmM6fZ2UIXG/0SzH9vZQUvsIUQ=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/exoscale/cli";
|
||||
|
||||
@ -146,10 +146,10 @@ let
|
||||
]);
|
||||
sitePackages = ceph-python-env.python.sitePackages;
|
||||
|
||||
version = "16.2.5";
|
||||
version = "16.2.6";
|
||||
src = fetchurl {
|
||||
url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
|
||||
sha256 = "sha256-uCBpFvp5k+A5SgwxoJVkuGb9E69paKrs3qda5RpsRt4=";
|
||||
sha256 = "sha256-TXGyZnyVTYAf7G7BcTv3dAfK/54JfOKObcyTRhCrnYA=";
|
||||
};
|
||||
in rec {
|
||||
ceph = stdenv.mkDerivation {
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, darwin
|
||||
, openexr, zlib, imagemagick6, libGLU, libGL, freeglut, fftwFloat
|
||||
, fftw, gsl, libexif, perl, opencv2, qtbase, netpbm
|
||||
, fftw, gsl, libexif, perl, qtbase, netpbm
|
||||
, enableUnfree ? false, opencv2
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
@ -28,12 +29,12 @@ mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [
|
||||
openexr zlib imagemagick6 fftwFloat
|
||||
fftw gsl libexif perl opencv2 qtbase netpbm
|
||||
fftw gsl libexif perl qtbase netpbm
|
||||
] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [
|
||||
OpenGL GLUT
|
||||
]) else [
|
||||
libGLU libGL freeglut
|
||||
]);
|
||||
]) ++ lib.optional enableUnfree (opencv2.override { enableUnfree = true; });
|
||||
|
||||
patches = [ ./threads.patch ./pfstools.patch ./pfsalign.patch ];
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pngquant";
|
||||
version = "2.14.1";
|
||||
version = "2.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kornelski";
|
||||
repo = "pngquant";
|
||||
rev = version;
|
||||
sha256 = "054hi33qp3jc7hv0141wi8drwdg24v5zfp8znwjmz4mcdls8vxbb";
|
||||
sha256 = "0ny6h3fwf6gvzkqkc3zb5mrkqxm6s7xzb6bvzn6vlamklncqgl78";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -4,19 +4,20 @@
|
||||
, writeText
|
||||
, libinput
|
||||
, libX11
|
||||
, wayland
|
||||
, conf ? null
|
||||
, patches ? [ ]
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lisgd";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~mil";
|
||||
repo = "lisgd";
|
||||
rev = version;
|
||||
sha256 = "sha256-A8SsF5k4GwfVCj8JtodNWoLdPzaA9YsoP5EHHakUguc=";
|
||||
sha256 = "sha256-yE2CUv1XDvo8fW0bLS1O2oxgDUu4drCO3jFpxPgAYKU=";
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
@ -33,6 +34,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
libinput
|
||||
libX11
|
||||
wayland
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenvNoCC, fetchFromGitHub, bash, makeWrapper, pciutils
|
||||
, x11Support ? true, ueberzug
|
||||
, x11Support ? true, ueberzug, fetchpatch
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
@ -13,6 +13,14 @@ stdenvNoCC.mkDerivation rec {
|
||||
sha256 = "sha256-PZjFF/K7bvPIjGVoGqaoR8pWE6Di/qJVKFNcIz7G8xE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/dylanaraps/neofetch/commit/413c32e55dc16f0360f8e84af2b59fe45505f81b.patch";
|
||||
sha256 = "1fapdg9z79f0j3vw7fgi72b54aw4brn42bjsj48brbvg3ixsciph";
|
||||
name = "avoid_overwriting_gio_extra_modules_env_var.patch";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
buildInputs = [ bash ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
95
pkgs/tools/misc/sharedown/default.nix
Normal file
95
pkgs/tools/misc/sharedown/default.nix
Normal file
@ -0,0 +1,95 @@
|
||||
{ stdenvNoCC
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, ffmpeg
|
||||
, yt-dlp
|
||||
, electron
|
||||
, makeWrapper
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, yarn2nix-moretea
|
||||
, chromium
|
||||
}:
|
||||
|
||||
let
|
||||
binPath = lib.makeBinPath ([
|
||||
ffmpeg
|
||||
yt-dlp
|
||||
]);
|
||||
|
||||
pname = "Sharedown";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kylon";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Z6OsZvVzk//qEkl4ciNz4cQRqC2GFg0qYgmliAyz6fo=";
|
||||
};
|
||||
|
||||
modules = yarn2nix-moretea.mkYarnModules {
|
||||
name = "${pname}-modules-${version}";
|
||||
inherit pname version;
|
||||
|
||||
yarnFlags = yarn2nix-moretea.defaultYarnFlags ++ [
|
||||
"--production"
|
||||
];
|
||||
|
||||
packageJSON = "${src}/package.json";
|
||||
yarnLock = ./yarn.lock;
|
||||
yarnNix = ./yarndeps.nix;
|
||||
};
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
inherit pname version src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "Sharedown";
|
||||
exec = "Sharedown";
|
||||
icon = "Sharedown";
|
||||
comment = "An Application to save your Sharepoint videos for offline usage.";
|
||||
desktopName = "Sharedown";
|
||||
categories = "Network;Archiving";
|
||||
})
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/bin" "$out/share/Sharedown" "$out/share/applications" "$out/share/icons/hicolor/512x512/apps"
|
||||
|
||||
# Electron app
|
||||
cp -r *.js *.json sharedownlogo.png sharedown "${modules}/node_modules" "$out/share/Sharedown"
|
||||
|
||||
# Desktop Launcher
|
||||
cp build/icon.png "$out/share/icons/hicolor/512x512/apps/Sharedown.png"
|
||||
|
||||
# Install electron wrapper script
|
||||
makeWrapper "${electron}/bin/electron" "$out/bin/Sharedown" \
|
||||
--add-flags "$out/share/Sharedown" \
|
||||
--prefix PATH : "${binPath}" \
|
||||
--set PUPPETEER_EXECUTABLE_PATH "${chromium}/bin/chromium"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Application to save your Sharepoint videos for offline usage";
|
||||
homepage = "https://github.com/kylon/Sharedown";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [
|
||||
jtojnar
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
16
pkgs/tools/misc/sharedown/update.sh
Executable file
16
pkgs/tools/misc/sharedown/update.sh
Executable file
@ -0,0 +1,16 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix-update yarn yarn2nix-moretea.yarn2nix
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
dirname="$(realpath "$(dirname "$0")")"
|
||||
sourceDir="$(nix-build -A sharedown.src --no-out-link)"
|
||||
tempDir="$(mktemp -d)"
|
||||
|
||||
nix-update sharedown
|
||||
|
||||
cp -r "$sourceDir"/* "$tempDir"
|
||||
cd "$tempDir"
|
||||
PUPPETEER_SKIP_DOWNLOAD=1 yarn install
|
||||
yarn2nix > "$dirname/yarndeps.nix"
|
||||
cp -r yarn.lock "$dirname"
|
||||
2193
pkgs/tools/misc/sharedown/yarn.lock
Normal file
2193
pkgs/tools/misc/sharedown/yarn.lock
Normal file
File diff suppressed because it is too large
Load Diff
2565
pkgs/tools/misc/sharedown/yarndeps.nix
Normal file
2565
pkgs/tools/misc/sharedown/yarndeps.nix
Normal file
File diff suppressed because it is too large
Load Diff
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "boundary";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
|
||||
src =
|
||||
let
|
||||
@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
|
||||
x86_64-darwin = "darwin_amd64";
|
||||
};
|
||||
sha256 = selectSystem {
|
||||
x86_64-linux = "sha256-E+AQhm2ddaDU8G0KuK0dC4wUU4YFELwO/q+8d2kpnV8=";
|
||||
aarch64-linux = "sha256-RG4hazKsuUCYYBfDJ9OWghHlBNLEaxVOz5YGHP+ySbA=";
|
||||
x86_64-darwin = "sha256-h0EjoEU+U3HQhmnPBKGijFJrkg9yPPP7zyWNbrn2e5Q=";
|
||||
x86_64-linux = "sha256-qO74R6L2kTHXCNtka9SHT4lZo4Gr15w6K3e43+p2HW4=";
|
||||
aarch64-linux = "sha256-apd16BuusNI5P2Qr8Hj95dRwoAk/ZEZa6TQi+0paIzs=";
|
||||
x86_64-darwin = "sha256-LdCakVru1sbB88plsGrJiMDQl5HtH1GkCkcjmIVjeec=";
|
||||
};
|
||||
in
|
||||
fetchzip {
|
||||
|
||||
29
pkgs/tools/networking/rustcat/default.nix
Normal file
29
pkgs/tools/networking/rustcat/default.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rustcat";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "robiot";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0f4g0fk3i9p403r21w1cdz4r9778pkz58y8h7w2fmj27bamsyfhb";
|
||||
};
|
||||
|
||||
cargoSha256 = "0zlgnnlnglix0qrjc5v0g91v083lm20iw1fhvjpvjlfq7shdkhyd";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Port listener and reverse shell";
|
||||
homepage = "https://github.com/robiot/rustcat";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dalfox";
|
||||
version = "2.4.9";
|
||||
version = "2.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hahwul";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1g0bafg3lgsqy8mjyzvvy9l1wp1rxqwpba3dkx6xisjkpbycxql8";
|
||||
sha256 = "sha256-/tS9/VxH5r4CSmxZ7uZOgAMLRtmPs+bgPtvljOhLALc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1mw58zbihw2fzbpqwydfrrkcwqjkjqdzp37m4dijhx1pbzkv9gzl";
|
||||
vendorSha256 = "sha256-AZbzcGqje2u9waH2NGWITXpax2GCFqbIEd4uNiDmcIY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool for analysing parameter and XSS scanning";
|
||||
|
||||
29
pkgs/tools/security/go365/default.nix
Normal file
29
pkgs/tools/security/go365/default.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go365";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "optiv";
|
||||
repo = "Go365";
|
||||
rev = version;
|
||||
sha256 = "0dh89hf00fr62gjdw2lb1ncdxd26nvlsh2s0i6981bp8xfg2pk5r";
|
||||
};
|
||||
|
||||
vendorSha256 = "0fx2966xfzmi8yszw1cq6ind3i2dvacdwfs029v3bq0n8bvbm3r2";
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/Go365 $out/bin/$pname
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Office 365 enumeration tool";
|
||||
homepage = "https://github.com/optiv/Go365";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
57
pkgs/tools/security/ioccheck/default.nix
Normal file
57
pkgs/tools/security/ioccheck/default.nix
Normal file
@ -0,0 +1,57 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ioccheck";
|
||||
version = "unstable-2021-09-29";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python3.pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ranguli";
|
||||
repo = pname;
|
||||
rev = "db02d921e2519b77523a200ca2d78417802463db";
|
||||
sha256 = "0lgqypcd5lzb2yqd5lr02pba24m26ghly4immxgz13svi8f6vzm9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
backoff
|
||||
click
|
||||
emoji
|
||||
jinja2
|
||||
pyfiglet
|
||||
ratelimit
|
||||
requests
|
||||
shodan
|
||||
tabulate
|
||||
termcolor
|
||||
tweepy
|
||||
vt-py
|
||||
];
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Can be removed with the next release
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace '"hurry.filesize" = "^0.9"' ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "ioccheck" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool for researching IOCs";
|
||||
homepage = "https://github.com/ranguli/ioccheck";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user