379aaa1 · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge master into staging-next

commit379aaa1e0cb9ba38cf2071c049a7478adefb4827 authorFrederik Rietdijk <fridh@fridh.nl> dateTue 10 Nov 2020, 10:11 (6 years ago) parent3a5ba30 d04287f

64 files changed+848−327

compare with master

unifiedsplit

maintainers/maintainer-list.nix+6

@@ -2833,6 +2833,12 @@

28332833 fingerprint = "50B7 11F4 3DFD 2018 DCE6 E8D0 8A52 A140 BEBF 7D2C";

28342834 }];

28352835 };

2836+ fabianhjr = {

2837+ email = "fabianhjr@protonmail.com";

2838+ github = "fabianhjr";

2839+ githubId = 303897;

2840+ name = "Fabián Heredia Montiel";

2841+ };

28362842 fadenb = {

28372843 email = "tristan.helmich+nixos@gmail.com";

28382844 github = "fadenb";

nixos/doc/manual/configuration/configuration.xml+1

@@ -18,6 +18,7 @@

1818 <xi:include href="user-mgmt.xml" />

1919 <xi:include href="file-systems.xml" />

2020 <xi:include href="x-windows.xml" />

21+ <xi:include href="wayland.xml" />

2122 <xi:include href="gpu-accel.xml" />

2223 <xi:include href="xfce.xml" />

2324 <xi:include href="networking.xml" />

nixos/doc/manual/configuration/wayland.xmlnew file+23

@@ -0,0 +1,23 @@

1+<chapter xmlns="http://docbook.org/ns/docbook"

2+ xmlns:xlink="http://www.w3.org/1999/xlink"

3+ xmlns:xi="http://www.w3.org/2001/XInclude"

4+ version="5.0"

5+ xml:id="sec-wayland">

6+ <title>Wayland</title>

8+ <para>

9+ While X11 (see <xref linkend="sec-x11"/>) is still the primary display

10+ technology on NixOS, Wayland support is steadily improving.

11+ Where X11 separates the X Server and the window manager, on Wayland those

12+ are combined: a Wayland Compositor is like an X11 window manager, but also

13+ embeds the Wayland 'Server' functionality. This means it is sufficient to

14+ install a Wayland Compositor such as <package>sway</package> without

15+ separately enabling a Wayland server:

16+<programlisting>

17+<xref linkend="opt-programs.sway.enable"/> = true;

18+</programlisting>

19+ This installs the <package>sway</package> compositor along with some

20+ essential utilities. Now you can start <package>sway</package> from the TTY

21+ console.

22+ </para>

23+</chapter>

nixos/modules/config/pulseaudio.nix+7−1

@@ -36,6 +36,8 @@ let

3636 ${addModuleIf cfg.zeroconf.discovery.enable "module-zeroconf-discover"}

3737 ${addModuleIf cfg.tcp.enable (concatStringsSep " "

3838 ([ "module-native-protocol-tcp" ] ++ allAnon ++ ipAnon))}

39+ ${addModuleIf config.services.jack.jackd.enable "module-jack-sink"}

40+ ${addModuleIf config.services.jack.jackd.enable "module-jack-source"}

3941 ${cfg.extraConfig}

4042 '';

4143 };

@@ -144,7 +146,9 @@ in {

144146

145147 package = mkOption {

146148 type = types.package;

147− default = pkgs.pulseaudio;

149+ default = if config.services.jack.jackd.enable

150+ then pkgs.pulseaudioFull

151+ else pkgs.pulseaudio;

148152 defaultText = "pkgs.pulseaudio";

149153 example = literalExample "pkgs.pulseaudioFull";

150154 description = ''

@@ -284,6 +288,8 @@ in {

284288 RestartSec = "500ms";

285289 PassEnvironment = "DISPLAY";

286290 };

291+ } // optionalAttrs config.services.jack.jackd.enable {

292+ environment.JACK_PROMISCUOUS_SERVER = "jackaudio";

287293 };

