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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát 2017-01-08 14:27:01 +01:00
commit 309c63c542
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
44 changed files with 373 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -444,6 +444,7 @@
spinus = "Tomasz Czyż <tomasz.czyz@gmail.com>";
sprock = "Roger Mason <rmason@mun.ca>";
spwhitt = "Spencer Whitt <sw@swhitt.me>";
srhb = "Sarah Brofeldt <sbrofeldt@gmail.com>";
SShrike = "Severen Redwood <severen@shrike.me>";
stephenmw = "Stephen Weinberg <stephen@q5comm.com>";
sternenseemann = "Lukas Epple <post@lukasepple.de>";

2
nixos/modules/misc/version.nix
View File

@ -99,7 +99,7 @@ in
};
# Generate /etc/os-release. See
# http://0pointer.de/public/systemd-man/os-release.html for the
# https://www.freedesktop.org/software/systemd/man/os-release.html for the
# format.
environment.etc."os-release".text =
''

2
nixos/modules/services/networking/bind.nix
View File

@ -155,7 +155,7 @@ in
chown ${bindUser} /var/run/named
'';
script = "${pkgs.bind.bin}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
script = "${pkgs.bind.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
unitConfig.Documentation = "man:named(8)";
};
};

7
pkgs/applications/misc/sakura/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre, glib }:
{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre, glib , makeWrapper }:
stdenv.mkDerivation rec {
name = "sakura-${version}";
@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake perl pkgconfig ];
buildInputs = [ gtk3 vte pcre glib ];
buildInputs = [ makeWrapper gtk3 vte pcre glib ];
# Wrapper sets path to gsettings-schemata so sakura knows where to find colorchooser, fontchooser ...
postInstall = "wrapProgram $out/bin/sakura --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/";
meta = with stdenv.lib; {
description = "A terminal emulator based on GTK and VTE";

3
pkgs/applications/networking/instant-messengers/skype/default.nix
View File

@ -38,6 +38,9 @@ stdenv.mkDerivation rec {
mkdir -p $out/{libexec/skype/,bin}
cp -r * $out/libexec/skype/
# Fix execution on PaX-enabled kernels
paxmark m $out/libexec/skype/skype
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${lib.makeLibraryPath buildInputs}" $out/libexec/skype/skype

3
pkgs/build-support/fetchgit/nix-prefetch-git
View File

@ -406,8 +406,7 @@ else
finalPath=$(nix-store --add-fixed --recursive "$hashType" "$tmpFile")
if test -n "$expHash" -a "$expHash" != "$hash"; then
print_metadata
echo "hash mismatch for URL \`$url'" >&2
echo "hash mismatch for URL \`$url'. Got \`$hash'; expected \`$expHash'." >&2
exit 1
fi
fi

34
pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
View File

@ -1,5 +1,8 @@
{stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk, pango,
libxml2Python, perl, intltool, gettext}:
{stdenv, fetchpatch, fetchurl, autoreconfHook, pkgconfig, atk, cairo, glib
, gnome_common, gtk, pango
, libxml2Python, perl, intltool, gettext, gtk-mac-integration }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "gtksourceview-${version}";
@ -9,6 +12,29 @@ stdenv.mkDerivation rec {
url = "mirror://gnome/sources/gtksourceview/2.10/${name}.tar.bz2";
sha256 = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e";
};
buildInputs = [pkgconfig atk cairo glib gtk pango libxml2Python perl intltool
gettext];
patches = optionals stdenv.isDarwin [
(fetchpatch {
name = "change-igemacintegration-to-gtkosxapplication.patch";
url = "https://git.gnome.org/browse/gtksourceview/patch/?id=e88357c5f210a8796104505c090fb6a04c213902";
sha256 = "0h5q79q9dqbg46zcyay71xn1pm4aji925gjd5j93v4wqn41wj5m7";
})
(fetchpatch {
name = "update-to-gtk-mac-integration-2.0-api.patch";
url = "https://git.gnome.org/browse/gtksourceview/patch/?id=ab46e552e1d0dae73f72adac8d578e40bdadaf95";
sha256 = "0qzrbv4hpa0v8qbmpi2vp575n13lkrvp3cgllwrd2pslw1v9q3aj";
})
];
buildInputs = [
pkgconfig atk cairo glib gtk
pango libxml2Python perl intltool
gettext
] ++ optionals stdenv.isDarwin [
autoreconfHook gnome_common gtk-mac-integration
];
preConfigure = optionalString stdenv.isDarwin ''
intltoolize --force
'';
}

13
pkgs/desktops/kde-5/plasma/kde-gtk-config/0001-follow-symlinks.patch
View File

@ -37,3 +37,16 @@ index 07c7ad7..b04d978 100644
--
2.6.2
diff --git a/src/cursorthemesmodel.cpp b/src/cursorthemesmodel.cpp
index 926a666..85b10f8 100644
--- a/src/cursorthemesmodel.cpp
+++ b/src/cursorthemesmodel.cpp
@@ -47,7 +47,7 @@ QList<QDir> CursorThemesModel::installedThemesPaths()
foreach(const QString& dir, dirs) {
QDir userIconsDir(dir);
- QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);
+ QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs);
while(it.hasNext()) {
QString currentPath = it.next();
QDir dir(currentPath);

6
pkgs/development/compilers/ghc/8.0.2.nix
View File

@ -13,12 +13,12 @@ let
});
in
stdenv.mkDerivation rec {
version = "8.0.1.20161213";
version = "8.0.2";
name = "ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/~ghc/8.0.2-rc2/${name}-src.tar.xz";
sha256 = "0l1arhbh3rbs011f0y4pgc35yn07x3hz6lfqlvqbwn96f8ff5529";
url = "https://downloads.haskell.org/~ghc/8.0.2/${name}-src.tar.xz";
sha256 = "1c8qc4fhkycynk4g1f9hvk53dj6a1vvqi6bklqznns6hw59m8qhi";
};
patches = [] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;

