Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
ae39fad8d0
|
|
@ -19,7 +19,7 @@ let
|
|||
description = "tuple of" + concatMapStrings (t: " (${t.description})") ts;
|
||||
};
|
||||
level = ints.unsigned;
|
||||
special = enum [ "level auto" "level full-speed" "level disengage" ];
|
||||
special = enum [ "level auto" "level full-speed" "level disengaged" ];
|
||||
in
|
||||
tuple [ (either level special) level level ];
|
||||
|
||||
|
|
@ -164,7 +164,7 @@ in {
|
|||
|
||||
LEVEL is the fan level to use: it can be an integer (0-7 with thinkpad_acpi),
|
||||
"level auto" (to keep the default firmware behavior), "level full-speed" or
|
||||
"level disengage" (to run the fan as fast as possible).
|
||||
"level disengaged" (to run the fan as fast as possible).
|
||||
LOW is the temperature at which to step down to the previous level.
|
||||
HIGH is the temperature at which to step up to the next level.
|
||||
All numbers are integers.
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ let
|
|||
makeHydraTest = with pkgs.lib; name: package: makeTest {
|
||||
name = "hydra-${name}";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ pstn lewo ma27 ];
|
||||
maintainers = [ lewo ma27 ];
|
||||
};
|
||||
|
||||
machine = { pkgs, lib, ... }: {
|
||||
|
|
|
|||
|
|
@ -1,68 +1,76 @@
|
|||
{ alsa-lib
|
||||
, curl
|
||||
, fetchFromGitHub
|
||||
, freeglut
|
||||
, freetype
|
||||
, libGL
|
||||
, libXcursor
|
||||
, libXext
|
||||
, libXinerama
|
||||
, libXrandr
|
||||
, libjack2
|
||||
, pkg-config
|
||||
, python3
|
||||
, stdenv
|
||||
, lib
|
||||
}:
|
||||
{ alsa-lib, at-spi2-core, cmake, curl, dbus, libepoxy, fetchFromGitHub, freeglut
|
||||
, freetype, gcc-unwrapped, gtk3, lib, libGL, libXcursor, libXdmcp, libXext
|
||||
, libXinerama, libXrandr, libXtst, libdatrie, libjack2, libpsl, libselinux
|
||||
, libsepol, libsysprof-capture, libthai, libxkbcommon, lv2, pcre, pkg-config
|
||||
, python3, sqlite, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "CHOWTapeModel";
|
||||
version = "unstable-2020-12-12";
|
||||
version = "2.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jatinchowdhury18";
|
||||
repo = "AnalogTapeModel";
|
||||
rev = "a7cf10c3f790d306ce5743bb731e4bc2c1230d70";
|
||||
sha256 = "09nq8x2dwabncbp039dqm1brzcz55zg9kpxd4p5348xlaz5m4661";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iuT7OBRBtMkjcTHayCcne1mNqkcxzKnEYl62n65V7Z4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
at-spi2-core
|
||||
curl
|
||||
dbus
|
||||
libepoxy
|
||||
freeglut
|
||||
freetype
|
||||
gtk3
|
||||
libGL
|
||||
libXcursor
|
||||
libXdmcp
|
||||
libXext
|
||||
libXinerama
|
||||
libXrandr
|
||||
libXtst
|
||||
libdatrie
|
||||
libjack2
|
||||
libpsl
|
||||
libselinux
|
||||
libsepol
|
||||
libsysprof-capture
|
||||
libthai
|
||||
libxkbcommon
|
||||
lv2
|
||||
pcre
|
||||
python3
|
||||
sqlite
|
||||
gcc-unwrapped
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
cd Plugin/
|
||||
./build_linux.sh
|
||||
'';
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar"
|
||||
"-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib"
|
||||
"-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm"
|
||||
];
|
||||
|
||||
postPatch = "cd Plugin";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/lib/lv2 $out/lib/vst3 $out/bin $out/share/doc/CHOWTapeModel/
|
||||
cd Builds/LinuxMakefile/build/
|
||||
cp CHOWTapeModel.a $out/lib
|
||||
cp -r CHOWTapeModel.lv2 $out/lib/lv2
|
||||
cp -r CHOWTapeModel.vst3 $out/lib/vst3
|
||||
cp CHOWTapeModel $out/bin
|
||||
cd CHOWTapeModel_artefacts/Release
|
||||
cp libCHOWTapeModel_SharedCode.a $out/lib
|
||||
cp -r LV2/CHOWTapeModel.lv2 $out/lib/lv2
|
||||
cp -r VST3/CHOWTapeModel.vst3 $out/lib/vst3
|
||||
cp Standalone/CHOWTapeModel $out/bin
|
||||
cp ../../../../Manual/ChowTapeManual.pdf $out/share/doc/CHOWTapeModel/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jatinchowdhury18/AnalogTapeModel";
|
||||
description = "Physical modelling signal processing for analog tape recording. LV2, VST3 and standalone";
|
||||
description =
|
||||
"Physical modelling signal processing for analog tape recording. LV2, VST3 and standalone";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ magnetophon ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -53,13 +53,13 @@ let
|
|||
python = python2.withPackages (pp: [ pp.pygtk ]);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "gimp";
|
||||
version = "2.10.28";
|
||||
version = "2.10.30";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "T03CLP8atfAm/qoqtV4Fd1s6EeGYGGtHvat5y/oHiCY=";
|
||||
sha256 = "iIFdqnbtfUJ37rNTNYuvoRbNL80shh2VuVE1wdUrZ9w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "skate";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "charmbracelet";
|
||||
repo = "skate";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Z+7unYmwPLOhJAMAhMwjapAmslTNxmP01myjgEOBfu8=";
|
||||
sha256 = "sha256-rUOFx0ebZs3xmsSz9oFvjINaHp9gIe7E/5UoJJ47aZc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-CdYyiUiy2q2boEHjdXkgRzVI+6fEb+fBrlInl6IrFjk=";
|
||||
vendorSha256 = "sha256-3+KXirGwZvPhqCeglPqHJ9wEt6naJiRE3TAX7/jxJpk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bitlbee-mastodon";
|
||||
version = "1.4.4";
|
||||
version = "1.4.5";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://alexschroeder.ch/cgit/bitlbee-mastodon";
|
||||
rev = "v${version}";
|
||||
sha256 = "0a8196pyr6bjnqg82zn7jdhiv7xsg4npbpzalla1i2h99j30q8pk";
|
||||
sha256 = "sha256-8vmq/YstuBYUxe00P4NrxD/eMYI++R9uvn1sCcMTr7I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, stdenv
|
||||
, fetchurl
|
||||
, hamlib
|
||||
, fltk14
|
||||
, fltk13
|
||||
, libjpeg
|
||||
, libpng
|
||||
, portaudio
|
||||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
libXinerama
|
||||
gettext
|
||||
hamlib
|
||||
fltk14
|
||||
fltk13
|
||||
libjpeg
|
||||
libpng
|
||||
portaudio
|
||||
|
|
@ -39,11 +39,16 @@ stdenv.mkDerivation rec {
|
|||
libsamplerate
|
||||
] ++ lib.optionals (stdenv.isLinux) [ libpulseaudio alsa-lib udev ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Digital modem program";
|
||||
homepage = "https://sourceforge.net/projects/fldigi/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ relrod ftrvxmtrx ];
|
||||
platforms = platforms.unix;
|
||||
# unable to execute command: posix_spawn failed: Argument list too long
|
||||
# Builds fine on aarch64-darwin
|
||||
broken = stdenv.system == "x86_64-darwin";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "minimap2";
|
||||
version = "2.22";
|
||||
version = "2.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = pname;
|
||||
owner = "lh3";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jYXJr2T1enZfSABVV5Kmd5OBtWZtQ2D/2eAlW2WHtGU=";
|
||||
sha256 = "sha256-oNVpSINcXO2eKzOCr/Fl8tSMguRxzmlDNu7hLZeopoQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rakudo";
|
||||
version = "2021.10";
|
||||
version = "2021.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
|
||||
sha256 = "sha256-sXTHU3Mo77Xj90JF55+nFZtwExuExZeRbPWmXCrKJKE=";
|
||||
url = "https://rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
|
||||
sha256 = "sha256-f1PSxxONE6sBaS1b19vCjz8p7Ya9ltUoCFb1WhqwVAY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ removeReferencesTo ];
|
||||
|
|
@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Raku implementation on top of Moar virtual machine";
|
||||
homepage = "https://rakudo.org";
|
||||
license = licenses.artistic2;
|
||||
platforms = platforms.unix;
|
||||
homepage = "https://rakudo.org";
|
||||
license = licenses.artistic2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ thoughtpolice vrthra sgo ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,19 @@
|
|||
{ lib, stdenv, fetchurl, perl
|
||||
, CoreServices, ApplicationServices }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, perl
|
||||
, CoreServices
|
||||
, ApplicationServices
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "moarvm";
|
||||
version = "2021.10";
|
||||
version = "2021.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://moarvm.org/releases/MoarVM-${version}.tar.gz";
|
||||
sha256 = "sha256-fzSHpw6Ld74OTi8SsUxJ9qAdA3jglAyGlYyQFsSVrXU=";
|
||||
};
|
||||
sha256 = "sha256-1Ju+sQ2WFsLYen+t0ca7elzhHBnHxEu7i+928ltQXE8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
|
|
@ -28,9 +33,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "VM with adaptive optimization and JIT compilation, built for Rakudo";
|
||||
homepage = "https://moarvm.org";
|
||||
license = licenses.artistic2;
|
||||
platforms = platforms.unix;
|
||||
homepage = "https://moarvm.org";
|
||||
license = licenses.artistic2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ thoughtpolice vrthra sgo ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nqp";
|
||||
version = "2021.10";
|
||||
version = "2021.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz";
|
||||
sha256 = "sha256-SBNbwbPOIsHFfM70ZTHnaI7sg9a5BbUC/879bCMpS0k=";
|
||||
url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz";
|
||||
sha256 = "sha256-Dh1TT9HuYaTIByMJuvvARmDprnLYhhjaoOjxUCLw2RM=";
|
||||
};
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
|
@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Not Quite Perl -- a lightweight Raku-like environment for virtual machines";
|
||||
homepage = "https://github.com/perl6/nqp";
|
||||
license = licenses.artistic2;
|
||||
platforms = platforms.unix;
|
||||
homepage = "https://github.com/Raku/nqp";
|
||||
license = licenses.artistic2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ thoughtpolice vrthra sgo ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import ./common.nix rec {
|
||||
version = "1.4.x-2021-07-04";
|
||||
rev = "1008cdfab27609a6f6a0e82dadad9fd9cbd8a66d";
|
||||
sha256 = "1h057dyhd04b9bjci952b2l7brxv183l9jw9i50mn9qjfljmvqim";
|
||||
version = "1.4.x-2021-12-21";
|
||||
rev = "c8bb2a35850be7c6eaec5ad5a2936a77f7913de2";
|
||||
sha256 = "1fwfg1hp1ajqh2b4ra4phi96854q9i8c0gbyi7pr35ljyv848295";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import ./common.nix rec {
|
||||
version = "1.3.6";
|
||||
version = "1.3.8";
|
||||
rev = "release-${version}";
|
||||
sha256 = "0vzk4d6j927v7dxywr5xlqlf70myal1xikkdfvd11p94rcdf9bsv";
|
||||
sha256 = "1pw4ndwn9rr1cxw5qiw32r9la2z9zbjphgsqq1hj2yy4blwv419r";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,14 +36,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gegl";
|
||||
version = "0.4.32";
|
||||
version = "0.4.34";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
outputBin = "dev";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-Zo48a5+vdfsAUScBw2J0q28iqLoF7GLb8YfTS40pj6E=";
|
||||
sha256 = "sha256-72PwvKW0McYRmt3YNMp/u1B8kAxIYcV7Nme29Mz8qqo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "khronos-ocl-icd-loader-${version}";
|
||||
version = "2020.06.16";
|
||||
version = "2021.06.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "OpenCL-ICD-Loader";
|
||||
rev = "v${version}";
|
||||
sha256 = "0v2yi6d3g5qshzy6pjic09c5irwgds106yvr93q62f32psfblnmy";
|
||||
sha256 = "sha256-1bSeGI8IufKtdcyxVHX4DVxkPKfJrUBVzzIGe8rQ/AA=";
|
||||
};
|
||||
|
||||
patches = lib.optional withTracing ./tracing.patch;
|
||||
|
|
|
|||
|
|
@ -82,5 +82,7 @@ stdenv.mkDerivation rec {
|
|||
license = with licenses; [ lgpl3Plus ];
|
||||
maintainers = with maintainers; [ KarlJoad ];
|
||||
platforms = platforms.all;
|
||||
# ./rsb_common.h:56:10: fatal error: 'omp.h' file not found
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ buildOctavePackage
|
||||
, stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, gsl
|
||||
|
|
@ -22,5 +23,8 @@ buildOctavePackage rec {
|
|||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ KarlJoad ];
|
||||
description = "Octave bindings to the GNU Scientific Library";
|
||||
# error: use of undeclared identifier 'feval'; did you mean 'octave::feval'?
|
||||
# error: no member named 'is_real_type' in 'octave_value'
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ buildOctavePackage
|
||||
, stdenv
|
||||
, lib
|
||||
, fetchgit
|
||||
, automake
|
||||
|
|
@ -50,5 +51,7 @@ buildOctavePackage rec {
|
|||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ KarlJoad ];
|
||||
description = "Routines for calculating the time-evolution of the level-set equation and extracting geometric information from the level-set function";
|
||||
# /build/level-set-2019-04-13.tar.gz: Cannot open: No such file or directory
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ buildOctavePackage
|
||||
, stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
}:
|
||||
|
|
@ -22,5 +23,7 @@ buildOctavePackage rec {
|
|||
Single-Instruction-Multiple-Data (SIMD) computations, selectively
|
||||
using available OpenCL hardware and drivers.
|
||||
'';
|
||||
# error: structure has no member 'dir'
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ buildOctavePackage
|
||||
, stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, pcre
|
||||
|
|
@ -33,5 +34,7 @@ buildOctavePackage rec {
|
|||
# Claims to have a freebsd license, but I found none.
|
||||
maintainers = with maintainers; [ KarlJoad ];
|
||||
description = "Additional functions for manipulation and analysis of strings";
|
||||
# Some pcre symbols claimed to be missing
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ buildOctavePackage
|
||||
, stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
# Octave dependencies
|
||||
|
|
@ -29,5 +30,7 @@ buildOctavePackage rec {
|
|||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ KarlJoad ];
|
||||
description = "Port of TISEAN 3.0.1";
|
||||
# Some gfortran symbols claimed to be missing
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ buildOctavePackage
|
||||
, stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
|
|
@ -27,5 +28,7 @@ buildOctavePackage rec {
|
|||
license = with licenses; [ gpl3Plus bsd3 ];
|
||||
maintainers = with maintainers; [ KarlJoad ];
|
||||
description = "Wrapper for OpenCV's CvCapture_FFMPEG and CvVideoWriter_FFMPEG";
|
||||
# error: declaration of 'panic' has a different language linkage
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mill";
|
||||
version = "0.9.10";
|
||||
version = "0.9.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly";
|
||||
sha256 = "sha256-JbZorHeBznBb+R9JjPQBNKlTdNNzg1G82OxWvBtNg5Q=";
|
||||
sha256 = "sha256-qYwCt7+//GJHJyDrZ8rcGCKLshKebIDBQCyn6rLOhJQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "smcroute";
|
||||
version = "2.5.3";
|
||||
version = "2.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "troglobit";
|
||||
repo = "smcroute";
|
||||
rev = version;
|
||||
sha256 = "sha256-0s4BIJbbygt7Wpxlp13QGbXpvZsdIBszE7TOaN2aq/E=";
|
||||
sha256 = "sha256-kMK2XLyI9GG83gxjVh4I7wSMEPM5iJSmgtwVJNHn9OQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "trivy";
|
||||
version = "0.21.2";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-k8bjwKoAXt9XFQX7rHhdrcu3FoaU31Ra78PQHNVCfq0=";
|
||||
sha256 = "sha256-DH4vr6WiGwzT9zTMs/UqVoCHhpOSoT5t8P9plTPt8ZQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-rJvmY0557QOb8D1/LhN8w64ds3HwqolLmGdntS5CJPQ=";
|
||||
vendorSha256 = "sha256-1m3izHfxMUvUiz21NRjqdNS95sXf8Rwlu5TuQ411190=";
|
||||
|
||||
excludedPackages = "misc";
|
||||
|
||||
|
|
@ -24,7 +24,11 @@ buildGoModule rec {
|
|||
"-X main.version=v${version}"
|
||||
];
|
||||
|
||||
# Tests requires network access
|
||||
doCheck = false;
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
$out/bin/trivy --help
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snapraid";
|
||||
version = "11.6";
|
||||
version = "12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amadvance";
|
||||
repo = "snapraid";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nO0Ujo9je59C+zP7l9Pp7JEdsSfVAv+9EnAq4OtJ78o=";
|
||||
sha256 = "sha256-CcJaxnbRvGYiQjU38qnTgNyim5aDQWmxhQv16ZT1F00=";
|
||||
};
|
||||
|
||||
VERSION = version;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, python3Packages, fetchFromGitHub }:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "dpt-rp1-py";
|
||||
version = "0.1.14";
|
||||
version = "0.1.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janten";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0584xwf5nli94b060gysmv4civ83p4a88phpkyxaddlks0w7fc5h";
|
||||
sha256 = "0kmhsx6n3wjzqcvfnpvdxiiwzxr51khgrl0kgaaas8hwq246l65d";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -2,22 +2,22 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mcfly";
|
||||
version = "0.5.10";
|
||||
version = "0.5.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cantino";
|
||||
repo = "mcfly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-auIerSfEKBK47mIhfmjREJohnhCmtzruobRXaoz5fqA=";
|
||||
sha256 = "sha256-JyNrEIgvL4TQHpAEefDnLirXplGjJcUqsmALKY44VuM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace mcfly.bash --replace '$(which mcfly)' '${placeholder "out"}/bin/mcfly'
|
||||
substituteInPlace mcfly.zsh --replace '$(which mcfly)' '${placeholder "out"}/bin/mcfly'
|
||||
substituteInPlace mcfly.fish --replace '(which mcfly)' '${placeholder "out"}/bin/mcfly'
|
||||
substituteInPlace mcfly.bash --replace '$(command which mcfly)' '${placeholder "out"}/bin/mcfly'
|
||||
substituteInPlace mcfly.zsh --replace '$(command which mcfly)' '${placeholder "out"}/bin/mcfly'
|
||||
substituteInPlace mcfly.fish --replace '(command which mcfly)' '${placeholder "out"}/bin/mcfly'
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-f9kpD295syRCntwvyjZ9AeAUV61RMbfRRMgNxKAJL8g=";
|
||||
cargoSha256 = "sha256-7wyRHViPL+Hb9Rwrb1dAmmz+faOl9ddNlTdQ/XvTWE8=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/cantino/mcfly";
|
||||
|
|
|
|||
29
pkgs/tools/networking/fast-ssh/default.nix
Normal file
29
pkgs/tools/networking/fast-ssh/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fast-ssh";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "julien-r44";
|
||||
repo = "fast-ssh";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eHJdMe8RU6Meg/9+NCfIneD5BqNUc2yIiQ8Z5UqUBUI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-sIQNoH3UWX3SwCFCPZEREIFR7C28ml4oGsrq6wuOAT0=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
meta = with lib; {
|
||||
description = "TUI tool to use the SSH config for connections";
|
||||
homepage = "https://github.com/julien-r44/fast-ssh";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "vpn-slice";
|
||||
version = "0.16";
|
||||
version = "0.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dlenski";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-szJLw+TtpYcTaqeOTzMiQ0HVjNb9A5SLL4mGMX8xUnw=";
|
||||
sha256 = "sha256-T6VULLNRLWO4OcAsuTmhty6H4EhinyxQSg0dfv2DUJs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ setproctitle dnspython ];
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dalfox";
|
||||
version = "2.6.1";
|
||||
version = "2.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hahwul";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4jqlMZ6/5m12+ZT0HCtskXq6jlcsQq05Vem+jw82RFs=";
|
||||
sha256 = "sha256-QSIaqHUNsVpb1qbQLIxxjoDH1DMM1XpXxWZtImMV1yM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-MoOnRsL8DO7Mx7JzvpnEOiqoLEyBPi2cRiQ2m+460V4=";
|
||||
vendorSha256 = "sha256-QtSWlGsbCxLpb4+TZgV0/wfSb5flGG3qHquO2maIOKU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool for analysing parameter and XSS scanning";
|
||||
|
|
|
|||
|
|
@ -12,20 +12,20 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mdcat";
|
||||
version = "0.24.2";
|
||||
version = "0.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lunaryorn";
|
||||
repo = pname;
|
||||
rev = "mdcat-${version}";
|
||||
sha256 = "sha256-9XVKLe1Kyq5SpJFpXg/GD/V+uiieljk7UoDzJ1MZBlA=";
|
||||
sha256 = "sha256-wrtvVFOSqpNBWLRGPL+08WBS4ltQyZwRE3/dqqT6IXg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ];
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optional stdenv.isDarwin Security;
|
||||
|
||||
cargoSha256 = "sha256-cgX/jPmOU3o5gAwbneGeQLU2hIrGdrAvOaA/TOXSZgg=";
|
||||
cargoSha256 = "sha256-9I6/lt5VXfZp2/W6EoXtagcNj2kfxB5ZT2GkWgsUyM8=";
|
||||
|
||||
checkInputs = [ ansi2html ];
|
||||
# Skip tests that use the network and that include files.
|
||||
|
|
|
|||
|
|
@ -1,29 +1,15 @@
|
|||
{lib, stdenv, fetchurl, perl}:
|
||||
{lib, stdenv, fetchurl, cmake, perl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "halibut";
|
||||
version = "1.2";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ww.chiark.greenend.org.uk/~sgtatham/halibut/halibut-${version}/halibut-${version}.tar.gz";
|
||||
sha256 = "0gqnhfqf555rfpk5xj1imbdxnbkkrv4wl3rrdb1r0wgj81igpv8s";
|
||||
url = "https://www.chiark.greenend.org.uk/~sgtatham/halibut/halibut-${version}/halibut-${version}.tar.gz";
|
||||
sha256 = "0ciikn878vivs4ayvwvr63nnhpcg12m8023xv514zxqpdxlzg85a";
|
||||
};
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
||||
patchPhase = ''
|
||||
sed -i -e s@/usr/local@$out@ Makefile
|
||||
sed -i -e 's@(prefix)/man@(prefix)/share/man@' doc/Makefile
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/man/man1
|
||||
pushd doc
|
||||
make halibut.1
|
||||
popd
|
||||
make install
|
||||
'';
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Documentation production system for software manuals";
|
||||
|
|
|
|||
|
|
@ -2990,6 +2990,10 @@ with pkgs;
|
|||
|
||||
fast-cpp-csv-parser = callPackage ../development/libraries/fast-cpp-csv-parser { };
|
||||
|
||||
fast-ssh = callPackage ../tools/networking/fast-ssh {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
faudio = callPackage ../development/libraries/faudio { };
|
||||
|
||||
fd = callPackage ../tools/misc/fd { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue