JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-12-27 12:13:41 +00:00 committed by GitHub
commit 808585560c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 181 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/hardware/thinkfan.nix
View File

@ -19,7 +19,7 @@ let
description = "tuple of" + concatMapStrings (t: " (${t.description})") ts; description = "tuple of" + concatMapStrings (t: " (${t.description})") ts;
}; };
level = ints.unsigned; level = ints.unsigned;
special = enum [ "level auto" "level full-speed" "level disengage" ]; special = enum [ "level auto" "level full-speed" "level disengaged" ];
in in
tuple [ (either level special) level level ]; 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 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 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. 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. HIGH is the temperature at which to step up to the next level.
All numbers are integers. All numbers are integers.

2
nixos/tests/hydra/default.nix
View File

@ -17,7 +17,7 @@ let
makeHydraTest = with pkgs.lib; name: package: makeTest { makeHydraTest = with pkgs.lib; name: package: makeTest {
name = "hydra-${name}"; name = "hydra-${name}";
meta = with pkgs.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ pstn lewo ma27 ]; maintainers = [ lewo ma27 ];
}; };
machine = { pkgs, lib, ... }: { machine = { pkgs, lib, ... }: {

72
pkgs/applications/audio/CHOWTapeModel/default.nix
View File

@ -1,68 +1,76 @@
{ alsa-lib { alsa-lib, at-spi2-core, cmake, curl, dbus, libepoxy, fetchFromGitHub, freeglut
, curl , freetype, gcc-unwrapped, gtk3, lib, libGL, libXcursor, libXdmcp, libXext
, fetchFromGitHub , libXinerama, libXrandr, libXtst, libdatrie, libjack2, libpsl, libselinux
, freeglut , libsepol, libsysprof-capture, libthai, libxkbcommon, lv2, pcre, pkg-config
, freetype , python3, sqlite, stdenv }:
, libGL
, libXcursor
, libXext
, libXinerama
, libXrandr
, libjack2
, pkg-config
, python3
, stdenv
, lib
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "CHOWTapeModel"; pname = "CHOWTapeModel";
version = "unstable-2020-12-12"; version = "2.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jatinchowdhury18"; owner = "jatinchowdhury18";
repo = "AnalogTapeModel"; repo = "AnalogTapeModel";
rev = "a7cf10c3f790d306ce5743bb731e4bc2c1230d70"; rev = "v${version}";
sha256 = "09nq8x2dwabncbp039dqm1brzcz55zg9kpxd4p5348xlaz5m4661"; sha256 = "sha256-iuT7OBRBtMkjcTHayCcne1mNqkcxzKnEYl62n65V7Z4=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ nativeBuildInputs = [ pkg-config cmake ];
pkg-config
];
buildInputs = [ buildInputs = [
alsa-lib alsa-lib
at-spi2-core
curl curl
dbus
libepoxy
freeglut freeglut
freetype freetype
gtk3
libGL libGL
libXcursor libXcursor
libXdmcp
libXext libXext
libXinerama libXinerama
libXrandr libXrandr
libXtst
libdatrie
libjack2 libjack2
libpsl
libselinux
libsepol
libsysprof-capture
libthai
libxkbcommon
lv2
pcre
python3 python3
sqlite
gcc-unwrapped
]; ];
buildPhase = '' cmakeFlags = [
cd Plugin/ "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar"
./build_linux.sh "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib"
''; "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm"
];
postPatch = "cd Plugin";
installPhase = '' installPhase = ''
mkdir -p $out/lib/lv2 $out/lib/vst3 $out/bin $out/share/doc/CHOWTapeModel/ mkdir -p $out/lib/lv2 $out/lib/vst3 $out/bin $out/share/doc/CHOWTapeModel/
cd Builds/LinuxMakefile/build/ cd CHOWTapeModel_artefacts/Release
cp CHOWTapeModel.a $out/lib cp libCHOWTapeModel_SharedCode.a $out/lib
cp -r CHOWTapeModel.lv2 $out/lib/lv2 cp -r LV2/CHOWTapeModel.lv2 $out/lib/lv2
cp -r CHOWTapeModel.vst3 $out/lib/vst3 cp -r VST3/CHOWTapeModel.vst3 $out/lib/vst3
cp CHOWTapeModel $out/bin cp Standalone/CHOWTapeModel $out/bin
cp ../../../../Manual/ChowTapeManual.pdf $out/share/doc/CHOWTapeModel/ cp ../../../../Manual/ChowTapeManual.pdf $out/share/doc/CHOWTapeModel/
''; '';
meta = with lib; { meta = with lib; {
homepage = "https://github.com/jatinchowdhury18/AnalogTapeModel"; 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 ]; license = with licenses; [ gpl3Only ];
maintainers = with maintainers; [ magnetophon ]; maintainers = with maintainers; [ magnetophon ];
platforms = platforms.linux; platforms = platforms.linux;

4
pkgs/applications/graphics/gimp/default.nix
View File

@ -53,13 +53,13 @@ let
python = python2.withPackages (pp: [ pp.pygtk ]); python = python2.withPackages (pp: [ pp.pygtk ]);
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "gimp"; pname = "gimp";
version = "2.10.28"; version = "2.10.30";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "T03CLP8atfAm/qoqtV4Fd1s6EeGYGGtHvat5y/oHiCY="; sha256 = "iIFdqnbtfUJ37rNTNYuvoRbNL80shh2VuVE1wdUrZ9w=";
}; };
patches = [ patches = [

6
pkgs/applications/misc/skate/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "skate"; pname = "skate";
version = "0.1.2"; version = "0.1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "charmbracelet"; owner = "charmbracelet";
repo = "skate"; repo = "skate";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-Z+7unYmwPLOhJAMAhMwjapAmslTNxmP01myjgEOBfu8="; sha256 = "sha256-rUOFx0ebZs3xmsSz9oFvjINaHp9gIe7E/5UoJJ47aZc=";
}; };
vendorSha256 = "sha256-CdYyiUiy2q2boEHjdXkgRzVI+6fEb+fBrlInl6IrFjk="; vendorSha256 = "sha256-3+KXirGwZvPhqCeglPqHJ9wEt6naJiRE3TAX7/jxJpk=";
doCheck = false; doCheck = false;

4
pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix
View File

@ -3,12 +3,12 @@
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bitlbee-mastodon"; pname = "bitlbee-mastodon";
version = "1.4.4"; version = "1.4.5";
src = fetchgit { src = fetchgit {
url = "https://alexschroeder.ch/cgit/bitlbee-mastodon"; url = "https://alexschroeder.ch/cgit/bitlbee-mastodon";
rev = "v${version}"; rev = "v${version}";
sha256 = "0a8196pyr6bjnqg82zn7jdhiv7xsg4npbpzalla1i2h99j30q8pk"; sha256 = "sha256-8vmq/YstuBYUxe00P4NrxD/eMYI++R9uvn1sCcMTr7I=";
}; };
nativeBuildInputs = [ autoreconfHook pkg-config ]; nativeBuildInputs = [ autoreconfHook pkg-config ];

9
pkgs/applications/radio/fldigi/default.nix
View File

@ -2,7 +2,7 @@
, stdenv , stdenv
, fetchurl , fetchurl
, hamlib , hamlib
, fltk14 , fltk13
, libjpeg , libjpeg
, libpng , libpng
, portaudio , portaudio
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
libXinerama libXinerama
gettext gettext
hamlib hamlib
fltk14 fltk13
libjpeg libjpeg
libpng libpng
portaudio portaudio
@ -39,11 +39,16 @@ stdenv.mkDerivation rec {
libsamplerate libsamplerate
] ++ lib.optionals (stdenv.isLinux) [ libpulseaudio alsa-lib udev ]; ] ++ lib.optionals (stdenv.isLinux) [ libpulseaudio alsa-lib udev ];
enableParallelBuilding = true;
meta = with lib; { meta = with lib; {
description = "Digital modem program"; description = "Digital modem program";
homepage = "https://sourceforge.net/projects/fldigi/"; homepage = "https://sourceforge.net/projects/fldigi/";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ relrod ftrvxmtrx ]; maintainers = with maintainers; [ relrod ftrvxmtrx ];
platforms = platforms.unix; 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";
}; };
} }

4
pkgs/applications/science/biology/minimap2/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "minimap2"; pname = "minimap2";
version = "2.22"; version = "2.23";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = pname; repo = pname;
owner = "lh3"; owner = "lh3";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-jYXJr2T1enZfSABVV5Kmd5OBtWZtQ2D/2eAlW2WHtGU="; sha256 = "sha256-oNVpSINcXO2eKzOCr/Fl8tSMguRxzmlDNu7hLZeopoQ=";
}; };
buildInputs = [ zlib ]; buildInputs = [ zlib ];

12
pkgs/development/interpreters/rakudo/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rakudo"; pname = "rakudo";
version = "2021.10"; version = "2021.12";
src = fetchurl { src = fetchurl {
url = "https://rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; url = "https://rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
sha256 = "sha256-sXTHU3Mo77Xj90JF55+nFZtwExuExZeRbPWmXCrKJKE="; sha256 = "sha256-f1PSxxONE6sBaS1b19vCjz8p7Ya9ltUoCFb1WhqwVAY=";
}; };
nativeBuildInputs = [ removeReferencesTo ]; nativeBuildInputs = [ removeReferencesTo ];
@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Raku implementation on top of Moar virtual machine"; description = "Raku implementation on top of Moar virtual machine";
homepage = "https://rakudo.org"; homepage = "https://rakudo.org";
license = licenses.artistic2; license = licenses.artistic2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; maintainers = with maintainers; [ thoughtpolice vrthra sgo ];
}; };
} }

21
pkgs/development/interpreters/rakudo/moarvm.nix
View File

@ -1,14 +1,19 @@
{ lib, stdenv, fetchurl, perl { lib
, CoreServices, ApplicationServices }: , stdenv
, fetchurl
, perl
, CoreServices
, ApplicationServices
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "moarvm"; pname = "moarvm";
version = "2021.10"; version = "2021.12";
src = fetchurl { src = fetchurl {
url = "https://moarvm.org/releases/MoarVM-${version}.tar.gz"; url = "https://moarvm.org/releases/MoarVM-${version}.tar.gz";
sha256 = "sha256-fzSHpw6Ld74OTi8SsUxJ9qAdA3jglAyGlYyQFsSVrXU="; sha256 = "sha256-1Ju+sQ2WFsLYen+t0ca7elzhHBnHxEu7i+928ltQXE8=";
}; };
postPatch = '' postPatch = ''
patchShebangs . patchShebangs .
@ -28,9 +33,9 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "VM with adaptive optimization and JIT compilation, built for Rakudo"; description = "VM with adaptive optimization and JIT compilation, built for Rakudo";
homepage = "https://moarvm.org"; homepage = "https://moarvm.org";
license = licenses.artistic2; license = licenses.artistic2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; maintainers = with maintainers; [ thoughtpolice vrthra sgo ];
}; };
} }

12
pkgs/development/interpreters/rakudo/nqp.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nqp"; pname = "nqp";
version = "2021.10"; version = "2021.12";
src = fetchurl { src = fetchurl {
url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz"; url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz";
sha256 = "sha256-SBNbwbPOIsHFfM70ZTHnaI7sg9a5BbUC/879bCMpS0k="; sha256 = "sha256-Dh1TT9HuYaTIByMJuvvARmDprnLYhhjaoOjxUCLw2RM=";
}; };
buildInputs = [ perl ]; buildInputs = [ perl ];
@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Not Quite Perl -- a lightweight Raku-like environment for virtual machines"; description = "Not Quite Perl -- a lightweight Raku-like environment for virtual machines";
homepage = "https://github.com/perl6/nqp"; homepage = "https://github.com/Raku/nqp";
license = licenses.artistic2; license = licenses.artistic2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; maintainers = with maintainers; [ thoughtpolice vrthra sgo ];
}; };
} }

