Merge branch 'staging-next' into staging
commit55a72926e1dee9cdb12036143899d7dfd5acb0b7
authorJan Tojnar <jtojnar@gmail.com>
dateSat 30 Nov 2019, 19:45 (7 years ago)
parentec7f139a69ad18
maintainers/maintainer-list.nix+12
@@ -4162,6 +4162,12 @@
41624162 github = "marcweber";
41634163 githubId = 34086;
41644164 name = "Marc Weber";
4165+ };
4166+ marcus7070 = {
4167+ email = "marcus@geosol.com.au";
4168+ github = "marcus7070";
4169+ githubId = 50230945;
4170+ name = "Marcus Boyd";
41654171 };
41664172 marenz = {
41674173 email = "marenz@arkom.men";
@@ -7658,4 +7664,10 @@
76587664 githubId = 50867187;
76597665 name = "Rakesh Gupta";
76607666 };
7667+ waiting-for-dev = {
7668+ email = "marc@lamarciana.com";
7669+ github = "waiting-for-dev";
7670+ githubId = 52650;
7671+ name = "Marc Busqué";
7672+ };
76617673}
nixos/modules/system/activation/switch-to-configuration.pl+1−11
@@ -214,17 +214,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
214214 # Reload the changed mount unit to force a remount.
215215 $unitsToReload{$unit} = 1;
216216 recordUnit($reloadListFile, $unit);
217− } elsif ($unit =~ /\.socket$/) {
218− my $unitInfo = parseUnit($newUnitFile);
219− # If a socket unit has been changed, the corresponding
220− # service unit has to be stopped before the socket can
221− # be restarted. The service will be started again on demand.
222− my $serviceUnit = $unitInfo->{'Unit'} // "$baseName.service";
223− $unitsToStop{$serviceUnit} = 1;
224− $unitsToStop{$unit} = 1;
225− $unitsToStart{$unit} = 1;
226− recordUnit($startListFile, $unit);
227− } elsif ($unit =~ /\.path$/ || $unit =~ /\.slice$/) {
217+ } elsif ($unit =~ /\.socket$/ || $unit =~ /\.path$/ || $unit =~ /\.slice$/) {
228218 # FIXME: do something?
229219 } else {
230220 my $unitInfo = parseUnit($newUnitFile);
pkgs/applications/audio/helm/default.nix+2−2
@@ -1,5 +1,5 @@
1− { stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2
2− , lv2, pkgconfig, libGLU, libGL }:
1+{ stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2
2+, lv2, pkgconfig, libGLU, libGL }:
33
44 stdenv.mkDerivation {
55 version = "0.9.0";
pkgs/applications/audio/reaper/default.nix+2−2
@@ -6,11 +6,11 @@
66
77stdenv.mkDerivation rec {
88 pname = "reaper";
9− version = "5.984";
9+ version = "5.987";
1010
1111 src = fetchurl {
1212 url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz";
13− sha256 = "01yy0s9b9mkl6v66vgdfxl2zhr36abridih1d4ajbrdn60vppykw";
13+ sha256 = "040k5inzj7mmi75fc6hr0ym18y5xss1675bl5rmhn4sq535m289k";
1414 };
1515
1616 nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
pkgs/applications/editors/rednotebook/default.nix+3−3
@@ -5,13 +5,13 @@
55
66buildPythonApplication rec {
77 pname = "rednotebook";
8− version = "2.11.1";
8+ version = "2.14";
99
1010 src = fetchFromGitHub {
1111 owner = "jendrikseipp";
1212 repo = "rednotebook";
1313 rev = "v${version}";
14− sha256 = "04c7a0wgmdl88v9386y1052c38ajbkryiwhqps5lx34d4g7r6hm1";
14+ sha256 = "1xs2wvm9g8vypz25li7rm8m0j4dsdpqpajcvrc756x5m149dxc08";
1515 };
1616
1717 # We have not packaged tests.
@@ -35,7 +35,7 @@ buildPythonApplication rec {
3535 strictDeps = false;
3636
3737 meta = with lib; {
38− homepage = http://rednotebook.sourceforge.net/;
38+ homepage = "https://rednotebook.sourceforge.io/";
3939 description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds";
4040 license = licenses.gpl2;
4141 maintainers = with maintainers; [ orivej tstrobel ];
pkgs/applications/graphics/cq-editor/default.nixnew file+57
@@ -0,0 +1,57 @@
1+{ lib
2+, mkDerivationWith
3+, python3Packages
4+, fetchFromGitHub
5+}:
6+
7+mkDerivationWith python3Packages.buildPythonApplication rec {
8+ pname = "cq-editor";
9+ version = "0.1RC1";
10+
11+ src = fetchFromGitHub {
12+ owner = "CadQuery";
13+ repo = "CQ-editor";
14+ rev = version;
15+ sha256 = "0iwcpnj15s64k16948sakvkn1lb4mqwrhmbxk3r03bczs0z33zax";
16+ };
17+
18+ propagatedBuildInputs = with python3Packages; [
19+ cadquery
20+ Logbook
21+ pyqt5
22+ pyparsing
23+ pyqtgraph
24+ spyder
25+ pathpy
26+ qtconsole
27+ requests
28+ ];
29+
30+ postFixup = ''
31+ wrapQtApp "$out/bin/cq-editor"
32+ '';
33+
34+ checkInputs = with python3Packages; [
35+ pytest
36+ pytest-xvfb
37+ pytest-mock
38+ pytestcov
39+ pytest-repeat
40+ pytest-qt
41+ ];
42+
43+ checkPhase = ''
44+ pytest --no-xvfb
45+ '';
46+
47+ # requires X server
48+ doCheck = false;
49+
50+ meta = with lib; {
51+ description = "CadQuery GUI editor based on PyQT";
52+ homepage = "https://github.com/CadQuery/CQ-editor";
53+ license = licenses.asl20;
54+ maintainers = with maintainers; [ costrouc marcus7070 ];
55+ };
56+
57+}
pkgs/applications/misc/qtpass/default.nix+6−1
@@ -1,5 +1,5 @@
11{ lib, mkDerivation, fetchFromGitHub
2−, git, gnupg, pass, pwgen
2+, git, gnupg, pass, pwgen, qrencode
33, qtbase, qtsvg, qttools, qmake
44}:
55
@@ -14,6 +14,11 @@ mkDerivation rec {
1414 sha256 = "0748hjvhjrybi33ci3c8hcr74k9pdrf5jv8npf9hrsrmdyy1kr9x";
1515 };
1616
17+ postPatch = ''
18+ substituteInPlace src/qtpass.cpp \
19+ --replace "/usr/bin/qrencode" "${qrencode}/bin/qrencode"
20+ '';
21+
1722 buildInputs = [ git gnupg pass qtbase qtsvg ];
1823
1924 nativeBuildInputs = [ qmake qttools ];
pkgs/applications/misc/xchm/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "xchm";
5− version = "1.30";
5+ version = "1.31";
66
77 src = fetchFromGitHub {
88 owner = "rzvncj";
99 repo = "xCHM";
1010 rev = version;
11− sha256 = "1sjvh06m8jbb28k6y3knas3nkh1dfvff4mlwjs33x12ilhddhr8v";
11+ sha256 = "1mzafbpc1c211byf8bnwl13by7vi8xvxlaykyrajb1bj0ynbmmgp";
1212 };
1313
1414 nativeBuildInputs = [ autoreconfHook ];
pkgs/applications/misc/xmrig/default.nix+2−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 pname = "xmrig";
7− version = "5.0.0";
7+ version = "5.0.1";
88
99 src = fetchFromGitHub {
1010 owner = "xmrig";
1111 repo = "xmrig";
1212 rev = "v${version}";
13− sha256 = "17bgz1rpix1zgzzn4zz84jp7hl6b2k968h918y3av5asxn0mji49";
13+ sha256 = "0w6vbrp44l25jhv3kx1m0841rkv7im30581gds0qb7lhyqm0hnbg";
1414 };
1515
1616 nativeBuildInputs = [ cmake ];
pkgs/applications/networking/browsers/opera/default.nix+2−2
@@ -47,11 +47,11 @@ let
4747in stdenv.mkDerivation rec {
4848
4949 pname = "opera";
50− version = "64.0.3417.83";
50+ version = "65.0.3467.48";
5151
5252 src = fetchurl {
5353 url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
54− sha256 = "09ygnfma5ncx6y8yr6dm3hz98cd9srv6687wgs786dw5glfhsd57";
54+ sha256 = "0vcpq2p8si6rlyvd8nzs0a7pjxks2qn8i8czna968wyfxlczckyr";
5555 };
5656
5757 unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
pkgs/applications/networking/instant-messengers/rambox/pro.nix+2−2
@@ -2,7 +2,7 @@
22
33stdenv.mkDerivation rec {
44 pname = "rambox-pro";
5− version = "1.1.7";
5+ version = "1.2.0";
66
77 dontBuild = true;
88 dontStrip = true;
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212
1313 src = fetchurl {
1414 url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz";
15− sha256 = "1d84hlac3qwrbi8khp6r3bm5y25zcz52l6z54k7jmyplay46r5as";
15+ sha256 = "189rpsrs25c4100xf1zhcwvdyigbzsw8ffhayj8mmrx4akg39653";
1616 };
1717
1818 installPhase = ''
pkgs/applications/networking/instant-messengers/signal-cli/default.nix+2−2
@@ -2,12 +2,12 @@
22
33stdenv.mkDerivation rec {
44 pname = "signal-cli";
5− version = "0.6.3";
5+ version = "0.6.5";
66
77 # Building from source would be preferred, but is much more involved.
88 src = fetchurl {
99 url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
10− sha256 = "1gvdifscyxmxn2dwlkqi684ahy5kbcj84mqda0m8l4aa8iaq1d59";
10+ sha256 = "082kq8kadxbwzf31fmlq4in714id2irk0hhqsl53vsl3wmv45zvv";
1111 };
1212
1313 buildInputs = lib.optional stdenv.isLinux [ libmatthew_java dbus dbus_java ];
pkgs/applications/radio/urh/default.nix+2−2
@@ -5,13 +5,13 @@
55
66python3Packages.buildPythonApplication rec {
77 pname = "urh";
8− version = "2.8.0";
8+ version = "2.8.1";
99
1010 src = fetchFromGitHub {
1111 owner = "jopohl";
1212 repo = pname;
1313 rev = "v${version}";
14− sha256 = "1c87lff9bqhf574420ycqz88x6ad5hmy36wrb8pi0dqd1s1d72qb";
14+ sha256 = "0vwc1jw1fjirdpavrnvc95bql8023ayrz9srbwn0p6n0ia038948";
1515 };
1616
1717 nativeBuildInputs = [ qt5.wrapQtAppsHook ];
pkgs/applications/science/biology/picard-tools/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "picard-tools";
5− version = "2.21.1";
5+ version = "2.21.3";
66
77 src = fetchurl {
88 url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
9− sha256 = "0knfx0by7rml19kr5ynb7860iykij1z1mx2hx0bg3s287sld1ppl";
9+ sha256 = "0s1gn2bkya41866kd8zj0g8xjbivs763jqmlzdpjz4c25h6xkhns";
1010 };
1111
1212 nativeBuildInputs = [ makeWrapper ];
pkgs/applications/version-management/git-and-tools/subgit/default.nix+2−2
@@ -1,7 +1,7 @@
11{ stdenv, fetchurl, unzip, makeWrapper, jre }:
22
33stdenv.mkDerivation rec {
4− name = "subgit-3.3.8";
4+ name = "subgit-3.3.9";
55
66 meta = {
77 description = "A tool for a smooth, stress-free SVN to Git migration";
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
2121
2222 src = fetchurl {
2323 url = "http://subgit.com/download/${name}.zip";
24− sha256 = "0gvyyr4prx1v06f9j9fmmr8br1gjd45bnncl40c9agiqsyy0q06n";
24+ sha256 = "0dwd2kymmprci3b61ayr6axzlkc8zgbc40jqxvvyzschfxw9y0v5";
2525 };
2626}
pkgs/applications/version-management/sourcehut/lists.nix+2−1
@@ -1,6 +1,6 @@
11{ stdenv, fetchgit, buildPythonPackage
22, python
3−, srht, asyncpg, unidiff, aiosmtpd, emailthreads }:
3+, srht, asyncpg, unidiff, aiosmtpd, pygit2, emailthreads }:
44
55buildPythonPackage rec {
66 pname = "listssrht";
@@ -20,6 +20,7 @@ buildPythonPackage rec {
2020
2121 propagatedBuildInputs = [
2222 srht
23+ pygit2
2324 asyncpg
2425 unidiff
2526 aiosmtpd
pkgs/applications/video/mkvtoolnix/default.nix+2−2
@@ -13,13 +13,13 @@ with stdenv.lib;
1313
1414stdenv.mkDerivation rec {
1515 pname = "mkvtoolnix";
16− version = "38.0.0";
16+ version = "40.0.0";
1717
1818 src = fetchFromGitLab {
1919 owner = "mbunkus";
2020 repo = "mkvtoolnix";
2121 rev = "release-${version}";
22− sha256 = "0874rfslglywpa8ilhqv59zvn2hisdsbwd7r61psf5rd64v72ym4";
22+ sha256 = "103rvj6f6nlzybzbkqix7q5f2017bmzsn9z5g7bwnjjwgih5mrpq";
2323 };
2424
2525 nativeBuildInputs = [
pkgs/applications/video/streamlink/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }:
22
33pythonPackages.buildPythonApplication rec {
4− version = "1.2.0";
4+ version = "1.3.0";
55 pname = "streamlink";
66
77 src = fetchFromGitHub {
88 owner = "streamlink";
99 repo = "streamlink";
1010 rev = version;
11− sha256 = "0l8b9ipfmd6dic07ajqqml26jdydz0k046hvx32mqp64jl5jpznh";
11+ sha256 = "0f4qwwa5pxd4igvxq1qadqpphazlbs3c3cr29ybks2x5wajrvwah";
1212 };
1313
1414 checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ];
pkgs/data/documentation/man-pages/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "man-pages";
5− version = "5.03";
5+ version = "5.04";
66
77 src = fetchurl {
88 url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
9− sha256 = "082i9258rl9xxjgpxpz3v8jcwk96dsk704ki9h9lq7q8z7m3mqbz";
9+ sha256 = "1bx4ws24bjq6iyfyilg7aih5f0qrhy9l97ksrwcd4yxvjh8gn13x";
1010 };
1111
1212 makeFlags = [ "MANDIR=$(out)/share/man" ];
pkgs/data/fonts/cascadia-code/default.nix+2−2
@@ -2,7 +2,7 @@
22
33let
44 pname = "cascadia-code";
5− version = "1910.04";
5+ version = "1911.20";
66in
77fetchurl {
88 name = "${pname}-${version}";
@@ -15,7 +15,7 @@ fetchurl {
1515 install -Dm444 $downloadedFile $out/share/fonts/truetype/Cascadia.ttf
1616 '';
1717
18− sha256 = "124zbv7xwirwwxrm988h3plwd2vynqxyx7p2gijqrnw69q9pf67q";
18+ sha256 = "1dfd3g7cf2h0z2gxvk4pxy46xswd3wyqz3p8ypxcv2dkz4ri6l0j";
1919
2020 meta = with lib; {
2121 description = "Monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal";
pkgs/data/themes/plata/default.nix+2−2
@@ -19,13 +19,13 @@
1919
2020stdenv.mkDerivation rec {
2121 pname = "plata-theme";
22− version = "0.9.0";
22+ version = "0.9.1";
2323
2424 src = fetchFromGitLab {
2525 owner = "tista500";
2626 repo = "plata-theme";
2727 rev = version;
28− sha256 = "1bcjrnh6bm7pxyqrr39yx5zykf3yzxrsydd5xcawjfihnph3yrlg";
28+ sha256 = "0rva56xdvsj6vwwvrn55137mw83c9p4xy00i3mq0ryh43imyj4mg";
2929 };
3030
3131 preferLocalBuild = true;
pkgs/desktops/gnome-3/core/rygel/default.nix+2−2
@@ -28,14 +28,14 @@
2828
2929stdenv.mkDerivation rec {
3030 pname = "rygel";
31− version = "0.38.1";
31+ version = "0.38.3";
3232
3333 # TODO: split out lib
3434 outputs = [ "out" "dev" ];
3535
3636 src = fetchurl {
3737 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
38− sha256 = "1w8bi2rw91qyfny1zxhy32k4qn62hdjl2m38f75cp7wv6494d7w0";
38+ sha256 = "003xficqb08r1dgid20i7cn889lbfwrglpx78rjd5nkvgxbimhh8";
3939 };
4040
4141 nativeBuildInputs = [
pkgs/desktops/gnome-3/core/yelp-xsl/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111stdenv.mkDerivation rec {
1212 pname = "yelp-xsl";
13− version = "3.34.0";
13+ version = "3.34.2";
1414
1515 src = fetchurl {
1616 url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
17− sha256 = "1qjfw4s8yf4hmyqrcqy6q2rsnb8b2cl1qbq67m7n7pyiczp3l1p8";
17+ sha256 = "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc";
1818 };
1919
2020 nativeBuildInputs = [
pkgs/development/compilers/nim/default.nix+2−2
@@ -5,11 +5,11 @@
55
66stdenv.mkDerivation rec {
77 pname = "nim";
8− version = "1.0.2";
8+ version = "1.0.4";
99
1010 src = fetchurl {
1111 url = "https://nim-lang.org/download/${pname}-${version}.tar.xz";
12− sha256 = "1rjinrs119c8i6wzz5fzjfml7n7kbd5hb9642g4rr8qxkq4sx83k";
12+ sha256 = "1q5fx9g40bk4ajghi856w5l34fmrl7avq5j6p0dr2xa4l52ib149";
1313 };
1414
1515 enableParallelBuilding = true;
pkgs/development/compilers/ocaml/generic.nix+13−6
@@ -12,16 +12,18 @@ in
1212
1313{ stdenv, fetchurl, ncurses, buildEnv
1414, libX11, xorgproto, useX11 ? safeX11 stdenv
15+, aflSupport ? false
1516, flambdaSupport ? false
1617}:
1718
1819assert useX11 -> !stdenv.isAarch32 && !stdenv.isMips;
20+assert aflSupport -> stdenv.lib.versionAtLeast version "4.05";
1921assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03";
2022
2123let
2224 useNativeCompilers = !stdenv.isMips;
2325 inherit (stdenv.lib) optional optionals optionalString;
24− name = "ocaml${optionalString flambdaSupport "+flambda"}-${version}";
26+ name = "ocaml${optionalString aflSupport "+afl"}${optionalString flambdaSupport "+flambda"}-${version}";
2527in
2628
2729let
@@ -41,11 +43,16 @@ stdenv.mkDerivation (args // {
4143 };
4244
4345 prefixKey = "-prefix ";
44− configureFlags = optionals useX11 (
45− if stdenv.lib.versionAtLeast version "4.08"
46− then [ "--x-libraries=${x11lib}" "--x-includes=${x11inc}"]
47− else [ "-x11lib" x11lib "-x11include" x11inc ])
48− ++ optional flambdaSupport "-flambda"
46+ configureFlags =
47+ let flags = new: old:
48+ if stdenv.lib.versionAtLeast version "4.08"
49+ then new else old
50+ ; in
51+ optionals useX11 (flags
52+ [ "--x-libraries=${x11lib}" "--x-includes=${x11inc}"]
53+ [ "-x11lib" x11lib "-x11include" x11inc ])
54+ ++ optional aflSupport (flags "--with-afl" "-afl-instrument")
55+ ++ optional flambdaSupport (flags "--enable-flambda" "-flambda")
4956 ;
5057
5158 buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
pkgs/development/compilers/x11basic/default.nix+2−2
@@ -5,13 +5,13 @@
55
66stdenv.mkDerivation rec {
77 pname = "X11basic";
8− version = "1.26";
8+ version = "1.27";
99
1010 src = fetchFromGitHub {
1111 owner = "kollokollo";
1212 repo = pname;
1313 rev = version;
14− sha256 = "0rwj9cf496xailply0rgw695bzdladh2dhy7vdqac1pwbkl53nvd";
14+ sha256 = "1hpxzdqnjl1fiwgs2vrjg4kxm29c7pqwk3g1m4p5pm4x33a3d1q2";
1515 };
1616
1717 buildInputs = [
pkgs/development/libraries/gaia/default.nix+4−2
@@ -3,6 +3,7 @@
33, fetchFromGitHub
44, libyaml
55, swig
6+, eigen
67, pkgconfig
78, wafHook
89, makeWrapper
@@ -19,13 +20,13 @@ assert pythonSupport -> pythonPackages != null;
1920
2021stdenv.mkDerivation rec {
2122 pname = "gaia";
22− version = "2.4.5";
23+ version = "2.4.6";
2324
2425 src = fetchFromGitHub {
2526 owner = "MTG";
2627 repo = "gaia";
2728 rev = "v${version}";
28− sha256 = "12jxb354s2dblr2ghnl3w05m23jgzvrrgywfj8jaa32j3gw48fv2";
29+ sha256 = "03vmdq7ca4f7zp2f4sxyqa8sdpdma3mn9fz4z7d93qryl0bhi7z3";
2930 };
3031
3132 # Fix installation error when waf tries to put files in /etc/
@@ -50,6 +51,7 @@ stdenv.mkDerivation rec {
5051
5152 buildInputs = [
5253 libyaml
54+ eigen
5355 qt4
5456 ];
5557
pkgs/development/libraries/libappindicator/default.nix+3−16
@@ -1,7 +1,7 @@
11# TODO: Resolve the issues with the Mono bindings.
22
3−{ stdenv, fetchurl, fetchpatch, lib, file
4−, pkgconfig, autoconf
3+{ stdenv, fetchurl, fetchpatch, lib
4+, pkgconfig, autoreconfHook
55, glib, dbus-glib, gtkVersion ? "3"
66, gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null
77, gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 sha256 = "17xlqd60v0zllrxp8bgq3k5a1jkj0svkqn8rzllcyjh8k0gpr46m";
2525 };
2626
27− nativeBuildInputs = [ pkgconfig autoconf vala gobject-introspection ];
27+ nativeBuildInputs = [ pkgconfig autoreconfHook vala gobject-introspection ];
2828
2929 propagatedBuildInputs =
3030 if gtkVersion == "2"
@@ -46,14 +46,6 @@ stdenv.mkDerivation rec {
4646 })
4747 ];
4848
49− postPatch = ''
50− autoconf
51− for f in {configure,ltmain.sh,m4/libtool.m4}; do
52− substituteInPlace $f \
53− --replace /usr/bin/file ${file}/bin/file
54− done
55− '';
56−
5749 configureFlags = [
5850 "CFLAGS=-Wno-error"
5951 "--sysconfdir=/etc"
@@ -61,11 +53,6 @@ stdenv.mkDerivation rec {
6153 "--with-gtk=${gtkVersion}"
6254 ];
6355
64− postConfigure = ''
65− substituteInPlace configure \
66− --replace /usr/bin/file ${file}/bin/file
67− '';
68−
6956 doCheck = false; # generates shebangs in check phase, too lazy to fix
7057
7158 installFlags = [
pkgs/development/libraries/libdigidocpp/default.nix+2−2
@@ -2,12 +2,12 @@
22, xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }:
33
44stdenv.mkDerivation rec {
5− version = "3.14.0";
5+ version = "3.14.1";
66 pname = "libdigidocpp";
77
88 src = fetchurl {
99 url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz";
10− sha256 = "0klbr881d56661d1lqlv4ivxhxcv2q16ivlz7r0rb901wilq5jyl";
10+ sha256 = "0yrcfw5i1jddz7x3j9zzlcwjlzdbi10wns7kbblbp03nx7vk2vqy";
1111 };
1212
1313 nativeBuildInputs = [ cmake pkgconfig xxd ];
pkgs/development/libraries/libisoburn/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "libisoburn";
5− version = "1.5.0";
5+ version = "1.5.2";
66
77 src = fetchurl {
88 url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
9− sha256 = "1r8xbhw21bmcp3jhfmvadivh0fa7f4k6larv8lvg4ka0kiigbhfs";
9+ sha256 = "1v4hanapr02wf2i6rncc62z8cyc18078nb2y6q4hp3hxa74hnwnc";
1010 };
1111
1212 buildInputs = [ attr zlib libburn libisofs ];
pkgs/development/libraries/nanoflann/default.nix+8−4
@@ -1,24 +1,28 @@
11{stdenv, fetchFromGitHub, cmake}:
22
33stdenv.mkDerivation rec {
4− version = "1.3.0";
4+ version = "1.3.1";
55 pname = "nanoflann";
66
77 src = fetchFromGitHub {
88 owner = "jlblancoc";
99 repo = "nanoflann";
1010 rev = "v${version}";
11− sha256 = "1bwdmrz1qygp9qy2nzrp1axa1i4nvm0ljkn6mnhlcvbfsyvhzigv";
11+ sha256 = "07vi3yn5y9zk9acdbxy954ghdml15wnyqfizzqwsw8zmc9bf30ih";
1212 };
1313
1414 buildInputs = [ cmake ];
1515
16+ cmakeFlags = [
17+ "-DBUILD_EXAMPLES=OFF"
18+ ];
19+
1620 doCheck = true;
1721 checkTarget = "test";
1822
1923 meta = {
20− homepage = https://github.com/jlblancoc/nanoflann;
21− license = stdenv.lib.licenses.bsd3;
24+ homepage = "https://github.com/jlblancoc/nanoflann";
25+ license = stdenv.lib.licenses.bsd2;
2226 description = "Header only C++ library for approximate nearest neighbor search";
2327 platforms = stdenv.lib.platforms.unix;
2428 };
pkgs/development/libraries/prometheus-cpp/default.nix+2−2
@@ -10,13 +10,13 @@
1010
1111stdenv.mkDerivation rec {
1212 pname = "prometheus-cpp";
13− version = "0.7.0";
13+ version = "0.8.0";
1414
1515 src = fetchFromGitHub {
1616 owner = "jupp0r";
1717 repo = pname;
1818 rev = "v${version}";
19− sha256 = "15bda1q1jbvixbx1qf41ykcdmsywhhwmi4xgsha12r5m9fh8jzxj";
19+ sha256 = "0j12ir8skw3y2q8n743zql4ddp7v1j4h030pjcsqn0xqrqw7m5hg";
2020 };
2121
2222 nativeBuildInputs = [ cmake ];
pkgs/development/libraries/simpleitk/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "simpleitk";
5− version = "1.2.3";
5+ version = "1.2.4";
66
77 src = fetchFromGitHub {
88 owner = "SimpleITK";
99 repo = "SimpleITK";
1010 rev = "v${version}";
11− sha256 = "0nmsq0qx4jmrrhrc6bfm11wwvyszvfgl45xizw69yra3cv9pgmm6";
11+ sha256 = "0dvf2407z9n6lczm0l5vzcvpw6r6z1wzrs2gk3dqjrgynq6952qr";
1212 };
1313
1414 nativeBuildInputs = [ cmake git swig ];
pkgs/development/libraries/smarty3/default.nix+2−2
@@ -1,12 +1,12 @@
11{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
22 pname = "smarty3";
3− version = "3.1.33";
3+ version = "3.1.34";
44
55 src = fetchFromGitHub {
66 owner = "smarty-php";
77 repo = "smarty";
88 rev = "v${version}";
9− sha256 = "12kll8nv4b90nlx3y0213lsncqw2ydshjx4g6dv7jah6j1pv29ix";
9+ sha256 = "0a44p71aqyifm7qkp892aczb0bn6a9fv4657dsscxszvdm25a92x";
1010 };
1111
1212 installPhase = ''
pkgs/development/libraries/xapian/default.nix+1−1
@@ -37,5 +37,5 @@ let
3737 };
3838 };
3939in {
40− xapian_1_4 = generic "1.4.13" "0z0k8902bz2ckdggikj5yz11ik2n8krmdwzvpqv60phcm3zzzy4k";
40+ xapian_1_4 = generic "1.4.14" "0ja95vn0lkf6qkjhg2blkx306i10hg4fr8wlrhalmly93307lnlp";
4141}
pkgs/development/python-modules/bitarray/default.nix+2−2
@@ -1,12 +1,12 @@
11{ lib, buildPythonPackage, fetchPypi }:
22
33buildPythonPackage rec {
4− version = "1.0.1";
4+ version = "1.1.0";
55 pname = "bitarray";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "3eb500f8b9cde19e14472fcbee0195dbf0fbac006f8406a03f0cfb495dff20a0";
9+ sha256 = "0nv1283qcfilhnb4q6znlijply6lfxwpvp10cr0v33l0qwa86mwz";
1010 };
1111
1212 meta = with lib; {
pkgs/development/python-modules/cadquery/default.nixnew file+93
@@ -0,0 +1,93 @@
1+{ lib
2+ , buildPythonPackage
3+ , isPy3k
4+ , pythonOlder
5+ , fetchFromGitHub
6+ , pyparsing
7+ , opencascade
8+ , stdenv
9+ , python
10+ , cmake
11+ , swig
12+ , ninja
13+ , smesh
14+ , freetype
15+ , libGL
16+ , libGLU
17+ , libX11
18+ , six
19+}:
20+
21+let
22+ pythonocc-core-cadquery = stdenv.mkDerivation {
23+ pname = "pythonocc-core-cadquery";
24+ version = "0.18.2";
25+
26+ src = fetchFromGitHub {
27+ owner = "CadQuery";
28+ repo = "pythonocc-core";
29+ # no proper release to to use, this commit copied from the Anaconda receipe
30+ rev = "701e924ae40701cbe6f9992bcbdc2ef22aa9b5ab";
31+ sha256 = "07zmiiw74dyj4v0ar5vqkvk30wzcpjjzbi04nsdk5mnlzslmyi6c";
32+ };
33+
34+ nativeBuildInputs = [
35+ cmake
36+ swig
37+ ninja
38+ ];
39+
40+ buildInputs = [
41+ python
42+ opencascade
43+ smesh
44+ freetype
45+ libGL
46+ libGLU
47+ libX11
48+ ];
49+
50+ propagatedBuildInputs = [
51+ six
52+ ];
53+
54+ cmakeFlags = [
55+ "-Wno-dev"
56+ "-DPYTHONOCC_INSTALL_DIRECTORY=${placeholder "out"}/${python.sitePackages}/OCC"
57+ "-DSMESH_INCLUDE_PATH=${smesh}/include/smesh"
58+ "-DSMESH_LIB_PATH=${smesh}/lib"
59+ "-DPYTHONOCC_WRAP_SMESH=TRUE"
60+ ];
61+ };
62+
63+in
64+ buildPythonPackage rec {
65+ pname = "cadquery";
66+ version = "2.0RC0";
67+
68+ src = fetchFromGitHub {
69+ owner = "CadQuery";
70+ repo = pname;
71+ rev = version;
72+ sha256 = "1xgd00rih0gjcnlrf9s6r5a7ypjkzgf2xij2b6436i76h89wmir3";
73+ };
74+
75+ buildInputs = [
76+ opencascade
77+ ];
78+
79+ propagatedBuildInputs = [
80+ pyparsing
81+ pythonocc-core-cadquery
82+ ];
83+
84+ # Build errors on 2.7 and >=3.8 (officially only supports 3.6 and 3.7).
85+ disabled = !(isPy3k && (pythonOlder "3.8"));
86+
87+ meta = with lib; {
88+ description = "Parametric scripting language for creating and traversing CAD models";
89+ homepage = "https://github.com/CadQuery/cadquery";
90+ license = licenses.asl20;
91+ maintainers = with maintainers; [ costrouc marcus7070 ];
92+ };
93+ }
pkgs/development/python-modules/pyscreenshot/default.nixnew file+29
@@ -0,0 +1,29 @@
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, EasyProcess
5+}:
6+
7+buildPythonPackage rec {
8+ pname = "pyscreenshot";
9+ version = "0.5.1";
10+
11+ src = fetchPypi {
12+ inherit pname version;
13+ sha256 = "19ec6d17a61c0cd4e7fcf3ab2685598a54b53dc781755393cc5f76dcb7bf359c";
14+ };
15+
16+ propagatedBuildInputs = [
17+ EasyProcess
18+ ];
19+
20+ # recursive dependency on pyvirtualdisplay
21+ doCheck = false;
22+
23+ meta = with lib; {
24+ description = "python screenshot";
25+ homepage = "https://github.com/ponty/pyscreenshot";
26+ license = licenses.bsd3;
27+ maintainers = with maintainers; [ costrouc ];
28+ };
29+}
pkgs/development/python-modules/pytest-qt/default.nixnew file+39
@@ -0,0 +1,39 @@
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, setuptools_scm
5+, pytest
6+, pyqt5
7+}:
8+
9+buildPythonPackage rec {
10+ pname = "pytest-qt";
11+ version = "3.2.2";
12+
13+ src = fetchPypi {
14+ inherit pname version;
15+ sha256 = "f6ecf4b38088ae1092cbd5beeaf714516d1f81f8938626a2eac546206cdfe7fa";
16+ };
17+
18+ nativeBuildInputs = [
19+ setuptools_scm
20+ ];
21+
22+ propagatedBuildInputs = [
23+ pytest
24+ ];
25+
26+ checkInputs = [
27+ pyqt5
28+ ];
29+
30+ # tests require X server
31+ doCheck = false;
32+
33+ meta = with lib; {
34+ description = "pytest support for PyQt and PySide applications";
35+ homepage = "https://github.com/pytest-dev/pytest-qt";
36+ license = licenses.mit;
37+ maintainers = with maintainers; [ costrouc ];
38+ };
39+}
pkgs/development/python-modules/pytest-repeat/default.nix+12−16
@@ -8,33 +8,29 @@
88
99buildPythonPackage rec {
1010 pname = "pytest-repeat";
11− version = "0.7.0";
11+ version = "0.8.0";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "0axbrpqal3cqw9zq6dakdbg49pnf5gvyvq6yn93hp1ayc7fnhzk3";
15+ sha256 = "1nbdmklpi0ra1jnfm032wz96y9nxdlcr4m9sjlnffwm7n4x43g2j";
1616 };
1717
18− # fixes support for pytest >3.6. Should be droppable during the
19− # next bump.
20− patches = [
21− (fetchpatch {
22− url = https://github.com/pytest-dev/pytest-repeat/commit/f94b6940e3651b7593aca5a7a987eb56abe04cb1.patch;
23− sha256 = "00da1gmpq9pslcmm8pw93jcbp8j2zymzqdsm6jq3xinkvjpsbmny";
24− })
18+ nativeBuildInputs = [
19+ setuptools_scm
2520 ];
2621
27− buildInputs = [ setuptools_scm ];
28− checkInputs = [ pytest ];
22+ checkInputs = [
23+ pytest
24+ ];
2925
3026 checkPhase = ''
31− py.test
27+ pytest
3228 '';
3329
34− meta = {
30+ meta = with lib; {
3531 description = "Pytest plugin for repeating tests";
36− homepage = https://github.com/pytest-dev/pytest-repeat;
37− maintainers = with lib.maintainers; [ costrouc ];
38− license = lib.licenses.mpl20;
32+ homepage = "https://github.com/pytest-dev/pytest-repeat";
33+ license = licenses.mpl20;
34+ maintainers = with maintainers; [ costrouc ];
3935 };
4036}
pkgs/development/python-modules/pytest-xvfb/default.nixnew file+28
@@ -0,0 +1,28 @@
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, pytest
5+, virtual-display
6+}:
7+
8+buildPythonPackage rec {
9+ pname = "pytest-xvfb";
10+ version = "1.2.0";
11+
12+ src = fetchPypi {
13+ inherit pname version;
14+ sha256 = "a7544ca8d0c7c40db4b40d7a417a7b071c68d6ef6bdf9700872d7a167302f979";
15+ };
16+
17+ propagatedBuildInputs = [
18+ pytest
19+ virtual-display
20+ ];
21+
22+ meta = with lib; {
23+ description = "A pytest plugin to run Xvfb for tests";
24+ homepage = "https://github.com/The-Compiler/pytest-xvfb";
25+ license = licenses.mit;
26+ maintainers = with maintainers; [ costrouc ];
27+ };
28+}
pkgs/development/python-modules/tinydb/default.nixnew file+39
@@ -0,0 +1,39 @@
1+{ lib
2+, buildPythonPackage
3+, fetchFromGitHub
4+, pytest
5+, pytestcov
6+, pytestrunner
7+, pycodestyle
8+, pyyaml
9+}:
10+
11+buildPythonPackage rec {
12+ pname = "tinydb";
13+ version = "v3.14.1";
14+
15+ src = fetchFromGitHub {
16+ owner = "msiemens";
17+ repo = pname;
18+ rev = version;
19+ sha256 = "02idbvrm8j4mwsjfkzy11f4png19k307p53s4qa2ifzssysxpb96";
20+ };
21+
22+ nativeBuildInputs = [
23+ pytestrunner
24+ ];
25+
26+ checkInputs = [
27+ pytest
28+ pytestcov
29+ pycodestyle
30+ pyyaml
31+ ];
32+
33+ meta = with lib; {
34+ description = "A lightweight document oriented database written in pure Python with no external dependencies";
35+ homepage = "https://github.com/msiemens/tinydb";
36+ license = licenses.asl20;
37+ maintainers = with maintainers; [ marcus7070 ];
38+ };
39+}
pkgs/development/tools/build-managers/qbs/default.nix+2−2
@@ -3,13 +3,13 @@
33stdenv.mkDerivation rec {
44 pname = "qbs";
55
6− version = "1.14.0";
6+ version = "1.14.1";
77
88 src = fetchFromGitHub {
99 owner = "qbs";
1010 repo = "qbs";
1111 rev = "v${version}";
12− sha256 = "19adxjyp5bf5hrjisv3ff9ndcmh1glrxfrzifs46xjn3r69kyv1k";
12+ sha256 = "0rqfnclhzln6v4gm68fn4vn6ncf5qpi90295fwm4fx6dq4l94b3v";
1313 };
1414
1515 nativeBuildInputs = [ qmake ];
pkgs/development/tools/build-managers/sbt/default.nix+2−2
@@ -2,14 +2,14 @@
22
33stdenv.mkDerivation rec {
44 pname = "sbt";
5− version = "1.3.3";
5+ version = "1.3.4";
66
77 src = fetchurl {
88 urls = [
99 "https://piccolo.link/sbt-${version}.tgz"
1010 "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
1111 ];
12− sha256 = "0v27i8pd9ss53ipi1cs40426mnyppdjgcdjk8nn05bi6rm7a4r7y";
12+ sha256 = "0bz6jj7jiwxd35xw9l1jbd846r0129pwgdi8m6dxwb8zybj73k2m";
1313 };
1414
1515 patchPhase = ''
pkgs/development/tools/micronaut/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "micronaut";
5− version = "1.2.5";
5+ version = "1.2.6";
66
77 src = fetchzip {
88 url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip";
9− sha256 = "1ka70cr6kznl68ilc42blzqk59gy20spkyqfn26n6zbk0jm5ssxv";
9+ sha256 = "0y7qshg6v8s5rwi0fz9xpyhd1yhv8jrw2jhp276a30dfkglx19qn";
1010 };
1111
1212 nativeBuildInputs = [ makeWrapper installShellFiles ];
pkgs/games/quakespasm/vulkan.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "vkquake";
5− version = "1.02.1";
5+ version = "1.03.0";
66
77 src = fetchFromGitHub {
88 owner = "Novum";
99 repo = "vkQuake";
1010 rev = version;
11− sha256 = "0fk9jqql0crnf0s12cxnris392ajciyw1zbz17qgs5hdyivp9vdx";
11+ sha256 = "1x2lx1fvr2p91clbx2jcc29j5yyh0xwq9fh0lyxhyadf5a710fn0";
1212 };
1313
1414 sourceRoot = "source/Quake";
pkgs/games/tintin/default.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, fetchurl, zlib, pcre }:
22
33stdenv.mkDerivation rec {
4− name = "tintin-2.01.91";
4+ name = "tintin-2.01.92";
55
66 src = fetchurl {
77 url = "mirror://sourceforge/tintin/${name}.tar.gz";
8− sha256 = "0nb3przw84r5zaibhpcb8gxm5vllrchca663c3f650fm83asd5im";
8+ sha256 = "0id8rd2yhh6ccjnlwyixflsay1rq3sw6pwlhz1ic3nzj22cd91ik";
99 };
1010
1111 buildInputs = [ zlib pcre ];
pkgs/os-specific/linux/kernel/linux-4.4.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
22
33buildLinux (args // rec {
4− version = "4.4.203";
4+ version = "4.4.205";
55 extraMeta.branch = "4.4";
66
77 src = fetchurl {
88 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
9− sha256 = "02krniihix9mb9bc0ffs03q4i9grjhwymnfp10h1r6gmxa554qlj";
9+ sha256 = "19pasidvfmf94rs86v80x7hpirz9gavmkxwcl76ya61fq7lqy7zs";
1010 };
1111} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.9.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
22
33buildLinux (args // rec {
4− version = "4.9.203";
4+ version = "4.9.205";
55 extraMeta.branch = "4.9";
66
77 src = fetchurl {
88 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
9− sha256 = "0jd8n8y3yf59sgfjhgjxsznxng7s4b30x5vdb48wrpgqmz7m1n8w";
9+ sha256 = "01cbqxw77g6rdg7dgk73pg9a2n9v4sxp48q2a77w1b068xjfifcq";
1010 };
1111} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-5.3.nix+2−2
@@ -3,7 +3,7 @@
33with stdenv.lib;
44
55buildLinux (args // rec {
6− version = "5.3.13";
6+ version = "5.3.14";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16− sha256 = "0by9lmgmllf19yflzm9f24cy9glcq6m73ywm25bddsnh0czya14z";
16+ sha256 = "0ckrbzwsc4lxd3l287wsd88mkfsd0kpf8nzchd9nfmkjiil14mwm";
1717 };
1818} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-5.4.nix+2−2
@@ -3,7 +3,7 @@
33with stdenv.lib;
44
55buildLinux (args // rec {
6− version = "5.4";
6+ version = "5.4.1";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16− sha256 = "14glqppn90z79b36k4c76mv90q933i2bg54rgwlcl2v7n608jcxz";
16+ sha256 = "1nagqx18a49hgj13spvyf095231wgc441np4zcgl4gnm4jrqpm57";
1717 };
1818} // (args.argsOverride or {}))
pkgs/os-specific/linux/libratbag/default.nix+2−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 pname = "libratbag";
7− version = "0.10";
7+ version = "0.11";
88
99 src = fetchFromGitHub {
1010 owner = "libratbag";
1111 repo = "libratbag";
1212 rev = "v${version}";
13− sha256 = "10hahpv2n48b5z35d2draka7cz1a9vw53rvwfmpp5dibwnmi81jb";
13+ sha256 = "1fcdcs4i83yic4rp3dsr7rq040f78lh8fb1ni1nnvp3y78fmibmi";
1414 };
1515
1616 nativeBuildInputs = [
pkgs/os-specific/linux/tomb/default.nix+2−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 pname = "tomb";
7− version = "2.6";
7+ version = "2.7";
88
99 src = fetchFromGitHub {
1010 owner = "dyne";
1111 repo = "Tomb";
1212 rev = "v${version}";
13− sha256 = "0pr0lw1byxwkgv857zfmd8yqa03a7mckhzklrf9rkv1l6nisz0z0";
13+ sha256 = "1vzkpzci6cp1r1q2n34pcgcns78i726k8d89dd6pibyj0vfnkl57";
1414 };
1515
1616 buildInputs = [ sudo zsh pinentry ];
pkgs/os-specific/linux/usbguard/default.nix+2−2
@@ -12,14 +12,14 @@ with stdenv.lib;
1212assert libgcrypt != null -> libsodium == null;
1313
1414stdenv.mkDerivation rec {
15− version = "0.7.5";
15+ version = "0.7.6";
1616 pname = "usbguard";
1717
1818 repo = "https://github.com/USBGuard/usbguard";
1919
2020 src = fetchurl {
2121 url = "${repo}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
22− sha256 = "0jj56sls13ryfgz6vajq8p4dm3grgb6rf2cmga6sckmzd4chk65b";
22+ sha256 = "0gzhs8s4aka86mkcjib36z54si939ki4bmk46p6v8kln1fixad3j";
2323 };
2424
2525 nativeBuildInputs = [
pkgs/tools/admin/tigervnc/default.nix+4−4
@@ -11,14 +11,14 @@
1111with stdenv.lib;
1212
1313stdenv.mkDerivation rec {
14− version = "1.9.0";
14+ version = "1.10.0";
1515 pname = "tigervnc";
1616
1717 src = fetchFromGitHub {
1818 owner = "TigerVNC";
1919 repo = "tigervnc";
20− rev = "v1.9.0";
21− sha256 = "0b47fg3741qs3zdpl2zr0s6jz46dypp2j6gqrappbzm3ywnnmm1x";
20+ rev = "v1.10.0";
21+ sha256 = "0l0x7cq65wv9n93r952qsikwzcls1sq3r32mx0c4wg19dha0x1m4";
2222 };
2323
2424 inherit fontDirectories;
@@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
9494 enableParallelBuilding = true;
9595
9696 meta = {
97− homepage = http://www.tigervnc.org/;
97+ homepage = "https://tigervnc.org/";
9898 license = stdenv.lib.licenses.gpl2Plus;
9999 description = "Fork of tightVNC, made in cooperation with VirtualGL";
100100 maintainers = with stdenv.lib.maintainers; [viric];
pkgs/tools/filesystems/moosefs/default.nix+2−2
@@ -10,13 +10,13 @@
1010
1111stdenv.mkDerivation rec {
1212 pname = "moosefs";
13− version = "3.0.105";
13+ version = "3.0.107";
1414
1515 src = fetchFromGitHub {
1616 owner = pname;
1717 repo = pname;
1818 rev = "v${version}";
19− sha256 = "0wphpdll0j4i6d4yxykaz2bamv83y0sj7j3cfv4br1zamdyprfwx";
19+ sha256 = "18mw7a1by8l09fb2pan6zak29bcrgbf5zgfzrlw3c203yawqbx3k";
2020 };
2121
2222 nativeBuildInputs = [ pkgconfig makeWrapper ];
pkgs/tools/misc/paps/default.nix+6−6
@@ -1,18 +1,18 @@
11{ stdenv, fetchFromGitHub
2−, autoconf, automake, pkgconfig, pango }:
2+, autoconf, automake, pkgconfig, intltool, pango }:
33
44stdenv.mkDerivation rec {
55 pname = "paps";
6− version = "0.7.0";
6+ version = "0.7.1";
77
88 src = fetchFromGitHub {
99 owner = "dov";
1010 repo = pname;
11− rev = version;
12− sha256 = "1f0qcawak76zk2xypipb6sy4bd8mixlrjby851x216a7f6z8fd4y";
11+ rev = "v${version}";
12+ sha256 = "129wpm2ayxs6qfh2761d4x9c034ivb2bcmmcnl56qs4448qb9495";
1313 };
1414
15− nativeBuildInputs = [ autoconf automake pkgconfig ];
15+ nativeBuildInputs = [ autoconf automake pkgconfig intltool ];
1616 buildInputs = [ pango ];
1717
1818 preConfigure = ''
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121
2222 meta = with stdenv.lib; {
2323 description = "Pango to PostScript converter";
24− homepage = https://github.com/dov/paps;
24+ homepage = "https://github.com/dov/paps";
2525 license = licenses.lgpl2;
2626 maintainers = with maintainers; [ etu ];
2727 platforms = platforms.linux;
pkgs/tools/misc/termtosvg/default.nix+2−2
@@ -2,11 +2,11 @@
22
33python3Packages.buildPythonApplication rec {
44 pname = "termtosvg";
5− version = "0.9.0";
5+ version = "1.0.0";
66
77 src = python3Packages.fetchPypi {
88 inherit pname version;
9− sha256 = "1mf2vlq083mzhja449il78zpvjq6fv36pzakwrqmgxdjbsdyvxbd";
9+ sha256 = "1d0lmvprraspdqpn0rsqzvkkmpj8zk0crid5l39kxpjpxrv2irfg";
1010 };
1111
1212 propagatedBuildInputs = with python3Packages; [ lxml pyte wcwidth ];
pkgs/tools/misc/tmate/default.nix+2−2
@@ -3,13 +3,13 @@
33
44stdenv.mkDerivation rec {
55 pname = "tmate";
6− version = "2.3.1";
6+ version = "2.4.0";
77
88 src = fetchFromGitHub {
99 owner = "tmate-io";
1010 repo = "tmate";
1111 rev = version;
12− sha256 = "183rvga8nvh9r7p8104vwcmzp3vrfdhnx73vh06m2fgdq9i5rz3l";
12+ sha256 = "0x5c31yq7ansmiy20a0qf59wagba9v3pq97mlkxrqxn4n1gcc6vi";
1313 };
1414
1515 dontUseCmakeConfigure = true;
pkgs/tools/misc/tmux/default.nix+24−8
@@ -1,4 +1,12 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook, ncurses, libevent, pkgconfig, makeWrapper }:
1+{ stdenv
2+, fetchFromGitHub
3+, autoreconfHook
4+, pkgconfig
5+, makeWrapper
6+, bison
7+, ncurses
8+, libevent
9+}:
210
311let
412
@@ -13,20 +21,28 @@ in
1321
1422stdenv.mkDerivation rec {
1523 pname = "tmux";
16− version = "2.9a";
24+ version = "3.0";
1725
1826 outputs = [ "out" "man" ];
1927
2028 src = fetchFromGitHub {
21− owner = pname;
22− repo = pname;
29+ owner = "tmux";
30+ repo = "tmux";
2331 rev = version;
24− sha256 = "040plbgxlz14q5p0p3wapr576jbirwripmsjyq3g1nxh76jh1ipg";
32+ sha256 = "0772hajzgpl4cvb9l2bma9hmnh4jg1phvqr2gg4292w34n5dsl3k";
2533 };
2634
27− nativeBuildInputs = [ pkgconfig autoreconfHook ];
35+ nativeBuildInputs = [
36+ pkgconfig
37+ autoreconfHook
38+ bison
39+ ];
2840
29− buildInputs = [ ncurses libevent makeWrapper ];
41+ buildInputs = [
42+ ncurses
43+ libevent
44+ makeWrapper
45+ ];
3046
3147 configureFlags = [
3248 "--sysconfdir=/etc"
@@ -39,7 +55,7 @@ stdenv.mkDerivation rec {
3955 '';
4056
4157 meta = {
42− homepage = http://tmux.github.io/;
58+ homepage = "http://tmux.github.io/";
4359 description = "Terminal multiplexer";
4460
4561 longDescription =
pkgs/tools/networking/stunnel/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "stunnel";
5− version = "5.55";
5+ version = "5.56";
66
77 src = fetchurl {
88 url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz";
9− sha256 = "0qjc0wkjf6bqz29fvwwsn9hnjhm6alsm10jcwx4jad2q3ks6kplh";
9+ sha256 = "08kb4gi9fzqngrczykvba6xhaxhq9m4wmdbhxvgrva5rasrvz13k";
1010 # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256",
1111 # not the output of `nix-prefetch-url`
1212 };
pkgs/tools/networking/whois/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }:
22
33stdenv.mkDerivation rec {
4− version = "5.5.2";
4+ version = "5.5.3";
55 pname = "whois";
66
77 src = fetchFromGitHub {
88 owner = "rfc1036";
99 repo = "whois";
1010 rev = "v${version}";
11− sha256 = "0587xvw0ifjrwxgisw0nfx7qykmkly1knfdghrpph9vicpzwsidw";
11+ sha256 = "099yvqng085f69k815961jnwk50nzmiknvhl1wwmji2hl36r160g";
1212 };
1313
1414 nativeBuildInputs = [ perl gettext pkgconfig ];
pkgs/tools/system/java-service-wrapper/default.nixnew file+41
@@ -0,0 +1,41 @@
1+{ stdenv, fetchurl
2+, jdk
3+, ant, cunit, ncurses
4+}:
5+
6+stdenv.mkDerivation rec {
7+ pname = "java-service-wrapper";
8+ version = "3.5.41";
9+
10+ src = fetchurl {
11+ url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
12+ sha256 = "0wvazc4y134brn99aa4rc9jdh1h2q3l7qhhvbcs6lhf4ym47sskm";
13+ };
14+
15+ buildInputs = [ jdk ];
16+ nativeBuildInputs = [ ant cunit ncurses ];
17+
18+ buildPhase = ''
19+ export ANT_HOME=${ant}
20+ export JAVA_HOME=${jdk}/lib/openjdk/jre/
21+ export JAVA_TOOL_OPTIONS=-Djava.home=$JAVA_HOME
22+ export CLASSPATH=${jdk}/lib/openjdk/lib/tools.jar
23+
24+ ${if stdenv.isi686 then "./build32.sh" else "./build64.sh"}
25+ '';
26+
27+ installPhase = ''
28+ mkdir -p $out/{bin,lib}
29+ cp bin/wrapper $out/bin/wrapper
30+ cp lib/wrapper.jar $out/lib/wrapper.jar
31+ cp lib/libwrapper.so $out/lib/libwrapper.so
32+ '';
33+
34+ meta = with stdenv.lib; {
35+ description = "Enables a Java Application to be run as a Windows Service or Unix Daemon";
36+ homepage = "https://wrapper.tanukisoftware.com/";
37+ license = licenses.gpl2;
38+ platforms = [ "x86_64-linux" "i686-linux" ];
39+ maintainers = [ maintainers.suhr ];
40+ };
41+}
pkgs/tools/text/boxes/default.nixnew file+47
@@ -0,0 +1,47 @@
1+{ stdenv, fetchFromGitHub, bison, flex }:
2+
3+stdenv.mkDerivation rec {
4+ pname = "boxes";
5+ version = "1.3";
6+
7+ src = fetchFromGitHub {
8+ owner = "ascii-boxes";
9+ repo = "boxes";
10+ rev = "v${version}";
11+ sha256 = "0b12rsynrmkldlwcb62drk33kk0aqwbj10mq5y5x3hjf626gjwsi";
12+ };
13+
14+ # Building instructions:
15+ # https://boxes.thomasjensen.com/build.html#building-on-linux--unix
16+ nativeBuildInputs = [ bison flex ];
17+
18+ dontConfigure = true;
19+
20+ # Makefile references a system wide config file in '/usr/share'. Instead, we
21+ # move it within the store by default.
22+ preBuild = ''
23+ substituteInPlace Makefile \
24+ --replace "GLOBALCONF = /usr/share/boxes" \
25+ "GLOBALCONF=${placeholder "out"}/share/boxes/boxes-config"
26+ '';
27+
28+ makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ];
29+
30+ installPhase = ''
31+ install -Dm755 -t $out/bin src/boxes
32+ install -Dm644 -t $out/share/boxes boxes-config
33+ install -Dm644 -t $out/share/man/man1 doc/boxes.1
34+ '';
35+
36+ meta = with stdenv.lib; {
37+ description = "Command line ASCII boxes unlimited!";
38+ longDescription = ''
39+ Boxes is a command line filter program that draws ASCII art boxes around
40+ your input text.
41+ '';
42+ homepage = https://boxes.thomasjensen.com;
43+ license = licenses.gpl2;
44+ maintainers = with maintainers; [ waiting-for-dev ];
45+ platforms = platforms.unix;
46+ };
47+}
pkgs/top-level/all-packages.nix+6
@@ -724,6 +724,8 @@ in
724724
725725 brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ;
726726
727+ boxes = callPackage ../tools/text/boxes { };
728+
727729 ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
728730
729731 ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { };
@@ -8335,6 +8337,8 @@ in
83358337
83368338 jasmin = callPackage ../development/compilers/jasmin { };
83378339
8340+ java-service-wrapper = callPackage ../tools/system/java-service-wrapper { };
8341+
83388342 javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { };
83398343
83408344 julia_07 = callPackage ../development/compilers/julia/0.7.nix {
@@ -18247,6 +18251,8 @@ in
1824718251
1824818252 coyim = callPackage ../applications/networking/instant-messengers/coyim {};
1824918253
18254+ cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { };
18255+
1825018256 cpp_ethereum = callPackage ../applications/misc/cpp-ethereum { };
1825118257
1825218258 crun = callPackage ../applications/virtualization/crun {};
pkgs/top-level/python-packages.nix+10
@@ -497,6 +497,8 @@ in {
497497
498498 cachy = callPackage ../development/python-modules/cachy { };
499499
500+ cadquery = callPackage ../development/python-modules/cadquery { };
501+
500502 catalogue = callPackage ../development/python-modules/catalogue { };
501503
502504 cdecimal = callPackage ../development/python-modules/cdecimal { };
@@ -1101,6 +1103,8 @@ in {
11011103
11021104 pyschedule = callPackage ../development/python-modules/pyschedule { };
11031105
1106+ pyscreenshot = callPackage ../development/python-modules/pyscreenshot { };
1107+
11041108 pyside = callPackage ../development/python-modules/pyside {
11051109 inherit (pkgs) mesa;
11061110 };
@@ -1155,12 +1159,16 @@ in {
11551159
11561160 pytest-pylint = callPackage ../development/python-modules/pytest-pylint { };
11571161
1162+ pytest-qt = callPackage ../development/python-modules/pytest-qt { };
1163+
11581164 pytest-testmon = callPackage ../development/python-modules/pytest-testmon { };
11591165
11601166 pytest-tornado = callPackage ../development/python-modules/pytest-tornado { };
11611167
11621168 pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { };
11631169
1170+ pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { };
1171+
11641172 pytmx = callPackage ../development/python-modules/pytmx { };
11651173
11661174 python-binance = callPackage ../development/python-modules/python-binance { };
@@ -5264,6 +5272,8 @@ in {
52645272
52655273 tiros = callPackage ../development/python-modules/tiros { };
52665274
5275+ tinydb = callPackage ../development/python-modules/tinydb { };
5276+
52675277 tifffile = callPackage ../development/python-modules/tifffile { };
52685278
52695279 tmdb3 = callPackage ../development/python-modules/tmdb3 { };