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

Merge master into staging

Browse Source
This commit is contained in:
Frederik Rietdijk 2018-04-11 15:00:18 +02:00
commit d117204d17
45 changed files with 1803 additions and 1419 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maintainers/maintainer-list.nix
View File

@ -4135,4 +4135,9 @@
github = "zzamboni"; github = "zzamboni";
name = "Diego Zamboni"; name = "Diego Zamboni";
}; };
srghma = {
email = "srghma@gmail.com";
github = "srghma";
name = "Sergei Khoma";
};
} }

1
nixos/modules/module-list.nix
View File

@ -366,6 +366,7 @@
./services/misc/ripple-data-api.nix ./services/misc/ripple-data-api.nix
./services/misc/rogue.nix ./services/misc/rogue.nix
./services/misc/serviio.nix ./services/misc/serviio.nix
./services/misc/safeeyes.nix
./services/misc/siproxd.nix ./services/misc/siproxd.nix
./services/misc/snapper.nix ./services/misc/snapper.nix
./services/misc/sonarr.nix ./services/misc/sonarr.nix

50
nixos/modules/services/misc/safeeyes.nix Normal file
View File

@ -0,0 +1,50 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.safeeyes;
in
{
###### interface
options = {
services.safeeyes = {
enable = mkOption {
default = false;
description = "Whether to enable the safeeyes OSGi service";
};
};
};
###### implementation
config = mkIf cfg.enable {
systemd.user.services.safeeyes = {
description = "Safeeyes";
wantedBy = [ "graphical-session.target" ];
partOf = [ "graphical-session.target" ];
serviceConfig = {
ExecStart = ''
${pkgs.safeeyes}/bin/safeeyes
'';
Restart = "on-failure";
RestartSec = 3;
StartLimitInterval = 350;
StartLimitBurst = 10;
};
};
};
}

4
pkgs/applications/audio/ncmpc/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ncmpc-${version}"; name = "ncmpc-${version}";
version = "0.29"; version = "0.30";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "MusicPlayerDaemon"; owner = "MusicPlayerDaemon";
repo = "ncmpc"; repo = "ncmpc";
rev = "v${version}"; rev = "v${version}";
sha256 = "1b2kbx2phbf4s2qpy7mx72c87xranljr0yam6z9m1i1kvcnp8q1q"; sha256 = "0s2bynm5szrk8bjhg200mvsm2ny0wz9s10nx7r69y9y4jsxr8624";
}; };
buildInputs = [ glib ncurses mpd_clientlib ]; buildInputs = [ glib ncurses mpd_clientlib ];

13
pkgs/applications/editors/texstudio/default.nix
View File

@ -1,14 +1,15 @@
{ stdenv, fetchurl, qt5, poppler_qt5, zlib, pkgconfig}: { stdenv, fetchFromGitHub, qt5, poppler_qt5, zlib, pkgconfig}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "texstudio"; pname = "texstudio";
version = "2.12.6"; version = "2.12.8";
name = "${pname}-${version}"; name = "${pname}-${version}";
altname="Texstudio";
src = fetchurl { src = fetchFromGitHub {
url = "mirror://sourceforge/texstudio/${name}.tar.gz"; owner = "${pname}-org";
sha256 = "18rxd7ra5k2f7s4c296b3v3pqhxjmfix9xpy9i1g4jm87ygqrbnd"; repo = pname;
rev = version;
sha256 = "0f1az7398rnxmm3m9b2jcz7pd9x445fjsv8w85k2j261n5cyfqx2";
}; };
nativeBuildInputs = [ qt5.qmake pkgconfig ]; nativeBuildInputs = [ qt5.qmake pkgconfig ];

4
pkgs/applications/misc/copyq/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "CopyQ-${version}"; name = "CopyQ-${version}";
version = "3.3.0"; version = "3.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hluk"; owner = "hluk";
repo = "CopyQ"; repo = "CopyQ";
rev = "v${version}"; rev = "v${version}";
sha256 = "0j46h87ifinkydi0m725p422m9svk3dpcz8dnrci4mxx0inn6qs3"; sha256 = "1jjb979dwdnkjca95yxzapbjpd6hr97hxz7sn614whvdv4vvpnyc";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

9
pkgs/applications/misc/kdeconnect/default.nix
View File

@ -15,22 +15,23 @@
, qtx11extras , qtx11extras
, sshfs , sshfs
, makeWrapper , makeWrapper
, kwayland
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kdeconnect"; pname = "kdeconnect";
version = "1.2.1"; version = "1.3.0";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-kde-v${version}.tar.xz"; url = "mirror://kde/stable/${pname}/${version}/src/${pname}-kde-${version}.tar.xz";
sha256 = "01v432p9ylwss9gl6fvby8954bnjd91dni5jk1i44vv7x26yn8zg"; sha256 = "0gzv55hks6j37pf7d18l40n1q6j8b74j9qg3v44p8sp0gnglwkcm";
}; };
buildInputs = [ buildInputs = [
libfakekey libXtst libfakekey libXtst
ki18n kiconthemes kcmutils kconfigwidgets kdbusaddons knotifications ki18n kiconthemes kcmutils kconfigwidgets kdbusaddons knotifications
qca-qt5 qtx11extras makeWrapper qca-qt5 qtx11extras makeWrapper kwayland
]; ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];

71
pkgs/applications/misc/safeeyes/default.nix Normal file
View File

@ -0,0 +1,71 @@
{ lib, python3Packages, gobjectIntrospection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk_pixbuf, shared-mime-info, librsvg
}:
let inherit (python3Packages) python buildPythonApplication fetchPypi;
in buildPythonApplication rec {
name = "${pname}-${version}";
pname = "safeeyes";
version = "2.0.2";
namePrefix = "";
src = fetchPypi {
inherit pname version;
sha256 = "1fx6zd4hnbc7gdpac6r7smxwdl1bifaxx3mnx0wrqfvhpnwr1ybv";
};
buildInputs = [
gtk3
gobjectIntrospection
gnome3.defaultIconTheme
gnome3.adwaita-icon-theme
];
nativeBuildInputs = [
wrapGAppsHook
];
propagatedBuildInputs = with python3Packages; [
Babel
psutil
xlib
pygobject3
dbus-python
libappindicator-gtk3
libnotify
xprintidle-ng
];
# patch smartpause plugin
postPatch = ''
sed -i \
-e 's!xprintidle!xprintidle-ng!g' \
safeeyes/plugins/smartpause/plugin.py
sed -i \
-e 's!xprintidle!xprintidle-ng!g' \
safeeyes/plugins/smartpause/config.json
'';
preFixup = ''
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share"
--prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
--prefix XDG_DATA_DIRS : "${librsvg}/share"
# safeeyes images
--prefix XDG_DATA_DIRS : "$out/lib/${python.libPrefix}/site-packages/usr/share"
)
'';
doCheck = false; # no tests
meta = {
homepage = http://slgobinath.github.io/SafeEyes;
description = "Protect your eyes from eye strain using this simple and beautiful, yet extensible break reminder. A Free and Open Source Linux alternative to EyeLeo";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ srghma ];
platforms = lib.platforms.all;
};
}

4
pkgs/applications/misc/synapse/default.nix
View File

@ -3,13 +3,13 @@
}: }:
let let
version = "0.2.99.3"; version = "0.2.99.4";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "synapse-${version}"; name = "synapse-${version}";
src = fetchurl { src = fetchurl {
url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${name}.tar.xz"; url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${name}.tar.xz";
sha256 = "0rwd42164xqfi40r13yr29cx6zy3bckgxk00y53b376nl5yqacvy"; sha256 = "1g6x9knb4jy1d8zgssjhzkgac583137pibisy9whjs8mckaj4k1j";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

34
pkgs/applications/misc/xmrig-proxy/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, libuuid
, donateLevel ? 0
}:
stdenv.mkDerivation rec {
name = "xmrig-proxy-${version}";
version = "2.5.2";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig-proxy";
rev = "v${version}";
sha256 = "1x10mrr58lc207zppzkjnhwah83kpxrqpa3idv01lyasv8mfkxzc";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ libuv libmicrohttpd libuuid ];
# Set default donation level to 0%. Can be increased at runtime via --donate-level option.
postPatch = ''
substituteInPlace src/donate.h --replace "kDonateLevel = 2;" "kDonateLevel = ${toString donateLevel};"
'';
installPhase = ''
install -vD xmrig-proxy $out/bin/xmrig-proxy
'';
meta = with lib; {
description = "Monero (XMR) Stratum protocol proxy";
homepage = "https://github.com/xmrig/xmrig-proxy";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ aij ];
};
}

4
pkgs/applications/networking/browsers/chromium/plugins.nix
View File

