Merge master into haskell-updates

This commit is contained in:
github-actions[bot] 2022-10-09 00:19:26 +00:00 committed by GitHub
commit 4567b99d17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
192 changed files with 19090 additions and 9459 deletions

View File

@ -1922,6 +1922,12 @@
githubId = 2506621;
name = "Brayden Willenborg";
};
brendanreis = {
email = "brendanreis@gmail.com";
name = "Brendan Reis";
github = "brendanreis";
githubId = 10686906;
};
brian-dawn = {
email = "brian.t.dawn@gmail.com";
github = "brian-dawn";
@ -10181,6 +10187,15 @@
fingerprint = "F90F FD6D 585C 2BA1 F13D E8A9 7571 654C F88E 31C2";
}];
};
oxapentane = {
email = "blame@oxapentane.com";
github = "oxapentane";
githubId = 1297357;
name = "Grigory Shipunov";
keys = [{
fingerprint = "DD09 98E6 CDF2 9453 7FC6 04F9 91FA 5E5B F9AA 901C";
}];
};
oxij = {
email = "oxij@oxij.org";
github = "oxij";

View File

@ -110,6 +110,7 @@ with lib.maintainers; {
astro
SuperSandro2000
revol-xut
oxapentane
];
scope = "Maintain packages used in the C3D2 hackspace";
shortName = "c3d2";

View File

@ -67,5 +67,5 @@ in
};
};
meta.maintainers = with lib.maintainers; [ mic92 dtzWill ];
meta.maintainers = with lib.maintainers; [ dtzWill ];
}

View File

@ -7,6 +7,7 @@ import ../make-test-python.nix ({...}: {
enable = true;
master = "master:7077";
};
virtualisation.memorySize = 2048;
};
master = { config, pkgs, ... }: {
services.spark.master = {

View File

@ -3,35 +3,52 @@ import ./make-test-python.nix ({ pkgs, ... }:
{
name = "systemd-oomd";
# This test is a simplified version of systemd's testsuite-55.
# https://github.com/systemd/systemd/blob/v251/test/units/testsuite-55.sh
nodes.machine = { pkgs, ... }: {
systemd.oomd.extraConfig.DefaultMemoryPressureDurationSec = "1s"; # makes the test faster
# Kill cgroups when more than 1% pressure is encountered
systemd.slices."-".sliceConfig = {
ManagedOOMMemoryPressure = "kill";
ManagedOOMMemoryPressureLimit = "1%";
};
# A service to bring the system under memory pressure
systemd.services.testservice = {
serviceConfig.ExecStart = "${pkgs.coreutils}/bin/tail /dev/zero";
};
# Do not kill the backdoor
systemd.services.backdoor.serviceConfig.ManagedOOMMemoryPressure = "auto";
# Limit VM resource usage.
virtualisation.memorySize = 1024;
systemd.oomd.extraConfig.DefaultMemoryPressureDurationSec = "1s";
systemd.slices.workload = {
description = "Test slice for memory pressure kills";
sliceConfig = {
MemoryAccounting = true;
ManagedOOMMemoryPressure = "kill";
ManagedOOMMemoryPressureLimit = "10%";
};
};
systemd.services.testbloat = {
description = "Create a lot of memory pressure";
serviceConfig = {
Slice = "workload.slice";
MemoryHigh = "5M";
ExecStart = "${pkgs.coreutils}/bin/tail /dev/zero";
};
};
systemd.services.testchill = {
description = "No memory pressure";
serviceConfig = {
Slice = "workload.slice";
MemoryHigh = "3M";
ExecStart = "${pkgs.coreutils}/bin/sleep infinity";
};
};
};
testScript = ''
# Start the system
# Start the system.
machine.wait_for_unit("multi-user.target")
machine.succeed("oomctl")
# Bring the system into memory pressure
machine.succeed("echo 0 > /proc/sys/vm/panic_on_oom") # NixOS tests kill the VM when the OOM killer is invoked - override this
machine.succeed("systemctl start testservice")
machine.succeed("systemctl start testchill.service")
with subtest("OOMd should kill the bad service"):
machine.fail("systemctl start --wait testbloat.service")
assert machine.get_unit_info("testbloat.service")["Result"] == "oom-kill"
# Wait for oomd to kill something
# Matches these lines:
# systemd-oomd[508]: Killed /system.slice/systemd-udevd.service due to memory pressure for / being 3.26% > 1.00% for > 1s with reclaim activity
machine.wait_until_succeeds("journalctl -b | grep -q 'due to memory pressure for'")
with subtest("Service without memory pressure should be untouched"):
machine.require_unit_state("testchill.service", "active")
'';
})

View File

@ -0,0 +1,86 @@
{ lib
, stdenv
, fetchurl
, makeDesktopItem
, imagemagick
, p7zip
, wine
, writeShellScriptBin
, symlinkJoin
, use64 ? false
}:
let
pname = "exact-audio-copy";
version = "1.6.0";
eac_exe = fetchurl {
url = "http://www.exactaudiocopy.de/eac-${lib.versions.majorMinor version}.exe";
sha256 = "8291d33104ebab2619ba8d85744083e241330a286f5bd7d54c7b0eb08f2b84c1";
};
cygwin_dll = fetchurl {
url = "https://cygwin.com/snapshots/x86/cygwin1-20220301.dll.xz";
sha256 = "0zxn0r5q69fhciy0mrplhxj1hxwy3sq4k1wdy6n6kyassm4zyz1x";
};
patched_eac = stdenv.mkDerivation {
pname = "patched_eac";
inherit version;
nativeBuildInputs = [
imagemagick
p7zip
];
buildCommand = ''
mkdir -p $out
_tmp=$(mktemp -d)
cd $_tmp
7z x -aoa ${eac_exe}
chmod -R 755 .
cp ${cygwin_dll} cygwin1.dll.xz
xz --decompress cygwin1.dll.xz
mv cygwin1.dll CDRDAO/
cp -r * $out
7z x EAC.exe
convert .rsrc/1033/ICON/29.ico -thumbnail 128x128 -alpha on -background none -flatten "$out/eac.ico.128.png"
'';
};
wrapper = writeShellScriptBin pname ''
export WINEPREFIX="''${EXACT_AUDIO_COPY_HOME:-"''${XDG_DATA_HOME:-"''${HOME}/.local/share"}/exact-audio-copy"}/wine"
export WINEARCH=${if use64 then "win64" else "win32"}
export WINEDLLOVERRIDES="mscoree=" # disable mono
export WINEDEBUG=-all
if [ ! -d "$WINEPREFIX" ] ; then
mkdir -p "$WINEPREFIX"
${wine}/bin/wineboot -u
fi
exec ${wine}/bin/wine ${patched_eac}/EAC.exe "$@"
'';
desktopItem = makeDesktopItem {
name = pname;
exec = pname;
comment = "Audio Grabber for CDs";
desktopName = "Exact Audio Copy";
categories = [ "Audio" "AudioVideo" ];
icon = "${patched_eac}/eac.ico.128.png";
};
in
symlinkJoin {
name = "${pname}-${version}";
paths = [ wrapper desktopItem ];
meta = with lib; {
description = "A precise CD audio grabber for creating perfect quality rips using CD and DVD drives";
homepage = "https://www.exactaudiocopy.de/";
changelog = "https://www.exactaudiocopy.de/en/index.php/resources/whats-new/whats-new/";
license = licenses.unfree;
maintainers = [ maintainers.brendanreis ];
platforms = wine.meta.platforms;
};
}

View File

@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A fully functional terminal-based music player, library, and streaming audio server";
homepage = "https://musikcube.com/";
maintainers = [ maintainers.aanderse ];
maintainers = with maintainers; [ aanderse srapenne ];
license = licenses.bsd3;
platforms = platforms.all;
};

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ergo";
version = "4.0.103";
version = "4.0.104";
src = fetchurl {
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
sha256 = "sha256-9vGPHNq76BSdqN1z0KzDOzeMOHAUKnA3Jpx+I5+FOFM=";
sha256 = "sha256-h6OVeDifYIKyIkwbN/pmJWge4/YGL6cnQQ/sI14LsHQ=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -14,8 +14,8 @@ let
sha256Hash = "GnJbWFeG9DuUQzbK9wM2BEbj9LXm4jQFf/Eh5Q75HZo=";
};
betaVersion = {
version = "2022.1.1.11"; # "Android Studio Electic Eel (2022.1.1) Beta 1"
sha256Hash = "YQ20VQME9bQ2vOI7RWfA00npewOL3D6y1dGgNnJXnHc=";
version = "2022.1.1.12"; # "Android Studio Electric Eel (2022.1.1) Beta 2"
sha256Hash = "8iSFPH0PTQkzV1t8bEq7CBtOU8pzdnD/PrpVcgPnO6Q=";
};
latestVersion = { # canary & dev
version = "2022.2.1.2"; # "Android Studio Flamingo (2022.2.1) Canary 2"

View File

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
description = "A vim inspired text editor";
license = licenses.publicDomain;
mainProgram = "kak";
maintainers = with maintainers; [ vrthra ];
maintainers = with maintainers; [ vrthra srapenne ];
platforms = platforms.unix;
};
}

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python2, gettext }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python2, gettext, openmp, Cocoa }:
stdenv.mkDerivation rec {
pname = "wxHexEditor";
@ -12,13 +12,17 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoconf automake ];
buildInputs = [ wxGTK libtool python2 gettext ];
buildInputs = [ wxGTK libtool python2 gettext ]
++ lib.optionals stdenv.cc.isClang [ openmp ]
++ lib.optionals stdenv.isDarwin [ Cocoa ];
preConfigure = "patchShebangs .";
prePatch = ''
substituteInPlace Makefile --replace "/usr" "$out"
substituteInPlace Makefile --replace "mhash; ./configure" "mhash; ./configure --prefix=$out"
'' + lib.optionalString stdenv.cc.isClang ''
substituteInPlace Makefile --replace "-lgomp" "-lomp"
'';
patches = [
@ -30,7 +34,7 @@ stdenv.mkDerivation rec {
./missing-semicolon.patch
];
makeFlags = [ "OPTFLAGS=-fopenmp" ];
makeFlags = lib.optionals stdenv.cc.isGNU [ "OPTFLAGS=-fopenmp" ];
meta = {
description = "Hex Editor / Disk Editor for Huge Files or Devices";
@ -46,6 +50,7 @@ stdenv.mkDerivation rec {
'';
homepage = "http://www.wxhexeditor.org/";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ wegank ];
};
}