6
pkgs/development/libraries/fltk/1.4.nix
View File

@ -1,5 +1,5 @@
import ./common.nix rec { import ./common.nix rec {
version = "1.4.x-2021-07-04"; version = "1.4.x-2021-12-21";
rev = "1008cdfab27609a6f6a0e82dadad9fd9cbd8a66d"; rev = "c8bb2a35850be7c6eaec5ad5a2936a77f7913de2";
sha256 = "1h057dyhd04b9bjci952b2l7brxv183l9jw9i50mn9qjfljmvqim"; sha256 = "1fwfg1hp1ajqh2b4ra4phi96854q9i8c0gbyi7pr35ljyv848295";
} }

4
pkgs/development/libraries/fltk/default.nix
View File

@ -1,5 +1,5 @@
import ./common.nix rec { import ./common.nix rec {
version = "1.3.6"; version = "1.3.8";
rev = "release-${version}"; rev = "release-${version}";
sha256 = "0vzk4d6j927v7dxywr5xlqlf70myal1xikkdfvd11p94rcdf9bsv"; sha256 = "1pw4ndwn9rr1cxw5qiw32r9la2z9zbjphgsqq1hj2yy4blwv419r";
} }

4
pkgs/development/libraries/gegl/default.nix
View File

@ -36,14 +36,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gegl"; pname = "gegl";
version = "0.4.32"; version = "0.4.34";
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev"; outputBin = "dev";
src = fetchurl { src = fetchurl {
url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-Zo48a5+vdfsAUScBw2J0q28iqLoF7GLb8YfTS40pj6E="; sha256 = "sha256-72PwvKW0McYRmt3YNMp/u1B8kAxIYcV7Nme29Mz8qqo=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "khronos-ocl-icd-loader-${version}"; name = "khronos-ocl-icd-loader-${version}";
version = "2020.06.16"; version = "2021.06.30";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KhronosGroup"; owner = "KhronosGroup";
repo = "OpenCL-ICD-Loader"; repo = "OpenCL-ICD-Loader";
rev = "v${version}"; rev = "v${version}";
sha256 = "0v2yi6d3g5qshzy6pjic09c5irwgds106yvr93q62f32psfblnmy"; sha256 = "sha256-1bSeGI8IufKtdcyxVHX4DVxkPKfJrUBVzzIGe8rQ/AA=";
}; };
patches = lib.optional withTracing ./tracing.patch; patches = lib.optional withTracing ./tracing.patch;

2
pkgs/development/libraries/librsb/default.nix
View File

@ -82,5 +82,7 @@ stdenv.mkDerivation rec {
license = with licenses; [ lgpl3Plus ]; license = with licenses; [ lgpl3Plus ];
maintainers = with maintainers; [ KarlJoad ]; maintainers = with maintainers; [ KarlJoad ];
platforms = platforms.all; platforms = platforms.all;
# ./rsb_common.h:56:10: fatal error: 'omp.h' file not found
broken = stdenv.isDarwin;
}; };
} }

4
pkgs/development/octave-modules/gsl/default.nix
View File

@ -1,4 +1,5 @@
{ buildOctavePackage { buildOctavePackage
, stdenv
, lib , lib
, fetchurl , fetchurl
, gsl , gsl
@ -22,5 +23,8 @@ buildOctavePackage rec {
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ KarlJoad ]; maintainers = with maintainers; [ KarlJoad ];
description = "Octave bindings to the GNU Scientific Library"; 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;
}; };
} }

3
pkgs/development/octave-modules/level-set/default.nix
View File

@ -1,4 +1,5 @@
{ buildOctavePackage { buildOctavePackage
, stdenv
, lib , lib
, fetchgit , fetchgit
, automake , automake
@ -50,5 +51,7 @@ buildOctavePackage rec {
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ KarlJoad ]; 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"; 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;
}; };
} }