@ -98,12 +98,12 @@ let
flash = stdenv.mkDerivation rec { flash = stdenv.mkDerivation rec {
name = "flashplayer-ppapi-${version}"; name = "flashplayer-ppapi-${version}";
version = "29.0.0.113"; version = "29.0.0.140";
src = fetchzip { src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
+ "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
sha256 = "1ix86jv4ckn5pcj37fgx4mncqjyvabdvwxp9zs9frdfbyx740izr"; sha256 = "1p0jr7s6vyzxw1mhbrl5yx092z2wpvfw0jjw127gs576z0zwamwh";
stripRoot = false; stripRoot = false;
}; };

10
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
View File

@ -73,7 +73,7 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "flashplayer-${version}"; name = "flashplayer-${version}";
version = "29.0.0.113"; version = "29.0.0.140";
src = fetchurl { src = fetchurl {
url = url =
@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
sha256 = sha256 =
if debug then if debug then
if arch == "x86_64" then if arch == "x86_64" then
"15nkmnkh4w458n9yp0f54d48vzl8bk6zq3clws8jvd76aa0accl0" "0bj0d899dswfbkbrm08c381yzm0hlqdv53sgbl2z9zj4x8rqyi3p"
else else
"0v9iwnb00jl6s6a1b9cnmqflh50dhyhmlwckk8qv6vy77b2jdsk7" "16as2dydgqip6qlg13jh83sd4lb2cgrny4ibqg7jlx1d1a1i0jwh"
else else
if arch == "x86_64" then if arch == "x86_64" then
"18cbalnyikb8g8fb861b9kbgsqwrin5k7gd5smz2czk73kmfrph4" "10s6j5izsy2v2ljljcv2vk898jg9xmp6zqqazmj07zy7m5vywfi7"
else else
"06djh4scz97r8h4bsd392paimpybd59q1chd86bdsybm1xkgicmy"; "0xk8a2brpzfxi87mqqfv8l5xi5j9x71cy0ik64dzwcq7ka16gpz1";
}; };
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];

6
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
View File

@ -55,7 +55,7 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}"; name = "flashplayer-standalone-${version}";
version = "29.0.0.113"; version = "29.0.0.140";
src = fetchurl { src = fetchurl {
url = url =
@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux.x86_64.tar.gz"; "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux.x86_64.tar.gz";
sha256 = sha256 =
if debug then if debug then
"12ackbfyh83f3ggvr8gs88f002glrymh2s2pfb5srbgdajrh0cyc" "1gvfm4z46m2y39fswpzhx18dlwcxwwy5mins3kx2m425dgp76zd5"
else else
"17xwsw13bq5s6mq4r22zhw99dx5xswzz83m7lvd9gl9ih78w7348"; "08a21c0l47w97xhwiby8j5055kl37ld5insfd459gz92d3f145fl";
}; };
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];

8
pkgs/applications/networking/cluster/minikube/default.nix
View File

@ -15,15 +15,15 @@ let
# instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is # instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is
# currently https://storage.googleapis.com/minikube/k8s_releases.json # currently https://storage.googleapis.com/minikube/k8s_releases.json
localkube-version = "1.9.4"; localkube-version = "1.10.0";
localkube-binary = fetchurl { localkube-binary = fetchurl {
url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64"; url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64";
sha256 = "0c1n8p7q38hx864xvcsr01d028cizjfpsqbfpf1y24fnrpzacajw"; sha256 = "02lkl2g274689h07pkcwnxn04swy6aa3f2z77n421mx38bbq2kpd";
}; };
in buildGoPackage rec { in buildGoPackage rec {
pname = "minikube"; pname = "minikube";
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "0.25.2"; version = "0.26.0";
goPackagePath = "k8s.io/minikube"; goPackagePath = "k8s.io/minikube";
@ -31,7 +31,7 @@ in buildGoPackage rec {
owner = "kubernetes"; owner = "kubernetes";
repo = "minikube"; repo = "minikube";
rev = "v${version}"; rev = "v${version}";
sha256 = "1h8sxs6xxmli7xkb33kdl4nyn1sgq2b8b2d6aj5wim11ric3l7pb"; sha256 = "1wc2gvmgb59yh0ldm2plvh6s8mvxvysrxp6w75z16ii86jmi3wr6";
}; };
patches = [ patches = [

4
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -13,7 +13,7 @@
}: }:
let let
version = "2.17.0"; version = "2.16.2";
svn = subversionClient.override { perlBindings = true; }; svn = subversionClient.override { perlBindings = true; };
in in
@ -22,7 +22,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "1ismz7nsz8dgjmk782xr9s0mr2qh06f72pdcgbxfmnw1bvlya5p9"; sha256 = "05y7480f2p7fkncbhf08zz56jbykcp0ia5gl6y3djs0lsa5mfq2m";
}; };
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

16
pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch
View File

@ -2,19 +2,19 @@ This patch does two things: (1) use the right name for `docbook2texi',
and (2) make sure `gitman.info' isn't produced since it's broken (duplicate and (2) make sure `gitman.info' isn't produced since it's broken (duplicate
node names). node names).
diff --git a/Documentation/Makefile b/Documentation/Makefile diff -ru git-1.8.4-orig/Documentation/Makefile git-1.8.4/Documentation/Makefile
--- a/Documentation/Makefile --- git-1.8.4-orig/Documentation/Makefile 2013-08-23 21:38:43.000000000 +0200
+++ b/Documentation/Makefile +++ git-1.8.4/Documentation/Makefile 2013-09-30 14:48:51.532890378 +0200
@@ -122,7 +122,7 @@ @@ -101,7 +101,7 @@
MAKEINFO = makeinfo MAKEINFO = makeinfo
INSTALL_INFO = install-info INSTALL_INFO = install-info
-DOCBOOK2X_TEXI = docbook2x-texi -DOCBOOK2X_TEXI = docbook2x-texi
+DOCBOOK2X_TEXI = docbook2texi +DOCBOOK2X_TEXI = docbook2texi
DBLATEX = dblatex DBLATEX = dblatex
ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex ifndef PERL_PATH
DBLATEX_COMMON = -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty PERL_PATH = /usr/bin/perl
@@ -240,7 +240,7 @@ @@ -205,7 +205,7 @@
man5: $(DOC_MAN5) man5: $(DOC_MAN5)
man7: $(DOC_MAN7) man7: $(DOC_MAN7)
@ -23,7 +23,7 @@ diff --git a/Documentation/Makefile b/Documentation/Makefile
pdf: user-manual.pdf pdf: user-manual.pdf
@@ -256,10 +256,9 @@ @@ -221,10 +221,9 @@
install-info: info install-info: info
$(INSTALL) -d -m 755 $(DESTDIR)$(infodir) $(INSTALL) -d -m 755 $(DESTDIR)$(infodir)

8
pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch
View File