View File

@ -5,13 +5,13 @@
mkDerivation rec {
pname = "yacreader";
version = "9.9.1";
version = "9.9.2";
src = fetchFromGitHub {
owner = "YACReader";
repo = pname;
rev = version;
sha256 = "sha256-D+ZmFMg9ZixZNUAMjPHwz7gcwKjG49lm5hTEqftbIrY=";
sha256 = "sha256-rurJkCIuHTWxIGb+TTHp8sQS26/5W/sdtWFxyeqVx54=";
};
nativeBuildInputs = [ qmake pkg-config ];
@ -22,5 +22,6 @@ mkDerivation rec {
description = "A comic reader for cross-platform reading and managing your digital comic collection";
homepage = "http://www.yacreader.com";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ srapenne ];
};
}

View File

@ -2,13 +2,13 @@
let
pname = "anytype";
version = "0.28.0";
version = "0.29.0";
name = "Anytype-${version}";
nameExecutable = pname;
src = fetchurl {
url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage";
name = "Anytype-${version}.AppImage";
sha256 = "sha256-tYeVz10saTJBf6DDGIVSd4IkSREDJFi/am/kg/An02E=";
sha256 = "sha256-xoHYQbV8fPsHs/G1iuTaQ197dpUZkMohmYM924y8NT0=";
};
appimageContents = appimageTools.extractType2 { inherit name src; };
in

View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, xlibsWrapper, motif
{ stdenv, lib, fetchFromGitHub, motif, xorg
, withAudioTracking ? false, libpulseaudio, aubio }:
stdenv.mkDerivation {
@ -21,7 +21,7 @@ stdenv.mkDerivation {
makeFlags = [ "DESTINATION=$(out)/bin/" ]
++ lib.optional withAudioTracking "WITH_TEMPO_TRACKER=1";
buildInputs = [ xlibsWrapper motif ]
buildInputs = [ motif xorg.libX11 xorg.libXext xorg.libXt ]
++ lib.optionals withAudioTracking [ libpulseaudio aubio ];
meta = with lib; {

View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "cubiomes-viewer";
version = "2.5.0";
version = "2.5.1";
src = fetchFromGitHub {
owner = "Cubitect";
repo = pname;
rev = version;
sha256 = "sha256-VZsq2HMvhFB6DR+Z3bVtyIJ2O984QaryYWCcP/a7paw=";
sha256 = "sha256-Ge1dO2I4avblN+3BXY9AXFFmgX4lIwZYUf4IohH1vqc=";
fetchSubmodules = true;
};

View File

@ -124,7 +124,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://keepassxc.org/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jonafato turion ];
maintainers = with maintainers; [ jonafato turion srapenne ];
platforms = platforms.linux ++ platforms.darwin;
broken = stdenv.isDarwin; # see to https://github.com/NixOS/nixpkgs/issues/172165
};

View File

@ -15,7 +15,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "numberstation";
version = "1.1.0";
version = "1.2.0";
format = "other";
@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "~martijnbraam";
repo = "numberstation";
rev = version;
hash = "sha256-A6qwsbeNZXfSOZwHp19/4JQ8dZgjsK7Y2zho6vJXsGA=";
hash = "sha256-e/KZrBnep5LbzgNnIoZlS5AMxhx4KlmdYDzdldMGVwg=";
};
postPatch = ''

View File

@ -22,6 +22,7 @@ python3.pkgs.buildPythonApplication rec {
urwid
urwid-readline
];
format = "other";
dontBuild = true;

View File

@ -70,9 +70,7 @@ def get_matching_chromedriver(version):
'version': chromedriver_version,
'sha256_linux': nix_prefetch_url(get_chromedriver_url('linux64')),
'sha256_darwin': nix_prefetch_url(get_chromedriver_url('mac64')),
# TODO: No such object: chromedriver/106.0.5249.61/chromedriver_mac64_m1.zip:
# 'sha256_darwin_aarch64': nix_prefetch_url(get_chromedriver_url('mac64_m1'))
'sha256_darwin_aarch64': "0000000000000000000000000000000000000000000000000000000000000000"
'sha256_darwin_aarch64': nix_prefetch_url(get_chromedriver_url('mac_arm64'))
}

View File