3
pkgs/development/octave-modules/ocl/default.nix
View File

@ -1,4 +1,5 @@
{ buildOctavePackage { buildOctavePackage
, stdenv
, lib , lib
, fetchurl , fetchurl
}: }:
@ -22,5 +23,7 @@ buildOctavePackage rec {
Single-Instruction-Multiple-Data (SIMD) computations, selectively Single-Instruction-Multiple-Data (SIMD) computations, selectively
using available OpenCL hardware and drivers. using available OpenCL hardware and drivers.
''; '';
# error: structure has no member 'dir'
broken = stdenv.isDarwin;
}; };
} }

3
pkgs/development/octave-modules/strings/default.nix
View File

@ -1,4 +1,5 @@
{ buildOctavePackage { buildOctavePackage
, stdenv
, lib , lib
, fetchurl , fetchurl
, pcre , pcre
@ -33,5 +34,7 @@ buildOctavePackage rec {
# Claims to have a freebsd license, but I found none. # Claims to have a freebsd license, but I found none.
maintainers = with maintainers; [ KarlJoad ]; maintainers = with maintainers; [ KarlJoad ];
description = "Additional functions for manipulation and analysis of strings"; description = "Additional functions for manipulation and analysis of strings";
# Some pcre symbols claimed to be missing
broken = stdenv.isDarwin;
}; };
} }

3
pkgs/development/octave-modules/tisean/default.nix
View File

@ -1,4 +1,5 @@
{ buildOctavePackage { buildOctavePackage
, stdenv
, lib , lib
, fetchurl , fetchurl
# Octave dependencies # Octave dependencies
@ -29,5 +30,7 @@ buildOctavePackage rec {
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ KarlJoad ]; maintainers = with maintainers; [ KarlJoad ];
description = "Port of TISEAN 3.0.1"; description = "Port of TISEAN 3.0.1";
# Some gfortran symbols claimed to be missing
broken = stdenv.isDarwin;
}; };
} }

3
pkgs/development/octave-modules/video/default.nix
View File

@ -1,4 +1,5 @@
{ buildOctavePackage { buildOctavePackage
, stdenv
, lib , lib
, fetchurl , fetchurl
, pkg-config , pkg-config
@ -27,5 +28,7 @@ buildOctavePackage rec {
license = with licenses; [ gpl3Plus bsd3 ]; license = with licenses; [ gpl3Plus bsd3 ];
maintainers = with maintainers; [ KarlJoad ]; maintainers = with maintainers; [ KarlJoad ];
description = "Wrapper for OpenCV's CvCapture_FFMPEG and CvVideoWriter_FFMPEG"; description = "Wrapper for OpenCV's CvCapture_FFMPEG and CvVideoWriter_FFMPEG";
# error: declaration of 'panic' has a different language linkage
broken = stdenv.isDarwin;
}; };
} }

4
pkgs/development/tools/build-managers/mill/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mill"; pname = "mill";
version = "0.9.10"; version = "0.9.11";
src = fetchurl { src = fetchurl {
url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly";
sha256 = "sha256-JbZorHeBznBb+R9JjPQBNKlTdNNzg1G82OxWvBtNg5Q="; sha256 = "sha256-qYwCt7+//GJHJyDrZ8rcGCKLshKebIDBQCyn6rLOhJQ=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

4
pkgs/servers/smcroute/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "smcroute"; pname = "smcroute";
version = "2.5.3"; version = "2.5.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "troglobit"; owner = "troglobit";
repo = "smcroute"; repo = "smcroute";
rev = version; rev = version;
sha256 = "sha256-0s4BIJbbygt7Wpxlp13QGbXpvZsdIBszE7TOaN2aq/E="; sha256 = "sha256-kMK2XLyI9GG83gxjVh4I7wSMEPM5iJSmgtwVJNHn9OQ=";
}; };
nativeBuildInputs = [ autoreconfHook pkg-config ]; nativeBuildInputs = [ autoreconfHook pkg-config ];