@ -1,20 +1,22 @@
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 8060ea35c..c81067a19 100644
--- a/Documentation/git-send-email.txt --- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt
@@ -208,8 +208,7 @@ a password is obtained using 'git-credential'. @@ -203,8 +203,7 @@ a password is obtained using 'git-credential'.
specify a full pathname of a sendmail-like program instead; specify a full pathname of a sendmail-like program instead;
the program must support the `-i` option. Default value can the program must support the `-i` option. Default value can
be specified by the `sendemail.smtpServer` configuration be specified by the `sendemail.smtpServer` configuration
- option; the built-in default is to search for `sendmail` in - option; the built-in default is to search for `sendmail` in
- `/usr/sbin`, `/usr/lib` and $PATH if such program is - `/usr/sbin`, `/usr/lib` and $PATH if such program is
+ option; the built-in default is to search in $PATH if such program is + option; the built-in default is to search in $PATH if such program is
available, falling back to `localhost` otherwise. available, falling back to `localhost` otherwise.
--smtp-server-port=<port>:: --smtp-server-port=<port>::
diff --git a/git-send-email.perl b/git-send-email.perl diff --git a/git-send-email.perl b/git-send-email.perl
index edcc6d346..8e357aeab 100755
--- a/git-send-email.perl --- a/git-send-email.perl
+++ b/git-send-email.perl +++ b/git-send-email.perl
@@ -944,8 +944,7 @@ if (defined $reply_to) { @@ -885,8 +885,7 @@ if (defined $initial_reply_to) {
} }
if (!defined $smtp_server) { if (!defined $smtp_server) {

8
pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch
View File

@ -6,15 +6,15 @@
-# First decide what scheme to use... -# First decide what scheme to use...
-GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough -GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
-if test -n "$GIT_GETTEXT_POISON" -if test -n "@@USE_GETTEXT_SCHEME@@"
-then
- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
-elif test -n "@@USE_GETTEXT_SCHEME@@"
-then -then
- GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@" - GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
-elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" -elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
-then -then
- : no probing necessary - : no probing necessary
-elif test -n "$GIT_GETTEXT_POISON"
-then
- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
-elif type gettext.sh >/dev/null 2>&1 -elif type gettext.sh >/dev/null 2>&1
-then -then
- # GNU libintl's gettext.sh - # GNU libintl's gettext.sh

8
pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch
View File

@ -1,7 +1,7 @@
diff --git a/Makefile b/Makefile diff -ru -x '*~' git-1.8.2.1-orig/Makefile git-1.8.2.1/Makefile
--- a/Makefile --- git-1.8.2.1-orig/Makefile 2013-04-08 00:52:04.000000000 +0200
+++ b/Makefile +++ git-1.8.2.1/Makefile 2013-04-22 15:46:42.906026940 +0200
@@ -2609,8 +2609,7 @@ @@ -2319,8 +2319,7 @@
{ test "$$bindir/" = "$$execdir/" || \ { test "$$bindir/" = "$$execdir/" || \
for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \ for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
$(RM) "$$execdir/$$p" && \ $(RM) "$$execdir/$$p" && \

4
pkgs/applications/video/smtube/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, qmake, qtscript, qtwebkit }: { stdenv, fetchurl, qmake, qtscript, qtwebkit }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "18.1.0"; version = "18.3.0";
name = "smtube-${version}"; name = "smtube-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2"; url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2";
sha256 = "1sw2b89ricxfbmgbzsp9f89n0gwh9dbnii6lr9gcccs8djpp1ad1"; sha256 = "05r7xmzc7i95nwzgcn7p0kwlhybryf7f0dpadgdnbz6xinz9a0mb";
}; };
makeFlags = [ makeFlags = [

12
pkgs/applications/virtualization/docker/default.nix
View File

@ -208,4 +208,16 @@ rec {
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
}; };
docker_18_04 = dockerGen rec {
version = "18.04.0-ce";
rev = "3d479c0af67cb9ea43a9cfc1bf2ef097e06a3470"; # git commit
sha256 = "1askbk8b92cdv7vlm688g2f1v2xjhmx77578318x76dydfql3jfl";
runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871";
runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062";
containerdRev = "773c489c9c1b21a6d78b5c538cd395416ec50f88";
containerdSha256 = "0k1zjn0mpd7q3p5srxld2fr4k6ijzbk0r34r6w69sh0d0rd2fvbs";
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
};
} }

4
pkgs/data/misc/hackage/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl }: { fetchurl }:
fetchurl { fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3f7d88041d19d251bca6330e9008175875c0ed4a.tar.gz"; url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/b35023f435e7713e5053d3dcd16691e3aff48227.tar.gz";
sha256 = "18aymxbm7zhmh8jciq2p1hjdfwq5g31s5mmw3lqwaviigcisq22a"; sha256 = "1mnh1bhr8caszxrl44l3iig8kshq7djibnmy0sx0q7inj260xcs7";
} }