13
pkgs/development/compilers/ghc/head.nix
View File

@ -8,8 +8,12 @@ let
commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
version = "8.1.20170106";
rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd";
commonPreConfigure = ''
echo ${version} >VERSION
echo ${rev} >GIT_COMMIT_ID
./boot
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
@ -17,9 +21,8 @@ let
export NIX_LDFLAGS+=" -no_dtrace_dof"
'';
in stdenv.mkDerivation (rec {
inherit version;
inherit version rev;
name = "ghc-${version}";
rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd";
src = fetchgit {
url = "git://git.haskell.org/ghc.git";
@ -29,11 +32,7 @@ in stdenv.mkDerivation (rec {
postPatch = "patchShebangs .";
preConfigure = ''
echo ${version} >VERSION
echo ${rev} >GIT_COMMIT_ID
./boot
'' + commonPreConfigure ;
preConfigure = commonPreConfigure;
buildInputs = commonBuildInputs;

3
pkgs/development/compilers/rust/nightlyBin.nix
View File

@ -49,6 +49,9 @@ rec {
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
"$out/bin/rustc"
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
"$out/bin/rustdoc"
''}
'';

7
pkgs/development/haskell-modules/configuration-ghc-head.nix
View File

@ -86,4 +86,11 @@ self: super: {
# Won't work with LLVM 3.5.
llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general;
# A bunch of jailbreaks due to 'base' bump
old-locale = doJailbreak super.old-locale;
primitive = doJailbreak super.primitive;
test-framework = doJailbreak super.test-framework;
atomic-primops = doJailbreak (appendPatch super.atomic-primops ./patches/atomic-primops-Cabal-1.25.patch);
hashable = doJailbreak super.hashable;
stm = doJailbreak super.stm;
}

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

@ -91117,8 +91117,8 @@ self: {
({ mkDerivation, base, hledger-lib, text, time }:
mkDerivation {
pname = "hledger-diff";
version = "0.2.0.6";
sha256 = "0ef38d60055fb632f3a686b5ce8aee0af5637e51b17d4c5a27764dd485c52b75";
version = "0.2.0.7";
sha256 = "1x7ngm0h9hsbf4p8vx1h4z1w9hlqkqfa39v2dvmlxrcx6rs8dzsl";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ base hledger-lib text time ];
@ -106695,8 +106695,8 @@ self: {
({ mkDerivation, base, Cabal }:
mkDerivation {
pname = "jailbreak-cabal";
version = "1.3.1";
sha256 = "610d8dbd04281eee3d5da05c9eef45bfd1a1ddca20dfe54f283e15ddf6d5c235";
version = "1.3.2";
sha256 = "1x2h54sx4ycik34q8f9g698xc2b7fai18918cd08qx7w7ny8nai1";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ base Cabal ];

37
pkgs/development/haskell-modules/patches/atomic-primops-Cabal-1.25.patch Normal file
View File

@ -0,0 +1,37 @@
diff --git a/Setup.hs b/Setup.hs
index ddf5a02..7ad1f26 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,4 +1,4 @@
-
+{-# LANGUAGE CPP #-}
import Control.Monad (when)
import Language.Haskell.TH
import Distribution.Simple (defaultMainWithHooks, simpleUserHooks, UserHooks(postConf), Args)
@@ -6,14 +6,25 @@ import Distribution.Simple.Utils (cabalVersion)
import Distribution.Simple.LocalBuildInfo
import Distribution.Simple.Setup (ConfigFlags)
import Distribution.Version (Version(..))
+#if MIN_VERSION_Cabal(1,25,0)
+import Distribution.Version (mkVersion)
+#endif
import Distribution.PackageDescription (PackageDescription)
import Debug.Trace
+#if MIN_VERSION_Cabal(1,25,0)
+versionBranch :: Version -> Version
+versionBranch = id
+#else
+mkVersion :: [Int] -> Version
+mkVersion vs = Version vs []
+#endif
+
-- I couldn't figure out a way to do this check from the cabal file, so we drop down
-- here to do it instead:
checkGoodVersion :: IO ()
checkGoodVersion =
- if cabalVersion >= Version [1,17,0] []
+ if cabalVersion >= mkVersion [1,17,0]
then putStrLn (" [Setup.hs] This version of Cabal is ok for profiling: "++show cabalVersion)
else error (" [Setup.hs] This package should not be used in profiling mode with cabal version "++
show (versionBranch cabalVersion)++" < 1.17.0\n"++

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

@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
libiconv
] ++ libintlOrEmpty ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
CoreGraphics
ApplicationServices
CoreText
Carbon
]);
@ -56,6 +56,9 @@ stdenv.mkDerivation rec {
++ optionals xcbSupport [ libxcb xcbutil ]
++ optional gobjectSupport glib
++ optional glSupport mesa_noglu
++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
ApplicationServices
])
; # TODO: maybe liblzo but what would it be for here?
configureFlags = if stdenv.isDarwin then [

6
pkgs/development/libraries/cpp-ipfs-api/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "cpp-ipfs-api-${version}";
version = "2016-11-09";
version = "2017-01-04";
src = fetchFromGitHub {
owner = "vasild";
repo = "cpp-ipfs-api";
rev = "46e473e49ede4fd829235f1d4930754d5356a747";
sha256 = "10c5hmg9857zb0fp262ca4a42gq9iqdyqz7f975cp3qs70x12q08";
rev = "96a890f4518665a56581a2a52311eaa65928eac8";
sha256 = "1z6gbd7npg4pd9wmdyzcp9h12sg84d7a43c69pp4lzqkyqg8pz1g";
};
buildInputs = [ cmake curl ];

17
pkgs/development/libraries/gtk+/2.x.nix
View File

@ -2,11 +2,15 @@
, gdk_pixbuf, libintlOrEmpty, xlibsWrapper
, xineramaSupport ? stdenv.isLinux
, cupsSupport ? true, cups ? null
, gdktarget ? "x11"
, AppKit, Cocoa
}:
assert xineramaSupport -> xorg.libXinerama != null;
assert cupsSupport -> cups != null;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "gtk+-2.24.31";
@ -20,7 +24,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (libintlOrEmpty != []) "-lintl";
NIX_CFLAGS_COMPILE = optionalString (libintlOrEmpty != []) "-lintl";
setupHook = ./setup-hook.sh;
@ -28,7 +32,7 @@ stdenv.mkDerivation rec {
patches = [ ./2.0-immodules.cache.patch ];
propagatedBuildInputs = with xorg; with stdenv.lib;
propagatedBuildInputs = with xorg;
[ glib cairo pango gdk_pixbuf atk ]
++ optionals (stdenv.isLinux || stdenv.isDarwin) [
libXrandr libXrender libXcomposite libXi libXcursor
@ -36,11 +40,13 @@ stdenv.mkDerivation rec {
++ optionals stdenv.isDarwin [ xlibsWrapper libXdamage ]
++ libintlOrEmpty
++ optional xineramaSupport libXinerama
++ optionals cupsSupport [ cups ];
++ optionals cupsSupport [ cups ]
++ optionals (gdktarget == "quartz") [ AppKit Cocoa ];
configureFlags = [
"--with-gdktarget=${gdktarget}"
"--with-xinput=yes"
] ++ stdenv.lib.optionals stdenv.isDarwin [
] ++ optionals stdenv.isDarwin [
"--disable-glibtest"
"--disable-introspection"
"--disable-visibility"
@ -57,9 +63,10 @@ stdenv.mkDerivation rec {
rm $out/lib/gtk-2.0/2.10.0/immodules.cache
$out/bin/gtk-query-immodules-2.0 $out/lib/gtk-2.0/2.10.0/immodules/*.so > $out/lib/gtk-2.0/2.10.0/immodules.cache
''; # workaround for bug of nix-mode for Emacs */ '';
inherit gdktarget;
};
meta = with stdenv.lib; {
meta = {
description = "A multi-platform toolkit for creating graphical user interfaces";
homepage = http://www.gtk.org/;
license = licenses.lgpl2Plus;

30
pkgs/development/libraries/gtk-mac-integration/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk_doc, gtk }:
stdenv.mkDerivation rec {
name = "gtk-mac-integration-2.0.8";
src = fetchFromGitHub {
owner = "GNOME";
repo = "gtk-mac-integration";
rev = "79e708870cdeea24ecdb036c77b4630104ae1776";
sha256 = "1fbhnvj0rqc3089ypvgnpkp6ad2rr37v5qk38008dgamb9h7f3qs";
};
nativeBuildInputs = [ autoreconfHook pkgconfig gtk_doc ];
buildInputs = [ glib gtk ];
preAutoreconf = ''
gtkdocize
'';
meta = with lib; {
description = "Provides integration for Gtk+ applications into the Mac desktop";
license = licenses.lgpl21;
homepage = https://wiki.gnome.org/Projects/GTK+/OSX/Integration;
maintainers = [ maintainers.matthewbauer ];
platforms = platforms.darwin;
};
}

19
pkgs/development/libraries/ldns/default.nix
View File

@ -1,25 +1,26 @@
{stdenv, fetchurl, openssl, perl}:
stdenv.mkDerivation rec {
name = "ldns-1.6.17";
pname = "ldns";
version = "1.7.0";
name = "${pname}-${version}";
src = fetchurl {
url = "http://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz";
sha256 = "1kf8pkwhcssvgzhh6ha1pjjiziwvwmfaali7kaafh6118mcy124b";
url = "https://www.nlnetlabs.nl/downloads/ldns/${name}.tar.gz";
sha1 = "ceeeccf8a27e61a854762737f6ee02f44662c1b8";
};
outputs = [ "out" "dev" ];
patches = [ ./perl-5.22-compat.patch ];
postPatch = ''
patchPhase = ''
patchShebangs doc/doxyparse.pl
'';
outputs = [ "out" "dev" ];
nativeBuildInputs = [ perl ];
buildInputs = [ openssl ];
configureFlags = [ "--with-ssl=${openssl.dev}" "--with-drill" ];
configureFlags = [ "--with-ssl=${openssl.dev}" "--with-drill"];
postInstall = ''
moveToOutput "bin/ldns-config" "$dev"

12
pkgs/development/libraries/ldns/perl-5.22-compat.patch
View File

@ -1,12 +0,0 @@
diff -Naur old/doc/doxyparse.pl new/doc/doxyparse.pl
--- old/doc/doxyparse.pl 2014-01-11 06:04:41.000000000 +0900
+++ new/doc/doxyparse.pl 2015-08-08 22:29:34.216889652 +0900
@@ -273,7 +273,7 @@
print MAN $MAN_MIDDLE;
- if (defined(@$also)) {
+ if (@$also) {
print MAN "\n.SH SEE ALSO\n\\fI";
print MAN join "\\fR, \\fI", @$also;
print MAN "\\fR.\nAnd ";

4
pkgs/development/libraries/libpng/12.nix
View File

@ -3,11 +3,11 @@
assert !(stdenv ? cross) -> zlib != null;
stdenv.mkDerivation rec {
name = "libpng-1.2.56";
name = "libpng-1.2.57";
src = fetchurl {
url = "mirror://sourceforge/libpng/${name}.tar.xz";
sha256 = "1ghd03p353x0vi4dk83n1nlldg11w7vqdk3f99rkgfb82ic59ki4";
sha256 = "1n2lrzjkm5jhfg2bs10q398lkwbbx742fi27zgdgx0x23zhj0ihg";
};
outputs = [ "out" "dev" "man" ];

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, postgresql, python2 }:
{ lib, stdenv, fetchurl, postgresql, python2, gnused }:
stdenv.mkDerivation rec {
name = "libpqxx-4.0.1";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0f6wxspp6rx12fkasanb0z2g2gc8dhcfwnxagx8wwqbpg6ifsz09";
};
buildInputs = [ postgresql python2 ];
buildInputs = [ postgresql python2 gnused ];
preConfigure = ''
patchShebangs .

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

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "libtermkey-${version}";
version = "0.18";
version = "0.19";
src = fetchzip {
url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-${version}.tar.gz";
sha256 = "0a0ih1a114phzmyq6jzgbp03x97463fwvrp1cgnl26awqw3f8sbf";
sha256 = "0v85h0zacd5lqwkykl2ms4009x8mfidzb6jr4dsq4gh7kwm54w56";
};
makeFlags = [ "PREFIX=$(out)" ]

3
pkgs/development/libraries/libuv/default.nix
View File

@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
toDisable = [
"getnameinfo_basic" # probably network-dependent
"spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces
"getaddrinfo_fail" "getaddrinfo_fail_sync"
];
tdRegexp = lib.concatStringsSep "\\|" toDisable;
in lib.optionalString doCheck ''
@ -33,8 +34,6 @@ stdenv.mkDerivation rec {
doCheck = true;
crossAttrs.doCheck = false;
meta = with lib; {
description = "A multi-platform support library with a focus on asynchronous I/O";
homepage = https://github.com/libuv/libuv;

23
pkgs/development/libraries/openjpeg/2.1.nix
View File

@ -1,4 +1,4 @@
{ callPackage, ... } @ args:
{ callPackage, fetchpatch, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "2.1.2";
@ -12,5 +12,26 @@ callPackage ./generic.nix (args // rec {
# Put in our source code to make sure we don't lose it, since that
# referenced commit is someone else's fork, and not actually up-stream.
./CVE-2016-9580-and-CVE-2016-9581.patch
(fetchpatch {
url = "https://bugzilla.suse.com/attachment.cgi?id=707359&action=diff&context=patch&collapsed=&headers=1&format=raw";
name = "CVE-2016-9112.patch";
sha256 = "18hqx73wdzfybr5n5k6pzhbhdlmawiqbjci8n82zykxiyfgp18pd";
})
(fetchpatch {
url = "https://bugzilla.suse.com/attachment.cgi?id=707354&action=diff&context=patch&collapsed=&headers=1&format=raw";
name = "CVE-2016-9114.patch";
sha256 = "0qam3arw9kdbh4501xim2pyldl708dnpyjwvjmwc9gc7hcq4gfi3";
})
(fetchpatch {
url = "https://bugzilla.suse.com/attachment.cgi?id=707356&action=diff&context=patch&collapsed=&headers=1&format=raw";
name = "CVE-2016-9116.patch";
sha256 = "0yyb3pxqi5sr44a48bacngzp206j4z49lzkg6hbkz1nra9na61a3";
})
(fetchpatch {
url = "https://bugzilla.suse.com/attachment.cgi?id=707358&action=diff&context=patch&collapsed=&headers=1&format=raw";
name = "CVE-2016-9118.patch";
sha256 = "125n8bmh07y7697s0y82ypb39rxgj0bdn8rcywbvamscagwg2wy9";
})
];
})

11
pkgs/development/libraries/pango/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz
, libintlOrEmpty, gobjectIntrospection
, libintlOrEmpty, gobjectIntrospection, darwin
}:
with stdenv.lib;
@ -19,7 +19,12 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "devdoc" ];
buildInputs = [ gobjectIntrospection ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig ]
++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
Carbon
CoreGraphics
CoreText
]);
propagatedBuildInputs = [ cairo harfbuzz libXft ] ++ libintlOrEmpty;
enableParallelBuilding = true;
@ -48,6 +53,6 @@ stdenv.mkDerivation rec {
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ raskin urkud ];
platforms = with platforms; linux ++ darwin;
platforms = platforms.linux ++ platforms.darwin;
};
}

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

@ -11,13 +11,13 @@
let
pname = "discord.py";
version = "0.15.1";
version = "0.16.0";
in buildPythonPackage rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
sha256 = "01lgidvnwwva1i65853gaplamllym2nsk0jis2r6f1rzbamgk1yj";
sha256 = "0r3qqvx36vywjyjk1nh11ymmr8y81sb45nk63665kcjagx8qnmfx";
};
propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ];

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

@ -3,7 +3,7 @@
buildPythonPackage rec {
name = "pygtk-2.24.0";
disabled = isPy3k;
src = fetchurl {
@ -20,6 +20,8 @@ buildPythonPackage rec {
buildPhase = "buildPhase";
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-ObjC";
installPhase = "installPhase";
checkPhase = stdenv.lib.optionalString (libglade == null)

111
pkgs/development/r-modules/default.nix
View File

@ -240,30 +240,30 @@ let
audio = [ pkgs.portaudio ];
BayesSAE = [ pkgs.gsl_1 ];
BayesVarSel = [ pkgs.gsl_1 ];
BayesXsrc = [ pkgs.readline pkgs.ncurses ];
BayesXsrc = [ pkgs.readline.dev pkgs.ncurses ];
bigGP = [ pkgs.openmpi ];
BiocCheck = [ pkgs.which ];
Biostrings = [ pkgs.zlib ];
bnpmr = [ pkgs.gsl_1 ];
BNSP = [ pkgs.gsl_1 ];
cairoDevice = [ pkgs.gtk2 ];
Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo ];
cairoDevice = [ pkgs.gtk2.dev ];
Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo.dev pkgs.x11 pkgs.fontconfig.lib ];
Cardinal = [ pkgs.which ];
chebpol = [ pkgs.fftw ];
ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ];
cit = [ pkgs.gsl_1 ];
curl = [ pkgs.curl.dev ];
devEMF = [ pkgs.xorg.libXft ];
devEMF = [ pkgs.xorg.libXft.dev pkgs.x11 ];
diversitree = [ pkgs.gsl_1 pkgs.fftw ];
EMCluster = [ pkgs.liblapack ];
fftw = [ pkgs.fftw ];
fftwtools = [ pkgs.fftw ];
fftw = [ pkgs.fftw.dev ];
fftwtools = [ pkgs.fftw.dev ];
Formula = [ pkgs.gmp ];
geoCount = [ pkgs.gsl_1 ];
git2r = [ pkgs.zlib pkgs.openssl ];
git2r = [ pkgs.zlib.dev pkgs.openssl.dev ];
GLAD = [ pkgs.gsl_1 ];
glpkAPI = [ pkgs.gmp pkgs.glpk ];
gmp = [ pkgs.gmp ];
gmp = [ pkgs.gmp.dev ];
graphscan = [ pkgs.gsl_1 ];
gsl = [ pkgs.gsl_1 ];
h5 = [ pkgs.hdf5-cpp pkgs.which ];
@ -272,13 +272,13 @@ let
iBMQ = [ pkgs.gsl_1 ];
igraph = [ pkgs.gmp ];
JavaGD = [ pkgs.jdk ];
jpeg = [ pkgs.libjpeg ];
jpeg = [ pkgs.libjpeg.dev ];
KFKSDS = [ pkgs.gsl_1 ];
kza = [ pkgs.fftw ];
kza = [ pkgs.fftw.dev ];
libamtrack = [ pkgs.gsl_1 ];
mixcat = [ pkgs.gsl_1 ];
mvabund = [ pkgs.gsl_1 ];
mwaved = [ pkgs.fftw ];
mwaved = [ pkgs.fftw.dev ];
ncdf4 = [ pkgs.netcdf ];
nloptr = [ pkgs.nlopt ];
openssl = [ pkgs.openssl.dev ];
@ -287,99 +287,99 @@ let
pbdMPI = [ pkgs.openmpi ];
pbdNCDF4 = [ pkgs.netcdf ];
pbdPROF = [ pkgs.openmpi ];
PKI = [ pkgs.openssl ];
PKI = [ pkgs.openssl.dev ];
png = [ pkgs.libpng.dev ];
PopGenome = [ pkgs.zlib ];
PopGenome = [ pkgs.zlib.dev ];
proj4 = [ pkgs.proj ];
qtbase = [ pkgs.qt4 ];
qtpaint = [ pkgs.qt4 ];
R2GUESS = [ pkgs.gsl_1 ];
R2SWF = [ pkgs.zlib pkgs.libpng pkgs.freetype ];
R2SWF = [ pkgs.zlib pkgs.libpng pkgs.freetype.dev ];
RAppArmor = [ pkgs.libapparmor ];
rapportools = [ pkgs.which ];
rapport = [ pkgs.which ];
rbamtools = [ pkgs.zlib ];
rcdd = [ pkgs.gmp ];
RcppCNPy = [ pkgs.zlib ];
rbamtools = [ pkgs.zlib.dev ];
rcdd = [ pkgs.gmp.dev ];
RcppCNPy = [ pkgs.zlib.dev ];
RcppGSL = [ pkgs.gsl_1 ];
RcppOctave = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.octave ];
RcppOctave = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.pcre.dev pkgs.octave ];
RcppZiggurat = [ pkgs.gsl_1 ];
rgdal = [ pkgs.proj pkgs.gdal ];
rgeos = [ pkgs.geos ];
rggobi = [ pkgs.ggobi pkgs.gtk2 pkgs.libxml2 ];
rggobi = [ pkgs.ggobi pkgs.gtk2.dev pkgs.libxml2.dev ];
rgl = [ pkgs.mesa pkgs.xlibsWrapper ];
Rglpk = [ pkgs.glpk ];
RGtk2 = [ pkgs.gtk2 ];
RGtk2 = [ pkgs.gtk2.dev ];
rhdf5 = [ pkgs.zlib ];
Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ];
Rhtslib = [ pkgs.zlib ];
RJaCGH = [ pkgs.zlib ];
Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.openmpi pkgs.pcre.dev ];
Rhtslib = [ pkgs.zlib.dev ];
RJaCGH = [ pkgs.zlib.dev ];
rjags = [ pkgs.jags ];
rJava = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre pkgs.jdk pkgs.libzip ];
rJava = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.pcre.dev pkgs.jdk pkgs.libzip ];
Rlibeemd = [ pkgs.gsl_1 ];
rmatio = [ pkgs.zlib ];
Rmpfr = [ pkgs.gmp pkgs.mpfr ];
rmatio = [ pkgs.zlib.dev ];
Rmpfr = [ pkgs.gmp pkgs.mpfr.dev ];
Rmpi = [ pkgs.openmpi ];
RMySQL = [ pkgs.zlib pkgs.mysql.lib ];
RNetCDF = [ pkgs.netcdf pkgs.udunits ];
RODBCext = [ pkgs.libiodbc ];
RODBC = [ pkgs.libiodbc ];
rpg = [ pkgs.postgresql ];
rphast = [ pkgs.pcre pkgs.zlib pkgs.bzip2 pkgs.gzip pkgs.readline ];
rphast = [ pkgs.pcre.dev pkgs.zlib pkgs.bzip2 pkgs.gzip pkgs.readline ];
Rpoppler = [ pkgs.poppler ];
RPostgreSQL = [ pkgs.postgresql ];
RProtoBuf = [ pkgs.protobuf ];
rPython = [ pkgs.python ];
RSclient = [ pkgs.openssl ];
RSclient = [ pkgs.openssl.dev ];
Rserve = [ pkgs.openssl ];
Rssa = [ pkgs.fftw ];
rtfbs = [ pkgs.zlib pkgs.pcre pkgs.bzip2 pkgs.gzip pkgs.readline ];
rtiff = [ pkgs.libtiff ];
Rssa = [ pkgs.fftw.dev ];
rtfbs = [ pkgs.zlib pkgs.pcre.dev pkgs.bzip2 pkgs.gzip pkgs.readline ];
rtiff = [ pkgs.libtiff.dev ];
runjags = [ pkgs.jags ];
RVowpalWabbit = [ pkgs.zlib pkgs.boost ];
RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ];
rzmq = [ pkgs.zeromq3 ];
SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ];
sdcTable = [ pkgs.gmp pkgs.glpk ];
seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ];
seqinr = [ pkgs.zlib ];
seqminer = [ pkgs.zlib pkgs.bzip2 ];
showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype ];
seqinr = [ pkgs.zlib.dev ];
seqminer = [ pkgs.zlib.dev pkgs.bzip2 ];
showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype.dev ];
simplexreg = [ pkgs.gsl_1 ];
SOD = [ pkgs.cudatoolkit ]; # requres CL/cl.h
spate = [ pkgs.fftw ];
spate = [ pkgs.fftw.dev ];
sprint = [ pkgs.openmpi ];
ssanv = [ pkgs.proj ];
stsm = [ pkgs.gsl_1 ];
stringi = [ pkgs.icu.dev ];
survSNP = [ pkgs.gsl_1 ];
sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype ];
TAQMNGR = [ pkgs.zlib ];
tiff = [ pkgs.libtiff ];
sysfonts = [ pkgs.zlib pkgs.libpng pkgs.freetype.dev ];
TAQMNGR = [ pkgs.zlib.dev ];
tiff = [ pkgs.libtiff.dev ];
TKF = [ pkgs.gsl_1 ];
tkrplot = [ pkgs.xorg.libX11 ];
tkrplot = [ pkgs.xorg.libX11 pkgs.tk.dev ];
topicmodels = [ pkgs.gsl_1 ];
udunits2 = [ pkgs.udunits pkgs.expat ];
V8 = [ pkgs.v8 ];
VBLPCM = [ pkgs.gsl_1 ];
VBmix = [ pkgs.gsl_1 pkgs.fftw pkgs.qt4 ];
WhopGenome = [ pkgs.zlib ];
XBRL = [ pkgs.zlib pkgs.libxml2 ];
xml2 = [ pkgs.libxml2 ];
WhopGenome = [ pkgs.zlib.dev ];
XBRL = [ pkgs.zlib pkgs.libxml2.dev ];
xml2 = [ pkgs.libxml2.dev ];
XML = [ pkgs.libtool pkgs.libxml2.dev pkgs.xmlsec pkgs.libxslt ];
affyPLM = [ pkgs.zlib ];
bamsignals = [ pkgs.zlib ];
BitSeq = [ pkgs.zlib ];
affyPLM = [ pkgs.zlib.dev ];
bamsignals = [ pkgs.zlib.dev ];
BitSeq = [ pkgs.zlib.dev ];
DiffBind = [ pkgs.zlib ];
ShortRead = [ pkgs.zlib.dev ];
oligo = [ pkgs.zlib ];
gmapR = [ pkgs.zlib ];
Rsubread = [ pkgs.zlib ];
oligo = [ pkgs.zlib.dev ];
gmapR = [ pkgs.zlib.dev ];
Rsubread = [ pkgs.zlib.dev ];
XVector = [ pkgs.zlib.dev ];
Rsamtools = [ pkgs.zlib.dev ];
rtracklayer = [ pkgs.zlib ];
affyio = [ pkgs.zlib ];
VariantAnnotation = [ pkgs.zlib ];
snpStats = [ pkgs.zlib ];
rtracklayer = [ pkgs.zlib.dev ];
affyio = [ pkgs.zlib.dev ];
VariantAnnotation = [ pkgs.zlib.dev ];
snpStats = [ pkgs.zlib.dev ];
};
packagesWithBuildInputs = {
@ -1791,6 +1791,10 @@ let
'';
});
Cairo = old.Cairo.overrideDerivation (attrs: {
NIX_LDFLAGS = "-lfontconfig";
});
curl = old.curl.overrideDerivation (attrs: {
preConfigure = "patchShebangs configure";
});
@ -1859,6 +1863,7 @@ let
devEMF = old.devEMF.overrideDerivation (attrs: {
NIX_CFLAGS_LINK = "-L${pkgs.xorg.libXft.out}/lib -lXft";
NIX_LDFLAGS = "-lX11";
});
slfm = old.slfm.overrideDerivation (attrs: {

31
pkgs/games/warzone2100/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, fetchurl, bison, flex, gettext, pkgconfig, libpng
, libtheora, openal, physfs, mesa, fribidi, fontconfig
, freetype, qt4, glew, libogg, libvorbis, zlib, libX11
, libXrandr, zip, unzip, which, perl
{ stdenv, lib, fetchurl, perl, unzip, zip, which, pkgconfig
, qtbase, qtscript, SDL2, libtheora, openal, glew, physfs, fribidi
, withVideos ? false
}:
@ -14,28 +12,31 @@ let
in
stdenv.mkDerivation rec {
version = "3.1.5";
version = "3.2.2";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/${pname}/releases/${version}/${name}.tar.xz";
sha256 = "0hm49i2knvvg3wlnryv7h4m84s3qa7jfyym5yy6365sx8wzcrai1";
sha256 = "064xfxwkqpvqyy7kz46cwi71mxmimxi4wgjly9g51wwxkvz8snmg";
};
buildInputs = [ bison flex gettext pkgconfig libpng libtheora openal
physfs mesa fribidi fontconfig freetype qt4
glew libogg libvorbis zlib libX11 libXrandr zip
unzip perl
];
patchPhase = ''
buildInputs = [ qtbase qtscript SDL2 libtheora openal glew physfs fribidi ];
nativeBuildInputs = [ perl zip unzip pkgconfig ];
postPatch = ''
substituteInPlace lib/exceptionhandler/dumpinfo.cpp \
--replace "which %s" "${which}/bin/which %s"
substituteInPlace lib/exceptionhandler/exceptionhandler.cpp \
--replace "which %s" "${which}/bin/which %s"
'';
configureFlags = "--with-backend=qt --with-distributor=NixOS";
NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility
configureFlags = [ "--with-distributor=NixOS" ];
postInstall = stdenv.lib.optionalString withVideos "cp ${sequences_src} $out/share/warzone2100/sequences.wz";
hardeningDisable = [ "format" ];
enableParallelBuilding = true;
postInstall = lib.optionalString withVideos "cp ${sequences_src} $out/share/warzone2100/sequences.wz";
meta = with stdenv.lib; {
description = "A free RTS game, originally developed by Pumpkin Studios";

8
pkgs/os-specific/linux/firejail/default.nix
View File

@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="firejail";
version="0.9.44.2";
version="0.9.44.4";
name="${baseName}-${version}";
hash="0lc8vq6lj0669q4vx08m3dzqjayhl0cmm7n3qi4k18ys8ccyzbf5";
url="https://kent.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.44.2.tar.xz";
sha256="0lc8vq6lj0669q4vx08m3dzqjayhl0cmm7n3qi4k18ys8ccyzbf5";
hash="03y1xc70w5xr6jynmj305fmgniz2cq21q85s5q7dnda8ap6s4w1d";
url="https://netcologne.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.44.4.tar.xz";
sha256="03y1xc70w5xr6jynmj305fmgniz2cq21q85s5q7dnda8ap6s4w1d";
};
buildInputs = [
which

4
pkgs/os-specific/linux/kernel/linux-4.4.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.4.39";
version = "4.4.40";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "188ij72z05sbzrn438r9awpf2pvpv8p2iykfcxs2kxibn23c2jw6";
sha256 = "1qd431bk3q9xcvnlw4fvcsw4l8k44s14nwdkq4y3kmrywzb5xg64";
};
kernelPatches = args.kernelPatches;

4
pkgs/os-specific/linux/kernel/linux-4.8.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.8.15";
version = "4.8.16";
extraMeta.branch = "4.8";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1vlgacsdcww333n9vm2pmdfkcpkjhavrh1aalrr7p6vj2c4jc18n";
sha256 = "1aml6vhsfpvm8rsadraff7qj0ivgd9aw75k2q65drz4iby1pqb9h";
};
kernelPatches = args.kernelPatches;

5
pkgs/os-specific/linux/kernel/linux-4.9.nix
View File

@ -1,13 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.9";
modDirVersion = "4.9.0";
version = "4.9.1";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a";
sha256 = "06jlfdmfgmhj80q1q9pglkjygjc1s1b5fslhf5bzkicsw4r2369j";
};
kernelPatches = args.kernelPatches;