@ -15,7 +15,7 @@
"version": "106.0.5249.61",
"sha256_linux": "0l2270d5az46pc6icpn3zx7yr8ilkszsrfy3qmwrx3cyc4xnmznj",
"sha256_darwin": "07k76i9m3j34h6ybn1wafy39d2ngf06bhp24qzwvv45rks714hqa",
"sha256_darwin_aarch64": "0000000000000000000000000000000000000000000000000000000000000000"
"sha256_darwin_aarch64": "1nvid0s44nlzy46cgxzsyyb3jfpyl3xy7aqafwskmbxdczx7bdap"
}
},
"beta": {

View File

@ -3,10 +3,10 @@
rec {
firefox = buildMozillaMach rec {
pname = "firefox";
version = "105.0.2";
version = "105.0.3";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "49f4c0e7ecf2cef6fa7de8362185bd9ce6950304dadbbea0522a5782016587b9d58f32b45f0e0edf7a2cc31ea158ed10c886b287a18d1f2bff3daf50d9f0b926";
sha512 = "8a60ed26f3a6e3fafb1eb13a8daf067056d011a17835310f8ce814b86121014796e790f611058aea75334428529028a2e29ba81d9d2653e09517dc7c3cf48e76";
};
meta = {

View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "gatekeeper";
version = "3.9.0";
version = "3.9.1";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "gatekeeper";
rev = "v${version}";
sha256 = "sha256-hZ8PBJ+6G0A5tVrJfxy2rODxOxQarQg6mxG3sQCqjfY=";
sha256 = "sha256-XZASej26Mn4tq9c4nvjQNhQZWtu3L6jIgMNhyYyh5IE=";
};
vendorSha256 = null;

View File

@ -0,0 +1,27 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "kubectl-images";
version = "0.5.2";
src = fetchFromGitHub {
owner = "chenjiandongx";
repo = pname;
rev = "v${version}";
sha256 = "sha256-aDWtLTnMQklTU6X6LF0oBuh1317I5/kiEZVePgJjIdU";
};
vendorSha256 = "sha256-FxaOOFwDf3LNREOlA7frqhDXzc91LC3uJev3kzLDEy8";
postInstall = ''
mv $out/bin/cmd $out/bin/kubectl-images
'';
meta = with lib; {
description = "Show container images used in the cluster.";
homepage = "https://github.com/chenjiandongx/kubectl-images";
changelog = "https://github.com/chenjiandongx/kubectl-images/releases/tag/v${version}";
license = licenses.mit;
maintainers = [ maintainers.ivankovnatsky ];
};
}

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubent";
version = "0.5.1";
version = "0.6.0";
src = fetchFromGitHub {
owner = "doitintl";
repo = "kube-no-trouble";
rev = "${version}";
sha256 = "0pwb9g1hhfqn3rl87fg6sf07m7aviadljb05bbnd241hhlcyslv6";
sha256 = "sha256-aXuBYfXQfg6IQE9cFFTBCPNmDg7IZYPAAeuAxCiU0ro=";
};
vendorSha256 = "1z4cvk936l7011fbimsgpw89yqzyikw9jb4184l37mnj9hl5wpcp";
vendorSha256 = "sha256-WQwWBcwhFZxXPFO6h+5Y8VDM4urJGfZ6AOvhRoaSbpk=";
ldflags = [
"-w" "-s"

View File

@ -12,9 +12,9 @@
buildGoModule rec {
pname = "minikube";
version = "1.27.0";
version = "1.27.1";
vendorSha256 = "sha256-wAjgeq//vRUDUyVNTsVIxLXhA6fzTrYvn4klAPAv7DE=";
vendorSha256 = "sha256-2sXWf+iK1v9gv2DXhmEs8xlIRF+6EM7Y6Otd6F89zGk=";
doCheck = false;
@ -22,7 +22,7 @@ buildGoModule rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
sha256 = "sha256-Pn0F3363YJoOdWyoPy46HmIUwWr/I5TekalBp9hHg7I=";
sha256 = "sha256-GmvxKWHo0meiR1r5IlgI8jQRiDvmQafxTS9acv92EPk=";
};
nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ];

View File

@ -74,8 +74,8 @@ in
{
spark_3_2 = spark rec {
pname = "spark";
version = "3.2.1";
sha256 = "0kxdqczwmj6pray0h8h1qhygni9m82jzznw5fbv9hrxrkq1v182d";
version = "3.2.2";
sha256 = "sha256-yKoTyD/IqvsJQs0jB67h1zqwYaLuikdoa5fYIXtvhz0=";
};
spark_3_1 = spark rec {
pname = "spark";

View File

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "werf";
version = "1.2.176";
version = "1.2.177";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
hash = "sha256-E6xRnEIo6ks8E9bWjo8d+mDhYe+nsKIFdUEGS6tbgXM=";
hash = "sha256-hvMDQlWlAy7gRiSJMt2qAtBpYEbfhGS/DZeQK5ueHYA=";
};
vendorHash = "sha256-NHRPl38/R7yS8Hht118mBc+OBPwfYiHOaGIwryNK8Mo=";
vendorHash = "sha256-ZZh6vKbipp/JmDiB2ELKCFuRUDetmA3+WG7o6ZIQXZk=";
proxyVendor = true;

View File

@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.3.30";
version = "3.3.31";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "refs/tags/v${version}";
hash = "sha256-LwMbqweRtH0l+89pRns6VbQgWOy3j34i76IwYdOUW0M=";
hash = "sha256-JUeH62y2Y73N843ADvvK91PpHAwn1QApnz5Qusm64mI=";
};
postPatch = ''

View File

@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
buildInputs = [ libressl ];
patches = lib.optionals stdenv.isDarwin [ ./modification-time.patch ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
meta = with lib; {

View File

@ -0,0 +1,13 @@
diff --git a/geomyidae-v0.51/handlr.c b/geomyidae-v0.51/handlr.c
index 0c230d32519..9fc043fa3c9 100644
--- a/handlr.c
+++ b/handlr.c
@@ -71,7 +71,7 @@ handledir(int sock, char *path, char *port, char *base, char *args,
*type->type,
dirent[i]->d_name,
humansize(st.st_size),
- humantime(&(st.st_mtim.tv_sec)),
+ humantime(&(st.st_mtimespec.tv_sec)),
e, ohost, port);
free(file);
free(dirent[i]);

View File

@ -4,11 +4,11 @@ let
in
stdenv.mkDerivation rec {
pname = "rocketchat-desktop";
version = "3.8.9";
version = "3.8.11";
src = fetchurl {
url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb";
sha256 = "sha256-IapGlEUUl+iyW1rTCZugN2YOJUpNwd5NP2QPD3FHd0s=";
sha256 = "sha256-gRMoLzCAXByLVtzYAZnhmbgbfsav6CkbP3ZE0NDdlMw=";
};
nativeBuildInputs = [
@ -92,6 +92,6 @@ stdenv.mkDerivation rec {
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.mit;
maintainers = with maintainers; [ gbtb ];
platforms = platforms.x86_64;
platforms = [ "x86_64-linux" ];
};
}

View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "signal-cli";
version = "0.11.1";
version = "0.11.3";
# Building from source would be preferred, but is much more involved.
src = fetchurl {
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz";
sha256 = "sha256-ZvCdxUg1eWeE3/4DLCf7FbDF4B1ZdLTcipKeb/1+xOk=";
sha256 = "sha256-2Tn/04Bbj+mUsV0gftEUXQmFYWTQyVaPNHZQVk57Avo=";
};
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];

View File

@ -163,6 +163,6 @@ in stdenv.mkDerivation rec {
homepage = "https://www.claws-mail.org/";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ fpletz globin orivej oxzi ajs124 ];
maintainers = with maintainers; [ fpletz globin orivej oxzi ajs124 srapenne ];
};
}

View File

@ -4,16 +4,16 @@ let
common = { stname, target, postInstall ? "" }:
buildGoModule rec {
pname = stname;
version = "1.21.0";
version = "1.22.0";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
hash = "sha256-Qgp9fo3yZabxsCFhn7U9B2AcVSUb9GCzm7B81HrI1jY=";
hash = "sha256-jAXxgSm0eEdFylukYGhIGtA0KniMiln1BIfuGZoboSM=";
};
vendorSha256 = "sha256-rde7oyEZA8uGmkvz078Cu+aFrn9TuLTv0i7SW0ytyxU=";
vendorSha256 = "sha256-yabX1A4Q/0ZQFMCrvO5oCI5y0o/dqQy3IplxZ6SsHuw=";
doCheck = false;

View File

@ -1,10 +1,12 @@
{ lib
, stdenv
, fetchFromGitHub
, wxGTK
, cmake
, ninja
, wrapGAppsHook
, makeWrapper
, wxGTK
, Cocoa
, unstableGitUpdater
}:
@ -23,14 +25,25 @@ stdenv.mkDerivation rec {
cmake
ninja
wrapGAppsHook
makeWrapper
];
buildInputs = [
wxGTK
] ++ lib.optionals stdenv.isDarwin [
Cocoa
];
NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${builtins.replaceStrings [ "unstable-" ] [ "" ] version}\"";
postInstall = lib.optionalString stdenv.isDarwin ''
shopt -s extglob
mkdir -p $out/{share/treesheets,bin}
mv $out/!(share) $out/share/treesheets
makeWrapper $out/{share/treesheets,bin}/treesheets \
--chdir $out/share/treesheets
'';
passthru = {
updateScript = unstableGitUpdater { };
};
@ -49,7 +62,7 @@ stdenv.mkDerivation rec {
homepage = "https://strlen.com/treesheets/";
maintainers = with maintainers; [ obadz avery ];
platforms = platforms.linux;
platforms = platforms.unix;
license = licenses.zlib;
};
}

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "flex-ncat";
version = "0.1-20220505.0";
version = "0.1-20221007.1";
src = fetchFromGitHub {
owner = "kc2g-flex-tools";
repo = "nCAT";
rev = "v${version}";
hash = "sha256-Jqoqy+W5sKfg7U/F2OpK1jAVM8rm1Tbr4RHG/mMVE0g=";
hash = "sha256-9rxI3wsqjhaH7DD1Go/8s0r6jXaE15Z9PPtbsnsfrM0=";
};
vendorSha256 = "sha256-mWZRaPbmSPBUhTCWSkU33zOOq79ylEbnjPG3gLkWeQY=";
vendorSha256 = "sha256-lnJtFixgv4ke4Knavb+XKFPzHCiAPhNtfZS3SRVvY2g=";
meta = with lib; {
homepage = "https://github.com/kc2g-flex-tools/nCAT";

View File

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "flex-ndax";
version = "0.2-20220427";
version = "0.2-20221007.1";
src = fetchFromGitHub {
owner = "kc2g-flex-tools";
repo = "nDAX";
rev = "v${version}";
hash = "sha256-KmvTLfGC6xzXcWYAzmBYiYSF65lqMdsdMQjUEk3siqc=";
hash = "sha256-QldbiJnCjWrlXEPvyAqV5Xwz9YvsnVobVy/E/OB0A1k=";
};
buildInputs = [ libpulseaudio ];
vendorSha256 = "sha256-u/5LiVo/ZOefprEKr/L1+3+OfYb0a4wq+CWoUjYNvzg=";
vendorSha256 = "sha256-eHy8oFYicVONQr31LQQ9b5auzeBoIzbszw2buKaBQbQ=";
meta = with lib; {
broken = stdenv.isDarwin;

View File

@ -0,0 +1,59 @@
{ lib
, stdenv
, fetchFromGitHub
, qmake
, qtbase
, pkg-config
, sigutils
, fftwSinglePrec
, suwidgets
, wrapQtAppsHook
, suscan
, libsndfile
, soapysdr-with-plugins
, libxml2
, volk
}:
stdenv.mkDerivation rec {
pname = "sigdigger";
version = "0.3.0";
src = fetchFromGitHub {
owner = "BatchDrake";
repo = "SigDigger";
rev = "v${version}";
sha256 = "sha256-dS+Fc0iQz7GIlGaR556Ur/EQh3Uzhqm9uBW42IuEqoE=";
};
nativeBuildInputs = [
qmake
pkg-config
wrapQtAppsHook
];
buildInputs = [
qtbase
sigutils
fftwSinglePrec
suwidgets
suscan
libsndfile
libxml2
volk
soapysdr-with-plugins
];
qmakeFlags = [
"SUWIDGETS_PREFIX=${suwidgets}"
"SigDigger.pro"
];
meta = with lib; {
description = "Qt-based digital signal analyzer, using Suscan core and Sigutils DSP library";
homepage = "https://github.com/BatchDrake/SigDigger";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ polygon oxapentane ];
};
}

View File

@ -0,0 +1,40 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, fftwSinglePrec
, libsndfile
, volk
}:
stdenv.mkDerivation rec {
pname = "sigutils";
version = "unstable-2022-07-05";
src = fetchFromGitHub {
owner = "BatchDrake";
repo = "sigutils";
rev = "1d7559d427aadd253dd825eef26bf15e54860c5f";
sha256 = "sha256-wvd6sixwGmR9R4x+swLVqXre4Dqnj10jZIXUfaJcmBw=";
};
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
fftwSinglePrec
libsndfile
volk
];
meta = with lib; {
description = "Small signal processing utility library";
homepage = "https://github.com/BatchDrake/sigutils";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ polygon oxapentane ];
};
}

View File

@ -0,0 +1,50 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, fftwSinglePrec
, libsndfile
, sigutils
, soapysdr-with-plugins
, libxml2
, volk
}:
stdenv.mkDerivation rec {
pname = "suscan";
version = "unstable-2022-07-05";
src = fetchFromGitHub {
owner = "BatchDrake";
repo = "suscan";
rev = "37dad542b97aff24654f0bb80fb8e85af7cb84ab";
sha256 = "sha256-h1ogtYjkqiHb1/NAJfJ0HQIvGnZM2K/PSP5nqLXUf9M=";
};
postPatch = ''
sed -i 's/fftw3 >= 3.0/fftw3f >= 3.0/' suscan.pc.in
'';
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
fftwSinglePrec
libsndfile
sigutils
soapysdr-with-plugins
libxml2
volk
];
meta = with lib; {
description = "Channel scanner based on sigutils library";
homepage = "https://github.com/BatchDrake/suscan";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ polygon oxapentane ];
};
}