2
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -82,7 +82,7 @@ self: super: {
name = "git-annex-${drv.version}-src"; name = "git-annex-${drv.version}-src";
url = "git://git-annex.branchable.com/"; url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + drv.version; rev = "refs/tags/" + drv.version;
sha256 = "0qi5wpsvw6g8xrri1pr0401370acs5sg75myr0h5mjad6pvqc667"; sha256 = "011kiyy1anj99ab70npl5i7pcqri0pdk04s4cvdm39zyas5m9lbd";
}; };
})).overrideScope (self: super: { })).overrideScope (self: super: {
aws = dontCheck (self.aws_0_18); aws = dontCheck (self.aws_0_18);

78
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -38,7 +38,7 @@ core-packages:
- ghcjs-base-0 - ghcjs-base-0
default-package-overrides: default-package-overrides:
# LTS Haskell 11.3 # LTS Haskell 11.4
- abstract-deque ==0.3 - abstract-deque ==0.3
- abstract-deque-tests ==0.3 - abstract-deque-tests ==0.3
- abstract-par ==0.3.3 - abstract-par ==0.3.3
@ -140,7 +140,7 @@ default-package-overrides:
- auto-update ==0.1.4 - auto-update ==0.1.4
- avwx ==0.3.0.2 - avwx ==0.3.0.2
- axiom ==0.4.6 - axiom ==0.4.6
- b9 ==0.5.41 - b9 ==0.5.43
- backprop ==0.1.5.0 - backprop ==0.1.5.0
- bank-holidays-england ==0.1.0.6 - bank-holidays-england ==0.1.0.6
- barrier ==0.1.1 - barrier ==0.1.1
@ -162,7 +162,7 @@ default-package-overrides:
- bencode ==0.6.0.0 - bencode ==0.6.0.0
- bento ==0.1.0 - bento ==0.1.0
- between ==0.11.0.0 - between ==0.11.0.0
- bhoogle ==0.1.2.5 - bhoogle ==0.1.2.6
- bibtex ==0.1.0.6 - bibtex ==0.1.0.6
- bifunctors ==5.5.2 - bifunctors ==5.5.2
- bimap ==0.3.3 - bimap ==0.3.3
@ -200,8 +200,8 @@ default-package-overrides:
- bit-stream ==0.1.0.2 - bit-stream ==0.1.0.2
- bitx-bitcoin ==0.12.0.0 - bitx-bitcoin ==0.12.0.0
- blake2 ==0.2.0 - blake2 ==0.2.0
- blas-carray ==0.0.1 - blas-carray ==0.0.1.1
- blas-ffi ==0.0.1 - blas-ffi ==0.0.1.1
- blas-hs ==0.1.1.0 - blas-hs ==0.1.1.0
- blastxml ==0.3.2 - blastxml ==0.3.2
- blaze-bootstrap ==0.1.0.1 - blaze-bootstrap ==0.1.0.1
@ -214,7 +214,7 @@ default-package-overrides:
- blosum ==0.1.1.4 - blosum ==0.1.1.4
- bmp ==1.2.6.3 - bmp ==1.2.6.3
- bno055-haskell ==0.1.0 - bno055-haskell ==0.1.0
- boltzmann-samplers ==0.1.0.0 - boltzmann-samplers ==0.1.1.0
- bookkeeping ==0.2.1.4 - bookkeeping ==0.2.1.4
- Boolean ==0.2.4 - Boolean ==0.2.4
- boolean-like ==0.1.1.0 - boolean-like ==0.1.1.0
@ -243,7 +243,7 @@ default-package-overrides:
- byteable ==0.1.1 - byteable ==0.1.1
- bytedump ==1.0 - bytedump ==1.0
- byteorder ==1.0.4 - byteorder ==1.0.4
- bytes ==0.15.3 - bytes ==0.15.4
- byteset ==0.1.1.0 - byteset ==0.1.1.0
- bytestring-builder ==0.10.8.1.0 - bytestring-builder ==0.10.8.1.0
- bytestring-conversion ==0.3.1 - bytestring-conversion ==0.3.1
@ -259,7 +259,7 @@ default-package-overrides:
- cabal-file-th ==0.2.4 - cabal-file-th ==0.2.4
- cabal-rpm ==0.12.2 - cabal-rpm ==0.12.2
- cabal-toolkit ==0.0.5 - cabal-toolkit ==0.0.5
- cache ==0.1.0.1 - cache ==0.1.1.0
- cairo ==0.13.4.2 - cairo ==0.13.4.2
- calendar-recycling ==0.0 - calendar-recycling ==0.0
- call-stack ==0.1.0 - call-stack ==0.1.0
@ -269,7 +269,7 @@ default-package-overrides:
- cased ==0.1.0.0 - cased ==0.1.0.0
- case-insensitive ==1.2.0.11 - case-insensitive ==1.2.0.11
- cases ==0.1.3.2 - cases ==0.1.3.2
- casing ==0.1.2.1 - casing ==0.1.4.0
- cassava ==0.5.1.0 - cassava ==0.5.1.0
- cassava-conduit ==0.4.0.2 - cassava-conduit ==0.4.0.2
- cassava-records ==0.1.0.4 - cassava-records ==0.1.0.4
@ -344,6 +344,7 @@ default-package-overrides:
- composable-associations-aeson ==0.1.0.0 - composable-associations-aeson ==0.1.0.0
- composition ==1.0.2.1 - composition ==1.0.2.1
- composition-extra ==2.0.0 - composition-extra ==2.0.0
- composition-prelude ==1.3.0.8
- compressed ==3.11 - compressed ==3.11
- concise ==0.1.0.1 - concise ==0.1.0.1
- concurrency ==1.4.0.2 - concurrency ==1.4.0.2
@ -476,7 +477,7 @@ default-package-overrides:
- dependent-map ==0.2.4.0 - dependent-map ==0.2.4.0
- dependent-sum ==0.4 - dependent-sum ==0.4
- dependent-sum-template ==0.0.0.6 - dependent-sum-template ==0.0.0.6
- deque ==0.2 - deque ==0.2.1
- deriving-compat ==0.4.1 - deriving-compat ==0.4.1
- descriptive ==0.9.4 - descriptive ==0.9.4
- dhall ==1.11.1 - dhall ==1.11.1
@ -652,7 +653,7 @@ default-package-overrides:
- fn ==0.3.0.2 - fn ==0.3.0.2
- focus ==0.1.5.2 - focus ==0.1.5.2
- fold-debounce ==0.2.0.7 - fold-debounce ==0.2.0.7
- fold-debounce-conduit ==0.2.0.0 - fold-debounce-conduit ==0.2.0.1
- foldl ==1.3.7 - foldl ==1.3.7
- folds ==0.7.4 - folds ==0.7.4
- follow-file ==0.0.2 - follow-file ==0.0.2
@ -759,7 +760,7 @@ default-package-overrides:
- Glob ==0.9.2 - Glob ==0.9.2
- glob-posix ==0.1.0.1 - glob-posix ==0.1.0.1
- gloss ==1.11.1.1 - gloss ==1.11.1.1
- gloss-accelerate ==2.0.0.0 - gloss-accelerate ==2.0.0.1
- gloss-algorithms ==1.11.1.1 - gloss-algorithms ==1.11.1.1
- gloss-raster ==1.11.1.1 - gloss-raster ==1.11.1.1
- gloss-raster-accelerate ==2.0.0.0 - gloss-raster-accelerate ==2.0.0.0
@ -913,7 +914,7 @@ default-package-overrides:
- hpack ==0.27.0 - hpack ==0.27.0
- hpc-coveralls ==1.0.10 - hpc-coveralls ==1.0.10
- HPDF ==1.4.10 - HPDF ==1.4.10
- hpio ==0.9.0.5 - hpio ==0.9.0.6
- hpp ==0.5.2 - hpp ==0.5.2
- hpqtypes ==1.5.2.0 - hpqtypes ==1.5.2.0
- hquantlib ==0.0.4.0 - hquantlib ==0.0.4.0
@ -969,7 +970,7 @@ default-package-overrides:
- hsyslog ==5.0.1 - hsyslog ==5.0.1
- hsyslog-udp ==0.2.2 - hsyslog-udp ==0.2.2
- htaglib ==1.1.1 - htaglib ==1.1.1
- HTF ==0.13.2.2 - HTF ==0.13.2.4
- html ==1.0.1.2 - html ==1.0.1.2
- html-conduit ==1.3.0 - html-conduit ==1.3.0
- html-email-validate ==0.2.0.0 - html-email-validate ==0.2.0.0
@ -1003,7 +1004,7 @@ default-package-overrides:
- hw-fingertree ==0.1.0.1 - hw-fingertree ==0.1.0.1
- hw-fingertree-strict ==0.1.0.3 - hw-fingertree-strict ==0.1.0.3
- hw-hedgehog ==0.1.0.1 - hw-hedgehog ==0.1.0.1
- hw-hspec-hedgehog ==0.1.0.2 - hw-hspec-hedgehog ==0.1.0.3
- hw-int ==0.0.0.3 - hw-int ==0.0.0.3
- hw-json ==0.6.0.0 - hw-json ==0.6.0.0
- hw-mquery ==0.1.0.1 - hw-mquery ==0.1.0.1
@ -1111,7 +1112,7 @@ default-package-overrides:
- json-builder ==0.3 - json-builder ==0.3
- json-rpc-generic ==0.2.1.3 - json-rpc-generic ==0.2.1.3
- json-schema ==0.7.4.1 - json-schema ==0.7.4.1
- json-stream ==0.4.2.2 - json-stream ==0.4.2.3
- JuicyPixels ==3.2.9.5 - JuicyPixels ==3.2.9.5
- JuicyPixels-extra ==0.3.0 - JuicyPixels-extra ==0.3.0
- JuicyPixels-scale-dct ==0.1.1.2 - JuicyPixels-scale-dct ==0.1.1.2
@ -1146,8 +1147,9 @@ default-package-overrides:
- language-haskell-extract ==0.2.4 - language-haskell-extract ==0.2.4
- language-java ==0.2.9 - language-java ==0.2.9
- language-javascript ==0.6.0.11 - language-javascript ==0.6.0.11
- lapack-carray ==0.0.1 - language-puppet ==1.3.17
- lapack-ffi ==0.0.1 - lapack-carray ==0.0.2
- lapack-ffi ==0.0.2
- lapack-ffi-tools ==0.1.0.1 - lapack-ffi-tools ==0.1.0.1
- large-hashable ==0.1.0.4 - large-hashable ==0.1.0.4
- largeword ==1.2.5 - largeword ==1.2.5
@ -1169,7 +1171,7 @@ default-package-overrides:
- lens-properties ==4.11.1 - lens-properties ==4.11.1
- lens-regex ==0.1.0 - lens-regex ==0.1.0
- lens-simple ==0.1.0.9 - lens-simple ==0.1.0.9
- lentil ==1.0.10.1 - lentil ==1.0.11.3
- leveldb-haskell ==0.6.5 - leveldb-haskell ==0.6.5
- lexer-applicative ==2.1.0.1 - lexer-applicative ==2.1.0.1
- libffi ==0.1 - libffi ==0.1
@ -1215,7 +1217,7 @@ default-package-overrides:
- logging-facade-syslog ==1 - logging-facade-syslog ==1
- logict ==0.6.0.2 - logict ==0.6.0.2
- log-postgres ==0.7.0.2 - log-postgres ==0.7.0.2
- log-warper ==1.8.10.1 - log-warper ==1.8.11
- loop ==0.3.0 - loop ==0.3.0
- lrucache ==1.2.0.0 - lrucache ==1.2.0.0
- lrucaching ==0.3.3 - lrucaching ==0.3.3
@ -1297,7 +1299,7 @@ default-package-overrides:
- mockery ==0.3.5 - mockery ==0.3.5
- model ==0.4.4 - model ==0.4.4
- modern-uri ==0.2.1.0 - modern-uri ==0.2.1.0
- modify-fasta ==0.8.2.3 - modify-fasta ==0.8.3.0
- moesocks ==1.0.0.44 - moesocks ==1.0.0.44
- mole ==0.0.6 - mole ==0.0.6
- monad-control ==1.0.2.3 - monad-control ==1.0.2.3
@ -1333,7 +1335,7 @@ default-package-overrides:
- monad-unlift-ref ==0.2.1 - monad-unlift-ref ==0.2.1
- mongoDB ==2.3.0.5 - mongoDB ==2.3.0.5
- monoidal-containers ==0.3.1.0 - monoidal-containers ==0.3.1.0
- monoid-extras ==0.4.2 - monoid-extras ==0.4.3
- monoid-subclasses ==0.4.6 - monoid-subclasses ==0.4.6
- monoid-transformer ==0.0.4 - monoid-transformer ==0.0.4
- mono-traversable ==1.0.8.1 - mono-traversable ==1.0.8.1
@ -1370,7 +1372,7 @@ default-package-overrides:
- natural-transformation ==0.4 - natural-transformation ==0.4
- ndjson-conduit ==0.1.0.5 - ndjson-conduit ==0.1.0.5
- neat-interpolation ==0.3.2.1 - neat-interpolation ==0.3.2.1
- netlib-carray ==0.0.1 - netlib-carray ==0.0.1.1
- netlib-ffi ==0.0.1 - netlib-ffi ==0.0.1
- netpbm ==1.0.2 - netpbm ==1.0.2
- nettle ==0.2.0 - nettle ==0.2.0
@ -1555,7 +1557,7 @@ default-package-overrides:
- pomaps ==0.0.0.3 - pomaps ==0.0.0.3
- pooled-io ==0.0.2.1 - pooled-io ==0.0.2.1
- PortMidi ==0.1.6.1 - PortMidi ==0.1.6.1
- posix-paths ==0.2.1.4 - posix-paths ==0.2.1.5
- postgresql-binary ==0.12.1 - postgresql-binary ==0.12.1
- postgresql-libpq ==0.9.4.1 - postgresql-libpq ==0.9.4.1
- postgresql-schema ==0.1.14 - postgresql-schema ==0.1.14
@ -1624,7 +1626,7 @@ default-package-overrides:
- pureMD5 ==2.1.3 - pureMD5 ==2.1.3
- purescript-bridge ==0.11.1.2 - purescript-bridge ==0.11.1.2
- pushbullet-types ==0.4.1.0 - pushbullet-types ==0.4.1.0
- pusher-http-haskell ==1.5.1.3 - pusher-http-haskell ==1.5.1.4
- pwstore-fast ==2.4.4 - pwstore-fast ==2.4.4
- qchas ==1.1.0.0 - qchas ==1.1.0.0
- qm-interpolated-string ==0.3.0.0 - qm-interpolated-string ==0.3.0.0
@ -1638,7 +1640,7 @@ default-package-overrides:
- quickcheck-instances ==0.3.18 - quickcheck-instances ==0.3.18
- quickcheck-io ==0.2.0 - quickcheck-io ==0.2.0
- quickcheck-properties ==0.1 - quickcheck-properties ==0.1
- quickcheck-simple ==0.1.0.2 - quickcheck-simple ==0.1.0.3
- quickcheck-special ==0.1.0.6 - quickcheck-special ==0.1.0.6
- quickcheck-state-machine ==0.3.1 - quickcheck-state-machine ==0.3.1
- quickcheck-text ==0.1.2.1 - quickcheck-text ==0.1.2.1
@ -1748,14 +1750,14 @@ default-package-overrides:
- say ==0.1.0.0 - say ==0.1.0.0
- sbp ==2.3.13 - sbp ==2.3.13
- sbv ==7.5 - sbv ==7.5
- scalendar ==1.2.0
- SCalendar ==1.1.0 - SCalendar ==1.1.0
- scalendar ==1.2.0
- scalpel ==0.5.1 - scalpel ==0.5.1
- scalpel-core ==0.5.1 - scalpel-core ==0.5.1
- scanner ==0.2 - scanner ==0.2
- schematic ==0.4.2.0 - schematic ==0.4.2.0
- scientific ==0.3.5.3 - scientific ==0.3.5.3
- scotty ==0.11.0 - scotty ==0.11.1
- scrypt ==0.5.0 - scrypt ==0.5.0
- sdl2 ==2.4.0.1 - sdl2 ==2.4.0.1
- sdl2-gfx ==0.2 - sdl2-gfx ==0.2
@ -1789,7 +1791,7 @@ default-package-overrides:
- servant-exceptions ==0.1.1 - servant-exceptions ==0.1.1
- servant-foreign ==0.11.1 - servant-foreign ==0.11.1
- servant-generic ==0.1.0.1 - servant-generic ==0.1.0.1
- servant-github-webhook ==0.4.0.0 - servant-github-webhook ==0.4.1.0
- servant-js ==0.9.3.2 - servant-js ==0.9.3.2
- servant-JuicyPixels ==0.3.0.3 - servant-JuicyPixels ==0.3.0.3
- servant-kotlin ==0.1.1.0 - servant-kotlin ==0.1.1.0
@ -1817,7 +1819,7 @@ default-package-overrides:
- set-monad ==0.2.0.0 - set-monad ==0.2.0.0
- sets ==0.0.5.2 - sets ==0.0.5.2
- SHA ==1.6.4.4 - SHA ==1.6.4.4
- shake ==0.16.3 - shake ==0.16.4
- shake-language-c ==0.11.0 - shake-language-c ==0.11.0
- shakespeare ==2.0.15 - shakespeare ==2.0.15
- shelltestrunner ==1.9 - shelltestrunner ==1.9
@ -1920,7 +1922,7 @@ default-package-overrides:
- Strafunski-StrategyLib ==5.0.1.0 - Strafunski-StrategyLib ==5.0.1.0
- stratosphere ==0.19.1 - stratosphere ==0.19.1
- streaming ==0.2.1.0 - streaming ==0.2.1.0
- streaming-bytestring ==0.1.5 - streaming-bytestring ==0.1.6
- streaming-commons ==0.1.19 - streaming-commons ==0.1.19
- streamly ==0.1.2 - streamly ==0.1.2
- streamproc ==1.6.2 - streamproc ==1.6.2
@ -2052,7 +2054,7 @@ default-package-overrides:
- th-strict-compat ==0.1.0.1 - th-strict-compat ==0.1.0.1
- th-to-exp ==0.0.1.1 - th-to-exp ==0.0.1.1
- th-utilities ==0.2.0.1 - th-utilities ==0.2.0.1
- tibetan-utils ==0.1.1.4 - tibetan-utils ==0.1.1.5
- tidal ==0.9.6 - tidal ==0.9.6
- tidal-midi ==0.9.5.2 - tidal-midi ==0.9.5.2
- tile ==0.3.0.0 - tile ==0.3.0.0
@ -2060,9 +2062,9 @@ default-package-overrides:
- timeit ==2.0 - timeit ==2.0
- timelens ==0.2.0.2 - timelens ==0.2.0.2
- time-lens ==0.4.0.2 - time-lens ==0.4.0.2
- time-locale-compat ==0.1.1.3 - time-locale-compat ==0.1.1.4
- time-locale-vietnamese ==1.0.0.0 - time-locale-vietnamese ==1.0.0.0
- timemap ==0.0.6 - timemap ==0.0.7
- time-parsers ==0.1.2.0 - time-parsers ==0.1.2.0
- timerep ==2.0.0.2 - timerep ==2.0.0.2
- timespan ==0.3.0.0 - timespan ==0.3.0.0
@ -2113,7 +2115,7 @@ default-package-overrides:
- type-level-kv-list ==1.1.0 - type-level-kv-list ==1.1.0
- type-level-numbers ==0.1.1.1 - type-level-numbers ==0.1.1.1
- typelits-witnesses ==0.3.0.2 - typelits-witnesses ==0.3.0.2
- type-of-html ==1.3.3.2 - type-of-html ==1.3.4.0
- type-operators ==0.1.0.4 - type-operators ==0.1.0.4
- type-spec ==0.3.0.1 - type-spec ==0.3.0.1
- typography-geometry ==1.0.0.1 - typography-geometry ==1.0.0.1
@ -2130,14 +2132,14 @@ default-package-overrides:
- unfoldable-restricted ==0.0.3 - unfoldable-restricted ==0.0.3
- unicode ==0.0.1 - unicode ==0.0.1
- unicode-show ==0.1.0.2 - unicode-show ==0.1.0.2
- unicode-transforms ==0.3.3 - unicode-transforms ==0.3.4
- unification-fd ==0.10.0.1 - unification-fd ==0.10.0.1
- union ==0.1.1.2 - union ==0.1.1.2
- union-find ==0.2 - union-find ==0.2
- uniplate ==1.6.12 - uniplate ==1.6.12
- uniq-deep ==1.1.0.0 - uniq-deep ==1.1.0.0
- Unique ==0.4.7.2
- unique ==0 - unique ==0
- Unique ==0.4.7.2
- unit-constraint ==0.0.0 - unit-constraint ==0.0.0
- units-parser ==0.1.1.2 - units-parser ==0.1.1.2
- universe ==1.0 - universe ==1.0
@ -2227,7 +2229,7 @@ default-package-overrides:
- wai-middleware-metrics ==0.2.4 - wai-middleware-metrics ==0.2.4
- wai-middleware-prometheus ==0.3.0 - wai-middleware-prometheus ==0.3.0
- wai-middleware-rollbar ==0.10.0 - wai-middleware-rollbar ==0.10.0
- wai-middleware-static ==0.8.1 - wai-middleware-static ==0.8.2
- wai-middleware-throttle ==0.2.2.0 - wai-middleware-throttle ==0.2.2.0
- wai-predicates ==0.10.0 - wai-predicates ==0.10.0
- wai-route ==0.3.1.2 - wai-route ==0.3.1.2

2060
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

2
pkgs/development/interpreters/racket/default.nix
View File

@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
for p in $(ls $out/bin/) ; do for p in $(ls $out/bin/) ; do
wrapProgram $out/bin/$p --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}"; wrapProgram $out/bin/$p --prefix LD_LIBRARY_PATH ":" "${LD_LIBRARY_PATH}";
done done
''; '';

2
pkgs/development/node-packages/node-packages-v6.json
View File

@ -11,6 +11,8 @@
, "coinmon" , "coinmon"
, "configurable-http-proxy" , "configurable-http-proxy"
, "cordova" , "cordova"
, "create-react-app"
, "create-react-native-app"
, "csslint" , "csslint"
, "dat" , "dat"
, "dhcp" , "dhcp"

616
pkgs/development/node-packages/node-packages-v6.nix
View File

File diff suppressed because it is too large Load Diff

83
pkgs/development/node-packages/node-packages-v8.nix
View File

@ -508,13 +508,13 @@ let
sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
}; };
}; };
"aws4-1.6.0" = { "aws4-1.7.0" = {
name = "aws4"; name = "aws4";
packageName = "aws4"; packageName = "aws4";
version = "1.6.0"; version = "1.7.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz";
sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; sha512 = "3rkdcpm3myysvq9nj6plgvpngzsbv7qk1wvb9f4m3gcsl23pf5x0hyph02svyl2v1lgjji8kl75ii7q04lhhhgjyw1irbinmxsl6qyz";
}; };
}; };
"balanced-match-1.0.0" = { "balanced-match-1.0.0" = {
@ -706,13 +706,13 @@ let
sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7"; sha1 = "ba77962e12dff969d6b76711e914b737857bf6a7";
}; };
}; };
"braces-2.3.1" = { "braces-2.3.2" = {
name = "braces"; name = "braces";
packageName = "braces"; packageName = "braces";
version = "2.3.1"; version = "2.3.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/braces/-/braces-2.3.1.tgz"; url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz";
sha512 = "2fpcx8h100fhpaffr6mh5ysp6dv06nl5xkii807fw0c603i15sg3wsxmj63fdn4apxdnn8an2ks883mvrdsv7mfryhfxg1pf1h6bvj8"; sha512 = "3gxrfbb03jf6nh75n99snhv4a9jni48hfc0gkj5yl1cginpqx3d73dnp8snph1fdkc804iz6zg0aqibifjnscjfbpfziw2g7yg5pmv8";
}; };
}; };
"browser-stdout-1.3.1" = { "browser-stdout-1.3.1" = {
@ -1039,13 +1039,13 @@ let
sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
}; };
}; };
"cli-spinners-1.3.0" = { "cli-spinners-1.3.1" = {
name = "cli-spinners"; name = "cli-spinners";
packageName = "cli-spinners"; packageName = "cli-spinners";
version = "1.3.0"; version = "1.3.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.0.tgz"; url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz";
sha512 = "36fw6sfxv4nwbywjns5fvwflfdimmngjc44ri9xhmqq8cb64b0p19fk30m7ywhr9m9bac8a9jnkb22bs2h0bskv6y5spnqny6mzf6ka"; sha512 = "1vad3gya61nh9npwcrcrq0d7sq9v0a2zaqvvnhbzpqxfp24qkh3xb8372fk9yx7l1nm9gz2gvzjysksh9ggwlvzah1lp816ivkzh0nm";
}; };
}; };
"cli-table-0.3.1" = { "cli-table-0.3.1" = {
@ -3046,13 +3046,13 @@ let
sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
}; };
}; };
"hypercore-6.12.7" = { "hypercore-6.13.0" = {
name = "hypercore"; name = "hypercore";
packageName = "hypercore"; packageName = "hypercore";
version = "6.12.7"; version = "6.13.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/hypercore/-/hypercore-6.12.7.tgz"; url = "https://registry.npmjs.org/hypercore/-/hypercore-6.13.0.tgz";
sha512 = "28wgk53py46wrcp8h8xkirakbc3v64r1aaqnl0g0ivp9x7791wkga63mbjl0cdsa3yif0cvbp8djwcpzx0smfyyqkdz7skjdgsbg57j"; sha512 = "056r7rmx6zkfivza10a0fs5p2wlgxrb82gb1sz8hmjgczvc9gx652ybhbckmr0a0bjknc1yzd23zw6v3r2svasymvdfgcp9k98qf1hw";
}; };
}; };
"hypercore-protocol-6.6.4" = { "hypercore-protocol-6.6.4" = {
@ -3100,13 +3100,13 @@ let
sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d"; sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d";
}; };
}; };
"iconv-lite-0.4.19" = { "iconv-lite-0.4.21" = {
name = "iconv-lite"; name = "iconv-lite";
packageName = "iconv-lite"; packageName = "iconv-lite";
version = "0.4.19"; version = "0.4.21";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz"; url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz";
sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; sha512 = "0myjcmxx7dn5liikg8d2zgwb433sk761dfxwwnszyam16rzv5dzva352jrvav7cnambn0ha8fzh6g6xhdhxsd20l5v1p65r6vvmazhj";
}; };
}; };
"iconv-lite-0.4.8" = { "iconv-lite-0.4.8" = {
@ -5899,6 +5899,15 @@ let
sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e";
}; };
}; };
"safer-buffer-2.1.2" = {
name = "safer-buffer";
packageName = "safer-buffer";
version = "2.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1";
};
};
"sanitize-filename-1.6.1" = { "sanitize-filename-1.6.1" = {
name = "sanitize-filename"; name = "sanitize-filename";
packageName = "sanitize-filename"; packageName = "sanitize-filename";
@ -7617,7 +7626,7 @@ in
sources."formidable-1.2.1" sources."formidable-1.2.1"
sources."has-ansi-2.0.0" sources."has-ansi-2.0.0"
sources."has-flag-3.0.0" sources."has-flag-3.0.0"
sources."iconv-lite-0.4.19" sources."iconv-lite-0.4.21"
sources."inherits-2.0.3" sources."inherits-2.0.3"
(sources."inquirer-3.3.0" // { (sources."inquirer-3.3.0" // {
dependencies = [ dependencies = [
@ -7661,6 +7670,7 @@ in
sources."rx-lite-4.0.8" sources."rx-lite-4.0.8"
sources."rx-lite-aggregates-4.0.8" sources."rx-lite-aggregates-4.0.8"
sources."safe-buffer-5.1.1" sources."safe-buffer-5.1.1"
sources."safer-buffer-2.1.2"
sources."setimmediate-1.0.5" sources."setimmediate-1.0.5"
sources."shebang-command-1.2.0" sources."shebang-command-1.2.0"
sources."shebang-regex-1.0.0" sources."shebang-regex-1.0.0"
@ -7718,7 +7728,7 @@ in
sources."asynckit-0.4.0" sources."asynckit-0.4.0"
sources."atomic-batcher-1.0.2" sources."atomic-batcher-1.0.2"
sources."aws-sign2-0.7.0" sources."aws-sign2-0.7.0"
sources."aws4-1.6.0" sources."aws4-1.7.0"
sources."balanced-match-1.0.0" sources."balanced-match-1.0.0"
sources."bcrypt-pbkdf-1.0.1" sources."bcrypt-pbkdf-1.0.1"
sources."bencode-1.0.0" sources."bencode-1.0.0"
@ -7874,7 +7884,7 @@ in
sources."hoek-4.2.1" sources."hoek-4.2.1"
sources."http-methods-0.1.0" sources."http-methods-0.1.0"
sources."http-signature-1.2.0" sources."http-signature-1.2.0"
(sources."hypercore-6.12.7" // { (sources."hypercore-6.13.0" // {
dependencies = [ dependencies = [
sources."varint-5.0.0" sources."varint-5.0.0"
]; ];
@ -8202,7 +8212,7 @@ in
sources."assert-plus-1.0.0" sources."assert-plus-1.0.0"
sources."asynckit-0.4.0" sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0" sources."aws-sign2-0.7.0"
sources."aws4-1.6.0" sources."aws4-1.7.0"
sources."balanced-match-1.0.0" sources."balanced-match-1.0.0"
sources."bcrypt-pbkdf-1.0.1" sources."bcrypt-pbkdf-1.0.1"
sources."block-stream-0.0.9" sources."block-stream-0.0.9"
@ -8352,7 +8362,7 @@ in
sources."gauge-2.7.4" sources."gauge-2.7.4"
sources."glob-7.1.2" sources."glob-7.1.2"
sources."has-unicode-2.0.1" sources."has-unicode-2.0.1"
sources."iconv-lite-0.4.19" sources."iconv-lite-0.4.21"
sources."ignore-walk-3.0.1" sources."ignore-walk-3.0.1"
sources."inflight-1.0.6" sources."inflight-1.0.6"
sources."inherits-2.0.3" sources."inherits-2.0.3"
@ -8386,6 +8396,7 @@ in
sources."readable-stream-2.3.6" sources."readable-stream-2.3.6"
sources."rimraf-2.6.2" sources."rimraf-2.6.2"
sources."safe-buffer-5.1.1" sources."safe-buffer-5.1.1"
sources."safer-buffer-2.1.2"
sources."sax-1.2.4" sources."sax-1.2.4"
sources."semver-5.5.0" sources."semver-5.5.0"
sources."set-blocking-2.0.0" sources."set-blocking-2.0.0"
@ -8412,10 +8423,10 @@ in
pnpm = nodeEnv.buildNodePackage { pnpm = nodeEnv.buildNodePackage {
name = "pnpm"; name = "pnpm";
packageName = "pnpm"; packageName = "pnpm";
version = "1.38.2"; version = "1.38.3";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/pnpm/-/pnpm-1.38.2.tgz"; url = "https://registry.npmjs.org/pnpm/-/pnpm-1.38.3.tgz";
sha1 = "f0a9312db086d1446261575a69e05bdd545743aa"; sha1 = "84b7ce1eee5d893c51995752e8afc2ee726539e3";
}; };
buildInputs = globalBuildInputs; buildInputs = globalBuildInputs;
meta = { meta = {
@ -8511,7 +8522,7 @@ in
sources."async-2.6.0" sources."async-2.6.0"
sources."asynckit-0.4.0" sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0" sources."aws-sign2-0.7.0"
sources."aws4-1.6.0" sources."aws4-1.7.0"
sources."balanced-match-1.0.0" sources."balanced-match-1.0.0"
sources."base64-js-0.0.8" sources."base64-js-0.0.8"
sources."bcrypt-pbkdf-1.0.1" sources."bcrypt-pbkdf-1.0.1"
@ -8534,7 +8545,7 @@ in
sources."chalk-2.3.2" sources."chalk-2.3.2"
sources."chardet-0.4.2" sources."chardet-0.4.2"
sources."cli-cursor-2.1.0" sources."cli-cursor-2.1.0"
sources."cli-spinners-1.3.0" sources."cli-spinners-1.3.1"
sources."cli-width-2.2.0" sources."cli-width-2.2.0"
sources."cliui-2.1.0" sources."cliui-2.1.0"
sources."clone-1.0.4" sources."clone-1.0.4"
@ -8627,7 +8638,7 @@ in
sources."hawk-6.0.2" sources."hawk-6.0.2"
sources."hoek-4.2.1" sources."hoek-4.2.1"
sources."http-signature-1.2.0" sources."http-signature-1.2.0"
sources."iconv-lite-0.4.19" sources."iconv-lite-0.4.21"
sources."ieee754-1.1.11" sources."ieee754-1.1.11"
sources."inflight-1.0.6" sources."inflight-1.0.6"
sources."inherits-2.0.3" sources."inherits-2.0.3"
@ -8720,6 +8731,7 @@ in
sources."rx-lite-4.0.8" sources."rx-lite-4.0.8"
sources."rx-lite-aggregates-4.0.8" sources."rx-lite-aggregates-4.0.8"
sources."safe-buffer-5.1.1" sources."safe-buffer-5.1.1"
sources."safer-buffer-2.1.2"
sources."seek-bzip-1.0.5" sources."seek-bzip-1.0.5"
sources."semver-5.5.0" sources."semver-5.5.0"
sources."signal-exit-3.0.2" sources."signal-exit-3.0.2"
@ -8848,7 +8860,7 @@ in
}) })
sources."boxen-1.3.0" sources."boxen-1.3.0"
sources."brace-expansion-1.1.11" sources."brace-expansion-1.1.11"
(sources."braces-2.3.1" // { (sources."braces-2.3.2" // {
dependencies = [ dependencies = [
sources."is-extendable-0.1.1" sources."is-extendable-0.1.1"
]; ];
@ -9130,6 +9142,7 @@ in
sources."kind-of-3.2.2" sources."kind-of-3.2.2"
]; ];
}) })
sources."kind-of-3.2.2"
sources."lru-cache-4.1.2" sources."lru-cache-4.1.2"
sources."minimist-1.2.0" sources."minimist-1.2.0"
sources."strip-ansi-4.0.0" sources."strip-ansi-4.0.0"
@ -9222,11 +9235,7 @@ in
sources."kind-of-4.0.0" sources."kind-of-4.0.0"
]; ];
}) })
(sources."snapdragon-node-2.1.1" // { sources."snapdragon-node-2.1.1"
dependencies = [
sources."kind-of-3.2.2"
];
})
sources."snapdragon-util-3.0.1" sources."snapdragon-util-3.0.1"
sources."source-map-0.5.7" sources."source-map-0.5.7"
sources."source-map-resolve-0.5.1" sources."source-map-resolve-0.5.1"

