cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/master' into gcc-7

Browse source
This commit is contained in:
Franz Pletz 2018-01-28 23:17:32 +01:00
commit e2c1c76fd0
No known key found for this signature in database
GPG key ID: 846FDED7792617B4
194 changed files with 1767 additions and 757 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
doc/cross-compilation.xml
View file

@ -253,8 +253,19 @@
or also with <varname>crossSystem</varname>, 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, <literal>lib.systems.examples</literal> has some platforms which are used as arguments for these parameters in practice.
You can use them programmatically, or on the command line like <command>nix-build &lt;nixpkgs&gt; --arg crossSystem '(import &lt;nixpkgs/lib&gt;).systems.examples.fooBarBaz'</command>.
You can use them programmatically, or on the command line: <programlisting>
nix-build &lt;nixpkgs&gt; --arg crossSystem '(import &lt;nixpkgs/lib&gt;).systems.examples.fooBarBaz' -A whatever</programlisting>
</para>
<note>
<para>
Eventually we would like to make these platform examples an unnecessary convenience so that <programlisting>
nix-build &lt;nixpkgs&gt; --arg crossSystem.config '&lt;arch&gt;-&lt;os&gt;-&lt;vendor&gt;-&lt;abi&gt;' -A whatever</programlisting>
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 <link xlink:href="https://github.com/NixOS/nixpkgs/issues/34274">#34274</link> tracks this inconvenience along with its root cause in crufty configuration options.
</para>
</note>
<para>
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 <varname>system</varname>, <varname>config</varname>, and <varname>parsed</varname> is needed to infer the other two.

3
lib/maintainers.nix
View file

@ -610,6 +610,7 @@
schmitthenner = "Fabian Schmitthenner <development@schmitthenner.eu>";
schneefux = "schneefux <schneefux+nixos_pkg@schneefux.xyz>";
schristo = "Scott Christopher <schristopher@konputa.com>";
scode = "Peter Schuller <peter.schuller@infidyne.com>";
scolobb = "Sergiu Ivanov <sivanov@colimite.fr>";
sdll = "Sasha Illarionov <sasha.delly@gmail.com>";
SeanZicari = "Sean Zicari <sean.zicari@gmail.com>";
@ -679,6 +680,7 @@
ThomasMader = "Thomas Mader <thomas.mader@gmail.com>";
thoughtpolice = "Austin Seipp <aseipp@pobox.com>";
thpham = "Thomas Pham <thomas.pham@ithings.ch>";
tilpner = "Till Höppner <till@hoeppner.ws>";
timbertson = "Tim Cuthbertson <tim@gfxmonk.net>";
timokau = "Timo Kaufmann <timokau@zoho.com>";
tiramiseb = "Sébastien Maccagnoni <sebastien@maccagnoni.eu>";
@ -698,6 +700,7 @@
tvorog = "Marsel Zaripov <marszaripov@gmail.com>";
tweber = "Thorsten Weber <tw+nixpkgs@360vier.de>";
twey = "James ‘Twey’ Kay <twey@twey.co.uk>";
unode = "Renato Alves <alves.rjc@gmail.com>";
uralbash = "Svintsov Dmitry <root@uralbash.ru>";
utdemir = "Utku Demir <me@utdemir.com>";
#urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; inactive since 2012

21
lib/systems/examples.nix
View file

@ -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";
};
#

7
lib/systems/inspect.nix
View file

@ -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; }; };

4
lib/systems/parse.nix
View file

@ -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";

3
nixos/modules/config/power-management.nix
View file

@ -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" ];

13
nixos/modules/services/network-filesystems/samba.nix
View file

@ -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;

2
nixos/modules/virtualisation/container-config.nix
View file

@ -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;

2
nixos/tests/statsd.nix
View file

@ -1,4 +1,4 @@
import ./make-test.nix ({ pkgs, lib }:
import ./make-test.nix ({ pkgs, lib, ... }:
with lib;

89
pkgs/applications/altcoins/monero-gui/default.nix Normal file
View file

@ -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 ];
};
}

