diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index a1d9199b4e1d..4220a9500b0e 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -895,6 +895,35 @@
Citrix Receiver (citrix_receiver) has been dropped in favor of Citrix Workspace (citrix_workspace).
+
+
+ The services.gitlab module has had its literal secret options (,
+ ,
+ ,
+ ,
+ ,
+ and
+ ) replaced by file-based versions (,
+ ,
+ ,
+ ,
+ ,
+ and
+ ). This was done so that secrets aren't stored
+ in the world-readable nix store, but means that for each option you'll have to create a file with
+ the same exact string, add "File" to the end of the option name, and change the definition to a
+ string pointing to the corresponding file; e.g. services.gitlab.databasePassword = "supersecurepassword"
+ becomes services.gitlab.databasePasswordFile = "/path/to/secret_file" where the
+ file secret_file contains the string supersecurepassword.
+
+
+ The state path () now has the following restriction:
+ no parent directory can be owned by any other user than root or the user
+ specified in ; i.e. if
+ is set to /var/lib/gitlab/state, gitlab and all parent directories
+ must be owned by either root or the user specified in .
+
+
diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix
index e19935b77caf..75b3e707d576 100644
--- a/nixos/modules/programs/less.nix
+++ b/nixos/modules/programs/less.nix
@@ -54,8 +54,8 @@ in
type = types.attrsOf types.str;
default = {};
example = {
- h = "noaction 5\e(";
- l = "noaction 5\e)";
+ h = "noaction 5\\e(";
+ l = "noaction 5\\e)";
};
description = "Defines new command keys.";
};
diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
index 89aa9d17ff7f..4db35d9e89ab 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -68,7 +68,7 @@ let
replaced with rspamd_proxy.
'';
apply = let
- from = "services.rspamd.workers.\”${name}\".type";
+ from = "services.rspamd.workers.\"${name}\".type";
files = options.type.files;
warning = "The option `${from}` defined in ${showFiles files} has enum value `proxy` which has been renamed to `rspamd_proxy`";
in x: if x == "proxy" then traceWarning warning "rspamd_proxy" else x;
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index bcf0603c6f39..97cc0624c160 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -225,7 +225,15 @@ in {
statePath = mkOption {
type = types.str;
default = "/var/gitlab/state";
- description = "Gitlab state directory, logs are stored here.";
+ description = ''
+ Gitlab state directory. Configuration, repositories and
+ logs, among other things, are stored here.
+
+ The directory will be created automatically if it doesn't
+ exist already. Its parent directories must be owned by
+ either root or the user set in
+ .
+ '';
};
backupPath = mkOption {
@@ -675,6 +683,10 @@ in {
openssh
nodejs
gnupg
+
+ # Needed for GitLab project imports
+ gnutar
+ gzip
];
serviceConfig = {
Type = "simple";
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 64cb6c3da1e5..f7874af3df29 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -239,7 +239,7 @@ in {
description = "Any metrics received which match one of the experssions will be dropped.";
default = null;
type = types.nullOr types.str;
- example = "^some\.noisy\.metric\.prefix\..*";
+ example = "^some\\.noisy\\.metric\\.prefix\\..*";
};
whitelist = mkOption {
diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix
index 1ae063aa6bb5..7a503e711665 100644
--- a/nixos/modules/services/networking/prosody.nix
+++ b/nixos/modules/services/networking/prosody.nix
@@ -465,7 +465,7 @@ in
modules_enabled = {
- ${ lib.concatStringsSep "\n\ \ " (lib.mapAttrsToList
+ ${ lib.concatStringsSep "\n " (lib.mapAttrsToList
(name: val: optionalString val "${toLua name};")
cfg.modules) }
${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.package.communityModules)}
diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix
index d9f840408cc8..1e34aff8d171 100644
--- a/nixos/modules/services/web-apps/matomo.nix
+++ b/nixos/modules/services/web-apps/matomo.nix
@@ -105,8 +105,8 @@ in {
default = null;
example = {
serverAliases = [
- "matomo.$\{config.networking.domain\}"
- "stats.$\{config.networking.domain\}"
+ "matomo.\${config.networking.domain}"
+ "stats.\${config.networking.domain}"
];
enableACME = false;
};
@@ -115,7 +115,7 @@ in {
Either this option or the webServerUser option is mandatory.
Set this to {} to just enable the virtualHost if you don't need any customization.
If enabled, then by default, the is
- ${user}.$\{config.networking.hostName\}.$\{config.networking.domain\},
+ ''${user}.''${config.networking.hostName}.''${config.networking.domain},
SSL is active, and certificates are acquired via ACME.
If this is set to null (the default), no nginx virtualHost will be configured.
'';
@@ -275,7 +275,7 @@ in {
fastcgi_pass unix:${phpSocket};
'';
# Any other attempt to access any php files is forbidden
- locations."~* ^.+\.php$".extraConfig = ''
+ locations."~* ^.+\\.php$".extraConfig = ''
return 403;
'';
# Disallow access to unneeded directories
@@ -284,7 +284,7 @@ in {
return 403;
'';
# Disallow access to several helper files
- locations."~* \.(?:bat|git|ini|sh|txt|tpl|xml|md)$".extraConfig = ''
+ locations."~* \\.(?:bat|git|ini|sh|txt|tpl|xml|md)$".extraConfig = ''
return 403;
'';
# No crawling of this site for bots that obey robots.txt - no useful information here.
diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix
index f220669c9108..d3c97e86582f 100644
--- a/nixos/modules/services/web-apps/restya-board.nix
+++ b/nixos/modules/services/web-apps/restya-board.nix
@@ -236,7 +236,7 @@ in
locations."/".root = "${runDir}/client";
- locations."~ \.php$" = {
+ locations."~ \\.php$" = {
tryFiles = "$uri =404";
extraConfig = ''
include ${pkgs.nginx}/conf/fastcgi_params;
@@ -247,7 +247,7 @@ in
'';
};
- locations."~* \.(css|js|less|html|ttf|woff|jpg|jpeg|gif|png|bmp|ico)" = {
+ locations."~* \\.(css|js|less|html|ttf|woff|jpg|jpeg|gif|png|bmp|ico)" = {
root = "${runDir}/client";
extraConfig = ''
if (-f $request_filename) {
diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
index abe4748591e9..b92e34498949 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixos/modules/services/web-apps/tt-rss.nix
@@ -548,7 +548,7 @@ let
index = "index.php";
};
- locations."~ \.php$" = {
+ locations."~ \\.php$" = {
extraConfig = ''
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket};
diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 8ff00fa11dc7..641cf9faadc9 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -10,6 +10,9 @@ use Cwd 'abs_path';
my $out = "@out@";
+# FIXME: maybe we should use /proc/1/exe to get the current systemd.
+my $curSystemd = abs_path("/run/current-system/sw/bin");
+
# To be robust against interruption, record what units need to be started etc.
my $startListFile = "/run/systemd/start-list";
my $restartListFile = "/run/systemd/restart-list";
@@ -267,7 +270,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
sub pathToUnitName {
my ($path) = @_;
# Use current version of systemctl binary before daemon is reexeced.
- open my $cmd, "-|", "/run/current-system/sw/bin/systemd-escape", "--suffix=mount", "-p", $path
+ open my $cmd, "-|", "$curSystemd/systemd-escape", "--suffix=mount", "-p", $path
or die "Unable to escape $path!\n";
my $escaped = join "", <$cmd>;
chomp $escaped;
@@ -370,7 +373,7 @@ if (scalar (keys %unitsToStop) > 0) {
print STDERR "stopping the following units: ", join(", ", @unitsToStopFiltered), "\n"
if scalar @unitsToStopFiltered;
# Use current version of systemctl binary before daemon is reexeced.
- system("/run/current-system/sw/bin/systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors?
+ system("$curSystemd/systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors?
}
print STDERR "NOT restarting the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n"
@@ -382,10 +385,12 @@ my $res = 0;
print STDERR "activating the configuration...\n";
system("$out/activate", "$out") == 0 or $res = 2;
-# Restart systemd if necessary.
+# Restart systemd if necessary. Note that this is done using the
+# current version of systemd, just in case the new one has trouble
+# communicating with the running pid 1.
if ($restartSystemd) {
print STDERR "restarting systemd...\n";
- system("@systemd@/bin/systemctl", "daemon-reexec") == 0 or $res = 2;
+ system("$curSystemd/systemctl", "daemon-reexec") == 0 or $res = 2;
}
# Forget about previously failed services.
@@ -401,8 +406,10 @@ while (my $f = <$listActiveUsers>) {
my ($uid, $name) = ($+{uid}, $+{user});
print STDERR "reloading user units for $name...\n";
- system("@su@", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user daemon-reload");
- system("@su@", "-s", "@shell@", "-l", $name, "-c", "XDG_RUNTIME_DIR=/run/user/$uid @systemd@/bin/systemctl --user start nixos-activation.service");
+ system("@su@", "-s", "@shell@", "-l", $name, "-c",
+ "export XDG_RUNTIME_DIR=/run/user/$uid; " .
+ "$curSystemd/systemctl --user daemon-reexec; " .
+ "@systemd@/bin/systemctl --user start nixos-activation.service");
}
close $listActiveUsers;
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index 34e270667151..7c6604922cf7 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -12,7 +12,7 @@ let
i.ipv4.addresses
++ optionals cfg.enableIPv6 i.ipv6.addresses;
- dhcpStr = useDHCP: if useDHCP == true || useDHCP == null then "both" else "no";
+ dhcpStr = useDHCP: if useDHCP == true || useDHCP == null then "yes" else "no";
slaves =
concatLists (map (bond: bond.interfaces) (attrValues cfg.bonds))
diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix
index d8fada45eb16..b8ec2d7116f5 100644
--- a/pkgs/applications/audio/gigedit/default.nix
+++ b/pkgs/applications/audio/gigedit/default.nix
@@ -4,15 +4,13 @@
stdenv.mkDerivation rec {
pname = "gigedit";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchurl {
url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";
- sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni";
+ sha256 = "08db12crwf0dy1dbyrmivqqpg5zicjikqkmf2kb1ywpq0a9hcxrb";
};
- patches = [ ./gigedit-1.1.0-pangomm-2.40.1.patch ];
-
preConfigure = "make -f Makefile.svn";
nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ];
diff --git a/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch b/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch
deleted file mode 100644
index eb00fcc87a24..000000000000
--- a/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/gigedit/wrapLabel.cc
-+++ b/src/gigedit/wrapLabel.cc
-@@ -64,12 +64,7 @@ WrapLabel::WrapLabel(const Glib::ustring &text) // IN: The label text
- : mWrapWidth(0),
- mWrapHeight(0)
- {
-- // pangomm >= 2.35.1
--#if PANGOMM_MAJOR_VERSION > 2 || (PANGOMM_MAJOR_VERSION == 2 && (PANGOMM_MINOR_VERSION > 35 || (PANGOMM_MINOR_VERSION == 35 && PANGOMM_MICRO_VERSION >= 1)))
-- get_layout()->set_wrap(Pango::WrapMode::WORD_CHAR);
--#else
- get_layout()->set_wrap(Pango::WRAP_WORD_CHAR);
--#endif
- set_alignment(0.0, 0.0);
- set_text(text);
- }
diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index c574c862f521..a5248e2a89ef 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec {
];
propagatedBuildInputs = with pythonPackages; [
- gst-python pygobject3 pykka tornado_4 requests
+ gst-python pygobject3 pykka tornado_4 requests setuptools
] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python;
# There are no tests
diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index 3a663fd33c81..90b81e1163d8 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -2,11 +2,11 @@
pythonPackages.buildPythonApplication rec {
pname = "Mopidy-Iris";
- version = "3.39.0";
+ version = "3.40.0";
src = pythonPackages.fetchPypi {
inherit pname version;
- sha256 = "1d2g66gvm7yaz4nbxlh23lj2xfkhi3hsg2k646m1za510f8dzlag";
+ sha256 = "1cn68zmyvig114dsw7vhx761v9c1za3wnbq4y2z0f0cbl958n49v";
};
propagatedBuildInputs = [
diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/applications/audio/paulstretch/default.nix
index b2c049c9eeeb..b9a3f39affb1 100644
--- a/pkgs/applications/audio/paulstretch/default.nix
+++ b/pkgs/applications/audio/paulstretch/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchFromGitHub, audiofile, libvorbis, fltk, fftw, fftwFloat,
-minixml, pkgconfig, libmad, libjack2, portaudio, libsamplerate }:
+{ stdenv, fetchFromGitHub, fetchpatch
+, audiofile, libvorbis, fltk, fftw, fftwFloat
+, minixml, pkgconfig, libmad, libjack2, portaudio, libsamplerate
+}:
stdenv.mkDerivation {
pname = "paulstretch";
@@ -27,6 +29,13 @@ stdenv.mkDerivation {
libsamplerate
];
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/paulnasca/paulstretch_cpp/pull/12.patch";
+ sha256 = "0lx1rfrs53afkiz1drp456asqgj5yv6hx3lkc01165cv1jsbw6q4";
+ })
+ ];
+
buildPhase = ''
bash compile_linux_fftw_jack.sh
'';
diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix
index 241bb71983a0..76d4e989e8c3 100644
--- a/pkgs/applications/kde/dolphin.nix
+++ b/pkgs/applications/kde/dolphin.nix
@@ -15,6 +15,7 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ propagatedUserEnvPkgs = [ baloo ];
propagatedBuildInputs = [
baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig
kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes
diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index 64e0f0d325b5..e46df5d59e0e 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -1,33 +1,72 @@
-{ stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc, gcc-unwrapped }:
+{ stdenv
+, fetchurl
+, makeDesktopItem
+, makeWrapper
+, patchelf
+, fontconfig
+, freetype
+, gcc
+, gcc-unwrapped
+, iputils
+, psmisc
+, xorg }:
stdenv.mkDerivation rec {
- pname = "IPMIView";
- version = "2.14.0";
- buildVersion = "180213";
+ pname = "IPMIView";
+ version = "2.16.0";
+ buildVersion = "190815";
- src = fetchurl {
- url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz";
- sha256 = "1wp22wm7smlsb25x0cck4p660cycfczxj381930crd1qrf68mw4h";
+ src = fetchurl {
+ url = "https://www.supermicro.com/wftp/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz";
+ sha256 = "0qw9zfnj0cyvab7ndamlw2y0gpczjhh1jkz8340kl42r2xmhkvpl";
};
- nativeBuildInputs = [ patchelf makeWrapper ];
+ nativeBuildInputs = [ patchelf makeWrapper ];
+ buildPhase = with xorg;
+ let
+ stunnelBinary = if stdenv.hostPlatform.system == "x86_64-linux" then "linux/stunnel64"
+ else if stdenv.hostPlatform.system == "i686-linux" then "linux/stunnel32"
+ else throw "IPMIView is not supported on this platform";
+ in
+ ''
+ patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so
+ patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so
+ patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM64.so
+ patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./BMCSecurity/${stunnelBinary}
+ '';
- buildPhase = with xorg; ''
- patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/xawt/libmawt.so
- patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM64.so
- patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libXcursor libX11 libXext libXrender libXtst libXi ]}" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/javaws
- patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java
- '';
+ desktopItem = makeDesktopItem rec {
+ name = "IPMIView";
+ exec = "IPMIView";
+ desktopName = name;
+ genericName = "Supermicro BMC manager";
+ categories = "Network;Configuration";
+ };
- installPhase = ''
- mkdir -p $out/bin
- cp -R . $out/
- makeWrapper $out/jre/bin/java $out/bin/IPMIView \
- --prefix PATH : "$out/jre/bin" \
- --add-flags "-jar $out/IPMIView20.jar"
- '';
+ installPhase = ''
+ mkdir -p $out/bin
+ cp -R . $out/
- meta = with stdenv.lib; {
+ ln -s ${desktopItem}/share $out/share
+
+ # LD_LIBRARY_PATH: fontconfig is used from java code
+ # PATH: iputils is used for ping, and psmisc is for killall
+ # WORK_DIR: unfortunately the ikvm related binaries are loaded from
+ # and user configuration is written to files in the CWD
+ makeWrapper $out/jre/bin/java $out/bin/IPMIView \
+ --set LD_LIBRARY_PATH "${stdenv.lib.makeLibraryPath [ fontconfig ]}" \
+ --prefix PATH : "$out/jre/bin:${iputils}/bin:${psmisc}/bin" \
+ --add-flags "-jar $out/IPMIView20.jar" \
+ --run 'WORK_DIR=''${XDG_DATA_HOME:-~/.local/share}/ipmiview
+ mkdir -p $WORK_DIR
+ ln -snf '$out'/iKVM.jar '$out'/libiKVM* '$out'/libSharedLibrary* $WORK_DIR
+ cd $WORK_DIR'
+ '';
+
+ meta = with stdenv.lib; {
license = licenses.unfree;
- };
- }
+ maintainers = with maintainers; [ vlaci ];
+ platforms = [ "x86_64-linux" "i686-linux" ];
+ };
+}
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 45fb820a076c..ae3659a21fef 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -82,11 +82,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
- version = "0.68.131";
+ version = "0.69.128";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- sha256 = "0syhwy1gxy82jbxbryi1n4zp1ya7wvm20g1vqvd2s7kqspprsi0l";
+ sha256 = "1w5p2hbn14k239fbqrbxkw9h3p8wm7cdyjcyvrsss57fj00j8s4r";
};
dontConfigure = true;
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 6a5bcbfcdbea..3fd0691727aa 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -265,17 +265,17 @@ in rec {
gtk3Support = false;
};
- tor-browser-8-5 = tbcommon {
- ffversion = "60.8.0esr";
- tbversion = "8.5.4";
+ tor-browser-8-5 = tbcommon rec {
+ ffversion = "60.9.0esr";
+ tbversion = "8.5.6";
# FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
src = fetchFromGitHub {
owner = "SLNOS";
repo = "tor-browser";
- # branch "tor-browser-60.8.0esr-8.5-1-slnos"
- rev = "9ec7e4832a68ba3a77f5e8e21dc930a25757f55d";
- sha256 = "10x9h2nm1p8cs0qnd8yjp7ly5raxagqyfjn4sj2y3i86ya5zygb9";
+ # branch "tor-browser-60.9.0esr-8.5-2-slnos"
+ rev = "0489ae3158cd8c0e16c2e78b94083d8cbf0209dc";
+ sha256 = "0y5s7d8pg8ak990dp8d801j9823igaibfhv9hsa79nib5yllifzs";
};
patches = [
diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix
index bd38855109a1..6fd66096b5b2 100644
--- a/pkgs/applications/networking/irc/kvirc/default.nix
+++ b/pkgs/applications/networking/irc/kvirc/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub
+{ lib, mkDerivation, fetchFromGitHub
, qtbase, qtmultimedia, qtsvg, qtx11extras
, pkgconfig, cmake, gettext
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "kvirc";
version = "5.0.0";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
pkgconfig cmake gettext
];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Advanced IRC Client";
homepage = "http://www.kvirc.net/";
license = licenses.gpl2;
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index 6aacdde544bc..6addd66ac634 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -1,5 +1,5 @@
{ monolithic ? true # build monolithic Quassel
-, daemon ? false # build Quassel daemon
+, enableDaemon ? false # build Quassel daemon
, client ? false # build Quassel client
, tag ? "-kf5" # tag added to the package name
, static ? false # link statically
@@ -21,11 +21,11 @@
let
buildClient = monolithic || client;
- buildCore = monolithic || daemon;
+ buildCore = monolithic || enableDaemon;
in
-assert monolithic -> !client && !daemon;
-assert client || daemon -> !monolithic;
+assert monolithic -> !client && !enableDaemon;
+assert client || enableDaemon -> !monolithic;
assert !buildClient -> !withKDE; # KDE is used by the client only
let
@@ -63,12 +63,12 @@ in with stdenv; mkDerivation rec {
]
++ edf static "STATIC"
++ edf monolithic "WANT_MONO"
- ++ edf daemon "WANT_CORE"
+ ++ edf enableDaemon "WANT_CORE"
++ edf client "WANT_QTCLIENT"
++ edf withKDE "WITH_KDE";
preFixup =
- lib.optionalString daemon ''
+ lib.optionalString enableDaemon ''
wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin"
'' +
lib.optionalString buildClient ''
diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix
index cd512e776130..85b73141966b 100644
--- a/pkgs/applications/networking/mailreaders/afew/default.nix
+++ b/pkgs/applications/networking/mailreaders/afew/default.nix
@@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
nativeBuildInputs = with pythonPackages; [ sphinx setuptools_scm ];
propagatedBuildInputs = with pythonPackages; [
- pythonPackages.notmuch chardet dkimpy
+ pythonPackages.setuptools pythonPackages.notmuch chardet dkimpy
] ++ stdenv.lib.optional (!pythonPackages.isPy3k) subprocess32;
makeWrapperArgs = [
diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix
index 40378f8c04d5..9b87b8c899e5 100644
--- a/pkgs/applications/science/logic/tamarin-prover/default.nix
+++ b/pkgs/applications/science/logic/tamarin-prover/default.nix
@@ -104,4 +104,6 @@ mkDerivation (common "tamarin-prover" src // {
tamarin-prover-term
tamarin-prover-theory
];
+
+ broken = true;
})
diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix
index 4ddd84433e88..1b9f0d0997a0 100644
--- a/pkgs/applications/video/kino/default.nix
+++ b/pkgs/applications/video/kino/default.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation {
postInstall = "
rpath=`patchelf --print-rpath \$out/bin/kino`;
- for i in $\buildInputs; do
+ for i in $buildInputs; do
echo adding \$i/lib
rpath=\$rpath\${rpath:+:}\$i/lib
done
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index ac52b83e43d2..633f047be5a0 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -92,6 +92,9 @@ in stdenv.mkDerivation {
})
++ [
./qtx11extras.patch
+ # Kernel 5.3 fix, should be fixed with VirtualBox 6.0.14
+ # https://www.virtualbox.org/ticket/18911
+ ./kernel-5.3-fix.patch
];
postPatch = ''
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index ad860b07bdf6..08b6fa63e84c 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,9 +12,16 @@ let
# It's likely to work again in some future update.
xserverABI = let abi = xserverVListFunc 0 + xserverVListFunc 1;
in if abi == "119" || abi == "120" then "118" else abi;
-in
-stdenv.mkDerivation {
+ # Specifies how to patch binaries to make sure that libraries loaded using
+ # dlopen are found. We grep binaries for specific library names and patch
+ # RUNPATH in matching binaries to contain the needed library paths.
+ dlopenLibs = [
+ { name = "libdbus-1.so"; pkg = dbus; }
+ { name = "libXfixes.so"; pkg = xorg.libXfixes; }
+ ];
+
+in stdenv.mkDerivation {
name = "VirtualBox-GuestAdditions-${version}-${kernel.version}";
src = fetchurl {
@@ -134,13 +141,13 @@ stdenv.mkDerivation {
# Stripping breaks these binaries for some reason.
dontStrip = true;
- # Some code dlopen() libdbus, patch RUNPATH in fixupPhase so it isn't stripped.
- postFixup = ''
- for i in $(grep -F libdbus-1.so -l -r $out/{lib,bin}); do
+ # Patch RUNPATH according to dlopenLibs (see the comment there).
+ postFixup = lib.concatMapStrings (library: ''
+ for i in $(grep -F ${lib.escapeShellArg library.name} -l -r $out/{lib,bin}); do
origRpath=$(patchelf --print-rpath "$i")
- patchelf --set-rpath "$origRpath:${lib.makeLibraryPath [ dbus ]}" "$i"
+ patchelf --set-rpath "$origRpath:${lib.makeLibraryPath [ library.pkg ]}" "$i"
done
- '';
+ '') dlopenLibs;
meta = {
description = "Guest additions for VirtualBox";
diff --git a/pkgs/applications/virtualization/virtualbox/kernel-5.3-fix.patch b/pkgs/applications/virtualization/virtualbox/kernel-5.3-fix.patch
new file mode 100644
index 000000000000..ba9c7c941db9
--- /dev/null
+++ b/pkgs/applications/virtualization/virtualbox/kernel-5.3-fix.patch
@@ -0,0 +1,72 @@
+--- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
++++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+@@ -2123,7 +2123,9 @@
+ #endif
+ if (in_dev != NULL)
+ {
+- for_ifa(in_dev) {
++ struct in_ifaddr *ifa;
++
++ for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
+ if (VBOX_IPV4_IS_LOOPBACK(ifa->ifa_address))
+ return NOTIFY_OK;
+
+@@ -2137,7 +2139,7 @@
+
+ pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort,
+ /* :fAdded */ true, kIntNetAddrType_IPv4, &ifa->ifa_address);
+- } endfor_ifa(in_dev);
++ }
+ }
+
+ /*
+--- a/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c
++++ a/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c
+@@ -283,12 +283,15 @@
+ if (RTCpuSetCount(&OnlineSet) > 1)
+ {
+ /* Fire the function on all other CPUs without waiting for completion. */
+-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
++ smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
++# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+ int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
++ Assert(!rc); NOREF(rc);
+ # else
+ int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* retry */, 0 /* wait */);
+-# endif
+ Assert(!rc); NOREF(rc);
++# endif
+ }
+ #endif
+
+@@ -326,7 +329,6 @@
+ {
+ #ifdef CONFIG_SMP
+ IPRT_LINUX_SAVE_EFL_AC();
+- int rc;
+ RTMPARGS Args;
+
+ RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
+@@ -337,14 +339,17 @@
+ Args.cHits = 0;
+
+ RTThreadPreemptDisable(&PreemptState);
+-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+- rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
++ smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
++# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
++ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
++ Assert(rc == 0); NOREF(rc);
+ # else /* older kernels */
+- rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
++ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
++ Assert(rc == 0); NOREF(rc);
+ # endif /* older kernels */
+ RTThreadPreemptRestore(&PreemptState);
+
+- Assert(rc == 0); NOREF(rc);
+ IPRT_LINUX_RESTORE_EFL_AC();
+ #else
+ RT_NOREF(pfnWorker, pvUser1, pvUser2);
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index 1f84403c10fc..b4906d72f19a 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -185,6 +185,7 @@ rec {
keyutils.lib
libjack2
fribidi
+ p11_kit
# libraries not on the upstream include list, but nevertheless expected
# by at least one appimage
diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix
index e8784d90e7fd..59cff1b0f470 100644
--- a/pkgs/data/fonts/vista-fonts/default.nix
+++ b/pkgs/data/fonts/vista-fonts/default.nix
@@ -3,7 +3,7 @@
fetchzip {
name = "vista-fonts-1";
- url = http://download.microsoft.com/download/f/5/a/f5a3df76-d856-4a61-a6bd-722f52a5be26/PowerPointViewer.exe;
+ url = https://web.archive.org/web/20171225132744/http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe;
postFetch = ''
${cabextract}/bin/cabextract --lowercase --filter ppviewer.cab $downloadedFile
@@ -21,7 +21,7 @@ fetchzip {
done
'';
- sha256 = "1q2d24c203vkl6pwk86frmaj6jra49hr9mydq7cnlx4hilqslw3g";
+ sha256 = "1l27zg5jraa16zm11d3qz1w7m6f1ih3xy5avww454ylm50fw6z11";
meta = {
description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)";
@@ -31,6 +31,5 @@ fetchzip {
# Set a non-zero priority to allow easy overriding of the
# fontconfig configuration files.
priority = 5;
- broken = true; # source url is 404
};
}
diff --git a/pkgs/desktops/xfce4-14/tumbler/default.nix b/pkgs/desktops/xfce4-14/tumbler/default.nix
index ecbc62d8ffbf..e99551bd8d26 100644
--- a/pkgs/desktops/xfce4-14/tumbler/default.nix
+++ b/pkgs/desktops/xfce4-14/tumbler/default.nix
@@ -27,4 +27,9 @@ mkXfceDerivation {
libgsf
poppler # technically the glib binding
];
+
+ # WrapGAppsHook won't touch this binary automatically, so we wrap manually.
+ postFixup = ''
+ wrapProgram $out/lib/tumbler-1/tumblerd "''${gappsWrapperArgs[@]}"
+ '';
}
diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index 02aa6567c1a9..6bcfcfc30235 100644
--- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -103,6 +103,6 @@ rec {
cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include $out/include
chmod +w $out/include
cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include/${targetInfo.triple}/* $out/include
- ln -s ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib $out/lib
+ ln -s ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/${if hostInfo.arch == "x86_64" then "lib64" else "lib"} $out/lib
'';
}
diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix
index 6e0716659c79..1e9b77cfb79b 100644
--- a/pkgs/development/compilers/manticore/default.nix
+++ b/pkgs/development/compilers/manticore/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, coreutils, autoreconfHook, smlnj }:
let
- rev= "47273c463fc3c5d0a0ae655cf75a4700bdb020b4";
+ rev= "4528ccacdfd53d36f5959c005b27cd7ab6175b83";
in stdenv.mkDerivation {
pname = "manticore";
- version = "2018.09.29";
+ version = "2019.09.20";
src = fetchFromGitHub {
owner = "ManticoreProject";
repo = "manticore";
- sha256 = "1prrgp7ldkdnrdbj224qqkirw8bj72460ix97c96fy264j9c97cn";
+ sha256 = "1xz7msiq5x2c56zjxydbxlj6r001mm5zszcda6f6v5qfmmd1bakz";
inherit rev;
};
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index bb00b7c1fbab..7114151e1dc0 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -57673,7 +57673,7 @@ self: {
version = "0.1.0.1";
sha256 = "0rwi5zwvqn18g7qyp9aw51w3yzkqbff9g7rcqdk1l871fvq8qhha";
libraryHaskellDepends = [ base ];
- description = "Haskell operator `g ... f = \x1 .. xn -> g (f x1 .. xn)`.";
+ description = "Haskell operator `g ... f = \\x1 .. xn -> g (f x1 .. xn)`.";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -185223,6 +185223,8 @@ self: {
description = "Postmaster ESMTP Server";
license = "GPL";
maintainers = with stdenv.lib.maintainers; [ peti ];
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"potato-tool" = callPackage
@@ -251718,7 +251720,7 @@ self: {
base containers exceptions free spiros split text transformers
];
executableHaskellDepends = [ base ];
- description = "Automate keyboard\/mouse\/clipboard\/application interaction";
+ description = "Automate keyboard/mouse/clipboard/application interaction";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix
index 47c6998a587d..074a260b8169 100644
--- a/pkgs/development/idris-modules/default.nix
+++ b/pkgs/development/idris-modules/default.nix
@@ -103,8 +103,6 @@
html = callPackage ./html.nix {};
- heyting-algebra = callPackage ./heyting-algebra.nix {};
-
hezarfen = callPackage ./hezarfen.nix {};
hrtime = callPackage ./hrtime.nix {};
diff --git a/pkgs/development/idris-modules/heyting-algebra.nix b/pkgs/development/idris-modules/heyting-algebra.nix
deleted file mode 100644
index 3fa546466c8a..000000000000
--- a/pkgs/development/idris-modules/heyting-algebra.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ build-idris-package
-, fetchFromGitHub
-, contrib
-, lib
-}:
-build-idris-package {
- name = "heyting-algebra";
- version = "2017-08-18";
-
- idrisDeps = [ contrib ];
-
- src = fetchFromGitHub {
- owner = "Risto-Stevcev";
- repo = "idris-heyting-algebra";
- rev = "2c814c48246a5e19bff66e64a753208c7d59d397";
- sha256 = "199cvhxiimlhchvsc66zwn0dls78f9lamam256ad65mv4cjmxv40";
- };
-
- meta = {
- description = "Interfaces for heyting algebras and verified bounded join and meet semilattices";
- homepage = https://github.com/Risto-Stevcev/idris-heyting-algebra;
- license = lib.licenses.mit;
- maintainers = [ lib.maintainers.brainrape ];
- };
-}
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 1cc65b53b3e9..6bfb80d3a174 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib
+{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib, fetchpatch
, aws-c-common, aws-c-event-stream, aws-checksums
, CoreAudio, AudioToolbox
, # Allow building a limited set of APIs, e.g. ["s3" "ec2"].
@@ -50,6 +50,13 @@ stdenv.mkDerivation rec {
__darwinAllowLocalNetworking = true;
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/aws/aws-sdk-cpp/commit/42991ab549087c81cb630e5d3d2413e8a9cf8a97.patch";
+ sha256 = "0myq5cm3lvl5r56hg0sc0zyn1clbkd9ys0wr95ghw6bhwpvfv8gr";
+ })
+ ];
+
meta = with lib; {
description = "A C++ interface for Amazon Web Services";
homepage = https://github.com/awslabs/aws-sdk-cpp;
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 33c8e5076daa..8e8e445f0173 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -19,7 +19,7 @@
{ stdenv, lib
, buildPackages
-, fetchurl ? null
+, fetchurl, fetchpatch
, linuxHeaders ? null
, gd ? null, libpng ? null
, bison
@@ -95,7 +95,15 @@ stdenv.mkDerivation ({
]
++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch
++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch
- ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch;
+ ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch
+
+ # Remove after upgrading to glibc 2.28+
+ ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) (fetchpatch {
+ url = "https://sourceware.org/git/?p=glibc.git;a=patch;h=780684eb04298977bc411ebca1eadeeba4877833";
+ name = "correct-pwent-parsing-issue-and-resulting-build.patch";
+ sha256 = "08fja894vzaj8phwfhsfik6jj2pbji7kypy3q8pgxvsd508zdv1q";
+ excludes = [ "ChangeLog" ];
+ });
postPatch =
''
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index de31128e5a67..d9ea5a71dd30 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -37,7 +37,7 @@ let self = stdenv.mkDerivation rec {
"--build=${stdenv.buildPlatform.config}"
] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions"
++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64"
- ++ optional (with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt) "--disable-assembly"
+ ++ optional (with stdenv.hostPlatform; (useAndroidPrebuilt || useiOSPrebuilt) && !isx86) "--disable-assembly"
;
doCheck = true; # not cross;
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 11fb21fe52e2..d5cbbccba015 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess
-, withValgrind ? valgrind-light.meta.available, valgrind-light
+, withValgrind ? valgrind-light.meta.available, valgrind-light, fetchpatch
}:
stdenv.mkDerivation rec {
@@ -17,7 +17,15 @@ stdenv.mkDerivation rec {
buildInputs = [ libpthreadstubs libpciaccess ]
++ lib.optional withValgrind valgrind-light;
- patches = [ ./cross-build-nm-path.patch ];
+ patches = [ ./cross-build-nm-path.patch ] ++
+ lib.optionals stdenv.hostPlatform.isMusl [
+ # Fix tests not building on musl because they use the glibc-specific
+ # (non-POSIX) `ioctl()` type signature. See #66441.
+ (fetchpatch {
+ url = "https://raw.githubusercontent.com/openembedded/openembedded-core/30a2af80f5f8c8ddf0f619e4f50451b02baa22dd/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch";
+ sha256 = "0rdmh4k5kb80hhk1sdhlil30yf0s8d8w0fnq0hzyvw3ir1mki3by";
+ })
+ ];
postPatch = ''
for a in */*-symbol-check ; do
diff --git a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh
index d7a44cace036..d2aadbd956a8 100644
--- a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh
+++ b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh
@@ -80,7 +80,7 @@ wrapQtAppsHook() {
do
[ -d "$targetDir" ] || continue
- find "$targetDir" -type f -executable -print0 | while IFS= read -r -d '' file
+ find "$targetDir" ! -type d -executable -print0 | while IFS= read -r -d '' file
do
patchelf --print-interpreter "$file" >/dev/null 2>&1 || continue
diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix
index c0b8fd7d1679..3cb8998485a9 100644
--- a/pkgs/development/libraries/vtk/default.nix
+++ b/pkgs/development/libraries/vtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xorgproto, libXt
+{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xorgproto, libXt, libtiff
, qtLib ? null
# Darwin support
, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL
@@ -20,7 +20,9 @@ stdenv.mkDerivation rec {
sha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d";
};
- buildInputs = [ cmake ]
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ libtiff ]
++ optional (qtLib != null) qtLib
++ optionals stdenv.isLinux [ libGLU_combined libX11 xorgproto libXt ]
++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit
@@ -38,7 +40,7 @@ stdenv.mkDerivation rec {
# built and requiring one of the shared objects.
# At least, we use -fPIC for other packages to be able to use this in shared
# objects.
- cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ]
+ cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" ]
++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ]
++ optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks";
diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index f46ca274f2e1..35bb7b1aa59a 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -39,6 +39,9 @@ buildPythonPackage rec {
pytest
'';
+ # 368 failed, 10889 passed, 978 skipped, 69 xfailed in 196.24s
+ doCheck = false;
+
meta = {
description = "Astronomy/Astrophysics library for Python";
homepage = https://www.astropy.org;
diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix
index f91b33d20102..574aeefa7fca 100644
--- a/pkgs/development/python-modules/cairocffi/default.nix
+++ b/pkgs/development/python-modules/cairocffi/default.nix
@@ -19,8 +19,8 @@
}@args:
import ./generic.nix ({
- version = "1.0.2";
- sha256 = "01ac51ae12c4324ca5809ce270f9dd1b67f5166fe63bd3e497e9ea3ca91946ff";
+ version = "1.1.0";
+ sha256 = "1nq53f5jipgy9jgyfxp43j40qfbmrhgn1cj8bp5rrb3liy3wbh7i";
dlopen_patch = ./dlopen-paths.patch;
disabled = pythonOlder "3.5";
inherit withXcffib;
diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
index 10e2294981d4..6542b4367eb4 100644
--- a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
+++ b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
@@ -1,46 +1,61 @@
-commit 0435bc2577d4b18f54b78b2f5185abb2b2005982
-Author: Alexander V. Nikolaev
-Date: Sat Feb 6 08:09:06 2016 +0200
+Patch dlopen() to allow direct paths to all required libs
- Patch dlopen() to allow direct paths to all required libs
+This is an update of the patch submitted in
+https://github.com/NixOS/nixpkgs/commit/b13e44e094989d3a902f8c73b22e8d3c0cc7acf4
+by Alexander V. Nikolaev
- This patch is NixOS specific
+---
+ cairocffi/__init__.py | 34 ++++++++++++++++------------------
+ 1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py
-index 6061973..3538a58 100644
+index 307d58c..43c29e3 100644
--- a/cairocffi/__init__.py
+++ b/cairocffi/__init__.py
-@@ -21,19 +21,22 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip()
- version = '1.16.0'
- version_info = (1, 16, 0)
+@@ -21,28 +21,26 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip()
+ version = '1.17.2'
+ version_info = (1, 17, 2)
-+# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime
++# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be
++# required for runtime
+_LIBS = {
+ 'cairo': '@cairo@/lib/libcairo@ext@',
+ 'glib-2.0': '@glib@/lib/libglib-2.0@ext@',
+ 'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@',
+ 'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
+}
++
--def dlopen(ffi, *names):
-+def dlopen(ffi, name, *names):
+ def dlopen(ffi, library_names, filenames):
"""Try various names for the same library, for different platforms."""
-- for name in names:
-- for lib_name in (name, 'lib' + name):
-- try:
-- path = ctypes.util.find_library(lib_name)
-- lib = ffi.dlopen(path or lib_name)
-- if lib:
-- return lib
-- except OSError:
-- pass
-- raise OSError("dlopen() failed to load a library: %s" % ' / '.join(names))
-+ path = _LIBS.get(name, None)
-+ if path:
-+ lib = ffi.dlopen(path)
-+ if lib:
-+ return lib
-+ raise OSError("dlopen() failed to load a library: %s as %s" % (name, path))
+- exceptions = []
+-
+ for library_name in library_names:
+- library_filename = find_library(library_name)
+- if library_filename:
+- filenames = (library_filename,) + filenames
+- else:
+- exceptions.append(
+- 'no library called "{}" was found'.format(library_name))
+-
+- for filename in filenames:
+- try:
+- return ffi.dlopen(filename)
+- except OSError as exception: # pragma: no cover
+- exceptions.append(exception)
+-
+- error_message = '\n'.join( # pragma: no cover
+- str(exception) for exception in exceptions)
+- raise OSError(error_message) # pragma: no cover
++ path = _LIBS.get(library_name, None)
++ if path:
++ lib = ffi.dlopen(path)
++ if lib:
++ return lib
++
++ raise OSError("dlopen() failed to load a library: %s as %s" % (library_name, path))
- cairo = dlopen(ffi, 'cairo', 'cairo-2', 'cairo-gobject-2', 'cairo.so.2')
+ cairo = dlopen(
+--
+2.19.2
diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix
index beee82950496..77c5c21befee 100644
--- a/pkgs/development/python-modules/cairosvg/default.nix
+++ b/pkgs/development/python-modules/cairosvg/default.nix
@@ -4,24 +4,15 @@
buildPythonPackage rec {
pname = "CairoSVG";
- version = "2.3.0";
+ version = "2.4.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
- sha256 = "66f333ef5dc79fdfbd3bbe98adc791b1f854e0461067d202fa7b15de66d517ec";
+ sha256 = "1bb7irxbaxxb9ahm3z5wsx1q96mm5gzskc7b6q07h9ikcnb8yrjf";
};
- patches = [
- # fix isort-check
- (fetchpatch {
- url = https://github.com/Kozea/CairoSVG/commit/b2534b0fc80b9f24a2bff2c938ac5da73ff1e478.patch;
- excludes = [ "test_non_regression/__init__.py" ];
- sha256 = "1bms75dd0fd978yhlr0k565zq45lzxf0vkihryb7gcwnd42bl6yf";
- })
- ];
-
propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ];
checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ];
diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix
index 8c55c3ac8bbb..9b3050942a88 100644
--- a/pkgs/development/python-modules/cheroot/default.nix
+++ b/pkgs/development/python-modules/cheroot/default.nix
@@ -31,9 +31,12 @@ buildPythonPackage rec {
checkPhase = ''
substituteInPlace pytest.ini --replace "--doctest-modules" "" --replace "-n auto" ""
${lib.optionalString (pythonAtLeast "3.7") "sed -i '/warnings/,+2d' pytest.ini"}
- pytest ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"}
+ pytest -k 'not tls' ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"}
'';
+ # Some of the tests use localhost networking.
+ __darwinAllowLocalNetworking = true;
+
meta = with lib; {
description = "High-performance, pure-Python HTTP";
homepage = https://github.com/cherrypy/cheroot;
diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix
new file mode 100644
index 000000000000..88cbee2649da
--- /dev/null
+++ b/pkgs/development/python-modules/dict2xml/default.nix
@@ -0,0 +1,20 @@
+{ lib, fetchPypi, buildPythonPackage, six }:
+
+buildPythonPackage rec {
+ pname = "dict2xml";
+ version = "1.6.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "17wsybqq0916i1yh7bpf2cmicldn7d0y2b9mzlgs503fkcpxda5w";
+ };
+
+ propagatedBuildInputs = [ six ];
+
+ meta = with lib; {
+ description = "Super simple library to convert a Python dictionary into an xml string";
+ homepage = "https://github.com/delfick/python-dict2xml";
+ license = licenses.mit;
+ maintainers = with maintainers; [ johnazoidberg ];
+ };
+}
diff --git a/pkgs/development/python-modules/dynd/default.nix b/pkgs/development/python-modules/dynd/default.nix
index d4cd0e711a0d..f3e4e0a8b732 100644
--- a/pkgs/development/python-modules/dynd/default.nix
+++ b/pkgs/development/python-modules/dynd/default.nix
@@ -26,6 +26,8 @@ buildPythonPackage rec {
substituteInPlace setup.py --replace "'--always', '--match', 'v*']).decode('ascii').strip('\n')" ""
'';
+ dontUseCmakeConfigure = true;
+
# Python 3 works but has a broken import test that I couldn't
# figure out.
doCheck = !isPy3k;
diff --git a/pkgs/development/python-modules/flask-oauthlib/default.nix b/pkgs/development/python-modules/flask-oauthlib/default.nix
deleted file mode 100644
index 587057514156..000000000000
--- a/pkgs/development/python-modules/flask-oauthlib/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
-, flask, oauthlib, requests_oauthlib, flask_sqlalchemy
-, mock, nose}:
-buildPythonPackage rec {
- pname = "Flask-OAuthlib";
- version = "0.9.5";
-
- src = fetchFromGitHub {
- owner = "lepture";
- repo = "flask-oauthlib";
- rev = "v${version}";
- sha256 = "1l82niwrpm7411xvwh65bj263si90kcbrbfg5fa52mpixhxcp40f";
- };
-
- buildInputs = [ mock nose ];
- propagatedBuildInputs = [
- flask flask_sqlalchemy oauthlib requests_oauthlib
- ];
-
- checkPhase = "nosetests -d";
- doCheck = false; # request mocking fails
-
- meta = with stdenv.lib; {
- description = "OAuthlib implementation for Flask";
- license = licenses.mit;
- maintainers = [ maintainers.mic92 ];
- homepage = https://github.com/lepture/flask-oauthlib;
- };
-}
diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix
index 6d52e5f5c1f5..2bf204a9a628 100644
--- a/pkgs/development/python-modules/license-expression/default.nix
+++ b/pkgs/development/python-modules/license-expression/default.nix
@@ -12,6 +12,7 @@ buildPythonPackage rec {
rev = "v${version}";
sha256 = "0q8sha38w7ajg7ar0rmbqrwv0n58l8yzyl96cqwcbvp578fn3ir0";
};
+ postPatch = "patchShebangs ./configure";
propagatedBuildInputs = [ boolean-py ];
diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix
index 99ba6845fa08..aec477d36a0d 100644
--- a/pkgs/development/python-modules/pycountry/default.nix
+++ b/pkgs/development/python-modules/pycountry/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "pycountry";
- version = "19.7.15";
+ version = "19.8.18";
src = fetchPypi {
inherit pname version;
- sha256 = "15lhv18za0zv36laksr86rszjhp0slmqzcylm6ds9vpd7gyqprb8";
+ sha256 = "1jxkdjffrhn0il0nm14dlzxpd6f3v1hbxzxsprcksafgmm0almrw";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/pycurl2/default.nix b/pkgs/development/python-modules/pycurl2/default.nix
index 01428d41b7d2..478f4451cf7a 100644
--- a/pkgs/development/python-modules/pycurl2/default.nix
+++ b/pkgs/development/python-modules/pycurl2/default.nix
@@ -1,6 +1,4 @@
-{ stdenv
-, buildPythonPackage
-, fetchgit
+{ lib, buildPythonPackage, fetchFromGitHub
, isPy3k
, simplejson
, unittest2
@@ -13,8 +11,9 @@ buildPythonPackage {
version = "7.20.0";
disabled = isPy3k;
- src = fetchgit {
- url = "https://github.com/Lispython/pycurl.git";
+ src = fetchFromGitHub {
+ owner = "Lispython";
+ repo = "pycurl";
rev = "0f00109950b883d680bd85dc6e8a9c731a7d0d13";
sha256 = "1qmw3cm93kxj94s71a8db9lwv2cxmr2wjv7kp1r8zildwdzhaw7j";
};
@@ -22,9 +21,10 @@ buildPythonPackage {
# error: (6, "Couldn't resolve host 'h.wrttn.me'")
doCheck = false;
- buildInputs = [ pkgs.curl simplejson unittest2 nose ];
+ nativeBuildInputs = [ pkgs.curl.dev ];
+ buildInputs = [ simplejson unittest2 nose ];
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = https://pypi.python.org/pypi/pycurl2;
description = "A fork from original PycURL library that no maintained from 7.19.0";
license = licenses.mit;
diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix
index bb92fc9df9ac..285f50e3cb32 100644
--- a/pkgs/development/python-modules/qiskit/default.nix
+++ b/pkgs/development/python-modules/qiskit/default.nix
@@ -59,5 +59,7 @@ buildPythonPackage rec {
maintainers = with stdenv.lib.maintainers; [
pandaman
];
+ # Needs to be updated and have its new dependencies added
+ broken = true;
};
}
diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix
index 7eb020bbe609..939782722c6e 100644
--- a/pkgs/development/python-modules/scikitlearn/default.nix
+++ b/pkgs/development/python-modules/scikitlearn/default.nix
@@ -2,6 +2,7 @@
, lib
, buildPythonPackage
, fetchPypi
+, fetchpatch
, gfortran, glibcLocales
, numpy, scipy, pytest, pillow
, cython
@@ -40,6 +41,15 @@ buildPythonPackage rec {
];
checkInputs = [ pytest ];
+ patches = [
+ # Fixes tests by changing threshold of a test-case that broke
+ # with numpy versions >= 1.17. This should be removed for versions > 0.21.2.
+ ( fetchpatch {
+ url = "https://github.com/scikit-learn/scikit-learn/commit/b730befc821caec5b984d9ff3aa7bc4bd7f4d9bb.patch";
+ sha256 = "0z36m05mv6d494qwq0688rgwa7c4bbnm5s2rcjlrp29fwn3fy1bv";
+ })
+ ];
+
LC_ALL="en_US.UTF-8";
doCheck = !stdenv.isAarch64;
diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix
index 7dc09d58aad6..f112d6f15557 100644
--- a/pkgs/development/python-modules/weasyprint/default.nix
+++ b/pkgs/development/python-modules/weasyprint/default.nix
@@ -23,11 +23,15 @@
buildPythonPackage rec {
pname = "weasyprint";
- version = "47";
+ version = "50";
disabled = !isPy3k;
- # ignore failing pytest
- checkPhase = "pytest -k 'not test_font_stretch'";
+ # excluded test needs the Ahem font
+ checkPhase = ''
+ runHook preCheck
+ pytest -k 'not test_font_stretch'
+ runHook postCheck
+ '';
# ignore failing flake8-test
prePatch = ''
@@ -55,7 +59,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "WeasyPrint";
- sha256 = "0hd1zwrkfnj7g0jaaf6jvarlj6l5imar6ar78zxdgv17a3s3k3dg";
+ sha256 = "0invs96zvmcr6wh5klj52jrcnr9qg150v9wpmbhcsf3vv1d1hbcw";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix
index f737cf344b88..1a854845cc42 100644
--- a/pkgs/development/python-modules/xml2rfc/default.nix
+++ b/pkgs/development/python-modules/xml2rfc/default.nix
@@ -1,15 +1,15 @@
{ lib, fetchPypi, buildPythonPackage, intervaltree, pyflakes, requests, lxml, google-i18n-address
-, pycountry, html5lib, six
+, pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint
, stdenv
}:
buildPythonPackage rec {
pname = "xml2rfc";
- version = "2.18.0";
+ version = "2.27.1";
src = fetchPypi {
inherit pname version;
- sha256 = "e192236798615f34479a9bb9f30df72ce0e5f319df75ecc0473d896713a17451";
+ sha256 = "00v5gsshy1rmjd334d2awh0mvri949lmyk8f02wfr20rq6fc3xqd";
};
propagatedBuildInputs = [
@@ -21,13 +21,18 @@ buildPythonPackage rec {
pycountry
html5lib
six
+ kitchen
+ pypdf2
+ dict2xml
+ weasyprint
];
preCheck = ''
export HOME=$(mktemp -d)
'';
- doCheck = !stdenv.isDarwin;
+ # lxml tries to fetch from the internet
+ doCheck = false;
meta = with lib; {
description = "Tool generating IETF RFCs and drafts from XML sources";
@@ -35,6 +40,6 @@ buildPythonPackage rec {
# Well, parts might be considered unfree, if being strict; see:
# http://metadata.ftp-master.debian.org/changelogs/non-free/x/xml2rfc/xml2rfc_2.9.6-1_copyright
license = licenses.bsd3;
- maintainers = [ maintainers.vcunat ];
+ maintainers = with maintainers; [ vcunat yrashk ];
};
}
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 1616eacffc65..4c8935d92221 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -441,12 +441,15 @@ let
nlme = [ pkgs.libiconv ];
Matrix = [ pkgs.libiconv ];
mgcv = [ pkgs.libiconv ];
+ minqa = [ pkgs.libiconv ];
igraph = [ pkgs.libiconv ];
ape = [ pkgs.libiconv ];
expm = [ pkgs.libiconv ];
mnormt = [ pkgs.libiconv ];
+ pan = [ pkgs.libiconv ];
phangorn = [ pkgs.libiconv ];
quadprog = [ pkgs.libiconv ];
+ randomForest = [ pkgs.libiconv ];
sundialr = [ pkgs.libiconv ];
};
diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix
index 8ec2552aeffb..f89bd1ddf02a 100644
--- a/pkgs/development/tools/cask/default.nix
+++ b/pkgs/development/tools/cask/default.nix
@@ -10,10 +10,15 @@ stdenv.mkDerivation rec {
};
doCheck = true;
+
+ nativeBuildInputs = [ emacsPackages.emacs ];
buildInputs = with emacsPackages; [
s f dash ansi ecukes servant ert-runner el-mock
noflet ert-async shell-split-string git package-build
+ ] ++ [
+ python
];
+
buildPhase = ''
emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el
'';
@@ -38,11 +43,9 @@ stdenv.mkDerivation rec {
Cask can also be used to manage dependencies for your local Emacs configuration.
'';
- homepage = https://cask.readthedocs.io/en/latest/index.html;
+ homepage = "https://cask.readthedocs.io/en/latest/index.html";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = [ maintainers.flexw ];
};
-
- nativeBuildInputs = [ emacsPackages.emacs python ];
}
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index d8b18fcd121e..fbb7461bbc7e 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
let
- version = "12.2.0";
+ version = "12.3.0";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
- sha256 = "0r0jy571dxcspsl0q31wyw4017rfq7i4rxsgf83jqdjqaigas8dk";
+ sha256 = "11xbz24811vi3l1dwhyqv3mypawrky85qjsg6aaigfv8zj9l2xmi";
};
docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
- sha256 = "1pbzyfvfgwp9r67a148nr4gh2p9lrmnn4hxap37abb5q5209pjir";
+ sha256 = "04gfhlm32wrdq0s9blmfknpcnmr30vrnd7afib1lfbzbdl99g4sx";
};
in
buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
- sha256 = "0id0ivysn0396dwi357iig28d4xr2wd7q05r6ksgml8xyfijdgd3";
+ sha256 = "155im9sybkldh0rx34j9fm3qg95dm5q3jcjjx635b7fwq1wyl7c7";
};
patches = [ ./fix-shell-path.patch ];
diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/pkgs/development/tools/misc/ctags/wrapped.nix
index 869e7a61121d..08f8049aa8a1 100644
--- a/pkgs/development/tools/misc/ctags/wrapped.nix
+++ b/pkgs/development/tools/misc/ctags/wrapped.nix
@@ -27,10 +27,10 @@ with pkgs.stdenv.lib;
# don't scan version control directories
defaultArgs = [
- "--exclude=\.svn"
- "--exclude=\.hg"
- "--exclude=\.git"
- "--exclude=\_darcs"
+ "--exclude=.svn"
+ "--exclude=.hg"
+ "--exclude=.git"
+ "--exclude=_darcs"
"--sort=yes"
];
@@ -38,8 +38,8 @@ with pkgs.stdenv.lib;
asLang = [
"--langdef=ActionScript"
"--langmap=ActionScript:.as"
- "--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\1/f,function,functions/"
- "--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\2/p,property,properties/"
+ "--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\1/f,function,functions/"
+ "--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\2/p,property,properties/"
"--regex-ActionScript=/interface[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/i,interface,interfaces/"
"--regex-ActionScript=/package[ \\t]+([^ \\t]*)/\\1/p/"
"--regex-ActionScript=/class[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/c,class,classes/"
@@ -67,7 +67,7 @@ with pkgs.stdenv.lib;
nixLang = [
"--langdef=NIX"
"--langmap=NIX:.nix"
- "--regex-NIX=/\([^ \\t*]*\)[ \\t]*=/\\1/f/"
+ "--regex-NIX=/([^ \\t*]*)[ \\t]*=/\\1/f/"
];
rubyLang = [
diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix
index 518b63ed483c..82806c7521cf 100644
--- a/pkgs/games/dxx-rebirth/default.nix
+++ b/pkgs/games/dxx-rebirth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, scons, pkgconfig
+{ gcc6Stdenv, fetchurl, fetchpatch, scons, pkgconfig
, SDL, SDL_mixer, libGLU_combined, physfs
}:
@@ -8,7 +8,7 @@ let
sha256 = "05mz77vml396mff43dbs50524rlm4fyds6widypagfbh5hc55qdc";
};
-in stdenv.mkDerivation rec {
+in gcc6Stdenv.mkDerivation rec {
pname = "dxx-rebirth";
version = "0.59.100";
@@ -44,9 +44,9 @@ in stdenv.mkDerivation rec {
install -Dm644 -t $out/share/doc/dxx-rebirth *.txt
'';
- meta = with stdenv.lib; {
+ meta = with gcc6Stdenv.lib; {
description = "Source Port of the Descent 1 and 2 engines";
- homepage = https://www.dxx-rebirth.com/;
+ homepage = "https://www.dxx-rebirth.com/";
license = licenses.free;
maintainers = with maintainers; [ peterhoeg ];
platforms = with platforms; linux;
diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index f26769cd28dd..3b55c44d173e 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -27,12 +27,12 @@ let
in stdenv.mkDerivation rec {
pname = "retroarch-bare";
- version = "1.7.5";
+ version = "1.7.8.4";
src = fetchFromGitHub {
owner = "libretro";
repo = "RetroArch";
- sha256 = "1jfpgl34jjxn3dvxd1kd564swkw7v98hnn562v998b7vllz3dxdm";
+ sha256 = "1i3i23xwvmck8k2fpalr49np7xjzfg507243mybqrljawlnbxvph";
rev = "v${version}";
};
diff --git a/pkgs/misc/gnuk/default.nix b/pkgs/misc/gnuk/default.nix
index 4597fa40390d..afef861c0dc4 100644
--- a/pkgs/misc/gnuk/default.nix
+++ b/pkgs/misc/gnuk/default.nix
@@ -1,11 +1,11 @@
{ callPackage, fetchgit, ... } @ args:
callPackage ./generic.nix (args // {
- version = "1.0.4";
+ version = "1.2.14";
src = fetchgit {
url = "git://git.gniibe.org/gnuk/gnuk.git";
- rev = "93867d0c8b90c485f9832c0047c3a2e17a029aca";
- sha256 = "0ah2gc772kdq7gdwpqwdmfh5nzbx2wgpk5ljnhwc4i3mrkafdiih";
+ rev = "177ef67edfa2306c2a369a037362385c354083e1";
+ sha256 = "16wa3xsaq4r8caw6c24hnv4j78bklacix4in2y66j35h68ggr3j1";
};
})
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
index 03556296ca1d..16454cbc1a5f 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
@@ -14,8 +14,8 @@ appleDerivation {
# + lib.optionalString hostPlatform.isAarch32 "-D__arm__";
NIX_CFLAGS_COMPILE = [ "-DDAEMON_UID=1"
"-DDAEMON_GID=1"
- "-DDEFAULT_AT_QUEUE=\'a\'"
- "-DDEFAULT_BATCH_QUEUE=\'b\'"
+ "-DDEFAULT_AT_QUEUE='a'"
+ "-DDEFAULT_BATCH_QUEUE='b'"
"-DPERM_PATH=\"/usr/lib/cron/\""
"-DOPEN_DIRECTORY"
"-DNO_DIRECT_RPC"
diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix
index 036cd3f28a1b..e66ac4d65ab9 100644
--- a/pkgs/os-specific/linux/exfat/default.nix
+++ b/pkgs/os-specific/linux/exfat/default.nix
@@ -6,13 +6,13 @@ assert lib.versionAtLeast kernel.version "4.2" || lib.versionOlder kernel.versi
stdenv.mkDerivation rec {
name = "exfat-nofuse-${version}-${kernel.version}";
- version = "2018-04-16";
+ version = "2019-09-06";
src = fetchFromGitHub {
- owner = "dorimanx";
+ owner = "AdrianBan";
repo = "exfat-nofuse";
- rev = "01c30ad52625a7261e1b0d874553b6ca7af25966";
- sha256 = "0n1ibamf1yj8iqapc86lfscnky9p07ngsi4f2kpv3d5r2s6mzsh6";
+ rev = "5536f067373c196f152061f5000fe0032dc07c48";
+ sha256 = "00mhadsv2iw8z00a6170hwbvk3afx484nn3irmd5f5kmhs34sw7k";
};
hardeningDisable = [ "pic" ];
@@ -27,18 +27,9 @@ stdenv.mkDerivation rec {
install -m644 -b -D exfat.ko $out/lib/modules/${kernel.modDirVersion}/kernel/fs/exfat/exfat.ko
'';
- patches = [
- # fix compile-errors in 4.18 and 4.20
- # ref: https://github.com/dorimanx/exfat-nofuse/pull/137
- (fetchpatch {
- url = https://github.com/dorimanx/exfat-nofuse/compare/01c30ad52625a7261e1b0d874553b6ca7af25966...f93a47e6414d567a1e7f6ab7f34b015b20f9a050.patch ;
- sha256 = "0w57pi9h6dwjxfgc3zpwy6sr4zw42hn1zj72f7wgfpqrx6d8xkh5";
- } )
- ];
-
meta = {
description = "exfat kernel module";
- homepage = https://github.com/dorimanx/exfat-nofuse;
+ inherit (src.meta) homepage;
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ makefu ];
platforms = lib.platforms.linux;
diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix
index 0dd0eeed616f..9e8de46edba7 100644
--- a/pkgs/os-specific/linux/jool/source.nix
+++ b/pkgs/os-specific/linux/jool/source.nix
@@ -1,11 +1,11 @@
{ fetchFromGitHub }:
rec {
- version = "4.0.0";
+ version = "4.0.5";
src = fetchFromGitHub {
owner = "NICMx";
repo = "Jool";
rev = "v${version}";
- sha256 = "1ivnx7ijqf41kxmi2bmsf9qfcv6b1rvag35754ddlndry3sgvimr";
+ sha256 = "0zfda8mbcg4mgg39shxdx5n2bq6zi9w3v8bcx03b3dp09lmq45y3";
};
}
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index 1b4700a2e392..6c24311338ac 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -54,6 +54,7 @@ lib.overrideDerivation (buildLinux (args // {
copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb
'' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv7l-linux" "aarch64-linux"]) ''
copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb
+ copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-a-plus.dtb
copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb
copyDTB bcm2710-rpi-cm3.dtb bcm2837-rpi-cm3.dtb
'';
diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix
index e177b284bbda..be3a5612a297 100644
--- a/pkgs/os-specific/linux/piper/default.nix
+++ b/pkgs/os-specific/linux/piper/default.nix
@@ -16,8 +16,12 @@ python3.pkgs.buildPythonApplication rec {
};
nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
- buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme python3 ];
- propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ];
+ buildInputs = [
+ gtk3 glib gnome3.adwaita-icon-theme python3
+ ];
+ propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ] ++ [
+ gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now
+ ];
postPatch = ''
chmod +x meson_install.sh # patchShebangs requires executable file
diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix
index 24213cd2fb5a..42739e53fdac 100644
--- a/pkgs/os-specific/linux/ply/default.nix
+++ b/pkgs/os-specific/linux/ply/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, p7zip }:
+{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, p7zip, rsync }:
assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.0";
@@ -7,7 +7,7 @@ let
in stdenv.mkDerivation {
pname = "ply";
inherit version;
- nativeBuildInputs = [ autoreconfHook flex yacc p7zip ];
+ nativeBuildInputs = [ autoreconfHook flex yacc p7zip rsync ];
src = fetchFromGitHub {
owner = "iovisor";
diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix
index f2c87b97c4ff..b3d8965704fd 100644
--- a/pkgs/os-specific/linux/r8168/default.nix
+++ b/pkgs/os-specific/linux/r8168/default.nix
@@ -6,7 +6,7 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi
in stdenv.mkDerivation rec {
name = "r8168-${kernel.version}-${version}";
# on update please verify that the source matches the realtek version
- version = "8.046.00";
+ version = "8.047.04";
# This is a mirror. The original website[1] doesn't allow non-interactive
# downloads, instead emailing you a download link.
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
owner = "mtorromeo";
repo = "r8168";
rev = version;
- sha256 = "0y8w3biw5mshn5bvl24b9rybfh67f1s9gfzkcv9p4m7s7nchj2dg";
+ sha256 = "1rni8jimwdhyx75603mdcylrdxgfwfpyprf1lf5x5cli2i4bbijg";
};
hardeningDisable = [ "pic" ];
diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix
index 81e5a2af9cdf..d2c3c11c9390 100644
--- a/pkgs/os-specific/linux/radeontools/default.nix
+++ b/pkgs/os-specific/linux/radeontools/default.nix
@@ -1,33 +1,25 @@
-{ stdenv, fetchurl, pciutils }:
+{ stdenv, fetchurl
+, autoreconfHook
+, pciutils
+, pkgconfig
+, xorg
+}:
-stdenv.mkDerivation {
- name = "radeontool-1.5";
-
- inherit pciutils;
-
- # Don't know wether it's a good idea to hardcode the lspci path..
- # But it will work on nix..
- postUnpack = ''
- cd $sourceRoot
- sed -i "s%lspci%$pciutils/sbin/lspci%g" radeontool.c
- cd ..
- '';
+stdenv.mkDerivation rec {
+ pname = "radeontool";
+ version = "1.6.3";
src = fetchurl {
- url = http://fdd.com/software/radeon/radeontool-1.5.tar.gz;
- sha256 = "0qbkawhhq0y0gqbbql7q04y0v0hims5c4jkjsbc1y03rf9kr10ar";
+ url = "https://people.freedesktop.org/~airlied/radeontool/${pname}-${version}.tar.gz";
+ sha256 = "0mjk9wr9rsb17yy92j6yi16hfpa6v5r1dbyiy60zp4r125wr63za";
};
- installPhase = ''
- mkdir -p $out/bin
- chmod +x lightwatch.pl
- cp radeontool lightwatch.pl $out/bin
- '';
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ xorg.libpciaccess ];
- meta = {
- description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards";
- homepage = http://fdd.com/software/radeon/;
- license = stdenv.lib.licenses.zlib;
- broken = true;
+ meta = with stdenv.lib; {
+ description = "Lowlevel tools to tweak register and dump state on radeon GPUs";
+ homepage = "https://airlied.livejournal.com/";
+ license = licenses.zlib;
};
}
diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix
index 447f9127d607..94ba31d59e1a 100644
--- a/pkgs/os-specific/linux/rtlwifi_new/default.nix
+++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix
@@ -6,13 +6,13 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi
in stdenv.mkDerivation rec {
pname = "rtlwifi_new";
- version = "2018-02-17";
+ version = "2019-08-21";
src = fetchFromGitHub {
owner = "lwfinger";
repo = "rtlwifi_new";
- rev = "0588ac0cc5f530e7764705416370b70d3c2afedc";
- sha256 = "1vs8rfw19lcs04bapa97zlnl5x0kf02sdw5ik0hdm27wgk0z969m";
+ rev = "a108e3de87c2ed30b71c3c4595b79ab7a2f9e348";
+ sha256 = "15kjs9i9vvmn1cdzccd5cljf3m45r4ssm65klkj2fdkf3kljj38k";
};
hardeningDisable = [ "pic" "format" ];
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 85e6837dee18..6f8489b57c64 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -223,7 +223,7 @@ in stdenv.mkDerivation {
# in a backwards-incompatible way. If the interface version of two
# systemd builds is the same, then we can switch between them at
# runtime; otherwise we can't and we need to reboot.
- passthru.interfaceVersion = 3;
+ passthru.interfaceVersion = 2;
meta = with stdenv.lib; {
homepage = http://www.freedesktop.org/wiki/Software/systemd;
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 8191bf5acbf1..ad1bb26a54d9 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
# Note: ATM only the libraries have been tested in nixpkgs.
stdenv.mkDerivation rec {
pname = "knot-dns";
- version = "2.8.3";
+ version = "2.8.4";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
- sha256 = "8a62d81e5cf3df938f469b60ed4e46d9161007c2b89fbf7ae07525fa68368bad";
+ sha256 = "541e7e43503765c91405c5797b3838103bb656154712e69b3f959c6ab0e700a9";
};
outputs = [ "bin" "out" "dev" ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 5f7ef11246ed..c36388b26fc3 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -65,10 +65,6 @@ let
};
})
- (self: super: {
- pyyaml = super.pyyaml_3;
- })
-
# hass-frontend does not exist in python3.pkgs
(self: super: {
hass-frontend = self.callPackage ./frontend.nix { };
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 615edeb81ec1..3d61961321d4 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "grafana";
- version = "6.3.5";
+ version = "6.3.6";
goPackagePath = "github.com/grafana/grafana";
@@ -12,12 +12,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
- sha256 = "0qimqdlxkvh31n730gp1wl1va0bza69bw90nyzrmfb34733pmni2";
+ sha256 = "1dxsd32ny7wcpfyhhdf5m6anzgs0mkyvlrha7ps5pfyiix7brrlk";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
- sha256 = "1rw2ws610ba2vl5kv3yay8s69xkqzisrl6q27zxa5kj48khvy101";
+ sha256 = "0cz6bg8q8lxxvqh9nb2b64rr5brkmbvpvvg4x7dykc04vcjivf6n";
};
postPatch = ''
diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
index 80fe9b2357f4..9b0d91747ad1 100644
--- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "wireguard-exporter";
- version = "3.0.1";
+ version = "3.1.0";
src = fetchFromGitHub {
owner = "MindFlavor";
repo = "prometheus_wireguard_exporter";
rev = version;
- sha256 = "0wfv54ny557mjajjdf0lyq5sbf9m7y50ggm7s2v30c639i0swyrc";
+ sha256 = "0hl82cg6cijk3xf35cgi4v14gmxk3fj4c3z1x5hrs2i0j1i26ilw";
};
- cargoSha256 = "06s9194lvwd7lynxnsrjfbjfj87ngvjbqjhx3idf7d1w9mgi4ysw";
+ cargoSha256 = "1ndb33bi08j40b4jkj4q7d3k0cw5fscz2gc2cc3134nbs2r7jamk";
buildInputs = lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 15553055457c..b0fdd333238b 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -3,7 +3,7 @@
, libaio, libevent, jemalloc, cracklib, systemd, numactl, perl
, fixDarwinDylibNames, cctools, CoreServices
, asio, buildEnv, check, scons
-, less
+, less, fetchpatch
, withoutClient ? false
}:
@@ -56,7 +56,12 @@ common = rec { # attributes common to both builds
patches = [
./cmake-includedir.patch
./cmake-libmariadb-includedir.patch
- ];
+ ] ++ optional stdenv.hostPlatform.isDarwin (fetchpatch {
+ url = "https://github.com/MariaDB/mariadb-connector-c/commit/ee91b2c98a63acb787114dee4f2694e154630928.patch";
+ extraPrefix = "libmariadb/";
+ sha256 = "06i865zwyhs9fvrgmargzn09pbg1cmably3c4wifd241bj8ig8qk";
+ stripLen = 1;
+ });
cmakeFlags = [
"-DBUILD_CONFIG=mysql_release"
diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix
index 4a9af9d329cc..9dbf060aa9a7 100644
--- a/pkgs/servers/web-apps/wordpress/default.nix
+++ b/pkgs/servers/web-apps/wordpress/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wordpress";
- version = "5.2.2";
+ version = "5.2.3";
src = fetchurl {
url = "https://wordpress.org/${pname}-${version}.tar.gz";
- sha256 = "08iilbvf1gam2nmacj0a8fgldnd2gighmslf9sny8dsdlqlwjgvq";
+ sha256 = "07gqdzhnqivyfah386lwyz984y9k2bc0hmji1y2pbvv0a60r63wr";
};
installPhase = ''
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index f1e6e28627c7..e5c4a47b110d 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchFromGitHub
, file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto
-, w3m, gnugrep, gnused, coreutils, xset
+, w3m, gnugrep, gnused, coreutils, xset, perlPackages
, mimiSupport ? false, gawk ? null }:
assert mimiSupport -> gawk != null;
@@ -13,6 +13,11 @@ let
rev = "8e0070f17bcd3612ee83cb84e663e7c7fabcca3d";
sha256 = "15gw2nyrqmdsdin8gzxihpn77grhk9l97jp7s7pr7sl4n9ya2rpj";
};
+
+ perlPath = with perlPackages; makePerlPath [
+ NetDBus XMLTwig XMLParser X11Protocol
+ ];
+
in
stdenv.mkDerivation rec {
@@ -39,6 +44,7 @@ stdenv.mkDerivation rec {
awk() { ${gawk}/bin/awk "$@"; }\
sort() { ${coreutils}/bin/sort "$@"; }\
xset() { ${xset}/bin/xset "$@"; }\
+ perl() { PERL5LIB=${perlPath} ${perlPackages.perl}/bin/perl "$@"; }\
&#' -i "$out"/bin/*
substituteInPlace $out/bin/xdg-open \
diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix
index ea25b302e355..436037245bbb 100644
--- a/pkgs/tools/filesystems/xtreemfs/default.nix
+++ b/pkgs/tools/filesystems/xtreemfs/default.nix
@@ -66,5 +66,6 @@ stdenv.mkDerivation {
maintainers = with lib.maintainers; [ raskin matejc ];
platforms = lib.platforms.linux;
license = lib.licenses.bsd3;
+ broken = true; # does not support openssl 1.1
};
}
diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index 0f448cc089c8..52e712c5cb1b 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "graylog";
- version = "3.1.0";
+ version = "3.1.2";
src = fetchurl {
url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
- sha256 = "0zv64cnd5nrn2hgbjmcwjam8dx5y2a7gz5x7xb9kr134132dm0yd";
+ sha256 = "14zr1aln34j5wifhg6ak3f83l959vic8i11jr90ibmnxl5v4hcqp";
};
dontBuild = true;
diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix
index a8d571da7ebd..e7d32dd4b373 100644
--- a/pkgs/tools/misc/graylog/plugins.nix
+++ b/pkgs/tools/misc/graylog/plugins.nix
@@ -38,10 +38,10 @@ in {
auth_sso = glPlugin rec {
name = "graylog-auth-sso-${version}";
pluginName = "graylog-plugin-auth-sso";
- version = "3.0.0";
+ version = "3.1.0";
src = fetchurl {
url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
- sha256 = "09y1s71mk8fm6lsghla7mrh9z5y230r8zpv84klhavh2dacs8gq5";
+ sha256 = "0hwgpq1j3qk0j1zgap5f1avh2nvkcscgds81x8xr0gamphgps8y2";
};
meta = {
homepage = https://github.com/Graylog2/graylog-plugin-auth-sso;
diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix
index 613ad263ed34..90498767c995 100644
--- a/pkgs/tools/misc/radeon-profile/default.nix
+++ b/pkgs/tools/misc/radeon-profile/default.nix
@@ -1,9 +1,11 @@
-{ stdenv, fetchFromGitHub, qtbase, qtcharts, qmake, libXrandr, libdrm }:
+{ lib, mkDerivation, fetchFromGitHub
+, qtbase, qtcharts, qmake, libXrandr, libdrm
+}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "radeon-profile";
- version = "20170714";
+ version = "20190903";
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase qtcharts libXrandr libdrm ];
@@ -12,15 +14,15 @@ stdenv.mkDerivation rec {
owner = "marazmista";
repo = "radeon-profile";
rev = version;
- sha256 = "08fv824iq00zbl9xk9zsfs8gkk8rsy6jlxbmszrjfx7ji28hansd";
+ sha256 = "0ax5417q03xjwi3pn7yyjdb90ssaygdprfgb1pz9nkyk6773ckx5";
}) + "/radeon-profile";
- postInstall = ''
- mkdir -p $out/bin
- cp ./radeon-profile $out/bin/radeon-profile
+ preConfigure = ''
+ substituteInPlace radeon-profile.pro \
+ --replace "/usr/" "$out/"
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Application to read current clocks of AMD Radeon cards";
homepage = https://github.com/marazmista/radeon-profile;
license = licenses.gpl2Plus;
diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix
index b9a4360abfb9..0a240248806d 100644
--- a/pkgs/tools/networking/p2p/amule/default.nix
+++ b/pkgs/tools/networking/p2p/amule/default.nix
@@ -1,5 +1,5 @@
{ monolithic ? true # build monolithic amule
-, daemon ? false # build amule daemon
+, enableDaemon ? false # build amule daemon
, httpServer ? false # build web interface for the daemon
, client ? false # build amule remote gui
, fetchurl, stdenv, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null
@@ -32,7 +32,7 @@ mkDerivation rec {
"--disable-debug"
"--enable-optimize"
(stdenv.lib.enableFeature monolithic "monolithic")
- (stdenv.lib.enableFeature daemon "amule-daemon")
+ (stdenv.lib.enableFeature enableDaemon "amule-daemon")
(stdenv.lib.enableFeature client "amule-gui")
(stdenv.lib.enableFeature httpServer "webserver")
];
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 69489e271cba..518c1baad5ad 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -121,7 +121,7 @@ common =
homepage = https://nixos.org/;
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = [ stdenv.lib.maintainers.eelco ];
- platforms = stdenv.lib.platforms.all;
+ platforms = stdenv.lib.platforms.unix;
outputsToInstall = [ "out" "man" ];
};
@@ -200,13 +200,13 @@ in rec {
});
nixFlakes = lib.lowPrio (callPackage common rec {
- name = "nix-2.3${suffix}";
- suffix = "pre20190830_04np4n6";
+ name = "nix-2.4${suffix}";
+ suffix = "pre20190922_382aa05";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "aa82f8b2d2a2c42f0d713e8404b668cef1a4b108";
- hash = "sha256-09ZHwpxf9pRDacCSGTHYx+fnKYgxKx8G37Jqb4wl1xI=";
+ rev = "382aa05ff71b61379f5c2792eaf517bdf4a5c5bf";
+ hash = "sha256-k4vV3Q1YVmLd+49AETnsSGetpDjD6sdd9yBrnpi8Q3g=";
};
fromGit = true;
diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix
index 2683192c89e3..24301fc76d87 100644
--- a/pkgs/tools/package-management/protontricks/default.nix
+++ b/pkgs/tools/package-management/protontricks/default.nix
@@ -4,13 +4,13 @@
buildPythonApplication rec {
pname = "protontricks";
- version = "1.2.4";
+ version = "1.2.5";
src = fetchFromGitHub {
owner = "Matoking";
repo = pname;
rev = version;
- sha256 = "0kwf2m62v4w7ds9y2fpcb8scazirkj114rn8y0ak62ph7lav8ma4";
+ sha256 = "1nkhp1mnvah7zkc1s55jji9lxxbph1miw8dfl9kb72khmaqfzsf0";
};
propagatedBuildInputs = [ vdf ];
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index c0fa221c9691..4d47e5d4134f 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ stdenv, fetchFromGitHub, buildGoPackage }:
-buildGoModule rec {
+buildGoPackage rec {
pname = "vault";
- version = "1.2.2";
+ version = "1.2.3";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "vault";
rev = "v${version}";
- sha256 = "1xljm7xmb4ldg3wx8s9kw1spffg4ywk4r1jqfa743czd2xxmqavl";
+ sha256 = "11zi12j09vi6j112a1n8f7sxwp15pbh0801bzh27ihcy01hlzdf8";
};
- modSha256 = "13pr3piv6hrsc562qagpn1h5wckiziyfqraj13172hdglz3n2i7q";
+ goPackagePath = "github.com/hashicorp/vault";
+
+ subPackages = [ "." ];
buildFlagsArray = [
"-tags='vault'"
@@ -19,8 +21,8 @@ buildGoModule rec {
];
postInstall = ''
- mkdir -p $out/share/bash-completion/completions
- echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault
+ mkdir -p $bin/share/bash-completion/completions
+ echo "complete -C $bin/bin/vault vault" > $bin/share/bash-completion/completions/vault
'';
meta = with stdenv.lib; {
diff --git a/pkgs/tools/system/daemon/default.nix b/pkgs/tools/system/daemon/default.nix
new file mode 100644
index 000000000000..9bc6ecc6ddfa
--- /dev/null
+++ b/pkgs/tools/system/daemon/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, perl}:
+
+stdenv.mkDerivation {
+ name = "daemon-0.6.4";
+ src = fetchurl {
+ url = http://libslack.org/daemon/download/daemon-0.6.4.tar.gz;
+ sha256 = "18aw0f8k3j30xqwv4z03962kdpqd10nf1w9liihylmadlx5fmff4";
+ };
+ makeFlags = "PREFIX=$(out)";
+ buildInputs = [ perl ];
+
+ meta = {
+ description = "Daemon turns other process into daemons";
+ longDescription = ''
+ Daemon turns other process into daemons. There are many tasks that need
+ to be performed to correctly set up a daemon process. This can be tedious.
+ Daemon performs these tasks for other processes. This is useful for
+ writing daemons in languages other than C, C++ or Perl (e.g. /bin/sh,
+ Java).
+ '';
+ license = stdenv.lib.licenses.gpl2Plus;
+ maintainers = [ stdenv.lib.maintainers.sander ];
+ platforms = stdenv.lib.platforms.unix;
+ };
+}
diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix
index 69fde7784f59..6622a03decc5 100644
--- a/pkgs/tools/typesetting/tex/texlive/combine.nix
+++ b/pkgs/tools/typesetting/tex/texlive/combine.nix
@@ -136,9 +136,9 @@ in buildEnv {
script =
writeText "hyphens.sed" (
# pick up the header
- "1,/^\% from/p;"
+ "1,/^% from/p;"
# pick up all sections matching packages that we combine
- + lib.concatMapStrings (pname: "/^\% from ${pname}:$/,/^\%/p;\n") pnames
+ + lib.concatMapStrings (pname: "/^% from ${pname}:$/,/^%/p;\n") pnames
);
in ''
(
diff --git a/pkgs/tools/typesetting/xml2rfc/default.nix b/pkgs/tools/typesetting/xml2rfc/default.nix
deleted file mode 100644
index 7fe0396ae440..000000000000
--- a/pkgs/tools/typesetting/xml2rfc/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ python, stdenv }:
-
-with python.pkgs;
-
-buildPythonPackage rec {
- pname = "xml2rfc";
- version = "2.9.8";
-
- buildInputs = [ intervaltree lxml requests pyflakes ];
- propagatedBuildInputs = [ intervaltree lxml requests six ];
-
- src = fetchPypi {
- inherit pname version;
- sha256 = "b50ce2f98bc431cadbcef0523213497049b78c2829ee81c399976f1e4832afc6";
- };
-
- meta = with stdenv.lib; {
- homepage = "https://xml2rfc.tools.ietf.org/";
- license = licenses.bsdOriginal;
- description = "Xml2rfc generates RFCs and IETF drafts from document source in XML according to the dtd in RFC2629.";
- maintainers = [ maintainers.yrashk ];
- };
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f8ceac5ae15..82412c1e450c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -713,7 +713,7 @@ in
amuleDaemon = appendToName "daemon" (amule.override {
monolithic = false;
- daemon = true;
+ enableDaemon = true;
});
amuleGui = appendToName "gui" (amule.override {
@@ -2515,6 +2515,8 @@ in
dadadodo = callPackage ../tools/text/dadadodo { };
+ daemon = callPackage ../tools/system/daemon { };
+
daemonize = callPackage ../tools/system/daemonize { };
daq = callPackage ../applications/networking/ids/daq { };
@@ -18242,7 +18244,6 @@ in
libpng = libpng_apng;
python = python2;
gnused = gnused_422;
- icu = icu63;
inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling
Kerberos AVFoundation MediaToolbox
CoreLocation Foundation AddressBook;
@@ -20118,7 +20119,7 @@ in
quasselDaemon = quassel.override {
monolithic = false;
- daemon = true;
+ enableDaemon = true;
withKDE = false;
tag = "-daemon-qt5";
};
@@ -24705,7 +24706,7 @@ in
diceware = callPackage ../tools/security/diceware { };
- xml2rfc = callPackage ../tools/typesetting/xml2rfc { };
+ xml2rfc = with python3Packages; toPythonApplication xml2rfc;
mmark = callPackage ../tools/typesetting/mmark { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8b1e7943fb6e..047ef07746a8 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12665,6 +12665,21 @@ let
};
};
+ NetPrometheus = buildPerlModule {
+ pname = "Net-Prometheus";
+ version = "0.07";
+ src = fetchurl {
+ url = mirror://cpan/authors/id/P/PE/PEVANS/Net-Prometheus-0.07.tar.gz;
+ sha256 = "1dh498b26wdaip053hw52317jjmb2n2r5209a1zv5yfrlxpblqm7";
+ };
+ propagatedBuildInputs = [ RefUtil StructDumb ];
+ buildInputs = [ TestFatal ];
+ meta = {
+ description = "export monitoring metrics for F";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
NetSCP = buildPerlPackage {
pname = "Net-SCP";
version = "0.08.reprise";
@@ -15736,6 +15751,20 @@ let
};
};
+ StructDumb = buildPerlModule {
+ pname = "Struct-Dumb";
+ version = "0.09";
+ src = fetchurl {
+ url = mirror://cpan/authors/id/P/PE/PEVANS/Struct-Dumb-0.09.tar.gz;
+ sha256 = "0g9rziaqxkm00vh30g1yfwzq3b1xl23p8fbm4rszqsp641wr2z9k";
+ };
+ buildInputs = [ TestFatal ];
+ meta = {
+ description = "make simple lightweight record-like structures";
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
SubExporter = buildPerlPackage {
pname = "Sub-Exporter";
version = "0.987";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 450930462c5f..ce2126071da5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -717,7 +717,7 @@ in {
mailman-web = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/web.nix { });
- mailmanclient = callPackage ../development/python-modules/mailmanclient { };
+ mailmanclient = disabledIf (!isPy3k) (callPackage ../development/python-modules/mailmanclient { });
mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { };
@@ -3101,8 +3101,6 @@ in {
flask_migrate = callPackage ../development/python-modules/flask-migrate { };
- flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib { };
-
flask-paginate = callPackage ../development/python-modules/flask-paginate { };
flask_principal = callPackage ../development/python-modules/flask-principal { };
@@ -5709,6 +5707,8 @@ in {
basemap = callPackage ../development/python-modules/basemap { };
+ dict2xml = callPackage ../development/python-modules/dict2xml { };
+
dicttoxml = callPackage ../development/python-modules/dicttoxml { };
markdown2 = callPackage ../development/python-modules/markdown2 { };