4
pkgs/development/python-modules/pyhomematic/default.nix
View File

@ -2,7 +2,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyhomematic"; pname = "pyhomematic";
version = "0.1.40"; version = "0.1.41";
disabled = !isPy3k; disabled = !isPy3k;
@ -11,7 +11,7 @@ buildPythonPackage rec {
owner = "danielperna84"; owner = "danielperna84";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0rflfak505cgc69594yc9chz5mblqvc2d7bbbfcddzhlhs5qcsq2"; sha256 = "01j6y2ypi7a8ffnkqd8j8vnpszza2cxqpiqbnk1dwbg9w9pwwq53";
}; };
# Unreliable timing: https://github.com/danielperna84/pyhomematic/issues/126 # Unreliable timing: https://github.com/danielperna84/pyhomematic/issues/126

4
pkgs/development/tools/analysis/radare2/default.nix
View File

@ -13,7 +13,7 @@ let
inherit (stdenv.lib) optional; inherit (stdenv.lib) optional;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.4.0"; version = "2.5.0";
name = "radare2-${version}"; name = "radare2-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
capstone = fetchgit { capstone = fetchgit {
url = "https://github.com/aquynh/capstone.git"; url = "https://github.com/aquynh/capstone.git";
rev = cs_tip; rev = cs_tip;
sha256 = "1b126npshdbwh5y7rafmb9w4dzlvxsf4ca6bx4zs2y7kbk48jyn8"; sha256 = "19vfgdfykmi3cfs4x1acxy0gnwggjjc8qq46pybqvcksbi11nw1k";
leaveDotGit = true; leaveDotGit = true;
}; };
in '' in ''

