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

Merge staging into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk 2018-07-22 11:15:27 +02:00
commit 0f5f0c157a
139 changed files with 566 additions and 574 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/strings.nix
View File

@ -121,7 +121,7 @@ rec {
Example:
pkgs = import <nixpkgs> { }
makePerlPath [ pkgs.perlPackages.NetSMTP ]
makePerlPath [ pkgs.perlPackages.libnet ]
=> "/nix/store/n0m1fk9c960d8wlrs62sncnadygqqc6y-perl-Net-SMTP-1.25/lib/perl5/site_perl"
*/
makePerlPath = makeSearchPathOutput "lib" "lib/perl5/site_perl";

2
maintainers/scripts/nix-generate-from-cpan.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "nix-generate-from-cpan-3";
buildInputs = with perlPackages; [
makeWrapper perl CPANMeta GetoptLongDescriptive CPANPLUS Readonly Log4Perl
makeWrapper perl CPANMeta GetoptLongDescriptive CPANPLUS Readonly LogLog4perl
];
phases = [ "installPhase" ];

4
nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
View File

@ -68,8 +68,8 @@ in
package = mkOption {
type = types.package;
default = pkgs.gnome3.gnome-themes-standard;
defaultText = "pkgs.gnome3.gnome-themes-standard";
default = pkgs.gnome3.gnome-themes-extra;
defaultText = "pkgs.gnome3.gnome-themes-extra";
description = ''
The package path that contains the theme given in the name option.
'';

4
pkgs/applications/audio/abcde/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, libcdio-paranoia, cddiscid, wget, which, vorbis-tools, id3v2, eyeD3
, lame, flac, glyr
, perl, DigestSHA, MusicBrainz, MusicBrainzDiscID
, perl, MusicBrainz, MusicBrainzDiscID
, makeWrapper }:
let version = "2.8.1";
@ -35,7 +35,7 @@ in
buildInputs = [ makeWrapper ];
propagatedBuildInputs = [ perl DigestSHA MusicBrainz MusicBrainzDiscID ];
propagatedBuildInputs = [ perl MusicBrainz MusicBrainzDiscID ];
installFlags = [ "sysconfdir=$(out)/etc" ];

4
pkgs/applications/audio/lollypop/default.nix
View File

@ -2,7 +2,7 @@
, appstream-glib, desktop-file-utils, gobjectIntrospection
, python36Packages, gnome3, glib, gst_all_1 }:
stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
version = "0.9.521";
name = "lollypop-${version}";
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [ glib ] ++ (with gnome3; [
gsettings_desktop_schemas gtk3 libsecret libsoup totem-pl-parser
gsettings-desktop-schemas gtk3 libsecret libsoup totem-pl-parser
]) ++ (with gst_all_1; [
gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly
gstreamer

4
pkgs/applications/audio/sidplayfp/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, libsidplayfp }:
stdenv.mkDerivation rec {
version = "1.4.3";
version = "1.4.4";
name = "sidplayfp-${version}";
src = fetchurl {
url = "mirror://sourceforge/sidplay-residfp/sidplayfp/1.4/${name}.tar.gz";
sha256 = "04gqhxs4w0riabp1svgcs6gsxdmbfmrs4kaqr5lifvxjvv03vzsn";
sha256 = "0arsrg3f0fsinal22qjmj3r6500bcbgqnx26fsz049ldl716kz1m";
};
nativeBuildInputs = [ pkgconfig ];

7
pkgs/applications/editors/emacs-modes/melpa-packages.nix
View File

@ -151,6 +151,13 @@ self:
# missing OCaml
ocp-indent = markBroken super.ocp-indent;
orgit =
(super.orgit.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
}));
# upstream issue: missing dependency
org-readme = markBroken super.org-readme;

4
pkgs/applications/editors/focuswriter/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "focuswriter-${version}";
version = "1.6.14";
version = "1.6.15";
src = fetchurl {
url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
sha256 = "1n8ni4bnw5vs7jx28v8r1vk69g2m1q5h9s6xpf8c0bxbcwwg2m5i";
sha256 = "0afs9cm5q7zxag28m427ycwwxkbn47zw7v111x7963ydqyn9gr9q";
};
nativeBuildInputs = [ pkgconfig qmake qttools ];

8
pkgs/applications/editors/geany/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file, libintl }:
{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file, libintl, hicolor-icon-theme }:
with stdenv.lib;
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig intltool libintl ];
buildInputs = [ gtk2 which file ];
buildInputs = [ gtk2 which file hicolor-icon-theme ];
doCheck = true;
@ -23,10 +23,6 @@ stdenv.mkDerivation rec {
patchPhase = "patchShebangs .";
# This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
# It have no reasons to exist in a redistribuable package
postInstall = "rm $out/share/icons/hicolor/icon-theme.cache";
meta = {
description = "Small and lightweight IDE";
longDescription = ''

4
pkgs/applications/editors/neovim/default.nix
View File

@ -11,13 +11,13 @@ let
neovim = stdenv.mkDerivation rec {
name = "neovim-unwrapped-${version}";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "neovim";
repo = "neovim";
rev = "v${version}";
sha256 = "10c8y309fdwvr3d9n6vm1f2c0k6pzicnhc64l2dvbw1lnabp04vv";
sha256 = "19jy9nr2ffscli6wsysqkdvqvh7sgkkwhzkw3yypfrvg4pj9rl56";
};
enableParallelBuilding = true;

4
pkgs/applications/editors/tiled/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "tiled-${version}";
version = "1.1.5";
version = "1.1.6";
src = fetchFromGitHub {
owner = "bjorn";
repo = "tiled";
rev = "v${version}";
sha256 = "1l8sx0qfkm7n2ag0ns01vrs8mzcxzva00in4xqz4zgd505qx5q9v";
sha256 = "09qnlinm3q9xwp6b6cajs49fx8y6pkpixhji68bhs53m5hpvfg4s";
};
nativeBuildInputs = [ pkgconfig qmake ];

10
pkgs/applications/graphics/dia/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perl,
perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl,
libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui,
libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-theme,
gtk-mac-integration }:
stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5
libxslt docbook_xsl libart_lgpl ]
libxslt docbook_xsl libart_lgpl hicolor-icon-theme ]
++ stdenv.lib.optional withGNOME libgnomeui
++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration;
@ -28,12 +28,6 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
# This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
# It have no reasons to exist in a redistribuable package
postInstall = ''
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = {
description = "Gnome Diagram drawing software";
homepage = http://live.gnome.org/Dia;

4
pkgs/applications/graphics/feh/default.nix
View File

@ -6,11 +6,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "feh-${version}";
version = "2.27";
version = "2.27.1";
src = fetchurl {
url = "https://feh.finalrewind.org/${name}.tar.bz2";
sha256 = "0kn6cka9m76697i495npd60ad64jnfnzv5z6znzyr0vlxx2nhcmg";
sha256 = "10zk76l491s22qrv86rax6cvpgwyl3qq0izl2pbk0k1z1kw3ihvf";
};
outputs = [ "out" "man" "doc" ];

5
pkgs/applications/graphics/glabels/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, barcode, gnome3, autoreconfHook
, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book
, intltool, itstool, makeWrapper, pkgconfig
, intltool, itstool, makeWrapper, pkgconfig, hicolor-icon-theme
}:
stdenv.mkDerivation rec {
@ -17,11 +17,10 @@ stdenv.mkDerivation rec {
barcode gtk3 gtk-doc gnome3.yelp-tools
gnome3.gnome-common gnome3.gsettings-desktop-schemas
itstool libxml2 librsvg libe-book libtool
hicolor-icon-theme
];
preFixup = ''
rm "$out/share/icons/hicolor/icon-theme.cache"
wrapProgram "$out/bin/glabels-3" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';

10
pkgs/applications/graphics/inkscape/default.nix
View File

@ -2,7 +2,7 @@
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
, gsl, python2, poppler, imagemagick, libwpg, librevenge
, libvisio, libcdr, libexif, potrace, cmake
, libvisio, libcdr, libexif, potrace, cmake, hicolor-icon-theme
}:
let
@ -44,15 +44,13 @@ stdenv.mkDerivation rec {
libXft libpng zlib popt boehmgc
libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
gsl poppler imagemagick libwpg librevenge
libvisio libcdr libexif potrace
libvisio libcdr libexif potrace hicolor-icon-theme
];
enableParallelBuilding = true;
postInstall = ''
# Make sure PyXML modules can be found at run-time.
rm -f "$out/share/icons/hicolor/icon-theme.cache"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
# Make sure PyXML modules can be found at run-time.
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape
install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview
'';