4
pkgs/os-specific/linux/kernel/linux-grsecurity.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.8.15";
version = "4.8.16";
extraMeta.branch = "4.8";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1vlgacsdcww333n9vm2pmdfkcpkjhavrh1aalrr7p6vj2c4jc18n";
sha256 = "1aml6vhsfpvm8rsadraff7qj0ivgd9aw75k2q65drz4iby1pqb9h";
};
kernelPatches = args.kernelPatches;

6
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -95,9 +95,9 @@ rec {
};
grsecurity_testing = grsecPatch
{ kver = "4.8.15";
grrev = "201612301949";
sha256 = "1083r30ipvdi3kjixlsp3f1mmf7848f2p32ds956caarvr4vkm3b";
{ kver = "4.8.16";
grrev = "201701062021";
sha256 = "0ivl9dpbyf0f7ywgh8kbzdf0za10yrh6s8plqk9vnns3dhgcnvnq";
};
# This patch relaxes grsec constraints on the location of usermode helpers,

7
pkgs/servers/dns/bind/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "11lxkb7d79c75scrs28q4xmr0ii2li69zj1c650al3qxir8yf754";
};
outputs = [ "bin" "lib" "dev" "out" "man" "dnsutils" "host" ];
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++
stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch;
@ -40,13 +40,10 @@ stdenv.mkDerivation rec {
moveToOutput bin/isc-config.sh $dev
moveToOutput bin/host $host
ln -sf $host/bin/host $bin/bin
moveToOutput bin/dig $dnsutils
moveToOutput bin/nslookup $dnsutils
moveToOutput bin/nsupdate $dnsutils
ln -sf $dnsutils/bin/{dig,nslookup,nsupdate} $bin/bin
ln -sf $host/bin/host $dnsutils/bin
for f in "$lib/lib/"*.la "$dev/bin/"{isc-config.sh,bind*-config}; do
sed -i "$f" -e 's|-L${openssl.dev}|-L${openssl.out}|g'
@ -60,5 +57,7 @@ stdenv.mkDerivation rec {
maintainers = with stdenv.lib.maintainers; [viric peti];
platforms = with stdenv.lib.platforms; unix;
outputsToInstall = [ "out" "dnsutils" "host" ];
};
}

