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

Merge master into staging-next

This commit is contained in:
Frederik Rietdijk 2019-09-08 20:45:29 +02:00
parent 5f4734b1dd 1a1a7ed266
commit 47caef475f
17 changed files with 1048 additions and 1027 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -4782,6 +4782,12 @@
githubId = 11016164;
name = "Fedor Pakhomov";
};
pamplemousse = {
email = "xav.maso@gmail.com";
github = "Pamplemousse";
githubId = 2647236;
name = "Xavier Maso";
};
panaeon = {
email = "vitalii.voloshyn@gmail.com";
github = "panaeon";

2
nixos/lib/utils.nix
View File

@ -1,6 +1,6 @@
pkgs: with pkgs.lib;
{
rec {
# Check whenever fileSystem is needed for boot
fsNeededForBoot = fs: fs.neededForBoot

52
pkgs/applications/blockchains/wasabiwallet/default.nix
View File

@ -2,37 +2,37 @@
stdenv.mkDerivation rec {
pname = "wasabiwallet";
version = "1.1.5";
version = "1.1.6";
src = fetchurl {
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz";
sha256 = "1iq7qkpq073yq1bz8pam4cbm2myznhpjr3g9afblvmxwgbdjxak0";
};
src = fetchurl {
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz";
sha256 = "1i7fhaj9chjlm7qg0h3azy4djnm9rxskbr3dzjj0n9rw8cjdqyq6";
};
dontBuild = true;
dontPatchELF = true;
dontBuild = true;
dontPatchELF = true;
desktopItem = makeDesktopItem {
name = "wasabi";
exec = "wasabiwallet";
desktopName = "Wasabi";
genericName = "Bitcoin wallet";
comment = meta.description;
categories = "Application;Network;Utility;";
};
desktopItem = makeDesktopItem {
name = "wasabi";
exec = "wasabiwallet";
desktopName = "Wasabi";
genericName = "Bitcoin wallet";
comment = meta.description;
categories = "Application;Network;Utility;";
};
installPhase = ''
mkdir -p $out/opt/${pname} $out/bin $out/share/applications
cp -Rv . $out/opt/${pname}
cd $out/opt/${pname}
for i in $(find . -type f -name '*.so') wassabee
do
patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc.lib xorg.libX11 curl fontconfig.lib krb5 zlib dotnet-sdk ]} $i
done
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee
ln -s $out/opt/${pname}/wassabee $out/bin/${pname}
cp -v $desktopItem/share/applications/* $out/share/applications
'';
mkdir -p $out/opt/${pname} $out/bin $out/share/applications
cp -Rv . $out/opt/${pname}
cd $out/opt/${pname}
for i in $(find . -type f -name '*.so') wassabee
do
patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc.lib xorg.libX11 curl fontconfig.lib krb5 zlib dotnet-sdk ]} $i
done
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee
ln -s $out/opt/${pname}/wassabee $out/bin/${pname}
cp -v $desktopItem/share/applications/* $out/share/applications
'';
meta = with stdenv.lib; {
description = "Privacy focused Bitcoin wallet";

2
pkgs/applications/kde/fetch.sh
View File

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/applications/19.08.0/ )
WGET_ARGS=( https://download.kde.org/stable/applications/19.08.1/ )

1736
pkgs/applications/kde/srcs.nix
View File

File diff suppressed because it is too large Load Diff

12
pkgs/data/fonts/source-serif-pro/default.nix
View File

@ -1,20 +1,20 @@
{ lib, fetchzip }:
let
version = "2.010";
version = "3.000";
in fetchzip {
name = "source-serif-pro-${version}";
url = "https://github.com/adobe-fonts/source-serif-pro/releases/download/${version}R-ro%2F1.010R-it/source-serif-pro-${version}R-ro-1.010R-it.zip";
url = "https://github.com/adobe-fonts/source-serif-pro/releases/download/${version}R/source-serif-pro-${version}R.zip";
postFetch = ''
mkdir -p $out/share/fonts/{opentype,truetype,variable}
unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype
unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype
unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable
unzip -j $downloadedFile "OTF/*.otf" -d $out/share/fonts/opentype
unzip -j $downloadedFile "TTF/*.ttf" -d $out/share/fonts/truetype
unzip -j $downloadedFile "VAR/*.otf" -d $out/share/fonts/variable
'';
sha256 = "1a3lmqk7hyxpfkb30s9z73lhs823dmq6xr5llp9w23g6bh332x2h";
sha256 = "06yp8y79mqk02qzp81h8zkmzqqlhicgrkwmzkd0bm338xh8grsiz";
meta = with lib; {
homepage = https://adobe-fonts.github.io/source-serif-pro/;

5
pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-system-monitor";
version = "36";
version = "38";
src = fetchFromGitHub {
owner = "paradoxxxzero";
repo = "gnome-shell-system-monitor-applet";
rev = "v${version}";
sha256 = "0x3r189h5264kjxsm18d34gzb5ih8l4pz7i9qks9slcnzaiw4y0z";
sha256 = "1sdj2kxb418mgq44a6lf6jic33wlfbnn3ja61igmx0jj1530iknv";
};
buildInputs = [
@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Display system informations in gnome shell status bar";
license = licenses.gpl3Plus;
broken = true; # GNOME 3.32 support WIP: https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/510
maintainers = with maintainers; [ aneeshusa tiramiseb ];
homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet;
};

67
pkgs/development/libraries/freeimage/default.nix
View File

@ -1,65 +1,46 @@
{ stdenv, fetchurl, unzip, darwin }:
{ lib, stdenv, fetchurl, unzip, darwin }:
stdenv.mkDerivation {
name = "freeimage-3.17.0";
name = "freeimage-3.18.0";
src = fetchurl {
url = mirror://sourceforge/freeimage/FreeImage3170.zip;
sha256 = "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v";
url = mirror://sourceforge/freeimage/FreeImage3180.zip;
sha256 = "1z9qwi9mlq69d5jipr3v2jika2g0kszqdzilggm99nls5xl7j4zl";
};
patches = let
patchURL = https://anonscm.debian.org/cgit/debian-science/packages/freeimage.git/plain/debian/patches;
in [
(fetchurl {
url = patchURL + "/Fix-CVE-2015-0852.patch";
sha256 = "1vxdck4i5qi5j6i3cjja0gfy79mmbf0lq2qdrnqdsl4kclbvw2c8";
})
(fetchurl {
url = patchURL + "/Fix-CVE-2016-5684.patch";
sha256 = "14ffgqbnwg28r6sjvm3z89zbnnm9ghbc81hdhrzxlyk3vwvd6cw3";
})
(fetchurl {
url = https://raw.githubusercontent.com/buildroot/buildroot/2018.05/package/libfreeimage/0005-Manage-powf64-with-glibc.patch;
sha256 = "1lis479ad5cfkhqm044nk4x97wfwm3hry3bvij1w5xkndnlfppc2";
})
];
patches = lib.optional stdenv.isDarwin ./dylib.patch;
buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools;
buildInputs = [ unzip ] ++ lib.optional stdenv.isDarwin darwin.cctools;
prePatch = if stdenv.isDarwin
then ''
sed -e 's/gcc-4.0/clang/g' \
-e 's/g++-4.0/clang++/g' \
-e 's/COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS/COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__/' \
prePatch = if stdenv.isDarwin then ''
sed -e 's/$(shell xcrun -find clang)/clang/g' \
-e 's/$(shell xcrun -find clang++)/clang++/g' \
-e "s|PREFIX = /usr/local|PREFIX = $out|" \
-e 's|-Wl,-syslibroot /Developer/SDKs/MacOSX10.5.sdk||g' \
-e 's|-Wl,-syslibroot /Developer/SDKs/MacOSX10.6.sdk||g' \
-e 's|-isysroot /Developer/SDKs/MacOSX10.6.sdk||g' \
-e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||g' \
-e 's| $(STATICLIB)-ppc $(STATICLIB)-i386||g' \
-e 's| $(SHAREDLIB)-ppc $(SHAREDLIB)-i386||g' \
-e 's|-Wl,-syslibroot $(MACOSX_SYSROOT)||g' \
-e 's|-isysroot $(MACOSX_SYSROOT)||g' \
-e 's| install -d -m 755 -o root -g wheel $(INCDIR) $(INSTALLDIR)||' \
-e 's| -m 644 -o root -g wheel||g' \
-i ./Makefile.osx
# Fix LibJXR performance timers
sed 's|^SRCS = \(.*\)$|SRCS = \1 Source/LibJXR/image/sys/perfTimerANSI.c|' -i ./Makefile.srcs
''
else ''
'' else ''
sed -e s@/usr/@$out/@ \
-e 's@-o root -g root@@' \
-e 's@ldconfig@echo not running ldconfig@' \
-i Makefile.gnu Makefile.fip
# Fix gcc 5.1 macro problems
# https://chromium.googlesource.com/webm/libwebp/+/eebaf97f5a1cb713d81d311308d8a48c124e5aef%5E!/
sed -i -e 's/"\(#[^"]*\)"/" \1 "/g' Source/LibWebP/src/dsp/*
'';
postBuild = stdenv.lib.optionalString (!stdenv.isDarwin) "make -f Makefile.fip";
preInstall = "mkdir -p $out/include $out/lib";
postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) "make -f Makefile.fip install";
postBuild = lib.optionalString (!stdenv.isDarwin) ''
make -f Makefile.fip
'';
NIX_CFLAGS_COMPILE = "-Wno-narrowing";
preInstall = ''
mkdir -p $out/include $out/lib
'';
postInstall = lib.optionalString (!stdenv.isDarwin) ''
make -f Makefile.fip install
'';
enableParallelBuilding = true;
@ -67,7 +48,7 @@ stdenv.mkDerivation {
description = "Open Source library for accessing popular graphics image file formats";
homepage = http://freeimage.sourceforge.net/;
license = "GPL";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; unix;
maintainers = with lib.maintainers; [viric];
platforms = with lib.platforms; unix;
};
}

16
pkgs/development/libraries/freeimage/dylib.patch Normal file
View File

@ -0,0 +1,16 @@
--- a/Makefile.osx
+++ b/Makefile.osx
@@ -60,1 +60,1 @@
-FreeImage: $(STATICLIB)
+FreeImage: $(STATICLIB) $(SHAREDLIB)
@@ -87,7 +87,7 @@
-$(SHAREDLIB): $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64
- $(LIPO) -create $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -output $(SHAREDLIB)
+#$(SHAREDLIB): $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64
+# $(LIPO) -create $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -output $(SHAREDLIB)
$(SHAREDLIB)-i386: $(MODULES_I386)
$(CPP_I386) -arch i386 -dynamiclib $(LIBRARIES_I386) -o $@ $(MODULES_I386)
-$(SHAREDLIB)-x86_64: $(MODULES_X86_64)
+$(SHAREDLIB): $(MODULES_X86_64)

38
pkgs/development/misc/rappel/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ fetchFromGitHub
, libedit
, makeWrapper
, nasm
, stdenv
}:
stdenv.mkDerivation rec {
pname = "rappel";
version = "unstable-2019-07-08";
src = fetchFromGitHub {
owner = "yrp604";
repo = "rappel";
rev = "95a776f850cf6a7c21923a2100b605408ef038de";
sha256 = "0fmd15xa6hswh3x48av4g1sf6rncbiinbj7gbw1ffvqsbcfnsgcr";
};
buildInputs = [ libedit ];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
install -Dm755 -t $out/bin bin/rappel
wrapProgram $out/bin/rappel --prefix PATH : "${nasm}/bin"
runHook postInstall
'';
meta = with stdenv.lib; {
homepage = "https://github.com/yrp604/rappel";
description = "A pretty janky assembly REPL";
license = licenses.bsdOriginal;
maintainers = [ maintainers.pamplemousse ];
platforms = platforms.linux;
};
}

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

@ -3,7 +3,7 @@
buildPythonPackage rec {
pname = "XlsxWriter";
version = "1.1.8";
version = "1.2.0";
# PyPI release tarball doesn't contain tests so let's use GitHub. See:
# https://github.com/jmcnamara/XlsxWriter/issues/327
@ -11,7 +11,7 @@ buildPythonPackage rec {
owner = "jmcnamara";
repo = pname;
rev = "RELEASE_${version}";
sha256 = "19qhdcycaiamd3bp8v2z9rpirxsr4c29fgs219k2766fpmfrgx40";
sha256 = "0w9ggzi887w4z6i5mz24kcy7qbkd4d7gycqi0dhqgaj9lzxh7jjh";
};
meta = {

24
pkgs/development/python-modules/can/default.nix
View File

@ -1,7 +1,9 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchPypi
, pythonOlder
, isPy27
, aenum
, wrapt
, typing
, pyserial
@ -14,21 +16,21 @@
buildPythonPackage rec {
pname = "python-can";
version = "3.1.0";
version = "3.3.1";
# PyPI tarball is missing some tests and is missing __init__.py in test
# directory causing the tests to fail. See:
# https://github.com/hardbyte/python-can/issues/518
src = fetchFromGitHub {
repo = pname;
owner = "hardbyte";
rev = "v${version}";
sha256 = "01lfsh7drm4qvv909x9i0vnhskdh27mcb5xa86sv9m3zfpq8cjis";
src = fetchPypi {
inherit pname version;
sha256 = "1giv9s6w90lalxsijgnxzynygkckcfyaxnxsldbwv0784vwy1jcd";
};
propagatedBuildInputs = [ wrapt pyserial ] ++ lib.optional (pythonOlder "3.5") typing;
propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing;
checkInputs = [ nose mock pytest pytest-timeout hypothesis future ];
# Tests won't work with hypothesis 4.7.3 under Python 2. So skip the tests in
# that case. This clause can be removed once hypothesis has been upgraded in
# nixpkgs.
doCheck = !(isPy27 && (hypothesis.version == "4.7.3"));
# Add the scripts to PATH
checkPhase = ''
PATH=$out/bin:$PATH pytest -c /dev/null

23
pkgs/development/python-modules/pvlib/default.nix
View File

@ -1,27 +1,26 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, pandas, pytz, six
, pytest, mock, pytest-mock }:
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, numpy, pandas, pytz, six
, pytest, mock, pytest-mock, requests }:
buildPythonPackage rec {
pname = "pvlib";
version = "0.6.1";
version = "0.6.3";
# Use GitHub because PyPI release tarball doesn't contain the tests. See:
# https://github.com/pvlib/pvlib-python/issues/473
src = fetchFromGitHub{
owner = "pvlib";
repo = "pvlib-python";
rev = "v${version}";
sha256 = "17h7vz9s829qxnl4byr8458gzgiismrbrn5gl0klhfhwvc5kkdfh";
# Support for Python <3.5 dropped in 0.6.3 on June 1, 2019.
disabled = pythonOlder "3.5";
src = fetchPypi{
inherit pname version;
sha256 = "03nvgpmnscd7rh9jwm2h579zvriq5lva6rsdhb6jckpra5wjkn69";
};
checkInputs = [ pytest mock pytest-mock ];
propagatedBuildInputs = [ numpy pandas pytz six ];
propagatedBuildInputs = [ numpy pandas pytz six requests ];
# Skip a few tests that try to access some URLs
checkPhase = ''
runHook preCheck
pushd pvlib/test
pytest . -k "not test_read_srml_dt_index and not test_read_srml_month_from_solardata"
pytest . -k "not test_read_srml_dt_index and not test_read_srml_month_from_solardata and not test_get_psm3"
popd
runHook postCheck
'';

83
pkgs/misc/drivers/epkowa/default.nix
View File

@ -27,29 +27,22 @@ in
let plugins = {
v330 = stdenv.mkDerivation rec {
name = "iscan-v330-bundle";
version = "1.0.1";
pluginVersion = "0.2.0";
version = "2.30.4";
src = fetchurl {
url = "https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz";
sha256 = "f6fa455f04cdfbc3d38526573260746e9546830de93ba182d0365f557d2f7df9";
sha256 = "16iq5gmfcgkvcx5hixggxgb8lwin5gjdhnq0zabgpfqg11n2w21q";
};
buildInputs = [ patchelf rpm ];
nativeBuildInputs = [ autoPatchelfHook rpm ];
installPhase = ''
${rpm}/bin/rpm2cpio "plugins/esci-interpreter-perfection-v330-${pluginVersion}-1.x86_64.rpm" | ${cpio}/bin/cpio -idmv
${rpm}/bin/rpm2cpio plugins/esci-interpreter-perfection-v330-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
mkdir $out{,/share,/lib}
cp -r ./usr/share/{iscan-data,esci}/ $out/share/
cp -r ./usr/lib64/esci $out/lib
'';
preFixup = ''
lib=$out/lib/esci/libesci-interpreter-perfection-v330.so
rpath=${gcc.cc.lib}/lib/
patchelf --set-rpath $rpath $lib
'';
passthru = {
registrationCommand = ''
$registry --add interpreter usb 0x04b8 0x0142 "$plugin/lib/esci/libesci-interpreter-perfection-v330 $plugin/share/esci/esfwad.bin"
@ -60,28 +53,22 @@ let plugins = {
};
x770 = stdenv.mkDerivation rec {
pname = "iscan-gt-x770-bundle";
version = "1.0.1";
pluginVersion = "2.1.2-1";
version = "2.30.4";
nativeBuildInputs = [ patchelf rpm ];
nativeBuildInputs = [ autoPatchelfHook rpm ];
src = fetchurl {
url = "https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz";
sha256 = "0m9c60rszzdvq1pqfzygzzrjycm1giy465lj29108j7hsnfcv56r";
sha256 = "1cz4z3wz216s77z185m665jcgdslil5gn4dsi118nv1fm17z3jik";
};
installPhase = ''
cd plugins
${rpm}/bin/rpm2cpio iscan-plugin-gt-x770-${pluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv
${rpm}/bin/rpm2cpio iscan-plugin-gt-x770-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
mkdir $out
cp -r usr/share $out
cp -r usr/lib64 $out/lib
mv $out/share/iscan $out/share/esci
mv $out/lib/iscan $out/lib/esci
'';
preFixup = ''
lib=$out/lib/esci/libesint7C.so
rpath=${gcc.cc.lib}/lib/
patchelf --set-rpath $rpath $lib
'';
passthru = {
registrationCommand = ''
$registry --add interpreter usb 0x04b8 0x0130 "$plugin/lib/esci/libesint7C $plugin/share/esci/esfw7C.bin"
@ -92,26 +79,22 @@ let plugins = {
};
f720 = stdenv.mkDerivation rec {
pname = "iscan-gt-f720-bundle";
version = "1.0.1";
pluginVersion = "0.1.1-2";
version = "2.30.4";
buildInputs = [ patchelf ];
nativeBuildInputs= [ autoPatchelfHook ];
buildInputs = [ gcc.cc.lib ];
src = fetchurl {
url = "https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz";
sha256 = "0dvikq5ad6wid3lxw1amar8lsbr50g39g6zlmcjxdcsg0wb1qspp";
sha256 = "12rivh00n9mhagy5yjl1m0bv7ypbig6brqkxm0a12xy0mjq7yv8y";
};
installPhase = ''
cd plugins
${rpm}/bin/rpm2cpio esci-interpreter-gt-f720-${pluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv
${rpm}/bin/rpm2cpio esci-interpreter-gt-f720-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
mkdir $out
cp -r usr/share $out
cp -r usr/lib64 $out/lib
'';
preFixup = ''
lib=$out/lib/esci/libesci-interpreter-gt-f720.so
rpath=${gcc.cc.lib}/lib/
patchelf --set-rpath $rpath $lib
'';
passthru = {
registrationCommand = ''
$registry --add interpreter usb 0x04b8 0x0131 "$plugin/lib/esci/libesci-interpreter-gt-f720 $plugin/share/esci/esfw8b.bin"
@ -123,32 +106,24 @@ let plugins = {
};
s80 = stdenv.mkDerivation rec {
pname = "iscan-gt-s80-bundle";
version = "1.0.1";
esciPluginVersion = "0.2.1-1";
esdipPluginVersion = "1.0.0-5";
version = "2.30.4";
buildInputs = [ patchelf ];
nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = [ gcc.cc.lib libtool ];
src = fetchurl {
url = "https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz";
sha256 = "14j11znx5ga2ykpyg6kjg7lbrddyr9pwxrsa82dmdishd1j7zji9";
sha256 = "1ran75zsxcdci00jakngkz6p9lj4q483hjapmf80p68rzhpmdr5y";
};
installPhase = ''
cd plugins
${rpm}/bin/rpm2cpio esci-interpreter-gt-s80-${esciPluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv
${rpm}/bin/rpm2cpio iscan-plugin-esdip-${esdipPluginVersion}.ltdl7.x86_64.rpm | ${cpio}/bin/cpio -idmv
${rpm}/bin/rpm2cpio esci-interpreter-gt-s80-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
${rpm}/bin/rpm2cpio iscan-plugin-esdip-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
mkdir $out
cp -r usr/share $out
cp -r usr/lib64 $out/lib
mkdir $out/share/esci
'';
preFixup = ''
rpath=${gcc.cc.lib}/lib/
patchelf --set-rpath $rpath $out/lib/esci/libesci-interpreter-gt-s80.so
patchelf --set-rpath $rpath $out/lib/esci/libesci-interpreter-gt-s50.so
patchelf --set-rpath $rpath $out/lib/iscan/esdip
patchelf --set-rpath $rpath $out/lib/iscan/libesdtr.so.0
patchelf --set-rpath $rpath $out/lib/iscan/libesdtr2.so.0
'';
passthru = {
registrationCommand = ''
$registry --add interpreter usb 0x04b8 0x0136 "$plugin/lib/esci/libesci-interpreter-gt-s80.so"
@ -163,19 +138,19 @@ let plugins = {
};
network = stdenv.mkDerivation rec {
pname = "iscan-nt-bundle";
version = "1.0.0";
ntPluginVersion = "1.1.1-1";
# for the version, look for the driver of XP-750 in the search page
version = "2.30.4";
buildInputs = [ stdenv.cc.cc.lib ];
nativeBuildInputs = [ autoPatchelfHook ];
src = fetchurl {
url = "https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz";
sha256 = "1k3dmv4ml21k6mafvcvgfymb1acpcdxpvyrbfh2yf07jzmn5if4f";
sha256 = "1l0y4dy88y91jdq66pxrxqmiwsxwy0rd7x4bh0cw08r4iyhjqprz";
};
installPhase = ''
cd plugins
${rpm}/bin/rpm2cpio iscan-network-nt-${ntPluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv
${rpm}/bin/rpm2cpio iscan-network-nt-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
mkdir $out
cp -r usr/share $out
@ -201,11 +176,11 @@ let fwdir = symlinkJoin {
in
let iscan-data = stdenv.mkDerivation rec {
pname = "iscan-data";
version = "1.39.0-1";
version = "1.39.1-2";
src = fetchurl {
url = "http://support.epson.net/linux/src/scanner/iscan/iscan-data_${version}.tar.gz";
sha256 = "0pvm67gqyvzhnv5qyfbaz802l4sbgvaf0zb8wz60k1wcasb99vv1";
sha256 = "04zrvbnxf1k6zinrd13hwnbzscc3qhmwlvx3k2jhjys2lginw7w4";
};
buildInputs = [
@ -217,11 +192,11 @@ let iscan-data = stdenv.mkDerivation rec {
in
stdenv.mkDerivation rec {
pname = "iscan";
version = "2.30.3-1";
version = "2.30.4-2";
src = fetchurl {
url = "http://support.epson.net/linux/src/scanner/iscan/iscan_${version}.tar.gz";
sha256 = "0ryy946h7ddmxh866hfszqfyff1qy4svpsk7w3739v75f4awr9li";
sha256 = "1ma76jj0k3bz0fy06fiyl4di4y77rcryb0mwjmzs5ms2vq9rjysr";
};
nativeBuildInputs = [ pkgconfig ];

1
pkgs/tools/graphics/pgf/default.nix
View File

@ -19,6 +19,7 @@ stdenv.mkDerivation {
patchPhase = ''
sed 1i'#include <inttypes.h>' -i src/PGF.cpp
sed s/__int64/int64_t/g -i src/PGF.cpp
rm include/FreeImage.h include/FreeImagePlus.h
'';
preConfigure = "dos2unix configure.ac; sh autogen.sh";

2
pkgs/tools/text/xml/jing-trang/default.nix
View File

@ -13,6 +13,8 @@ stdenv.mkDerivation {
buildInputs = [ jdk ant saxon ];
CLASSPATH = "lib/saxon.jar";
preBuild = "ant";
installPhase = ''

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

@ -9072,6 +9072,8 @@ in
mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { };
rappel = callPackage ../development/misc/rappel/default.nix { };
pharo-vms = callPackage ../development/pharo/vm { };
pharo = pharo-vms.multi-vm-wrapper;
pharo-cog32 = pharo-vms.cog32;