42
pkgs/applications/altcoins/monero-gui/move-log-file.patch Normal file
View file

@ -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)

14
pkgs/applications/altcoins/monero-gui/move-translations-dir.patch Normal file
View file

@ -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;

78
pkgs/applications/altcoins/monero/build-wallet-rpc.patch Normal file
View file

@ -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)

46
pkgs/applications/altcoins/monero/default.nix Normal file
View file

@ -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 ];
};
}

13
pkgs/applications/audio/distrho/default.nix
View file

@ -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 = ''

4
pkgs/applications/audio/gradio/default.nix
View file

@ -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 = [

1
pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix
View file

@ -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
'';

2
pkgs/applications/audio/magnetophonDSP/CompBus/default.nix
View file

@ -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

1
pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
View file

@ -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
'';

1
pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix
View file

@ -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
'';

1
pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
View file

@ -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
'';

1
pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix
View file

@ -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
'';

4
pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
View file

@ -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
'';

1
pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix
View file

@ -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

1
pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix
View file

@ -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
'';

4
pkgs/applications/audio/mpg123/default.nix
View file

@ -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;

6
pkgs/applications/audio/ncmpc/default.nix
View file

@ -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/;

4
pkgs/applications/audio/opusfile/default.nix
View file

@ -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 ];

4
pkgs/applications/audio/xmp/default.nix
View file

@ -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 ];

4
pkgs/applications/editors/vbindiff/default.nix
View file

@ -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 = {

4
pkgs/applications/graphics/ImageMagick/7.0.nix
View file

@ -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

4
pkgs/applications/graphics/ImageMagick/default.nix
View file

@ -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.

4
pkgs/applications/graphics/darktable/default.nix
View file

@ -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 =

33
pkgs/applications/graphics/goxel/default.nix Normal file
View file

@ -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 ];
};
}

4
pkgs/applications/graphics/graphicsmagick/default.nix
View file

@ -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 = [

6
pkgs/applications/graphics/krita/default.nix
View file

@ -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 ];

24
pkgs/applications/graphics/meme/default.nix Normal file
View file

@ -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;
};
}

6
pkgs/applications/graphics/openscad/default.nix
View file

@ -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 ];
};
}

11
pkgs/applications/misc/gpxsee/default.nix
View file

@ -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;
};
}

4
pkgs/applications/misc/gqrx/default.nix
View file

@ -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 ];

4
pkgs/applications/misc/j4-dmenu-desktop/default.nix
View file

@ -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 = ''

4
pkgs/applications/misc/mdp/default.nix
View file

@ -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)" ];

4
pkgs/applications/misc/mediainfo/default.nix
View file

@ -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 ];

44
pkgs/applications/misc/monero/default.nix
View file

@ -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" ];
};
}

27
pkgs/applications/misc/ranger/default.nix
View file

@ -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 ];
};
}

4
pkgs/applications/misc/styx/default.nix
View file

@ -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";

5
pkgs/applications/networking/browsers/google-chrome/default.nix
View file

@ -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

6
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View file

@ -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

4
pkgs/applications/networking/cluster/mesos/default.nix
View file

@ -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 = [

4
pkgs/applications/networking/irc/irssi/default.nix
View file

@ -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 ];

4
pkgs/applications/networking/mailreaders/mutt/default.nix
View file

@ -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 {

35
pkgs/applications/science/biology/muscle/default.nix Normal file
View file

@ -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;
};
}

21
pkgs/applications/science/biology/muscle/muscle-3.8.31-no-static.patch Normal file
View file

@ -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

34
pkgs/applications/science/biology/star/default.nix Normal file
View file

@ -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 ];
};
}

34
pkgs/applications/science/math/sage/default.nix
View file

@ -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.

51
pkgs/applications/science/math/sage/patchSageShebangs.sh Normal file
View file

@ -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

36
pkgs/applications/science/math/sage/shebangs.patch Normal file
View file

@ -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

13
pkgs/applications/science/math/sage/spkg-python.patch Normal file
View file

@ -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"

