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

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

Browse Source
This commit is contained in:
Franz Pletz
2019-12-26 14:17:36 +01:00
parent 602bccd1a8 4d2dd15546
commit 77b6c3cd06
4311 changed files with 115681 additions and 107815 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/asymptote/default.nix
+49 -49
View File
@@ -1,74 +1,74 @@
{stdenv, fetchurl, fetchpatch
, freeglut, ghostscriptX, imagemagick, fftw
, boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv
, python, zlib, perl, texLive, texinfo, xz
{ stdenv, fetchFromGitHub, fetchurl
, autoreconfHook, bison, glm, yacc, flex
, freeglut, ghostscriptX, imagemagick, fftw
, boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv
, python3Packages
, zlib, perl
, texLive, texinfo
, darwin
}:
let
s = # Generated upstream information
rec {
baseName="asymptote";
version="2.47";
name="${baseName}-${version}";
hash="0zc24n2vwzxdfmcppqfk3fkqlb4jmvswzi3bz232kxl7dyiyb971";
url="https://freefr.dl.sourceforge.net/project/asymptote/2.47/asymptote-2.47.src.tgz";
sha256="0zc24n2vwzxdfmcppqfk3fkqlb4jmvswzi3bz232kxl7dyiyb971";
};
buildInputs = [
ghostscriptX imagemagick fftw
boehmgc ncurses readline gsl libsigsegv
python zlib perl texLive texinfo xz ]
++ stdenv.lib.optionals stdenv.isLinux
[ freeglut libGLU libGL mesa.osmesa ]
++ stdenv.lib.optionals stdenv.isDarwin
(with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ])
;
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
stdenv.mkDerivation rec {
version = "2.61";
pname = "asymptote";
src = fetchurl {
inherit (s) url sha256;
src = fetchFromGitHub {
owner = "vectorgraphics";
repo = pname;
rev = version;
sha256 = "0nblcxqzaxv1286zl2fjkivgp478l0nf3m0wnk78rd99lscjlw71";
};
patches = [
# Remove when updating from 2.47 to 2.48
# Compatibility with BoehmGC 7.6.8
(fetchpatch {
url = "https://github.com/vectorgraphics/asymptote/commit/38a59370dc5ac720c29e1424614a10f7384b943f.patch";
sha256 = "0c3d11hzxxaqh24kfw9y8zvlid54kk40rx2zajx7jwl12gga05s1";
})
nativeBuildInputs = [
autoreconfHook
bison
flex
yacc
texinfo
];
buildInputs = [
ghostscriptX imagemagick fftw
boehmgc ncurses readline gsl libsigsegv
zlib perl
texLive
] ++ (with python3Packages; [
python
pyqt5
]);
propagatedBuildInputs = [
glm
] ++ stdenv.lib.optionals stdenv.isLinux [
freeglut libGLU libGL mesa.osmesa
] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
OpenGL GLUT Cocoa
]);
preConfigure = ''
export HOME="$PWD"
patchShebangs .
sed -e 's@epswrite@eps2write@g' -i runlabel.in
xz -d < ${texinfo.src} | tar --wildcards -x texinfo-'*'/doc/texinfo.tex
cp texinfo-*/doc/texinfo.tex doc/
rm *.tar.gz
configureFlags="$configureFlags --with-latex=$out/share/texmf/tex/latex --with-context=$out/share/texmf/tex/context/third"
HOME=$TMP
'';
configureFlags = [
"--with-latex=$out/share/texmf/tex/latex"
"--with-context=$out/share/texmf/tex/context/third"
];
NIX_CFLAGS_COMPILE = [ "-I${boehmgc.dev}/include/gc" ];
postInstall = ''
mv -v "$out/share/info/asymptote/"*.info $out/share/info/
mv $out/share/info/asymptote/*.info $out/share/info/
sed -i -e 's|(asymptote/asymptote)|(asymptote)|' $out/share/info/asymptote.info
rmdir $out/share/info/asymptote
rm $out/share/info/dir
rm -f $out/share/info/dir
rm -rfv "$out"/share/texmf
mkdir -pv "$out"/share/emacs/site-lisp/${s.name}
mv -v "$out"/share/asymptote/*.el "$out"/share/emacs/site-lisp/${s.name}
rm -rf $out/share/texmf
install -Dt $out/share/emacs/site-lisp/${pname} $out/share/asymptote/*.el
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
inherit (s) version;
description = "A tool for programming graphics intended to replace Metapost";
license = licenses.gpl3Plus;
maintainers = [ maintainers.raskin maintainers.peti ];
pkgs/tools/graphics/dcraw/default.nix
+9 -2
View File
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "dcraw-9.28.0";
src = fetchurl {
url = "https://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz";
url = "https://www.dechifro.org/dcraw/archive/${name}.tar.gz";
sha256 = "1fdl3xa1fbm71xzc3760rsjkvf0x5jdjrvdzyg2l9ka24vdc7418";
};
@@ -23,10 +23,17 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = http://www.cybercom.net/~dcoffin/dcraw/;
homepage = https://www.dechifro.org/dcraw/;
description = "Decoder for many camera raw picture formats";
license = stdenv.lib.licenses.free;
platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
maintainers = [ ];
knownVulnerabilities = [
"CVE-2018-19655"
"CVE-2018-19565"
"CVE-2018-19566"
"CVE-2018-19567"
"CVE-2018-19568"
];
};
}
pkgs/tools/graphics/dpic/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "dpic";
version = "2019.08.30";
version = "2019.11.30";
src = fetchurl {
url = "https://ece.uwaterloo.ca/~aplevich/dpic/${pname}-${version}.tar.gz";
sha256 = "059m53cppw67hwygm7l03ciaxbnaldx63bqdhx1vzbx3kiwz8iw2";
sha256 = "0rgd31mdbaqbm9rz49872s17n25n5ajxcn61xailz3f0kzr4f3dg";
};
phases = [ "unpackPhase" "buildPhase" "installPhase" ];
pkgs/tools/graphics/enblend-enfuse/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl
, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libGLU_combined, vigra
, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libGLU, libGL, vigra
, help2man, pkgconfig, perl, texlive }:
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0j5x011ilalb47ssah50ag0a4phgh1b0wdgxdbbp1gcyjcjf60w7";
};
buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libGLU_combined vigra ];
buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libGLU libGL vigra ];
nativeBuildInputs = [ help2man perl pkgconfig texlive.combined.scheme-small ];
pkgs/tools/graphics/facedetect/default.nix
+2 -2
View File
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
};
buildInputs = [ python2Packages.python python2Packages.wrapPython ];
pythonPath = [ python2Packages.numpy python2Packages.opencv ];
pythonPath = [ python2Packages.numpy python2Packages.opencv4 ];
phases = [ "unpackPhase" "patchPhase" "installPhase" ];
patchPhase = ''
substituteInPlace facedetect \
--replace /usr/share/opencv "${python2Packages.opencv}/share/OpenCV"
--replace /usr/share/opencv "${python2Packages.opencv4}/share/opencv4"
'';
installPhase = ''
pkgs/tools/graphics/gifsicle/default.nix
+1 -1
View File
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
homepage = https://www.lcdf.org/gifsicle/;
license = stdenv.lib.licenses.gpl2;
platforms = platforms.all;
maintainers = with stdenv.lib.maintainers; [ fuuzetsu zimbatm ];
maintainers = with stdenv.lib.maintainers; [ zimbatm ];
};
}
pkgs/tools/graphics/glee/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchgit, cmake, libGLU_combined, xorg }:
{stdenv, fetchgit, cmake, libGLU, libGL, xorg }:
stdenv.mkDerivation rec {
pname = "glee";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ libGLU_combined xorg.libX11 ];
buildInputs = [ libGLU libGL xorg.libX11 ];
configureScript = ''
cmake
pkgs/tools/graphics/gmic-qt/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
, fetchFromGitLab
, cmake
, pkgconfig
, opencv
, opencv3
, openexr
, graphicsmagick
, fftw
@@ -120,7 +120,7 @@ mkDerivation rec {
libjpeg
libtiff
libpng
opencv
opencv3
openexr
graphicsmagick
curl
pkgs/tools/graphics/gmic/default.nix
+2 -2
View File
@@ -3,7 +3,7 @@
, cmake
, ninja
, pkgconfig
, opencv
, opencv3
, openexr
, graphicsmagick
, fftw
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
libjpeg
libtiff
libpng
opencv
opencv3
openexr
graphicsmagick
];
pkgs/tools/graphics/gnuplot/default.nix
+2 -2
View File
@@ -11,14 +11,14 @@
, fontconfig ? null
, gnused ? null
, coreutils ? null
, withQt ? false, qttools, qtbase, qtsvg
, withQt ? false, mkDerivation, qttools, qtbase, qtsvg
}:
assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null);
let
withX = libX11 != null && !aquaterm && !stdenv.isDarwin;
in
stdenv.mkDerivation rec {
(if withQt then mkDerivation else stdenv.mkDerivation) rec {
name = "gnuplot-5.2.7";
src = fetchurl {
pkgs/tools/graphics/graphviz/base.nix
+5 -5
View File
@@ -7,7 +7,7 @@
assert stdenv.isDarwin -> ApplicationServices != null;
let
inherit (stdenv.lib) optionals optionalString;
inherit (stdenv.lib) optional optionals optionalString;
raw_patch =
# https://gitlab.com/graphviz/graphviz/issues/1367 CVE-2018-10196
fetchpatch {
@@ -17,11 +17,13 @@ let
excludes = ["tests/*"]; # we don't run them and they don't apply
};
# the patch needs a small adaption for older versions
patch = if stdenv.lib.versionAtLeast version "2.37" then raw_patch else
patchToUse = if stdenv.lib.versionAtLeast version "2.37" then raw_patch else
stdenv.mkDerivation {
inherit (raw_patch) name;
buildCommand = "sed s/dot_root/agroot/g ${raw_patch} > $out";
};
# 2.42 has the patch included
patches = optional (stdenv.lib.versionOlder version "2.42") patchToUse;
in
stdenv.mkDerivation {
@@ -52,9 +54,7 @@ stdenv.mkDerivation {
"--with-ltdl-include=${libtool}/include"
] ++ stdenv.lib.optional (xorg == null) [ "--without-x" ];
patches = [
patch
];
inherit patches;
postPatch = ''
for f in $(find . -name Makefile.in); do
pkgs/tools/graphics/graphviz/default.nix
+3 -3
View File
@@ -1,5 +1,5 @@
import ./base.nix rec {
rev = "67cd2e5121379a38e0801cc05cce5033f8a2a609";
version = "2.40.1";
sha256 = "1xjqq3g2n6jgwp5xzyvibgrxawlskkpam69fjjz9ksrrjas2qwzj";
rev = "da4c2ec6f24ca1b6d1752c6b5bc4389e55682147"; # use rev as tags have disappeared before
version = "2.42.2";
sha256 = "0lacl11amyvj04j78m63qifljl4c0nkyy50z4bkg8mg9j4hjdy0x";
}
pkgs/tools/graphics/ifm/default.nix
+25
View File
@@ -0,0 +1,25 @@
{ lib, stdenv, fetchzip, autoreconfHook, bison, flex, help2man, perl, tk }:
stdenv.mkDerivation rec {
pname = "ifm";
version = "2015-11-08";
src = fetchzip {
url = "https://bitbucket.org/zondo/ifm/get/dca0774e4d3a.zip";
sha256 = "14af21qjd5jvsscm6vxpsdrnipdr33g6niagzmykrhyfhwcbjahi";
};
nativeBuildInputs = [ autoreconfHook bison flex help2man ];
buildInputs = [ perl tk ]; # perl and wish are not run but written as shebangs.
enableParallelBuilding = false; # ifm-scan.l:16:10: fatal error: ifm-parse.h: No such file or directory
meta = with lib; {
homepage = https://bitbucket.org/zondo/ifm;
description = "Interactive fiction mapper";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ orivej ];
};
}
pkgs/tools/graphics/jpegexiforient/default.nix
+27
View File
@@ -0,0 +1,27 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
pname = "jpegexiforient";
version = "unstable-2002-02-17";
src = fetchurl {
url = "http://sylvana.net/jpegcrop/jpegexiforient.c";
sha256 = "1v0f42cvs0397g9v46p294ldgxwbp285npg6npgnlnvapk6nzh5s";
};
unpackPhase = ''
cp $src jpegexiforient.c
'';
buildPhase = ''
cc -o jpegexiforient jpegexiforient.c
'';
installPhase = ''
install -Dt $out/bin jpegexiforient
'';
meta = with lib; {
description = "Utility program to get and set the Exif Orientation Tag";
homepage = "http://sylvana.net/jpegcrop/exif_orientation.html";
# Website doesn't mention any license, but I think it's safe to assume this
# to be free since it's from IJG, the current maintainers of libjpeg
license = licenses.free;
platforms = platforms.all;
maintainers = with maintainers; [ infinisil ];
};
}
pkgs/tools/graphics/logstalgia/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL2_image, glew
, libGLU_combined, boost, glm, freetype }:
, libGLU, libGL, boost, glm, freetype }:
stdenv.mkDerivation rec {
pname = "logstalgia";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU_combined boost
buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU libGL boost
glm freetype ];
meta = with stdenv.lib; {
pkgs/tools/graphics/luxcorerender/default.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35
, tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase
, freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core
, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, gtk3, pcre
, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, dconf, gtk3, pcre
, bison, flex, libpthreadstubs, libX11
, embree2, makeWrapper, gsettings-desktop-schemas, glib
, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp
@@ -35,7 +35,7 @@ in stdenv.mkDerivation {
# needed for XDG_ICON_DIRS
gnome3.adwaita-icon-theme
makeWrapper
(stdenv.lib.getLib gnome3.dconf)
(stdenv.lib.getLib dconf)
] ++ stdenv.lib.optionals withOpenCL [opencl-headers ocl-icd opencl-clhpp];
cmakeFlags = [
@@ -66,7 +66,7 @@ in stdenv.mkDerivation {
wrapProgram "$out/bin/luxcoreui" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
--suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' \
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
'';
meta = with stdenv.lib; {
pkgs/tools/graphics/maim/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig
, zlib, libpng, libjpeg, libGLU_combined, glm
, zlib, libpng, libjpeg, libGLU, libGL, glm
, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop, icu
}:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs =
[ zlib libpng libjpeg libGLU_combined glm
[ zlib libpng libjpeg libGLU libGL glm
libX11 libXext libXfixes libXrandr libXcomposite slop icu ];
doCheck = false;
pkgs/tools/graphics/nifskope/default.nix
+6 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, wrapQtAppsHook }:
{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, substituteAll, libGLU, wrapQtAppsHook, fetchpatch }:
stdenv.mkDerivation {
pname = "nifskope";
@@ -18,6 +18,11 @@ stdenv.mkDerivation {
src = ./qttools-bins.patch;
qttools = "${qttools.dev}/bin";
})
(fetchpatch {
name = "qt512-build-fix.patch";
url = "https://github.com/niftools/nifskope/commit/30954e7f01f3d779a2a1fd37d363e8a6ad560bd3.patch";
sha256 = "0d6xjj2mjjhdd7w1aig5f75jksjni16jyj0lxsz51pys6xqb6fpj";
})
];
buildInputs = [ qtbase qttools libGLU.dev ];
pkgs/tools/graphics/pfstools/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, pkgconfig, darwin
, openexr, zlib, imagemagick, libGLU_combined, freeglut, fftwFloat
, openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat
, fftw, gsl, libexif, perl, opencv, qt5, netpbm
}:
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [
OpenGL GLUT
]) else [
libGLU_combined freeglut
libGLU libGL freeglut
]);
patches = [ ./threads.patch ./pfstools.patch ./pfsalign.patch ];
pkgs/tools/graphics/vips/default.nix
+2 -2
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "vips";
version = "8.8.3";
version = "8.8.4";
src = fetchFromGitHub {
owner = "libvips";
repo = "libvips";
rev = "v${version}";
sha256 = "0wlwcgcp7d3vhjdbi3xlpvnj4jl4321vac9v1sr1mis4aivwzsrn";
sha256 = "1gw8srjf5r6dhg6g5hh91if302mcr44dzy87mv230ar7027kwwbi";
# Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation.
extraPostFetch = ''
pkgs/tools/graphics/wallutils/default.nix
+2 -2
View File
@@ -4,13 +4,13 @@
buildGoPackage rec {
pname = "wallutils";
version = "5.8.2";
version = "5.8.3";
src = fetchFromGitHub {
owner = "xyproto";
repo = "wallutils";
rev = version;
sha256 = "1ghvcxsy5prj8l38r4lg39imsqbwmvn1zmiv7004j6skmgpaaawh";
sha256 = "1cc0bb6bdh3pm9mf6rcgk9myr62xhqc6l84xgw44lhm6hkkp16gb";
};
goPackagePath = "github.com/xyproto/wallutils";
pkgs/tools/graphics/wallutils/lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch
+15 -14
View File
@@ -1,25 +1,26 @@
From 9d064428cec970ced9be6753d6250b20a45a9fe2 Mon Sep 17 00:00:00 2001
From 2643b06889605e6096174fb48dcb64a49b252217 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 19 Apr 2019 11:56:50 +0200
Date: Sun, 17 Nov 2019 20:30:08 +0100
Subject: [PATCH] lscollection: Add NixOS paths to DefaultWallpaperDirectories
---
collections.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
collections.go | 3 +++
1 file changed, 3 insertions(+)
diff --git a/collections.go b/collections.go
index ef74ea6..9f9a608 100644
index be04d41..cc79c56 100644
--- a/collections.go
+++ b/collections.go
@@ -21,7 +21,7 @@ const (
)
@@ -22,6 +22,9 @@ const (
var (
- DefaultWallpaperDirectories = []string{"/usr/share/pixmaps", "/usr/share/wallpapers", "/usr/share/backgrounds", "/usr/local/share/pixmaps", "/usr/local/share/wallpapers", "/usr/local/share/backgrounds", "/usr/share/archlinux"}
+ DefaultWallpaperDirectories = []string{"/run/current-system/sw/share/pixmaps", "/run/current-system/sw/share/wallpapers", "/run/current-system/sw/share/backgrounds", "/usr/share/pixmaps", "/usr/share/wallpapers", "/usr/share/backgrounds", "/usr/local/share/pixmaps", "/usr/local/share/wallpapers", "/usr/local/share/backgrounds", "/usr/share/archlinux"}
)
type SearchResults struct {
// DefaultWallpaperDirectories lists the default locations to look for wallpapers
var DefaultWallpaperDirectories = []string{
+ "/run/current-system/sw/share/pixmaps",
+ "/run/current-system/sw/share/wallpapers",
+ "/run/current-system/sw/share/backgrounds",
"/usr/share/pixmaps",
"/usr/share/wallpapers",
"/usr/share/backgrounds",
--
2.19.2
2.23.0