10
pkgs/tools/admin/trivy/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "trivy"; pname = "trivy";
version = "0.21.2"; version = "0.22.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aquasecurity"; owner = "aquasecurity";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-k8bjwKoAXt9XFQX7rHhdrcu3FoaU31Ra78PQHNVCfq0="; sha256 = "sha256-DH4vr6WiGwzT9zTMs/UqVoCHhpOSoT5t8P9plTPt8ZQ=";
}; };
vendorSha256 = "sha256-rJvmY0557QOb8D1/LhN8w64ds3HwqolLmGdntS5CJPQ="; vendorSha256 = "sha256-1m3izHfxMUvUiz21NRjqdNS95sXf8Rwlu5TuQ411190=";
excludedPackages = "misc"; excludedPackages = "misc";
@ -24,7 +24,11 @@ buildGoModule rec {
"-X main.version=v${version}" "-X main.version=v${version}"
]; ];
# Tests requires network access
doCheck = false;
doInstallCheck = true; doInstallCheck = true;
installCheckPhase = '' installCheckPhase = ''
runHook preInstallCheck runHook preInstallCheck
$out/bin/trivy --help $out/bin/trivy --help

4
pkgs/tools/filesystems/snapraid/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "snapraid"; pname = "snapraid";
version = "11.6"; version = "12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "amadvance"; owner = "amadvance";
repo = "snapraid"; repo = "snapraid";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-nO0Ujo9je59C+zP7l9Pp7JEdsSfVAv+9EnAq4OtJ78o="; sha256 = "sha256-CcJaxnbRvGYiQjU38qnTgNyim5aDQWmxhQv16ZT1F00=";
}; };
VERSION = version; VERSION = version;

4
pkgs/tools/misc/dpt-rp1-py/default.nix
View File

@ -1,13 +1,13 @@
{ lib, python3Packages, fetchFromGitHub }: { lib, python3Packages, fetchFromGitHub }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "dpt-rp1-py"; pname = "dpt-rp1-py";
version = "0.1.14"; version = "0.1.15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "janten"; owner = "janten";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0584xwf5nli94b060gysmv4civ83p4a88phpkyxaddlks0w7fc5h"; sha256 = "0kmhsx6n3wjzqcvfnpvdxiiwzxr51khgrl0kgaaas8hwq246l65d";
}; };
doCheck = false; doCheck = false;

12
pkgs/tools/misc/mcfly/default.nix
View File

@ -2,22 +2,22 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "mcfly"; pname = "mcfly";
version = "0.5.10"; version = "0.5.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cantino"; owner = "cantino";
repo = "mcfly"; repo = "mcfly";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-auIerSfEKBK47mIhfmjREJohnhCmtzruobRXaoz5fqA="; sha256 = "sha256-JyNrEIgvL4TQHpAEefDnLirXplGjJcUqsmALKY44VuM=";
}; };
postPatch = '' postPatch = ''
substituteInPlace mcfly.bash --replace '$(which mcfly)' '${placeholder "out"}/bin/mcfly' substituteInPlace mcfly.bash --replace '$(command which mcfly)' '${placeholder "out"}/bin/mcfly'
substituteInPlace mcfly.zsh --replace '$(which mcfly)' '${placeholder "out"}/bin/mcfly' substituteInPlace mcfly.zsh --replace '$(command which mcfly)' '${placeholder "out"}/bin/mcfly'
substituteInPlace mcfly.fish --replace '(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; { meta = with lib; {
homepage = "https://github.com/cantino/mcfly"; homepage = "https://github.com/cantino/mcfly";

29
pkgs/tools/networking/fast-ssh/default.nix Normal file
View 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 ];
};
}

4
pkgs/tools/networking/vpn-slice/default.nix
View File