View File

@ -0,0 +1,51 @@
{ lib
, stdenv
, fetchFromGitHub
, qmake
, qtbase
, pkg-config
, sigutils
, fftwSinglePrec
}:
stdenv.mkDerivation rec {
pname = "suwidgets";
version = "unstable-2022-04-03";
src = fetchFromGitHub {
owner = "BatchDrake";
repo = "SuWidgets";
rev = "826b3eeae5b682dc063f53b427caa9c7c48131ea";
sha256 = "sha256-cyFLsP+8GbALdlgEnVX4201Qq/KAxb/Vv+sJqbFpvUk=";
};
dontWrapQtApps = true;
postPatch = ''
substituteInPlace SuWidgets.pri \
--replace "PKGCONFIG += sigutils fftw3" "PKGCONFIG += sigutils fftw3f"
'';
nativeBuildInputs = [
qmake
pkg-config
];
buildInputs = [
qtbase
sigutils
fftwSinglePrec
];
qmakeFlags = [
"SuWidgetsLib.pro"
];
meta = with lib; {
description = "Sigutils-related widgets";
homepage = "https://github.com/BatchDrake/SuWidgets";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ polygon oxapentane ];
};
}

View File

@ -1,6 +1,5 @@
{ lib
, fetchFromGitHub
, fetchpatch
, git
, libiconv
, ncurses
@ -15,24 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-branchless";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "arxanas";
repo = "git-branchless";
rev = "v${version}";
sha256 = "sha256-jAc17poNTld3eptN1Vd1MOKS5iloMWkq3oZgpWBkGTY=";
sha256 = "sha256-xh+G9bKEL2ho1YrNVTLbCTxSWZtjEuEWutvYEFr2G/g=";
};
cargoPatches = [
(fetchpatch {
name = "build-run-cargo-update";
url = "https://github.com/arxanas/git-branchless/commit/0ac3f325520f79d15368aa9d14893ebc17313ab6.patch";
sha256 = "sha256-S1kazUzvz3FzFpphSRhWiv/l2b/+zC9HtAl7ndq5aJA=";
})
];
cargoSha256 = "sha256-Lo/Q6OSIzWrRNiTGsOWRX+6FEcj4fk1kn7V9tw67UVo=";
cargoSha256 = "sha256-Zz1RQ/mhdIbPiw2StGtTiORXiJ2nVLyZakt1072ha6U=";
nativeBuildInputs = [ pkg-config ];

View File

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://jonas.github.io/tig/";
description = "Text-mode interface for git";
maintainers = with maintainers; [ bjornfor domenkozar qknight globin ma27 ];
maintainers = with maintainers; [ bjornfor domenkozar qknight globin ma27 srapenne ];
license = licenses.gpl2Plus;
platforms = platforms.unix;
};

View File

@ -21,11 +21,11 @@ let
self = python3Packages.buildPythonApplication rec {
pname = "mercurial${lib.optionalString fullBuild "-full"}";
version = "6.2.2";
version = "6.2.3";
src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
sha256 = "sha256-nvqdpfSXqHUKycSPpDHEq3IgnxNgGAxdSSDRMRsEIN8=";
sha256 = "sha256-mNGuAC9orfU9ZcWUf+i3o3n5jPBdm46h9Ad9LKXc6ds=";
};
format = "other";
@ -35,7 +35,7 @@ let
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
inherit src;
name = "mercurial-${version}";
sha256 = "sha256-hvjp45Iv+fjs8R5Q+k96chY5j0S2Vs6+VrXzMuc2Cwg=";
sha256 = "sha256-UWYXVPdEMITLNdBjnoo8IuLOGZiwUJL+dqSl26nf5qs=";
sourceRoot = "mercurial-${version}/rust";
} else null;
cargoRoot = if rustSupport then "rust" else null;

View File

@ -130,6 +130,12 @@ stdenv.mkDerivation rec {
./remove-bundled-luajit.patch
];
# error: unknown type name 'NSUInteger'
postPatch = ''
substituteInPlace src/dialog_colorpicker.cpp \
--replace "NSUInteger" "size_t"
'';
NIX_CFLAGS_COMPILE = "-I${luajit52}/include";
NIX_CFLAGS_LINK = "-L${luajit52}/lib";
@ -153,7 +159,7 @@ stdenv.mkDerivation rec {
# The Aegisub sources are itself BSD/ISC, but they are linked against GPL'd
# softwares - so the resulting program will be GPL
license = licenses.bsd3;
maintainers = [ maintainers.AndersonTorres ];
maintainers = with maintainers; [ AndersonTorres wegank ];
platforms = platforms.unix;
};
}

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "buildkit-nix";
version = "0.0.2";
version = "0.0.3";
src = fetchFromGitHub {
owner = "AkihiroSuda";
repo = pname;
rev = "v${version}";
sha256 = "sha256-k9YO4KFIDebfszhKG6RYDFlVfbUPFHRsHRQXXlJ6SoU=";
sha256 = "sha256-hrrvDby+UDwY0wvq/HIP9lYVEa/flr/1gtGXHMN8Mug=";
};
vendorSha256 = "sha256-c+VHt2uTaEQIXsmJ9TA7X5lfMxGL9yKbbnnXn4drCLU=";
vendorSha256 = "sha256-1H5oWgcaamf+hocABWWnzJUjWiqwk1ZZtbBjF6EKzzU=";
CGO_ENABLED = 0;

View File