288294 sockets.pulseaudio = {

289295 wantedBy = [ "sockets.target" ];

nixos/modules/services/audio/jack.nix+3

@@ -246,6 +246,9 @@ in {

246246 description = "JACK Audio Connection Kit";

247247 serviceConfig = {

248248 User = "jackaudio";

249+ SupplementaryGroups = lib.optional

250+ (config.hardware.pulseaudio.enable

251+ && !config.hardware.pulseaudio.systemWide) "users";

249252 ExecStart = "${cfg.jackd.package}/bin/jackd ${lib.escapeShellArgs cfg.jackd.extraOptions}";

250253 LimitRTPRIO = 99;

251254 LimitMEMLOCK = "infinity";

nixos/modules/system/activation/activation-script.nix+24−12

@@ -28,6 +28,20 @@ let

2828 utillinux # needed for mount and mountpoint

2929 ];

3030

31+ scriptType = with types;

32+ let scriptOptions =

33+ { deps = mkOption

34+ { type = types.listOf types.str;

35+ default = [ ];

36+ description = "List of dependencies. The script will run after these.";

37+ };

38+ text = mkOption

39+ { type = types.lines;

40+ description = "The content of the script.";

41+ };

42+ };

43+ in either str (submodule { options = scriptOptions; });

44+

3145in

3246

3347{

@@ -40,16 +54,14 @@ in

4054 default = {};

4155

4256 example = literalExample ''

43− { stdio = {

44− text = '''

45− # Needed by some programs.

46− ln -sfn /proc/self/fd /dev/fd

47− ln -sfn /proc/self/fd/0 /dev/stdin

48− ln -sfn /proc/self/fd/1 /dev/stdout

49− ln -sfn /proc/self/fd/2 /dev/stderr

50− ''';

51− deps = [];

52− };

57+ { stdio.text =

58+ '''

59+ # Needed by some programs.

60+ ln -sfn /proc/self/fd /dev/fd

61+ ln -sfn /proc/self/fd/0 /dev/stdin

62+ ln -sfn /proc/self/fd/1 /dev/stdout

63+ ln -sfn /proc/self/fd/2 /dev/stderr

64+ ''';

5365 }

5466 '';

5567

@@ -62,7 +74,7 @@ in

6274 idempotent and fast.

6375 '';

6476

65− type = types.attrsOf types.unspecified; # FIXME

77+ type = types.attrsOf scriptType;

6678

6779 apply = set: {

6880 script =

@@ -125,7 +137,7 @@ in

125137 idempotent and fast.

126138 '';

127139

128− type = types.attrsOf types.unspecified;

140+ type = with types; attrsOf scriptType;

129141

130142 apply = set: {

131143 script = ''

pkgs/applications/blockchains/freicoin.nixdeleted−41

@@ -1,41 +0,0 @@

1−{ fetchFromGitHub, stdenv, db, boost, gmp, mpfr, qt4, qmake4Hook }:

2−

3−stdenv.mkDerivation rec {

4− version = "0.8.6-2";

5− pname = "freicoin";

6−

7− src = fetchFromGitHub {

8− owner = "freicoin";

9− repo = "freicoin";

10− rev = "v${version}";

11− sha256 = "1v1qwv4x5agjba82s1vknmdgq67y26wzdwbmwwqavv7f7y3y860h";

12− };

13−

14− enableParallelBuilding = false;

15−

16− qmakeFlags = ["USE_UPNP=-"];

17−

18− # I think that openssl and zlib are required, but come through other

19− # packages

20−

21− preBuild = "unset AR";

22−

23− installPhase = ''

24− mkdir -p $out/bin

25− cp freicoin-qt $out/bin

26− '';

27−

28− nativeBuildInputs = [ qmake4Hook ];

29− buildInputs = [ db boost gmp mpfr qt4 ];

30−

31− meta = with stdenv.lib; {

32− description = "Peer-to-peer currency with demurrage fee";

33− homepage = "http://freicoi.in/";

34− license = licenses.mit;

35− maintainers = [ maintainers.viric ];

36− platforms = platforms.linux;

37−

38− # upstream doesn't support newer openssl versions, use 1.0.1 for testing

39− broken = true;

40− };

41−}

pkgs/applications/editors/android-studio/default.nix+3−3

@@ -19,9 +19,9 @@ let

1919 sha256Hash = "sha256-qbxmR9g8DSKzcP09bJuc+am79BSXWG39UQxFEb1bZ88=";

2020 };

2121 latestVersion = { # canary & dev

22− version = "4.2.0.15"; # "Android Studio 4.2 Canary 15"

23− build = "202.6922807";

24− sha256Hash = "sha256-PXFNnPSJbdp9NtkMDR3Vq+vpWqd85Io2FmXPhRLRk/8=";

22+ version = "4.2.0.16"; # "Android Studio 4.2 Canary 16"

23+ build = "202.6939830";

24+ sha256Hash = "sha256-2Xh0GR4BHZI6ofdyMI2icrztI2BmiHWT+1bEZIZ58IE=";

2525 };

2626in {

2727 # Attributes are named by their corresponding release channels

pkgs/applications/graphics/qview/default.nix+2−2

@@ -2,13 +2,13 @@

33mkDerivation rec {

44 pname = "qview";

5− version = "3.0";

5+ version = "4.0";

77 src = fetchFromGitHub {

88 owner = "jurplel";

99 repo = "qView";

1010 rev = version;

11− sha256 = "15a91bs3wcqhgf76wzigbn10hayg628j84pq4j2vaxar94ak0vk7";

11+ sha256 = "15n9cq7w3ckinnx38hvncxrbkv4qm4k51sal41q4y0pkvhmafhnr";

1212 };

1313

1414 nativeBuildInputs = [ qmake ];

pkgs/applications/misc/k2pdfopt/default.nix+2−2

@@ -2,7 +2,7 @@

22, cmake, pkgconfig, zlib, libpng, makeWrapper

33, enableGSL ? true, gsl

44, enableGhostScript ? true, ghostscript

5−, enableMuPDF ? true, mupdf

5+, enableMuPDF ? true, mupdf_1_17

66, enableDJVU ? true, djvulibre

77, enableGOCR ? false, gocr # Disabled by default due to crashes

88, enableTesseract ? true, leptonica, tesseract4

@@ -89,7 +89,7 @@ in stdenv.mkDerivation rec {

8989 cp ${k2pdfopt_src}/mupdf_mod/pdf-* ./source/pdf/

9090 '';

9191 };

92− mupdf_modded = mupdf.overrideAttrs ({ patches ? [], ... }: {

92+ mupdf_modded = mupdf_1_17.overrideAttrs ({ patches ? [], ... }: {

9393 patches = patches ++ [ mupdf_patch ];

9494 # This function is missing in font.c, see font-win32.c

9595 postPatch = ''

pkgs/applications/misc/llpp/default.nix+5−5

@@ -1,16 +1,16 @@

1−{ stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11,

2−libGLU, libGL, freetype, xclip, inotify-tools, procps }:

1+{ stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11, jbig2dec, openjpeg, libjpeg , lcms2, harfbuzz,

2+libGLU, libGL, gumbo, freetype, zlib, xclip, inotify-tools, procps }:

44assert lib.versionAtLeast (lib.getVersion ocaml) "4.07";

66stdenv.mkDerivation rec {

77 pname = "llpp";

8− version = "32";

8+ version = "33";

1010 src = fetchgit {

1111 url = "git://repo.or.cz/llpp.git";

1212 rev = "v${version}";

13− sha256 = "1h1zysm5cz8laq8li49djl6929cnrjlflag9hw0c1dcr4zaxk32y";

13+ sha256 = "0shqzhaflm2yhkx6c0csq9lxp1s1r7lh5kgpx9q5k06xya2a7yvs";

1414 fetchSubmodules = false;

1515 };

1616

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {

2020 });

2121

2222 nativeBuildInputs = [ makeWrapper ];

23− buildInputs = [ ocaml mupdf libX11 libGLU libGL freetype ];

23+ buildInputs = [ ocaml mupdf libX11 libGLU libGL freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ];

2424

2525 dontStrip = true;

2626

pkgs/applications/misc/llpp/fix-build-bash.patch+15−13

@@ -1,8 +1,9 @@

11diff --git a/build.bash b/build.bash

22index 7c278b6..41494c5 100755

3+with manual adjustments

34--- a/build.bash

45+++ b/build.bash

5−@@ -29,7 +29,6 @@ srcd="$(dirname $0)"

6+@@ -30,7 +30,6 @@ srcd="$(dirname $0)"

67 mudir=$outd/mupdf

78 muinc="-I $mudir/include -I $mudir/thirdparty/freetype/include"

@@ -10,25 +11,25 @@ index 7c278b6..41494c5 100755

1011

1112 mkdir -p $outd/{$wsid,lablGL}

1213 :>$outd/ordered

13−@@ -39,12 +38,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; }

14− mbt=${mbt:-native}

15− mulibs="$mudir/build/$mbt/libmupdf.a" # $mudir/build/$mbt/libmupdf-third.a

14+@@ -41,12 +40,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; }

15+ mulibst="$mudir/build/$mbt/libs"

16+ mulibs="$mudir/build/$mbt/libmupdf.a $mudir/build/$mbt/libmupdf-third.a"

1617

1718-keycmd="(cd $mudir && make -q build=$mbt libs && echo); digest $mulibs"

18−-isfresh "$mulibs" "$(eval $keycmd)" || (

19+-isfresh "$mulibst" "$(eval $keycmd)" || (

1920- make -C "$mudir" build=$mbt -j $mjobs libs

20−- eval $keycmd >$mudir/build/$mbt/libmupdf.a.past

21+- eval $keycmd >${mulibst}.past

2122-) && vecho "fresh mupdf"

2223-

2324 oincs() {

2425 local i=

2526 local incs1=

26−@@ -89,34 +82,6 @@ mflags() {

27+@@ -100,35 +93,6 @@ mflags() {

2728 }

2829

2930 overs="$(ocamlc -vnum 2>/dev/null)" || overs=""

30−-test "$overs" = "4.10.0" || {

31−- url=https://caml.inria.fr/pub/distrib/ocaml-4.10/ocaml-4.10.0.tar.xz

31+-test "$overs" = "4.11.1" || {

32+- url=https://caml.inria.fr/pub/distrib/ocaml-4.11/ocaml-4.11.1.tar.xz

3233- txz=$outd/$(basename $url)

3334- keycmd="printf $url; digest $txz;"

3435- isfresh $txz "$(eval $keycmd)" || {

@@ -48,7 +49,8 @@ index 7c278b6..41494c5 100755

4849- tar xf $txz -C $outd

4950- bn=$(basename $url)

5051- cd $outd/${bn%.tar.xz}

51−- ./configure --disable-ocamldoc --enable-debugger=no --prefix=$absprefix

52+- ./configure --disable-ocamldoc --disable-ocamltest \

53+- --enable-debugger=no --prefix=$absprefix

5254- make -j $mjobs world

5355- make install

5456- eval $keycmd >$absprefix/bin/ocamlc.past

@@ -58,7 +60,7 @@ index 7c278b6..41494c5 100755

5860

5961 ccomp=${LLPP_CC-$(ocamlc -config | grep "^c_compiler: " | \

6062 { read _ c; echo $c; })}

61−@@ -230,7 +195,7 @@ bobjc() {

63+@@ -243,7 +208,7 @@ bobjc() {

6264 } && vecho "fresh $o"

6365 }

6466

@@ -67,12 +69,12 @@ index 7c278b6..41494c5 100755

6769

6870 cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)"

6971 keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml"

70−@@ -284,7 +249,7 @@ for m in ml_gl ml_glarray ml_raw; do

72+@@ -291,7 +256,7 @@ for m in ml_gl ml_glarray ml_raw; do

7173 done

7274

7375 libs="str.cma unix.cma"

7476-clibs="-L$mudir/build/$mbt -lmupdf -lmupdf-third -lpthread"

75−+clibs="-lmupdf -lfreetype -lpthread"

77++clibs="-lmupdf -lmupdf-third -lfreetype -lgumbo -ljpeg -lopenjp2 -ljbig2dec -llcms2 -lharfbuzz -lpthread -lz"

7678 if $darwin; then

7779 mcomp=$(ocamlc -config | grep bytecomp_c_co | { read _ c; echo $c; })

7880 clibs="$clibs -framework Cocoa -framework OpenGL"

pkgs/applications/misc/mupdf/1.17.nixnew file+95

@@ -0,0 +1,95 @@

1+{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg

2+, jbig2dec, libjpeg , darwin

3+, enableX11 ? true, libX11, libXext, libXi, libXrandr

4+, enableCurl ? true, curl, openssl

5+, enableGL ? true, freeglut, libGLU

6+}:

8+let

10+ # OpenJPEG version is hardcoded in package source

11+ openJpegVersion = with stdenv;

12+ lib.versions.majorMinor (lib.getVersion openjpeg);

13+

14+

15+in stdenv.mkDerivation rec {

16+ version = "1.17.0";

17+ pname = "mupdf";

18+

19+ src = fetchurl {

20+ url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";

21+ sha256 = "13nl9nrcx2awz9l83mlv2psi1lmn3hdnfwxvwgwiwbxlkjl3zqq0";

22+ };

23+

24+ patches =

25+ # Use shared libraries to decrease size

26+ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch

27+ ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch

28+ ;

29+

30+ postPatch = ''

31+ sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c

32+ '';

33+

34+ makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ];

35+ nativeBuildInputs = [ pkgconfig ];

36+ buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ]

37+ ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ]

38+ ++ lib.optionals enableCurl [ curl openssl ]

39+ ++ lib.optionals enableGL (

40+ if stdenv.isDarwin then

41+ with darwin.apple_sdk.frameworks; [ GLUT OpenGL ]

42+ else

43+ [ freeglut libGLU ])

44+ ;

45+ outputs = [ "bin" "dev" "out" "man" "doc" ];

46+

47+ preConfigure = ''

48+ # Don't remove mujs because upstream version is incompatible

49+ rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib}

50+ '';

51+

52+ postInstall = ''

53+ mkdir -p "$out/lib/pkgconfig"

54+ cat >"$out/lib/pkgconfig/mupdf.pc" <<EOF

55+ prefix=$out

56+ libdir=$out/lib

57+ includedir=$out/include

58+

59+ Name: mupdf

60+ Description: Library for rendering PDF documents

61+ Version: ${version}

62+ Libs: -L$out/lib -lmupdf -lmupdf-third

63+ Cflags: -I$dev/include

64+ EOF

65+

66+ moveToOutput "bin" "$bin"

67+ ln -s "$bin/bin/mupdf-x11" "$bin/bin/mupdf"

68+ mkdir -p $bin/share/applications

69+ cat > $bin/share/applications/mupdf.desktop <<EOF

70+ [Desktop Entry]

71+ Type=Application

72+ Version=1.0

73+ Name=mupdf

74+ Comment=PDF viewer

75+ Exec=$bin/bin/mupdf-x11 %f

76+ Terminal=false

77+ MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;application/epub+zip

78+ EOF

79+ '';

80+

81+ enableParallelBuilding = true;

82+

83+ meta = with stdenv.lib; {

84+ homepage = "https://mupdf.com";

85+ repositories.git = "git://git.ghostscript.com/mupdf.git";

86+ description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C";

87+ license = licenses.agpl3Plus;

88+ maintainers = with maintainers; [ vrthra fpletz ];

89+ platforms = platforms.unix;

90+ knownVulnerabilities = [

91+ "CVE-2020-26519: denial of service when parsing JBIG2"

92+ "CVE-2017-5991: NULL pointer dereference"

93+ ];

94+ };

95+}

pkgs/applications/misc/mupdf/default.nix+24−7

@@ -1,5 +1,6 @@

11{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg

22, jbig2dec, libjpeg , darwin

3+, gumbo

34, enableX11 ? true, libX11, libXext, libXi, libXrandr

45, enableCurl ? true, curl, openssl

56, enableGL ? true, freeglut, libGLU

@@ -13,27 +14,43 @@ let

1314

1415

1516in stdenv.mkDerivation rec {

16− version = "1.17.0";

17+ version = "1.18.0";

1718 pname = "mupdf";

1819

1920 src = fetchurl {

2021 url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";

21− sha256 = "13nl9nrcx2awz9l83mlv2psi1lmn3hdnfwxvwgwiwbxlkjl3zqq0";

22+ sha256 = "0rljl44y8p8hgaqializlyrgpij1wbnrzyp0ll5kcg7w05nylq48";

2223 };

2324

2425 patches =

25− # Use shared libraries to decrease size

26− stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch

27− ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch

28− ;

26+ stdenv.lib.optional stdenv.isDarwin ./darwin.patch ++ [

27+ (fetchpatch {

28+ name = "pdfocr.patch";

29+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a507b139adf37d2c742e039815601cdc2aa00a84";

30+ sha256 = "1fx6pdgwrbk3bqsx53764d61llfj9s5q8lxqkna7mjnp7mg4krj3";

31+ })

32+ (fetchpatch {

33+ name = "pdf-layer.patch";

34+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54";

35+ sha256 = "0ma8jq8d9a0mf26qjklgi4gdaflpjik1br1nhafzvjz7ccl56ksm";

36+ })

37+ (fetchpatch {

38+ name = "pixmap.patch";

39+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=32e4e8b4bcbacbf92af7c88337efae21986d9603";

40+ sha256 = "1zqkxgwrhcwsdya98pcmpq2815jjmv3fwsp0sba9f5nq5xi6whbj";

41+ })

42+ ];

2943

3044 postPatch = ''

3145 sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c

3246 '';

3347

48+ # Use shared libraries to decrease size

49+ buildFlags = [ "shared" ];

50+

3451 makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ];

3552 nativeBuildInputs = [ pkgconfig ];

36− buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ]

53+ buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU gumbo ]

3754 ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ]

3855 ++ lib.optionals enableCurl [ curl openssl ]

3956 ++ lib.optionals enableGL (

pkgs/applications/networking/instant-messengers/element/element-desktop-package.json+1−1

@@ -2,7 +2,7 @@

22 "name": "element-desktop",

33 "productName": "Element",

44 "main": "src/electron-main.js",

5− "version": "1.7.12",

5+ "version": "1.7.13",

66 "description": "A feature-rich client for Matrix.org",

77 "author": "Element",

88 "repository": {

pkgs/applications/networking/instant-messengers/element/element-desktop.nix+2−2

@@ -8,12 +8,12 @@

99let

1010 executableName = "element-desktop";

11− version = "1.7.12";

11+ version = "1.7.13";

1212 src = fetchFromGitHub {

1313 owner = "vector-im";

1414 repo = "riot-desktop";

1515 rev = "v${version}";

16− sha256 = "08d9llrglap5bbicdkbdl9l71wba2kkyhdyd0a4iqdz3l2jvv698";

16+ sha256 = "04nm5amhc0bqqwcc1c9x88lnbjaaryfs0xhi4as65l5ac4jdkzjc";

1717 };

1818 electron = electron_9;

1919

pkgs/applications/networking/instant-messengers/element/element-web.nix+2−2

@@ -12,11 +12,11 @@ let

1212

1313in stdenv.mkDerivation rec {

1414 pname = "element-web";

15− version = "1.7.12";

15+ version = "1.7.13";

1616

1717 src = fetchurl {

1818 url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";

19− sha256 = "173hdg09cw13vqh0lvz6kl0mq4i3rsacjxhspkpydh2qd1g3hjrs";

19+ sha256 = "13ylzyr1kkrppvp86kih60pqxlsvqlcsgz2gj4azgmrf2bijfby3";

2020 };

2121

2222 installPhase = ''

pkgs/applications/video/go-chromecast/default.nixnew file+24

@@ -0,0 +1,24 @@

1+{ lib, buildGoModule, fetchFromGitHub }:

3+buildGoModule rec {

4+ pname = "go-chromecast";

5+ version = "0.2.5";

7+ src = fetchFromGitHub {

8+ owner = "vishen";

9+ repo = pname;

10+ rev = "v${version}";

11+ sha256 = "0y1zwy1bxnjz409vdhqwykvfjhrsyy4j503v3rjrrhkcca6vfbyg";

12+ };

13+

14+ vendorSha256 = "04mgm3afgczq0an6ys8bilxv1hgzfwvgjx21fyl82yxd573rsf5r";

15+

16+ buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ];

17+

18+ meta = with lib; {

19+ homepage = "https://github.com/vishen/go-chromecast";

20+ description = "CLI for Google Chromecast, Home devices and Cast Groups";

21+ license = licenses.asl20;

22+ maintainers = with maintainers; [ marsam ];

23+ };

24+}

pkgs/applications/video/kodi/default.nix+2−2

@@ -45,14 +45,14 @@ assert useWayland -> wayland != null && wayland-protocols != null && waylandpp !

4545

4646let

4747 kodiReleaseDate = "20200728";

48− kodiVersion = "18.8";

48+ kodiVersion = "18.9";

4949 rel = "Leia";

5050

5151 kodi_src = fetchFromGitHub {

5252 owner = "xbmc";

5353 repo = "xbmc";

5454 rev = "${kodiVersion}-${rel}";

55− sha256 = "0qpkpz43s207msvv3qkiy6vzqwcgmydxv3py7vc29mv6h30chrva";

55+ sha256 = "0nnf7823pixj6n2fkjc8rbdjwayvhlbglij2by4rnjzzfgmqmw20";

5656 };

5757

5858 cmakeProto = fetchurl {

pkgs/applications/virtualization/looking-glass-client/default.nix+13−19

@@ -1,36 +1,30 @@

1−{ stdenv, fetchFromGitHub, fetchpatch

2−, cmake, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig

3−, libX11, freefont_ttf, nettle, libconfig, wayland, libpthreadstubs, libXdmcp

4−, libXfixes, libbfd

1+{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_ttf, spice-protocol

2+, fontconfig, libX11, freefont_ttf, nettle, libpthreadstubs, libXau, libXdmcp

3+, libXi, libXext, wayland, libffi, libGLU, expat, libbfd

54}:

76stdenv.mkDerivation rec {

87 pname = "looking-glass-client";

9− version = "B1";

8+ version = "B2";

109

1110 src = fetchFromGitHub {

1211 owner = "gnif";

1312 repo = "LookingGlass";

1413 rev = version;

15− sha256 = "0vykv7yjz4fima9d82m83acd8ab72nq4wyzyfs1c499i27wz91ia";

14+ sha256 = "100b5kzh8gr81kzw5fdqz2jsms25hv3815d31vy3qd6lrlm5gs3d";

15+ fetchSubmodules = true;

1616 };

1717

18− nativeBuildInputs = [ pkgconfig ];

18+ nativeBuildInputs = [ cmake pkgconfig ];

1919

2020 buildInputs = [

21− SDL SDL2 SDL2_ttf openssl spice-protocol fontconfig

22− libX11 freefont_ttf nettle libconfig wayland libpthreadstubs

23− libXdmcp libXfixes libbfd cmake

21+ SDL2 SDL2_ttf spice-protocol fontconfig libX11 freefont_ttf nettle

22+ libpthreadstubs libXau libXdmcp libXi libXext wayland libffi libGLU expat

23+ libbfd

2424 ];

2525

26− enableParallelBuilding = true;

27−

2826 sourceRoot = "source/client";

29−

30− installPhase = ''

31− mkdir -p $out/bin

32− mv looking-glass-client $out/bin

33− '';

27+ NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem.

3428

3529 meta = with stdenv.lib; {

3630 description = "A KVM Frame Relay (KVMFR) implementation";

@@ -41,9 +35,9 @@ stdenv.mkDerivation rec {

4135 step required to move away from dual booting with other operating systems

4236 for legacy programs that require high performance graphics.

4337 '';

44− homepage = "https://looking-glass.hostfission.com/";

38+ homepage = "https://looking-glass.io/";

4539 license = licenses.gpl2Plus;

46− maintainers = [ maintainers.alexbakker ];

40+ maintainers = with maintainers; [ alexbakker ];

4741 platforms = [ "x86_64-linux" ];

4842 };

4943}

pkgs/applications/virtualization/qemu/CVE-2020-27617.patchnew file+43

@@ -0,0 +1,43 @@

1+From 6d19c0cc6c5a9bba308fc29d7c0edc2dc372c41b Mon Sep 17 00:00:00 2001

2+From: Prasad J Pandit <pjp@fedoraproject.org>

3+Date: Wed, 21 Oct 2020 11:35:50 +0530

4+Subject: [PATCH] net: remove an assert call in eth_get_gso_type

6+eth_get_gso_type() routine returns segmentation offload type based on

7+L3 protocol type. It calls g_assert_not_reached if L3 protocol is

8+unknown, making the following return statement unreachable. Remove the

9+g_assert call, it maybe triggered by a guest user.

10+

11+Reported-by: Gaoning Pan <pgn@zju.edu.cn>

12+Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>

13+---

14+ net/eth.c | 6 +++---

15+ 1 file changed, 3 insertions(+), 3 deletions(-)

16+

17+diff --git a/net/eth.c b/net/eth.c

18+index 0c1d413ee2..eee77071f9 100644

19+--- a/net/eth.c

20++++ b/net/eth.c

21+@@ -16,6 +16,7 @@

22+ */

23+

24+ #include "qemu/osdep.h"

25++#include "qemu/log.h"

26+ #include "net/eth.h"

27+ #include "net/checksum.h"

28+ #include "net/tap.h"

29+@@ -71,9 +72,8 @@ eth_get_gso_type(uint16_t l3_proto, uint8_t *l3_hdr, uint8_t l4proto)

30+ return VIRTIO_NET_HDR_GSO_TCPV6 | ecn_state;

31+ }

32+ }

33+-

34+- /* Unsupported offload */

35+- g_assert_not_reached();

36++ qemu_log_mask(LOG_GUEST_ERROR, "%s: probably not GSO frame, "

37++ "unknown L3 protocol: 0x%04"PRIx16"\n", __func__, l3_proto);

38+

39+ return VIRTIO_NET_HDR_GSO_NONE | ecn_state;

40+ }

41+--

42+2.28.0

43+

pkgs/applications/virtualization/qemu/default.nix+1

@@ -82,6 +82,7 @@ stdenv.mkDerivation rec {

8282 ./no-etc-install.patch

8383 ./fix-qemu-ga.patch

8484 ./9p-ignore-noatime.patch

85+ ./CVE-2020-27617.patch

8586 ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch

8687 ++ optionals stdenv.hostPlatform.isMusl [

8788 (fetchpatch {

pkgs/applications/virtualization/virt-top/default.nix+9−1

@@ -1,4 +1,4 @@

1−{ stdenv, fetchgit, ocamlPackages, autoreconfHook }:

1+{ stdenv, fetchgit, fetchpatch, ocamlPackages, autoreconfHook }:

33stdenv.mkDerivation rec {

44 pname = "virt-top";

@@ -10,6 +10,14 @@ stdenv.mkDerivation rec {

1010 sha256 = "0m7pm8lzlpngsj0vjv0hg8l9ck3gvwpva7r472f8f03xpjffwiga";

1111 };

1212

13+ patches = [

14+ (fetchpatch {

15+ name = "ocaml-libvirt-0.6.1.5-fix.patch";

16+ url = "http://git.annexia.org/?p=virt-top.git;a=patch;h=24a461715d5bce47f63cb0097606fc336230589f";

17+ sha256 = "15w7w9iggvlw8m9w8g4h08251wzb3m3zkb58glr7ifsgi3flbn61";

18+ })

19+ ];

20+

1321 nativeBuildInputs = [ autoreconfHook ];

1422 buildInputs = with ocamlPackages; [ ocaml findlib ocaml_extlib ocaml_libvirt gettext-stub curses csv xml-light ];

1523

pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nixnew file+38

@@ -0,0 +1,38 @@

1+{ stdenv, dockapps-sources, pkg-config, libX11, libXpm, libXext, alsaLib }:

3+stdenv.mkDerivation rec {

4+ pname = "AlsaMixer.app";

5+ version = "0.2.1";

7+ src = dockapps-sources;

9+ nativeBuildInputs = [ pkg-config ];

10+ buildInputs = [ libX11 libXpm libXext alsaLib ];

11+

12+ setSourceRoot = ''

13+ export sourceRoot=$(echo */${pname})

14+ '';

15+

16+ dontConfigure = true;

17+

18+ preInstall = ''

19+ install -d ${placeholder "out"}/bin

20+ '';

21+

22+ installPhase = ''

23+ runHook preInstall

24+ install -t ${placeholder "out"}/bin AlsaMixer.app

25+ runHook postInstall

26+ '';

27+

28+ postInstall = ''

29+ ln -s ${placeholder "out"}/bin/AlsaMixer.app ${placeholder "out"}/bin/AlsaMixer

30+ '';

31+

32+ meta = with stdenv.lib; {

33+ description = "Alsa mixer application for Windowmaker";

34+ homepage = "https://www.dockapps.net/alsamixerapp";

35+ license = licenses.gpl2Plus;

36+ maintainers = [ maintainers.bstrik ];

37+ };

38+}

pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nixdeleted−27

@@ -1,27 +0,0 @@

1−{ stdenv, fetchgit, pkgconfig, libX11, libXpm, libXext, alsaLib }:

2−

3−stdenv.mkDerivation {

4− name = "alsamixer.app-0.2.1";

5− src = fetchgit {

6− url = "git://repo.or.cz/dockapps.git";

7− rev = "38c74350b02f35824554ce0c4f0f251d71762040";

8− sha256 = "0g9cwhlqg065fbhav4g4n16a4cqkk9jykl3y0zwbn5whhacfqyhl";

9− };

10−

11− nativeBuildInputs = [ pkgconfig ];

12− buildInputs = [ libX11 libXpm libXext alsaLib ];

13−

14− postUnpack = "sourceRoot=\${sourceRoot}/AlsaMixer.app";

15−

16− installPhase = ''

17− mkdir -pv $out/bin;

18− cp AlsaMixer.app $out/bin/AlsaMixer;

19− '';

20−

21− meta = {

22− description = "Alsa mixer application for Windowmaker";

23− homepage = "http://windowmaker.org/dockapps/?name=AlsaMixer.app";

24− license = stdenv.lib.licenses.gpl2;

25− maintainers = [ stdenv.lib.maintainers.bstrik ];

26− };

27−}

pkgs/applications/window-managers/windowmaker/dockapps/default.nixnew file+20

@@ -0,0 +1,20 @@

1+{ config, lib, pkgs }:

3+lib.makeScope pkgs.newScope (self: with self; {

5+ dockapps-sources = pkgs.fetchgit {

6+ url = "https://repo.or.cz/dockapps.git";

7+ rev = "b2b9d872ee61c9b329e4597c301e4417cbd9c3ea";

8+ sha256 = "sha256-BuSnwPIj3gUWMjj++SK+117xm/77u4gXLQzRFttei0w=";

9+ };

10+

11+ libdockapp = callPackage ./libdockapp.nix { };

12+

13+ AlsaMixer-app = callPackage ./AlsaMixer-app.nix { };

14+

15+ wmCalClock = callPackage ./wmCalClock.nix { };

16+

17+ wmsm-app = callPackage ./wmsm-app.nix { };

18+

19+ wmsystemtray = callPackage ./wmsystemtray.nix { };

20+})

pkgs/applications/window-managers/windowmaker/dockapps/libdockapp.nixnew file+30

@@ -0,0 +1,30 @@

1+{ stdenv, dockapps-sources, autoreconfHook, pkg-config

2+, libX11, libXext, libXpm, mkfontdir, fontutil }:

4+stdenv.mkDerivation rec {

5+ pname = "libdockapp";

6+ version = "0.7.3";

8+ src = dockapps-sources;

10+ nativeBuildInputs = [ autoreconfHook pkg-config ];

11+

12+ buildInputs = [ libX11 libXext libXpm fontutil mkfontdir ];

13+

14+ setSourceRoot = ''

15+ export sourceRoot=$(echo */${pname})

16+ '';

17+

18+ # There is a bug on --with-font

19+ configureFlags = [

20+ "--with-examples=no"

21+ "--with-font=no"

22+ ];

23+

24+ meta = with stdenv.lib; {

25+ description = "A library providing a framework for dockapps";

26+ homepage = "https://www.dockapps.net/libdockapp";

27+ license = licenses.gpl2Plus;

28+ maintainers = [ maintainers.bstrik ];

29+ };

30+}

pkgs/applications/window-managers/windowmaker/dockapps/wmCalClock.nixnew file+38

@@ -0,0 +1,38 @@

1+{ stdenv, dockapps-sources

2+, libX11, libXpm, libXext }:

4+stdenv.mkDerivation rec {

5+ pname = "wmCalClock";

6+ version = "1.25";

8+ src = dockapps-sources;

10+ buildInputs = [ libX11 libXpm libXext ];

11+

12+ setSourceRoot = ''

13+ export sourceRoot=$(echo */${pname}/Src)

14+ '';

15+

16+ preBuild = ''

17+ makeFlagsArray+=(

18+ CC="cc"

19+ INCDIR="-I${libX11.dev}/include -I${libXext.dev}/include -I${libXpm.dev}/include"

20+ LIBDIR="-I${libX11}/lib -I${libXext}/lib -I${libXpm}/lib"

21+ )

22+ '';

23+

24+ preInstall = ''

25+ install -d ${placeholder "out"}/bin

26+ install -d ${placeholder "out"}/man/man1

27+ '';

28+

29+ installFlags = [ "DESTDIR=${placeholder "out"}" ];

30+

31+ meta = with stdenv.lib; {

32+ description = "A Calendar clock with antialiased text";

33+ homepage = "https://www.dockapps.net/wmcalclock";

34+ license = licenses.gpl2Plus;

35+ maintainers = [ maintainers.bstrik ];

36+ platforms = platforms.linux;

37+ };

38+}

pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nixdeleted−32

@@ -1,32 +0,0 @@

1−{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext }:

2−

3−stdenv.mkDerivation {

4− name = "wmCalClock-1.25";

5− src = fetchurl {

6− url = "http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmCalClock-1.25.tar.gz";

7− sha256 = "4b42b55bb7c1d7c58b5ee1f0058c683d3e4f3e3380d3a69c54a50b983c7c1b3f";

8− };

9−

10− nativeBuildInputs = [ pkgconfig ];

11− buildInputs = [ libX11 libXpm libXext ];

12−

13− postUnpack = "sourceRoot=\${sourceRoot}/Src";

14−

15− buildPhase=''

16− make prefix=$out

17− '';

18−

19− installPhase = ''

20− mkdir -pv $out/bin

21− mkdir -pv $out/man/man1

22− make DESTDIR=$out install

23− '';

24−

25− meta = {

26− description = "Clock for Windowmaker";

27− homepage = "http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/time.html#wmcalclock";

28− license = stdenv.lib.licenses.gpl2;

29− maintainers = [ stdenv.lib.maintainers.bstrik ];

30− platforms = stdenv.lib.platforms.linux;

31− };

32−}

pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nixnew file+43

@@ -0,0 +1,43 @@

1+{ stdenv, dockapps-sources

2+, libX11

3+, libXpm

4+, libXext

5+, libdockapp }:

7+stdenv.mkDerivation rec {

8+ pname = "wmsm.app";

9+ version = "0.2.1";

10+

11+ src = dockapps-sources;

12+

13+ buildInputs = [ libX11 libXpm libXext libdockapp ];

14+

15+ setSourceRoot = ''

16+ export sourceRoot=$(echo */${pname}/wmsm)

17+ '';

18+

19+ NIX_CFLAGS_COMPILE = "-std=gnu89";

20+

21+ postPatch = ''

22+ substituteInPlace Makefile \

23+ --replace "PREFIX = /usr/X11R6/bin" "" \

24+ --replace "/usr/bin/install" "install"

25+ '';

26+

27+ makeFlags = [ "CC=cc" ];

28+

29+ preInstall = ''

30+ runHook preInstall

31+ install -d ${placeholder "out"}/bin

32+ runHook postInstall

33+ '';

34+

35+ installFlags = [ "PREFIX=${placeholder "out"}/bin" ];

36+

37+ meta = with stdenv.lib; {

38+ description = "System monitor for Windowmaker";

39+ homepage = "https://www.dockapps.net/wmsmapp";

40+ license = licenses.gpl2;

41+ maintainers = [ maintainers.bstrik ];

42+ };

43+}

pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nixdeleted−29

@@ -1,29 +0,0 @@

1−{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext }:

2−

3−stdenv.mkDerivation {

4− name = "wmsm.app-0.2.1";

5− src = fetchurl {

6− url = "http://linux-bsd-unix.strefa.pl/wmsm.app-0.2.1.tar.bz2";

7− sha256 = "369a8f2e5673c6b7ab0cf85166f38fbf553dd966c3c1cfeec0e32837defd32c7";

8− };

9−

10− nativeBuildInputs = [ pkgconfig ];

11− buildInputs = [ libX11 libXpm libXext ];

12−

13− postUnpack = "sourceRoot=\${sourceRoot}/wmsm";

14−

15− NIX_CFLAGS_COMPILE = "-std=gnu89";

16−

17− installPhase = ''

18− substituteInPlace Makefile --replace "PREFIX = /usr/X11R6/bin" "" --replace "/usr/bin/install" "install"

19− mkdir -pv $out/bin;

20− make PREFIX=$out/bin install;

21− '';

22−

23− meta = {

24− description = "System monitor for Windowmaker";

25− homepage = "http://linux-bsd-unix.strefa.pl";

26− license = stdenv.lib.licenses.gpl2;

27− maintainers = [ stdenv.lib.maintainers.bstrik ];

28− };

29−}

pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix+11−9

@@ -1,20 +1,22 @@

11{ stdenv, fetchurl, pkgconfig, libX11, libXpm, libXext, libXfixes, libXmu }:

3−stdenv.mkDerivation {

4− name = "wmsystemtray-1.4";

3+stdenv.mkDerivation rec {

4+ pname = "wmsystemtray";

5+ version = "1.4";

57 src = fetchurl {

6− url = "mirror://sourceforge/project/wmsystemtray/wmsystemtray/wmsystemtray-1.4.tar.gz";

7− sha256 = "8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9";

8+ url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}.tar.gz";

9+ sha256 = "sha256-jt70NpHp//BxAA4pFmx8GtQgwJVukGgVEGHogcisl+k=";

810 };

911

1012 nativeBuildInputs = [ pkgconfig ];

1113 buildInputs = [ libX11 libXpm libXext libXfixes libXmu ];

1214

13− meta = {

14− description = "Systemtray for Windowmaker";

15+ meta = with stdenv.lib; {

16+ description = "A system tray for Windowmaker";

1517 homepage = "http://wmsystemtray.sourceforge.net";

16− license = stdenv.lib.licenses.gpl2;

17− maintainers = [ stdenv.lib.maintainers.bstrik ];

18− platforms = stdenv.lib.platforms.linux;

18+ license = licenses.gpl2Only;

19+ maintainers = [ maintainers.bstrik ];

20+ platforms = platforms.linux;

1921 };

2022}

pkgs/desktops/plasma-5/default.nix+1

@@ -129,6 +129,7 @@ let

129129 plasma-integration = callPackage ./plasma-integration {};

130130 plasma-nm = callPackage ./plasma-nm {};

131131 plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; };

132+ plasma-thunderbolt = callPackage ./plasma-thunderbolt.nix { };

132133 plasma-vault = callPackage ./plasma-vault {};

133134 plasma-workspace = callPackage ./plasma-workspace {};

134135 plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};

pkgs/desktops/plasma-5/plasma-thunderbolt.nixnew file+16

@@ -0,0 +1,16 @@

1+{ mkDerivation

2+, extra-cmake-modules

3+, kcmutils

4+, kcoreaddons

5+, bolt

6+}:

8+mkDerivation {

9+ name = "plasma-thunderbolt";

10+ nativeBuildInputs = [ extra-cmake-modules ];

11+ buildInputs = [

12+ kcmutils

13+ kcoreaddons

14+ bolt

15+ ];

16+}

pkgs/development/haskell-modules/configuration-nix.nix+9−1

@@ -95,7 +95,15 @@ self: super: builtins.intersectAttrs super {

9595 sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL";

9696

9797 # profiling is disabled to allow C++/C mess to work, which is fixed in GHC 8.8

98− cachix = disableLibraryProfiling super.cachix;

98+ cachix = overrideSrc (disableLibraryProfiling super.cachix) {

99+ src = (pkgs.fetchFromGitHub {

100+ owner = "cachix";

101+ repo = "cachix";

102+ rev = "1471050f5906ecb7cd0d72115503d07d2e3beb17";

103+ sha256 = "1lkrmhv5x9dpy53w33kxnhv4x4qm711ha8hsgccrjmxaqcsdm59g";

104+ }) + "/cachix";

105+ version = "0.5.1";

106+ };

99107 hercules-ci-agent = disableLibraryProfiling super.hercules-ci-agent;

100108

101109 # avoid compiling twice by providing executable as a separate output (with small closure size)

pkgs/development/libraries/google-cloud-cpp/default.nix+1

@@ -58,5 +58,6 @@ in stdenv.mkDerivation rec {

5858 homepage = "https://github.com/googleapis/google-cloud-cpp";

5959 description = "C++ Idiomatic Clients for Google Cloud Platform services";

6060 maintainers = with maintainers; [ andir flokli ];

61+ broken = true; # Broken on Hydra since 2020-05-19

6162 };

6263}

pkgs/development/ocaml-modules/ocaml-libvirt/default.nix+8−12

@@ -1,28 +1,24 @@

1−{ stdenv, fetchgit, libvirt, autoconf, ocaml, findlib }:

1+{ stdenv, fetchFromGitLab, libvirt, autoreconfHook, pkg-config, ocaml, findlib, perl }:

33stdenv.mkDerivation rec {

44 pname = "ocaml-libvirt";

5− rev = "bab7f84ade84ceaddb08b6948792d49b3d04b897";

6− version = "0.6.1.4.2017-11-08-unstable"; # libguestfs-1.34+ needs ocaml-libvirt newer than the latest release 0.6.1.4

5+ version = "0.6.1.5";

8− src = fetchgit {

9− url = "git://git.annexia.org/git/ocaml-libvirt.git";

10− rev = rev;

11− sha256 = "0vxgx1n58fp4qmly6i5zxiacr7303127d6j78a295xin1p3a8xcw";

7+ src = fetchFromGitLab {

8+ owner = "libvirt";

9+ repo = "libvirt-ocaml";

10+ rev = "v${version}";

11+ sha256 = "0xpkdmknk74yqxgw8z2w8b7ss8hpx92xnab5fsqg2byyj55gzf2k";

1212 };

1313

1414 propagatedBuildInputs = [ libvirt ];

1515

16− nativeBuildInputs = [ autoconf findlib ];

16+ nativeBuildInputs = [ autoreconfHook pkg-config findlib perl ];

1717

1818 buildInputs = [ ocaml ];

1919

2020 createFindlibDestdir = true;

2121

22− preConfigure = ''

23− autoconf

24− '';

25−

2622 buildPhase = "make all opt CPPFLAGS=-Wno-error";

2723

2824 installPhase = "make install-opt";

pkgs/development/python-modules/ansible-lint/default.nix+2−2

@@ -15,13 +15,13 @@

1515

1616buildPythonPackage rec {

1717 pname = "ansible-lint";

18− version = "4.3.6";

18+ version = "4.3.7";

1919 # pip is not able to import version info on raumel.yaml

2020 disabled = isPy27;

2121

2222 src = fetchPypi {

2323 inherit pname version;

24− sha256 = "1fn7mdykm4id78k4faibi92q9yxbjbyxb90ww0by03c31m8z5348";

24+ sha256 = "0kwwv9dv9rgsqvp15r2vma7hii9lkkqn0n2irvp5h32cbhzzq4hh";

2525 };

2626

2727 format = "pyproject";

pkgs/development/python-modules/coconut/default.nixnew file+52

@@ -0,0 +1,52 @@

1+{

2+ lib,

3+ buildPythonApplication,

4+ fetchFromGitHub,

5+ fetchpatch,

7+ cpyparsing,

8+ ipykernel,

9+ mypy,

10+ pygments,

11+ pytest,

12+ prompt_toolkit,

13+ tkinter,

14+ watchdog

15+}:

16+

17+buildPythonApplication rec {

18+ pname = "coconut";

19+ version = "1.4.3";

20+

21+ src = fetchFromGitHub {

22+ owner = "evhub";

23+ repo = "coconut";

24+ rev = "v${version}";

25+ sha256 = "1pz13vza3yy95dbylnq89fzc3mwgcqr7ds096wy25k6vxd9dp9c3";

26+ };

27+

28+ propagatedBuildInputs = [ cpyparsing pygments prompt_toolkit ipykernel mypy watchdog ];

29+

30+ patches = [

31+ (fetchpatch {

32+ name = "fix-setuptools-version-check.patch";

33+ url = "https://github.com/LibreCybernetics/coconut/commit/2916a087da1e063cc4438b68d4077347fd1ea4a2.patch";

34+ sha256 = "136jbd2rvnifw30y73vv667002nf7sbkm5qyihshj4db7ngysr6q";

35+ })

36+ ];

37+

38+ checkInputs = [ pytest tkinter ];

39+ # Currently most tests do not work on Hydra due to external fetches.

40+ checkPhase = ''

41+ pytest tests/constants_test.py

42+ pytest tests/main_test.py::TestShell::test_compile_to_file

43+ pytest tests/main_test.py::TestShell::test_convenience

44+ '';

45+

46+ meta = with lib; {

47+ homepage = "http://coconut-lang.org/";

48+ description = "Simple, elegant, Pythonic functional programming";

49+ license = licenses.asl20;

50+ maintainers = with maintainers; [ fabianhjr ];

51+ };

52+}

pkgs/development/python-modules/cpyparsing/default.nixnew file+24

@@ -0,0 +1,24 @@

1+{ lib, buildPythonPackage, fetchFromGitHub, cython, python }:

3+buildPythonPackage rec {

4+ pname = "cpyparsing";

5+ version = "2.4.5.0.1.1";

7+ src = fetchFromGitHub {

8+ owner = "evhub";

9+ repo = pname;

10+ rev = "aa8ee45daec5c55328446bad7202ab8f799ab0ce"; # No tags on repo

11+ sha256 = "1mxa5q41cb0k4lkibs0d4lzh1w6kmhhdrsm0w0r1m3s80m05ffmw";

12+ };

13+

14+ nativeBuildInputs = [ cython ];

15+

16+ checkPhase = "${python.interpreter} tests/cPyparsing_test.py";

17+

18+ meta = with lib; {

19+ homepage = "https://github.com/evhub/cpyparsing";

20+ description = "Cython PyParsing implementation";

21+ license = licenses.asl20;

22+ maintainers = with maintainers; [ fabianhjr ];

23+ };

24+}

pkgs/development/python-modules/googlemaps/default.nixnew file+34

@@ -0,0 +1,34 @@

1+{ stdenv, buildPythonPackage, fetchFromGitHub

2+, requests

3+, responses, pytestCheckHook, pytest, pytestcov, isPy27

4+}:

6+buildPythonPackage rec {

7+ pname = "googlemaps";

8+ version = "4.4.2";

9+ disabled = isPy27;

10+

11+ src = fetchFromGitHub {

12+ owner = "googlemaps";

13+ repo = "google-maps-services-python";

14+ rev = "v${version}";

15+ sha256 = "DYhW1OGce/0gY7Jmwq6iM45PxLyXIYo4Cfg2u6Xuyg4=";

16+ };

17+

18+ propagatedBuildInputs = [ requests ];

19+

20+ checkInputs = [ pytestCheckHook responses pytestcov ];

21+

22+ disabledTests = [

23+ # touches network

24+ "test_elevation_along_path_single"

25+ "test_transit_without_time"

26+ ];

27+

28+ meta = with stdenv.lib; {

29+ homepage = "https://github.com/googlemaps/google-maps-services-python";

30+ description = "Python client library for Google Maps API Web Services";

31+ license = licenses.asl20;

32+ maintainers = with maintainers; [ Scriptkiddi ];

33+ };

34+}

pkgs/development/python-modules/openrouteservice/default.nixnew file+29

@@ -0,0 +1,29 @@

1+{ lib, buildPythonPackage, fetchFromGitHub, requests, responses, pytestCheckHook }:

3+buildPythonPackage rec {

4+ pname = "openrouteservice";

5+ version = "2.3.0";

7+ src = fetchFromGitHub {

8+ owner = "GIScience";

9+ repo = "${pname}-py";

10+ rev = "v${version}";

11+ sha256 = "ySXzOQI9NcF1W/otbL7i3AY628/74ZkJjDMQ9ywVEPc=";

12+ };

13+

14+ checkInputs = [ pytestCheckHook responses ];

15+

16+ disabledTests = [

17+ # touches network

18+ "test_optimized_waypoints"

19+ "test_invalid_api_key"

20+ "test_raise_timeout_retriable_requests"

21+ ];

22+

23+ meta = with lib; {

24+ homepage = "https://github.com/GIScience/openrouteservice-py";

25+ description = "The Python API to consume openrouteservice(s) painlessly";

26+ license = licenses.asl20;

27+ maintainers = with maintainers; [ Scriptkiddi ];

28+ };

29+}

pkgs/development/python-modules/pymupdf/default.nix+2−2

@@ -1,11 +1,11 @@

11{ stdenv, buildPythonPackage, fetchPypi, mupdf, swig }:

22buildPythonPackage rec {

33 pname = "PyMuPDF";

4− version = "1.17.6";

4+ version = "1.18.0";

66 src = fetchPypi {

77 inherit pname version;

8− sha256 = "5eef4ff61698016a296932858625a5a0039b923ba692043e2c98ca02966f1da2";

8+ sha256 = "64ce58f92d9edd2631e447175fa13b4024ac3b6dce6e718e0b003c41de6f7952";

99 };

1010

1111 patchPhase = ''

pkgs/development/python-modules/pytest-pylint/default.nix+2−2

@@ -11,12 +11,12 @@

1111

1212buildPythonPackage rec {

1313 pname = "pytest-pylint";

14− version = "0.17.0";

14+ version = "0.18.0";

1515 disabled = isPy27;

1616

1717 src = fetchPypi {

1818 inherit pname version;

19− sha256 = "b0c177d63f6e3f5b82fa2720a6570dd2ecff1616c26ed6d02d0cbf75fd98ddf9";

19+ sha256 = "790c7a8019fab08e59bd3812db1657a01995a975af8b1c6ce95b9aa39d61da27";

2020 };

2121

2222 nativeBuildInputs = [ pytestrunner ];

pkgs/development/python-modules/pyvmomi/default.nix+2−2

@@ -2,13 +2,13 @@

33buildPythonPackage rec {

44 pname = "pyvmomi";

5− version = "7.0";

5+ version = "7.0.1";

77 src = fetchFromGitHub {

88 owner = "vmware";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "1qqljrlc9h7kddx3xxc6479gk75fvaxspfikzjn6zj5mznsvfwj5";

11+ sha256 = "1i7zni4ygdikc22wfrbnzwqh6qy402s3di6sdlfcvky2y7fzx52x";

1212 };

1313

1414 # requires old version of vcrpy

pkgs/development/python-modules/rtslib/default.nix+2−2

@@ -2,13 +2,13 @@

33buildPythonPackage rec {

44 pname = "rtslib";

5− version = "2.1.72";

5+ version = "2.1.74";

77 src = fetchFromGitHub {

88 owner = "open-iscsi";

99 repo = "${pname}-fb";

1010 rev = "v${version}";

11− sha256 = "13kycf9xkyxm1ik8yh3qpd96vird8y65daigyiyb4jvx0lmrd0kv";

11+ sha256 = "1in10z6ckmkfhykar435k1fmswbfajysv4g9nsav893ij8g694fy";

1212 };

1313

1414 propagatedBuildInputs = [ six pyudev pygobject3 ];

pkgs/development/python-modules/streamz/default.nix+2−2

@@ -15,11 +15,11 @@

1515

1616buildPythonPackage rec {

1717 pname = "streamz";

18− version = "0.5.5";

18+ version = "0.6.1";

1919

2020 src = fetchPypi {

2121 inherit pname version;

22− sha256 = "787ade4796c5b2e79af2aac678841ba3748a65a3adce150697dcdd31c4f80365";

22+ sha256 = "215703456479d24f524cdcd0365006250d4502d242f57e2f5db18e8638bc8694";

2323 };

2424

2525 propagatedBuildInputs = [

pkgs/development/tools/build-managers/qbs/default.nix+2−2

@@ -3,13 +3,13 @@

33stdenv.mkDerivation rec {

44 pname = "qbs";

6− version = "1.16.0";

6+ version = "1.17.0";

88 src = fetchFromGitHub {

99 owner = "qbs";

1010 repo = "qbs";

1111 rev = "v${version}";

12− sha256 = "1kg11s3figpkvgd85p0zk416s57gnvlzrz1isbc2lv13adidf041";

12+ sha256 = "0sd4qwl1wh8b1hck846plrgddkrdwdfqwk2dgh5hdsrlrvx5xjrr";

1313 };

1414

1515 nativeBuildInputs = [ qmake ];

pkgs/development/tools/misc/arcanist/default.nix+19−13

@@ -1,20 +1,24 @@

1−{ stdenv, fetchFromGitHub, php, flex }:

1+{ bison

2+, fetchFromGitHub

3+, flex

4+, php

5+, stdenv

6+}:

38# Make a custom wrapper. If `wrapProgram` is used, arcanist thinks .arc-wrapped is being

49# invoked and complains about it being an unknown toolset. We could use `makeWrapper`, but

510# then we’d need to still craft a script that does the `php libexec/arcanist/bin/...` dance

611# anyway... So just do everything at once.

712let makeArcWrapper = toolset: ''

8− cat << WRAPPER > $out/bin/${toolset}

9− #!$shell -e

10− export PATH='${php}/bin/'\''${PATH:+':'}\$PATH

11− exec ${php}/bin/php $out/libexec/arcanist/bin/${toolset} "\$@"

12− WRAPPER

13− chmod +x $out/bin/${toolset}

13+ cat << WRAPPER > $out/bin/${toolset}

14+ #!$shell -e

15+ export PATH='${php}/bin/'\''${PATH:+':'}\$PATH

16+ exec ${php}/bin/php $out/libexec/arcanist/bin/${toolset} "\$@"

17+ WRAPPER

18+ chmod +x $out/bin/${toolset}

1419'';

1520

1621in

17−

1822stdenv.mkDerivation {

1923 pname = "arcanist";

2024 version = "20200711";

@@ -25,7 +29,7 @@ stdenv.mkDerivation {

2529 rev = "2565cc7b4d1dbce6bc7a5b3c4e72ae94be4712fe";

2630 sha256 = "0jiv4aj4m5750dqw9r8hizjkwiyxk4cg4grkr63sllsa2dpiibxw";

2731 };

28− buildInputs = [ php flex ];

32+ buildInputs = [ bison flex php ];

2933

3034 postPatch = stdenv.lib.optionalString stdenv.isAarch64 ''

3135 substituteInPlace support/xhpast/Makefile \

@@ -33,13 +37,15 @@ stdenv.mkDerivation {

3337 '';

3438

3539 buildPhase = ''

40+ make cleanall -C support/xhpast

3641 make xhpast -C support/xhpast

3742 '';

3843

3944 installPhase = ''

4045 mkdir -p $out/bin $out/libexec

4146 make install -C support/xhpast

42− cp -R $src $out/libexec/arcanist

47+ make cleanall -C support/xhpast

48+ cp -R . $out/libexec/arcanist

4349

4450 ${makeArcWrapper "arc"}

4551 ${makeArcWrapper "phage"}

@@ -53,9 +59,9 @@ stdenv.mkDerivation {

5359

5460 meta = {

5561 description = "Command line interface to Phabricator";

56− homepage = "http://phabricator.org";

57− license = stdenv.lib.licenses.asl20;

58− platforms = stdenv.lib.platforms.unix;

62+ homepage = "http://phabricator.org";

63+ license = stdenv.lib.licenses.asl20;

64+ platforms = stdenv.lib.platforms.unix;

5965 maintainers = [ stdenv.lib.maintainers.thoughtpolice ];

6066 };

6167}

pkgs/development/web/deno/default.nix+7−8

@@ -18,16 +18,16 @@ let

1818in

1919rustPlatform.buildRustPackage rec {

2020 pname = "deno";

21− version = "1.5.1";

21+ version = "1.5.2";

2222

2323 src = fetchFromGitHub {

2424 owner = "denoland";

2525 repo = pname;

2626 rev = "v${version}";

27− sha256 = "19ki9qyg9q26jq4jkcf8b6xhy4g4cn30zqccgl3324mnijhl33jk";

27+ sha256 = "0dpx74zp85a3qcabfmwnsh1kl0c74ygafybqzmyvwjmax0hdgkq6";

2828 fetchSubmodules = true;

2929 };

30− cargoSha256 = "1q3gmilphkbh54y7m711ccr1gr5slk2nn91qq61rmmphyylwkgv2";

30+ cargoSha256 = "0358vbpda9x0ib0vla4crn052lk299x2hg14g8lzymg33277lk3p";

3131

3232 # Install completions post-install

3333 nativeBuildInputs = [ installShellFiles ];

@@ -52,15 +52,14 @@ rustPlatform.buildRustPackage rec {

5252 # Skipping until resolved

5353 doCheck = false;

5454

55− # TODO: Move to enhanced installShellCompletion when merged: PR #83630

5655 postInstall = ''

5756 # remove test plugin and test server

5857 rm -rf $out/lib $out/bin/test_server

5958

60− $out/bin/deno completions bash > deno.bash

61− $out/bin/deno completions fish > deno.fish

62− $out/bin/deno completions zsh > _deno

63− installShellCompletion deno.{bash,fish} --zsh _deno

59+ installShellCompletion --cmd deno \

60+ --bash <($out/bin/deno completions bash) \

61+ --fish <($out/bin/deno completions fish) \

62+ --zsh <($out/bin/deno completions zsh)

6463 '';

6564

6665 passthru.updateScript = ./update/update.ts;

pkgs/games/quakespasm/vulkan.nix+2−2

@@ -2,13 +2,13 @@

33stdenv.mkDerivation rec {

44 pname = "vkquake";

5− version = "1.05.0";

5+ version = "1.05.1";

77 src = fetchFromGitHub {

88 owner = "Novum";

99 repo = "vkQuake";

1010 rev = version;

11− sha256 = "16ryjfkmnhlxv7b6yvyk3247q7ih4g90a7c4z501xiyp7h0wlsw8";

11+ sha256 = "03b2vxpakp6zizb0m65q9lq800z67b052k01q251b3f04kr1waih";

1212 };

1313

1414 sourceRoot = "source/Quake";

pkgs/os-specific/linux/batman-adv/version.nix+4−4

@@ -1,9 +1,9 @@

11{

2− version = "2020.3";

2+ version = "2020.4";

44 sha256 = {

5− batman-adv = "0wrzh0k44zzjx2s5zj65hjkh4jm9y38qpis1s5cbx9cyj756slb5";

6− alfred = "13bvccz90pkjl09jyw68gj23pbrw9b05w1vhds9sjggwf3jkj5w2";

7− batctl = "0r2w2v4sy6wgr7mp9lc7yj9k4ldsbsm3425rjil7p0b17zmzf4rm";

5+ batman-adv = "1cxr0zmn9nzisawkrfk0gzd9fx0pg6261c889kz47hwp4f545v6d";

6+ alfred = "1ay69nifzghpbvy11fdca5cllkn852h6rg045lci4vzgqf7b2bd2";

7+ batctl = "05rrpfbpdhxn5zgdps849qls2ifis6a94cjryb60d4y1nc2n0d7w";

88 };

99}

pkgs/os-specific/linux/bolt/default.nix+34−11

@@ -1,28 +1,49 @@

1−{ stdenv, meson, ninja, pkgconfig, fetchFromGitLab,

2− python3, umockdev, gobject-introspection, dbus,

3− asciidoc, libxml2, libxslt, docbook_xml_dtd_45, docbook_xsl,

4− glib, systemd, polkit

1+{ stdenv

2+, meson

3+, ninja

4+, pkgconfig

5+, fetchFromGitLab

6+, python3

7+, umockdev

8+, gobject-introspection

9+, dbus

10+, asciidoc

11+, libxml2

12+, libxslt

13+, docbook_xml_dtd_45

14+, docbook_xsl

15+, glib

16+, systemd

17+, polkit

518}:

619

720stdenv.mkDerivation rec {

821 pname = "bolt";

9− version = "0.8";

22+ version = "0.9";

1023

1124 src = fetchFromGitLab {

1225 domain = "gitlab.freedesktop.org";

1326 owner = "bolt";

1427 repo = "bolt";

1528 rev = version;

16− sha256 = "1qamls0fll0qc27lqavf56hv1yj6v6n4ry90g7bcnwpvccmd82yd";

29+ sha256 = "sha256-lcJE+bMK2S2GObHMy/Fu12WGb3T1HrWjsNyZPz4/f4E=";

1730 };

1831

1932 nativeBuildInputs = [

20− meson ninja pkgconfig

21− asciidoc libxml2 libxslt docbook_xml_dtd_45 docbook_xsl

33+ asciidoc

34+ docbook_xml_dtd_45

35+ docbook_xsl

36+ libxml2

37+ libxslt

38+ meson

39+ ninja

40+ pkgconfig

2241 ] ++ stdenv.lib.optional (!doCheck) python3;

2342

2443 buildInputs = [

25− glib systemd polkit

44+ glib

45+ polkit

46+ systemd

2647 ];

2748

2849 doCheck = true;

@@ -32,7 +53,9 @@ stdenv.mkDerivation rec {

3253 '';

3354

3455 checkInputs = [

35− dbus umockdev gobject-introspection

56+ dbus

57+ gobject-introspection

58+ umockdev

3659 (python3.withPackages

3760 (p: [ p.pygobject3 p.dbus-python p.python-dbusmock ]))

3861 ];

@@ -55,7 +78,7 @@ stdenv.mkDerivation rec {

5578 description = "Thunderbolt 3 device management daemon";

5679 homepage = "https://gitlab.freedesktop.org/bolt/bolt";

5780 license = licenses.lgpl21Plus;

58− maintainers = [ maintainers.callahad ];

81+ maintainers = with maintainers; [ callahad ];

5982 platforms = platforms.linux;

6083 };

6184}

pkgs/os-specific/linux/jfbview/default.nix+2−2

@@ -1,5 +1,5 @@

11{ stdenv, fetchFromGitHub

2−, freetype, harfbuzz, jbig2dec, libjpeg, libX11, mupdf, ncurses, openjpeg

2+, freetype, harfbuzz, jbig2dec, libjpeg, libX11, mupdf_1_17, ncurses, openjpeg

33, openssl

55, imageSupport ? true, imlib2 ? null }:

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {

3232 hardeningDisable = [ "format" ];

3333

3434 buildInputs = [

35− freetype harfbuzz jbig2dec libjpeg libX11 mupdf ncurses openjpeg

35+ freetype harfbuzz jbig2dec libjpeg libX11 mupdf_1_17 ncurses openjpeg

3636 openssl

3737 ] ++ stdenv.lib.optionals imageSupport [

3838 imlib2

pkgs/servers/asterisk/default.nix+8−8

@@ -105,8 +105,8 @@ in rec {

105105 asterisk = asterisk_18;

106106

107107 asterisk_13 = common {

108− version = "13.37.0";

109− sha256 = "09wc6cqh4f15wm62drzdppwvh7nwgnbwapvz1kgb0qdgixsshn3v";

108+ version = "13.37.1";

109+ sha256 = "1zc3104zw4y7i8bhhgrgy3snq0zr1904p64ykfc3ldh4xyfy3ld6";

110110 externals = {

111111 "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;

112112 "addons/mp3" = mp3-202;

@@ -114,8 +114,8 @@ in rec {

114114 };

115115

116116 asterisk_16 = common {

117− version = "16.14.0";

118− sha256 = "1y120p4jlhg4iwihdxlk64y3y3n8w7y785lwqxsyqg6zviz0ghx6";

117+ version = "16.14.1";

118+ sha256 = "1lhh3npyy8hvy29jwjgapnxfjv1ahp2qdi4iq1d6a61ffhd20vfs";

119119 externals = {

120120 "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;

121121 "addons/mp3" = mp3-202;

@@ -123,8 +123,8 @@ in rec {

123123 };

124124

125125 asterisk_17 = common {

126− version = "17.8.0";

127− sha256 = "0xhwh8s8n8xg43gcdkqjj484assva7lm5ah1b306a5nf6j8p9bjy";

126+ version = "17.8.1";

127+ sha256 = "0m7gw01kpvsc0f9lb1hiq5b4g1fdh4gdfyxlqxp6m37vgxh2a48p";

128128 externals = {

129129 "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;

130130 "addons/mp3" = mp3-202;

@@ -132,8 +132,8 @@ in rec {

132132 };

133133

134134 asterisk_18 = common {

135− version = "18.0.0";

136− sha256 = "174zasx8d7ragy2fz4vwc4pbra9wl471mnisz1z0a3b2qsbh4y4v";

135+ version = "18.0.1";

136+ sha256 = "1kyly10pk7bpfqg3mjbvb8p795fnj9lvd29yp2xsxwgsqi1dn9p8";

137137 externals = {

138138 "externals_cache/pjproject-2.10.tar.bz2" = pjproject_2_10;

139139 "addons/mp3" = mp3-202;

pkgs/servers/monitoring/prometheus/promscale.nix+2−2

@@ -5,13 +5,13 @@

66buildGoModule rec {

77 pname = "promscale";

8− version = "0.1.1";

8+ version = "0.1.2";

1010 src = fetchFromGitHub {

1111 owner = "timescale";

1212 repo = pname;

1313 rev = version;

14− sha256 = "sha256:00mhkp3nf6h2zsvmmwyza1lahvmm05isfi7rqkx24c0dmkmif3x9";

14+ sha256 = "sha256-Yl61hX4YBddw0euTwheMIOy08jgS47rAU0cKyXiz9s4=";

1515 };

1616

1717 vendorSha256 = "sha256:1ilciwf08678sciwwrjalwvcs5bp7x254nxc3nhdf88cf0bp2nxi";

pkgs/servers/trezord/default.nix+10−6

@@ -1,18 +1,22 @@

1−{ stdenv, buildGoPackage, fetchFromGitHub, trezor-udev-rules }:

1+{ stdenv

2+, buildGoModule

3+, fetchFromGitHub

4+, trezor-udev-rules

5+}:

3−buildGoPackage rec {

7+buildGoModule rec {

48 pname = "trezord-go";

5− version = "2.0.29";

6−

7− goPackagePath = "github.com/trezor/trezord-go";

9+ version = "2.0.30";

810

911 src = fetchFromGitHub {

1012 owner = "trezor";

1113 repo = "trezord-go";

1214 rev = "v${version}";

13− sha256 = "1ks1fa0027s3xp0z6qp0dxmayvrb4dwwscfhbx7da0khp153f2cp";

15+ sha256 = "1hzvk0wfgg7b4wpqjk3738yqxlv3pj5i7zxwm0jady2h97hmrqrr";

1416 };

1517

18+ vendorSha256 = "0wb959xzyvr5zzjvkfqc422frmf97q5nr460f02wwx0pj6ch0y61";

19+

1620 propagatedBuildInputs = [ trezor-udev-rules ];

1721

1822 meta = with stdenv.lib; {

pkgs/tools/filesystems/sshfs-fuse/default.nix+4−4

@@ -1,22 +1,22 @@

11{ stdenv, fetchFromGitHub

2−, meson, pkgconfig, ninja, docutils, makeWrapper

2+, meson, pkg-config, ninja, docutils, makeWrapper

33, fuse3, glib

44, which, python3Packages

55, openssh

66}:

88stdenv.mkDerivation rec {

9− version = "3.7.0";

9+ version = "3.7.1";

1010 pname = "sshfs-fuse";

1111

1212 src = fetchFromGitHub {

1313 owner = "libfuse";

1414 repo = "sshfs";

1515 rev = "sshfs-${version}";

16− sha256 = "119qvjaai3nqs2psqk2kv4gxjchrnrcfnmlwk7yxnj3v59pgyxhv";

16+ sha256 = "088mgcsqv9f2vly4xn6lvvkmqkgr9jjmjs9qp8938hl7j6rrgd17";

1717 };

1818

19− nativeBuildInputs = [ meson pkgconfig ninja docutils makeWrapper ];

19+ nativeBuildInputs = [ meson pkg-config ninja docutils makeWrapper ];

2020 buildInputs = [ fuse3 glib ];

2121 checkInputs = [ which python3Packages.pytest ];

2222

pkgs/tools/misc/bandwidth/default.nix+13−14

@@ -1,13 +1,8 @@

11{ stdenv, fetchurl, nasm }:

33let

4− arch =

5− if stdenv.hostPlatform.system == "x86_64-linux" then "bandwidth64"

6− else if stdenv.hostPlatform.system == "i686-linux" then "bandwidth32"

7− else if stdenv.hostPlatform.system == "x86_64-darwin" then "bandwidth-mac64"

8− else if stdenv.hostPlatform.system == "i686-darwin" then "bandwidth-mac32"

9− else if stdenv.hostPlatform.system == "i686-cygwin" then "bandwidth-win32"

10− else throw "Unknown architecture";

4+ inherit (stdenv.hostPlatform.parsed.cpu) bits;

5+ arch = "bandwidth${toString bits}";

116in

127stdenv.mkDerivation rec {

138 pname = "bandwidth";

@@ -18,21 +13,25 @@ stdenv.mkDerivation rec {

1813 sha256 = "0x798xj3vhiwq2hal0vmf92sq4h7yalp3i6ylqwhnnpv99m2zws4";

1914 };

2015

21− buildInputs = [ nasm ];

16+ postPatch = ''

17+ sed -i 's,^CC=gcc .*,,' OOC/Makefile Makefile*

18+ sed -i 's,ar ,$(AR) ,g' OOC/Makefile

19+ '';

20+

21+ nativeBuildInputs = [ nasm ];

2222

23− buildFlags = [ arch ]

24− ++ stdenv.lib.optionals stdenv.cc.isClang [ "CC=clang" "LD=clang" ];

23+ buildFlags = [ arch ];

2524

2625 installPhase = ''

2726 mkdir -p $out/bin

28− cp ${arch} $out/bin

29− ln -s ${arch} $out/bin/bandwidth

27+ cp ${arch} $out/bin/bandwidth

3028 '';

3129

3230 meta = with stdenv.lib; {

3331 homepage = "https://zsmith.co/bandwidth.html";

3432 description = "Artificial benchmark for identifying weaknesses in the memory subsystem";

35− license = licenses.mit;

36− platforms = platforms.unix;

33+ license = licenses.gpl2Plus;

34+ platforms = platforms.x86;

35+ maintainers = with maintainers; [ r-burns ];

3736 };

3837}

pkgs/tools/misc/fend/default.nixnew file+22

@@ -0,0 +1,22 @@

1+{ lib, fetchFromGitHub, rustPlatform }:

3+rustPlatform.buildRustPackage rec {

4+ pname = "fend";

5+ version = "0.1.9";

7+ src = fetchFromGitHub {

8+ owner = "printfn";

9+ repo = pname;

10+ rev = "v${version}";

11+ sha256 = "11cvpg7j2rvqri16cr3gb6dpm7dzgs3vywhdc91aa531f87qj16c";

12+ };

13+

14+ cargoSha256 = "0q9gkvbay6rnb0nd14z71h3506yzn9610zc6g8wbpgmw6cpwvbg9";

15+

16+ meta = with lib; {

17+ description = "Arbitrary-precision unit-aware calculator";

18+ homepage = "https://github.com/printfn/fend";

19+ license = licenses.mit;

20+ maintainers = with maintainers; [ djanatyn ];

21+ };

22+}

pkgs/tools/misc/vector/default.nix+14−1

@@ -4,9 +4,11 @@

44, tzdata

66, features ?

7− (if stdenv.isAarch64

7+ ((if stdenv.isAarch64

88 then [ "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]

99 else [ "leveldb" "leveldb/leveldb-sys-2" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ])

10+ ++

11+ [ "sinks" "sources" "transforms" ])

1012, coreutils

1113, CoreServices

1214}:

@@ -38,9 +40,20 @@ rustPlatform.buildRustPackage rec {

3840 # vector.dev during the checkPhase, which obviously isn't going to work.

3941 # these tests in the DNS module are trivial though, so stubbing them out is

4042 # fine IMO.

43+ #

44+ # the geoip transform yields maxmindb.so which contains references to rustc.

45+ # neither figured out why the shared object is included in the output

46+ # (it doesn't seem to be a runtime dependencies of the geoip transform),

47+ # nor do I know why it depends on rustc.

48+ # However, in order for the closure size to stay at a reasonable level,

49+ # transforms-geoip is patched out of Cargo.toml for now - unless explicitly asked for.

4150 patchPhase = ''

4251 substituteInPlace ./src/dns.rs \

4352 --replace "#[test]" ""

53+

54+ ${lib.optionalString (!builtins.elem "transforms-geoip" features) ''

55+ substituteInPlace ./Cargo.toml --replace '"transforms-geoip",' ""

56+ ''}

4457 '';

4558

4659 meta = with stdenv.lib; {

pkgs/tools/networking/dogdns/default.nix+10−2

@@ -3,6 +3,8 @@

33, rustPlatform

44, pkg-config

55, openssl

6+, Security

7+, installShellFiles

68}:

810rustPlatform.buildRustPackage rec {

@@ -16,11 +18,17 @@ rustPlatform.buildRustPackage rec {

1618 sha256 = "088ib0sncv0vrvnqfvxf5zc79v7pnxd2cmgp4378r6pmgax9z9zy";

1719 };

1820

19− nativeBuildInputs = [ pkg-config ];

20− buildInputs = [ openssl ];

21+ nativeBuildInputs = [ installShellFiles ]

22+ ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ];

23+ buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ]

24+ ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];

2125

2226 cargoSha256 = "08scc6vh703245rg3xkffhalrk5pisd0wg54fd49d7gdbyjivgi6";

2327

28+ postInstall = ''

29+ installShellCompletion completions/dog.{bash,fish,zsh}

30+ '';

31+

2432 meta = with stdenv.lib; {

2533 description = "Command-line DNS client";

2634 homepage = "https://dns.lookup.dog";

pkgs/top-level/all-packages.nix+14−13

@@ -1064,6 +1064,8 @@ in

10641064

10651065 cloud-custodian = python3Packages.callPackage ../tools/networking/cloud-custodian { };

10661066

1067+ coconut = with python3Packages; toPythonApplication coconut;

1068+

10671069 cod = callPackage ../tools/misc/cod { };

10681070

10691071 codespell = with python3Packages; toPythonApplication codespell;

@@ -2145,6 +2147,8 @@ in

21452147

21462148 gdrive = callPackage ../applications/networking/gdrive { };

21472149

2150+ go-chromecast = callPackage ../applications/video/go-chromecast { };

2151+

21482152 go-rice = callPackage ../tools/misc/go.rice {};

21492153

21502154 go-2fa = callPackage ../tools/security/2fa {};

@@ -3357,7 +3361,9 @@ in

33573361

33583362 dog = callPackage ../tools/system/dog { };

33593363

3360− dogdns = callPackage ../tools/networking/dogdns { };

3364+ dogdns = callPackage ../tools/networking/dogdns {

3365+ inherit (darwin.apple_sdk.frameworks) Security;

3366+ };

33613367

33623368 dosfstools = callPackage ../tools/filesystems/dosfstools { };

33633369

@@ -3794,6 +3800,8 @@ in

37943800

37953801 feedreader = callPackage ../applications/networking/feedreaders/feedreader {};

37963802

3803+ fend = callPackage ../tools/misc/fend { };

3804+

37973805 ferm = callPackage ../tools/networking/ferm { };

37983806

37993807 ffsend = callPackage ../tools/misc/ffsend { };

@@ -9627,7 +9635,7 @@ in

96279635 stdenv = gcc7Stdenv;

96289636 });

96299637

9630− llvmPackages_latest = llvmPackages_10;

9638+ llvmPackages_latest = llvmPackages_11;

96319639

96329640 llvmPackages_rocm = callPackage ../development/compilers/llvm/rocm { };

96339641

@@ -15293,7 +15301,7 @@ in

1529315301 kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 kinfocenter kmenuedit

1529415302 kscreen kscreenlocker ksshaskpass ksysguard kwallet-pam kwayland-integration

1529515303 kwin kwrited milou oxygen plasma-browser-integration plasma-desktop

15296− plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace

15304+ plasma-integration plasma-nm plasma-pa plasma-thunderbolt plasma-vault plasma-workspace

1529715305 plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm

1529815306 systemsettings user-manager xdg-desktop-portal-kde

1529915307 ;

@@ -18379,7 +18387,7 @@ in

1837918387 # Hardened Linux

1838018388 hardenedLinuxPackagesFor = kernel': overrides:

1838118389 let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates:

18382− linux_latest_for_hardened = pkgs.linux_5_8;

18390+ linux_latest_for_hardened = pkgs.linux_5_9;

1838318391 kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides;

1838418392 in linuxPackagesFor (kernel.override {

1838518393 structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {

@@ -22704,6 +22712,7 @@ in

2270422712 pdfsam-basic = callPackage ../applications/misc/pdfsam-basic { };

2270522713

2270622714 mupdf = callPackage ../applications/misc/mupdf { };

22715+ mupdf_1_17 = callPackage ../applications/misc/mupdf/1.17.nix { };

2270722716

2270822717 mystem = callPackage ../applications/misc/mystem { };

2270922718

@@ -24358,6 +24367,7 @@ in

2435824367 windowlab = callPackage ../applications/window-managers/windowlab { };

2435924368

2436024369 windowmaker = callPackage ../applications/window-managers/windowmaker { };

24370+ dockapps = callPackage ../applications/window-managers/windowmaker/dockapps { };

2436124371

2436224372 wily = callPackage ../applications/editors/wily { };

2436324373

@@ -24367,16 +24377,8 @@ in

2436724377

2436824378 write_stylus = libsForQt5.callPackage ../applications/graphics/write_stylus { };

2436924379

24370− alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { };

24371−

2437224380 wllvm = callPackage ../development/tools/wllvm { };

2437324381

24374− wmcalclock = callPackage ../applications/window-managers/windowmaker/dockapps/wmcalclock.nix { };

24375−

24376− wmsm.app = callPackage ../applications/window-managers/windowmaker/dockapps/wmsm.app.nix { };

24377−

24378− wmsystemtray = callPackage ../applications/window-managers/windowmaker/dockapps/wmsystemtray.nix { };

24379−

2438024382 wmname = callPackage ../applications/misc/wmname { };

2438124383

2438224384 wmctrl = callPackage ../tools/X11/wmctrl { };

@@ -24927,7 +24929,6 @@ in

2492724929

2492824930 exodus = callPackage ../applications/blockchains/exodus { };

2492924931

24930− freicoin = callPackage ../applications/blockchains/freicoin.nix { boost = boost155; };

2493124932 go-ethereum = callPackage ../applications/blockchains/go-ethereum.nix {

2493224933 inherit (darwin) libobjc;

2493324934 inherit (darwin.apple_sdk.frameworks) IOKit;

pkgs/top-level/python-packages.nix+8

@@ -1250,6 +1250,8 @@ in {

12501250

12511251 cnvkit = callPackage ../development/python-modules/cnvkit { };

12521252

1253+ coconut = callPackage ../development/python-modules/coconut { };

1254+

12531255 cocotb = callPackage ../development/python-modules/cocotb { };

12541256

12551257 codecov = callPackage ../development/python-modules/codecov { };

@@ -1351,6 +1353,8 @@ in {

13511353

13521354 cppy = callPackage ../development/python-modules/cppy { };

13531355

1356+ cpyparsing = callPackage ../development/python-modules/cpyparsing { };

1357+

13541358 cram = callPackage ../development/python-modules/cram { };

13551359

13561360 crashtest = callPackage ../development/python-modules/crashtest { };

@@ -2530,6 +2534,8 @@ in {

25302534

25312535 google-i18n-address = callPackage ../development/python-modules/google-i18n-address { };

25322536

2537+ googlemaps = callPackage ../development/python-modules/googlemaps { };

2538+

25332539 google-music = callPackage ../development/python-modules/google-music { };

25342540

25352541 google-music-proto = callPackage ../development/python-modules/google-music-proto { };

@@ -4245,6 +4251,8 @@ in {

42454251

42464252 openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { };

42474253

4254+ openrouteservice = callPackage ../development/python-modules/openrouteservice/default.nix { };

4255+

42484256 opentimestamps = callPackage ../development/python-modules/opentimestamps { };

42494257

42504258 opentracing = callPackage ../development/python-modules/opentracing { };