4
pkgs/development/tools/database/liquibase/default.nix
View File

@ -12,11 +12,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "liquibase"; pname = "liquibase";
version = "3.5.5"; version = "3.6.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz"; url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz";
sha256 = "1ipjbzdb32xigm0vg6zzjnbx9n248rrkr324n5igp53nxbvgf3fs"; sha256 = "0nrszf80s5v485li7xy8jkl1wsgjq6inr33m7p85splxhdgszjlb";
}; };
buildInputs = [ jre makeWrapper ]; buildInputs = [ jre makeWrapper ];

4
pkgs/development/tools/misc/strace/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "strace-${version}"; name = "strace-${version}";
version = "4.21"; version = "4.22";
src = fetchurl { src = fetchurl {
url = "https://strace.io/files/${version}/${name}.tar.xz"; url = "https://strace.io/files/${version}/${name}.tar.xz";
sha256 = "0dsw6xcfrmygidp1dj2ch8cl8icrar7789snkb2r8gh78kdqhxjw"; sha256 = "17dkpnsjxmys1ydidm9wcvc3wscsz44fmlxw3dclspn9cj9d1306";
}; };
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];

2
pkgs/os-specific/darwin/opencflite/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0jgmzs0ycl930hmzcvx0ykryik56704yw62w394q1q3xw5kkjn9v"; sha256 = "0jgmzs0ycl930hmzcvx0ykryik56704yw62w394q1q3xw5kkjn9v";
}; };
configureFlags = [ "--with-uuid=${libuuid}" ]; configureFlags = [ "--with-uuid=${libuuid.dev}" ];
buildInputs = [ icu tzdata.dev ]; buildInputs = [ icu tzdata.dev ];
enableParallelBuilding = true; enableParallelBuilding = true;

