diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index 028fd674491..10e4706b059 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -253,8 +253,19 @@
or also with crossSystem, in which case packages run on the latter, but all building happens on the former.
Both parameters take the same schema as the 3 (build, host, and target) platforms defined in the previous section.
As mentioned above, lib.systems.examples has some platforms which are used as arguments for these parameters in practice.
- You can use them programmatically, or on the command line like nix-build <nixpkgs> --arg crossSystem '(import <nixpkgs/lib>).systems.examples.fooBarBaz'.
+ You can use them programmatically, or on the command line:
+nix-build <nixpkgs> --arg crossSystem '(import <nixpkgs/lib>).systems.examples.fooBarBaz' -A whatever
+
+
+ Eventually we would like to make these platform examples an unnecessary convenience so that
+nix-build <nixpkgs> --arg crossSystem.config '<arch>-<os>-<vendor>-<abi>' -A whatever
+ works in the vast majority of cases.
+ The problem today is dependencies on other sorts of configuration which aren't given proper defaults.
+ We rely on the examples to crudely to set those configuration parameters in some vaguely sane manner on the users behalf.
+ Issue #34274 tracks this inconvenience along with its root cause in crufty configuration options.
+
+
While one is free to pass both parameters in full, there's a lot of logic to fill in missing fields.
As discussed in the previous section, only one of system, config, and parsed is needed to infer the other two.
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index ba5ee757a7c..ed3fcd81951 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -610,6 +610,7 @@
schmitthenner = "Fabian Schmitthenner ";
schneefux = "schneefux ";
schristo = "Scott Christopher ";
+ scode = "Peter Schuller ";
scolobb = "Sergiu Ivanov ";
sdll = "Sasha Illarionov ";
SeanZicari = "Sean Zicari ";
@@ -679,6 +680,7 @@
ThomasMader = "Thomas Mader ";
thoughtpolice = "Austin Seipp ";
thpham = "Thomas Pham ";
+ tilpner = "Till Höppner ";
timbertson = "Tim Cuthbertson ";
timokau = "Timo Kaufmann ";
tiramiseb = "Sébastien Maccagnoni ";
@@ -698,6 +700,7 @@
tvorog = "Marsel Zaripov ";
tweber = "Thorsten Weber ";
twey = "James ‘Twey’ Kay ";
+ unode = "Renato Alves ";
uralbash = "Svintsov Dmitry ";
utdemir = "Utku Demir ";
#urkud = "Yury G. Kudryashov "; inactive since 2012
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 90d7e956d2b..5fc36c5b056 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -11,44 +11,33 @@ rec {
sheevaplug = rec {
config = "armv5tel-unknown-linux-gnueabi";
- bigEndian = false;
arch = "armv5tel";
float = "soft";
- withTLS = true;
libc = "glibc";
platform = platforms.sheevaplug;
- openssl.system = "linux-generic32";
};
raspberryPi = rec {
config = "armv6l-unknown-linux-gnueabihf";
- bigEndian = false;
arch = "armv6l";
float = "hard";
fpu = "vfp";
- withTLS = true;
libc = "glibc";
platform = platforms.raspberrypi;
- openssl.system = "linux-generic32";
};
armv7l-hf-multiplatform = rec {
config = "arm-unknown-linux-gnueabihf";
- bigEndian = false;
arch = "armv7-a";
float = "hard";
fpu = "vfpv3-d16";
- withTLS = true;
libc = "glibc";
platform = platforms.armv7l-hf-multiplatform;
- openssl.system = "linux-generic32";
};
aarch64-multiplatform = rec {
config = "aarch64-unknown-linux-gnu";
- bigEndian = false;
arch = "aarch64";
- withTLS = true;
libc = "glibc";
platform = platforms.aarch64-multiplatform;
};
@@ -62,24 +51,16 @@ rec {
arch = "armv5tel";
config = "armv5tel-unknown-linux-gnueabi";
float = "soft";
-
- platform = platforms.pogoplug4;
-
libc = "glibc";
-
- withTLS = true;
- openssl.system = "linux-generic32";
+ platform = platforms.pogoplug4;
};
fuloongminipc = rec {
config = "mips64el-unknown-linux-gnu";
- bigEndian = false;
arch = "mips";
float = "hard";
- withTLS = true;
libc = "glibc";
platform = platforms.fuloong2f_n32;
- openssl.system = "linux-generic32";
};
#
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index a4fa9af4e0a..3f0335a0adf 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -5,8 +5,6 @@ with lib.lists;
rec {
patterns = rec {
- "32bit" = { cpu = { bits = 32; }; };
- "64bit" = { cpu = { bits = 64; }; };
i686 = { cpu = cpuTypes.i686; };
x86_64 = { cpu = cpuTypes.x86_64; };
PowerPC = { cpu = cpuTypes.powerpc; };
@@ -14,6 +12,11 @@ rec {
Arm = { cpu = { family = "arm"; }; };
Aarch64 = { cpu = { family = "aarch64"; }; };
Mips = { cpu = { family = "mips"; }; };
+ RiscV = { cpu = { family = "riscv"; }; };
+ Wasm = { cpu = { family = "wasm"; }; };
+
+ "32bit" = { cpu = { bits = 32; }; };
+ "64bit" = { cpu = { bits = 64; }; };
BigEndian = { cpu = { significantByte = significantBytes.bigEndian; }; };
LittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; };
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index d14ca04bfb9..f59549ec2f3 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -44,6 +44,10 @@ rec {
x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; };
mips64el = { bits = 32; significantByte = littleEndian; family = "mips"; };
powerpc = { bits = 32; significantByte = bigEndian; family = "power"; };
+ riscv32 = { bits = 32; significantByte = littleEndian; family = "riscv"; };
+ riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; };
+ wasm32 = { bits = 32; significantByte = littleEndian; family = "wasm"; };
+ wasm64 = { bits = 64; significantByte = littleEndian; family = "wasm"; };
};
isVendor = isType "vendor";
diff --git a/nixos/modules/config/power-management.nix b/nixos/modules/config/power-management.nix
index a4a4d6e1a6a..4c37e8a6208 100644
--- a/nixos/modules/config/power-management.nix
+++ b/nixos/modules/config/power-management.nix
@@ -69,9 +69,6 @@ in
config = mkIf cfg.enable {
- # Leftover for old setups, should be set by nixos-generate-config now
- powerManagement.cpuFreqGovernor = mkDefault "ondemand";
-
systemd.targets.post-resume = {
description = "Post-Resume Actions";
requires = [ "post-resume.service" ];
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index 09cd9cb22ca..b23266e8d43 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -54,10 +54,12 @@ let
};
serviceConfig = {
- ExecStart = "${samba}/sbin/${appName} ${args}";
+ ExecStart = "${samba}/sbin/${appName} --foreground --no-process-group ${args}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
LimitNOFILE = 16384;
+ PIDFile = "/run/${appName}.pid";
Type = "notify";
+ NotifyAccess = "all"; #may not do anything...
};
restartTriggers = [ configFile ];
@@ -231,11 +233,12 @@ in
after = [ "samba-setup.service" "network.target" ];
wantedBy = [ "multi-user.target" ];
};
-
+ # Refer to https://github.com/samba-team/samba/tree/master/packaging/systemd
+ # for correct use with systemd
services = {
- "samba-smbd" = daemonService "smbd" "-F";
- "samba-nmbd" = mkIf cfg.enableNmbd (daemonService "nmbd" "-F");
- "samba-winbindd" = mkIf cfg.enableWinbindd (daemonService "winbindd" "-F");
+ "samba-smbd" = daemonService "smbd" "";
+ "samba-nmbd" = mkIf cfg.enableNmbd (daemonService "nmbd" "");
+ "samba-winbindd" = mkIf cfg.enableWinbindd (daemonService "winbindd" "");
"samba-setup" = {
description = "Samba Setup Task";
script = setupScript;
diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index b4f9d8b6fc1..5e368acd6d8 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -11,7 +11,7 @@ with lib;
services.udisks2.enable = mkDefault false;
powerManagement.enable = mkDefault false;
- networking.useHostResolvConf = true;
+ networking.useHostResolvConf = mkDefault true;
# Containers should be light-weight, so start sshd on demand.
services.openssh.startWhenNeeded = mkDefault true;
diff --git a/nixos/tests/statsd.nix b/nixos/tests/statsd.nix
index d6bbc390163..a9d7dc61cb6 100644
--- a/nixos/tests/statsd.nix
+++ b/nixos/tests/statsd.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib }:
+import ./make-test.nix ({ pkgs, lib, ... }:
with lib;
diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix
new file mode 100644
index 00000000000..0d2899b2e64
--- /dev/null
+++ b/pkgs/applications/altcoins/monero-gui/default.nix
@@ -0,0 +1,89 @@
+{ stdenv, fetchFromGitHub
+, makeWrapper, makeDesktopItem
+, qtbase, qmake, qtmultimedia, qttools
+, qtgraphicaleffects, qtdeclarative
+, qtlocation, qtquickcontrols, qtwebchannel
+, qtwebengine, qtx11extras, qtxmlpatterns
+, monero, unbound, readline, boost, libunwind
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ name = "monero-gui-${version}";
+ version = "0.11.1.0";
+
+ src = fetchFromGitHub {
+ owner = "monero-project";
+ repo = "monero-gui";
+ rev = "v${version}";
+ sha256 = "01d7apwrv8j8bh7plvvhlnll3ransaha3n6rx19nkgvfn319hswq";
+ };
+
+ nativeBuildInputs = [ qmake ];
+
+ buildInputs = [
+ qtbase qtmultimedia qtgraphicaleffects
+ qtdeclarative qtlocation qtquickcontrols
+ qtwebchannel qtwebengine qtx11extras
+ qtxmlpatterns monero unbound readline
+ boost libunwind makeWrapper
+ ];
+
+ patches = [
+ ./move-log-file.patch
+ ./move-translations-dir.patch
+ ];
+
+ postPatch = ''
+ echo '
+ var GUI_VERSION = "${version}";
+ var GUI_MONERO_VERSION = "${getVersion monero}";
+ ' > version.js
+ substituteInPlace monero-wallet-gui.pro \
+ --replace '$$[QT_INSTALL_BINS]/lrelease' '${getDev qttools}/bin/lrelease'
+ substituteInPlace src/daemon/DaemonManager.cpp \
+ --replace 'QApplication::applicationDirPath() + "' '"${monero}/bin'
+ '';
+
+ makeFlags = [ "INSTALL_ROOT=$(out)" ];
+
+ preBuild = ''
+ sed -i s#/opt/monero-wallet-gui##g Makefile
+ make -C src/zxcvbn-c
+ '';
+
+ desktopItem = makeDesktopItem {
+ name = "monero-wallet-gui";
+ exec = "monero-wallet-gui";
+ icon = "monero";
+ desktopName = "Monero Wallet";
+ genericName = "Wallet";
+ categories = "Application;Network;Utility;";
+ };
+
+ postInstall = ''
+ # install desktop entry
+ mkdir -p $out/share/applications
+ cp ${desktopItem}/share/applications/* $out/share/applications
+
+ # install translations
+ cp -r release/bin/translations $out/share/
+
+ # install icons
+ for n in 16 24 32 48 64 96 128 256; do
+ size=$n"x"$n
+ mkdir -p $out/share/icons/hicolor/$size/apps
+ cp $src/images/appicons/$size.png \
+ $out/share/icons/hicolor/$size/apps/monero.png
+ done;
+ '';
+
+ meta = {
+ description = "Private, secure, untraceable currency";
+ homepage = https://getmonero.org/;
+ license = licenses.bsd3;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ rnhmjoj ];
+ };
+}
diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/altcoins/monero-gui/move-log-file.patch
new file mode 100644
index 00000000000..928fb32911f
--- /dev/null
+++ b/pkgs/applications/altcoins/monero-gui/move-log-file.patch
@@ -0,0 +1,42 @@
+diff --git a/main.cpp b/main.cpp
+index 1a9a979..2316929 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -74,10 +74,6 @@ int main(int argc, char *argv[])
+ // qDebug() << "High DPI auto scaling - enabled";
+ //#endif
+
+- // Log settings
+- Monero::Wallet::init(argv[0], "monero-wallet-gui");
+-// qInstallMessageHandler(messageHandler);
+-
+ MainApp app(argc, argv);
+
+ qDebug() << "app startd";
+@@ -86,6 +82,13 @@ int main(int argc, char *argv[])
+ app.setOrganizationDomain("getmonero.org");
+ app.setOrganizationName("monero-project");
+
++ // Log settings
++ QString logfile =
++ QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
++ + "/monero-wallet-gui.log";
++ Monero::Wallet::init(argv[0], logfile.toUtf8().constData());
++
++
+ filter *eventFilter = new filter;
+ app.installEventFilter(eventFilter);
+
+diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
+index 8525bf3..6967b24 100644
+--- a/src/libwalletqt/Wallet.cpp
++++ b/src/libwalletqt/Wallet.cpp
+@@ -613,7 +613,7 @@ QString Wallet::getDaemonLogPath() const
+
+ QString Wallet::getWalletLogPath() const
+ {
+- return QCoreApplication::applicationDirPath() + "/monero-wallet-gui.log";
++ return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/monero-wallet-gui.log";
+ }
+
+ Wallet::Wallet(Monero::Wallet *w, QObject *parent)
diff --git a/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch b/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch
new file mode 100644
index 00000000000..29bb5630154
--- /dev/null
+++ b/pkgs/applications/altcoins/monero-gui/move-translations-dir.patch
@@ -0,0 +1,14 @@
+diff --git a/TranslationManager.cpp b/TranslationManager.cpp
+index fa39d35..5a410f7 100644
+--- a/TranslationManager.cpp
++++ b/TranslationManager.cpp
+@@ -29,7 +29,7 @@ bool TranslationManager::setLanguage(const QString &language)
+ #ifdef Q_OS_MACX
+ QString dir = qApp->applicationDirPath() + "/../Resources/translations";
+ #else
+- QString dir = qApp->applicationDirPath() + "/translations";
++ QString dir = qApp->applicationDirPath() + "/../share/translations";
+ #endif
+
+ QString filename = "monero-core_" + language;
+
diff --git a/pkgs/applications/altcoins/monero/build-wallet-rpc.patch b/pkgs/applications/altcoins/monero/build-wallet-rpc.patch
new file mode 100644
index 00000000000..5436332db80
--- /dev/null
+++ b/pkgs/applications/altcoins/monero/build-wallet-rpc.patch
@@ -0,0 +1,78 @@
+diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt
+index 63908005..f6656d5c 100644
+--- a/src/wallet/CMakeLists.txt
++++ b/src/wallet/CMakeLists.txt
+@@ -86,43 +86,40 @@ target_link_libraries(wallet
+ ${EXTRA_LIBRARIES})
+ add_dependencies(wallet version)
+
+-if (NOT BUILD_GUI_DEPS)
+- set(wallet_rpc_sources
+- wallet_rpc_server.cpp)
++set(wallet_rpc_sources
++ wallet_rpc_server.cpp)
+
+- set(wallet_rpc_headers)
++set(wallet_rpc_headers)
+
+- set(wallet_rpc_private_headers
+- wallet_rpc_server.h)
++set(wallet_rpc_private_headers
++ wallet_rpc_server.h)
+
+- monero_private_headers(wallet_rpc_server
+- ${wallet_rpc_private_headers})
+- monero_add_executable(wallet_rpc_server
+- ${wallet_rpc_sources}
+- ${wallet_rpc_headers}
+- ${wallet_rpc_private_headers})
+-
+- target_link_libraries(wallet_rpc_server
+- PRIVATE
+- wallet
+- epee
+- rpc
+- cryptonote_core
+- cncrypto
+- common
+- ${Boost_CHRONO_LIBRARY}
+- ${Boost_PROGRAM_OPTIONS_LIBRARY}
+- ${Boost_FILESYSTEM_LIBRARY}
+- ${Boost_THREAD_LIBRARY}
+- ${CMAKE_THREAD_LIBS_INIT}
+- ${EXTRA_LIBRARIES})
+- add_dependencies(wallet_rpc_server version)
+- set_property(TARGET wallet_rpc_server
+- PROPERTY
+- OUTPUT_NAME "monero-wallet-rpc")
+- install(TARGETS wallet_rpc_server DESTINATION bin)
+-endif()
++monero_private_headers(wallet_rpc_server
++ ${wallet_rpc_private_headers})
++monero_add_executable(wallet_rpc_server
++ ${wallet_rpc_sources}
++ ${wallet_rpc_headers}
++ ${wallet_rpc_private_headers})
+
++target_link_libraries(wallet_rpc_server
++ PRIVATE
++ wallet
++ epee
++ rpc
++ cryptonote_core
++ cncrypto
++ common
++ ${Boost_CHRONO_LIBRARY}
++ ${Boost_PROGRAM_OPTIONS_LIBRARY}
++ ${Boost_FILESYSTEM_LIBRARY}
++ ${Boost_THREAD_LIBRARY}
++ ${CMAKE_THREAD_LIBS_INIT}
++ ${EXTRA_LIBRARIES})
++add_dependencies(wallet_rpc_server version)
++set_property(TARGET wallet_rpc_server
++ PROPERTY
++ OUTPUT_NAME "monero-wallet-rpc")
++install(TARGETS wallet_rpc_server DESTINATION bin)
+
+ # build and install libwallet_merged only if we building for GUI
+ if (BUILD_GUI_DEPS)
diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix
new file mode 100644
index 00000000000..4b1e9cd4ea3
--- /dev/null
+++ b/pkgs/applications/altcoins/monero/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchpatch, fetchFromGitHub, cmake
+, boost, miniupnpc, openssl, pkgconfig, unbound
+}:
+
+stdenv.mkDerivation rec {
+ name = "monero-${version}";
+ version = "0.11.1.0";
+
+ src = fetchFromGitHub {
+ owner = "monero-project";
+ repo = "monero";
+ rev = "v${version}";
+ sha256 = "0nrpxx6r63ia6ard85d504x2kgaikvrhb5sg93ml70l6djyy1148";
+ };
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ buildInputs = [ boost miniupnpc openssl unbound ];
+
+ patches = [
+ ./build-wallet-rpc.patch # fixed in next release
+ ];
+
+ cmakeFlags = [
+ "-DCMAKE_BUILD_TYPE=Release"
+ "-DBUILD_GUI_DEPS=ON"
+ ];
+
+ doCheck = false;
+
+ installPhase = ''
+ make install
+ install -Dt "$out/bin/" \
+ bin/monero-blockchain-export \
+ bin/monero-blockchain-import \
+ bin/monero-wallet-rpc
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Private, secure, untraceable currency";
+ homepage = https://getmonero.org/;
+ license = licenses.bsd3;
+ platforms = platforms.all;
+ maintainers = [ maintainers.ehmry ];
+ };
+}
diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index a6a7ad22fa1..5c9211e7f3b 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, libjack2
+{ stdenv, fetchFromGitHub, alsaLib, fftwSinglePrec, freetype, libjack2
, libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }:
stdenv.mkDerivation rec {
- name = "distrho-ports-unstable-2017-10-10";
+ name = "distrho-ports-unstable-2018-01-01";
- src = fetchgit {
- url = "https://github.com/DISTRHO/DISTRHO-Ports.git";
- rev = "e11e2b204c14b8e370a0bf5beafa5f162fedb8e9";
- sha256 = "1nd542iian9kr2ldaf7fkkgf900ryzqigks999d1jhms6p0amvfv";
+ src = fetchFromGitHub {
+ owner = "DISTRHO";
+ repo = "DISTRHO-Ports";
+ rev = "b200e7409aa9f6612c4d948932f6ce6f0a087f5a";
+ sha256 = "0672r0a9s6skzkxpjdraziwh5k8ivrfzvi4zcpkcg3zrv2hia2vz";
};
patchPhase = ''
diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix
index 4b552301dd3..8c2987352fb 100644
--- a/pkgs/applications/audio/gradio/default.nix
+++ b/pkgs/applications/audio/gradio/default.nix
@@ -17,7 +17,7 @@
, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
}:
let
- version = "7.0";
+ version = "7.1";
in stdenv.mkDerivation rec {
name = "gradio-${version}";
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
owner = "haecker-felix";
repo = "gradio";
rev = "v${version}";
- sha256 = "0kn08k5dv7yh29ksywcpl6ifrp3p8zzk3p3hkbhzc8fpx84jn7r9";
+ sha256 = "0x0hmcjvpgvsm64ywcc71srlwqybfhadn5nkwycq0lh7r49d89kx";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
index 206754a5195..f355c540f30 100644
--- a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
buildPhase = ''
faust2jaqt -vec -time -t 99999 CharacterCompressor.dsp
faust2jaqt -vec -time -t 99999 CharacterCompressorMono.dsp
- sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "lib/CharacterCompressor.lib"
faust2lv2 -vec -time -gui -t 99999 CharacterCompressor.dsp
faust2lv2 -vec -time -gui -t 99999 CharacterCompressorMono.dsp
'';
diff --git a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
index 467e11daaf6..90e4eabeef0 100644
--- a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
@@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
faust2jaqt -time -vec -double -t 99999 $f
done
- sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "CompBus.lib"
-
for f in *.dsp;
do
faust2lv2 -time -vec -double -gui -t 99999 $f
diff --git a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
index b452d91426e..73dd7b48e9c 100644
--- a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
buildPhase = ''
faust2jaqt -time -vec -t 99999 ConstantDetuneChorus.dsp
- sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "ConstantDetuneChorus.dsp"
faust2lv2 -time -vec -t 99999 -gui ConstantDetuneChorus.dsp
'';
diff --git a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
index d1959ec3ceb..39065db6ede 100644
--- a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
buildPhase = ''
faust2jaqt -vec -time -t 99999 LazyLimiter.dsp
- sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "GUI.lib"
faust2lv2 -vec -time -t 99999 -gui LazyLimiter.dsp
'';
diff --git a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
index 6216ba55593..362451988d3 100644
--- a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
buildPhase = ''
faust2jaqt -time -vec -t 99999 MBdistortion.dsp
- sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "MBdistortion.dsp"
faust2lv2 -time -vec -gui -t 99999 MBdistortion.dsp
'';
diff --git a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
index 0bb2034fc46..3f809aa7847 100644
--- a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
buildPhase = ''
faust2jaqt -time -vec -t 99999 RhythmDelay.dsp
- sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "RhythmDelay.dsp"
faust2lv2 -time -vec -t 99999 -gui RhythmDelay.dsp
'';
diff --git a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
index e526e40a1e3..fece392ab1c 100644
--- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
@@ -19,11 +19,9 @@ stdenv.mkDerivation rec {
faust2jaqt -time -double -t 99999 $f
done
- sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "compressors.lib"
-
for f in *.dsp;
do
- echo "compiling plugin from" $f
+ echo "Compiling plugin from" $f
faust2lv2 -time -double -gui -t 99999 $f
done
'';
diff --git a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
index daa23baa966..6237628e600 100644
--- a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
@@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
do
echo "Building jack standalone for $f"
faust2jaqt -vec -time -t 99999 "$f"
- sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "$f"
echo "Building lv2 for $f"
faust2lv2 -vec -time -gui -t 99999 "$f"
done
diff --git a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
index 422aabb2829..cb9247fd3d0 100644
--- a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
buildPhase = ''
faust2jaqt -vec -double -time -t 99999 shelfMultiBand.dsp
faust2jaqt -vec -double -time -t 99999 shelfMultiBandMono.dsp
- sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "shelfMultiBand.lib"
faust2lv2 -vec -double -time -gui -t 99999 shelfMultiBandMono.dsp
faust2lv2 -vec -double -time -gui -t 99999 shelfMultiBand.dsp
'';
diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index 1e0b46826cf..1b30399ae0a 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "mpg123-1.25.7";
+ name = "mpg123-1.25.8";
src = fetchurl {
url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
- sha256 = "1ws40fglyyk51jvmz8gfapjkw1g51pkch1rffdsbh4b1yay5xc9i";
+ sha256 = "16s9z1xc5kv1p90g42vsr9m4gq3dwjsmrj873x4i8601mvpm3nkr";
};
buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
index ca147ffc735..1b865642178 100644
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/pkgs/applications/audio/ncmpc/default.nix
@@ -3,20 +3,18 @@
stdenv.mkDerivation rec {
name = "ncmpc-${version}";
- version = "0.28";
+ version = "0.29";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "ncmpc";
rev = "v${version}";
- sha256 = "1z0bdkqsdb3f5k2lsws3qzav4r30fzk8fhxj9l0p738flcka6k4n";
+ sha256 = "1b2kbx2phbf4s2qpy7mx72c87xranljr0yam6z9m1i1kvcnp8q1q";
};
buildInputs = [ glib ncurses mpd_clientlib ];
nativeBuildInputs = [ meson ninja pkgconfig gettext ];
- NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
-
meta = with stdenv.lib; {
description = "Curses-based interface for MPD (music player daemon)";
homepage = https://www.musicpd.org/clients/ncmpc/;
diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix
index 8a7ab8889a6..d864d5972bc 100644
--- a/pkgs/applications/audio/opusfile/default.nix
+++ b/pkgs/applications/audio/opusfile/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, openssl, libogg, libopus }:
stdenv.mkDerivation rec {
- name = "opusfile-0.8";
+ name = "opusfile-0.10";
src = fetchurl {
url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
- sha256 = "192mp2jgn5s9815h31ybzsfipmbppmdhwx1dymrk26xarz9iw8rc";
+ sha256 = "0bs1376sd131qdh7198jp64vv5d17az5wyy4y7srrvw7p8k3bq28";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix
index 9aa24738c37..d234f6b6b8c 100644
--- a/pkgs/applications/audio/xmp/default.nix
+++ b/pkgs/applications/audio/xmp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, alsaLib, libxmp }:
stdenv.mkDerivation rec {
- name = "xmp-4.0.10";
+ name = "xmp-4.1.0";
meta = with stdenv.lib; {
description = "Extended module player";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/xmp/xmp/${name}.tar.gz";
- sha256 = "0gjylvvmq7ha0nhcjg56qfp0xxpsrcsj7y5r914svd5x1ppmzm5n";
+ sha256 = "17i8fc7x7yn3z1x963xp9iv108gxfakxmdgmpv3mlm438w3n3g8x";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/applications/editors/vbindiff/default.nix
index 3a3a0d1a781..8d3a5353c98 100644
--- a/pkgs/applications/editors/vbindiff/default.nix
+++ b/pkgs/applications/editors/vbindiff/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "vbindiff-${version}";
- version = "3.0_beta4";
+ version = "3.0_beta5";
buildInputs = [ ncurses ];
src = fetchurl {
url = "https://www.cjmweb.net/vbindiff/${name}.tar.gz";
- sha256 = "0gcqy4ggp60qc6blq1q1gc90xmhip1m6yvvli4hdqlz9zn3mlpbx";
+ sha256 = "1f1kj4jki08bnrwpzi663mjfkrx4wnfpzdfwd2qgijlkx5ysjkgh";
};
meta = {
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 6aa2ba118d6..0cb95d75fcf 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -14,8 +14,8 @@ let
else throw "ImageMagick is not supported on this platform.";
cfg = {
- version = "7.0.7-21";
- sha256 = "0680dbg77gcyb3g4n22z5mp7c8mg0jpkqb0g4nj7d7r78nl869rv";
+ version = "7.0.7-22";
+ sha256 = "12c48cfhc2a3zvhgxdywrfy8b4m2vx85vn2qj69iyni5x849xpj9";
patches = [];
};
in
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index bb6b8c89a2f..be3a369c28b 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -14,8 +14,8 @@ let
else throw "ImageMagick is not supported on this platform.";
cfg = {
- version = "6.9.9-33";
- sha256 = "05931wfhllrb1c2g2nwnwaf1wazn60y5f70gd11qcqp46rif7z21";
+ version = "6.9.9-34";
+ sha256 = "0sqrgyfi7i7x1akna95c1qhk9sxxswzm3pkssfi4w6v7bn24g25g";
patches = [];
}
# Freeze version on mingw so we don't need to port the patch too often.
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 5fd636ff7c5..787ddc72ec9 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -11,12 +11,12 @@
assert stdenv ? glibc;
stdenv.mkDerivation rec {
- version = "2.4.0";
+ version = "2.4.1";
name = "darktable-${version}";
src = fetchurl {
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
- sha256 = "0y0q7a7k09sbg05k5xl1lz8n2ak1v8yarfv222ksvmbrxs53hdwx";
+ sha256 = "014pq80i5k1kdvvrl7xrgaaq3i4fzv09h7a3pwzlp2ahkczwcm32";
};
buildInputs =
diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix
new file mode 100644
index 00000000000..6fb7182035b
--- /dev/null
+++ b/pkgs/applications/graphics/goxel/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, wrapGAppsHook
+, glfw3, gtk3, libpng12 }:
+
+stdenv.mkDerivation rec {
+ name = "goxel-${version}";
+ version = "0.7.2";
+
+ src = fetchFromGitHub {
+ owner = "guillaumechereau";
+ repo = "goxel";
+ rev = "v${version}";
+ sha256 = "1d6waj8zz9iq3ddbi9wbpcnh200ajjy9x53xrj5bij01pb8jwskv";
+ };
+
+ nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ];
+ buildInputs = [ glfw3 gtk3 libpng12 ];
+
+ buildPhase = ''
+ make release
+ '';
+
+ installPhase = ''
+ install -D ./goxel $out/bin/goxel
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Open Source 3D voxel editor";
+ homepage = https://guillaumechereau.github.io/goxel/;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ tilpner ];
+ };
+}
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index 11a2b3a8c8b..f086a8f5ba6 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -2,14 +2,14 @@
, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11
, libwebp, quantumdepth ? 8, fixDarwinDylibNames }:
-let version = "1.3.27"; in
+let version = "1.3.28"; in
stdenv.mkDerivation {
name = "graphicsmagick-${version}";
src = fetchurl {
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
- sha256 = "0rq35p3rml10cxz2z4s7xcfsilhhk19mmy094g3ivz0fg797hcnh";
+ sha256 = "0jlrrimrajcmwp7llivyj14qnzb1mpqd8vw95dl6zbx5m2lnhall";
};
patches = [
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index a9c238ead3c..791cd7be2d0 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -9,11 +9,11 @@
mkDerivation rec {
name = "krita-${version}";
- version = "3.3.2";
+ version = "3.3.3";
src = fetchurl {
- url = https://download.kde.org/stable/krita/3.3.2/krita-3.3.2.1.tar.xz;
- sha256 = "0i3l27cfi1h486m74xf4ynk0pwx32xaqraa91a0g1bpj1jxf2mg5";
+ url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz";
+ sha256 = "0pc6hnakkqy81x5b5ncivaps6hqv43i50sjwgi3i3cz9j8rlxh5y";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];
diff --git a/pkgs/applications/graphics/meme/default.nix b/pkgs/applications/graphics/meme/default.nix
new file mode 100644
index 00000000000..2fddc39e0d0
--- /dev/null
+++ b/pkgs/applications/graphics/meme/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "meme-unstable-${version}";
+ version = "2017-09-10";
+
+ owner = "nomad-software";
+ repo = "meme";
+ goPackagePath = "github.com/${owner}/${repo}";
+
+ src = fetchFromGitHub {
+ inherit owner repo;
+ rev = "a6521f2eecb0aac22937b0013747ed9cb40b81ea";
+ sha256 = "1gbsv1d58ck6mj89q31s5b0ppw51ab76yqgz39jgwqnkidvzdfly";
+ };
+
+ meta = with stdenv.lib; {
+ description = "A command line utility for creating image macro style memes";
+ homepage = "https://github.com/nomad-software/meme";
+ license = licenses.mit;
+ maintainers = [ maintainers.fgaz ];
+ platforms = with platforms; linux ++ darwin;
+ };
+}
diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index e7a05c522ca..06a1a946cdf 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -3,12 +3,12 @@
}:
stdenv.mkDerivation rec {
- version = "2015.03-1";
+ version = "2015.03-3";
name = "openscad-${version}";
src = fetchurl {
url = "http://files.openscad.org/${name}.src.tar.gz";
- sha256 = "61e0dd3cd107e5670d727526700104cca5ac54a1f0a84117fcc9e57bf3b6b279";
+ sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx";
};
buildInputs = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
homepage = http://openscad.org/;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
- maintainers = with stdenv.lib.maintainers;
+ maintainers = with stdenv.lib.maintainers;
[ bjornfor raskin the-kenny ];
};
}
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 00735624ad9..d87ac459d02 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "gpxsee-${version}";
- version = "4.14";
+ version = "4.19";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
- sha256 = "0yv3hcs5b8a88mp24h8r2sn69phwrahdff5pp74lz24270il3jgb";
+ sha256 = "1xjf2aawf633c1ydhpcsjhdlfkjkfsjbcgjd737xpfv1wjz99l4l";
};
nativeBuildInputs = [ qmake qttools ];
@@ -26,11 +26,14 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = http://tumic.wz.cz/gpxsee;
+ homepage = http://www.gpxsee.org/;
description = "GPX viewer and analyzer";
+ longDescription = ''
+ GPXSee is a Qt-based GPS log file viewer and analyzer that supports GPX,
+ TCX, KML, FIT, IGC and NMEA files.
+ '';
license = licenses.gpl3;
maintainers = [ maintainers.womfoo ];
platforms = platforms.linux;
};
-
}
diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix
index 27bda1e2092..f6d9f4edb62 100644
--- a/pkgs/applications/misc/gqrx/default.nix
+++ b/pkgs/applications/misc/gqrx/default.nix
@@ -8,13 +8,13 @@ assert pulseaudioSupport -> libpulseaudio != null;
stdenv.mkDerivation rec {
name = "gqrx-${version}";
- version = "2.8";
+ version = "2.10";
src = fetchFromGitHub {
owner = "csete";
repo = "gqrx";
rev = "v${version}";
- sha256 = "0niy4c05886mhbfmix93j2bnj4kzdh9bvrmymawl6z28glyz5d3c";
+ sha256 = "1qc944sn1kjdnhdhcsdc39764vqcryk86808xxl49vy8sznqr0mf";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/applications/misc/j4-dmenu-desktop/default.nix
index 6b4762c0de4..f24951624c5 100644
--- a/pkgs/applications/misc/j4-dmenu-desktop/default.nix
+++ b/pkgs/applications/misc/j4-dmenu-desktop/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "j4-dmenu-desktop-${version}";
- version = "2.15";
+ version = "2.16";
src = fetchFromGitHub {
owner = "enkore";
repo = "j4-dmenu-desktop";
rev = "r${version}";
- sha256 = "1yn45i3hpim2hriaqkq7wmawwsmkynvy2xgz7dg6p5r0ikw5bn1r";
+ sha256 = "0714cri8bwpimmiirhzrkbri4xi24k0za6i1aw94d3fnblk2dg9f";
};
postPatch = ''
diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix
index f627a3cda22..9e584217c59 100644
--- a/pkgs/applications/misc/mdp/default.nix
+++ b/pkgs/applications/misc/mdp/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, ncurses }:
stdenv.mkDerivation rec {
- version = "1.0.10";
+ version = "1.0.12";
name = "mdp-${version}";
src = fetchFromGitHub {
owner = "visit1985";
repo = "mdp";
rev = version;
- sha256 = "1swp1hqryai84c8dpzsvjpgg5rz2vnn2vrp0dhwy8r0qgpmby2nn";
+ sha256 = "04izj9i9rxmgswjh2iawqs6qglfv44zfv042smmcvfh1pm43361i";
};
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index e6175356348..7b4b8f0d780 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
stdenv.mkDerivation rec {
- version = "17.10";
+ version = "17.12";
name = "mediainfo-${version}";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "1yvh4r19kk3bzzgnr4ikrjxqldr6860s35sh4bqr51c7l77k048c";
+ sha256 = "1pxdf0ny3c38gl513zdiaagpvk4bqnsc2fn7476yjdpv2lxsw56f";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix
deleted file mode 100644
index ed2049ee5ab..00000000000
--- a/pkgs/applications/misc/monero/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, boost, miniupnpc, openssl, pkgconfig, unbound }:
-
-let
- version = "0.11.1.0";
-in
-stdenv.mkDerivation {
- name = "monero-${version}";
-
- src = fetchFromGitHub {
- owner = "monero-project";
- repo = "monero";
- rev = "v${version}";
- sha256 = "0nrpxx6r63ia6ard85d504x2kgaikvrhb5sg93ml70l6djyy1148";
- };
-
- nativeBuildInputs = [ cmake pkgconfig ];
-
- buildInputs = [ boost miniupnpc openssl unbound ];
-
- # these tests take a long time and don't
- # always complete in the build environment
- postPatch = "sed -i '/add_subdirectory(tests)/d' CMakeLists.txt";
-
- NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
-
- doCheck = false;
-
- installPhase = ''
- install -Dt "$out/bin/" \
- bin/monerod \
- bin/monero-blockchain-export \
- bin/monero-blockchain-import \
- bin/monero-wallet-cli \
- bin/monero-wallet-rpc
- '';
-
- meta = with stdenv.lib; {
- description = "Private, secure, untraceable currency";
- homepage = https://getmonero.org/;
- license = licenses.bsd3;
- maintainers = [ maintainers.ehmry ];
- platforms = [ "x86_64-linux" ];
- };
-}
diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index f3198085b9a..ce1c790614e 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, file, less
+{ stdenv, fetchFromGitHub, pythonPackages, file, less
, imagePreviewSupport ? true, w3m ? null}:
with stdenv.lib;
@@ -6,18 +6,14 @@ with stdenv.lib;
assert imagePreviewSupport -> w3m != null;
pythonPackages.buildPythonApplication rec {
- name = "ranger-1.8.1";
+ name = "ranger-v${version}";
+ version = "1.9.0";
- meta = {
- description = "File manager with minimalistic curses interface";
- homepage = http://ranger.nongnu.org/;
- license = stdenv.lib.licenses.gpl3;
- platforms = stdenv.lib.platforms.unix;
- };
-
- src = fetchurl {
- url = "http://ranger.nongnu.org/${name}.tar.gz";
- sha256 = "1d11qw0mr9aj22a7nhr6p2c3yzf359xbffmjsjblq44bjpwzjcql";
+ src = fetchFromGitHub {
+ owner = "ranger";
+ repo = "ranger";
+ rev = "v${version}";
+ sha256= "0h3qz0sr21390xdshhlfisvscja33slv1plzcisg1wrdgwgyr5j6";
};
checkInputs = with pythonPackages; [ pytest ];
@@ -50,4 +46,11 @@ pythonPackages.buildPythonApplication rec {
--replace "set preview_images false" "set preview_images true" \
'';
+ meta = with stdenv.lib; {
+ description = "File manager with minimalistic curses interface";
+ homepage = http://ranger.github.io/;
+ license = licenses.gpl3;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.magnetophon ];
+ };
}
diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix
index 2cdf047a10f..f9779beec0f 100644
--- a/pkgs/applications/misc/styx/default.nix
+++ b/pkgs/applications/misc/styx/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "styx-${version}";
- version = "0.7.0";
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "styx-static";
repo = "styx";
rev = "v${version}";
- sha256 = "044zpj92w96csaddf1qnnc2w2w9iq4b7rzlqqsqnd1s0a87lm1qd";
+ sha256 = "01lklz7l9klqmmsncikwjnk3glzyz15c30118s82yd1chwpwhpfl";
};
server = "${caddy.bin}/bin/caddy";
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index b868c434e23..b1b1132f22b 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -38,13 +38,12 @@
with stdenv.lib;
-with chromium.upstream-info;
-
let
opusWithCustomModes = libopus.override {
withCustomModes = true;
};
+ version = chromium.upstream-info.version;
gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2;
gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2;
@@ -68,7 +67,7 @@ in stdenv.mkDerivation rec {
name = "google-chrome${suffix}-${version}";
- src = binary;
+ src = chromium.upstream-info.binary;
buildInputs = [
patchelf
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 8f22045578d..d64c7a20cb9 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -98,7 +98,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
- version = "7.0.11";
+ version = "7.5";
lang = "en-US";
@@ -108,7 +108,7 @@ let
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
- sha256 = "0i42jxdka0sq8fp6lj64n0az6m4g72il9qhdn63p0h7y4204i2v4";
+ sha256 = "1ia8qv5hj7zrrli5d9qf65s3rlrls0whrx3q96lw63x2gn05nwv7";
};
"i686-linux" = fetchurl {
@@ -116,7 +116,7 @@ let
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
- sha256 = "1p9s6wqghpkml662vnp5194i8gb9bkqxdr96fmw0fh305cyk25k0";
+ sha256 = "1sw1n7jsagyl5cjs265x3k9jzh0j0yh767ixcy17vif5f9dfyzak";
};
};
in
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 6654ee89c80..68c66d78de1 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -23,7 +23,7 @@ let
});
in stdenv.mkDerivation rec {
- version = "1.4.0";
+ version = "1.4.1";
name = "mesos-${version}";
enableParallelBuilding = true;
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://apache/mesos/${version}/${name}.tar.gz";
- sha256 = "0c08kd226nrjwm2z2drpq4vi97h9r8b1xkdvkgh1114fxg7cyvys";
+ sha256 = "1c7l0rim9ija913gpppz2mcms08ywyqhlzbbspqsi7wwfdd7jwsr";
};
patches = [
diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index 0e8c4849f3c..c543825c9f2 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }:
stdenv.mkDerivation rec {
- version = "1.0.6";
+ version = "1.1.0";
name = "irssi-${version}";
src = fetchurl {
url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
- sha256 = "0iiz0x698bdlpssbj357ln5f7ccjwc1m1550xzy1g7kwcvdpp4mb";
+ sha256 = "0y362v6ncgs77q5axv7vgjm6vcxiaj5chsxj1ha07jaxsr1z7285";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index d28bfb647e5..90fbe18f0bc 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -27,11 +27,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "mutt-${version}";
- version = "1.9.2";
+ version = "1.9.3";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
- sha256 = "15kqxpx8bykqbyw4q33hkz0j2f65v6cl21sl5li2vw5vaaim5qd2";
+ sha256 = "1qbngck1pq1jkpnbpcwcb2q2zqrkgp0nd68wwp57bprxjgb8a6j3";
};
patches = optional smimeSupport (fetchpatch {
diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/applications/science/biology/muscle/default.nix
new file mode 100644
index 00000000000..9cbabc7ab37
--- /dev/null
+++ b/pkgs/applications/science/biology/muscle/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ _name = "muscle";
+ name = "${_name}-${version}";
+ version = "3.8.31";
+
+ src = fetchurl {
+ url = "https://www.drive5.com/muscle/downloads${version}/${_name}${version}_src.tar.gz";
+ sha256 = "1b89z0x7h098g99g00nqadgjnb2r5wpi9s11b7ddffqkh9m9dia3";
+ };
+
+ patches = [
+ ./muscle-3.8.31-no-static.patch
+ ];
+
+ preBuild = ''
+ cd ./src/
+ patchShebangs mk
+ '';
+
+ installPhase = ''
+ install -vD muscle $out/bin/muscle
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A multiple sequence alignment method with reduced time and space complexity";
+ license = licenses.publicDomain;
+ homepage = https://www.drive5.com/muscle/;
+ maintainers = [ maintainers.unode ];
+ # NOTE: Supposed to be compatible with darwin/intel & PPC but currently fails.
+ # Anyone with access to these platforms is welcome to give it a try
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch b/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch
new file mode 100644
index 00000000000..7f4b2129518
--- /dev/null
+++ b/pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch
@@ -0,0 +1,21 @@
+--- a/src/mk 2010-05-02 01:15:42.000000000 +0200
++++ b/src/mk 2018-01-27 17:07:23.539092748 +0100
+@@ -5,14 +5,14 @@
+ rm -f *.o muscle.make.stdout.txt muscle.make.stderr.txt
+ for CPPName in $CPPNames
+ do
+- echo $CPPName >> /dev/tty
++ echo $CPPName
+ g++ $ENV_GCC_OPTS -c -O3 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 $CPPName.cpp -o $CPPName.o >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt
+ done
+
+ LINK_OPTS=
+-if [ `uname -s` == Linux ] ; then
+- LINK_OPTS=-static
+-fi
++#if [ `uname -s` == Linux ] ; then
++# LINK_OPTS=-static
++#fi
+ g++ $LINK_OPTS $ENV_LINK_OPTS -g -o muscle $ObjNames >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt
+ tail muscle.make.stderr.txt
+
diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix
new file mode 100644
index 00000000000..1642739140d
--- /dev/null
+++ b/pkgs/applications/science/biology/star/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, zlib }:
+
+stdenv.mkDerivation rec {
+ name = "star-${version}";
+ version = "2.5.3a";
+
+ src = fetchFromGitHub {
+ repo = "STAR";
+ owner = "alexdobin";
+ rev = version;
+ sha256 = "1fd9xl7i1zxgsxn2qf6gz8s42g2djm29qmp6qb35d8nnxh8ns54x";
+ };
+
+ sourceRoot = "source/source";
+
+ postPatch = "sed 's:/bin/rm:rm:g' -i Makefile";
+
+ buildInputs = [ zlib ];
+
+ buildPhase = "make STAR STARlong";
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp STAR STARlong $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Spliced Transcripts Alignment to a Reference";
+ homepage = https://github.com/alexdobin/STAR;
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.arcadio ];
+ };
+}
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index 24dc4436b0f..686e93b5d5e 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -18,6 +18,7 @@
# - https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/sagemath
{ stdenv
+, bash
, fetchurl
, perl
, gfortran
@@ -26,13 +27,17 @@
, gettext
, which
, texlive
+, texinfo
, hevea
}:
stdenv.mkDerivation rec {
- version = "8.0";
+ version = "8.1";
name = "sage-${version}";
+ # Modified version of patchShebangs that patches to the sage-internal version if possible
+ # and falls back to the system version if not.
+ patchSageShebangs = ./patchSageShebangs.sh;
src = fetchurl {
# Note that the source is *not* fetched from github, since that doesn't
# the upstream folder with all the source tarballs of the spkgs.
@@ -70,11 +75,12 @@ stdenv.mkDerivation rec {
"http://www-ftp.lip6.fr/pub/math/sagemath/src/sage-${version}.tar.gz"
"http://ftp.ntua.gr/pub/sagemath/src/sage-${version}.tar.gz"
];
- sha256 = "1a9rhb8jby6fdqa2s7n2fl9jwqqlsl7qz7dbpbwvg6jwlrvni7fg";
+ sha256 = "1cpcs1mr0yii64s152xmxyd450bfzjb22jjj0zh9y3n6g9alzpyq";
};
postPatch = ''
substituteAllInPlace src/bin/sage-env
+ bash=${bash} substituteAllInPlace build/bin/sage-spkg
'';
installPhase = ''
@@ -84,14 +90,16 @@ stdenv.mkDerivation rec {
outputs = [ "out" "doc" ];
buildInputs = [
+ bash # needed for the build
perl # needed for the build
python # needed for the build
- gfortran # needed to build giac
+ gfortran # needed to build giac, openblas
autoreconfHook # needed to configure sage with prefix
gettext # needed to build the singular spkg
hevea # needed to build the docs of the giac spkg
which # needed in configure of mpir
# needed to build the docs of the giac spkg
+ texinfo # needed to build maxima
(texlive.combine { inherit (texlive)
scheme-basic
collection-pstricks # needed by giac
@@ -102,18 +110,22 @@ stdenv.mkDerivation rec {
})
];
+ nativeBuildInputs = [ gfortran perl which ];
+
patches = [
# fix usages of /bin/rm
./spkg-singular.patch
# help python find the crypt library
- ./spkg-python2.patch
- ./spkg-python3.patch
+ # patches python3 and indirectly python2, since those installation files are symlinked
+ ./spkg-python.patch
# fix usages of /usr/bin/perl
./spkg-git.patch
# fix usages of /bin/cp and add necessary argument to function call
./spkg-giac.patch
# environment
./env.patch
+ # adjust wrapper shebang and patch shebangs after each spkg build
+ ./shebangs.patch
];
enableParallelBuilding = true;
@@ -144,7 +156,14 @@ stdenv.mkDerivation rec {
preBuild = ''
# TODO do this conditionally
export SAGE_SPKG_INSTALL_DOCS='no'
- patchShebangs build
+ # symlink python to make sure the shebangs are patched to the sage path
+ # while still being able to use python before building it
+ # (this is important because otherwise sage will try to install python
+ # packages globally later on)
+ ln -s "${python}/bin/python2" $out/bin/python2
+ ln -s "$out/bin/python2" $out/bin/python
+ touch $out/bin/python3
+ bash $patchSageShebangs .
'';
postBuild = ''
@@ -153,9 +172,12 @@ stdenv.mkDerivation rec {
rm -rf "$out/sage-root/src/.git"
rm -r "$out/sage-root/logs"
# Fix dependency cycle between out and doc
+ rm -f "$out/sage-root/config.log"
rm -f "$out/sage-root/config.status"
rm -f "$out/sage-root/build/make/Makefile-auto"
rm -f "$out/sage-home/.sage/gap/libgap-workspace-"*
+ # Make sure all shebangs are properly patched
+ bash $patchSageShebangs $out
'';
# TODO there are some doctest failures, which seem harmless.
diff --git a/pkgs/applications/science/math/sage/patchSageShebangs.sh b/pkgs/applications/science/math/sage/patchSageShebangs.sh
new file mode 100644
index 00000000000..6ddf93af011
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patchSageShebangs.sh
@@ -0,0 +1,51 @@
+# This is a slightly modified version of nix's default patchShebangs
+
+dir="$1"
+
+echo "patching sage internal script interpreter paths in $( readlink -f "$dir")"
+
+find "$dir" -type f -perm -0100 | while read f; do
+ if [ "$(head -1 "$f" | head -c+2)" != '#!' ]; then
+ # missing shebang => not a script
+ continue
+ fi
+
+ oldInterpreterLine=$(head -1 "$f" | tail -c+3)
+ read -r oldPath arg0 args <<< "$oldInterpreterLine"
+
+ if $(echo "$oldPath" | grep -q "/bin/env$"); then
+ # Check for unsupported 'env' functionality:
+ # - options: something starting with a '-'
+ # - environment variables: foo=bar
+ if $(echo "$arg0" | grep -q -- "^-.*\|.*=.*"); then
+ echo "unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)"
+ exit 1
+ fi
+ executable="$arg0"
+ else
+ if [ "$oldPath" = "" ]; then
+ # If no interpreter is specified linux will use /bin/sh. Set
+ # oldpath="/bin/sh" so that we get /nix/store/.../sh.
+ oldPath="/bin/sh"
+ fi
+ executable="$(basename "$oldPath")"
+ args="$arg0 $args"
+ fi
+
+ newPath="$(echo "$out/bin/$executable $args" | sed 's/[[:space:]]*$//')"
+ if [[ ! -x "$newPath" ]] ; then
+ newPath="$(command -v "$executable" || true)"
+ fi
+
+ # Strip trailing whitespace introduced when no arguments are present
+ newInterpreterLine="$(echo "$newPath $args" | sed 's/[[:space:]]*$//')"
+
+ if [ -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then
+ if [ -n "$newPath" -a "$newPath" != "$oldPath" ]; then
+ echo "$f: sage interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\""
+ # escape the escape chars so that sed doesn't interpret them
+ escapedInterpreterLine=$(echo "$newInterpreterLine" | sed 's|\\|\\\\|g')
+ sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f"
+ fi
+ fi
+done
diff --git a/pkgs/applications/science/math/sage/shebangs.patch b/pkgs/applications/science/math/sage/shebangs.patch
new file mode 100644
index 00000000000..96ed5a4bc6c
--- /dev/null
+++ b/pkgs/applications/science/math/sage/shebangs.patch
@@ -0,0 +1,36 @@
+diff --git a/build/bin/sage-spkg b/build/bin/sage-spkg
+index 83e61a7e0d..942ba206c7 100755
+--- a/build/bin/sage-spkg
++++ b/build/bin/sage-spkg
+@@ -648,8 +648,12 @@ if ! sage-apply-patches; then
+ error_msg "Error applying patches"
+ exit 1
+ fi
++
++@bash@/bin/bash @patchSageShebangs@ .
++
+ cd ..
+
++
+ ##################################################################
+ # The package has been extracted, prepare for installation
+ ##################################################################
+@@ -671,7 +675,7 @@ write_script_wrapper() {
+ local tmpscript="$(dirname "$script")/.tmp-${script##*/}"
+
+ cat > "$tmpscript" <<__EOF__
+-#!/usr/bin/env bash
++#! @bash@/bin/bash
+
+ export SAGE_ROOT="$SAGE_ROOT"
+ export SAGE_SRC="$SAGE_SRC"
+@@ -833,6 +837,9 @@ if [ "$UNAME" = "CYGWIN" ]; then
+ sage-rebase.sh "$SAGE_LOCAL" 2>/dev/null
+ fi
+
++@bash@/bin/bash @patchSageShebangs@ .
++@bash@/bin/bash @patchSageShebangs@ "$out/bin"
++
+ echo "Successfully installed $PKG_NAME"
+
+ if [ "$SAGE_CHECK" = "yes" ]; then
diff --git a/pkgs/applications/science/math/sage/spkg-python.patch b/pkgs/applications/science/math/sage/spkg-python.patch
new file mode 100644
index 00000000000..e39981b6552
--- /dev/null
+++ b/pkgs/applications/science/math/sage/spkg-python.patch
@@ -0,0 +1,13 @@
+diff --git a/build/pkgs/python3/spkg-build b/build/pkgs/python3/spkg-build
+index 56db087ae5..b450703c5f 100644
+--- a/build/pkgs/python3/spkg-build
++++ b/build/pkgs/python3/spkg-build
+@@ -27,6 +27,8 @@ fi
+ export EXTRA_CFLAGS="`testcflags.sh -Wno-unused` $CFLAGS"
+ unset CFLAGS
+
++export LDFLAGS="$LDFLAGS -lcrypt"
++
+ if [ "$UNAME" = Darwin ]; then
+ PYTHON_CONFIGURE="--disable-toolbox-glue $PYTHON_CONFIGURE"
+
diff --git a/pkgs/applications/science/math/sage/spkg-python2.patch b/pkgs/applications/science/math/sage/spkg-python2.patch
deleted file mode 100644
index 5d92d3f8bea..00000000000
--- a/pkgs/applications/science/math/sage/spkg-python2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- old/build/pkgs/python2/spkg-install 2017-07-21 14:10:00.000000000 -0500
-+++ new/build/pkgs/python2/spkg-install 2017-10-15 11:26:54.823134067 -0500
-@@ -22,6 +22,9 @@
-
- cd src
-
-+LDFLAGS="-lcrypt $LDFLAGS"
-+export LDFLAGS
-+
- if [ "$SAGE_DEBUG" = "yes" ]; then
- echo "Building Python with pydebug"
- PYTHON_CONFIGURE="$PYTHON_CONFIGURE --with-pydebug"
diff --git a/pkgs/applications/science/math/sage/spkg-python3.patch b/pkgs/applications/science/math/sage/spkg-python3.patch
deleted file mode 100644
index 51827fd11be..00000000000
--- a/pkgs/applications/science/math/sage/spkg-python3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- old/build/pkgs/python3/spkg-install 2017-07-21 14:10:00.000000000 -0500
-+++ new/build/pkgs/python3/spkg-install 2017-10-15 13:11:17.769261404 -0500
-@@ -22,6 +22,9 @@
-
- cd src
-
-+LDFLAGS="-lcrypt $LDFLAGS"
-+export LDFLAGS
-+
- if [ "$SAGE_DEBUG" = "yes" ]; then
- echo "Building Python with pydebug"
- PYTHON_CONFIGURE="$PYTHON_CONFIGURE --with-pydebug"
diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix
index 5e1feacd83d..78b59f59e94 100644
--- a/pkgs/applications/version-management/gitolite/default.nix
+++ b/pkgs/applications/version-management/gitolite/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, git, nettools, perl }:
+{ stdenv, fetchFromGitHub, git, nettools, perl }:
stdenv.mkDerivation rec {
name = "gitolite-${version}";
- version = "3.6.3";
+ version = "3.6.7";
- src = fetchurl {
- url = "https://github.com/sitaramc/gitolite/archive/v${version}.tar.gz";
- sha256 = "16cxifjxnri719qb6zzwkdf61x5y957acbdhcgqcan23x1mfn84v";
+ src = fetchFromGitHub {
+ owner = "sitaramc";
+ repo = "gitolite";
+ rev = "9123ae44b14b9df423a7bf1e693e05865ca320ac";
+ sha256 = "0rmyzr66lxh2ildf3h1nh3hh2ndwk21rjdin50r5vhwbdd7jg8vb";
};
buildInputs = [ git nettools perl ];
@@ -26,6 +28,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
perl ./install -to $out/bin
+ echo ${version} > $out/bin/VERSION
'';
meta = with stdenv.lib; {
@@ -33,6 +36,6 @@ stdenv.mkDerivation rec {
homepage = http://gitolite.com/gitolite/index.html;
license = licenses.gpl2;
platforms = platforms.unix;
- maintainers = [ maintainers.thoughtpolice maintainers.lassulus ];
+ maintainers = [ maintainers.thoughtpolice maintainers.lassulus maintainers.tomberek ];
};
}
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 867dacc213e..9324b08efd7 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv
, drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, qt5, boost
-, libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt
+, libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt, cmark
, withGUI ? true
}:
@@ -10,20 +10,20 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "mkvtoolnix-${version}";
- version = "19.0.0";
+ version = "20.0.0";
src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
- sha256 = "068g0mmi284zl9d9p9zhp55h6rj58j5c27czd3mg42kq74cwcsx9";
+ sha256 = "0qrjvvp0pvw9i91rh0zrxpclq7xap2dpjip0s5bm4gv14gh4l4mc";
};
nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ];
buildInputs = [
expat file xdg_utils boost libebml zlib libmatroska libogg
- libvorbis flac
+ libvorbis flac cmark
]
++ optional stdenv.isDarwin libiconv
++ optionals withGUI [qt5.qtbase qt5.qtmultimedia];
diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix
index 9fd07febbfc..9ff54bd681f 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@@ -1,17 +1,17 @@
{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }:
pythonPackages.buildPythonApplication rec {
- version = "0.9.0";
+ version = "0.10.0";
name = "streamlink-${version}";
src = fetchFromGitHub {
owner = "streamlink";
repo = "streamlink";
rev = "${version}";
- sha256 = "11jczkar3aqsbl5amkm7lsv4fz6xdaydd5izn222wjzsbvnzrcgd";
+ sha256 = "1p9gkwcvqlnv09ihqh71nh82nnmq9ybp1v8d8kd2vhkg1vm5ximn";
};
- buildInputs = with pythonPackages; [ pytest mock ];
+ checkInputs = with pythonPackages; [ pytest mock requests-mock ];
propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client ]) ++ [ rtmpdump ffmpeg ];
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index 68ee06953a3..2f5a6192c86 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -13,12 +13,12 @@ with stdenv.lib;
stdenv.mkDerivation rec {
baseName = "virt-viewer";
- version = "5.0";
+ version = "6.0";
name = "${baseName}-${version}";
src = fetchurl {
url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz";
- sha256 = "0blbp1wkw8ahss9va0bmcz2yx18j0mvm6fzrzhh2ly3sja5ysb8b";
+ sha256 = "1chqrf658niivzfh85cbwkbv9vyg8sv1mv3i31vawkfsfdvvsdwh";
};
nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 20df6566b23..4d572e8c040 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "i3lock-${version}";
- version = "2.9.1";
+ version = "2.10";
src = fetchurl {
url = "https://i3wm.org/i3lock/${name}.tar.bz2";
- sha256 = "1467ha4ssbfjk1jh0ya2i5ljzm554ln18nyrppvsipg8shb1cshh";
+ sha256 = "1vn8828ih7mpdl58znfnzpdwdgwksq16rghm5qlppbbz66zk5sr9";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
index 01884f48878..2c46d5fae90 100644
--- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix
+++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix
@@ -21,7 +21,6 @@ let
crossSystem = {
libc = "msvcrt";
platform = {};
- openssl.system = "mingw64";
inherit arch;
config = "${arch}-w64-mingw32";
};
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index f292ef4d52d..0e6a0450bb4 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "man-pages-${version}";
- version = "4.12";
+ version = "4.14";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
- sha256 = "6f6d79d991fed04e16e7c7a15705304b0b9d51de772c51c57428555039fbe093";
+ sha256 = "0wf9ymqxk1k5xwcl3n919p66a1aayif3x4cahj4w04y3k1wbhlih";
};
makeFlags = [ "MANDIR=$(out)/share/man" ];
diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix
new file mode 100644
index 00000000000..9173387a4c7
--- /dev/null
+++ b/pkgs/data/fonts/twemoji-color-font/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }:
+
+stdenv.mkDerivation rec {
+ name = "twemoji-color-font-${meta.version}";
+ src = fetchFromGitHub {
+ owner = "eosrei";
+ repo = "twemoji-color-font";
+ rev = "v${meta.version}";
+ sha256 = "0i7krmg99nrrj7mbjjd2cw6dx24aja63571mcyp6d7q1z09asz9k";
+ };
+
+ nativeBuildInputs = [ inkscape imagemagick potrace svgo scfbuild ];
+ # silence inkscape errors about non-writable home
+ preBuild = "export HOME=\"$NIX_BUILD_ROOT\"";
+ makeFlags = [ "SCFBUILD=${scfbuild}/bin/scfbuild" ];
+ enableParallelBuilding = true;
+ installPhase = "install -Dm755 build/TwitterColorEmoji-SVGinOT.ttf $out/share/fonts/truetype/TwitterColorEmoji-SVGinOT.ttf";
+
+ meta = with stdenv.lib; {
+ version = "1.3";
+ description = "Color emoji SVGinOT font using Twitter Unicode 10 emoji with diversity and country flags";
+ longDescription = ''
+ A color and B&W emoji SVGinOT font built from the Twitter Emoji for
+ Everyone artwork with support for ZWJ, skin tone diversity and country
+ flags.
+
+ The font works in all operating systems, but will currently only show
+ color emoji in Firefox, Thunderbird, Photoshop CC 2017, and Windows Edge
+ V38.14393+. This is not a limitation of the font, but of the operating
+ systems and applications. Regular B&W outline emoji are included for
+ backwards/fallback compatibility.
+ '';
+ homepage = "https://github.com/eosrei/twemoji-color-font";
+ downloadPage = "https://github.com/eosrei/twemoji-color-font/releases";
+ license = with licenses; [ cc-by-40 mit ];
+ maintainers = [ maintainers.fgaz ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix
index c714dc6cf1b..70f217f1b7e 100644
--- a/pkgs/data/misc/wireless-regdb/default.nix
+++ b/pkgs/data/misc/wireless-regdb/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "wireless-regdb-${version}";
- version = "2017.03.07";
+ version = "2017.12.23";
src = fetchurl {
url = "https://www.kernel.org/pub/software/network/wireless-regdb/${name}.tar.xz";
- sha256 = "1f9mcp78sdd4sci6v32vxfcl1rfjpv205jisz1p93kkfnaisy7ip";
+ sha256 = "1faa394frq0126h2z28kp4dwknx6zqm5nar4552g7rwqvl2yclqf";
};
dontBuild = true;
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index e8e6b5224de..de3544a3a63 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -3,10 +3,10 @@
, curl, tzdata, gdb, darwin
, callPackage
, bootstrapVersion ? false
-, version ? "2.078.0"
-, dmdSha256 ? "1ia4swyq0xqppnpmcalh2yxywdk2gv3kvni2abx1mq6wwqgmwlcr"
-, druntimeSha256 ? "0inyvcjc5qn8277d1zlfvgdgiss86rkjg9mhkw5l31hix8yan372"
-, phobosSha256 ? "1vb5xnysja9l8hvv9gy4c05vihmblz7ga005761jbazxkmlfirj4"
+, version ? "2.078.1"
+, dmdSha256 ? "0b9lphh4g3r9cyzv4wcfppv9j3w952vvwv615za23acgwav3mqg2"
+, druntimeSha256 ? "16jv40m073cflpkyl0vmg1g58cianybfcsgcvwli7pfryxbgsbrr"
+, phobosSha256 ? "08ircpf4ilznz638kra272hz8fi5ccvw2cswj5hqckssl1lyqzs8"
}:
let
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 253af033dd8..15ddd9e7009 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -55,7 +55,7 @@ assert langGo -> langCC;
with stdenv.lib;
with builtins;
-let version = "7.2.0";
+let version = "7.3.0";
# Whether building a cross-compiler for GNU/Hurd.
crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
@@ -184,7 +184,7 @@ stdenv.mkDerivation ({
src = fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
- sha256 = "16j7i0888j2f1yp9l0nhji6cq65dy6y4nwy8868a8njbzzwavxqw";
+ sha256 = "0p71bij6bfhzyrs8676a8jmpjsfz392s2rg862sdnsk30jpacb43";
};
inherit patches;
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index b7808ab6ec0..9d6f641bc46 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -37,6 +37,12 @@ stdenv.mkDerivation {
# The build will fail at the very end on AArch64 without this.
dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then true else null;
+ # Running the default `strip -S` command on Darwin corrupts the
+ # .rlib files in "lib/".
+ #
+ # See https://github.com/NixOS/nixpkgs/pull/34227
+ stripDebugList = if stdenv.isDarwin then [ "bin" ] else null;
+
NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib";
# Enable nightly features in stable compiles (used for
@@ -78,8 +84,9 @@ stdenv.mkDerivation {
#[ -f src/liballoc_jemalloc/lib.rs ] && sed -i 's,je_,,g' src/liballoc_jemalloc/lib.rs
#[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+
- # Disable fragile linker-output-non-utf8 test
+ # Disable fragile tests.
rm -vr src/test/run-make/linker-output-non-utf8 || true
+ rm -vr src/test/run-make/issue-26092.rs || true
# Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835
rm -vr src/test/run-pass/issue-36023.rs || true
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index cd3120ed831..54610467e7a 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
name = "sbcl-${version}";
- version = "1.4.2";
+ version = "1.4.3";
src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
- sha256 = "05s7wsx6bsnx4h6w3d8yim9apbvi8ih0glmvkmgjz7nrad4abjwd";
+ sha256 = "1z8d11k6vc6jhmpwzy0nawj84qdd2jvibrvqmb1nmq3h8w64hlam";
};
patchPhase = ''
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 74331d46a8b..acae897609b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -960,4 +960,43 @@ self: super: {
sha256 = "0i889zs46wn09d7iqdy99201zaqxb175cfs8jz2zi3mv4ywx3a0l";
});
+ # Copy hledger man pages from data directory into the proper place. This code
+ # should be moved into the cabal2nix generator.
+ hledger = overrideCabal super.hledger (drv: {
+ postInstall = ''
+ for i in $(seq 1 9); do
+ for j in $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/.otherdocs/*.$i; do
+ mkdir -p $out/share/man/man$i
+ cp $j $out/share/man/man$i/
+ done
+ done
+ mkdir $out/share/info
+ cp $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.info $out/share/info/
+ '';
+ });
+ hledger-ui = overrideCabal super.hledger-ui (drv: {
+ postInstall = ''
+ for i in $(seq 1 9); do
+ for j in $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/.otherdocs/*.$i; do
+ mkdir -p $out/share/man/man$i
+ cp $j $out/share/man/man$i/
+ done
+ done
+ mkdir $out/share/info
+ cp $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.info $out/share/info/
+ '';
+ });
+ hledger-web = overrideCabal super.hledger-web (drv: {
+ postInstall = ''
+ for i in $(seq 1 9); do
+ for j in $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.$i $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/.otherdocs/*.$i; do
+ mkdir -p $out/share/man/man$i
+ cp $j $out/share/man/man$i/
+ done
+ done
+ mkdir $out/share/info
+ cp $data/share/${self.ghc.name}/${pkgs.stdenv.system}-${self.ghc.name}/*/*.info $out/share/info/
+ '';
+ });
+
}
diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index e4eb8d3ab2e..46cdf3a47c6 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }:
stdenv.mkDerivation rec {
- version = "4.9";
+ version = "4.11";
name = "cgal-" + version;
src = fetchFromGitHub {
owner = "CGAL";
repo = "releases";
rev = "CGAL-${version}";
- sha256 = "044amgml1x5h17rpkck2azmxrmjvlzzykv71cjh5hlajsi88cid5";
+ sha256 = "126r06aba5h8l73xmm5mwmxkir7sy122jn2j18cd4gz3z9p23npr";
};
# note: optional component libCGAL_ImageIO would need zlib and opengl;
diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix
index 60d40b10aa4..d93430ac1f5 100644
--- a/pkgs/development/libraries/geoip/default.nix
+++ b/pkgs/development/libraries/geoip/default.nix
@@ -1,17 +1,22 @@
# in geoipDatabase, you can insert a package defining ${geoipDatabase}/share/GeoIP
# e.g. geolite-legacy
-{ stdenv, fetchurl, pkgs, drvName ? "geoip", geoipDatabase ? "/var/lib/geoip-databases" }:
+{ stdenv, fetchFromGitHub, autoreconfHook
+, drvName ? "geoip", geoipDatabase ? "/var/lib/geoip-databases" }:
-let version = "1.6.2";
+let version = "1.6.12";
dataDir = if (stdenv.lib.isDerivation geoipDatabase) then "${toString geoipDatabase}/share/GeoIP" else geoipDatabase;
in stdenv.mkDerivation {
name = "${drvName}-${version}";
- src = fetchurl {
- url = "http://geolite.maxmind.com/download/geoip/api/c/GeoIP-${version}.tar.gz";
- sha256 = "0dd6si4cvip73kxdn43apg6yygvaf7dnk5awqfg9w2fd2ll0qnh7";
+ src = fetchFromGitHub {
+ owner = "maxmind";
+ repo = "geoip-api-c";
+ rev = "v${version}";
+ sha256 = "0ixyp3h51alnncr17hqp1p0rlqz9w69nlhm60rbzjjz3vjx52ajv";
};
+ nativeBuildInputs = [ autoreconfHook ];
+
postPatch = ''
find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \;
'';
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index f68970ae13e..b17d4effb1e 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -127,7 +127,6 @@ stdenv.mkDerivation ({
] ++ lib.optionals withLinuxHeaders [
"--enable-kernel=3.2.0" # can't get below with glibc >= 2.26
] ++ lib.optionals (cross != null) [
- (if cross.withTLS then "--with-tls" else "--without-tls")
(if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp")
] ++ lib.optionals (cross != null) [
"--with-__thread"
@@ -156,8 +155,7 @@ stdenv.mkDerivation ({
// (removeAttrs args [ "withLinuxHeaders" "withGd" ]) //
{
- name = name + "-${version}${patchSuffix}" +
- lib.optionalString (cross != null) "-${cross.config}";
+ name = name + "-${version}${patchSuffix}";
src = fetchurl {
url = "mirror://gnu/glibc/glibc-${version}.tar.xz";
@@ -190,14 +188,7 @@ stdenv.mkDerivation ({
libc_cv_forced_unwind=yes
libc_cv_c_cleanup=yes
libc_cv_gnu89_inline=yes
- # Only due to a problem in gcc configure scripts:
- libc_cv_sparc64_tls=${if cross.withTLS then "yes" else "no"}
EOF
-
- export BUILD_CC=gcc
- export CC="$crossConfig-gcc"
- export AR="$crossConfig-ar"
- export RANLIB="$crossConfig-ranlib"
'';
preBuild = lib.optionalString withGd "unset NIX_DONT_SET_RPATH";
diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix
index 4d6af866990..c0745cb9e68 100644
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/pkgs/development/libraries/hwloc/default.nix
@@ -6,15 +6,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "hwloc-1.11.8";
+ name = "hwloc-1.11.9";
src = fetchurl {
url = "http://www.open-mpi.org/software/hwloc/v1.11/downloads/${name}.tar.bz2";
- sha256 = "0karxv4r1r8sa7ki5aamlxdvyvz0bvzq4gdhq0yi5nc4a0k11vzc";
+ sha256 = "0r2im1s5lp7zjwqalcqcnlxx0dsky1bnx5waf2r3rmj888c36hrr";
};
- hardeningDisable = [ "format" ];
-
configureFlags = [
"--localstatedir=/var"
];
@@ -75,8 +73,8 @@ stdenv.mkDerivation rec {
# http://www.open-mpi.org/projects/hwloc/license.php
license = licenses.bsd3;
- homepage = http://www.open-mpi.org/projects/hwloc/;
- maintainers = [ ];
+ homepage = https://www.open-mpi.org/projects/hwloc/;
+ maintainers = with maintainers; [ fpletz ];
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix
index f7da9e9140d..4f2785675f0 100644
--- a/pkgs/development/libraries/ldb/default.nix
+++ b/pkgs/development/libraries/ldb/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "ldb-1.3.1";
+ name = "ldb-1.1.27";
src = fetchurl {
url = "mirror://samba/ldb/${name}.tar.gz";
- sha256 = "1b1mkggp8swb67s9aswavhzswlib34hpgsv66zgns009paf2df6d";
+ sha256 = "1b1mkl5p8swb67s9aswavhzswlib34hpgsv66zgns009paf2df6d";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix
index 79cbf09317c..94e8ea05e66 100644
--- a/pkgs/development/libraries/libargon2/default.nix
+++ b/pkgs/development/libraries/libargon2/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libargon2-${version}";
- version = "20161029";
+ version = "20171227";
src = fetchFromGitHub {
owner = "P-H-C";
repo = "phc-winner-argon2";
rev = "${version}";
- sha256 = "021g8wi4g67ywm8zf3yncqwrmfz7ypgm1ih9wcmnxip5n75rymh5";
+ sha256 = "0sc9zca1anqk41017vjpas4kxi4cbn0zvicv8vj8p2sb2gy94bh8";
};
installPhase = ''
diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix
index 058839f70f8..d7ebf781a04 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@@ -19,11 +19,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libass-${version}";
- version = "0.13.7";
+ version = "0.14.0";
src = fetchurl {
url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz";
- sha256 = "17byv926w1mxn56n896sxvdq4m0yv1l7qbm688h6zr3nzgsyarbh";
+ sha256 = "18iqznl4mabhj9ywfsz4kwvbsplcv1jjxq50nxssvbj8my1267w8";
};
configureFlags = [
diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix
index 900bcac4156..bcfee044475 100644
--- a/pkgs/development/libraries/libast/default.nix
+++ b/pkgs/development/libraries/libast/default.nix
@@ -3,8 +3,8 @@
stdenv.mkDerivation rec {
name = "libast-${version}";
- version = "0.7";
-
+ version = "0.7.1";
+
src = fetchurl {
url = "http://www.eterm.org/download/${name}.tar.gz";
sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj";
diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index 8b67d52b875..fea4744a075 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -19,11 +19,11 @@ assert withFonts -> freetype != null;
stdenv.mkDerivation rec {
name = "libbluray-${version}";
- version = "1.0.0";
+ version = "1.0.2";
src = fetchurl {
url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2";
- sha256 = "1k3lag4lxi2jjd3zh4wcb5l3hadzm54j5kagh92yzfy76p9svqzp";
+ sha256 = "1zxfnw1xbghcj7b3zz5djndv6gwssxda19cz1lrlqrkg8577r7kd";
};
patches = optional withJava ./BDJ-JARFILE-path.patch;
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
'';
configureFlags = with stdenv.lib;
- optional (! withJava) "--disable-bdjava"
+ optional (! withJava) "--disable-bdjava-jar"
++ optional (! withMetadata) "--without-libxml2"
++ optional (! withFonts) "--without-freetype"
;
diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index 7e112caf3c7..0e232a50e94 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libbsd-${version}";
- version = "0.8.6";
+ version = "0.8.7";
src = fetchurl {
url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz";
- sha256 = "11wnkzims5grprvhb1ssmq9pc2lcgh2r2rk8gwgz36ply6fvyzs6";
+ sha256 = "0c9bl49zs0xdddcwj5dh0lay9sxi2m1yi74848g8p87mb87g2j7m";
};
# darwin changes configure.ac which means we need to regenerate
diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix
index 670484f0ae6..6d8cafcfaa6 100644
--- a/pkgs/development/libraries/libcdr/default.nix
+++ b/pkgs/development/libraries/libcdr/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost }:
+{ stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost, cppunit }:
stdenv.mkDerivation rec {
- name = "libcdr-0.1.1";
+ name = "libcdr-0.1.4";
src = fetchurl {
- url = "http://dev-www.libreoffice.org/src/${name}.tar.bz2";
- sha256 = "0javd72wmaqd6vprsh3clm393b3idjdjzbb7vyn44li7yaxppzkj";
+ url = "http://dev-www.libreoffice.org/src/${name}.tar.xz";
+ sha256 = "0vd6likgk51j46llybkx4wq3674xzrhp0k82220pkx9x1aqfi9z7";
};
- buildInputs = [ libwpg libwpd lcms librevenge icu boost ];
+ buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix
index 23ab36fe09f..a09e48dcc1d 100644
--- a/pkgs/development/libraries/libdivecomputer/default.nix
+++ b/pkgs/development/libraries/libdivecomputer/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libdivecomputer-${version}";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchurl {
url = "http://www.libdivecomputer.org/releases/${name}.tar.gz";
- sha256 = "11n2qpqg4b2h7mqifp9qm5gm1aqwy7wj1j4j5ha0wdjf55zzy30y";
+ sha256 = "0nm1mcscpxb9dv4p0lidd6rf5xg4vmcbigj6zqxvgn7pwnvpbzm0";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/libewf/04-fix-FTBFS-GCC5.patch b/pkgs/development/libraries/libewf/04-fix-FTBFS-GCC5.patch
deleted file mode 100644
index 54878303589..00000000000
--- a/pkgs/development/libraries/libewf/04-fix-FTBFS-GCC5.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Patch from Debian:
-https://sources.debian.net/data/main/libe/libewf/20140608-6/debian/patches/04-fix-FTBFS-GCC5.patch
-
-Description: fix a FTBFS with GCC-5. Thanks to Linn Crosetto for
- the first fix (see #777938). This patch closes #777945.
-Author: Joao Eriberto Mota Filho
-Last-Update: 2015-07-02
-Index: libewf-20140608/libuna/Makefile.am
-===================================================================
---- libewf-20140608.orig/libuna/Makefile.am
-+++ libewf-20140608/libuna/Makefile.am
-@@ -3,7 +3,7 @@ AM_CPPFLAGS = \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/common \
- @LIBCSTRING_CPPFLAGS@ \
-- @LIBCERROR_CPPFLAGS@
-+ @LIBCERROR_CPPFLAGS@ -std=gnu89
-
- noinst_LTLIBRARIES = libuna.la
-
diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix
index ec53b50b5af..b1a6238a378 100644
--- a/pkgs/development/libraries/libewf/default.nix
+++ b/pkgs/development/libraries/libewf/default.nix
@@ -1,16 +1,16 @@
{ fetchurl, stdenv, zlib, openssl, libuuid, file, fuse, autoreconfHook, pkgconfig }:
stdenv.mkDerivation rec {
- version = "20140608";
+ version = "20171104";
name = "libewf-${version}";
+
src = fetchurl {
- url = "https://googledrive.com/host/0B3fBvzttpiiSMTdoaVExWWNsRjg/libewf-20140608.tar.gz";
- sha256 = "0wfsffzxk934hl8cpwr14w8ixnh8d23x0xnnzcspjwi2c7730h6i";
+ url = "https://github.com/libyal/libewf/releases/download/${version}/libewf-experimental-${version}.tar.gz";
+ sha256 = "0h7036gpj5cryvh17aq6i2cpnbpwg5yswmfydxbbwvd9yfxd6dng";
};
- nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [ zlib openssl libuuid ];
- patches = [ ./04-fix-FTBFS-GCC5.patch ];
meta = {
description = "Library for support of the Expert Witness Compression Format";
diff --git a/pkgs/development/libraries/libewf/default.upstream b/pkgs/development/libraries/libewf/default.upstream
deleted file mode 100644
index a071132463f..00000000000
--- a/pkgs/development/libraries/libewf/default.upstream
+++ /dev/null
@@ -1,7 +0,0 @@
-url https://code.google.com/p/libewf/
-version_link 'googledrive[.]com'
-version_link '[.]tar[.]'
-do_overwrite () {
- do_overwrite_just_version
- set_var_value url "$CURRENT_URL"
-}
diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix
index 479deb7593d..51a7ab4851c 100644
--- a/pkgs/development/libraries/libite/default.nix
+++ b/pkgs/development/libraries/libite/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libite-${version}";
- version = "1.9.2";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "troglobit";
repo = "libite";
rev = "v${version}";
- sha256 = "1y2iylsgs8am5br7an0xkrgshq6k2zkk8jfsaa7vdw2dh3qvc9pr";
+ sha256 = "07zypi3f02ygl7h5yc9sy136iiwgdi3r3nkjai9bq4gzjmzsvyl9";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix
index 8071d386db0..c509fcd2b4f 100644
--- a/pkgs/development/libraries/libmikmod/default.nix
+++ b/pkgs/development/libraries/libmikmod/default.nix
@@ -4,10 +4,10 @@ let
inherit (stdenv.lib) optional optionals optionalString;
in stdenv.mkDerivation rec {
- name = "libmikmod-3.3.11";
+ name = "libmikmod-3.3.11.1";
src = fetchurl {
url = "mirror://sourceforge/mikmod/${name}.tar.gz";
- sha256 = "1smb291jr4qm2cdk3gfpmh0pr23rx3jw3fw0j1zr3b4ih7727fni";
+ sha256 = "06bdnhb0l81srdzg6gn2v2ydhhaazza7rshrcj3q8dpqr3gn97dd";
};
buildInputs = [ texinfo ]
diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix
index aaa1abacab8..1304aff9e3b 100644
--- a/pkgs/development/libraries/libowfat/default.nix
+++ b/pkgs/development/libraries/libowfat/default.nix
@@ -1,18 +1,18 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libowfat-0.29";
+ name = "libowfat-0.31";
src = fetchurl {
- url = "http://dl.fefe.de/${name}.tar.bz2";
- sha256 = "09v4phf1d4y617fdqwn214jmkialf7xqcsyx3rzk7x5ysvpbvbab";
+ url = "https://www.fefe.de/libowfat/${name}.tar.xz";
+ sha256 = "04lagr62bd2cr0k8h59qfnx2klh2cf73k5kxsx8xrdybzhfarr6i";
};
makeFlags = "prefix=$(out)";
-
+
meta = with stdenv.lib; {
homepage = http://www.fefe.de/libowfat/;
license = licenses.gpl2;
platforms = platforms.linux;
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix
index 15d14199041..26694eb3777 100644
--- a/pkgs/development/libraries/libpinyin/default.nix
+++ b/pkgs/development/libraries/libpinyin/default.nix
@@ -2,14 +2,13 @@
let
modelData = fetchurl {
- url = "mirror://sourceforge/libpinyin/models/model12.text.tar.gz";
- sha256 = "1fijhhnjgj8bj1xr5pp7c4qxf11cqybgfqg7v36l3x780d84hfnd";
+ url = "mirror://sourceforge/libpinyin/models/model14.text.tar.gz";
+ sha256 = "0qqk30nflj07zjhs231c95ln4yj4ipzwxxiwrxazrg4hb8bhypqq";
};
in
-
stdenv.mkDerivation rec {
name = "libpinyin-${version}";
- version = "1.6.0";
+ version = "2.1.91";
nativeBuildInputs = [ autoreconfHook glib db pkgconfig ];
@@ -21,7 +20,7 @@ stdenv.mkDerivation rec {
owner = "libpinyin";
repo = "libpinyin";
rev = version;
- sha256 = "0k40a7wfp8zj9d426afv0am5sr3m2i2p309fq0vf8qrb050hj17f";
+ sha256 = "0jbvn65p3zh0573hh27aasd3qly5anyfi8jnps2dxi0my09wbrq3";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index 0b88cd02df7..c1df11aa544 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libraw-${version}";
- version = "0.18.5";
+ version = "0.18.7";
src = fetchurl {
url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz";
- sha256 = "0y519nlvl4bfnnxbwry35f6gbcv6jbbpd2lmiwv6pbyzv4a7saps";
+ sha256 = "0wap67mb03fl2himbs20yncnnrr71mszsfm2v4spks58c714gqw7";
};
outputs = [ "out" "lib" "dev" "doc" ];
diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix
index 3409948f59e..0f2ca371297 100644
--- a/pkgs/development/libraries/librsync/default.nix
+++ b/pkgs/development/libraries/librsync/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "librsync-${version}";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "librsync";
repo = "librsync";
rev = "v${version}";
- sha256 = "0yad7nkw6d8j824qkxrj008ak2wq6yw5p894sbhr35yc1wr5mki6";
+ sha256 = "0wihjinqbjl4hnvrgsk4ca1zy5v6bj7vjm6wlygwvgbn5yh3yq0x";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix
index 75bc9668fca..0ad02c190c1 100644
--- a/pkgs/development/libraries/libsass/default.nix
+++ b/pkgs/development/libraries/libsass/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libsass-${version}";
- version = "3.4.5";
+ version = "3.4.8";
src = fetchurl {
url = "https://github.com/sass/libsass/archive/${version}.tar.gz";
- sha256 = "1j22138l5ymqjfj5zan9d2hipa3ahjmifgpjahqy1smlg5sb837x";
+ sha256 = "0gq0mg42sq2nxiv25fh37frlr0iyqamh7shv83qixnqklqpkfi13";
};
patchPhase = ''
diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index 5d4535676e7..0b341b38917 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libsodium-1.0.15";
+ name = "libsodium-1.0.16";
src = fetchurl {
url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz";
- sha256 = "1x3qw7lsz44vcxpcn1dvwig410phg6gmv31jwj94arrgka3rwspv";
+ sha256 = "0cq5pn7qcib7q70mm1lgjwj75xdxix27v0xl1xl0kvxww7hwgbgf";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/libstemmer/default.nix b/pkgs/development/libraries/libstemmer/default.nix
new file mode 100644
index 00000000000..67d6d8d42ea
--- /dev/null
+++ b/pkgs/development/libraries/libstemmer/default.nix
@@ -0,0 +1,22 @@
+{ lib, stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+ name = "libstemmer-2017-03-02";
+
+ src = fetchFromGitHub {
+ owner = "zvelo";
+ repo = "libstemmer";
+ rev = "78c149a3a6f262a35c7f7351d3f77b725fc646cf";
+ sha256 = "06md6n6h1f2zvnjrpfrq7ng46l1x12c14cacbrzmh5n0j98crpq7";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ meta = with lib; {
+ description = "Snowball Stemming Algorithms";
+ homepage = "http://snowball.tartarus.org/";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ fpletz ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix
index 1c4cdd81d7c..67ec3b57fa7 100644
--- a/pkgs/development/libraries/libxc/default.nix
+++ b/pkgs/development/libraries/libxc/default.nix
@@ -26,7 +26,7 @@ in stdenv.mkDerivation {
description = "Library of exchange-correlation functionals for density-functional theory";
homepage = http://octopus-code.org/wiki/Libxc;
license = licenses.lgpl3;
- platforms = platforms.linux;
+ platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ markuskowa ];
};
}
diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix
index 28584d14a87..ca4d7edbf32 100644
--- a/pkgs/development/libraries/libxmp/default.nix
+++ b/pkgs/development/libraries/libxmp/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libxmp-4.3.12";
+ name = "libxmp-4.4.1";
meta = with stdenv.lib; {
description = "Extended module player library";
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/xmp/libxmp/${name}.tar.gz";
- sha256 = "1536dfxgxl6dyvkdby8lxzi9f7y2qlwl8ylrkybips3ampcqgkhm";
+ sha256 = "1kycz4jsyvmf7ny9227b497wc7y5ligydi6fvvldmkf8hk63ad9m";
};
}
diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index 8195ba2d4d6..82d867fedf0 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchurl, perl }:
+{ stdenv, fetchFromGitHub, perl }:
stdenv.mkDerivation rec {
- name = "mbedtls-2.6.0";
+ name = "mbedtls-2.6.1";
- src = fetchurl {
- url = "https://tls.mbed.org/download/${name}-gpl.tgz";
- sha256 = "042q1l4708zjn5v72sa9qdvgx173kmy4hbcd23wj5vqd6vbmk6d9";
+ src = fetchFromGitHub {
+ owner = "ARMmbed";
+ repo = "mbedtls";
+ rev = name;
+ sha256 = "0d421w9bz4p1nw6kza3licv2w97y1364mcpb4fxvpgdqz48rc1vg";
};
nativeBuildInputs = [ perl ];
diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix
index d67fdc110f0..a57884912ba 100644
--- a/pkgs/development/libraries/netcdf-cxx4/default.nix
+++ b/pkgs/development/libraries/netcdf-cxx4/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, netcdf, hdf5, curl }:
stdenv.mkDerivation rec {
name = "netcdf-cxx4-${version}";
- version = "4.2.1";
+ version = "4.3.0";
src = fetchurl {
url = "https://github.com/Unidata/netcdf-cxx4/archive/v${version}.tar.gz";
- sha256 = "1g0fsmz59dnjib4a7r899lm99j3z6yxsw10c0wlihclzr6znmmds";
+ sha256 = "13zi8cbk18gggx1c12a580wdsbl714lw68a1wg7c86x0sybirni5";
};
buildInputs = [ netcdf hdf5 curl ];
diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix
index e7c64b9a76d..696df48bfbc 100644
--- a/pkgs/development/libraries/netcdf/default.nix
+++ b/pkgs/development/libraries/netcdf/default.nix
@@ -9,27 +9,30 @@ let
mpiSupport = hdf5.mpiSupport;
mpi = hdf5.mpi;
in stdenv.mkDerivation rec {
- name = "netcdf-4.4.1.1";
- src = fetchurl {
- url = "http://www.unidata.ucar.edu/downloads/netcdf/ftp/${name}.tar.gz";
- sha256 = "1blc7ik5yin7i0ls2kag0a9xjk12m0dzx6v1x88az3ras3scci2d";
- };
+ name = "netcdf-4.6.0";
- buildInputs = [ hdf5 m4 curl mpi];
+ src = fetchurl {
+ url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/${name}.tar.gz";
+ sha256 = "099qmdjj059wkj5za13zqnz0lcziqkcvyfdf894j4n6qq4c5iw2b";
+ };
- passthru = {
- mpiSupport = mpiSupport;
- inherit mpi;
- };
+ nativeBuildInputs = [ m4 ];
+ buildInputs = [ hdf5 curl mpi ];
- configureFlags = [
- "--enable-netcdf-4"
- "--enable-dap"
- "--enable-shared"
- ]
- ++ (stdenv.lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]);
+ passthru = {
+ mpiSupport = mpiSupport;
+ inherit mpi;
+ };
- meta = {
- platforms = stdenv.lib.platforms.unix;
- };
+ configureFlags = [
+ "--enable-netcdf-4"
+ "--enable-dap"
+ "--enable-shared"
+ ]
+ ++ (stdenv.lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]);
+
+ meta = {
+ platforms = stdenv.lib.platforms.unix;
+ homepage = https://www.unidata.ucar.edu/software/netcdf/;
+ };
}
diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix
index 8ebf62cfdf0..dc4f4926e9d 100644
--- a/pkgs/development/libraries/npth/default.nix
+++ b/pkgs/development/libraries/npth/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "npth-1.3";
+ name = "npth-1.5";
src = fetchurl {
url = "ftp://ftp.gnupg.org/gcrypt/npth/${name}.tar.bz2";
- sha256 = "0am86vblapwz84254qpmhz0chk70g6qzh3wdxcs0gvba8d01ka5w";
+ sha256 = "1hmkkp6vzyrh8v01c2ynzf9vwikyagp7p1lxhbnr4ysk3w66jji9";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 35d72c6cbec..c2f79753bd1 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gfortran, perl, libibverbs
+{stdenv, fetchurl, gfortran, perl, rdma-core
# Enable the Sun Grid Engine bindings
, enableSGE ? false
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
};
buildInputs = [ gfortran ]
- ++ optional (stdenv.isLinux || stdenv.isFreeBSD) libibverbs;
+ ++ optional (stdenv.isLinux || stdenv.isFreeBSD) rdma-core;
nativeBuildInputs = [ perl ];
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 94c49af8c4f..775e6056dff 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, buildPackages, perl
-, hostPlatform
+, buildPlatform, hostPlatform
, fetchpatch
, withCryptodev ? false, cryptodevHeaders
, enableSSL2 ? false
@@ -8,10 +8,6 @@
with stdenv.lib;
let
-
- opensslCrossSystem = hostPlatform.openssl.system or
- (throw "openssl needs its platform name cross building");
-
common = args@{ version, sha256, patches ? [] }: stdenv.mkDerivation rec {
name = "openssl-${version}";
@@ -24,23 +20,34 @@ let
(args.patches or [])
++ [ ./nix-ssl-cert-file.patch ]
++ optional (versionOlder version "1.1.0")
- (if stdenv.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch)
+ (if hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch)
++ optional (versionOlder version "1.0.2" && hostPlatform.isDarwin)
./darwin-arch.patch;
outputs = [ "bin" "dev" "out" "man" ];
setOutputFlags = false;
- separateDebugInfo = stdenv.isLinux;
+ separateDebugInfo = hostPlatform.isLinux;
nativeBuildInputs = [ perl ];
buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
- # On x86_64-darwin, "./config" misdetects the system as
- # "darwin-i386-cc". So specify the system type explicitly.
- configureScript =
- if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc"
- else if stdenv.system == "x86_64-solaris" then "./Configure solaris64-x86_64-gcc"
- else "./config";
+ # TODO(@Ericson2314): Improve with mass rebuild
+ configureScript = {
+ "x86_64-darwin" = "./Configure darwin64-x86_64-cc";
+ "x86_64-solaris" = "./Configure solaris64-x86_64-gcc";
+ }.${hostPlatform.system} or (
+ if hostPlatform == buildPlatform
+ then "./config"
+ else if hostPlatform.isMinGW
+ then "./Configure mingw${toString hostPlatform.parsed.cpu.bits}"
+ else if hostPlatform.isLinux
+ then "./Configure linux-generic${toString hostPlatform.parsed.cpu.bits}"
+ else
+ throw "Not sure what configuration to use for ${hostPlatform.config}"
+ );
+
+ # TODO(@Ericson2314): Make unconditional on mass rebuild
+ ${if buildPlatform != hostPlatform then "configurePlatforms" else null} = [];
configureFlags = [
"shared"
@@ -50,7 +57,7 @@ let
"-DHAVE_CRYPTODEV"
"-DUSE_CRYPTODEV_DIGESTS"
] ++ stdenv.lib.optional enableSSL2 "enable-ssl2"
- ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.isAarch64) "no-afalgeng";
+ ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && hostPlatform.isAarch64) "no-afalgeng";
makeFlags = [ "MANDIR=$(man)/share/man" ];
@@ -84,18 +91,6 @@ let
fi
'';
- crossAttrs = {
- # upstream patch: https://rt.openssl.org/Ticket/Display.html?id=2558
- postPatch = ''
- sed -i -e 's/[$][(]CROSS_COMPILE[)]windres/$(WINDRES)/' Makefile.shared
- '';
- preConfigure=''
- # It's configure does not like --build or --host
- export configureFlags="${concatStringsSep " " (configureFlags ++ [ opensslCrossSystem ])}"
- '';
- configureScript = "./Configure";
- };
-
meta = {
homepage = https://www.openssl.org/;
description = "A cryptographic library that implements the SSL and TLS protocols";
diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index 1e7448b6605..8b06e3f2e09 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "talloc-2.1.8";
+ name = "talloc-2.1.11";
src = fetchurl {
url = "mirror://samba/talloc/${name}.tar.gz";
- sha256 = "0c3ihyb0jd8mhvi7gg2mr5w1zl2habx6jlkbyxzyckad2q8lkl92";
+ sha256 = "1lzfxv2zjxap5snf9ydl1bqgjpz0kgkq7n644f8rkbx0arav77k3";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix
index 057be97ce96..17d7320cb64 100644
--- a/pkgs/development/libraries/xvidcore/default.nix
+++ b/pkgs/development/libraries/xvidcore/default.nix
@@ -3,11 +3,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "xvidcore-${version}";
- version = "1.3.4";
-
+ version = "1.3.5";
+
src = fetchurl {
url = "http://downloads.xvid.org/downloads/${name}.tar.bz2";
- sha256 = "1xwbmp9wqshc0ckm970zdpi0yvgqxlqg0s8bkz98mnr8p2067bsz";
+ sha256 = "1d0hy1w9sn6491a3vhyf3vmhq4xkn6yd4ralx1191s6qz5wz483w";
};
preConfigure = ''
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
postInstall = optionalString (!stdenv.isDarwin) ''
rm $out/lib/*.a
'';
-
+
meta = {
description = "MPEG-4 video codec for PC";
homepage = https://www.xvid.com/;
diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix
index 0224bf16ab7..b13ddf8357f 100644
--- a/pkgs/development/lisp-modules/define-package.nix
+++ b/pkgs/development/lisp-modules/define-package.nix
@@ -33,7 +33,7 @@ let
test -n "$LD_LIBRARY_PATH" &&
echo "export LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\"'$LD_LIBRARY_PATH'" >> "$path_config_script"
test -n "$NIX_LISP_LD_LIBRARY_PATH" &&
- echo "export NIX_LISP_LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\"'$NIX_LISP_LD_LIBRARY_PATH'" >> "$path_config_script"
+ echo "export NIX_LISP_LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\"'$(echo "$NIX_LISP_LD_LIBRARY_PATH" | tr -d '\n' | tr : '\n' | sort | uniq | tr '\n' ':')'" >> "$path_config_script"
echo "fi" >> "$path_config_script"
'';
deployLaunchScript = ''
diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix
index 15e801c1dff..8af11f05738 100644
--- a/pkgs/development/tools/build-managers/dub/default.nix
+++ b/pkgs/development/tools/build-managers/dub/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, curl, dmd, libevent, rsync }:
+{ stdenv, fetchFromGitHub, fetchpatch, curl, dmd, libevent, rsync }:
let
dubBuild = stdenv.mkDerivation rec {
name = "dubBuild-${version}";
- version = "1.6.0";
+ version = "1.7.1";
enableParallelBuilding = true;
@@ -12,9 +12,17 @@ let
owner = "dlang";
repo = "dub";
rev = "v${version}";
- sha256 = "1xjr5pp263lbcd4harxy1ybh7q0kzj9iyy63ji6pn66fizrgm7zk";
+ sha256 = "09bcc9bq2z1rbm8sdip1l81y5p8q13r30k02lzifyasiplrnpvlv";
};
+ patches = [
+ # TODO Remove with next release which contains https://github.com/dlang/dub/pull/1354
+ (fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/dlang/dub/pull/1354.patch";
+ sha256 = "01alky8a91qwjmlnfjbrn8kiivwr69f3j4c84cjlxrzfp1ph20ah";
+ })
+ ];
+
postPatch = ''
# Avoid that the version file is overwritten
substituteInPlace build.sh \
@@ -59,6 +67,8 @@ let
outputHash = builtins.hashString "sha256" inputString;
src = dubBuild.src;
+
+ patches = dubBuild.patches;
postPatch = dubBuild.postPatch;
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 399fc62bd17..642a6a97bc0 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "jenkins-${version}";
- version = "2.101";
+ version = "2.103";
src = fetchurl {
url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
- sha256 = "0ragl8hhdlx2zpjzrx3xsvr5i0fvgshgbkqx0h48hgm73pf99227";
+ sha256 = "1d771q4xjjji7ydh6xjz3j6hz2mszxh0m3zqjh4khlzqhnvydlha";
};
buildCommand = ''
diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix
index b6774fe2416..daa25de9508 100644
--- a/pkgs/development/tools/dtools/default.nix
+++ b/pkgs/development/tools/dtools/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "dtools-${version}";
- version = "2.078.0";
+ version = "2.078.1";
srcs = [
(fetchFromGitHub {
owner = "dlang";
repo = "dmd";
rev = "v${version}";
- sha256 = "1ia4swyq0xqppnpmcalh2yxywdk2gv3kvni2abx1mq6wwqgmwlcr";
+ sha256 = "0b9lphh4g3r9cyzv4wcfppv9j3w952vvwv615za23acgwav3mqg2";
name = "dmd";
})
(fetchFromGitHub {
diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix
index 22b5ff4f086..c587505600c 100644
--- a/pkgs/development/tools/fac/default.nix
+++ b/pkgs/development/tools/fac/default.nix
@@ -1,8 +1,14 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }:
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, makeWrapper, git }:
-buildGoPackage rec {
+let
+ # TODO: Remove this on next update, should be included
+ fac_1 = fetchurl {
+ url = https://raw.githubusercontent.com/mkchoi212/fac/0a500c2a2dba9017fe7c2a45f15c328755f561a6/doc/fac.1;
+ sha256 = "1fsyx9i20ryhpihdpvs2z7vccl13b9bnh5hcdxn7bvqjz78mbqhw";
+ };
+in buildGoPackage rec {
name = "fac-${version}";
- version = "1.0.1";
+ version = "1.0.4";
goPackagePath = "github.com/mkchoi212/fac";
@@ -10,7 +16,7 @@ buildGoPackage rec {
owner = "mkchoi212";
repo = "fac";
rev = "v${version}";
- sha256 = "1j5kip3l3p9qlly03pih905sdz3ncvpj7135jpnfhckbk1s5x9dc";
+ sha256 = "0jhx80jbkxfxj95hmdpb9wwwya064xpfkaa218l1lwm3qwfbpk95";
};
nativeBuildInputs = [ makeWrapper ];
@@ -18,6 +24,8 @@ buildGoPackage rec {
postInstall = ''
wrapProgram $bin/bin/fac \
--prefix PATH : ${git}/bin
+
+ install -D ${fac_1} $out/share/man/man1/fac.1
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index 88556d7395d..ff4ad83b642 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -2,10 +2,10 @@
let ccache = stdenv.mkDerivation rec {
name = "ccache-${version}";
- version = "3.3.4";
+ version = "3.3.5";
src = fetchurl {
- sha256 = "0ks0vk408mdppfbk8v38p46fqx3p30r9a9cwiia43373i7rmpw94";
+ sha256 = "1iih5d171rq29366c1z90dri2h8173yyc8rm2740wxiqx6k7c18r";
url = "mirror://samba/ccache/${name}.tar.xz";
};
diff --git a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch
index ecd3c4c9a74..3bc3a95e420 100644
--- a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch
+++ b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch
@@ -1,9 +1,9 @@
---- ccache-3.3.4.org/test.sh 2017-02-17 21:28:53.000000000 +0000
-+++ ccache-3.3.4/test.sh 2017-07-01 18:38:00.523403023 +0100
-@@ -2631,23 +2631,23 @@
+--- a/test.sh
++++ b/test.sh
+@@ -2669,23 +2669,6 @@ SUITE_cleanup() {
+
$CCACHE -F 0 -M 256K >/dev/null
- $CCACHE -c >/dev/null
- # floor(0.8 * 4) = 3
+ CCACHE_LOGFILE=/tmp/foo $CCACHE -c >/dev/null
- expect_file_count 3 '*.o' $CCACHE_DIR
- expect_file_count 3 '*.d' $CCACHE_DIR
- expect_file_count 3 '*.stderr' $CCACHE_DIR
@@ -21,23 +21,6 @@
- test_failed "File $file not removed when it should"
- fi
- done
-+ #expect_file_count 3 '*.o' $CCACHE_DIR
-+ #expect_file_count 3 '*.d' $CCACHE_DIR
-+ #expect_file_count 3 '*.stderr' $CCACHE_DIR
-+ #expect_stat 'files in cache' 9
-+ #expect_stat 'cleanups performed' 1
-+ #for i in 3 4 5; do
-+ # file=$CCACHE_DIR/a/result$i-4017.o
-+ # if [ ! -f $file ]; then
-+ # test_failed "File $file removed when it shouldn't"
-+ # fi
-+ #done
-+ #for i in 0 1 2 6 7 8 9; do
-+ # file=$CCACHE_DIR/a/result$i-4017.o
-+ # if [ -f $file ]; then
-+ # test_failed "File $file not removed when it should"
-+ # fi
-+ #done
-
+
# -------------------------------------------------------------------------
- TEST "Automatic cache cleanup"
+ TEST "Automatic cache cleanup, limit_multiple 0.9"
diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/tools/mypy/default.nix
index 6dc57afb51e..f06f9c6828c 100644
--- a/pkgs/development/tools/mypy/default.nix
+++ b/pkgs/development/tools/mypy/default.nix
@@ -1,19 +1,18 @@
-{ stdenv, fetchPypi, buildPythonApplication, lxml, typed-ast }:
+{ stdenv, fetchPypi, buildPythonApplication, lxml, typed-ast, psutil }:
buildPythonApplication rec {
- name = "${pname}-${version}";
pname = "mypy";
- version = "0.540";
+ version = "0.560";
# Tests not included in pip package.
doCheck = false;
src = fetchPypi {
inherit pname version;
- sha256 = "5d82f51e228a88e5de6ac1d6699dd09e250ce7de217a5ff1256e317266e738ec";
+ sha256 = "1jja0xlwqajxzab8sabiycax8060zikg89dnl9a7lkqcrwprl35x";
};
- propagatedBuildInputs = [ lxml typed-ast ];
+ propagatedBuildInputs = [ lxml typed-ast psutil ];
meta = with stdenv.lib; {
description = "Optional static typing for Python";
diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index f8dc96c2394..d97d67c9851 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "packer-${version}";
- version = "1.1.0";
+ version = "1.1.3";
goPackagePath = "github.com/hashicorp/packer";
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "hashicorp";
repo = "packer";
rev = "v${version}";
- sha256 = "09hwq6dxyzhpl97akwbb02bjrisz9rf296avg5zj2p5qdsf4y777";
+ sha256 = "0bfjv4sqci10jzy11qg6q1xyik36v98vd6ck91sarawvgbaprsp2";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 714935513f7..5d967ba8127 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby }:
+{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive }:
let
version = "2.0.1";
@@ -36,9 +36,12 @@ in buildRubyGem rec {
./unofficial-installation-nowarn.patch
];
+ # PATH additions:
+ # - libarchive: Make `bsdtar` available for extracting downloaded boxes
postInstall = ''
wrapProgram "$out/bin/vagrant" \
- --set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}"
+ --set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}" \
+ --prefix PATH ':' "${lib.getBin libarchive}/bin"
'';
passthru = {
diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix
index 6ddea86f1a7..6fb7f8440ef 100644
--- a/pkgs/development/tools/yq/default.nix
+++ b/pkgs/development/tools/yq/default.nix
@@ -2,9 +2,8 @@
buildPythonApplication rec {
- name = "${pname}-${version}";
pname = "yq";
- version = "2.3.3";
+ version = "2.3.4";
propagatedBuildInputs = [ pyyaml jq ];
@@ -13,7 +12,7 @@ buildPythonApplication rec {
src = fetchPypi {
inherit pname version;
- sha256 = "14ywdi464z68qclsqzb8r50rzmypknaz74zmpppkahjigfcfppm3";
+ sha256 = "04ckrlmin8m176iicyfhddp4r0yry5hx306vhfglf8mcp1jkga78";
};
meta = with lib; {
diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index d60c4c7d0de..82d573e47a2 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -12,7 +12,7 @@ let
gtkName = if gtkClient then "-gtk" else "";
name = "freeciv";
- version = "2.5.9";
+ version = "2.5.10";
in
stdenv.mkDerivation {
name = "${name}${sdlName}${gtkName}-${version}";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/freeciv/${name}-${version}.tar.bz2";
- sha256 = "0a2rjw6065psh14bkk6ar4i19dcicn9lz63rffr9h278b9c76g5q";
+ sha256 = "00mkzhfcbc27d8m7hj644h8lyc9mb8nhqfcngc52zkidarb438f8";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index b40083bedba..49750997a90 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -4,19 +4,19 @@
}:
let
- version = "0.4.15";
+ version = "0.4.16";
sources = {
src = fetchFromGitHub {
owner = "minetest";
repo = "minetest";
rev = "${version}";
- sha256 = "0bn4102d0hq774bn6hqhrs6qzl4sancrs4j15w4318bqdndk4676";
+ sha256 = "048m8as01bw4pnwfxx04wfnyljxq7ivk88l214zi18prrrkfamj3";
};
data = fetchFromGitHub {
owner = "minetest";
repo = "minetest_game";
rev = "${version}";
- sha256 = "1mjj40slfiw0khg9nrq8yfmnay237z5jm1cg9hrsiq2fkjrr8w2m";
+ sha256 = "0alikzyjvj9hd8s3dd6ghpz0y982w2j0yd2zgd7a047mxw21hrcn";
};
};
in stdenv.mkDerivation {
diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index 2ecff1c835e..d0a8469dd1d 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -29,11 +29,11 @@ let
in
stdenv.mkDerivation rec {
name = "openttd-${version}";
- version = "1.7.1";
+ version = "1.7.2";
src = fetchurl {
url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz";
- sha256 = "0dhv5bbbg1dmmq7fi3xss0a9jq2rqgb5sf9fsqzlsjcdm590j6b1";
+ sha256 = "1m29s6shnp7c9qh7pzdbvhy7i5awyzn1hr39xkinrpwgvsxa0lgy";
};
nativeBuildInputs = [ pkgconfig makeWrapper ];
diff --git a/pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch b/pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch
new file mode 100644
index 00000000000..6794e8018af
--- /dev/null
+++ b/pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch
@@ -0,0 +1,27 @@
+From 7ebe252a8488a63675d1c50c0faa1bdc5ff97889 Mon Sep 17 00:00:00 2001
+From: Linus Heckemann
+Date: Fri, 5 Jan 2018 21:27:28 +0100
+Subject: [PATCH] Ignore missing data for installation
+
+This is for packaging vdrift separately from its data in nixpkgs.
+---
+ SConstruct | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 4394de0b..beef29a4 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -511,9 +511,6 @@ env.Alias(target = 'bin-package', source = bin_archive)
+ #----------------#
+ Export(['env', 'version', 'src_dir', 'bin_dir'])
+ if 'install' in COMMAND_LINE_TARGETS:
+- if not os.path.isfile('data/SConscript'):
+- raise 'VDrift data not found. Please make sure data is placed in vdrift directory. See README.md and http://wiki.vdrift.net.'
+- SConscript('data/SConscript')
+ # desktop appdata installation
+ install_desktop = env.Install(env['destdir'] + env['prefix'] + '/share/applications', 'vdrift.desktop')
+ install_appdata = env.Install(env['destdir'] + env['prefix'] + '/share/appdata', 'vdrift.appdata.xml')
+--
+2.15.0
+
diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix
index 27eef261426..81b95ddb9e1 100644
--- a/pkgs/games/vdrift/default.nix
+++ b/pkgs/games/vdrift/default.nix
@@ -1,41 +1,60 @@
-{ stdenv, fetchFromGitHub, fetchsvn, pkgconfig, scons, mesa, SDL2, SDL2_image, libvorbis,
- bullet, curl, gettext }:
+{ stdenv, fetchFromGitHub, fetchsvn, pkgconfig, scons, mesa, SDL2, SDL2_image
+, libvorbis, bullet, curl, gettext, writeTextFile, writeShellScriptBin
-stdenv.mkDerivation rec {
- version = "2014-10-20";
- name = "vdrift-${version}";
-
- src = fetchFromGitHub {
- owner = "VDrift";
- repo = "vdrift";
- rev = version;
- sha256 = "09yny5qzdrpffq3xhqwfymsracwsxwmdd5xa8bxx9a56hhxbak2l";
- };
-
- data = fetchsvn {
+, data ? fetchsvn {
url = "svn://svn.code.sf.net/p/vdrift/code/vdrift-data";
rev = 1386;
sha256 = "0ka6zir9hg0md5p03dl461jkvbk05ywyw233hnc3ka6shz3vazi1";
+ }
+}:
+let
+ version = "git";
+ bin = stdenv.mkDerivation {
+ name = "vdrift-${version}";
+
+ src = fetchFromGitHub {
+ owner = "vdrift";
+ repo = "vdrift";
+ rev = "12d444ed18395be8827a21b96cc7974252fce6d1";
+ sha256 = "001wq3c4n9wzxqfpq40b1jcl16sxbqv2zbkpy9rq2wf9h417q6hg";
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ scons mesa SDL2 SDL2_image libvorbis bullet curl gettext ];
+
+ patches = [ ./0001-Ignore-missing-data-for-installation.patch ];
+
+ buildPhase = ''
+ sed -i -e s,/usr/local,$out, SConstruct
+ export CXXFLAGS="$(pkg-config --cflags SDL2_image)"
+ scons -j$NIX_BUILD_CORES
+ '';
+ installPhase = "scons install";
+
+ meta = {
+ description = "Car racing game";
+ homepage = http://vdrift.net/;
+ license = stdenv.lib.licenses.gpl2Plus;
+ maintainers = with stdenv.lib.maintainers; [viric];
+ platforms = stdenv.lib.platforms.linux;
+ };
};
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ scons mesa SDL2 SDL2_image libvorbis bullet curl gettext ];
-
- buildPhase = ''
- cp -r --reflink=auto $data data
- chmod -R +w data
- sed -i -e s,/usr/local,$out, SConstruct
- export CXXFLAGS="$(pkg-config --cflags SDL2_image)"
- scons
+ wrappedName = "vdrift-${version}-with-data-${toString data.rev}";
+in writeTextFile {
+ name = wrappedName;
+ text = ''
+ export VDRIFT_DATA_DIRECTORY="${data}"
+ exec ${bin}/bin/vdrift "$@"
'';
- installPhase = "scons install";
-
- meta = {
- description = "Car racing game";
- homepage = http://vdrift.net/;
- license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [viric];
- platforms = stdenv.lib.platforms.linux;
+ destination = "/bin/vdrift";
+ executable = true;
+ checkPhase = ''
+ ${stdenv.shell} -n $out/bin/vdrift
+ '';
+} // {
+ meta = bin.meta // {
hydraPlatforms = [];
};
+ unwrapped = bin;
+ inherit bin data;
}
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index ae3617aedf0..928e692df6b 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -57,7 +57,9 @@ let wine-build = build: release:
in if wineRelease == "staging" then
let wineUnstable = wine-build wineBuild "unstable"; in
- builtins.trace "WARNING: wine staging is not yet at 3.0, using unstable" ( wineUnstable )
+ # wine staging is not yet at 3.0, using unstable
+ # FIXME update winestaging sources
+ wineUnstable
# callPackage ./staging.nix {
# inherit libtxc_dxtn_Name wineUnstable;
# }
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index ca7c760dc5c..c276a24b183 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -46,7 +46,10 @@ in rec {
};
staging = fetchFromGitHub rec {
+ # https://github.com/wine-compholio/wine-staging/releases
inherit (unstable) version;
+ # FIXME update winestaging sources, when 3.0 is released
+ # FIXME then revert the staging derivation in ./default.nix
sha256 = "1qznp4kgss4mhk1vvr91jmszsi47xg312r64l76jkgwijhypmvb7";
owner = "wine-compholio";
repo = "wine-staging";
@@ -54,6 +57,7 @@ in rec {
};
winetricks = fetchFromGitHub rec {
+ # https://github.com/Winetricks/winetricks/releases
version = "20171222";
sha256 = "04risg44kqq8z9nsflw7m7dqykw2aii8m8j495z6fgb7p0pi8ny9";
owner = "Winetricks";
diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix
index 72fb7b41c69..4a51facb4aa 100644
--- a/pkgs/misc/screensavers/electricsheep/default.nix
+++ b/pkgs/misc/screensavers/electricsheep/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "electricsheep";
- version = "2.7b33-2017-02-04";
+ version = "2.7b33-2017-10-20";
src = fetchFromGitHub {
owner = "scottdraves";
repo = pname;
- rev = "12420cd40dfad8c32fb70b88f3d680d84f795c63";
- sha256 = "1zqry25h6p0y0rg2h8xxda007hx1xdvsgzmjg13xkc8l4zsp5wah";
+ rev = "c02c19b9364733fc73826e105fc983a89a8b4f40";
+ sha256 = "1z49l53j1lhk7ahdy96lm9r0pklwpf2i5s6y2l2rn6l4z8dxkjmk";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index b7a8dc23a78..93681b2e18c 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -64,25 +64,15 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "conky-${version}";
- version = "1.10.6";
+ version = "1.10.7";
src = fetchFromGitHub {
owner = "brndnmtthws";
repo = "conky";
rev = "v${version}";
- sha256 = "15j8h251v9jpdg6h6wn1vb45pkk806pf9s5n3rdrps9r185w8hn8";
+ sha256 = "1qx47m4c1j3wh1hmbn2h8wyvg0ncr3kz1zcdj9si2bdyz3s0i9w7";
};
- patches = [
- # Patch to fix compilation on gcc-7 from conky PR
- # https://github.com/brndnmtthws/conky/pull/402
- (fetchpatch {
- name = "gcc7.patch";
- url = "https://github.com/brndnmtthws/conky/commit/6140122b82d50acc333e5d2a813cc1933ecc6d21.patch";
- sha256 = "1fblfj1w2kc0gshc2pq9lc1pxxsgmgh8byb1xs2v6amx15kj11k7";
- })
- ];
-
postPatch = ''
sed -i -e '/include.*CheckIncludeFile)/i include(CheckIncludeFiles)' \
cmake/ConkyPlatformChecks.cmake
@@ -95,8 +85,8 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "-lgcc_s";
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ glib cmake libXinerama ]
+ nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = [ glib libXinerama ]
++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ]
++ optional ncursesSupport ncurses
++ optional x11Support xlibsWrapper
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 2660f299262..2e2ef610de6 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -12,11 +12,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "lxc-${version}";
- version = "2.1.0";
+ version = "2.1.1";
src = fetchurl {
url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";
- sha256 = "1qld0gi19mximxm0qyr6vzav32gymhc7fvp0bzwv37j0b8q0fi1r";
+ sha256 = "1xpghrinxhm2072fwmn42pxhjwh7qx6cbsipw4s6g38a8mkklrk8";
};
nativeBuildInputs = [
@@ -29,12 +29,6 @@ stdenv.mkDerivation rec {
patches = [
./support-db2x.patch
- # Fix build error against glibc 2.26
- (fetchpatch {
- url = "https://github.com/lxc/lxc/commit/"
- + "180c477a326ce85632249ff16990e8c29db1b6fa.patch";
- sha256 = "05jkiiixxk9ibj1fwzmy56rkkign28bd9mrmgiz12g92r2qahm2z";
- })
];
postPatch = ''
diff --git a/pkgs/os-specific/linux/mdadm/4.nix b/pkgs/os-specific/linux/mdadm/4.nix
deleted file mode 100644
index f9c2a5e09af..00000000000
--- a/pkgs/os-specific/linux/mdadm/4.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv
-, fetchurl, groff
-, buildPlatform, hostPlatform
-}:
-
-assert stdenv.isLinux;
-
-stdenv.mkDerivation rec {
- name = "mdadm-4.0";
-
- src = fetchurl {
- url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz";
- sha256 = "1ad3mma641946wn5lsllwf0lifw9lps34fv1nnkhyfpd9krffshx";
- };
-
- # This is to avoid self-references, which causes the initrd to explode
- # in size and in turn prevents mdraid systems from booting.
- allowedReferences = [ stdenv.glibc.out ];
-
- patches = [ ./no-self-references.patch ];
-
- makeFlags = [
- "NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin"
- "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm"
- "STRIP="
- ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [
- "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
- ];
-
- nativeBuildInputs = [ groff ];
-
- preConfigure = ''
- sed -e 's@/lib/udev@''${out}/lib/udev@' \
- -e 's@ -Werror @ @' \
- -e 's@/usr/sbin/sendmail@/run/wrappers/bin/sendmail@' -i Makefile
- '';
-
- meta = {
- description = "Programs for managing RAID arrays under Linux";
- homepage = http://neil.brown.name/blog/mdadm;
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index 31dd0cbf18d..85a65b8f824 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -6,11 +6,11 @@
assert stdenv.isLinux;
stdenv.mkDerivation rec {
- name = "mdadm-3.3.4";
+ name = "mdadm-4.0";
src = fetchurl {
url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz";
- sha256 = "0s6a4bq7v7zxiqzv6wn06fv9f6g502dp047lj471jwxq0r9z9rca";
+ sha256 = "1ad3mma641946wn5lsllwf0lifw9lps34fv1nnkhyfpd9krffshx";
};
# This is to avoid self-references, which causes the initrd to explode
@@ -29,9 +29,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ groff ];
- # Attempt removing if building with gcc5 when updating
- NIX_CFLAGS_COMPILE = "-std=gnu89";
-
preConfigure = ''
sed -e 's@/lib/udev@''${out}/lib/udev@' \
-e 's@ -Werror @ @' \
diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix
new file mode 100644
index 00000000000..22ce4a10f1c
--- /dev/null
+++ b/pkgs/os-specific/linux/rdma-core/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, ethtool, libnl, libudev, python, perl
+} :
+
+let
+ version = "16.1";
+
+in stdenv.mkDerivation {
+ name = "rdma-core-${version}";
+
+ src = fetchFromGitHub {
+ owner = "linux-rdma";
+ repo = "rdma-core";
+ rev = "v${version}";
+ sha256 = "1fixw6hpf732vzlpczx0b2y84jrhgfjr3cljqxky7makzgh2s7ng";
+ };
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = [ libnl ethtool libudev python perl ];
+
+ postFixup = ''
+ substituteInPlace $out/bin/rxe_cfg --replace ethtool "${ethtool}/bin/ethtool"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "RDMA Core Userspace Libraries and Daemons";
+ homepage = https://github.com/linux-rdma/rdma-core;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ markuskowa ];
+ };
+}
+
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index e2d1f448b32..e995763a4a2 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, perl, pkgconfig, systemd, openssl
-, bzip2, zlib, inotify-tools, pam, libcap
-, clucene_core_2, icu, openldap
+, bzip2, zlib, lz4, inotify-tools, pam, libcap
+, clucene_core_2, icu, openldap, libsodium, libstemmer
# Auth modules
, withMySQL ? false, mysql
, withPgSQL ? false, postgresql
@@ -8,18 +8,19 @@
}:
stdenv.mkDerivation rec {
- name = "dovecot-2.2.33.2";
+ name = "dovecot-2.3.0";
nativeBuildInputs = [ perl pkgconfig ];
- buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ]
+ buildInputs =
+ [ openssl bzip2 zlib lz4 clucene_core_2 icu openldap libsodium libstemmer ]
++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ]
++ lib.optional withMySQL mysql.connector-c
++ lib.optional withPgSQL postgresql
++ lib.optional withSQLite sqlite;
src = fetchurl {
- url = "http://dovecot.org/releases/2.2/${name}.tar.gz";
- sha256 = "117f9i62liz2pm96zi2lpldzlj2knzj7g410zhifwmlsc1w3n7py";
+ url = "http://dovecot.org/releases/2.3/${name}.tar.gz";
+ sha256 = "10c5myzgys866c3x6jdr1s9x9pqnjd5vpyz8z384sph21m3wnq6y";
};
preConfigure = ''
@@ -58,6 +59,7 @@ stdenv.mkDerivation rec {
"--with-ssl=openssl"
"--with-zlib"
"--with-bzlib"
+ "--with-lz4"
"--with-ldap"
"--with-lucene"
"--with-icu"
@@ -68,9 +70,9 @@ stdenv.mkDerivation rec {
++ lib.optional withSQLite "--with-sqlite";
meta = {
- homepage = http://dovecot.org/;
+ homepage = https://dovecot.org/;
description = "Open source IMAP and POP3 email server written with security primarily in mind";
- maintainers = with stdenv.lib.maintainers; [viric peti rickynils];
+ maintainers = with stdenv.lib.maintainers; [ viric peti rickynils fpletz ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix
index cb9e43a5c88..695e5aa4558 100644
--- a/pkgs/servers/monitoring/cadvisor/default.nix
+++ b/pkgs/servers/monitoring/cadvisor/default.nix
@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
name = "cadvisor-${version}";
- version = "0.26.1";
+ version = "0.28.3";
src = fetchFromGitHub {
owner = "google";
repo = "cadvisor";
rev = "v${version}";
- sha256 = "0rv245acz2r12c6ga2ln01961sh36w15ay0nfpfcg8inz679dnvg";
+ sha256 = "1rdw09cbhs4il63lv1f92dw8pav9rjnkbrqx37lqij8x6xmv01gy";
};
- buildInputs = [ go ];
+ nativeBuildInputs = [ go ];
buildPhase = ''
mkdir -p Godeps/_workspace/src/github.com/google/
diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix
new file mode 100644
index 00000000000..d19d595f066
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix
@@ -0,0 +1,93 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+ {
+ goPackagePath = "github.com/alecthomas/template";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/template";
+ rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
+ sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+ };
+ }
+ {
+ goPackagePath = "github.com/alecthomas/units";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/units";
+ rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
+ sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+ };
+ }
+ {
+ goPackagePath = "github.com/beorn7/perks";
+ fetch = {
+ type = "git";
+ url = "https://github.com/beorn7/perks";
+ rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
+ sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/protobuf";
+ rev = "c65a0412e71e8b9b3bfd22925720d23c0f054237";
+ sha256 = "1ch3czyzq5abl6zm1l0dfsi09xj43ql9jcbmbhfhxz954pw03v3v";
+ };
+ }
+ {
+ goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+ fetch = {
+ type = "git";
+ url = "https://github.com/matttproud/golang_protobuf_extensions";
+ rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
+ sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_golang";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_golang";
+ rev = "06bc6e01f4baf4ee783ffcd23abfcb0b0f9dfada";
+ sha256 = "0dvv21214sn702kc25y5l0gd9d11358976d3w31fgwx7456mjx26";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_model";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_model";
+ rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
+ sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/common";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/common";
+ rev = "89604d197083d4781071d3c65855d24ecfb0a563";
+ sha256 = "169rdlaf2mk9z4fydz7ajmngyhmf3q1lk96yhvx46bn986x5xkyn";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/procfs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/procfs";
+ rev = "cb4147076ac75738c9a7d279075a253c0cc5acbd";
+ sha256 = "0zhlrik0f9q1lj6cisgnxgbz4darbcix52hm5abi24l2ahchf5ca";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/alecthomas/kingpin.v2";
+ rev = "947dcec5ba9c011838740e680966fd7087a71d0d";
+ sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+ };
+ }
+]
diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix
new file mode 100644
index 00000000000..e7cdfa616b4
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "dovecot_exporter-unstable-${version}";
+ version = "2018-01-18";
+ rev = "4e831356533e2321031df73ebd25dd55dbd8d385";
+
+ goPackagePath = "github.com/kumina/dovecot_exporter";
+
+ src = fetchFromGitHub {
+ owner = "kumina";
+ repo = "dovecot_exporter";
+ inherit rev;
+ sha256 = "0iky1i7m5mlknkhlpsxpjgigssg5m02nx5y7i4biddkqilfic74n";
+ };
+
+ goDeps = ./dovecot-exporter-deps.nix;
+
+ meta = with stdenv.lib; {
+ inherit (src.meta) homepage;
+ description = "Prometheus metrics exporter for Dovecot";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ willibutz ];
+ };
+}
diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix
new file mode 100644
index 00000000000..ff35c033427
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix
@@ -0,0 +1,66 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+ {
+ goPackagePath = "github.com/beorn7/perks";
+ fetch = {
+ type = "git";
+ url = "https://github.com/beorn7/perks";
+ rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
+ sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/protobuf";
+ rev = "c65a0412e71e8b9b3bfd22925720d23c0f054237";
+ sha256 = "1ch3czyzq5abl6zm1l0dfsi09xj43ql9jcbmbhfhxz954pw03v3v";
+ };
+ }
+ {
+ goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+ fetch = {
+ type = "git";
+ url = "https://github.com/matttproud/golang_protobuf_extensions";
+ rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
+ sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_golang";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_golang";
+ rev = "06bc6e01f4baf4ee783ffcd23abfcb0b0f9dfada";
+ sha256 = "0dvv21214sn702kc25y5l0gd9d11358976d3w31fgwx7456mjx26";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/client_model";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/client_model";
+ rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
+ sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/common";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/common";
+ rev = "89604d197083d4781071d3c65855d24ecfb0a563";
+ sha256 = "169rdlaf2mk9z4fydz7ajmngyhmf3q1lk96yhvx46bn986x5xkyn";
+ };
+ }
+ {
+ goPackagePath = "github.com/prometheus/procfs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/prometheus/procfs";
+ rev = "cb4147076ac75738c9a7d279075a253c0cc5acbd";
+ sha256 = "0zhlrik0f9q1lj6cisgnxgbz4darbcix52hm5abi24l2ahchf5ca";
+ };
+ }
+]
diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
new file mode 100644
index 00000000000..5438f8271d9
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "postfix_exporter-unstable-${version}";
+ version = "2017-06-01";
+ rev = "a8b4bed735a03f234fcfffba85302f51025e6b1d";
+
+ goPackagePath = "github.com/kumina/postfix_exporter";
+
+ src = fetchFromGitHub {
+ owner = "kumina";
+ repo = "postfix_exporter";
+ inherit rev;
+ sha256 = "0rxvjpyjcvr1y8k8skq5f1bnl0mpgvaa04dn8c44v7afqnv78riy";
+ };
+
+ goDeps = ./postfix-exporter-deps.nix;
+
+ meta = with stdenv.lib; {
+ inherit (src.meta) homepage;
+ description = "A Prometheus exporter for Postfix";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ willibutz ];
+ };
+}
diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix
index c4147e35e49..618c3a33cd7 100644
--- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix
+++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix
@@ -1,7 +1,7 @@
# Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix)
{ fetchbower, buildEnv }:
buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
- (fetchbower "uchiwa-web" "1.1.1" "1.1.1" "19f9xprmjkhk4wbb88xmnp1fhqp2zc3gazzi4iczg65jzak4xzw0")
+ (fetchbower "uchiwa-web" "1.1.2" "1.1.2" "174flmnqjm0avpvi71ii5cvas2wkgz42is38r7n4zyrhagzlj66k")
(fetchbower "angular" "1.6.8" "~1.6.3" "07bwbahxaz5myjj7sqv7k211avs23a9j7msl373h1qvp05fblajf")
(fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "11r2nlwp6xrim2y6lnrr8v064mx3bmlxchqpg1i803v9zxz3q53d")
(fetchbower "angular-cookies" "1.6.8" "~1.6.3" "0p3skdg2pmzgwm9a0gyl1vhq4lcwyrymmii7lxlrmypjhwm83il6")
@@ -21,5 +21,5 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
(fetchbower "moment-picker" "0.9.11" "~0.9.7" "0p2g6rp2kcixydrga9lfihg4bxb598rvpi8n8l59mp549diy7vsb")
(fetchbower "ua-parser-js" "0.7.17" "~0.7.12" "1dx46rm9han9fj409rjxrlnrk9zxmaqbnn62ljnh32ihngd4yxh0")
(fetchbower "jsoneditor" "5.5.11" "~5.5.10" "1gfsf8jqnd3hb3r9s9246mg40iqxk2ix8k4bjnrsbfmg6cd3xw6x")
- (fetchbower "jquery" "3.2.1" ">= 1.9.0" "03vn0kq07yxl3i5shc6b0mjck1vdbz1x0jspd3wwb169mvlsxxn3")
+ (fetchbower "jquery" "3.3.1" ">= 1.9.0" "1l891s3vgnpi1g8ksplid9jvrvnnv6lci8vraix4ssy50i264rkx")
]; }
diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix
index fd434193d74..3e0ead7b495 100644
--- a/pkgs/servers/monitoring/uchiwa/src.nix
+++ b/pkgs/servers/monitoring/uchiwa/src.nix
@@ -1,4 +1,4 @@
{
- version = "1.1.1-1";
- sha256 = "1j1l5cmhiz19k6lhvaxqhgkj7v5m3fyxpkspvbrdbmp461g4j9bi";
+ version = "1.1.2-1";
+ sha256 = "0fmzpjwmv7fkl0ihy2gzcgfd384k3wnifg42gzap770d6kl6yj1c";
}
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index a323cd4802c..da192f70bfe 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -34,7 +34,7 @@ let
opt = stdenv.lib.optional;
mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
major = "0.20";
- minor = "10";
+ minor = "15";
in stdenv.mkDerivation rec {
name = "mpd-${version}";
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
owner = "MusicPlayerDaemon";
repo = "MPD";
rev = "v${version}";
- sha256 = "0i170kfn68x683fsm5rba0zbpjfr1r7s6a8nvdbva2yl0aizfzhs";
+ sha256 = "0idlz9y7gn1yqk5x4igp060wvspzsf446b6ybhbb0swi035qpd2x";
};
patches = [ ./x86.patch ];
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 354b4d57960..745376f61e4 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, lua }:
stdenv.mkDerivation rec {
- version = "4.0.6";
+ version = "4.0.7";
name = "redis-${version}";
src = fetchurl {
url = "http://download.redis.io/releases/${name}.tar.gz";
- sha256 = "1ypnwmxwm49l0b8i9swcbjdxnc6f0r9zyqm2h423wz13xilmv6vn";
+ sha256 = "1lgcc5k6bg7f34lxbfx0xv74nj66khd5x8g1igyy2h7v8inm9fhv";
};
buildInputs = [ lua ];
diff --git a/pkgs/servers/samba/4.x-no-persistent-install-dynconfig.patch b/pkgs/servers/samba/4.x-no-persistent-install-dynconfig.patch
new file mode 100644
index 00000000000..7e3652dbe7b
--- /dev/null
+++ b/pkgs/servers/samba/4.x-no-persistent-install-dynconfig.patch
@@ -0,0 +1,15 @@
+diff -ru3 samba-4.4.6/dynconfig/wscript samba-4.4.6-new/dynconfig/wscript
+--- samba-4.4.6/dynconfig/wscript 2016-01-26 14:45:46.000000000 +0300
++++ samba-4.4.6-new/dynconfig/wscript 2016-10-15 22:21:18.159705132 +0300
+@@ -416,11 +416,3 @@
+ public_headers=os_path_relpath(os.path.join(Options.launch_dir, version_header), bld.curdir),
+ header_path='samba',
+ cflags=cflags)
+-
+- # install some extra empty directories
+- bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}");
+- bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}")
+- bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}");
+-
+- # these might be on non persistent storage
+- bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")
diff --git a/pkgs/servers/samba/4.x-no-persistent-install.patch b/pkgs/servers/samba/4.x-no-persistent-install.patch
index efb539bfaea..1c360f6b2c7 100644
--- a/pkgs/servers/samba/4.x-no-persistent-install.patch
+++ b/pkgs/servers/samba/4.x-no-persistent-install.patch
@@ -37,18 +37,3 @@ diff -ru3 samba-4.4.6/ctdb/wscript samba-4.4.6-new/ctdb/wscript
# Unit tests
ctdb_unit_tests = [
'db_hash_test',
-diff -ru3 samba-4.4.6/dynconfig/wscript samba-4.4.6-new/dynconfig/wscript
---- samba-4.4.6/dynconfig/wscript 2016-01-26 14:45:46.000000000 +0300
-+++ samba-4.4.6-new/dynconfig/wscript 2016-10-15 22:21:18.159705132 +0300
-@@ -416,11 +416,3 @@
- public_headers=os_path_relpath(os.path.join(Options.launch_dir, version_header), bld.curdir),
- header_path='samba',
- cflags=cflags)
--
-- # install some extra empty directories
-- bld.INSTALL_DIRS("", "${CONFIGDIR} ${PRIVATE_DIR} ${LOGFILEBASE}");
-- bld.INSTALL_DIRS("", "${PRIVATE_DIR} ${PRIVILEGED_SOCKET_DIR}")
-- bld.INSTALL_DIRS("", "${STATEDIR} ${CACHEDIR}");
--
-- # these might be on non persistent storage
-- bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index fa910e80dab..90b00169a51 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
patches =
[ ./4.x-no-persistent-install.patch
./patch-source3__libads__kerberos_keytab.c.patch
+ ./4.x-no-persistent-install-dynconfig.patch
];
buildInputs =
diff --git a/pkgs/servers/samba/master.nix b/pkgs/servers/samba/master.nix
new file mode 100644
index 00000000000..f1dd7fe7b14
--- /dev/null
+++ b/pkgs/servers/samba/master.nix
@@ -0,0 +1,29 @@
+{ lib, stdenv, fetchFromGitHub
+, samba4
+, nettle
+} :
+
+ (samba4.overrideAttrs(oldAttrs: rec {
+ name = "samba-master${version}";
+ version = "4.8.0_2018-01-25";
+
+ src = fetchFromGitHub {
+ owner = "samba-team";
+ repo = "samba";
+ rev = "849169a7b6ed0beb78bbddf25537521c1ed2f8e1";
+ sha256 = "1535w787cy1x5ia9arjrg6hhf926wi8wm9qj0k0jgydy3600zpbv";
+ };
+
+ # Remove unnecessary install flags, same as <4.8 patch
+ postPatch = oldAttrs.postPatch + ''
+ sed -i '423,433d' dynconfig/wscript
+ '';
+
+ patches = [ ./4.x-no-persistent-install.patch ];
+ buildInputs = [ nettle ] ++ oldAttrs.buildInputs;
+ meta.branch = "master";
+ })).override {
+ # samba4.8+ removed the ability to disable LDAP.
+ # Enable for base derivation here:
+ enableLDAP = true;
+ }
diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index 950056ccb1d..25cd46aa98b 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
name = "groonga-${version}";
- version = "7.0.8";
+ version = "7.1.0";
src = fetchurl {
url = "http://packages.groonga.org/source/groonga/${name}.tar.gz";
- sha256 = "1j5biji86dicm8whbqjgjmyycxsfl5qfyxqfc4bxaspd6w18vj87";
+ sha256 = "1v0dyahlq7801bgcyvawj8waw6z84r0sr90x2b8nnrisrac3b8m7";
};
buildInputs = with stdenv.lib;
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 91d288c6a9e..88d2ae3d68a 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -180,6 +180,11 @@ connector-c = stdenv.mkDerivation rec {
"-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
];
+ # The cmake setup-hook uses $out/lib by default, this is not the case here.
+ preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+ cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$out/lib/mariadb")
+ '';
+
nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ openssl zlib ];
buildInputs = [ libiconv ];
diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix
index 7b98ded5dc1..c8ac6ed9db0 100644
--- a/pkgs/servers/sslh/default.nix
+++ b/pkgs/servers/sslh/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers }:
+{ stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers, pcre }:
stdenv.mkDerivation rec {
name = "sslh-${version}";
- version = "1.18";
+ version = "1.19";
src = fetchurl {
url = "http://www.rutschle.net/tech/sslh/sslh-v${version}.tar.gz";
- sha256 = "1ba5fxd2s6jh9n3wbp2a782q7syc4m6qvfrggnscdbywfyrsa08n";
+ sha256 = "17362d3srrr49c3vvyg69maynpxac92wvi5j0nvlnh6sjs1v377g";
};
postPatch = "patchShebangs *.sh";
- buildInputs = [ libcap libconfig perl tcp_wrappers ];
+ buildInputs = [ libcap libconfig perl tcp_wrappers pcre ];
makeFlags = "USELIBCAP=1 USELIBWRAP=1";
diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix
index ebc08b745c6..72f5d3aa9d8 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/pkgs/servers/traefik/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "traefik-${version}";
- version = "1.4.6";
+ version = "1.5.0";
goPackagePath = "github.com/containous/traefik";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "containous";
repo = "traefik";
rev = "v${version}";
- sha256 = "1sd7wfp1hvq505lgybbaiq9d1hyygzf5jgl0qidn103xnf1yqaw0";
+ sha256 = "0yvmw99knjdfgaa3snk4fmrbf3bqnj78ix5hr0mcqj5pwjx1dihb";
};
buildInputs = [ go-bindata bash ];
diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix
index dfc90feeb33..c38d4e80143 100644
--- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix
+++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, pkgconfig, m4, libxcb, xcbutil, libX11 }:
stdenv.mkDerivation rec {
- version = "1.0";
+ version = "1.2";
name = "xcb-util-xrm-${version}";
src = fetchurl {
url = "https://github.com/Airblader/xcb-util-xrm/releases/download/v${version}/${name}.tar.bz2";
- sha256 = "1h5vxwpd37dqfw9yj1l4zd9c5dj30r3g0szgysr6kd7xrqgaq04l";
+ sha256 = "0vbqhag51i0njc8d5fc8c6aa12496cwrc3s6s7sa5kfc17cwhppp";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ m4 libxcb xcbutil ]
+ nativeBuildInputs = [ pkgconfig m4 ];
+ buildInputs = [ libxcb xcbutil ]
++ stdenv.lib.optional doCheck libX11;
doCheck = true;
diff --git a/pkgs/tools/X11/xcalib/default.nix b/pkgs/tools/X11/xcalib/default.nix
index 65868a3b6b0..2f925b11ba5 100644
--- a/pkgs/tools/X11/xcalib/default.nix
+++ b/pkgs/tools/X11/xcalib/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, libX11, libXxf86vm, libXext }:
+{ stdenv, fetchFromGitHub, libX11, libXxf86vm, libXext, libXrandr }:
stdenv.mkDerivation rec {
- name = "xcalib-0.8";
+ name = "xcalib-0.10";
- src = fetchurl {
- url = "mirror://sourceforge/xcalib/xcalib-source-0.8.tar.gz";
- sha256 = "8a112ee710e5446f6c36e62345b2066f10639d500259db8c48bf1716caea06e6";
+ src = fetchFromGitHub {
+ owner = "OpenICC";
+ repo = "xcalib";
+ rev = "f95abc1a551d7c695a8b142c4d9d5035368d482d";
+ sha256 = "05fzdjmhiafgi2jf0k41i3nm0837a78sb6yv59cwc23nla8g0bhr";
};
- buildInputs = [ libX11 libXxf86vm libXext ];
+ buildInputs = [ libX11 libXxf86vm libXext libXrandr ];
installPhase = ''
mkdir -p $out/bin
@@ -16,7 +18,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = http://xcalib.sourceforge.net/;
+ inherit (src.meta) homepage;
description = "A tiny monitor calibration loader for X and MS-Windows";
license = licenses.gpl2;
maintainers = [ maintainers.rickynils ];
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index c711881d528..899845a044c 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -195,7 +195,7 @@ in pythonPackages.buildPythonApplication rec {
BASH_COMPLETION_SCRIPT="${completion}" \
HOME="$(mktemp -d)" \
# Exclude failing test https://github.com/beetbox/beets/issues/2652
- nosetests -v --exclude="test_single_month_nonmatch_"
+ nosetests -v --exclude=test_single_month_nonmatch_ --exclude=test_asciify_variable --exclude=test_asciify_character_expanding_to_slash
runHook postCheck
'';
diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix
index 0469ad54eb1..7bbfafef819 100644
--- a/pkgs/tools/filesystems/cryfs/default.nix
+++ b/pkgs/tools/filesystems/cryfs/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "cryfs-${version}";
- version = "0.9.7";
+ version = "0.9.8";
src = fetchFromGitHub {
owner = "cryfs";
repo = "cryfs";
rev = "${version}";
- sha256 = "1wsv4cyjkyg3cyr6vipw1mj41bln2m69123l3miav8r4mvmkfq8w";
+ sha256 = "1lrzmzjakv08qjq09a3krllfw5vrgblfxzijpf3lm3yjgih63r1k";
};
prePatch = ''
diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix
index f9b82a38344..fd0b0caea4c 100644
--- a/pkgs/tools/graphics/optipng/default.nix
+++ b/pkgs/tools/graphics/optipng/default.nix
@@ -7,11 +7,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "optipng-0.7.6";
+ name = "optipng-0.7.7";
src = fetchurl {
url = "mirror://sourceforge/optipng/${name}.tar.gz";
- sha256 = "105yk5qykvhiahzag67gm36s2kplxf6qn5hay02md0nkrcgn6w28";
+ sha256 = "0lj4clb851fzpaq446wgj0sfy922zs5l5misbpwv6w7qrqrz4cjg";
};
buildInputs = [ libpng ];
diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix
index 3bcbc5d5ead..fce1f3f913c 100644
--- a/pkgs/tools/graphics/pngcrush/default.nix
+++ b/pkgs/tools/graphics/pngcrush/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libpng }:
stdenv.mkDerivation rec {
- name = "pngcrush-1.8.1";
+ name = "pngcrush-1.8.13";
src = fetchurl {
url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz";
- sha256 = "1h3sibmmiq4ynvf8hrpksfrbcmszxh4bqpkqy5c0m8828c7drpr9";
+ sha256 = "0l43c59d6v9l0g07z3q3ywhb8xb3vz74llv3mna0izk9bj6aqkiv";
};
makeFlags = [ "CC=cc" "LD=cc" ]; # gcc and/or clang compat
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
index 6022bcebc3b..f2610efd2eb 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, libpinyin, glib, pcre, dbus, qt4 }:
+{ stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, libpinyin, glib, pcre, dbus, qtwebengine, qtbase, fcitx-qt5 }:
stdenv.mkDerivation rec {
name = "fcitx-libpinyin-${version}";
- version = "0.3.91";
+ version = "0.5.3";
src = fetchurl {
url = "http://download.fcitx-im.org/fcitx-libpinyin/${name}.tar.xz";
- sha256 = "19h0p1s8bkw24v7x6v19fg7dqpz2kkjlvvrqhypi5bkkvfswf7xn";
+ sha256 = "196c229ckib3xvafkk4n3n3jk9rpksfcjsbbwka6a9k2f34qrjj6";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ cmake fcitx gettext libpinyin glib pcre dbus qt4 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ fcitx-qt5 qtbase qtwebengine.dev cmake fcitx gettext libpinyin glib pcre dbus ];
preInstall = ''
substituteInPlace src/cmake_install.cmake \
@@ -24,13 +24,14 @@ stdenv.mkDerivation rec {
'';
preBuild = let
+ ZHUYIN_DATA_FILE_NAME = "model.text.20161206.tar.gz";
store_path = fetchurl {
- url = https://download.fcitx-im.org/data/model.text.20130308.tar.gz;
- sha256 = "0s8sazix29z1ilxmkw2f0bv6i349awd89ibylf9ixy615s1vb5a5";
+ url = "https://download.fcitx-im.org/data/${ZHUYIN_DATA_FILE_NAME}";
+ sha256 = "017p11si1b7bkwx36xaybq5a9icq1pd7x1jbymqw92akfgjj8w2w";
};
in
''
- cp -rv ${store_path} $NIX_BUILD_TOP/$name/data/model.text.20130308.tar.gz
+ cp -rv ${store_path} $NIX_BUILD_TOP/$name/data/${ZHUYIN_DATA_FILE_NAME}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
index b0da0034ef9..7617d544d29 100644
--- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
+++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "fcitx-qt5-${version}";
- version = "1.1.0";
+ version = "1.2.1";
src = fetchurl {
url = "http://download.fcitx-im.org/fcitx-qt5/${name}.tar.xz";
- sha256 = "0r8c5k0qin3mz2p1mdciip6my0x58662sx5z50zs4c5pkdg21qwv";
+ sha256 = "0z8ax0dxk88byic41mfaiahjdv1k8ciwn97xfjkkgr4ijgscdr8c";
};
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ];
@@ -16,10 +16,12 @@ stdenv.mkDerivation rec {
preInstall = ''
substituteInPlace platforminputcontext/cmake_install.cmake \
--replace ${qtbase.out} $out
+ substituteInPlace quickphrase-editor/cmake_install.cmake \
+ --replace ${fcitx} $out
'';
meta = with stdenv.lib; {
- homepage = "https://github.com/fcitx/fcitx-qt5";
+ homepage = http://github.com/fcitx/fcitx-qt5;
description = "Qt5 IM Module for Fcitx";
license = licenses.gpl2;
platforms = platforms.linux;
diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix
index c489b3e4ed7..27eb35ce6ae 100644
--- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix
+++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix
@@ -2,27 +2,75 @@
, libxml2, enchant, isocodes, icu, libpthreadstubs
, pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon
, dbus, gtk2, gtk3, qt4, extra-cmake-modules
+, xkeyboard_config, pcre, libuuid, curl, cacert
+, withPinyin ? true
+, fetchFromGitHub
}:
+let
+ # releases at http://download.fcitx-im.org/fcitx/${name}_dict.tar.xz
+ # contains all data but if we want to compile from source, we need to
+ # fetch them ourselves
+ # to update the urls and where to unpack these, look into the
+ # src/module/*/data/CMakeLists.txt files
+ # fcitx_download tgt_name url output)
+ dicts = let SPELL_EN_DICT_VER="20121020"; in fetchurl {
+ url = "http://download.fcitx-im.org/data/en_dict-${SPELL_EN_DICT_VER}.tar.gz";
+ sha256 = "1svcb97sq7nrywp5f2ws57cqvlic8j6p811d9ngflplj8xw5sjn4";
+ };
+ table = fetchurl {
+ url = http://download.fcitx-im.org/data/table.tar.gz;
+ sha256 = "1dw7mgbaidv3vqy0sh8dbfv8631d2zwv5mlb7npf69a1f8y0b5k1";
+ };
+ pystroke-data = let PY_STROKE_VER="20121124"; in fetchurl {
+ url = "http://download.fcitx-im.org/data/py_stroke-${PY_STROKE_VER}.tar.gz";
+ sha256 = "0j72ckmza5d671n2zg0psg7z9iils4gyxz7jgkk54fd4pyljiccf";
+ };
+ pytable-data = let PY_TABLE_VER="20121124"; in fetchurl {
+ url = "http://download.fcitx-im.org/data/py_table-${PY_TABLE_VER}.tar.gz";
+ sha256 = "011cg7wssssm6hm564cwkrrnck2zj5rxi7p9z5akvhg6gp4nl522";
+ };
+ pinyin-data = fetchurl {
+ url = http://download.fcitx-im.org/data/pinyin.tar.gz;
+ sha256 = "1qfq5dy4czvd1lvdnxzyaiir9x8b1m46jjny11y0i33m9ar2jf2q";
+ };
+in
stdenv.mkDerivation rec {
name = "fcitx-${version}";
- version = "4.2.9.1";
+ version = "4.2.9.5";
- src = fetchurl {
- url = "http://download.fcitx-im.org/fcitx/${name}_dict.tar.xz";
- sha256 = "0xvcmm4yi7kagf55d0yl3ql5ssbkm9410fwbz3kd988pchichdsk";
+ src = fetchFromGitHub {
+ owner = "fcitx";
+ repo = "fcitx";
+ rev = version;
+ sha256 = "0rv69bacdvblka85dakz4ldpznrgwj59nqcccp5mkkn1rab4zh1r";
};
+ # put data at the correct locations else cmake tries to fetch them,
+ # which fails in sandboxed mode
+ prePatch = ''
+ cp ${dicts} src/module/spell/dict/$(stripHash ${dicts})
+ cp ${table} src/im/table/data/$(stripHash ${table})
+ ''
+ + stdenv.lib.optionalString withPinyin ''
+ cp ${pystroke-data} src/module/pinyin-enhance/data/$(stripHash ${pystroke-data})
+ cp ${pytable-data} src/module/pinyin-enhance/data/$(stripHash ${pytable-data})
+ cp ${pinyin-data} src/im/pinyin/data/$(stripHash ${pinyin-data})
+ ''
+ ;
+
postPatch = ''
substituteInPlace src/frontend/qt/CMakeLists.txt \
--replace $\{QT_PLUGINS_DIR} $out/lib/qt4/plugins
+
+ patchShebangs cmake/
'';
- nativeBuildInputs = [ cmake extra-cmake-modules intltool pkgconfig ];
+ nativeBuildInputs = [ cmake extra-cmake-modules intltool pkgconfig pcre ];
buildInputs = [
- enchant gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile
- libxkbcommon libxml2 dbus cairo gtk2 gtk3 pango qt4
+ xkeyboard_config enchant gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile
+ libxkbcommon libxml2 dbus cairo gtk2 gtk3 pango qt4 libuuid
];
cmakeFlags = ''
@@ -33,10 +81,15 @@ stdenv.mkDerivation rec {
-DENABLE_OPENCC=OFF
-DENABLE_PRESAGE=OFF
-DENABLE_XDGAUTOSTART=OFF
- '';
+ -DENABLE_PINYIN=${if withPinyin then "ON" else "OFF"}
+ -DENABLE_TABLE=ON
+ -DENABLE_SPELL=ON
+ -DENABLE_QT_GUI=ON
+ -DXKB_RULES_XML_FILE='${xkeyboard_config}/share/X11/xkb/rules/evdev.xml'
+ '';
meta = with stdenv.lib; {
- homepage = "https://github.com/fcitx/fcitx";
+ homepage = http://github.com/fcitx/fcitx;
description = "A Flexible Input Method Framework";
license = licenses.gpl2;
platforms = platforms.linux;
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
index 6293fa30d7a..85399bffd3f 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "ibus-libpinyin-${version}";
- version = "1.8.0";
+ version = "1.9.2";
src = fetchFromGitHub {
owner = "libpinyin";
repo = "ibus-libpinyin";
rev = version;
- sha256 = "1d85kzlhav0ay798i88yqyrjbkv3y7w2aiadpmcjgscyd5ccsnnz";
+ sha256 = "067w926gcf0kwwn71yshhjmyzkad0qsdm1dsi2xwz1j633qd4xlb";
};
buildInputs = [ ibus glib sqlite libpinyin python3 gtk3 db ];
diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix
index 6575c19391c..d93cc479a80 100644
--- a/pkgs/tools/misc/debianutils/default.nix
+++ b/pkgs/tools/misc/debianutils/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- version = "4.8.2";
+ version = "4.8.4";
name = "debianutils-${version}";
src = fetchurl {
url = "mirror://debian/pool/main/d/debianutils/debianutils_${version}.tar.xz";
- sha256 = "0s3w3svcsh984zinkxvpzxi7dc0ginqk0nk299fkrr6k7wlmzssd";
+ sha256 = "1chypq3dbkgvl16lgzdvqvlr7cdm3814nqmp8ch8j7x6mscsnqf0";
};
meta = {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
longDescription = ''
This package provides a number of small utilities which are used primarily by the installation scripts of Debian packages, although you may use them directly.
- The specific utilities included are: add-shell installkernel ischroot remove-shell run-parts savelog tempfile which
+ The specific utilities included are: add-shell installkernel ischroot remove-shell run-parts savelog tempfile which
'';
downloadPage = https://packages.debian.org/sid/debianutils;
license = with stdenv.lib.licenses; [ gpl2Plus publicDomain smail ];
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 5b42c811bd2..418d5e38fd7 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, python3Packages, docutils
+{ lib, stdenv, fetchgit, python3Packages, docutils, help2man
, acl, apktool, libbfd, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, diffutils, dtc
, e2fsprogs, file, findutils, fontforge-fonttools, fpc, gettext, ghc, ghostscriptX, giflib, gnupg1, gnutar
, gzip, imagemagick, jdk, libarchive, libcaca, llvm, mono, openssh, pdftk, pgpdump, poppler_utils, sng, sqlite
@@ -8,12 +8,12 @@
python3Packages.buildPythonApplication rec {
name = "diffoscope-${version}";
- version = "87";
+ version = "90";
src = fetchgit {
url = "git://anonscm.debian.org/reproducible/diffoscope.git";
rev = "refs/tags/${version}";
- sha256 = "0j3pljwmggrpaghbamvr24x4cg5yj7hl2ll27405p7970scnpngv";
+ sha256 = "1w16667j6ag2iim1xcy8y9v9965mq50k64wnf693mivddll62704";
};
patches = [
@@ -25,6 +25,8 @@ python3Packages.buildPythonApplication rec {
sed -i setup.py -e "/'rpm-python',/d"
'';
+ nativeBuildInputs = [ docutils help2man ];
+
# Still missing these tools: docx2txt enjarify js-beautify oggDump Rscript
# Also these libraries: python3-guestfs
pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [
@@ -37,10 +39,12 @@ python3Packages.buildPythonApplication rec {
];
doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
+ checkInputs = with python3Packages; [ pytest ];
postInstall = ''
+ make -C doc
mkdir -p $out/share/man/man1
- ${docutils}/bin/rst2man.py debian/diffoscope.1.rst $out/share/man/man1/diffoscope.1
+ cp doc/diffoscope.1 $out/share/man/man1/diffoscope.1
'';
meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix
new file mode 100644
index 00000000000..55aa146d301
--- /dev/null
+++ b/pkgs/tools/misc/flameshot/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, qtbase, qmake, qttools }:
+
+stdenv.mkDerivation rec {
+ name = "flameshot-${version}";
+ version = "0.5.0";
+
+ nativeBuildInputs = [ qmake qttools ];
+ buildInputs = [ qtbase ];
+
+ qmakeFlags = [
+ # flameshot.pro assumes qmake is being run in a git checkout and uses it
+ # to determine the version being built. Let's replace that.
+ "VERSION=${version}"
+ "PREFIX=/"
+ ];
+ patchPhase = ''
+ sed -i 's/VERSION =/#VERSION =/g' flameshot.pro
+ sed -i 's,USRPATH = /usr/local,USRPATH = /,g' flameshot.pro
+ '';
+
+ installFlags = [ "INSTALL_ROOT=$(out)" ];
+
+ src = fetchFromGitHub {
+ owner = "lupoDharkael";
+ repo = "flameshot";
+ rev = "v${version}";
+ sha256 = "1fy4il7rdj294l9cs642hx23bry25j9phn37274r2b87hwzy1rrv";
+ };
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "Powerful yet simple to use screenshot software";
+ homepage = https://github.com/lupoDharkael/flameshot;
+ maintainers = [ maintainers.scode ];
+ license = stdenv.lib.licenses.gpl3;
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix
index 2047b77144a..b1e09312658 100644
--- a/pkgs/tools/misc/flashrom/default.nix
+++ b/pkgs/tools/misc/flashrom/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, libftdi, pciutils }:
+{ lib, stdenv, fetchurl, pkgconfig, libftdi, pciutils }:
-let version = "0.9.9"; in
+let version = "1.0"; in
stdenv.mkDerivation rec {
name = "flashrom-${version}";
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
preConfigure = "export PREFIX=$out";
- meta = {
+ meta = with lib; {
homepage = http://www.flashrom.org;
description = "Utility for reading, writing, erasing and verifying flash ROM chips";
- license = stdenv.lib.licenses.gpl2;
- maintainers = [ stdenv.lib.maintainers.funfunctor ];
- platforms = with stdenv.lib.platforms; linux;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ funfunctor fpletz ];
+ platforms = with platforms; linux;
};
}
diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index 5c868ae5e2f..d4acc063b4d 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- version = "2.4.0";
+ version = "2.4.1";
name = "graylog-${version}";
src = fetchurl {
url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
- sha256 = "12ipp1bji0ss0d20dpqx8d6x3p3h38qdfdy98qy37mjy0fi22vpq";
+ sha256 = "1dps1vvv8b154ayamhjxdgiq101qs4w0nk79j3zb41pdyn2fji4j";
};
dontBuild = true;
diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix
index b428205fcd0..80cbf3661da 100644
--- a/pkgs/tools/misc/testdisk/default.nix
+++ b/pkgs/tools/misc/testdisk/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ncurses, libjpeg, e2fsprogs, zlib, openssl, libuuid, ntfs3g }:
stdenv.mkDerivation {
- name = "testdisk-7.0";
+ name = "testdisk-7.1";
src = fetchurl {
url = http://www.cgsecurity.org/testdisk-7.0.tar.bz2;
- sha256 = "00bb3b6b22e6aba88580eeb887037aef026968c21a87b5f906c6652cbee3442d";
+ sha256 = "0ba4wfz2qrf60vwvb1qsq9l6j0pgg81qgf7fh22siaz649mkpfq0";
};
buildInputs = [ ncurses libjpeg zlib openssl libuuid ]
diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix
index 35bdcf1b823..938092c2387 100644
--- a/pkgs/tools/misc/tmuxinator/default.nix
+++ b/pkgs/tools/misc/tmuxinator/default.nix
@@ -8,8 +8,8 @@ buildRubyGem rec {
inherit ruby;
name = "${gemName}-${version}";
gemName = "tmuxinator";
- version = "0.10.0";
- source.sha256 = "199pq15qknpcafw8ryb9kk1jsrwnncg6k5l9d4n0nmms4knxlqlf";
+ version = "0.10.1";
+ source.sha256 = "0rjy2glqwbz07ci0snycq19myfczd2pry2iw4g0nqsw37wclm1vi";
erubis = buildRubyGem rec {
inherit ruby;
@@ -23,8 +23,8 @@ buildRubyGem rec {
inherit ruby;
name = "ruby${ruby.version}-${gemName}-${version}";
gemName = "thor";
- version = "0.19.1";
- source.sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
+ version = "0.20.0";
+ source.sha256 = "0nmqpyj642sk4g16nkbq6pj856adpv91lp4krwhqkh2iw63aszdl";
};
xdg = buildRubyGem rec {
diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix
index 90758e909e5..f66f6c3642e 100644
--- a/pkgs/tools/misc/units/default.nix
+++ b/pkgs/tools/misc/units/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "units-${version}";
- version = "2.14";
+ version = "2.16";
src = fetchurl {
url = "mirror://gnu/units/${name}.tar.gz";
- sha256 = "9d33893d82f3ddd831d5822992007c40bcd0826ae67d3cbc96539951fb0a82e8";
+ sha256 = "11hnp3gcmcc5kci2caxw4hs6m08h2mhqs3xzqq7iafx1ha2ggwyw";
};
buildInputs = [ readline ];
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 0080c073fd1..c4595a1a94e 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -16,11 +16,11 @@ with stdenv.lib;
buildPythonApplication rec {
name = "youtube-dl-${version}";
- version = "2018.01.21";
+ version = "2018.01.27";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
- sha256 = "14ggjxnhc2sxc93h7d5k3z4n35n5q3ffsif97np0ar93x5z3zgn5";
+ sha256 = "14vbm8pr6xdrdbk8j9k4v82rnalbdpk2lcm7n9wj6z6d441ymji9";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix
index 36dd8339f26..c3bb28bc1a5 100644
--- a/pkgs/tools/misc/yubikey-personalization/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "yubikey-personalization-${version}";
- version = "1.18.0";
+ version = "1.18.1";
src = fetchurl {
url = "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${version}.tar.gz";
- sha256 = "1bc2z6y2x7bbqn7ink2dg3wrgqzlcq2zxxg0cdcxy6jm7c9kwcyg";
+ sha256 = "0mjjkk6p8d0kblj6vzld4v188y40ynprvd2hnfh7m1hs28wbkzcz";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix
index 219a993b8a2..99997eb927f 100644
--- a/pkgs/tools/networking/inadyn/default.nix
+++ b/pkgs/tools/networking/inadyn/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
name = "inadyn-${version}";
- version = "2.2.1";
+ version = "2.3";
src = fetchFromGitHub {
owner = "troglobit";
diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix
index 6f2ca96d120..94be3c25d1f 100644
--- a/pkgs/tools/networking/iperf/2.nix
+++ b/pkgs/tools/networking/iperf/2.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "iperf-2.0.9";
+ name = "iperf-2.0.10";
src = fetchurl {
url = "mirror://sourceforge/iperf2/files/${name}.tar.gz";
- sha256 = "1gzh8dk2myqgxznxrryib4zsw23ffvx0s5j7sa780vk86lgr20nv";
+ sha256 = "1whyi7lxrkllmbs7i1avc6jq8fvirn64mhx9197bf4x3rj6k9r3z";
};
hardeningDisable = [ "format" ];
diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix
index f33fe7a7105..67428664556 100644
--- a/pkgs/tools/networking/kea/default.nix
+++ b/pkgs/tools/networking/kea/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "kea";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchurl {
url = "https://ftp.isc.org/isc/${pname}/${version}/${name}.tar.gz";
- sha256 = "0afiab6c8cw0w3m0l4hrc4g8bs9y3z59fdr16xnba01nn52mkl92";
+ sha256 = "14f32lsdd1824cx9a4l4pfbhq1d4jik6l6hxd911ihi64nzwvpvf";
};
patches = [ ./dont-create-var.patch ];
diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix
index 1ce9f7cb323..20e65c5ea3c 100644
--- a/pkgs/tools/networking/lldpd/default.nix
+++ b/pkgs/tools/networking/lldpd/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "lldpd-${version}";
- version = "0.9.8";
+ version = "0.9.9";
src = fetchurl {
url = "https://media.luffy.cx/files/lldpd/${name}.tar.gz";
- sha256 = "0kwck17cr2f1a395a8bfmj7fz1n4i1hv429cbdbkhff33glr9r4y";
+ sha256 = "1nq2z03hbs5qc3kdk3rdxcwcsrxilhcqx7xw3iipc4yj03shi7jy";
};
configureFlags = [
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index d0881c5ac5e..f2c0bb13afe 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
name = "${pname}-${major}.${minor}";
pname = "network-manager-applet";
major = "1.8";
- minor = "2";
+ minor = "6";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz";
- sha256 = "09f9hjpn9nkhw57mk6pi7q1bq3lhf5hvmwas0fknscssak7yjmry";
+ sha256 = "0c4wxwxpa7wlskvnqaqfa7mmc0c6a2pj7jcvymcchjnq4wn9wx01";
};
configureFlags = [
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 6005314ea97..b6201e308d9 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
name = "network-manager-${version}";
pname = "NetworkManager";
major = "1.10";
- version = "${major}.0";
+ version = "${major}.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
- sha256 = "1ph45rqpl8p9k4rirhss0hpf104clm8fp322p6kh6q75y06ddfwa";
+ sha256 = "0nv2jm2lsidlrzn4dkbc5rpj8ma4cpzjqz8z8dmwkqvh0zsk970n";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/tools/networking/network-manager/iodine.nix b/pkgs/tools/networking/network-manager/iodine.nix
index 154b54952f2..0cfc8bbba7d 100644
--- a/pkgs/tools/networking/network-manager/iodine.nix
+++ b/pkgs/tools/networking/network-manager/iodine.nix
@@ -18,6 +18,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ intltool pkgconfig ];
+ # Fixes deprecation errors with networkmanager 1.10.2
+ NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
+
configureFlags = [
"${if withGnome then "--with-gnome" else "--without-gnome"}"
"--disable-static"
diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix
index f2657187464..365aec88a7d 100644
--- a/pkgs/tools/networking/network-manager/strongswan.nix
+++ b/pkgs/tools/networking/network-manager/strongswan.nix
@@ -21,6 +21,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ intltool pkgconfig ];
+ # Fixes deprecation errors with networkmanager 1.10.2
+ NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
+
preConfigure = ''
substituteInPlace "configure" \
--replace "/sbin/sysctl" "${procps}/bin/sysctl"
diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/tools/networking/ngrep/default.nix
index dcc0e8596e9..ca5e0b7c4f5 100644
--- a/pkgs/tools/networking/ngrep/default.nix
+++ b/pkgs/tools/networking/ngrep/default.nix
@@ -1,39 +1,35 @@
-{ stdenv, fetchurl, fetchpatch, libpcap, gnumake3, pcre }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libpcap, gnumake3, pcre }:
stdenv.mkDerivation rec {
- name = "ngrep-1.45";
+ name = "ngrep-${version}";
+ version = "1.47";
- src = fetchurl {
- url = "mirror://sourceforge/ngrep/${name}.tar.bz2";
- sha256 = "19rg8339z5wscw877mz0422wbsadds3mnfsvqx3ihy58glrxv9mf";
+ src = fetchFromGitHub {
+ owner = "jpr5";
+ repo = "ngrep";
+ rev = "V${lib.replaceStrings ["."] ["_"] version}";
+ sha256 = "1x2fyd7wdqlj1r76ilal06cl2wmbz0ws6i3ys204sbjh1cj6dcl7";
};
patches = [
(fetchpatch {
- url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/10_debian-build.diff?h=debian/1.45.ds2-14";
- sha256 = "1p359k54xjbh6r0d0lv1l679n250wxk6j8yyz23gn54kwdc29zfy";
- })
- (fetchpatch {
- url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/10_man-fixes.diff?h=debian/1.45.ds2-14";
- sha256 = "1b66zfbsrsvg60j988i6ga9iif1c34fsbq3dp1gi993xy4va8m5k";
- })
- (fetchpatch {
- url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/20_setlocale.diff?h=debian/1.45.ds2-14";
- sha256 = "16xbmnmvw5sjidz2qhay68k3xad05g74nrccflavxbi0jba52fdq";
- })
- (fetchpatch {
- url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/40_ipv6-offsets.diff?h=debian/1.45.ds2-14";
- sha256 = "0fjlk1sav5nnjapvsa8mvdwjkhgm3kgc6dw7r9h1qx6d3b8cgl76";
+ url = "https://patch-diff.githubusercontent.com/raw/jpr5/ngrep/pull/11.patch";
+ sha256 = "0k5qzvj8j3r1409qwwvzp7m3clgs2g7hs4q68bhrqbrsvvb2h5dh";
})
];
- buildInputs = [ gnumake3 libpcap pcre ];
+ nativeBuildInputs = [ autoreconfHook gnumake3 ];
+ buildInputs = [ libpcap pcre ];
+
+ configureFlags = [
+ "--enable-ipv6"
+ "--enable-pcre"
+ "--disable-pcap-restart"
+ "--with-pcap-includes=${libpcap}/include"
+ ];
preConfigure = ''
- # Fix broken test for BPF header file
sed -i "s|BPF=.*|BPF=${libpcap}/include/pcap/bpf.h|" configure
-
- configureFlags="$configureFlags --enable-ipv6 --enable-pcre --disable-pcap-restart --with-pcap-includes=${libpcap}/include"
'';
meta = with stdenv.lib; {
@@ -47,7 +43,7 @@ stdenv.mkDerivation rec {
null interfaces, and understands BPF filter logic in the same fashion as
more common packet sniffing tools, such as tcpdump and snoop.
'';
- homepage = http://ngrep.sourceforge.net/;
+ homepage = https://github.com/jpr5/ngrep/;
# /doc/README.txt says that ngrep itself is licensed under a
# 'BSD-like' license but that the 'regex' library (in the ngrep tarball) is
# GPLv2.
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 4295151516d..86a029bcb3d 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -2,7 +2,7 @@
asciidoc, libxml2, libxslt, docbook_xml_xslt }:
pythonPackages.buildPythonApplication rec {
- version = "7.1.4";
+ version = "7.1.5";
name = "offlineimap-${version}";
namePrefix = "";
@@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
owner = "OfflineIMAP";
repo = "offlineimap";
rev = "v${version}";
- sha256 = "04y2bsgmxykkhcjh3540y2a43xrwfkzd7wks1wvl6av0vjaqa5gm";
+ sha256 = "0qm5vhzm8hkab2zs2l8ffg754wkws2nyd4pwb332v3zckf11flzd";
};
postPatch = ''
diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix
index 97780d546e4..a0bac7854c1 100644
--- a/pkgs/tools/networking/pykms/default.nix
+++ b/pkgs/tools/networking/pykms/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchFromGitHub, python2Packages, writeText, writeScript
+{ stdenv, fetchFromGitHub, python3Packages, writeText, writeScript
, coreutils, sqlite }:
+with python3Packages;
+
let
dbSql = writeText "create_pykms_db.sql" ''
CREATE TABLE clients(
@@ -27,21 +29,21 @@ let
fi
'');
-in python2Packages.buildPythonApplication rec {
+in buildPythonApplication rec {
name = "pykms-${version}";
- version = "20170719";
+ version = "20171224";
src = fetchFromGitHub {
owner = "ThunderEX";
repo = "py-kms";
- rev = "27355d88affd740330174a7c2bae9f50b9efce56";
- sha256 = "0cpywj73jmyijjc5hs3b00argjsdwpqzmhawbxkx3mc2l4sgzc88";
+ rev = "885f67904f002042d7758e38f9c5426461c5cdc7";
+ sha256 = "155khy1285f8xkzi6bsqm9vzz043jsjmp039va1qsh675gz3q9ha";
};
- propagatedBuildInputs = with python2Packages; [ argparse pytz ];
+ propagatedBuildInputs = [ argparse pytz ];
prePatch = ''
- siteDir=$out/${python2Packages.python.sitePackages}
+ siteDir=$out/${python.sitePackages}
substituteInPlace kmsBase.py \
--replace "'KmsDataBase.xml'" "'$siteDir/KmsDataBase.xml'"
@@ -60,7 +62,7 @@ in python2Packages.buildPythonApplication rec {
mv * $siteDir
for b in client server ; do
chmod 0755 $siteDir/$b.py
- makeWrapper ${python2Packages.python.interpreter} $out/bin/$b.py \
+ makeWrapper ${python.interpreter} $out/bin/$b.py \
--add-flags $siteDir/$b.py
done
@@ -68,7 +70,7 @@ in python2Packages.buildPythonApplication rec {
mv $siteDir/README.md $out/share/doc/pykms/
- ${python2Packages.python.interpreter} -m compileall $siteDir
+ ${python.interpreter} -m compileall $siteDir
runHook postInstall
'';
diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index 30ecf617873..6f37e88f4f6 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }:
stdenv.mkDerivation rec {
- version = "5.2.20";
+ version = "5.3.0";
name = "whois-${version}";
src = fetchFromGitHub {
owner = "rfc1036";
repo = "whois";
rev = "v${version}";
- sha256 = "1aamasivfnghr9my1j6c1rf0dfal45axjcjf3mpv0g942bkxqp5b";
+ sha256 = "01pfl1ap62hc27574sx1a4yaaf7hr2zkksspn5z97sgacl6h1rnf";
};
nativeBuildInputs = [ perl gettext pkgconfig ];
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 506d6fc3fce..976c58eb1e3 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -1,44 +1,35 @@
-{ stdenv, fetchurl, fetchpatch, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl
-, libmilter, pcre }:
+{ stdenv, fetchurl, fetchpatch, pkgconfig
+, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl, libmilter, pcre
+}:
stdenv.mkDerivation rec {
name = "clamav-${version}";
- version = "0.99.2";
+ version = "0.99.3";
src = fetchurl {
url = "https://www.clamav.net/downloads/production/${name}.tar.gz";
- sha256 = "0yh2q318bnmf2152g2h1yvzgqbswn0wvbzb8p4kf7v057shxcyqn";
+ sha256 = "114f7qk3h0klgm0zzn2394n5spcn91vjc9mq6m03l2p0ls955yh0";
};
- patches = [
- (fetchpatch {
- name = "CVE-2017-6420.patch";
- url = "https://github.com/vrtadmin/clamav-devel/commit/dfc00cd3301a42b571454b51a6102eecf58407bc.patch";
- sha256 = "08w3p3a4pmi0cmcmyxkagsbn3g0jgx1jqlc34pn141x0qzrlqr60";
- })
- ];
-
# don't install sample config files into the absolute sysconfdir folder
postPatch = ''
substituteInPlace Makefile.in --replace ' etc ' ' '
'';
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre
];
+ patches = [ ./fd-leak.patch ];
+
configureFlags = [
"--sysconfdir=/etc/clamav"
- "--with-zlib=${zlib.dev}"
- "--disable-zlib-vcheck" # it fails to recognize that 1.2.10 >= 1.2.2
"--disable-llvm" # enabling breaks the build at the moment
- "--with-libbz2-prefix=${bzip2.dev}"
- "--with-iconv-dir=${libiconv}"
+ "--with-zlib=${zlib.dev}"
"--with-xml=${libxml2.dev}"
"--with-openssl=${openssl.dev}"
- "--with-libncurses-prefix=${ncurses.dev}"
"--with-libcurl=${curl.dev}"
- "--with-pcre=${pcre.dev}"
"--enable-milter"
];
@@ -51,7 +42,7 @@ stdenv.mkDerivation rec {
homepage = http://www.clamav.net;
description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats";
license = licenses.gpl2;
- maintainers = with maintainers; [ phreedom robberer qknight ];
+ maintainers = with maintainers; [ phreedom robberer qknight fpletz ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/security/clamav/fd-leak.patch b/pkgs/tools/security/clamav/fd-leak.patch
new file mode 100644
index 00000000000..2c147901e44
--- /dev/null
+++ b/pkgs/tools/security/clamav/fd-leak.patch
@@ -0,0 +1,49 @@
+--- a/libclamav/scanners.c 2018-01-26 16:59:00.820231425 +0100
++++ b/libclamav/scanners.c 2018-01-26 17:39:07.523633805 +0100
+@@ -1366,12 +1366,14 @@
+
+ if ((ret = cli_ac_initdata(&tmdata, troot?troot->ac_partsigs:0, troot?troot->ac_lsigs:0, troot?troot->ac_reloff_num:0, CLI_DEFAULT_AC_TRACKLEN))) {
+ free(tmpname);
++ free(normalized);
+ return ret;
+ }
+
+ if ((ret = cli_ac_initdata(&gmdata, groot->ac_partsigs, groot->ac_lsigs, groot->ac_reloff_num, CLI_DEFAULT_AC_TRACKLEN))) {
+ cli_ac_freedata(&tmdata);
+ free(tmpname);
++ free(normalized);
+ return ret;
+ }
+
+@@ -1390,6 +1392,7 @@
+ cli_errmsg("cli_scanscript: can't write to file %s\n",tmpname);
+ close(ofd);
+ free(tmpname);
++ free(normalized);
+ return CL_EWRITE;
+ }
+ text_normalize_reset(&state);
+@@ -1424,6 +1427,8 @@
+ if (ret) {
+ cli_ac_freedata(&tmdata);
+ free(tmpname);
++ free(normalized);
++ close(ofd);
+ return ret;
+ }
+ }
+@@ -1466,11 +1471,9 @@
+
+ }
+
+- if(ctx->engine->keeptmp) {
+- free(tmpname);
+- if (ofd >= 0)
+- close(ofd);
+- }
++ if (ofd >= 0)
++ close(ofd);
++ free(tmpname);
+ free(normalized);
+
+ if(ret != CL_VIRUS || SCAN_ALL) {
diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index ca9cdcc8d6c..a8de8742dd5 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, python, pythonPackages, gamin }:
-let version = "0.10.1"; in
+let version = "0.10.2"; in
pythonPackages.buildPythonApplication {
name = "fail2ban-${version}";
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication {
owner = "fail2ban";
repo = "fail2ban";
rev = version;
- sha256 = "05ngnjxrwvfdd233s5n2wd8w4ndkpgrgymlfzn6i2fjlwf4hdikj";
+ sha256 = "1asn9gp0ybz6fak991vki9vln4ijramvr13rbwpxyj5wfmnh05r5";
};
propagatedBuildInputs = [ gamin ]
diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix
index 6acaacd1467..fa4555dcafb 100644
--- a/pkgs/tools/security/gnupg/1.nix
+++ b/pkgs/tools/security/gnupg/1.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, readline, bzip2 }:
stdenv.mkDerivation rec {
- name = "gnupg-1.4.21";
+ name = "gnupg-1.4.22";
src = fetchurl {
url = "mirror://gnupg/gnupg/${name}.tar.bz2";
- sha256 = "0xi2mshq8f6zbarb5f61c9w2qzwrdbjm4q8fqsrwlzc51h8a6ivb";
+ sha256 = "1d1hz4szh1kvwhsw7w2zxa6q5ndrk3qy6hj289l1b8k3xi5s554m";
};
buildInputs = [ readline bzip2 ];
diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix
index 9fa6307ebde..39770433ff3 100644
--- a/pkgs/tools/security/spectre-meltdown-checker/default.nix
+++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "spectre-meltdown-checker-${version}";
- version = "0.32";
+ version = "0.33";
src = fetchFromGitHub {
owner = "speed47";
repo = "spectre-meltdown-checker";
rev = "v${version}";
- sha256 = "1qd3cwmg3p309czmghczlacygiyngp2wcwdghacg0y4l9vrndg8c";
+ sha256 = "0a0vbzjfmvcvak804y2s0301f9bcnr0nwg2piafx6i6ibisp917y";
};
prePatch = ''
diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 1238a920760..5192f57582c 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -5,14 +5,14 @@
}:
stdenv.mkDerivation rec {
- name = "sudo-1.8.21p2";
+ name = "sudo-1.8.22";
src = fetchurl {
urls =
[ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
"ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
];
- sha256 = "0s33szq6q59v5s377l4v6ybsdy7pfq6sz7y364j4x09ssdn79ibl";
+ sha256 = "00pxp74xkwdcmrjwy55j0k8p684jk1zx3nzdc11v30q8q8kwnmkj";
};
prePatch = ''
diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix
index ee1b9d84470..166f20dd7d6 100644
--- a/pkgs/tools/security/yara/default.nix
+++ b/pkgs/tools/security/yara/default.nix
@@ -5,14 +5,14 @@
}:
stdenv.mkDerivation rec {
- version = "3.7.0";
+ version = "3.7.1";
name = "yara-${version}";
src = fetchFromGitHub {
owner = "VirusTotal";
repo = "yara";
rev = "v${version}";
- sha256 = "1giq5677j0vh5vw0nsv5qcqddcif6jckqaxyqg13j0j54n1p6xyj";
+ sha256 = "05smkn4ii8irx6ccnzrhwa39pkmrjyxjmfrwh6mhdd8iz51v5cgz";
};
# FIXME: this is probably not the right way to make it work
diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix
index fb1806b850e..dca6d37d9af 100644
--- a/pkgs/tools/system/augeas/default.nix
+++ b/pkgs/tools/system/augeas/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "augeas-${version}";
- version = "1.8.1";
+ version = "1.10.0";
src = fetchurl {
url = "http://download.augeas.net/${name}.tar.gz";
- sha256 = "1yf93fqwav1zsl8dpyfkf0g11w05mmfckqy6qsjy5zkklnspbkv5";
+ sha256 = "04q2hr3xj71rdbjdj3jiygi8dbiq1x4szlyavxj1xjiw9jcgd41a";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ readline libxml2 ];
diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix
index b63d60633c3..c4347da4460 100644
--- a/pkgs/tools/system/sleuthkit/default.nix
+++ b/pkgs/tools/system/sleuthkit/default.nix
@@ -1,16 +1,23 @@
-{ stdenv, fetchurl, libewf, afflib, openssl, zlib }:
+{ stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }:
stdenv.mkDerivation rec {
- version = "4.2.0";
+ version = "4.5.0";
name = "sleuthkit-${version}";
- src = fetchurl {
- url = "mirror://sourceforge/sleuthkit/${name}.tar.gz";
- sha256 = "08s7c1jwn2rjq2jm8859ywaiq12adrl02m61hc04iblqjzqqgcli";
+ src = fetchFromGitHub {
+ owner = "sleuthkit";
+ repo = "sleuthkit";
+ rev = name;
+ sha256 = "0h9l9yl5ibbgriq12gizg8k0r6jw6bnii3iljjp4p963wc0ms9b9";
};
+ postPatch = ''
+ substituteInPlace tsk/img/ewf.c --replace libewf_handle_read_random libewf_handle_read_buffer_at_offset
+ '';
+
enableParallelBuilding = true;
+ nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ libewf afflib openssl zlib ];
# Hack to fix the RPATH.
@@ -18,6 +25,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A forensic/data recovery tool";
+ homepage = https://www.sleuthkit.org/;
maintainers = [ stdenv.lib.maintainers.raskin ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.ipl10;
diff --git a/pkgs/tools/system/sleuthkit/default.upstream b/pkgs/tools/system/sleuthkit/default.upstream
deleted file mode 100644
index f8ffe9352ed..00000000000
--- a/pkgs/tools/system/sleuthkit/default.upstream
+++ /dev/null
@@ -1,5 +0,0 @@
-url http://sourceforge.net/projects/sleuthkit/files/sleuthkit/
-SF_version_dir
-SF_version_tarball
-SF_redirect
-minimize_overwrite
diff --git a/pkgs/tools/text/hyx/default.nix b/pkgs/tools/text/hyx/default.nix
new file mode 100644
index 00000000000..1ba3534e3f8
--- /dev/null
+++ b/pkgs/tools/text/hyx/default.nix
@@ -0,0 +1,22 @@
+{ lib, stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name = "hyx-0.1.4";
+
+ src = fetchurl {
+ url = "https://yx7.cc/code/hyx/${name}.tar.xz";
+ sha256 = "049r610hyrrfa62vpiqyb3rh99bpy8cnqy4nd4sih01733cmdhyx";
+ };
+
+ installPhase = ''
+ install -vD hyx $out/bin/hyx
+ '';
+
+ meta = with lib; {
+ description = "minimalistic but powerful Linux console hex editor";
+ homepage = https://yx7.cc/code/;
+ license = licenses.mit;
+ maintainers = with maintainers; [ fpletz ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f17400b408..94f189bf4f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1205,6 +1205,8 @@ with pkgs;
hr = callPackage ../applications/misc/hr { };
+ hyx = callPackage ../tools/text/hyx { };
+
icdiff = callPackage ../tools/text/icdiff {};
interlock = callPackage ../servers/interlock {};
@@ -2105,7 +2107,7 @@ with pkgs;
cloudpinyin = callPackage ../tools/inputmethods/fcitx-engines/fcitx-cloudpinyin { };
- libpinyin = callPackage ../tools/inputmethods/fcitx-engines/fcitx-libpinyin { };
+ libpinyin = libsForQt5.callPackage ../tools/inputmethods/fcitx-engines/fcitx-libpinyin { };
skk = callPackage ../tools/inputmethods/fcitx-engines/fcitx-skk { };
};
@@ -3206,7 +3208,9 @@ with pkgs;
npm2nix = nodePackages.npm2nix;
- kea = callPackage ../tools/networking/kea { };
+ kea = callPackage ../tools/networking/kea {
+ boost = boost165;
+ };
kindlegen = callPackage ../tools/typesetting/kindlegen { };
@@ -4327,6 +4331,8 @@ with pkgs;
rc = callPackage ../shells/rc { };
+ rdma-core = callPackage ../os-specific/linux/rdma-core { };
+
read-edid = callPackage ../os-specific/linux/read-edid { };
redir = callPackage ../tools/networking/redir { };
@@ -5363,10 +5369,8 @@ with pkgs;
# Ben Nanonote system
crossSystem = {
config = crossPrefix;
- bigEndian = true;
arch = "mips";
float = "soft";
- withTLS = true;
libc = "uclibc";
platform = {
name = "ben_nanonote";
@@ -7963,7 +7967,9 @@ with pkgs;
tweak = callPackage ../applications/editors/tweak { };
- uhd = callPackage ../development/tools/misc/uhd { };
+ uhd = callPackage ../development/tools/misc/uhd {
+ boost = boost165;
+ };
uisp = callPackage ../development/tools/misc/uisp { };
@@ -8040,9 +8046,7 @@ with pkgs;
grabserial = callPackage ../development/tools/grabserial { };
- mypy = callPackage ../development/tools/mypy {
- inherit (python3Packages) fetchPypi buildPythonApplication lxml typed-ast;
- };
+ mypy = python3Packages.callPackage ../development/tools/mypy { };
### DEVELOPMENT / LIBRARIES
@@ -9901,6 +9905,8 @@ with pkgs;
libstartup_notification = callPackage ../development/libraries/startup-notification { };
+ libstemmer = callPackage ../development/libraries/libstemmer { };
+
libstroke = callPackage ../development/libraries/libstroke { };
libstrophe = callPackage ../development/libraries/libstrophe { };
@@ -12255,6 +12261,7 @@ with pkgs;
prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { };
prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { };
prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { };
+ prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { };
prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { };
prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };
prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { };
@@ -12264,6 +12271,7 @@ with pkgs;
prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { };
prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { };
prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { };
+ prometheus-postfix-exporter = callPackage ../servers/monitoring/prometheus/postfix-exporter.nix { };
prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { };
prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { };
prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { };
@@ -12333,9 +12341,10 @@ with pkgs;
samba4 = callPackage ../servers/samba/4.x.nix {
python = python2;
- # enableLDAP
};
+ sambaMaster = callPackage ../servers/samba/master.nix { };
+
samba = samba4;
smbclient = samba;
@@ -13205,8 +13214,8 @@ with pkgs;
mbpfan = callPackage ../os-specific/linux/mbpfan { };
- mdadm = callPackage ../os-specific/linux/mdadm { };
- mdadm4 = callPackage ../os-specific/linux/mdadm/4.nix { };
+ mdadm = mdadm4;
+ mdadm4 = callPackage ../os-specific/linux/mdadm { };
mingetty = callPackage ../os-specific/linux/mingetty { };
@@ -14028,6 +14037,11 @@ with pkgs;
ttf-envy-code-r = callPackage ../data/fonts/ttf-envy-code-r {};
+ twemoji-color-font = callPackage ../data/fonts/twemoji-color-font {
+ inherit (nodePackages) svgo;
+ inherit (pythonPackages) scfbuild;
+ };
+
tzdata = callPackage ../data/misc/tzdata { };
ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { };
@@ -15081,6 +15095,8 @@ with pkgs;
gopherclient = libsForQt5.callPackage ../applications/networking/gopher/gopherclient { };
+ goxel = callPackage ../applications/graphics/goxel { };
+
gpa = callPackage ../applications/misc/gpa { };
gpicview = callPackage ../applications/graphics/gpicview {
@@ -15220,6 +15236,8 @@ with pkgs;
flac = callPackage ../applications/audio/flac { };
+ flameshot = libsForQt5.callPackage ../tools/misc/flameshot { };
+
flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer {
debug = config.flashplayer.debug or false;
};
@@ -15527,6 +15545,7 @@ with pkgs;
hipchat = callPackage ../applications/networking/instant-messengers/hipchat { };
hledger = haskell.lib.justStaticExecutables haskellPackages.hledger;
+ hledger-ui = haskell.lib.justStaticExecutables haskellPackages.hledger-ui;
hledger-web = haskell.lib.justStaticExecutables haskellPackages.hledger-web;
homebank = callPackage ../applications/office/homebank {
@@ -16044,6 +16063,8 @@ with pkgs;
meld = callPackage ../applications/version-management/meld { };
+ meme = callPackage ../applications/graphics/meme { };
+
mcomix = callPackage ../applications/graphics/mcomix { };
mendeley = libsForQt5.callPackage ../applications/office/mendeley {
@@ -16111,7 +16132,9 @@ with pkgs;
mod-distortion = callPackage ../applications/audio/mod-distortion { };
- monero = callPackage ../applications/misc/monero { };
+ monero = callPackage ../applications/altcoins/monero { };
+
+ monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { };
xmr-stak = callPackage ../applications/misc/xmr-stak {
hwloc = hwloc-nox;
@@ -18716,6 +18739,9 @@ with pkgs;
vdrift = callPackage ../games/vdrift { };
+ # To ensure vdrift's code is built on hydra
+ vdrift-bin = vdrift.bin;
+
vectoroids = callPackage ../games/vectoroids { };
vessel = callPackage_i686 ../games/vessel { };
@@ -18959,6 +18985,8 @@ with pkgs;
kallisto = callPackage ../applications/science/biology/kallisto { };
+ muscle = callPackage ../applications/science/biology/muscle/default.nix { };
+
neuron = callPackage ../applications/science/biology/neuron {
python = null;
};
@@ -18989,6 +19017,8 @@ with pkgs;
snpeff = callPackage ../applications/science/biology/snpeff/default.nix { };
+ star = callPackage ../applications/science/biology/star { };
+
varscan = callPackage ../applications/science/biology/varscan/default.nix { };
bwa = callPackage ../applications/science/biology/bwa/default.nix { };