12
pkgs/applications/science/math/sage/spkg-python2.patch
View file

@ -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"

12
pkgs/applications/science/math/sage/spkg-python3.patch
View file

@ -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"

15
pkgs/applications/version-management/gitolite/default.nix
View file

@ -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 ];
};
}

8
pkgs/applications/video/mkvtoolnix/default.nix
View file

@ -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];

6
pkgs/applications/video/streamlink/default.nix
View file

@ -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 ];

4
pkgs/applications/virtualization/virt-viewer/default.nix
View file

@ -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 ];

4
pkgs/applications/window-managers/i3/lock.nix
View file

@ -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 ];

1
pkgs/build-support/vm/windows/cygwin-iso/default.nix
View file

@ -21,7 +21,6 @@ let
crossSystem = {
libc = "msvcrt";
platform = {};
openssl.system = "mingw64";
inherit arch;
config = "${arch}-w64-mingw32";
};

4
pkgs/data/documentation/man-pages/default.nix
View file

@ -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" ];

39
pkgs/data/fonts/twemoji-color-font/default.nix Normal file
View file

@ -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;
};
}

4
pkgs/data/misc/wireless-regdb/default.nix
View file

@ -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;

8
pkgs/development/compilers/dmd/default.nix
View file

@ -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

4
pkgs/development/compilers/gcc/7/default.nix
View file

@ -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;

9
pkgs/development/compilers/rust/rustc.nix
View file

@ -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

4
pkgs/development/compilers/sbcl/default.nix
View file

@ -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 = ''

39
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -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/
'';
});
}

4
pkgs/development/libraries/CGAL/default.nix
View file

@ -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;

15
pkgs/development/libraries/geoip/default.nix
View file

@ -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}#' {} \;
'';

11
pkgs/development/libraries/glibc/common.nix
View file

@ -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";

10
pkgs/development/libraries/hwloc/default.nix
View file

@ -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;
};
}

4
pkgs/development/libraries/ldb/default.nix
View file

@ -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" ];

4
pkgs/development/libraries/libargon2/default.nix
View file

@ -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 = ''

4
pkgs/development/libraries/libass/default.nix
View file

@ -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 = [

4
pkgs/development/libraries/libast/default.nix
View file

@ -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";

6
pkgs/development/libraries/libbluray/default.nix
View file

@ -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"
;

4
pkgs/development/libraries/libbsd/default.nix
View file

@ -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

10
pkgs/development/libraries/libcdr/default.nix
View file

@ -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 ];

4
pkgs/development/libraries/libdivecomputer/default.nix
View file

@ -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;

20
pkgs/development/libraries/libewf/04-fix-FTBFS-GCC5.patch
View file

@ -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 <linn@hp.com> for
the first fix (see #777938). This patch closes #777945.
Author: Joao Eriberto Mota Filho <eriberto@debian.org>
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

10
pkgs/development/libraries/libewf/default.nix
View file

@ -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";

7
pkgs/development/libraries/libewf/default.upstream
View file

@ -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"
}

4
pkgs/development/libraries/libite/default.nix
View file

@ -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 ];

4
pkgs/development/libraries/libmikmod/default.nix
View file

@ -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 ]

10
pkgs/development/libraries/libowfat/default.nix
View file

@ -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;
};
}
}

9
pkgs/development/libraries/libpinyin/default.nix
View file

@ -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; {

4
pkgs/development/libraries/libraw/default.nix
View file

@ -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" ];

4
pkgs/development/libraries/librsync/default.nix
View file

@ -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 ];

4
pkgs/development/libraries/libsass/default.nix
View file

@ -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 = ''

4
pkgs/development/libraries/libsodium/default.nix
View file

@ -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" ];

22
pkgs/development/libraries/libstemmer/default.nix Normal file
View file

@ -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;
};
}

2
pkgs/development/libraries/libxc/default.nix
View file

@ -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 ];
};
}

4
pkgs/development/libraries/libxmp/default.nix
View file

@ -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";
};
}

Some files were not shown because too many files have changed in this diff Show more