6
pkgs/servers/monitoring/prometheus/default.nix
View File

@ -17,7 +17,7 @@ let
inherit sha256; inherit sha256;
}; };
docheck = true; doCheck = true;
buildFlagsArray = let t = "${goPackagePath}/version"; in '' buildFlagsArray = let t = "${goPackagePath}/version"; in ''
-ldflags= -ldflags=
@ -50,7 +50,7 @@ in rec {
}; };
prometheus_2 = generic { prometheus_2 = generic {
version = "2.1.0"; version = "2.2.1";
sha256 = "01pbqfp43qrqcgyidyg2lw9jnjdrv140vnmqmm49z0vhlkxkwlvw"; sha256 = "1zwxjmj8jh02i4y3i3zrkz7ml66zyhg3ad1npjzf3319mglsp7ch";
}; };
} }

4
pkgs/servers/nosql/apache-jena/fuseki-binary.nix
View File

@ -3,10 +3,10 @@ let
s = # Generated upstream information s = # Generated upstream information
rec { rec {
baseName="apache-jena-fuseki"; baseName="apache-jena-fuseki";
version = "3.6.0"; version = "3.7.0";
name="${baseName}-${version}"; name="${baseName}-${version}";
url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz"; url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
sha256 = "0wmhfr1jlk34cimpz7gvfbi4bh8ki02acbmwdksnkal61f2dxj8q"; sha256 = "1824rvdrs9yhjinac2vkvkxvns8bfdvy91k5ghzzk0nrdcj31pmr";
}; };
buildInputs = [ buildInputs = [
makeWrapper makeWrapper

6
pkgs/servers/tt-rss/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tt-rss-${version}"; name = "tt-rss-${version}";
version = "2018-01-05"; version = "2018-04-05";
rev = "c30f5e18119d1935e8fe6d422053b127e8f4f1b3"; rev = "963c22646b3e1bd544bd957bf34175b996bd6e53";
src = fetchurl { src = fetchurl {
url = "https://git.tt-rss.org/git/tt-rss/archive/${rev}.tar.gz"; url = "https://git.tt-rss.org/git/tt-rss/archive/${rev}.tar.gz";
sha256 = "18pc1l0dbjr7d5grcrb70y6j7cr2zb9575yqmy6zfwzrlvw0pa0l"; sha256 = "02vjw5cag5x0rpiqalfrqf7iz21rp8ml5wnfd8pdkxbr8182bw3h";
}; };
installPhase = '' installPhase = ''

19
pkgs/tools/backup/wal-g/default.nix
View File

@ -1,11 +1,20 @@
{ stdenv, buildGoPackage, fetchurl }: { stdenv, buildGoPackage, fetchFromGitHub }:
let
rev = "966f3c5f45ba18b2225c5b06918e41f56e223e73";
revCount = "240";
sha256 = "1m70a5rpycrfwrrc83745mamgpg54pc0n75qpzr9jbvicbp8g66p";
in
buildGoPackage rec { buildGoPackage rec {
name = "wal-g-${version}"; name = "wal-g-${version}";
version = "0.1.2"; version = "0.1.8pre${revCount}_${builtins.substring 0 9 rev}";
src = fetchurl {
url = https://github.com/wal-g/wal-g/archive/v0.1.2.tar.gz; src = fetchFromGitHub {
sha256 = "0zkjs72gq7sc9cqqzxr6ms1ibk8466zpwmrziq9p4jv9r4iq3bfb"; owner = "wal-g";
repo = "wal-g";
inherit rev sha256;
}; };
goPackagePath = "github.com/wal-g/wal-g"; goPackagePath = "github.com/wal-g/wal-g";
meta = { meta = {
homepage = https://github.com/wal-g/wal-g; homepage = https://github.com/wal-g/wal-g;

6
pkgs/tools/compression/pigz/default.nix
View File

@ -1,20 +1,22 @@
{ stdenv, fetchurl, zlib, utillinux }: { stdenv, fetchurl, zlib, utillinux }:
let name = "pigz"; let name = "pigz";
version = "2.3.4"; version = "2.4";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = name + "-" + version; name = name + "-" + version;
src = fetchurl { src = fetchurl {
url = "http://www.zlib.net/${name}/${name}-${version}.tar.gz"; url = "http://www.zlib.net/${name}/${name}-${version}.tar.gz";
sha256 = "16lgbjzzfx0k4a1znsw8kq3lnkx17gw93zq2sn01sny11fj1y0vg"; sha256 = "0wsgw5vwl23jrnpsvd8v3xcp5k4waw5mk0164fynjhkv58i1dy54";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux utillinux; buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux utillinux;
makeFlags = [ "CC=cc" ];
doCheck = stdenv.isLinux; doCheck = stdenv.isLinux;
checkTarget = "tests"; checkTarget = "tests";
installPhase = installPhase =

4
pkgs/tools/networking/offlineimap/default.nix
View File

@ -2,7 +2,7 @@
asciidoc, libxml2, libxslt, docbook_xml_xslt }: asciidoc, libxml2, libxslt, docbook_xml_xslt }:
pythonPackages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
version = "7.1.5"; version = "7.2.0";
name = "offlineimap-${version}"; name = "offlineimap-${version}";
namePrefix = ""; namePrefix = "";
@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
owner = "OfflineIMAP"; owner = "OfflineIMAP";
repo = "offlineimap"; repo = "offlineimap";
rev = "v${version}"; rev = "v${version}";
sha256 = "0qm5vhzm8hkab2zs2l8ffg754wkws2nyd4pwb332v3zckf11flzd"; sha256 = "0xyvqgy36n0bb41c4ffldyrcnaja5gpwx2ngbnk3qs22ldb2n1sb";
}; };
postPatch = '' postPatch = ''

4
pkgs/tools/package-management/nix-review/default.nix
View File

@ -7,13 +7,13 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "nix-review"; pname = "nix-review";
version = "0.1.0"; version = "0.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Mic92"; owner = "Mic92";
repo = "nix-review"; repo = "nix-review";
rev = version; rev = version;
sha256 = "1kafp3x95dklydy5224w0a292rd8pv30lz6z5ddk6y7zg3fsxrcr"; sha256 = "06lj3q6405fw18fq1xg0bm52cwlwx94lx5hn4zpz3rxl5g49wiyz";
}; };
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];