4
pkgs/applications/graphics/shutter/default.nix
View File

@ -7,9 +7,9 @@ let
[ Gnome2 Gnome2Canvas Gtk2 Glib Pango Gnome2VFS Gnome2Wnck Gtk2ImageView
Gtk2Unique FileWhich FileCopyRecursive XMLSimple NetDBus XMLTwig
XMLParser HTTPMessage ProcSimple SortNaturally LocaleGettext
ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWPUserAgent JSON
ProcProcessTable URI ImageExifTool Gtk2AppIndicator LWP JSON
PerlMagick WWWMechanize HTTPDate HTMLForm HTMLParser HTMLTagset JSONXS
CommonSense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo
commonsense HTTPCookies NetOAuth PathClass GooCanvas X11Protocol Cairo
EncodeLocale TryTiny TypesSerialiser LWPMediaTypes
];
in

14
pkgs/applications/graphics/write_stylus/default.nix
View File

@ -6,7 +6,8 @@ stdenv.mkDerivation rec {
desktopItem = makeDesktopItem {
name = "Write";
exec = "Write";
comment = "a word processor for hadwriting";
comment = "A word processor for handwriting";
icon = "write_stylus";
desktopName = "Write";
genericName = "Write";
categories = "Office;Graphics";
@ -16,6 +17,14 @@ stdenv.mkDerivation rec {
url = "http://www.styluslabs.com/write/write${version}.tar.gz";
sha256 = "1p6glp4vdpwl8hmhypayc4cvs3j9jfmjfhhrgqm2xkgl5bfbv2qd";
};
# taken from: https://www.iconfinder.com/icons/50835/edit_pencil_write_icon
# license: Free for commercial use
icon = fetchurl {
url = "https://oyra.eu/write/icon.tar.gz";
sha256 = "1zd98g63apwi17qc1hm1g14maain5d18g4afadxm30qjz2s0mvs8";
};
sourceRoot = ".";
dontBuild = true;
@ -26,6 +35,9 @@ stdenv.mkDerivation rec {
# symlink the binary to bin/
ln -s $out/Write/Write $out/bin/Write
# untar icons
tar -xzf ${icon} *.tar.gz -C $out/
mkdir -p $out/share/applications
ln -s ${desktopItem}/share/applications/* $out/share/applications/
'';

158
pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
View File

@ -1,158 +0,0 @@
diff --git a/colorer/configs/base/hrc/nix.hrc b/colorer/configs/base/hrc/nix.hrc
new file mode 100644
index 0000000..1bd9bb5
--- /dev/null
+++ b/colorer/configs/base/hrc/nix.hrc
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<!DOCTYPE hrc PUBLIC "-//Cail Lomecb//DTD Colorer HRC take5//EN"
+ "http://colorer.sf.net/2003/hrc.dtd">
+<hrc version="take5" xmlns="http://colorer.sf.net/2003/hrc"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://colorer.sf.net/2003/hrc http://colorer.sf.net/2003/hrc.xsd">
+
+ <type name="nix">
+
+ <annotation><documentation>
+ Nix
+ </documentation></annotation>
+
+ <import type="def"/>
+
+ <region name="Code" parent="def:Text"/>
+ <region name="StringEscape" parent="def:StringContent"/>
+ <region name='Import' parent='def:Directive'/>
+ <region name='ImportOutline' parent='def:Outlined'/>
+ <region name="Path" parent="def:Path"/>
+ <region name="URL" parent="def:String"/>
+ <region name="LiteralKeyword" parent="def:Keyword"/>
+ <region name='Interpolation' parent='def:StringEdge'/>
+ <region name="Ident" parent="def:Identifier"/> <!-- Label -->
+
+ <scheme name="TabsAsErrors" if="tabs-as-errors">
+ <regexp match="/\t+/" region='def:Error'/>
+ </scheme>
+
+ <scheme name="SpacesAsErrors" if="spaces-as-errors">
+ <regexp match="/\x20+$/" region='def:Error'/>
+ </scheme>
+
+ <scheme name="NotNestedComment">
+ <inherit scheme="TabsAsErrors"/>
+ <inherit scheme="SpacesAsErrors"/>
+ <inherit scheme="Comment"/>
+ </scheme>
+
+ <scheme name="String">
+ <inherit scheme="TabsAsErrors"/>
+ <inherit scheme="SpacesAsErrors"/>
+<!-- <regexp match="/\\[xX]0*[\da-fA-F]{1,2}/" region0="StringEscape"/> -->
+ <regexp match="/\\./" region0="StringEscape"/>
+ <block start="/(\$\{)/" end="/(\})/" scheme="NixExpression" region="Code" region00="Interpolation" region01="PairStart" region10="Interpolation" region11="PairEnd"/>
+ </scheme>
+
+ <scheme name="BlockString">
+ <inherit scheme="TabsAsErrors"/>
+ <inherit scheme="SpacesAsErrors"/>
+
+ <regexp match="/&apos;&apos;\$/" region0="StringEscape"/>
+ <regexp match="/&apos;&apos;&apos;/" region0="StringEscape"/>
+ <block start="/(\$\{)/" end="/(\})/" scheme="NixExpression" region="Code" region00="Interpolation" region01="PairStart" region10="Interpolation" region11="PairEnd"/>
+ </scheme>
+
+ <scheme name="NixIdent">
+ <regexp match="/\w[\w\d-]*'*/" region0="Ident"/>
+ </scheme>
+
+ <scheme name="NixExpression">
+ <inherit scheme="TabsAsErrors"/>
+ <inherit scheme="SpacesAsErrors"/>
+
+ <inherit scheme="def:unixCommentDirective"/>
+ <block start="/#/" end="/\s*$/" scheme="Comment" region="LineComment" region10="def:Error"/>
+ <block start="/\/\*/" end="/\*\//" scheme="NotNestedComment" region="Comment" region00="PairStart" region10="PairEnd"/>
+
+ <block start="/(\$\{)/" end="/(\})/" scheme="NixExpression" region00="Interpolation" region01="PairStart" region10="Interpolation" region11="PairEnd"/>
+ <block start="/(\{)/" end="/(\})/" scheme="NixExpression" region00="Symbol" region01="PairStart" region10="Symbol" region11="PairEnd"/>
+ <block start="/(\()/" end="/(\))/" scheme="NixExpression" region00="Symbol" region01="PairStart" region10="Symbol" region11="PairEnd"/>
+ <block start="/(\[)/" end="/(\])/" scheme="NixExpression" region00="Symbol" region01="PairStart" region10="Symbol" region11="PairEnd"/>
+
+ <regexp match="/[\w\d.+=?~-]*(\/[\w\d.+?~-]+)+/" region0="Path"/>
+ <regexp match="/&lt;[\w\d\/.+?~-]+&gt;/" region0="Path"/>
+ <regexp match="/(ftp|mirror|http|https|git):\/\/[\w\d\/:?=&amp;.~+-]+/" region0="URL"/>
+ <block start="/(&quot;)/" end="/(&quot;)/" scheme="String" region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/>
+ <block start="/(&apos;&apos;)/" end="/(&apos;&apos;)/" scheme="BlockString" region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/>
+
+ <keywords region="Keyword">
+ <word name="assert"/>
+ <word name="else"/>
+ <word name="if"/>
+ <word name="in"/>
+ <word name="inherit"/>
+ <word name="import"/>
+ <word name="let"/>
+ <word name="or"/>
+ <word name="rec"/>
+ <word name="then"/>
+ <word name="throw"/>
+ <word name="with"/>
+ </keywords>
+ <keywords region="LiteralKeyword">
+ <word name="true"/>
+ <word name="false"/>
+ <word name="null"/>
+ </keywords>
+ <keywords region="Symbol">
+ <symb name="."/>
+ <symb name=":"/>
+ <symb name=","/>
+ <symb name=";"/>
+
+ <symb name="*"/>
+ <symb name="/"/>
+ <symb name="%"/>
+ <symb name="+"/>
+ <symb name="-"/>
+ <symb name="!"/>
+ <symb name="?"/>
+ <symb name="@"/>
+ <symb name="&lt;"/>
+ <symb name="&gt;"/>
+ <symb name="&amp;"/>
+ <symb name="|"/>
+ <symb name="="/>
+ <symb name="..."/>
+ </keywords>
+
+ <inherit scheme="def:Number"/>
+ <inherit scheme="NixIdent"/>
+
+ <regexp match="/[^\)\}\]\s]/" region='def:Error'/>
+
+ </scheme>
+
+ <scheme name="nix">
+ <inherit scheme="NixExpression"/>
+ </scheme>
+
+ </type>
+</hrc>
diff --git a/colorer/configs/base/hrc/proto.hrc b/colorer/configs/base/hrc/proto.hrc
index 11e493b..2a67263 100644
--- a/colorer/configs/base/hrc/proto.hrc
+++ b/colorer/configs/base/hrc/proto.hrc
@@ -156,6 +156,14 @@
<location link="jar:common.jar!base/lua.hrc"/>
<filename>/\.(w?lua)$/i</filename>
</prototype>
+ <prototype name="nix" group="main" description="Nix">
+ <location link="nix.hrc"/>
+ <filename>/\.(nix)$/i</filename>
+ <parameters>
+ <param name="tabs-as-errors" value="true" description="Shows tabulation symbol as error"/>
+ <param name="spaces-as-errors" value="true" description="Shows trailing spaces as error"/>
+ </parameters>
+ </prototype>
<prototype name="ruby" group="main" description="Ruby">
<location link="jar:common.jar!base/ruby.hrc"/>
<filename>/\.(rb|rbw|ruby|rake)$/i</filename>

22
pkgs/applications/misc/far2l/default.nix
View File

@ -1,17 +1,16 @@
{ stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,
{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,
xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }:
with stdenv.lib;
stdenv.mkDerivation rec {
rev = "819d131110a9fedfc14f3b3bea8f1f56e68b077a";
build = "unstable-2018-02-27.git${builtins.substring 0 7 rev}";
build = "unstable-2018-07-19.git${builtins.substring 0 7 src.rev}";
name = "far2l-2.1.${build}";
src = fetchFromGitHub {
owner = "elfmz";
repo = "far2l";
rev = rev;
sha256 = "1xjy2ricd68pm9j758pb2axc2269ns2xh86443x5llfcaxrjja4b";
rev = "dceaa3918ea2c5e43600bad3fc63f861b8d26fc4";
sha256 = "1ssd3hwz4b7vl4r858d9whl61cn23pgcamcjmvfa6ysf4x2b7sgi";
};
nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];
@ -19,10 +18,8 @@ stdenv.mkDerivation rec {
buildInputs = [ wxGTK30 glib pcre ]
++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa;
patches = [ ./add-nix-syntax-highlighting.patch ];
postPatch = optionalString stdenv.isLinux ''
substituteInPlace far2l/bootstrap/open.sh \
substituteInPlace far2l/bootstrap/trash.sh \
--replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash'
'' + optionalString stdenv.isDarwin ''
substituteInPlace far2l/CMakeLists.txt \
@ -44,6 +41,15 @@ stdenv.mkDerivation rec {
--replace '"gzip ' '"${gzip}/bin/gzip ' \
--replace '"bzip2 ' '"${bzip2}/bin/bzip2 ' \
--replace '"tar ' '"${gnutar}/bin/tar '
( cd colorer/configs/base
patch -p2 < ${ fetchpatch {
name = "nix-language-highlighting.patch";
url = https://github.com/colorer/Colorer-schemes/commit/64bd06de0a63224b431cd8fc42cd9fa84b8ba7c0.patch;
sha256 = "1mrj1wyxmk7sll9j1jzw6miwi0sfavf654klms24wngnh6hadsch";
}
}
)
'';
installPhase = ''

4
pkgs/applications/misc/ola/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "ola-${version}";
version = "0.10.6";
version = "0.10.7";
src = fetchFromGitHub {
owner = "OpenLightingProject";
repo = "ola";
rev = version;
sha256 = "1qazhkcakvzkf1dvav0alk33aaklawf8vckgwpf6fvwf7g2kyh63";
sha256 = "18krwrw7w1qzwih8gnmv7r4sah5ppvq7ax65r7l5yjxn3ihwp2kf";
};
nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ];

8
pkgs/applications/misc/todiff/default.nix
View File

@ -2,16 +2,18 @@
rustPlatform.buildRustPackage rec {
name = "todiff-${version}";
version = "0.5.0";
version = "0.6.1";
src = fetchFromGitHub {
owner = "Ekleog";
repo = "todiff";
rev = version;
sha256 = "0xnqw98nccnkqfdmbkblm897v981rw1fagbi5q895bpwfg0p71lk";
sha256 = "1y0v8nkaqb8kn61xwarpbyrq019gxx1f5f5p1hzw73nqxadc1rcm";
};
cargoSha256 = "0ih7lw5hbayvc66fjqwga0i7l3sb9qn0m26vnham5li39f5i3rqp";
cargoSha256 = "1r7l9zbw6kq8yb5cv6h0qgl2gp71bkn9xv7b2n49a5r7by98jjqr";
checkPhase = "cargo test --features=integration_tests";
meta = with stdenv.lib; {
description = "Human-readable diff for todo.txt files";

2
pkgs/applications/misc/yarssr/default.nix
View File

@ -16,7 +16,7 @@ let
ClassSingleton
URI
AnyEvent AnyEventHTTP
CommonSense
commonsense
FileSlurp
JSON
Guard

2
pkgs/applications/networking/browsers/eolie/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [ gtkspell3 hunspell python36Packages.pygobject3 ] ++ (with gnome3; [
glib glib-networking gsettings_desktop_schemas gtk3 webkitgtk libsecret
glib glib-networking gsettings-desktop-schemas gtk3 webkitgtk libsecret
]) ++ (with gst_all_1; [
gst-libav gst-plugins-base gst-plugins-ugly gstreamer
]);

4
pkgs/applications/networking/feedreaders/feedreader/default.nix
View File

@ -24,8 +24,8 @@ in stdenv.mkDerivation {
buildInputs = [
curl glib json-glib libnotify libsecret sqlite
] ++ (with gnome3; [
gtk libgee libpeas libsoup rest webkitgtk gnome_online_accounts
gsettings_desktop_schemas
gtk libgee libpeas libsoup rest webkitgtk gnome-online-accounts
gsettings-desktop-schemas
]) ++ (with gst_all_1; [
gstreamer gst-plugins-base gst-plugins-good
]);

5
pkgs/applications/networking/newsreaders/liferea/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, python3Packages, wrapGAppsHook
, glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json-glib, gst_all_1
, libnotify, gtk3, gsettings-desktop-schemas, libpeas, dconf, librsvg
, gobjectIntrospection, glib-networking
, gobjectIntrospection, glib-networking, hicolor-icon-theme
}:
let
@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings-desktop-schemas
libpeas gsettings-desktop-schemas json-glib dconf gobjectIntrospection
librsvg glib-networking libnotify
librsvg glib-networking libnotify hicolor-icon-theme
] ++ (with gst_all_1; [
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
]);
@ -28,7 +28,6 @@ in stdenv.mkDerivation rec {
pythonPath = with python3Packages; [ pygobject3 pycairo ];
preFixup = ''
rm "$out/share/icons/hicolor/icon-theme.cache"
buildPythonPath "$out $pythonPath"
gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
'';

4
pkgs/applications/networking/owncloud-client/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "owncloud-client-${version}";
version = "2.4.1";
version = "2.4.2";
src = fetchurl {
url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz";
sha256 = "4462ae581c281123dc62f3604f1aa54c8f4a60cd8157b982e2d76faac0f7aa23";
sha256 = "0pxga45fi7iyayy278hgl8x099isz6d7x1jq57p2m9qlsvfx8ap5";
};
patches = [ ./find-sql.patch ];

9
pkgs/applications/networking/p2p/transmission/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, file, wrapGAppsHook
, openssl, curl, libevent, inotify-tools, systemd, zlib
, openssl, curl, libevent, inotify-tools, systemd, zlib, hicolor-icon-theme
, enableGTK3 ? false, gtk3
, enableSystemd ? stdenv.isLinux
, enableDaemon ? true
@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
buildInputs = [ intltool file openssl curl libevent zlib ]
++ optionals enableGTK3 [ gtk3 ]
++ optionals enableSystemd [ systemd ]
++ optionals stdenv.isLinux [ inotify-tools ];
++ optionals stdenv.isLinux [ inotify-tools ]
++ optionals enableGTK3 [ hicolor-icon-theme ];
postPatch = ''
substituteInPlace ./configure \
@ -39,10 +40,6 @@ stdenv.mkDerivation rec {
++ optional enableSystemd "--with-systemd-daemon"
++ optional enableGTK3 "--with-gtk";
preFixup = optionalString enableGTK3 ''
rm "$out/share/icons/hicolor/icon-theme.cache"
'';
NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation";
meta = with stdenv.lib; {

2
pkgs/applications/networking/remote/citrix-receiver/default.nix
View File

@ -247,7 +247,7 @@ let
makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \
--add-flags "-icaroot $ICAInstDir" \
--set ICAROOT "$ICAInstDir" \
--set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-standard}/lib/gtk-2.0" \
--set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-extra}/lib/gtk-2.0" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
--set LD_LIBRARY_PATH "$libPath" \

4
pkgs/applications/networking/sniffers/wireshark/default.nix
View File

@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null;
with stdenv.lib;
let
version = "2.6.1";
version = "2.6.2";
variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
in stdenv.mkDerivation {
@ -20,7 +20,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
sha256 = "126dvd6myjbxjr69dy9vzzdda2lmjy1wwwc6gcs5djb46jy5nvmb";
sha256 = "153h6prxamv5a62f3pfadkry0y57696xrgxfy2gfy5xswdg8kcj9";
};
cmakeFlags = [

4
pkgs/applications/networking/transporter/default.nix
View File

@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
defaultIconTheme # If I omit this there's no icons in KDE
glib
granite
gsettings_desktop_schemas
gsettings-desktop-schemas
gtk3
libgee
magic-wormhole
@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
substituteInPlace ./src/WormholeInterface.vala \
--replace /bin/wormhole ${magic-wormhole}/bin/wormhole
'';
postPatch = ''
chmod +x ./meson/post_install.py
patchShebangs ./meson/post_install.py

5
pkgs/applications/office/gnucash/2.4.nix
View File

@ -1,7 +1,7 @@
{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk2, libgnomeui, libofx
, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui
, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade
, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar
, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar, hicolor-icon-theme
}:
/* If you experience GConf errors when running GnuCash on NixOS, see
@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
libgnomeprint goffice enchant gettext intltool perl guile slibGuile
swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl
perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar
hicolor-icon-theme
];
propagatedUserEnvPkgs = [ gconf ];
@ -49,8 +50,6 @@ stdenv.mkDerivation rec {
--set GCONF_CONFIG_SOURCE 'xml::~/.gconf' \
--prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}"
done
rm $out/share/icons/hicolor/icon-theme.cache
'';
# The following settings fix failures in the test suite. It's not required otherwise.

6
pkgs/applications/office/gnucash/2.6.nix
View File

@ -3,7 +3,7 @@
, glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice
, webkit, glibcLocales, gsettings-desktop-schemas, dconf
, gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers
, pango, gdk_pixbuf
, pango, gdk_pixbuf, hicolor-icon-theme
}:
/*
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
libxml2 libxslt glibcLocales gettext swig enchant
bzip2 isocodes
# glib, gtk...
glib gtk2 goffice webkit
glib gtk2 goffice webkit hicolor-icon-theme
# gnome...
dconf gconf libgnomecanvas gsettings-desktop-schemas
# financial
@ -83,8 +83,6 @@ stdenv.mkDerivation rec {
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
--prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}"
done
rm $out/share/icons/hicolor/icon-theme.cache
'';
# The following settings fix failures in the test suite. It's not required otherwise.

4
pkgs/applications/office/libreoffice/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext
, CompressZlib, zlib, libjpeg, expat, freetype, libwpd
, IOCompress, zlib, libjpeg, expat, freetype, libwpd
, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, cups, xorg, libcmis
@ -251,7 +251,7 @@ in stdenv.mkDerivation rec {
buildInputs = with xorg;
[ ant ArchiveZip autoconf automake bison boost cairo clucene_core
CompressZlib cppunit cups curl db dbus-glib expat file flex fontconfig
IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig
freetype GConf getopt gnome_vfs gperf gtk3 gtk2
hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11

4
pkgs/applications/office/libreoffice/still.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip
, CompressZlib, zlib, libjpeg, expat, freetype, libwpd
, IOCompress, zlib, libjpeg, expat, freetype, libwpd
, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, cups, xorg, libcmis, carlito
@ -248,7 +248,7 @@ in stdenv.mkDerivation rec {
buildInputs = with xorg;
[ ant ArchiveZip autoconf automake bison boost cairo clucene_core
CompressZlib cppunit cups curl db dbus-glib expat file flex fontconfig
IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig
freetype GConf getopt gnome_vfs gperf gtk3 gtk2
hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11

4
pkgs/applications/science/biology/picard-tools/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "picard-tools-${version}";
version = "2.18.9";
version = "2.18.10";
src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
sha256 = "0mmyzw75szjycncrgilj1kly3ldawqndxy59059qc8ddbiwn1zky";
sha256 = "1px5ar6iizm4czpc66hyyafandw6g9x9s1abj8klc78alvihciw4";
};
buildInputs = [ jre makeWrapper ];

4
pkgs/applications/science/electronics/gtkwave/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "gtkwave-${version}";
version = "3.3.91";
version = "3.3.92";
src = fetchurl {
url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
sha256 = "1vp9qj3wyfwm36jk3pajvi09xvc1m1crf3d4gphfbs6nkyx2z942";
sha256 = "08916gv5vl7dgvlsq098mxljbciby9miyh8jqwn1q8sfdhzvmxak";
};
nativeBuildInputs = [ pkgconfig ];

4
pkgs/applications/science/logic/tlaplus/toolbox.nix
View File

@ -3,7 +3,7 @@
}:
let
version = "1.5.6";
version = "1.5.7";
arch = "x86_64";
desktopItem = makeDesktopItem rec {
@ -24,7 +24,7 @@ in stdenv.mkDerivation {
name = "tla-toolbox-${version}";
src = fetchzip {
url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip";
sha256 = "1h63mcbrkf4jcg6qncpqffdi0x665z0wlfdq43d67p411xcqmbw9";
sha256 = "0lg9sizpw5mkcnwwvmgqigkizjyz2lf1wrg48h7mg7wcv3macy4q";
};
buildInputs = [ makeWrapper ];

8
pkgs/applications/science/logic/why3/default.nix
View File

@ -2,15 +2,15 @@
stdenv.mkDerivation rec {
name = "why3-${version}";
version = "0.88.3";
version = "1.0.0";
src = fetchurl {
url = https://gforge.inria.fr/frs/download.php/file/37313/why3-0.88.3.tar.gz;
sha256 = "0limdqy9l5bjzwhdalcfdyh0b6laxgiphhvr4bby9p0030agssiy";
url = https://gforge.inria.fr/frs/download.php/file/37604/why3-1.0.0.tar.gz;
sha256 = "18h00diw1c051v7ya0lv09ns5630qi9savwffx0652mcc4b4qpxn";
};
buildInputs = (with ocamlPackages; [
ocaml findlib lablgtk ocamlgraph zarith menhir ]) ++
ocaml findlib num lablgtk ocamlgraph zarith menhir ]) ++
stdenv.lib.optionals (ocamlPackages.ocaml == coq.ocaml ) [
coq coq.camlp5
];

5
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -10,10 +10,9 @@ let
sendEmailSupport = false; # requires plenty of perl libraries
perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey];
smtpPerlLibs = [
perlPackages.NetSMTP perlPackages.NetSMTPSSL
perlPackages.libnet perlPackages.NetSMTPSSL
perlPackages.IOSocketSSL perlPackages.NetSSLeay
perlPackages.MIMEBase64 perlPackages.AuthenSASL
perlPackages.DigestHMAC
perlPackages.AuthenSASL perlPackages.DigestHMAC
];
};

1
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -238,6 +238,7 @@ EOF
## InstallCheck
doCheck = false;
doInstallCheck = true;
installCheckTarget = "test";

4
pkgs/applications/version-management/peru/default.nix
View File

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
name = "peru-${version}";
version = "1.1.3";
version = "1.1.4";
src = fetchFromGitHub {
owner = "buildinspace";
repo = "peru";
rev = "${version}";
sha256 = "02kr3ib3ppbmcsjy8i8z41vp9gw9gdivy2l5aps12lmaa3rc6727";
sha256 = "0mzmi797f2h2wy36q4ab701ixl5zy4m0pp1wp9abwdfg2y6qhmnk";
};
propagatedBuildInputs = with python3Packages; [ pyyaml docopt ];

9
pkgs/applications/video/handbrake/default.nix
View File

@ -10,7 +10,7 @@
libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec,
lame, libdvdread, libdvdnav, libbluray,
mp4v2, mpeg2dec, x264, x265, libmkv,
fontconfig, freetype,
fontconfig, freetype, hicolor-icon-theme,
glib, gtk3, intltool, libnotify,
gst_all_1, dbus-glib, udev, libgudev, libvpx,
useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null,
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals useGtk [
glib gtk3 libappindicator-gtk3 libnotify
gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev
libgudev
libgudev hicolor-icon-theme
] ++ (if useFfmpeg then [ ffmpeg ] else [ patched_libav_12 ])
++ lib.optional useFdk fdk_aac;
@ -82,11 +82,6 @@ stdenv.mkDerivation rec {
cd build
'';
# icon-theme.cache belongs in the icon theme, not in individual packages
postInstall = ''
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = with stdenv.lib; {
homepage = http://handbrake.fr/;
description = "A tool for converting video files and ripping DVDs";

2
pkgs/applications/window-managers/i3/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon
libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango
perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun
perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC
perlPackages.ExtUtilsPkgConfig perlPackages.InlineC
xorgserver xvfb_run
];

8
pkgs/build-support/bintools-wrapper/setup-hook.sh
View File

@ -20,7 +20,13 @@ bintoolsWrapper_addLDVars () {
fi
if [[ -d "$1/lib" ]]; then
export NIX_${role_pre}LDFLAGS+=" -L$1/lib"
# Don't add the /lib directory if it actually doesn't contain any libraries. For instance,
# Python and Haskell packages often only have directories like $out/lib/ghc-8.4.3/ or
# $out/lib/python3.6/, so having them in LDFLAGS just makes the linker search unnecessary
# directories and bloats the size of the environment variable space.
if [[ -n "$(echo $1/lib/lib*)" ]]; then
export NIX_${role_pre}LDFLAGS+=" -L$1/lib"
fi
fi
}

2
pkgs/data/fonts/dejavu-fonts/default.nix
View File

@ -20,7 +20,7 @@ let
# See http://dejavu-fonts.org/wiki/License for details
license = stdenv.lib.licenses.free;
platforms = stdenv.lib.platforms.unix;
platforms = stdenv.lib.platforms.all;
};
full-ttf = stdenv.mkDerivation {

4
pkgs/desktops/gnome-3/games/gnome-mines/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, vala, gobjectIntrospection, pkgconfig, gnome3, gtk3, wrapGAppsHook
, librsvg, gettext, itstool, libxml2, libgames-support, libgee }:
, librsvg, gettext, itstool, libxml2, libgnome-games-support, libgee }:
stdenv.mkDerivation rec {
name = "gnome-mines-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
# gobjectIntrospection for finding vapi files
nativeBuildInputs = [ meson ninja vala gobjectIntrospection pkgconfig gettext itstool libxml2 wrapGAppsHook ];
buildInputs = [ gtk3 librsvg gnome3.defaultIconTheme libgames-support libgee ];
buildInputs = [ gtk3 librsvg gnome3.defaultIconTheme libgnome-games-support libgee ];
postPatch = ''
chmod +x data/meson_compile_gschema.py # patchShebangs requires executable file

4
pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, librsvg, libcanberra-gtk3, clutter-gtk, intltool, itstool
, libxml2, libgee, libgames-support }:
, libxml2, libgee, libgnome-games-support }:
stdenv.mkDerivation rec {
name = "gnome-nibbles-${version}";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3 wrapGAppsHook intltool itstool libxml2
librsvg libcanberra-gtk3 clutter-gtk gnome3.defaultIconTheme
libgee libgames-support
libgee libgnome-games-support
];
meta = with stdenv.lib; {

4
pkgs/desktops/gnome-3/games/gnome-robots/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
, librsvg, libcanberra-gtk3, intltool, itstool, libxml2, libgames-support
, librsvg, libcanberra-gtk3, intltool, itstool, libxml2, libgnome-games-support
, libgee}:
stdenv.mkDerivation rec {
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
gtk3 wrapGAppsHook intltool itstool librsvg libcanberra-gtk3
libxml2 gnome3.defaultIconTheme libgames-support libgee
libxml2 gnome3.defaultIconTheme libgnome-games-support libgee
];
meta = with stdenv.lib; {

5
pkgs/desktops/xfce/applications/orage.nix
View File

@ -1,6 +1,5 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib, tzdata
, libnotify, popt, xfce
}:
, libnotify, popt, xfce, hicolor-icon-theme }:
stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
@ -35,8 +34,6 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util
xfce.xfce4-panel ];
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache ";
meta = {
homepage = http://www.xfce.org/projects/;
description = "A simple calendar application with reminders";

5
pkgs/desktops/xfce/applications/xfce4-notifyd.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, libnotify
, gtk , libxfce4util, libxfce4ui, xfconf }:
, gtk , libxfce4util, libxfce4ui, xfconf, hicolor-icon-theme }:
stdenv.mkDerivation rec {
p_name = "xfce4-notifyd";
@ -13,10 +13,9 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool libnotify gtk libxfce4util libxfce4ui xfconf ];
buildInputs = [ intltool libnotify gtk libxfce4util libxfce4ui xfconf hicolor-icon-theme ];
preFixup = ''
rm $out/share/icons/hicolor/icon-theme.cache
# to be able to run the daemon we need it in PATH
ln -rs $out/lib/xfce4/notifyd/xfce4-notifyd $out/bin
'';

5
pkgs/desktops/xfce/core/thunar-build.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, intltool
, gtk, dbus-glib, libstartup_notification, libnotify, libexif, pcre, udev
, exo, libxfce4util, xfconf, xfce4-panel, wrapGAppsHook
, exo, libxfce4util, xfconf, xfce4-panel, hicolor-icon-theme, wrapGAppsHook
}:
stdenv.mkDerivation rec {
@ -26,13 +26,12 @@ stdenv.mkDerivation rec {
intltool
gtk dbus-glib libstartup_notification libnotify libexif pcre udev
exo libxfce4util xfconf xfce4-panel
hicolor-icon-theme
];
# TODO: optionality?
enableParallelBuilding = true;
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
meta = {
homepage = http://thunar.xfce.org/;
description = "Xfce file manager";

5
pkgs/desktops/xfce/core/thunar-volman.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
, xfconf, udev, libgudev, libnotify }:
, xfconf, udev, libgudev, libnotify, hicolor-icon-theme }:
stdenv.mkDerivation rec {
p_name = "thunar-volman";
@ -15,9 +15,8 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig intltool exo gtk udev libgudev libxfce4ui libxfce4util
xfconf libnotify
xfconf libnotify hicolor-icon-theme
];
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
enableParallelBuilding = true;

5
pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
with stdenv.lib;
stdenv.mkDerivation rec {
@ -13,8 +13,7 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";

5
pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
with stdenv.lib;
stdenv.mkDerivation rec {
@ -13,8 +13,7 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";

6
pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
with stdenv.lib;
stdenv.mkDerivation rec {
@ -15,12 +15,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
buildInputs = [ libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
enableParallelBuilding = true;
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "CPU Freq load plugin for Xfce panel";

5
pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk}:
{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk, hicolor-icon-theme }:
with stdenv.lib;
stdenv.mkDerivation rec {
@ -13,8 +13,7 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel xfconf gtk ];
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
buildInputs = [ intltool glib exo libXtst xproto libxfce4util libxfce4ui xfce4-panel xfconf gtk hicolor-icon-theme ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";

5
pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
with stdenv.lib;
stdenv.mkDerivation rec {
@ -13,8 +13,7 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";

6
pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel_gtk3, xfconf
, gtk3, libpulseaudio
, gtk3, libpulseaudio, hicolor-icon-theme
, withKeybinder ? true, keybinder3
, withLibnotify ? true, libnotify
}:
@ -21,12 +21,10 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ libxfce4util xfce4panel_gtk3 xfconf gtk3 libpulseaudio ]
buildInputs = [ libxfce4util xfce4panel_gtk3 xfconf gtk3 libpulseaudio hicolor-icon-theme ]
++ optional withKeybinder keybinder3
++ optional withLibnotify libnotify;
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Adjust the audio volume of the PulseAudio sound system";

6
pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxml2, libsoup, upower,
libxfce4ui, libxfce4util, xfce4-panel }:
libxfce4ui, libxfce4util, xfce4-panel, hicolor-icon-theme }:
stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
@ -15,12 +15,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ gtk libxml2 libsoup upower libxfce4ui libxfce4util
xfce4-panel ];
xfce4-panel hicolor-icon-theme ];
enableParallelBuilding = true;
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Weather plugin for the Xfce desktop environment";

9
pkgs/desktops/xfce/thunar-plugins/archive/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, pkgconfig, xfce4-dev-tools
, gtk
, thunarx-2-dev
, thunar-bare
, exo, libxfce4util, libxfce4ui
, xfconf, udev, libnotify
, xfconf, udev, libnotify, hicolor-icon-theme
}:
stdenv.mkDerivation rec {
@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
xfce4-dev-tools
thunarx-2-dev
thunar-bare
exo gtk libxfce4util libxfce4ui
xfconf udev libnotify
xfconf udev libnotify hicolor-icon-theme
];
preConfigure = ''
@ -44,7 +44,6 @@ stdenv.mkDerivation rec {
pushd $out/libexec/thunar-archive-plugin > /dev/null
ln -s ./file-roller.tap org.gnome.FileRoller.tap
popd > /dev/null
rm $out/share/icons/hicolor/icon-theme.cache
'';
enableParallelBuilding = true;

6
pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig
, gtk
, thunarx-2-dev, python2
, thunar-bare, python2, hicolor-icon-theme
}:
stdenv.mkDerivation rec {
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
gtk
thunarx-2-dev python2
thunar-bare python2 hicolor-icon-theme
];
configurePhase = "python2 waf configure --prefix=$out";
@ -28,8 +28,6 @@ stdenv.mkDerivation rec {
python2 waf install
'';
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
enableParallelBuilding = true;
meta = with stdenv.lib; {

6
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -207831,7 +207831,7 @@ self: {
}) {};
"udev" = callPackage
({ mkDerivation, base, bytestring, libudev, posix-paths, unix }:
({ mkDerivation, base, bytestring, udev, posix-paths, unix }:
mkDerivation {
pname = "udev";
version = "0.1.0.0";
@ -207839,12 +207839,12 @@ self: {
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base bytestring posix-paths unix ];
libraryPkgconfigDepends = [ libudev ];
libraryPkgconfigDepends = [ udev ];
description = "libudev bindings";
license = stdenv.lib.licenses.bsd3;
platforms = [ "i686-linux" "x86_64-linux" ];
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) libudev;};
}) {inherit (pkgs) udev;};
"udp-conduit" = callPackage
({ mkDerivation, base, chunked-data, conduit-combinators

4
pkgs/development/interpreters/lua-5/5.3.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "lua-${version}";
luaversion = "5.3";
version = "${luaversion}.4";
version = "${luaversion}.5";
src = fetchurl {
url = "https://www.lua.org/ftp/${name}.tar.gz";
sha256 = "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn";
sha256 = "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac";
};
buildInputs = [ readline ];

2
pkgs/development/interpreters/python/cpython/2.7/boot.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, CF, configd, coreutils }:
{ stdenv, fetchurl, configd, CF, coreutils }:
with stdenv.lib;

5
pkgs/development/interpreters/ruby/default.nix
View File

@ -133,6 +133,11 @@ let
++ op (stdenv.hostPlatform != stdenv.buildPlatform)
"--with-baseruby=${buildRuby}";
# fails with "16993 tests, 2229489 assertions, 105 failures, 14 errors, 89 skips"
# mostly TZ- and patch-related tests
# TZ- failures are caused by nix sandboxing, I didn't investigate others
doCheck = false;
preInstall = ''
# Ruby installs gems here itself now.
mkdir -pv "$out/${passthru.gemPath}"

8
pkgs/development/libraries/boost/1.67.nix
View File

@ -1,8 +1,14 @@
{ stdenv, callPackage, fetchurl, hostPlatform, buildPlatform, ... } @ args:
{ stdenv, callPackage, fetchurl, fetchpatch, hostPlatform, buildPlatform, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "1.67_0";
patches = [ (fetchpatch {
url = "https://github.com/boostorg/lockfree/commit/12726cda009a855073b9bedbdce57b6ce7763da2.patch";
sha256 = "0x65nkwzv8fdacj8sw5njl3v63jj19dirrpklbwy6qpsncw7fc7h";
stripLen = 1;
})];
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_67_0.tar.bz2";
# SHA256 from http://www.boost.org/users/history/version_1_66_0.html

4
pkgs/development/libraries/capstone/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "capstone-${version}";
version = "3.0.4";
version = "3.0.5";
src = fetchurl {
url = "https://github.com/aquynh/capstone/archive/${version}.tar.gz";
sha256 = "1whl5c8j6vqvz2j6ay2pyszx0jg8d3x8hq66cvgghmjchvsssvax";
sha256 = "1wbd1g3r32ni6zd9vwrq3kn7fdp9y8qwn9zllrrbk8n5wyaxcgci";
};
configurePhase = '' patchShebangs make.sh '';

2
pkgs/development/libraries/flatpak/default.nix
View File

@ -5,7 +5,7 @@
let
version = "0.99.3";
desktop_schemas = gnome3.gsettings_desktop_schemas;
desktop_schemas = gnome3.gsettings-desktop-schemas;
in stdenv.mkDerivation rec {
name = "flatpak-${version}";

50
pkgs/development/libraries/geoclue/2.0.nix
View File

@ -1,50 +0,0 @@
{ fetchurl, stdenv, intltool, pkgconfig, glib, json-glib, libsoup, geoip
, dbus, dbus-glib, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection
}:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "geoclue-2.4.8";
src = fetchurl {
url = "https://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz";
sha256 = "08yg1r7m0n9hwyvcy769qkmkf8lslqwv69cjfffwnc3zm5km25qj";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [
pkgconfig intltool wrapGAppsHook gobjectIntrospection
];
buildInputs = [ glib json-glib libsoup geoip
dbus dbus-glib avahi
] ++ optionals (!stdenv.isDarwin) [ modemmanager ];
propagatedBuildInputs = [ dbus dbus-glib glib glib-networking ];
preConfigure = ''
substituteInPlace configure --replace "-Werror" ""
'';
configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--enable-introspection" ] ++
optionals stdenv.isDarwin [
"--disable-silent-rules"
"--disable-3g-source"
"--disable-cdma-source"
"--disable-modem-gps-source"
"--disable-nmea-source" ];
postInstall = ''
sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|"
'';
meta = with stdenv.lib; {
description = "Geolocation framework and some data providers";
homepage = https://freedesktop.org/wiki/Software/GeoClue/;
maintainers = with maintainers; [ raskin garbas ];
platforms = with platforms; linux ++ darwin;
license = licenses.lgpl2;
};
}

60
pkgs/development/libraries/geoclue/default.nix
View File

@ -1,36 +1,56 @@
{ stdenv, fetchurl, dbus, dbus-glib, glib, pkgconfig, libxml2, gnome2,
libxslt, glib-networking }:
{ fetchurl, stdenv, intltool, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf
, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection
, withDemoAgent ? false
}:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "geoclue-0.12.0";
name = "geoclue-${version}";
version = "2.4.10";
src = fetchurl {
url = "https://launchpad.net/geoclue/trunk/0.12/+download/${name}.tar.gz";
sha256 = "15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg";
url = "https://www.freedesktop.org/software/geoclue/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0h4n8jf7w457sglfdhghkyf8n4v4a5jrx8dgdy5zn35nbscx24l4";
};
outputs = [ "out" "dev" ];
outputs = [ "out" "dev" "devdoc" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libxml2 gnome2.GConf libxslt glib-networking ];
nativeBuildInputs = [
pkgconfig intltool gtk-doc docbook_xsl docbook_xml_dtd_412 wrapGAppsHook gobjectIntrospection
];
propagatedBuildInputs = [dbus glib dbus-glib];
buildInputs = [
glib json-glib libsoup avahi
] ++ optionals withDemoAgent [
libnotify gdk_pixbuf
] ++ optionals (!stdenv.isDarwin) [ modemmanager ];
hardeningDisable = [ "format" ];
propagatedBuildInputs = [ glib glib-networking ];
preConfigure = ''
sed -e '/-Werror/d' -i configure
configureFlags = [
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--enable-introspection"
"--enable-gtk-doc"
"--enable-demo-agent=${if withDemoAgent then "yes" else "no"}"
] ++ optionals stdenv.isDarwin [
"--disable-silent-rules"
"--disable-3g-source"
"--disable-cdma-source"
"--disable-modem-gps-source"
"--disable-nmea-source"
];
# https://gitlab.freedesktop.org/geoclue/geoclue/issues/73
postInstall = ''
sed -i $dev/lib/pkgconfig/libgeoclue-2.0.pc -e "s|includedir=.*|includedir=$dev/include|"
'';
meta = with stdenv.lib; {
description = "Geolocation framework and some data providers";
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
homepage = https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home;
maintainers = with maintainers; [ raskin garbas ];
platforms = with platforms; linux ++ darwin;
license = licenses.lgpl2;
};
passthru = {
updateInfo = {
downloadPage = "http://folks.o-hand.com/jku/geoclue-releases/";
};
};
}

10
pkgs/development/libraries/gvfs/default.nix
View File

@ -4,7 +4,7 @@
, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp
, gnomeSupport ? false, gnome, makeWrapper
, libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh
, libsecret, libgdata
, libsecret, libgdata, python3
# Remove when switching back to meson
, autoreconfHook, lzma, bzip2
}:
@ -28,6 +28,10 @@ stdenv.mkDerivation rec {
sha256 = "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4";
};
postPatch = ''
patchShebangs test test-driver
'';
# Uncomment when switching back to meson
# postPatch = ''
# chmod +x meson_post_install.py # patchShebangs requires executable file
@ -73,6 +77,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
checkInputs = [ python3 ];
doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'"
doInstallCheck = doCheck;
preFixup = ''
for f in $out/libexec/*; do
wrapProgram $f \

5
pkgs/development/libraries/ilmbase/default.nix
View File

@ -20,6 +20,11 @@ stdenv.mkDerivation rec {
patches = [ ./bootstrap.patch ];
# fails 1 out of 1 tests with
# "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed"
# at least on i686. spooky!
doCheck = stdenv.isx86_64;
meta = with stdenv.lib; {
homepage = http://www.openexr.com/;
license = licenses.bsd3;

1
pkgs/development/libraries/libcommuni/default.nix
View File

@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
# The tests fail on darwin because of install_name if they run
# before the frameworks are installed.
doCheck = false;
doInstallCheck = true;
installCheckTarget = "check";

10
pkgs/development/libraries/libffi/default.nix
View File

@ -1,5 +1,9 @@
{ stdenv, fetchurl, fetchpatch, dejagnu, doCheck ? false
{ stdenv, fetchurl, fetchpatch
, buildPlatform, hostPlatform, autoreconfHook
# libffi is used in darwin stdenv
# we cannot run checks within it
, doCheck ? !stdenv.isDarwin, dejagnu
}:
stdenv.mkDerivation rec {
@ -40,8 +44,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" "info" ];
buildInputs = stdenv.lib.optional doCheck dejagnu;
nativeBuildInputs = stdenv.lib.optional hostPlatform.isRiscV autoreconfHook;
configureFlags = [
@ -54,6 +56,8 @@ stdenv.mkDerivation rec {
NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/}
'';
checkInputs = [ dejagnu ];
inherit doCheck;
dontStrip = hostPlatform != buildPlatform; # Don't run the native `strip' when cross-compiling.

4
pkgs/development/libraries/libguestfs/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
, ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex
, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen, libapparmor
, gmp, readline, file, libintl_perl, GetoptLong, SysVirt, numactl, xen, libapparmor
, getopt, perlPackages, ocamlPackages
, appliance ? null
, javaSupport ? false, jdk ? null }:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [
makeWrapper autoreconfHook ncurses cpio gperf perl
cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig
systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong
systemd fuse yajl libvirt gmp readline file hivex libintl_perl GetoptLong
SysVirt numactl xen libapparmor getopt perlPackages.ModuleBuild
] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ])
++ stdenv.lib.optional javaSupport jdk;

6
pkgs/development/libraries/librdf/rasqal.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2 }:
{ stdenv, fetchurl, librdf_raptor2, gmp, pkgconfig, pcre, libxml2, perl }:
stdenv.mkDerivation rec {
name = "rasqal-0.9.33";
@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
postInstall = "rm -rvf $out/share/gtk-doc";
checkInputs = [ perl ];
doCheck = false; # fails with "No testsuite plan file sparql-query-plan.ttl could be created in build/..."
doInstallCheck = false; # fails with "rasqal-config does not support (--help|--version)"
meta = {
description = "Library that handles Resource Description Framework (RDF)";
homepage = http://librdf.org/rasqal;

2
pkgs/development/libraries/libxml2/default.nix
View File

@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
homepage = http://xmlsoft.org/;
description = "An XML parsing library for C";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
platforms = lib.platforms.all;
maintainers = [ lib.maintainers.eelco ];
};
}

2
pkgs/development/libraries/libxslt/default.nix
View File

@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
homepage = http://xmlsoft.org/XSLT/;
description = "A C library and tools to do XSL transformations";
license = licenses.mit;
platforms = platforms.unix;
platforms = platforms.all;
maintainers = [ maintainers.eelco ];
};
}

4
pkgs/development/libraries/mdds/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, boost }:
stdenv.mkDerivation rec {
version = "1.3.1";
@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig"
'';
checkInputs = [ boost ];
meta = {
inherit version;
homepage = https://gitlab.com/mdds/mdds;

2
pkgs/development/libraries/mesa/default.nix
View File

@ -92,7 +92,7 @@ let self = stdenv.mkDerivation {
patches = [
./glx_ro_text_segm.patch # fix for grsecurity/PaX
./symlink-drivers.patch
./missing-include.patch # dev_t needs sys/stat.h, fixes build w/musl
./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl
];
outputs = [ "out" "dev" "drivers" "osmesa" ];

11
pkgs/development/libraries/mesa/missing-include.patch
View File

@ -1,11 +0,0 @@
--- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig
+++ ./src/gallium/winsys/svga/drm/vmw_screen.h
@@ -34,7 +34,7 @@
#ifndef VMW_SCREEN_H_
#define VMW_SCREEN_H_
-
+#include <sys/stat.h>
#include "pipe/p_compiler.h"
#include "pipe/p_state.h"

55
pkgs/development/libraries/mesa/missing-includes.patch Normal file
View File

@ -0,0 +1,55 @@
--- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig
+++ ./src/gallium/winsys/svga/drm/vmw_screen.h
@@ -34,7 +34,7 @@
#ifndef VMW_SCREEN_H_
#define VMW_SCREEN_H_
-
+#include <sys/stat.h>
#include "pipe/p_compiler.h"
#include "pipe/p_state.h"
--- ./src/gallium/state_trackers/nine/threadpool.h.orig 2015-05-07 14:10:53.443337212 +0200
+++ ./src/gallium/state_trackers/nine/threadpool.h 2015-05-07 14:11:04.210307653 +0200
@@ -24,6 +24,8 @@
#ifndef _THREADPOOL_H_
#define _THREADPOOL_H_
+#include <pthread.h>
+
#define MAXTHREADS 1
struct threadpool {
--- ./src/util/rand_xor.c.orig 2017-06-20 00:38:57.199474067 +0200
+++ ./src/util/rand_xor.c 2017-06-20 00:40:31.351279557 +0200
@@ -23,7 +23,9 @@
*/
#if defined(__linux__)
+#include <sys/types.h>
#include <sys/file.h>
+#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
#else
--- ./src/mesa/drivers/dri/i965/brw_bufmgr.h
+++ ./src/mesa/drivers/dri/i965/brw_bufmgr.h
@@ -37,6 +37,7 @@
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
+#include <time.h>
#include "util/u_atomic.h"
#include "util/list.h"
--- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
+++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
@@ -28,6 +28,8 @@
#ifndef RADV_AMDGPU_WINSYS_H
#define RADV_AMDGPU_WINSYS_H
+#include <sys/types.h>
+
#include "radv_radeon_winsys.h"
#include "ac_gpu_info.h"
#include "addrlib/addrinterface.h"<Paste>

6
pkgs/development/libraries/ncurses/default.nix
View File

@ -33,7 +33,11 @@ stdenv.mkDerivation rec {
"--enable-symlinks"
] ++ lib.optional unicode "--enable-widec"
++ lib.optional (!withCxx) "--without-cxx"
++ lib.optional (abiVersion == "5") "--with-abi-version=5";
++ lib.optional (abiVersion == "5") "--with-abi-version=5"
++ lib.optionals hostPlatform.isWindows [
"--enable-sp-funcs"
"--enable-term-driver"
];
# Only the C compiler, and explicitly not C++ compiler needs this flag on solaris:
CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED";

5
pkgs/development/libraries/neon/0.29.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libxml2, pkgconfig
{ stdenv, fetchurl, libxml2, pkgconfig, perl
, compressionSupport ? true, zlib ? null
, sslSupport ? true, openssl ? null
, static ? false
@ -38,6 +38,9 @@ stdenv.mkDerivation rec {
passthru = {inherit compressionSupport sslSupport;};
checkInputs = [ perl ];
doCheck = false; # fails, needs the net
meta = {
description = "An HTTP and WebDAV client library";
homepage = http://www.webdav.org/neon/;

5
pkgs/development/libraries/neon/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libxml2, pkgconfig
{ stdenv, fetchurl, libxml2, pkgconfig, perl
, compressionSupport ? true, zlib ? null
, sslSupport ? true, openssl ? null
, static ? false
@ -38,6 +38,9 @@ stdenv.mkDerivation rec {
passthru = {inherit compressionSupport sslSupport;};
checkInputs = [ perl ];
doCheck = false; # fails, needs the net
meta = {
description = "An HTTP and WebDAV client library";
homepage = http://www.webdav.org/neon/;

4
pkgs/development/libraries/npth/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "npth-1.5";
name = "npth-1.6";
src = fetchurl {
url = "mirror://gnupg/npth/${name}.tar.bz2";
sha256 = "1hmkkp6vzyrh8v01c2ynzf9vwikyagp7p1lxhbnr4ysk3w66jji9";
sha256 = "1lg2lkdd3z1s3rpyf88786l243adrzyk9p4q8z9n41ygmpcsp4qk";
};
doCheck = true;

4
pkgs/development/libraries/opencollada/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "opencollada-${version}";
version = "1.6.62";
version = "1.6.63";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "OpenCOLLADA";
rev = "v${version}";
sha256 = "0bqki6sdvxsp9drzj87ma6n7m98az9pr0vyxhgw8b8b9knk8c48r";
sha256 = "1x8hz5nkz4lxsf17jv8sdl92dmbbpkqck8jkkc6g32d8gbs3gha1";
};
nativeBuildInputs = [ pkgconfig ];

4
pkgs/development/libraries/openssl/default.nix
View File

@ -44,7 +44,9 @@ let
if hostPlatform == buildPlatform
then "./config"
else if hostPlatform.isMinGW
then "./Configure mingw${toString hostPlatform.parsed.cpu.bits}"
then "./Configure mingw${optionalString
(hostPlatform.parsed.cpu.bits != 32)
(toString hostPlatform.parsed.cpu.bits)}"
else if hostPlatform.isLinux
then "./Configure linux-generic${toString hostPlatform.parsed.cpu.bits}"
else if hostPlatform.isiOS

2
pkgs/development/python-modules/hypothesis/default.nix
View File

@ -20,9 +20,9 @@ buildPythonPackage rec {
sha256 = "063sn5m1966gvm3wrlxczdq4vw0r94h3nd9xpr94qxahpg2r4bpb";
};
checkInputs = [ pytest pytest_xdist flaky mock ];
propagatedBuildInputs = [ attrs coverage ] ++ lib.optional (!isPy3k) [ enum34 ];
checkInputs = [ pytest pytest_xdist flaky mock ];
inherit doCheck;
# https://github.com/DRMacIver/hypothesis/issues/300

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

@ -1,12 +1,12 @@
{ lib, buildPythonPackage, fetchPypi, requests, pytest }:
buildPythonPackage rec {
version = "2.3.0";
version = "2.3.3";
pname = "plaid-python";
src = fetchPypi {
inherit pname version;
sha256 = "0kp0crzjginmga6qvwwppar5b2pbdvwryf6vdpxgx7kkwzv33w97";
sha256 = "0jblc0bvzcns1dmsax6n0cvdg8867hm7snvdxa2l7v305h6gssjw";
};
checkInputs = [ pytest ];

7
pkgs/development/python-modules/pytest/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchPypi, attrs, hypothesis, py
, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
, atomicwrites, mock
, atomicwrites, mock, writeText
}:
buildPythonPackage rec {
version = "3.6.2";
@ -27,6 +27,11 @@ buildPythonPackage rec {
runHook postCheck
'';
# Don't create .pytest-cache when using py.test in a Nix build
setupHook = writeText "pytest-hook" ''
export PYTEST_ADDOPTS="-p no:cacheprovider"
'';
meta = with stdenv.lib; {
maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
platforms = platforms.unix;

3
pkgs/development/tools/misc/hydra/default.nix
View File

@ -22,7 +22,7 @@ let
CatalystPluginSessionStateCookie
CatalystPluginSessionStoreFastMmap
CatalystPluginStackTrace
CatalystPluginUnicodeEncoding
CatalystRuntime
CatalystTraitForRequestProxyBase
CatalystViewDownload
CatalystViewJSON
@ -52,7 +52,6 @@ let
SetScalar
Starman
SysHostnameLong
TestMore
TextDiff
TextTable
XMLSimple

4
pkgs/development/tools/ocaml/utop/default.nix
View File

@ -7,12 +7,12 @@ then throw "utop is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
version = "2.1.0";
version = "2.2.0";
name = "utop-${version}";
src = fetchurl {
url = "https://github.com/diml/utop/archive/${version}.tar.gz";
sha256 = "0lpfyhnm4v3xmcpac76g1px3x7na4p29w6xj2q8chqxhcw131n2y";
sha256 = "1414snwmqaxs1x8wbpjf6fn3jsl01hq0phrr7639xmb5vh15mgd4";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/development/tools/rust/racer/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
name = "racer-${version}";
version = "2.0.12";
version = "2.0.14";
src = fetchFromGitHub {
owner = "racer-rust";
repo = "racer";
rev = version;
sha256 = "0y1xlpjr8y8gsmmrjlykx4vwzf8akk42g35kg3kc419ry4fli945";
sha256 = "0kgax74qa09axq7b175ph3psprgidwgsml83wm1qwdq16gpxiaif";
};
cargoSha256 = "1h3jv4hajdv6k309kjr6b6298kxmd0faw081i3788sl794k9mp0j";
cargoSha256 = "1j3fviimdxn6xa75z0l9wkgdnznp8q20jjs42mql6ql782dga5lk";
# rustup is required for test
buildInputs = [ makeWrapper rustup ];

2
pkgs/development/web/postman/default.nix
View File

@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
pkgs.alsaLib
pkgs.cairo
pkgs.cups
pkgs.dbus_daemon.lib
pkgs.dbus.daemon.lib
pkgs.expat
pkgs.gdk_pixbuf
pkgs.glib

4
pkgs/games/cutemaze/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "cutemaze-${version}";
version = "1.2.3";
version = "1.2.4";
src = fetchurl {
url = "https://gottcode.org/cutemaze/${name}-src.tar.bz2";
sha256 = "1gczg8bki9d2kkkkrac5wi4vnjdynv8xjw2qxn9lx1jfkm8fk1qk";
sha256 = "0l727j28igs7cx6gvxs43vvzhp3hk0z61df7sprp1vdxzpzzfifl";
};
nativeBuildInputs = [ qmake qttools ];

2
pkgs/games/steam/runtime-wrapped.nix
View File

@ -8,7 +8,7 @@ let
libpulseaudio
alsaLib
openalSoft
libva1-full
libva1
libvdpau
vulkan-loader
gcc.cc

4
pkgs/os-specific/linux/acpid/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook }:
stdenv.mkDerivation rec {
name = "acpid-2.0.29";
name = "acpid-2.0.30";
src = fetchurl {
url = "mirror://sourceforge/acpid2/${name}.tar.xz";
sha256 = "1zq38al07z92r2md18zivrzgjqnn7m2wahdpgri6wijwjwkknl2q";
sha256 = "1jzl7hiaspr5xkmsrbl69bib8cs3dp6bq5ix58fbskpnsdi7pdr8";
};
nativeBuildInputs = [ autoreconfHook ];

4
pkgs/os-specific/linux/batman-adv/batctl.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, libnl }:
let
ver = "2018.1";
ver = "2018.2";
in
stdenv.mkDerivation rec {
name = "batctl-${ver}";
src = fetchurl {
url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
sha256 = "0lxm0vb0w1gxyi5k553jgkpmhifc4cykzfybrsk8hvwilq6pv1r7";
sha256 = "09bxh4yifqiphn0ljc3msbxid62ynd9kk3vn82h13gcpfnyckw6z";
};
nativeBuildInputs = [ pkgconfig ];

4
pkgs/os-specific/linux/busybox/default.nix
View File

@ -32,14 +32,14 @@ let
in
stdenv.mkDerivation rec {
name = "busybox-1.29.0";
name = "busybox-1.29.1";
# Note to whoever is updating busybox: please verify that:
# nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test
# still builds after the update.
src = fetchurl {
url = "https://busybox.net/downloads/${name}.tar.bz2";
sha256 = "10hccqprhr1mwkqc9i3kny44mb6sdmv9hl63wx20cr5yy095c4f8";
sha256 = "1hqlr5b3bsyb6avadz1z4za6pyl32r1krnpcpwwqilhnx8q0f9gw";
};
hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ];

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