@ -2,13 +2,13 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "vpn-slice"; pname = "vpn-slice";
version = "0.16"; version = "0.16.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dlenski"; owner = "dlenski";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-szJLw+TtpYcTaqeOTzMiQ0HVjNb9A5SLL4mGMX8xUnw="; sha256 = "sha256-T6VULLNRLWO4OcAsuTmhty6H4EhinyxQSg0dfv2DUJs=";
}; };
propagatedBuildInputs = with python3Packages; [ setproctitle dnspython ]; propagatedBuildInputs = with python3Packages; [ setproctitle dnspython ];

6
pkgs/tools/security/dalfox/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "dalfox"; pname = "dalfox";
version = "2.6.1"; version = "2.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hahwul"; owner = "hahwul";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-4jqlMZ6/5m12+ZT0HCtskXq6jlcsQq05Vem+jw82RFs="; sha256 = "sha256-QSIaqHUNsVpb1qbQLIxxjoDH1DMM1XpXxWZtImMV1yM=";
}; };
vendorSha256 = "sha256-MoOnRsL8DO7Mx7JzvpnEOiqoLEyBPi2cRiQ2m+460V4="; vendorSha256 = "sha256-QtSWlGsbCxLpb4+TZgV0/wfSb5flGG3qHquO2maIOKU=";
meta = with lib; { meta = with lib; {
description = "Tool for analysing parameter and XSS scanning"; description = "Tool for analysing parameter and XSS scanning";

6
pkgs/tools/text/mdcat/default.nix
View File

@ -12,20 +12,20 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "mdcat"; pname = "mdcat";
version = "0.24.2"; version = "0.25.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lunaryorn"; owner = "lunaryorn";
repo = pname; repo = pname;
rev = "mdcat-${version}"; rev = "mdcat-${version}";
sha256 = "sha256-9XVKLe1Kyq5SpJFpXg/GD/V+uiieljk7UoDzJ1MZBlA="; sha256 = "sha256-wrtvVFOSqpNBWLRGPL+08WBS4ltQyZwRE3/dqqT6IXg=";
}; };
nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ];
buildInputs = [ openssl ] buildInputs = [ openssl ]
++ lib.optional stdenv.isDarwin Security; ++ lib.optional stdenv.isDarwin Security;
cargoSha256 = "sha256-cgX/jPmOU3o5gAwbneGeQLU2hIrGdrAvOaA/TOXSZgg="; cargoSha256 = "sha256-9I6/lt5VXfZp2/W6EoXtagcNj2kfxB5ZT2GkWgsUyM8=";
checkInputs = [ ansi2html ]; checkInputs = [ ansi2html ];
# Skip tests that use the network and that include files. # Skip tests that use the network and that include files.

24
pkgs/tools/typesetting/halibut/default.nix
View File

@ -1,29 +1,15 @@
{lib, stdenv, fetchurl, perl}: {lib, stdenv, fetchurl, cmake, perl}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "halibut"; pname = "halibut";
version = "1.2"; version = "1.3";
src = fetchurl { src = fetchurl {
url = "http://ww.chiark.greenend.org.uk/~sgtatham/halibut/halibut-${version}/halibut-${version}.tar.gz"; url = "https://www.chiark.greenend.org.uk/~sgtatham/halibut/halibut-${version}/halibut-${version}.tar.gz";
sha256 = "0gqnhfqf555rfpk5xj1imbdxnbkkrv4wl3rrdb1r0wgj81igpv8s"; sha256 = "0ciikn878vivs4ayvwvr63nnhpcg12m8023xv514zxqpdxlzg85a";
}; };
buildInputs = [ perl ]; nativeBuildInputs = [ cmake 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
'';
meta = with lib; { meta = with lib; {
description = "Documentation production system for software manuals"; description = "Documentation production system for software manuals";

4
pkgs/top-level/all-packages.nix
View File

@ -2990,6 +2990,10 @@ with pkgs;
fast-cpp-csv-parser = callPackage ../development/libraries/fast-cpp-csv-parser { }; 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 { }; faudio = callPackage ../development/libraries/faudio { };
fd = callPackage ../tools/misc/fd { }; fd = callPackage ../tools/misc/fd { };