4
pkgs/tools/system/htop/default.nix
View File

@ -3,11 +3,11 @@ IOKit, python }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "htop-${version}"; name = "htop-${version}";
version = "2.1.0"; version = "2.2.0";
src = fetchurl { src = fetchurl {
url = "http://hisham.hm/htop/releases/${version}/${name}.tar.gz"; url = "http://hisham.hm/htop/releases/${version}/${name}.tar.gz";
sha256 = "0j07z0xm2gj1vzvbgh4323k4db9mr7drd7gw95mmpqi61ncvwq1j"; sha256 = "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr";
}; };
nativeBuildInputs = [ python ]; nativeBuildInputs = [ python ];

4
pkgs/tools/system/ipmiutil/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
baseName = "ipmiutil"; baseName = "ipmiutil";
version = "3.0.8"; version = "3.0.9";
name = "${baseName}-${version}"; name = "${baseName}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
sha256 = "0pqi63v9l95px1k0dh68gmbd4pbbpwy0pcg6nr5bi0zy898if135"; sha256 = "0j4lsfdj2bk1b1vw9l00zv1g4jan05p09szqbzxgqqw2lpnca4i7";
}; };
buildInputs = [ openssl ]; buildInputs = [ openssl ];

4
pkgs/tools/system/lr/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lr-${version}"; name = "lr-${version}";
version = "1.2"; version = "1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chneukirchen"; owner = "chneukirchen";
repo = "lr"; repo = "lr";
rev = "v${version}"; rev = "v${version}";
sha256 = "1536d723dm50gxgpf8i9yij8mr0csh662ljhs5bmz0945jwfbx4n"; sha256 = "0g4iqz8ddv7dsrfhx0828bmc16ff8qp8xh5ya9f0n5qj4zh4cn35";
}; };
makeFlags = "PREFIX=$(out)"; makeFlags = "PREFIX=$(out)";

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

@ -629,9 +629,9 @@ with pkgs;
encryptr = callPackage ../tools/security/encryptr { encryptr = callPackage ../tools/security/encryptr {
gconf = gnome2.GConf; gconf = gnome2.GConf;
}; };
enchive = callPackage ../tools/security/enchive { }; enchive = callPackage ../tools/security/enchive { };
enpass = callPackage ../tools/security/enpass { }; enpass = callPackage ../tools/security/enpass { };
@ -4723,6 +4723,8 @@ with pkgs;
safe-rm = callPackage ../tools/system/safe-rm { }; safe-rm = callPackage ../tools/system/safe-rm { };
safeeyes = callPackage ../applications/misc/safeeyes { };
salt = callPackage ../tools/admin/salt {}; salt = callPackage ../tools/admin/salt {};
salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {}; salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {};
@ -15177,10 +15179,11 @@ with pkgs;
# go 1.9 pin until https://github.com/moby/moby/pull/35739 # go 1.9 pin until https://github.com/moby/moby/pull/35739
inherit (callPackage ../applications/virtualization/docker { go = go_1_9; }) inherit (callPackage ../applications/virtualization/docker { go = go_1_9; })
docker_18_03; docker_18_03
docker_18_04;
docker = docker_18_03; docker = docker_18_03;
docker-edge = docker_18_03; docker-edge = docker_18_04;
docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };
@ -16732,6 +16735,8 @@ with pkgs;
xmrig = callPackage ../applications/misc/xmrig { }; xmrig = callPackage ../applications/misc/xmrig { };
xmrig-proxy = callPackage ../applications/misc/xmrig-proxy { };
monkeysAudio = callPackage ../applications/audio/monkeys-audio { }; monkeysAudio = callPackage ../applications/audio/monkeys-audio { };
monkeysphere = callPackage ../tools/security/monkeysphere { }; monkeysphere = callPackage ../tools/security/monkeysphere { };