@ -15,13 +15,13 @@
buildGoModule rec {
pname = "cri-o";
version = "1.25.0";
version = "1.25.1";
src = fetchFromGitHub {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
sha256 = "sha256-3J/fiaJL828P0L0vgwcR3DbMASt3fcwnLBu33SFDlx0=";
sha256 = "sha256-MFqCRHsIpc8ianyNW+PsDINQavbTZs2rZ2k6q/6wTkY=";
};
vendorSha256 = null;

View File

@ -6,16 +6,16 @@ in
rustPlatform.buildRustPackage rec {
pname = "leftwm";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "leftwm";
repo = "leftwm";
rev = version;
sha256 = "sha256-AfE36u5xSfivkg+hmJ6ASh6zXmTnLOv5RFigkGzySng=";
sha256 = "sha256-4f9YOVkOXn7+TzTUZS2Lultgj9WhiOPUa/fHUeyLBUU=";
};
cargoSha256 = "sha256-MmxF1jt5VUZGbkEe858HBjAuHhgDY23MJJxpYQ4ckhs=";
cargoSha256 = "sha256-D00IFTELRlqeKQ7zheJKTvu5FBgYQXsZ+OnPnVzweC4=";
buildInputs = rpathLibs;

View File

@ -1,14 +1,14 @@
{ lib, fetchurl, libarchive }:
let
version = "0.37.0";
version = "0.37.4";
in fetchurl {
name = "sarasa-gothic-${version}";
# Use the 'ttc' files here for a smaller closure size.
# (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
sha256 = "sha256-R1vU17PSfOe2w9PutA7zYrNsa4mejbXqWlWQVV5KXqs=";
sha256 = "sha256-fbZN4+SHb2Qelnp122M2I0enbcEl+Qh1oSMiDLAYwSs=";
recursiveHash = true;
downloadToTemp = true;

View File

@ -13,18 +13,18 @@ let
pname = "qogir-icon-theme";
in
lib.checkListOfEnum "${pname}: color variants" [ "default" "dark" "all" ] colorVariants
lib.checkListOfEnum "${pname}: color variants" [ "standard" "dark" "all" ] colorVariants
lib.checkListOfEnum "${pname}: theme variants" [ "default" "manjaro" "ubuntu" "all" ] themeVariants
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "2022-07-20";
version = "2022-10-08";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "sha256-I+eojCTR3fXcp7v5Bdie9vstmJja9HB71aQSF5jLDD4=";
sha256 = "sha256-BZhZyPnmiS5mxJp4/QnE7bTynB/cZ0QsUKFMhyd/Ox4=";
};
nativeBuildInputs = [ gtk3 jdupes ];

View File

@ -153,6 +153,10 @@ stdenv.mkDerivation rec {
sed "s|\"upload-system-info\"|\"${xapp}/bin/upload-system-info\"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
sed "s|/usr/bin/cinnamon-control-center|${cinnamon-control-center}/bin/cinnamon-control-center|g" -i ./files/usr/bin/cinnamon-settings
sed "s|/usr/bin/cinnamon-screensaver-command|/run/current-system/sw/bin/cinnamon-screensaver-command|g" \
-i ./files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js -i ./files/usr/share/cinnamon/applets/user@cinnamon.org/applet.js
# this one really IS optional
sed "s|/usr/bin/gnome-control-center|/run/current-system/sw/bin/gnome-control-center|g" -i ./files/usr/bin/cinnamon-settings

View File

@ -1,40 +1,63 @@
{ stdenv, fetchFromGitHub, fetchpatch, callPackage, gnat11, zlib, llvm, lib
, backend ? "mcode" }:
{ stdenv
, fetchFromGitHub
, fetchpatch
, callPackage
, gnat
, zlib
, llvm
, lib
, backend ? "mcode"
}:
assert backend == "mcode" || backend == "llvm";
stdenv.mkDerivation rec {
pname = "ghdl-${backend}";
version = "1.0.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "ghdl";
repo = "ghdl";
rev = "v${version}";
sha256 = "1gyh0xckwbzgslbpw9yrpj4gqs9fm1a2qpbzl0sh143fk1kwjlly";
sha256 = "sha256-B/G3FGRzYy4Y9VNNB8yM3FohiIjPJhYSVbqsTN3cL5k=";
};
patches = [
# Allow compilation with GNAT 11, picked from master
# https://github.com/ghdl/ghdl/issues/2056
(fetchpatch {
name = "fix-gnat-11-compilation.patch";
url = "https://github.com/ghdl/ghdl/commit/8356ea3bb4e8d0e5ad8638c3d50914b64fc360ec.patch";
sha256 = "04pzn8g7xha8000wbjjmry6h1grfqyn3bjvj47hi4qwgl21wfjra";
name = "fix-build-gcc-12.patch";
url = "https://github.com/ghdl/ghdl/commit/f8b87697e8b893b6293ebbfc34670c32bfb49397.patch";
hash = "sha256-tVbMm8veFkNPs6WFBHvaic5Jkp1niyg0LfFufa+hT/E=";
})
];
LIBRARY_PATH = "${stdenv.cc.libc}/lib";
buildInputs = [ gnat11 zlib ] ++ lib.optional (backend == "llvm") [ llvm ];
propagatedBuildInputs = lib.optionals (backend == "llvm") [ zlib ];
nativeBuildInputs = [
gnat
];
buildInputs = [
zlib
] ++ lib.optional (backend == "llvm") [
llvm
];
propagatedBuildInputs = [
] ++ lib.optionals (backend == "llvm") [
zlib
];
preConfigure = ''
# If llvm 7.0 works, 7.x releases should work too.
sed -i 's/check_version 7.0/check_version 7/g' configure
'';
configureFlags = [ "--enable-synth" ] ++ lib.optional (backend == "llvm")
"--with-llvm-config=${llvm.dev}/bin/llvm-config";
configureFlags = [
# See https://github.com/ghdl/ghdl/pull/2058
"--disable-werror"
"--enable-synth"
] ++ lib.optionals (backend == "llvm") [
"--with-llvm-config=${llvm.dev}/bin/llvm-config"
];
hardeningDisable = [ "format" ];

View File

@ -71,39 +71,16 @@ let
nimHost = parsePlatform stdenv.hostPlatform;
nimTarget = parsePlatform stdenv.targetPlatform;
bootstrapCompiler = let
revision = "561b417c65791cd8356b5f73620914ceff845d10";
in stdenv.mkDerivation {
pname = "nim-bootstrap";
version = "g${lib.substring 0 7 revision}";
src = fetchFromGitHub {
owner = "nim-lang";
repo = "csources_v1";
rev = revision;
sha256 = "sha256-gwBFuR7lzO4zttR/6rgdjXMRxVhwKeLqDwpmOwMyU7A=";
};
enableParallelBuilding = true;
installPhase = ''
runHook preInstall
install -Dt $out/bin bin/nim
runHook postInstall
'';
};
in {
nim-unwrapped = stdenv.mkDerivation rec {
pname = "nim-unwrapped";
version = "1.6.6";
version = "1.6.8";
strictDeps = true;
src = fetchurl {
url = "https://nim-lang.org/download/nim-${version}.tar.xz";
hash = "sha256-Z7ERzm84YVA7n8wcrln8NNASJWbT7P7zoGSiF0EhpFI=";
hash = "sha256-D1tlzbYPeK9BywdcI4mDaJoeH34lyBnxeYYsGKSEz1c=";
};
buildInputs = [ boehmgc openssl pcre readline sqlite ];
@ -118,7 +95,6 @@ in {
configurePhase = ''
runHook preConfigure
cp ${bootstrapCompiler}/bin/nim bin/
echo 'define:nixbuild' >> config/nim.cfg
runHook postConfigure
'';
@ -133,9 +109,11 @@ in {
buildPhase = ''
runHook preBuild
local HOME=$TMPDIR
./bin/nim c koch
make -j$NIX_BUILD_CORES
./bin/nim c --parallelBuild:$NIX_BUILD_CORES koch
./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES
./koch toolsNoExternal $kochArgs --parallelBuild:$NIX_BUILD_CORES
./bin/nim js -d:release tools/dochack/dochack.nim
runHook postBuild
'';
@ -145,6 +123,7 @@ in {
ln -sf $out/nim/bin/nim $out/bin/nim
ln -sf $out/nim/lib $out/lib
./install.sh $out
cp -a tools $out/nim/
runHook postInstall
'';

View File

@ -1,14 +1,3 @@
commit 164ba50fc74b980f77047080b2ae1ea099ae9b27
Author: Emery Hemingway <ehmry@posteo.net>
Date: Mon Sep 7 14:09:22 2020 +0200
Load libaries by absolute path on NixOS
If "nixbuild" is defined then choose dynamic runtime libraries by
searching $NIX_LDFLAGS at compile-time.
Fix #15194
diff --git a/lib/pure/dynlib.nim b/lib/pure/dynlib.nim
index f31ae94dd..debed9c07 100644
--- a/lib/pure/dynlib.nim
@ -37,7 +26,7 @@ index f31ae94dd..debed9c07 100644
+ # to enable this behavior by default.
+ #
+ var libDirs = split(getEnv("LD_LIBRARY_PATH"), ':')
+ for flag in split(getEnv("NIX_LDFLAGS")):
+ for flag in split(replace(getEnv("NIX_LDFLAGS"), "\\ ", " ")):
+ if flag.startsWith("-L"):
+ libDirs.add(flag[2..flag.high])
+ for lib in dest:

View File

@ -1,21 +1,34 @@
{ stdenv, lib, fetchFromGitHub, pkg-config
, yosys, readline, zlib, ghdl
{ stdenv
, lib
, fetchFromGitHub
, pkg-config
, yosys
, readline
, zlib
, ghdl
}:
stdenv.mkDerivation {
pname = "yosys-ghdl";
version = "2021.01.25";
plugin = "ghdl";
# This is not the latest commit, but it's the latest that builds with current stable ghdl 2.0.0
version = "2022.01.11";
src = fetchFromGitHub {
owner = "ghdl";
repo = "ghdl-yosys-plugin";
rev = "cba859cacf8c6631146dbdaa0f297c060b5a68cd";
sha256 = "01d9wb7sqkmkf2y9bnn3pmhy08khzs5m1d06whxsiwgwnjzfk9mx";
rev = "c9b05e481423c55ffcbb856fd5296701f670808c";
sha256 = "sha256-tT2+DXUtbJIBzBUBcyG2sz+3G+dTkciLVIczcRPr0Jw=";
};
buildInputs = [ yosys readline zlib ghdl ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
yosys
readline
zlib
ghdl
];
nativeBuildInputs = [
pkg-config
];
doCheck = true;
installPhase = ''
@ -25,6 +38,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "GHDL plugin for Yosys";
homepage = "https://github.com/ghdl/ghdl-yosys-plugin";
license = licenses.isc;
platforms = platforms.all;
maintainers = with maintainers; [ thoughtpolice ];

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "tytools";
version = "0.9.7";
version = "0.9.8";
src = fetchFromGitHub {
owner = "Koromix";
repo = pname;
rev = "v${version}";
sha256 = "sha256-iF2XyWSBBCO23iY/ni+QlpgtOuWKN2JTMTz+9OLEadk=";
sha256 = "sha256-MKhh0ooDZI1Ks8vVuPRiHhpOqStetGaAhE2ulvBstxA=";
};
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];

View File

@ -10,13 +10,13 @@
let cg3 = stdenv.mkDerivation rec {
pname = "cg3";
version = "1.3.7";
version = "1.3.9";
src = fetchFromGitHub {
owner = "GrammarSoft";
repo = "${pname}";
rev = "v${version}";
sha256 = "Ena3dGoZsXOIY6mbvnfI0H7QqRifoxWIBKQrK3yQSmY=";
sha256 = "sha256-TiEhhk90w5GibGZ4yalIf+4qLA8NoU6+GIPN6QNTz2A=";
};
nativeBuildInputs = [

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cosmopolitan";
version = "2.1";
version = "2.1.1";
src = fetchFromGitHub {
owner = "jart";
repo = pname;
rev = version;
sha256 = "sha256-qi82iGw0Sj2pgV9O4rr/q7jyd1XG3MpTr69dXdAUH0Q=";
sha256 = "sha256-2Q4lutSIQ6tBwTy01lPSMepNAww9Kb7BwNyEcsSdWZ0=";
};
patches = [

View File

@ -5,7 +5,7 @@
# imlib2 can load images from ID3 tags.
, libid3tag, librsvg, libheif
, freetype , bzip2, pkg-config
, x11Support ? true, xlibsWrapper ? null
, x11Support ? true
, svgSupport ? false
, heifSupport ? false
, webpSupport ? false
@ -20,10 +20,11 @@
, openbox
, fluxbox
, enlightenment
, xorg
}:
let
inherit (lib) optional;
inherit (lib) optional optionals;
in
stdenv.mkDerivation rec {
pname = "imlib2";
@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libjpeg libtiff giflib libpng
bzip2 freetype libid3tag
] ++ optional x11Support xlibsWrapper
] ++ optionals x11Support [ xorg.libXft xorg.libXext ]
++ optional heifSupport libheif
++ optional svgSupport librsvg
++ optional webpSupport libwebp

View File

@ -0,0 +1,35 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
, ninja
, pkg-config
}:
stdenv.mkDerivation rec {
pname = "libajantv2";
version = "16.2-bugfix5";
src = fetchFromGitHub {
owner = "aja-video";
repo = "ntv2";
rev = "v${version}";
sha256 = "sha256-h5PKWMwqTeI5/EaTWkjYojuvDU0FyMpzIjWB98UOJwc=";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [
cmake
ninja
pkg-config
];
meta = with lib; {
description = "AJA NTV2 Open Source Static Libs and Headers for building applications that only wish to statically link against";
homepage = "https://github.com/aja-video/ntv2";
license = with licenses; [ mit ];
maintainers = with maintainers; [ sebtm ];
platforms = platforms.linux;
};
}

View File

@ -1,8 +0,0 @@
{ callPackage, zlib }:
callPackage ./common.nix rec {
version = "0.4.2";
url = "https://www.prevanders.net/libdwarf-${version}.tar.xz";
sha512 = "6d2a3ebf0104362dd9cecec272935684f977db119810eea0eec88c9f56a042f260a4f6ed3bbabde8592fe16f98cbd81b4ab2878005140e05c8f475df6380d1c2";
buildInputs = [ zlib ];
knownVulnerabilities = [];
}

View File

@ -0,0 +1,8 @@
{ callPackage, zlib, libelf }:
callPackage ./common.nix rec {
version = "20210528";
url = "https://www.prevanders.net/libdwarf-${version}.tar.gz";
sha512 = "e0f9c88554053ee6c1b1333960891189e7820c4a4ddc302b7e63754a4cdcfc2acb1b4b6083a722d1204a75e994fff3401ecc251b8c3b24090f8cb4046d90f870";
buildInputs = [ zlib libelf ];
knownVulnerabilities = [ "CVE-2022-32200" "CVE-2022-39170" ];
}

View File

@ -1,8 +1,8 @@
{ callPackage, zlib, libelf }:
{ callPackage, zlib }:
callPackage ./common.nix rec {
version = "20210528";
url = "https://www.prevanders.net/libdwarf-${version}.tar.gz";
sha512 = "e0f9c88554053ee6c1b1333960891189e7820c4a4ddc302b7e63754a4cdcfc2acb1b4b6083a722d1204a75e994fff3401ecc251b8c3b24090f8cb4046d90f870";
buildInputs = [ zlib libelf ];
knownVulnerabilities = [ "CVE-2022-32200" "CVE-2022-39170" ];
version = "0.4.2";
url = "https://www.prevanders.net/libdwarf-${version}.tar.xz";
sha512 = "6d2a3ebf0104362dd9cecec272935684f977db119810eea0eec88c9f56a042f260a4f6ed3bbabde8592fe16f98cbd81b4ab2878005140e05c8f475df6380d1c2";
buildInputs = [ zlib ];
knownVulnerabilities = [];
}

View File

@ -102,4 +102,18 @@ in {
})
];
};
libressl_3_6 = generic {
version = "3.6.0";
hash = "sha256-GxLe/Lvb2+2oaSnkIQAK8PQjM63UgX/SbA2aGuxHhAQ=";
patches = [
# Fix endianness detection on aarch64-darwin, issue #181187
(fetchpatch {
name = "fix-endian-header-detection.patch";
url = "https://patch-diff.githubusercontent.com/raw/libressl-portable/portable/pull/771.patch";
sha256 = "sha256-in5U6+sl0HB9qMAtUL6Py4X2rlv0HsqRMIQhhM1oThE=";
})
];
};
}

View File

@ -8,21 +8,23 @@
stdenv.mkDerivation rec {
pname = "maeparser";
version = "1.2.4";
version = "1.3.0";
src = fetchFromGitHub {
owner = "schrodinger";
repo = "maeparser";
rev = "v${version}";
sha256 = "1qzp8d58ksy88y4fx1b0x65wycslm7zxzbb8ns28gkjh12xpzhwz";
sha256 = "sha256-9KxCR/spIZzePjmZe8qihIi1hEhPvxg/9dAlYmHxZPs=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ boost zlib ];
meta = with lib; {
description = "maestro file parser";
homepage = "https://github.com/schrodinger/maeparser";
description = "Maestro file parser";
maintainers = [ maintainers.rmcgibbo ];
license = licenses.mit;
platforms = platforms.unix;
};
}

View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "rocksdb";
version = "7.6.0";
version = "7.7.2";
src = fetchFromGitHub {
owner = "facebook";
repo = pname;
rev = "v${version}";
sha256 = "sha256-35GpPSL5r2LnpooMVux+a7oH8b+mkKVLiinzRKJaUJQ=";
sha256 = "sha256-Cla2yat/xCrzx53mYRKjcvH9cCY0MVD8RSMjGfxVDUM=";
};
nativeBuildInputs = [ cmake ninja ];

View File

@ -2,10 +2,10 @@
{ strictDeps ? true, depsBuildBuild ? [ ], nativeBuildInputs ? [ ]
, configurePhase ? null, buildPhase ? null, checkPhase ? null
, installPhase ? null, meta ? { }, ... }@attrs:
, installPhase ? null, enableParallelBuilding ? true, meta ? { }, ... }@attrs:
stdenv.mkDerivation (attrs // {
inherit strictDeps;
inherit strictDeps enableParallelBuilding;
depsBuildBuild = [ nim_builder ] ++ depsBuildBuild;
nativeBuildInputs = [ nim ] ++ nativeBuildInputs;

View File

@ -119,8 +119,8 @@ proc buildPhase*() =
binDir = getOutputDir("bin") / "bin"
if bins != @[]:
for bin in bins:
cmds.add("nim compile $# --outdir:$# $#" %
[getenv"nimFlags", binDir, normalizedPath(srcDir / bin)])
cmds.add("nim compile $# --parallelBuild:$# --outdir:$# $#" %
[getenv("nimFlags"), getenv("NIX_BUILD_CORES","1"), binDir, normalizedPath(srcDir / bin)])
if getEnvBool"nimDoc":
echo "generating documentation"
let docDir = getOutputDir("doc") / "doc"

View File

@ -32,6 +32,7 @@
, "asar"
, "audiosprite"
, "autoprefixer"
, "auto-changelog"
, "aws-azure-login"
, "aws-cdk"
, "awesome-lint"

File diff suppressed because it is too large Load Diff

View File

@ -1,10 +1,9 @@
{ lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib, cppo }:
let param =
let v6_5 = {
version = "6.5";
sha256 = "sha256:0fwibah2hgllrnbdrmfqil5gr5raf6pb5h2zx6zs1h3d4ykvy8k8";
useDune2 = true;
let v6_6 = {
version = "6.6";
sha256 = "sha256-QhuaQ9346a3neoRM4GrOVzjR8fg9ysMZR1VzNgyIQtc=";
nativeBuildInputs = [cppo];
buildInputs = [cppo];
}; in
@ -28,13 +27,13 @@ let param =
"4.07" = {
version = "5.1+4.06.0";
sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; };
"4.08" = v6_5;
"4.09" = v6_5;
"4.10" = v6_5;
"4.11" = v6_5;
"4.12" = v6_5;
"4.13" = v6_5;
"4.14" = v6_5;
"4.08" = v6_6;
"4.09" = v6_6;
"4.10" = v6_6;
"4.11" = v6_6;
"4.12" = v6_6;
"4.13" = v6_6;
"4.14" = v6_6;
}.${ocaml.meta.branch};
in
@ -56,7 +55,7 @@ if lib.versionAtLeast param.version "6.0"
then
buildDunePackage {
inherit pname src meta;
inherit (param) version useDune2 buildInputs nativeBuildInputs;
inherit (param) version buildInputs nativeBuildInputs;
strictDeps = true;
}

View File

@ -0,0 +1,70 @@
{ lib
, buildPythonPackage
, defusedxml
, dissect-cstruct
, dissect-target
, fetchFromGitHub
, minio
, pycryptodome
, pytestCheckHook
, pythonOlder
, requests
, requests-toolbelt
, rich
, setuptools
, setuptools-scm
}:
buildPythonPackage rec {
pname = "acquire";
version = "3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "acquire";
rev = version;
hash = "sha256-YwmrdqWG5qD621+jQMVyTM0Uy0yXCVPv9zfVhZ+ohg0=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
defusedxml
dissect-cstruct
dissect-target
];
passthru.optional-dependencies = {
full = [
dissect-target
minio
pycryptodome
requests
requests-toolbelt
rich
] ++ dissect-target.optional-dependencies.full;
};
checkInputs = [
pytestCheckHook
] ++ passthru.optional-dependencies.full;
pythonImportsCheck = [
"acquire"
];
meta = with lib; {
description = "Tool to quickly gather forensic artifacts from disk images or a live system";
homepage = "https://github.com/fox-it/acquire";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -1,35 +1,40 @@
{ lib
, fetchzip
, buildPythonPackage
, setuptools
, ecdsa
, fastecdsa
, sympy
, frozendict
, marshmallow
, marshmallow-enum
, marshmallow-dataclass
, marshmallow-oneofschema
, pipdeptree
, eth-hash
, web3
, aiohttp
, buildPythonPackage
, cachetools
, ecdsa
, eth-hash
, fastecdsa
, fetchzip
, frozendict
, gmp
, lark
, marshmallow
, marshmallow-dataclass
, marshmallow-enum
, marshmallow-oneofschema
, mpmath
, numpy
, pipdeptree
, prometheus-client
, typeguard
, lark
, pyyaml
, pytest-asyncio
, pytest
, pytest-asyncio
, pytestCheckHook
, gmp
, pythonOlder
, pythonRelaxDepsHook
, pyyaml
, setuptools
, sympy
, typeguard
, web3
}:
buildPythonPackage rec {
pname = "cairo-lang";
version = "0.10.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchzip {
url = "https://github.com/starkware-libs/cairo-lang/releases/download/v${version}/cairo-lang-${version}.zip";
@ -37,13 +42,9 @@ buildPythonPackage rec {
};
# TODO: remove a substantial part when https://github.com/starkware-libs/cairo-lang/pull/88/files is merged.
# TODO: pytest and pytest-asyncio must be removed as they are check inputs in fact.
postPatch = ''
substituteInPlace requirements.txt \
--replace 'frozendict==1.2' 'frozendict>=1.2' \
--replace 'lark-parser' 'lark' \
--replace 'pytest-asyncio' ''' \
--replace "pytest" '''
--replace "lark-parser" "lark"
substituteInPlace starkware/cairo/lang/compiler/parser_transformer.py \
--replace 'value, meta' 'meta, value' \
@ -52,7 +53,13 @@ buildPythonPackage rec {
--replace 'standard' 'basic'
'';
buildInputs = [ gmp ];
nativeBuildInputs = [
pythonRelaxDepsHook
];
buildInputs = [
gmp
];
propagatedBuildInputs = [
aiohttp
@ -74,23 +81,33 @@ buildPythonPackage rec {
lark
web3
eth-hash
eth-hash.optional-dependencies.pycryptodome
pyyaml
];
] ++ eth-hash.optional-dependencies.pycryptodome;
checkInputs = [
pytest-asyncio
pytestCheckHook
];
pythonRelaxDeps = [
"frozendict"
];
pythonRemoveDeps = [
# TODO: pytest and pytest-asyncio must be removed as they are check inputs
"pytest"
"pytest-asyncio"
];
# There seems to be no test included in the ZIP release…
# Cloning from GitHub is harder because they use a custom CMake setup
# TODO(raitobezarius): upstream was pinged out of band about it.
doCheck = false;
meta = {
homepage = "https://github.com/starkware/cairo-lang";
meta = with lib; {
description = "Tooling for Cairo language";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ raitobezarius ];
homepage = "https://github.com/starkware/cairo-lang";
license = licenses.mit;
maintainers = with maintainers; [ raitobezarius ];
};
}

View File

@ -57,6 +57,6 @@ buildPythonPackage rec {
homepage = "https://github.com/deltachat/deltachat-core-rust/tree/master/python";
changelog = "https://github.com/deltachat/deltachat-core-rust/blob/${version}/python/CHANGELOG";
license = licenses.mpl20;
maintainers = with maintainers; [ dotlambda ];
maintainers = with maintainers; [ dotlambda srapenne ];
};
}

View File

@ -0,0 +1,52 @@
{ lib
, buildPythonPackage
, dissect-cstruct
, dissect-util
, fetchFromGitHub
, setuptools
, setuptools-scm
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "dissect-cim";
version = "3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.cim";
rev = version;
hash = "sha256-rWlAYndqqZ6l/iwk1u2gG0mtQHvAMYUUEWo23hLykXI=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cstruct
dissect-util
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dissect.cim"
];
meta = with lib; {
description = "Dissect module implementing a parser for the Windows Common Information Model (CIM) database";
homepage = "https://github.com/fox-it/dissect.cim";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,50 @@
{ lib
, buildPythonPackage
, dissect-cstruct
, fetchFromGitHub
, setuptools
, setuptools-scm
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "dissect-clfs";
version = "1.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.clfs";
rev = version;
hash = "sha256-5rG8YiVBU4ETLgQoFnMaeXHttIB26+OhIdYjKDKmPBc=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cstruct
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dissect.clfs"
];
meta = with lib; {
description = "Dissect module implementing a parser for the CLFS (Common Log File System) file system";
homepage = "https://github.com/fox-it/dissect.clfs";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,45 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, setuptools
, setuptools-scm
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "dissect-cstruct";
version = "3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.cstruct";
rev = version;
hash = "sha256-iP00EcEkUWoYi+SCo/gY9LSVtCSQZ3g2wMs4Z8m+X2M=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dissect.cstruct"
];
meta = with lib; {
description = "Dissect module implementing a parser for C-like structures";
homepage = "https://github.com/fox-it/dissect.cstruct";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,52 @@
{ lib
, buildPythonPackage
, dissect-cstruct
, dissect-util
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, setuptools
, setuptools-scm
}:
buildPythonPackage rec {
pname = "dissect-esedb";
version = "3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.esedb";
rev = version;
hash = "sha256-DLu6FCWqeESFlsIB21jN/IKCwSKlBoibildv07/hPcw=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cstruct
dissect-util
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dissect.esedb"
];
meta = with lib; {
description = "Dissect module implementing a parser for Microsofts Extensible Storage Engine Database (ESEDB)";
homepage = "https://github.com/fox-it/dissect.esedb";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,52 @@
{ lib
, buildPythonPackage
, dissect-cstruct
, dissect-util
, fetchFromGitHub
, setuptools
, setuptools-scm
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "dissect-etl";
version = "3.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.etl";
rev = version;
hash = "sha256-EqEYw2MpNjdw8nXkxe76R5y99Y+rsK42qfTpT/kxtZ0=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cstruct
dissect-util
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dissect.etl"
];
meta = with lib; {
description = "Dissect module implementing a parser for Event Trace Log (ETL) files";
homepage = "https://github.com/fox-it/dissect.etl";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,52 @@
{ lib
, buildPythonPackage
, dissect-cstruct
, dissect-util
, fetchFromGitHub
, setuptools
, setuptools-scm
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "dissect-eventlog";
version = "3.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.eventlog";
rev = version;
hash = "sha256-cLIsK2/pL9nNOitoTZprqAio1BOo3/Uqfbl8uL/1tG4=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cstruct
dissect-util
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dissect.eventlog"
];
meta = with lib; {
description = "Dissect module implementing parsers for the Windows EVT, EVTX and WEVT log file formats";
homepage = "https://github.com/fox-it/dissect.eventlog";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,52 @@
{ lib
, buildPythonPackage
, dissect-cstruct
, dissect-util
, fetchFromGitHub
, setuptools
, setuptools-scm
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "dissect-evidence";
version = "3.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.evidence";
rev = version;
hash = "sha256-X0WMv96Wo3vDZ6HYGdWfn7OKhFuT5Qjzkyj4HzMqCiM=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cstruct
dissect-util
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dissect.evidence"
];
meta = with lib; {
description = "Dissect module implementing a parsers for various forensic evidence file containers";
homepage = "https://github.com/fox-it/dissect.evidence";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,52 @@
{ lib
, buildPythonPackage
, dissect-cstruct
, dissect-util
, fetchFromGitHub
, setuptools
, setuptools-scm
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "dissect-extfs";
version = "3.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.extfs";
rev = version;
hash = "sha256-i52hlTh0uJJcprA6oVlFQ3v6BpOtSnQAQ0p6BHt56Ac=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cstruct
dissect-util
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dissect.extfs"
];
meta = with lib; {
description = "Dissect module implementing a parser for the ExtFS file system";
homepage = "https://github.com/fox-it/dissect.extfs";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,50 @@
{ lib
, buildPythonPackage
, dissect-cstruct
, dissect-util
, fetchFromGitHub
, setuptools
, setuptools-scm
, pythonOlder
}:
buildPythonPackage rec {
pname = "dissect-fat";
version = "3.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.fat";
rev = version;
hash = "sha256-GBeacQtNA1onh67Svqo5R43gap/Lzpm+20TXcUMmU5k=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cstruct
dissect-util
];
# dissect.fat.exceptions.InvalidBPB: Invalid BS_jmpBoot
doCheck = false;
pythonImportsCheck = [
"dissect.fat"
];
meta = with lib; {
description = "Dissect module implementing a parser for the FAT file system";
homepage = "https://github.com/fox-it/dissect.fat";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,52 @@
{ lib
, buildPythonPackage
, dissect-cstruct
, dissect-util
, fetchFromGitHub
, setuptools
, setuptools-scm
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "dissect-ffs";
version = "3.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.ffs";
rev = version;
hash = "sha256-JI0i0pvOOChWCDB8rynDuf0txvPQT7z2JJ1EsE4VNLw=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cstruct
dissect-util
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dissect.ffs"
];
meta = with lib; {
description = "Dissect module implementing a parser for the FFS file system";
homepage = "https://github.com/fox-it/dissect.ffs";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,61 @@
{ lib
, buildPythonPackage
, dissect-cstruct
, dissect-util
, fetchFromGitHub
, pycryptodome
, pytestCheckHook
, pythonOlder
, rich
, setuptools
, setuptools-scm
}:
buildPythonPackage rec {
pname = "dissect-hypervisor";
version = "3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.hypervisor";
rev = version;
hash = "sha256-yc9QfzvWX8jsRVZYglZZuMfxsYUoPr5gf407DABjQcU=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cstruct
dissect-util
];
passthru.optional-dependencies = {
full = [
pycryptodome
rich
];
};
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dissect.hypervisor"
];
meta = with lib; {
description = "Dissect module implementing parsers for various hypervisor disk, backup and configuration files";
homepage = "https://github.com/fox-it/dissect.hypervisor";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,57 @@
{ lib
, buildPythonPackage
, dissect-cstruct
, dissect-util
, fetchFromGitHub
, setuptools
, setuptools-scm
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "dissect-ntfs";
version = "3.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.ntfs";
rev = version;
hash = "sha256-hZz/v6qLZnbsZkS/cBU/to4XmZNgUJQwCaPkY2ebl4Q=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cstruct
dissect-util
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dissect.ntfs"
];
disabledTestPaths = [
# Test is very time consuming
"tests/test_index.py"
];
meta = with lib; {
description = "Dissect module implementing a parser for the NTFS file system";
homepage = "https://github.com/fox-it/dissect.ntfs";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,50 @@
{ lib
, buildPythonPackage
, dissect-cstruct
, dissect-util
, fetchFromGitHub
, setuptools
, setuptools-scm
, pythonOlder
}:
buildPythonPackage rec {
pname = "dissect-ole";
version = "3.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.ole";
rev = version;
hash = "sha256-qnrbS+gdzBV/mQ08fQzpvevkDtrJ1qXpteW0lxJ+ZUI=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cstruct
dissect-util
];
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"dissect.ole"
];
meta = with lib; {
description = "Dissect module implementing a parser for the Object Linking & Embedding (OLE) format";
homepage = "https://github.com/fox-it/dissect.ole";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,52 @@
{ lib
, buildPythonPackage
, dissect-cstruct
, dissect-util
, fetchFromGitHub
, setuptools
, setuptools-scm
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "dissect-regf";
version = "3.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.regf";
rev = version;
hash = "sha256-88qG90jza0EVP5dgz09ZA8Z+zFwqanOODlUgsvkMxGo=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cstruct
dissect-util
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dissect.regf"
];
meta = with lib; {
description = "Dissect module implementing a parser for Windows registry file format";
homepage = "https://github.com/fox-it/dissect.regf";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,52 @@
{ lib
, buildPythonPackage
, dissect-cstruct
, dissect-util
, fetchFromGitHub
, setuptools
, setuptools-scm
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "dissect-shellitem";
version = "3.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.shellitem";
rev = version;
hash = "sha256-HVnfHsD1V+4kWt9qOClsKuIZMpX4VKrr/5eD7KRq5ww=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cstruct
dissect-util
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dissect.shellitem"
];
meta = with lib; {
description = "Dissect module implementing a parser for the Shellitem structures";
homepage = "https://github.com/fox-it/dissect.shellitem";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,52 @@
{ lib
, buildPythonPackage
, dissect-cstruct
, dissect-util
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, setuptools
, setuptools-scm
}:
buildPythonPackage rec {
pname = "dissect-sql";
version = "3.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.sql";
rev = version;
hash = "sha256-uKCCwTFLQSos+L0qc1pFlF3O4FV13up0qFqDYdTZJBk=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cstruct
dissect-util
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dissect.sql"
];
meta = with lib; {
description = "Dissect module implementing a parsers for the SQLite database file format";
homepage = "https://github.com/fox-it/dissect.sql";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,110 @@
{ lib
, asn1crypto
, buildPythonPackage
, defusedxml
, dissect-cim
, dissect-clfs
, dissect-cstruct
, dissect-esedb
, dissect-etl
, dissect-eventlog
, dissect-evidence
, dissect-extfs
, dissect-fat
, dissect-ffs
, dissect-hypervisor
, dissect-ntfs
, dissect-regf
, dissect-sql
, dissect-util
, dissect-volume
, dissect-xfs
, fetchFromGitHub
, flow-record
, fusepy
, ipython
, pytestCheckHook
, pythonOlder
, pyyaml
, setuptools
, setuptools-scm
, structlog
, yara-python
, zstandard
}:
buildPythonPackage rec {
pname = "dissect-target";
version = "3.3";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.target";
rev = version;
hash = "sha256-EWUYN2OsYeDo3C+QgjAVq9NXiVk1KWGILwtT0cI0tB0=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cstruct
dissect-eventlog
dissect-evidence
dissect-hypervisor
dissect-ntfs
dissect-regf
dissect-util
dissect-volume
flow-record
structlog
];
passthru.optional-dependencies = {
full = [
asn1crypto
defusedxml
dissect-cim
dissect-clfs
dissect-esedb
dissect-etl
dissect-extfs
dissect-fat
dissect-ffs
dissect-sql
dissect-xfs
fusepy
ipython
pyyaml
yara-python
zstandard
];
};
checkInputs = [
pytestCheckHook
] ++ passthru.optional-dependencies.full;
pythonImportsCheck = [
"dissect.target"
];
disabledTests = [
# Test requires rdump
"test_exec_target_command"
];
meta = with lib; {
description = "Dissect module that provides a programming API and command line tools";
homepage = "https://github.com/fox-it/dissect.target";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,45 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, setuptools
, setuptools-scm
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "dissect-util";
version = "3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.util";
rev = version;
hash = "sha256-vit+SQ368limLvdVP/0eVINiEAY/dzD/simHFw489Ck=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dissect.util"
];
meta = with lib; {
description = "Dissect module implementing various utility functions for the other Dissect modules";
homepage = "https://github.com/fox-it/dissect.util";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,52 @@
{ lib
, buildPythonPackage
, dissect-cstruct
, dissect-util
, fetchFromGitHub
, setuptools
, setuptools-scm
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "dissect-vmfs";
version = "3.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.vmfs";
rev = version;
hash = "sha256-JVJvuH+ZTlGOnmTSB/nnBuMrc/VtkKVrLDRYnukDXBA=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cstruct
dissect-util
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dissect.vmfs"
];
meta = with lib; {
description = "Dissect module implementing a parser for the VMFS file system";
homepage = "https://github.com/fox-it/dissect.vmfs";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,52 @@
{ lib
, buildPythonPackage
, dissect-cstruct
, dissect-util
, fetchFromGitHub
, setuptools
, setuptools-scm
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "dissect-volume";
version = "3.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.volume";
rev = version;
hash = "sha256-9SbluaB2wV4gOCry5c7ZLABMwhGfnYg7dTPdKMXYSZM=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cstruct
dissect-util
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dissect.volume"
];
meta = with lib; {
description = "Dissect module implementing various utility functions for the other Dissect modules";
homepage = "https://github.com/fox-it/dissect.volume";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,52 @@
{ lib
, buildPythonPackage
, dissect-cstruct
, dissect-util
, fetchFromGitHub
, setuptools
, setuptools-scm
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "dissect-xfs";
version = "3.1";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect.xfs";
rev = version;
hash = "sha256-Tg4su78Na6IAQhi7aOY8QNs3tnYOYvdnNQV6rn8QpSE=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cstruct
dissect-util
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"dissect.xfs"
];
meta = with lib; {
description = "Dissect module implementing a parser for the XFS file system";
homepage = "https://github.com/fox-it/dissect.xfs";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,88 @@
{ lib
, buildPythonPackage
, dissect-cim
, dissect-clfs
, dissect-cstruct
, dissect-esedb
, dissect-etl
, dissect-eventlog
, dissect-evidence
, dissect-extfs
, dissect-fat
, dissect-ffs
, dissect-hypervisor
, dissect-ntfs
, dissect-ole
, dissect-regf
, dissect-shellitem
, dissect-sql
, dissect-target
, dissect-util
, dissect-vmfs
, dissect-volume
, dissect-xfs
, fetchFromGitHub
, pythonOlder
, setuptools
, setuptools-scm
}:
buildPythonPackage rec {
pname = "dissect";
version = "3.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "dissect";
rev = version;
hash = "sha256-DtiaBKQtz6CgU1csfGhCw0LJLoiKwyH6N6b7/elpJkU=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
dissect-cim
dissect-clfs
dissect-cstruct
dissect-esedb
dissect-etl
dissect-eventlog
dissect-evidence
dissect-extfs
dissect-fat
dissect-ffs
dissect-hypervisor
dissect-ntfs
dissect-ole
dissect-regf
dissect-shellitem
dissect-sql
dissect-target
dissect-util
dissect-vmfs
dissect-volume
dissect-xfs
] ++ dissect-target.optional-dependencies.full;
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"dissect"
];
meta = with lib; {
description = "Dissect meta module";
homepage = "https://github.com/fox-it/dissect";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -0,0 +1,68 @@
{ lib
, buildPythonPackage
, elasticsearch
, fetchFromGitHub
, lz4
, msgpack
, pytestCheckHook
, pythonOlder
, setuptools
, setuptools-scm
, zstandard
}:
buildPythonPackage rec {
pname = "flow-record";
version = "3.5";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "fox-it";
repo = "flow.record";
rev = version;
hash = "sha256-hULz5pIqCKujVH3SpzFgzNM9R7WTtqAmuNOxG7VlUd0=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [
msgpack
];
passthru.optional-dependencies = {
compression = [
lz4
zstandard
];
elastic = [
elasticsearch
];
};
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"flow.record"
];
disabledTestPaths = [
# Test requires rdump
"tests/test_rdump.py"
];
meta = with lib; {
description = "Library for defining and creating structured data";
homepage = "https://github.com/fox-it/flow.record";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, poetry-core
, python
, pytestCheckHook
@ -11,7 +10,7 @@
buildPythonPackage rec {
pname = "funcparserlib";
version = "1.0.0a0";
version = "1.0.0";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -20,7 +19,7 @@ buildPythonPackage rec {
owner = "vlasovskikh";
repo = pname;
rev = version;
sha256 = "sha256-YfcboKjyc5ASzrp0duu2R6psf51MGZIeZ0owo5QNSnU=";
sha256 = "sha256-moWaOzyF/yhDQCLEp7bc0j8wNv7FM7cvvpCwon3j+gI=";
};
nativeBuildInputs = [
@ -32,15 +31,6 @@ buildPythonPackage rec {
six
];
patches = [
# Support for poetry-core, https://github.com/vlasovskikh/funcparserlib/pull/73
(fetchpatch {
name = "support-poetry-core.patch";
url = "https://github.com/vlasovskikh/funcparserlib/commit/61ed558fc146b7a30879919325dfa8aae77be556.patch";
sha256 = "sha256-tqdR3r4/t7RWBYZeAabaN7oYf6VxkVVz006XICX9rYI=";
})
];
pythonImportsCheck = [
"funcparserlib"
];

View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "2022.10.1";
version = "2022.10.2";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-wqAms2jG19midKz7yZUT3kFEVMSBUvNujBjzwKN5BsU=";
sha256 = "sha256-WQbTs29cbCm8i7cAlCkyBaBjwOKFawY9Xyj0fPhZQUk=";
};
nativeBuildInputs = [

Some files were not shown because too many files have changed in this diff Show More