4
pkgs/servers/matrix-synapse/default.nix
View File

@ -24,13 +24,13 @@ let
};
in pythonPackages.buildPythonApplication rec {
name = "matrix-synapse-${version}";
version = "0.18.6-rc3";
version = "0.18.7-rc2";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "synapse";
rev = "v${version}";
sha256 = "1a2yj22s84sd3nm9lx4rcdjbpbfclz6cp0ljpilw6n7spmj1nhcd";
sha256 = "13rx77xfcci7q8xpxxgnh84h6md53akjcy9glwn20vm9vpka3vvj";
};
patches = [ ./matrix-synapse.patch ];

39
pkgs/tools/graphics/qrcode/default.nix
View File

@ -1,24 +1,14 @@
{ stdenv, fetchgit }:
let
s =
rec {
baseName = "qrcode";
date = "2014-01-01";
version = "git-${date}";
name = "${baseName}-${version}";
url = "https://github.com/qsantos/qrcode";
rev = "2843cbada3b768f60ee1ae13c65160083558cc03";
sha256 = "1qli0b62yngqj66v6vdqqgcysy3q3fr5vwpf7yf0d9a0dg862x8a";
};
buildInputs = [
];
in
stdenv.mkDerivation {
inherit (s) name version;
inherit buildInputs;
{ stdenv, fetchFromGitHub }:
src = fetchgit {
inherit (s) rev url sha256;
stdenv.mkDerivation rec {
name = "qrcode-git-${version}";
version = "20160804";
src = fetchFromGitHub {
owner = "qsantos";
repo = "qrcode";
rev = "ad0fdb4aafd0d56b903f110f697abaeb27deee73";
sha256 = "0v81745nx5gny2g05946k8j553j18a29ikmlyh6c3syq6c15k8cf";
};
NIX_CFLAGS_COMPILE = "-Wno-error=unused-result";
@ -29,11 +19,10 @@ stdenv.mkDerivation {
cp DOCUMENTATION LICENCE "$out/share/doc/qrcode"
'';
meta = {
inherit (s) version;
meta = with stdenv.lib; {
description = ''A small QR-code tool'';
license = stdenv.lib.licenses.gpl3Plus;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ raskin ];
platforms = with platforms; linux;
};
}

4
pkgs/tools/networking/dnscrypt-proxy/default.nix
View File

@ -4,11 +4,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "dnscrypt-proxy-${version}";
version = "1.9.0";
version = "1.9.1";
src = fetchurl {
url = "https://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2";
sha256 = "0v5rsn9zdakzn6rcf2qhjqfd2y4h8q0hj4xr5hwhvaskg213rsyp";
sha256 = "0aa1qw59b72wl922lfhg24xq2gkv95v1s0daiiqv9b4zpap3ynag";
};
configureFlags = optional stdenv.isLinux "--with-systemd";

8
pkgs/tools/system/chase/default.nix
View File

@ -14,14 +14,14 @@ stdenv.mkDerivation rec {
makeFlags = [ "-e" ];
makeFlagsArray="LIBS=-lgc";
meta = {
meta = with stdenv.lib ; {
description = "Follow a symlink and print out its target file";
longDescription = ''
A commandline program that chases symbolic filesystems links to the original file
'';
homepage = "https://qa.debian.org/developer.php?login=rotty%40debian.org";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.polyrod ];
platforms = stdenv.lib.platforms.all;
license = licenses.gpl2Plus;
maintainers = [ maintainers.polyrod ];
platforms = platforms.all;
};
}

21
pkgs/tools/text/mir-qualia/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ lib, pythonPackages, fetchurl }:
pythonPackages.buildPythonApplication rec {
name = "mir.qualia-${version}";
version = "1.0.0";
doCheck = false; # 1.0.0-released pytests are broken
buildInputs = with pythonPackages; [ pytest ];
src = fetchurl {
url = "mirror://pypi/m/mir.qualia/mir.qualia-${version}.tar.gz";
sha256 = "1g0nwncwk4nq7b7zszqi1q4d2bdga1q50g9nkxigdaq647wqdf7x";
};
meta = {
description = "Dynamically enable sections of config files";
homepage = https://github.com/darkfeline/mir.qualia;
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.srhb ] ;
};
}

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

@ -2579,7 +2579,9 @@ in
ldapvi = callPackage ../tools/misc/ldapvi { };
ldns = callPackage ../development/libraries/ldns { };
ldns = callPackage ../development/libraries/ldns {
openssl = openssl_1_1_0;
};
leafpad = callPackage ../applications/editors/leafpad { };
@ -2816,6 +2818,10 @@ in
minixml = callPackage ../development/libraries/minixml { };
mir-qualia = callPackage ../tools/text/mir-qualia {
pythonPackages = python3Packages;
};
miredo = callPackage ../tools/networking/miredo { };
mitmproxy = callPackage ../tools/networking/mitmproxy { };
@ -7486,6 +7492,8 @@ in
gtk2 = callPackage ../development/libraries/gtk+/2.x.nix {
cupsSupport = config.gtk2.cups or stdenv.isLinux;
gdktarget = if stdenv.isDarwin then "quartz" else "x11";
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
};
gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { };
@ -7511,6 +7519,10 @@ in
gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { };
gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration {
gtk = gtk2;
};
gtkspell2 = callPackage ../development/libraries/gtkspell { };
gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };
@ -8373,7 +8385,9 @@ in
libpfm = callPackage ../development/libraries/libpfm { };
libpqxx = callPackage ../development/libraries/libpqxx { };
libpqxx = callPackage ../development/libraries/libpqxx {
gnused = gnused_422;
};
libproxy = callPackage ../development/libraries/libproxy {
stdenv = if stdenv.isDarwin
@ -16336,7 +16350,7 @@ in
libjpeg = libjpeg62;
};
warzone2100 = callPackage ../games/warzone2100 { };
warzone2100 = qt5.callPackage ../games/warzone2100 { };
wesnoth = callPackage ../games/wesnoth { };

6
pkgs/top-level/python-packages.nix
View File

@ -11125,6 +11125,10 @@ in {
homepage = "https://docs.docker.com/compose/";
description = "Multi-container orchestration for Docker";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [
jgeerds
];
};
};
@ -20601,7 +20605,7 @@ in {
};
buildInputs = with self; [ pytestrunner pytestcov pytest coverage ];
propagatedBuildInputs = with self; [ pycrypto ecdsa ];
propagatedBuildInputs = with self; [ cryptography ecdsa ];
# We don't need this specific version
postPatch = ''