ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát 2017-11-28 18:19:34 +01:00
commit addd20e6f9
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
56 changed files with 782 additions and 540 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/languages-frameworks/haskell.md
View File

@ -48,7 +48,7 @@ trouble with packages like `3dmodels` and `4Blocks`, because these names are
invalid identifiers in the Nix language. The issue of how to deal with these
rare corner cases is currently unresolved.)
Haskell packages who's Nix name (second column) begins with a `haskell-` prefix
Haskell packages whose Nix name (second column) begins with a `haskell-` prefix
are packages that provide a library whereas packages without that prefix
provide just executables. Libraries may provide executables too, though: the
package `haskell-pandoc`, for example, installs both a library and an

2
nixos/modules/services/monitoring/grafana.nix
View File

@ -111,7 +111,7 @@ in {
type = mkOption {
description = "Database type.";
default = "sqlite3";
type = types.enum ["mysql" "sqlite3" "postgresql"];
type = types.enum ["mysql" "sqlite3" "postgres"];
};
host = mkOption {

9
nixos/modules/services/security/clamav.nix
View File

@ -76,8 +76,9 @@ in
};
};
config = mkIf cfg.updater.enable or cfg.daemon.enable {
config = mkIf (cfg.updater.enable || cfg.daemon.enable) {
environment.systemPackages = [ pkg ];
users.extraUsers = singleton {
name = clamavUser;
uid = config.ids.uids.clamav;
@ -94,7 +95,7 @@ in
environment.etc."clamav/freshclam.conf".source = freshclamConfigFile;
environment.etc."clamav/clamd.conf".source = clamdConfigFile;
systemd.services.clamav-daemon = mkIf cfg.daemon.enable {
systemd.services.clamav-daemon = optionalAttrs cfg.daemon.enable {
description = "ClamAV daemon (clamd)";
after = mkIf cfg.updater.enable [ "clamav-freshclam.service" ];
requires = mkIf cfg.updater.enable [ "clamav-freshclam.service" ];
@ -115,7 +116,7 @@ in
};
};
systemd.timers.clamav-freshclam = mkIf cfg.updater.enable {
systemd.timers.clamav-freshclam = optionalAttrs cfg.updater.enable {
description = "Timer for ClamAV virus database updater (freshclam)";
wantedBy = [ "timers.target" ];
timerConfig = {
@ -124,7 +125,7 @@ in
};
};
systemd.services.clamav-freshclam = mkIf cfg.updater.enable {
systemd.services.clamav-freshclam = optionalAttrs cfg.updater.enable {
description = "ClamAV virus database updater (freshclam)";
restartTriggers = [ freshclamConfigFile ];

4
pkgs/applications/altcoins/zcash/default.nix
View File

@ -18,7 +18,9 @@ stdenv.mkDerivation rec {
sha256 = "19bxhdnkvgncgl9x6nbaf5nwgrdfw99icvdbi9adfh646pd5z64s";
};
enableParallelBuilding = true;
# Dependencies are underspecified: "make -C src gtest/zcash_gtest-test_merkletree.o"
# fails with "fatal error: test/data/merkle_roots.json.h: No such file or directory"
enableParallelBuilding = false;
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ gtest gmock gmp libsnark openssl wget db62 boost zlib

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

@ -20,11 +20,11 @@ let
in stdenv.mkDerivation rec {
name = "nano-${version}";
version = "2.9.0";
version = "2.9.1";
src = fetchurl {
url = "mirror://gnu/nano/${name}.tar.xz";
sha256 = "17hjgvig59a2ha2b0494bprrci3d33sayjqvxjhsnlzgr8whrlyj";
sha256 = "0z5sxji8jh8sh0g3inbzndhsrbm4qyqlvjrxl5wkxbr61lnxa5k3";
};
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "jgmenu-${version}";
version = "0.7.4";
version = "0.7.5";
src = fetchFromGitHub {
owner = "johanmalm";
repo = "jgmenu";
rev = "v${version}";
sha256 = "0vim7balxrxhbgq4jvf80lbh57xbw3qmhapy7n2iyv443ih4a7hi";
sha256 = "1gml2g711pr6wakznlxjrlmz8kylkv0ydpvv0jx2y5qczp3rwk3a";
};
nativeBuildInputs = [

6
pkgs/applications/misc/mupdf/default.nix
View File

@ -64,6 +64,12 @@ in stdenv.mkDerivation rec {
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=82df2631d7d0446b206ea6b434ea609b6c28b0e8";
sha256 = "04kfww7y0wazg6372g44fa2k5kiiigq4616ihkvmp18rz86903n9";
})
(fetchurl {
name = "mupdf-1.11-CVE-2017-15369.patch";
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=c2663e51238ec8256da7fc61ad580db891d9fe9a";
sha256 = "0xx2mrbjcymi3gh0l3cq81m6bygp9dv79v1kyrbcvpl5z6wgl71y";
})
];
postPatch = ''

21
pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, dpkg, makeWrapper
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, glibc, gnome2, libsecret
, libnotify, nspr, nss, systemd, xorg, libv4l, libstdcxx5 }:
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, glibc, gnome2
, libnotify, libpulseaudio, libsecret, libstdcxx5, libv4l, nspr, nss, systemd, xorg }:
let
version = "5.5.0.1";
version = "8.11.0.4";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
@ -17,9 +17,8 @@ let
fontconfig
freetype
glib
libsecret
glibc
libstdcxx5
libsecret
gnome2.GConf
gnome2.gdk_pixbuf
@ -29,10 +28,12 @@ let
gnome2.gnome_keyring
libnotify
libpulseaudio
nspr
nss
stdenv.cc.cc
systemd
libstdcxx5
libv4l
xorg.libxkbfile
@ -54,7 +55,7 @@ let
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
sha256 = "1r65qlsjwp0n0fmlhvbp71h03b3x73r26jk9f4q687sjqnzmkvcr";
sha256 = "1dq7k4zlqqsx7786phialia5xbpc3cp1wrjhqrvga09yg4dl505c";
}
else
throw "Skype for linux is not supported on ${stdenv.system}";
@ -82,8 +83,8 @@ in stdenv.mkDerivation {
postFixup = ''
for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* -or -name \*.node\* \) ); do
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true
done
ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux"
@ -92,15 +93,13 @@ in stdenv.mkDerivation {
substituteInPlace $out/share/applications/skypeforlinux.desktop \
--replace /usr/bin/ $out/bin/ \
--replace /usr/share/ $out/share/
'';
meta = with stdenv.lib; {
description = "Linux client for skype";
homepage = https://www.skype.com;
license = licenses.unfree;
maintainers = with stdenv.lib.maintainers; [ panaeon ];
maintainers = with stdenv.lib.maintainers; [ panaeon jraygauthier ];
platforms = [ "x86_64-linux" ];
};
}

4
pkgs/applications/science/logic/acgtk/default.nix
View File

@ -27,9 +27,11 @@ stdenv.mkDerivation {
patches = [ ./install-emacs-to-site-lisp.patch
./use-nix-ocaml-byteflags.patch ];
postPatch = stdenv.lib.optionalString (camlp4 != null) ''
postPatch = optionalString (camlp4 != null) ''
substituteInPlace src/Makefile.master.in \
--replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4/"
'' + optionalString (versionAtLeast (stdenv.lib.getVersion ocamlPackages.yojson) "1.4") ''
substituteInPlace src/scripting/Makefile.in --replace yojson.cmo yojson.cma
'';
# The bytecode executable is dependent on the dynamic library provided by

5
pkgs/applications/version-management/gource/default.nix
View File

@ -19,8 +19,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
NIX_CFLAGS_COMPILE = "-fpermissive " + # fix build with newer gcc versions
"-std=c++11"; # fix build with glm >= 0.9.6.0
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://gource.io/;
@ -36,7 +35,7 @@ stdenv.mkDerivation rec {
Mercurial and Bazaar and SVN. Gource can also parse logs produced
by several third party tools for CVS repositories.
'';
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ pSub ];
};
}

28
pkgs/data/fonts/iosevka/bin.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, fetchzip }:
let
version = "1.13.3";
in fetchzip rec {
name = "iosevka-bin-${version}";
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip";
postFetch = ''
mkdir -p $out/share/fonts
unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka
'';
sha256 = "0103rjxcp2sis42xp7fh7g8i03h5snvs8n78lgsf79g8ssw0p9d4";
meta = with stdenv.lib; {
homepage = https://be5invis.github.io/Iosevka/;
downloadPage = "https://github.com/be5invis/Iosevka/releases";
description = ''
Slender monospace sans-serif and slab-serif typeface inspired by Pragmata
Pro, M+ and PF DIN Mono, designed to be the ideal font for programming.
'';
license = licenses.ofl;
platforms = platforms.all;
maintainers = [ maintainers.cstrahan ];
};
}

27
pkgs/data/fonts/tlwg/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub, autoreconfHook, fontforge }:
stdenv.mkDerivation rec {
name = "tlwg-${version}";
version = "0.6.4";
src = fetchFromGitHub {
owner = "tlwg";
repo = "fonts-tlwg";
rev = "v${version}";
sha256 = "13bx98ygyyizb15ybdv3856lkxhx1fss8f7aiqmp0lk9zgw4mqyk";
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ fontforge ];
preAutoreconf = "echo ${version} > VERSION";
meta = with stdenv.lib; {
description = "A collection of Thai scalable fonts available under free licenses";
homepage = https://linux.thai.net/projects/fonts-tlwg;
license = with licenses; [ gpl2 publicDomain lppl13c free ];
platforms = platforms.unix;
maintainers = [ maintainers.yrashk ];
};
}

4
pkgs/desktops/enlightenment/efl.nix
View File

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
name = "efl-${version}";
version = "1.20.5";
version = "1.20.6";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
sha256 = "07624c71l9d1jx1zvdhwkr1bgb1n7i0i5hyg6579zdwl3jw6jpns";
sha256 = "1h9jkb1pkp2g6ld7ra9mxgblx3x5id4162ja697klx9mfjkpxijn";
};
nativeBuildInputs = [ pkgconfig ];

4
pkgs/desktops/enlightenment/enlightenment.nix
View File

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "enlightenment-${version}";
version = "0.22.0";
version = "0.22.1";
src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
sha256 = "0xmrvryr35idd7fyqgshfhvy2053bs3vwrxbx681pi6rgpdvjghv";
sha256 = "1q57fz57d0b26z06m1wiq7c1sniwh885b0vs02mk4jgwva46nyr0";
};
nativeBuildInputs = [

7
pkgs/development/compilers/llvm/4/llvm.nix
View File

@ -24,6 +24,11 @@
let
src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s";
aarch64Patch = fetchpatch {
url = https://reviews.llvm.org/file/data/2oqw5rhhklsapbjrhlpd/PHID-FILE-lvo4fcs6hjvkxb5wneg2/D40423.diff;
sha256 = "0b0h7n7lxw33pn2j061hm9050zn263gmiig937g5cmcvjimxlybb";
};
# Used when creating a version-suffixed symlink of libLLVM.dylib
shortVersion = with stdenv.lib;
concatStringsSep "." (take 2 (splitString "." release_version));
@ -81,6 +86,8 @@ in stdenv.mkDerivation rec {
substituteInPlace lib/esan/esan_sideline_linux.cpp \
--replace 'struct sigaltstack' 'stack_t'
)
'' + stdenv.lib.optionalString stdenv.isAarch64 ''
patch -p0 < ${aarch64Patch}
'';
# hacky fix: created binaries need to be run before installation

7
pkgs/development/compilers/llvm/5/llvm.nix
View File

@ -24,6 +24,11 @@
let
src = fetch "llvm" "1nin64vz21hyng6jr19knxipvggaqlkl2l9jpd5czbc4c2pcnpg3";
aarch64Patch = fetchpatch {
url = https://reviews.llvm.org/file/data/2oqw5rhhklsapbjrhlpd/PHID-FILE-lvo4fcs6hjvkxb5wneg2/D40423.diff;
sha256 = "0b0h7n7lxw33pn2j061hm9050zn263gmiig937g5cmcvjimxlybb";
};
# Used when creating a version-suffixed symlink of libLLVM.dylib
shortVersion = with stdenv.lib;
concatStringsSep "." (take 2 (splitString "." release_version));
@ -75,6 +80,8 @@ in stdenv.mkDerivation rec {
# Revert compiler-rt commit that makes codesign mandatory
patch -p1 -i ${./compiler-rt-codesign.patch} -d projects/compiler-rt
'' + stdenv.lib.optionalString stdenv.isAarch64 ''
patch -p0 < ${aarch64Patch}
'';
# hacky fix: created binaries need to be run before installation

2
pkgs/development/compilers/obliv-c/default.nix
View File

@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "0jz2ayadx62zv2b5ji947bkvw63axl4a2q70lwli86zgmcl390gf";
};
patches = [ ./ignore-complex-float128.patch ];
preBuild = ''
patchShebangs .
'';

37
pkgs/development/compilers/obliv-c/ignore-complex-float128.patch Normal file
View File

@ -0,0 +1,37 @@
--- a/src/frontc/clexer.mll
+++ b/src/frontc/clexer.mll
@@ -134,9 +134,11 @@ let init_lexicon _ =
(* WW: see /usr/include/sys/cdefs.h for why __signed and __volatile
* are accepted GCC-isms *)
("_Bool", fun loc -> BOOL loc);
+ ("_Complex", fun loc -> COMPLEX loc);
("char", fun loc -> CHAR loc);
("int", fun loc -> INT loc);
("float", fun loc -> FLOAT loc);
+ ("__float128", fun loc -> FLOAT128 loc);
("double", fun loc -> DOUBLE loc);
("void", fun loc -> VOID loc);
("enum", fun loc -> ENUM loc);
--- a/src/frontc/cparser.mly
+++ b/src/frontc/cparser.mly
@@ -269,6 +269,8 @@ let oblivState (s:statement): statement =
%token<Cabs.cabsloc> VOLATILE EXTERN STATIC CONST RESTRICT AUTO REGISTER FROZEN
%token<Cabs.cabsloc> THREAD
+%token<Cabs.cabsloc> COMPLEX FLOAT128
+
%token<Cabs.cabsloc> SIZEOF ALIGNOF
%token EQ PLUS_EQ MINUS_EQ STAR_EQ SLASH_EQ PERCENT_EQ
@@ -1002,7 +1004,11 @@ type_spec: /* ISO 6.7.2 */
| LONG { Tlong, $1 }
| INT64 { Tint64, $1 }
| FLOAT { Tfloat, $1 }
+| FLOAT128 { Tfloat, $1 }
| DOUBLE { Tdouble, $1 }
+| COMPLEX FLOAT { Tfloat, $2 }
+| COMPLEX FLOAT128{ Tfloat, $2 }
+| COMPLEX DOUBLE { Tdouble, $2 }
| SIGNED { Tsigned, $1 }
| UNSIGNED { Tunsigned, $1 }
| STRUCT id_or_typename

4
pkgs/development/interpreters/luajit/default.nix
View File

@ -62,9 +62,7 @@ rec {
installPhase = ''
make install PREFIX="$out"
for file in "$out"/include/luajit-*/*.h; do
ln -s $file "$out"/include/.
done
( cd "$out/include"; ln -s luajit-*/* . )
ln -s "$out"/bin/luajit-* "$out"/bin/lua
''
+ stdenv.lib.optionalString (!isStable)

9
pkgs/development/libraries/SDL2_image/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libXpm, zlib }:
{ stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libXpm, zlib, Foundation }:
stdenv.mkDerivation rec {
name = "SDL2_image-${version}";
@ -9,12 +9,15 @@ stdenv.mkDerivation rec {
sha256 = "1s3ciydixrgv34vlf45ak5syq5nlfaqf19wf162lbz4ixxd0gpvj";
};
buildInputs = [ SDL2 libpng libjpeg libtiff libungif libXpm zlib ];
buildInputs = [ SDL2 libpng libjpeg libtiff libungif libXpm zlib ]
++ stdenv.lib.optional stdenv.isDarwin Foundation;
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "SDL image library";
homepage = http://www.libsdl.org/projects/SDL_image/;
platforms = platforms.linux;
platforms = platforms.unix;
license = licenses.zlib;
};
}

44
pkgs/development/libraries/ftgl/2.1.2.nix
View File

@ -1,44 +0,0 @@
{stdenv, fetchurl, freetype, mesa}:
let
name = "ftgl-2.1.2";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/ftgl/${name}.tar.gz";
sha256 = "0xa00fnn6wd3rnkrkcs1wpv21lxdsb83r4hjn3l33dn0zbawnn97";
};
buildInputs = [freetype mesa];
NIX_LDFLAGS = "-lGLU -lGL";
patches = [ ./gcc.patch ];
configureFlags = "--enable-shared";
preConfigure = ''
cd unix
cd docs
tar vxf ../../docs/html.tar.gz
cd ..
'';
meta = {
homepage = https://sourceforge.net/apps/mediawiki/ftgl/;
description = "Font rendering library for OpenGL applications";
license = stdenv.lib.licenses.gpl3Plus;
longDescription = ''
FTGL is a free cross-platform Open Source C++ library that uses
Freetype2 to simplify rendering fonts in OpenGL applications. FTGL
supports bitmaps, pixmaps, texture maps, outlines, polygon mesh,
and extruded polygon rendering modes.
'';
platforms = stdenv.lib.platforms.gnu;
maintainers = [];
};
}

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

@ -11,7 +11,9 @@ stdenv.mkDerivation {
sha256 = "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l";
};
buildInputs = [freetype mesa];
buildInputs = [ freetype mesa ];
enableParallelBuilding = true;
meta = {
homepage = https://sourceforge.net/apps/mediawiki/ftgl/;
@ -25,7 +27,7 @@ stdenv.mkDerivation {
and extruded polygon rendering modes.
'';
platforms = stdenv.lib.platforms.gnu;
platforms = stdenv.lib.platforms.unix;
maintainers = [];
};
}

13
pkgs/development/libraries/ftgl/gcc.patch
View File

@ -1,13 +0,0 @@
diff --git a/include/FTTextureGlyph.h b/include/FTTextureGlyph.h
index c263f72..8959cb3 100755
--- a/include/FTTextureGlyph.h
+++ b/include/FTTextureGlyph.h
@@ -52,7 +52,7 @@ class FTGL_EXPORT FTTextureGlyph : public FTGlyph
* Reset the currently active texture to zero to get into a known state before
* drawing a string. This is to get round possible threading issues.
*/
- static void FTTextureGlyph::ResetActiveTexture(){ activeTextureID = 0;}
+ static void ResetActiveTexture(){ activeTextureID = 0;}
private:
/**

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

@ -19,8 +19,9 @@ stdenv.mkDerivation rec {
patchPhase = ''
sed -i 's|lib64|lib|' config/Makefile.linux
substituteInPlace config/Makefile.darwin --replace /usr/local "$out"
${optionalString (hostPlatform != buildPlatform) ''
sed -i -e 's/\(INSTALL.*\)-s/\1/' Makefile
sed -i -e 's/\(INSTALL.*\)-s/\1/' Makefile
''}
'';
@ -43,6 +44,8 @@ stdenv.mkDerivation rec {
"SYSTEM=${if hostPlatform.isMinGW then "mingw" else hostPlatform.parsed.kernel.name}"
];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "An OpenGL extension loading library for C(++)";
homepage = http://glew.sourceforge.net/;

37
pkgs/development/libraries/libao/default.nix
View File

@ -1,33 +1,42 @@
{ lib, stdenv, fetchurl, pkgconfig, libpulseaudio, alsaLib, libcap
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, libpulseaudio, alsaLib, libcap
, CoreAudio, CoreServices, AudioUnit
, usePulseAudio }:
stdenv.mkDerivation rec {
version = "1.2.0";
version = "1.2.2";
name = "libao-${version}";
src = fetchurl {
url = "http://downloads.xiph.org/releases/ao/${name}.tar.gz";
sha256 = "1bwwv1g9lchaq6qmhvj1pp3hnyqr64ydd4j38x94pmprs4d27b83";
# the github mirror is more up to date than downloads.xiph.org
src = fetchFromGitHub {
owner = "xiph";
repo = "libao";
rev = "${version}";
sha256 = "0svgk4sc9kdhcsfyvbvgm5vpbg3sfr6z5rliflrw49v3x2i4vxq5";
};
configureFlags = [
"--disable-broken-oss"
"--enable-alsa-mmap"
];
outputs = [ "out" "dev" "man" "doc" ];
buildInputs =
[ pkgconfig ] ++
lib.optional usePulseAudio libpulseaudio ++
lib.optional stdenv.isLinux alsaLib ++
lib.optional stdenv.isLinux libcap ++
buildInputs = [ ] ++
lib.optional usePulseAudio libpulseaudio ++
lib.optionals stdenv.isLinux [ alsaLib libcap ] ++
lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ];
meta = {
nativeBuildInputs = [ autoreconfHook pkgconfig ];
meta = with stdenv.lib; {
longDescription = ''
Libao is Xiph.org's cross-platform audio library that allows
programs to output audio using a simple API on a wide variety of
platforms.
'';
homepage = https://xiph.org/ao/;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
platforms = with stdenv.lib.platforms; unix;
license = licenses.gpl2;
maintainers = with maintainers; [ fuuzetsu ];
platforms = with platforms; unix;
};
}

36
pkgs/development/ocaml-modules/cstruct/1.9.0.nix Normal file
View File

@ -0,0 +1,36 @@
{ stdenv, writeText, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools
, async ? null, lwt ? null
}:
assert stdenv.lib.versionAtLeast ocaml.version "4.01";
let version = "1.9.0"; in
let opt = b: "--${if b != null then "en" else "dis"}able"; in
stdenv.mkDerivation {
name = "ocaml${ocaml.version}-cstruct-${version}";
src = fetchFromGitHub {
owner = "mirage";
repo = "ocaml-cstruct";
rev = "v${version}";
sha256 = "1c1j21zgmxi9spq23imy7byn50qr7hlds1cfpzxlsx9dp309jngy";
};
configureFlags = [ "${opt lwt}-lwt" "${opt async}-async" "${opt ppx_tools}-ppx" ];
buildInputs = [ ocaml findlib ocamlbuild ppx_tools lwt async ];
propagatedBuildInputs = [ ocplib-endian sexplib ];
createFindlibDestdir = true;
dontStrip = true;
meta = with stdenv.lib; {
homepage = https://github.com/mirage/ocaml-cstruct;
description = "Map OCaml arrays onto C-like structs";
license = stdenv.lib.licenses.isc;
maintainers = [ maintainers.vbgl maintainers.ericbmerritt ];
platforms = ocaml.meta.platforms or [];
};
}

50
pkgs/development/ocaml-modules/cstruct/default.nix
View File

@ -1,40 +1,28 @@
{ stdenv, writeText, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools
, async ? null, lwt ? null
}:
{ stdenv, fetchurl, ocaml, jbuilder, findlib, sexplib, ocplib-endian }:
assert stdenv.lib.versionAtLeast ocaml.version "4.01";
let param =
if stdenv.lib.versionAtLeast ocaml.version "4.02"
then { version = "2.3.2"; sha256 = "1fykack86hvvqhwngddyxxqlwm3xjljfaszsjbdrvjlrd1nlg079"; }
else { version = "1.9.0"; sha256 = "1c1j21zgmxi9spq23imy7byn50qr7hlds1cfpzxlsx9dp309jngy"; };
in
let opt = b: "--${if b != null then "en" else "dis"}able"; in
stdenv.mkDerivation {
name = "ocaml${ocaml.version}-cstruct-${param.version}";
src = fetchFromGitHub {
owner = "mirage";
repo = "ocaml-cstruct";
rev = "v${param.version}";
inherit (param) sha256;
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-cstruct-${version}";
version = "3.0.2";
src = fetchurl {
url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-${version}.tbz";
sha256 = "03caxcyzfjmbnnwa15zy9s1ckkl4sc834d1qkgi4jcs3zqchvd8z";
};
configureFlags = [ "${opt lwt}-lwt" "${opt async}-async" "${opt ppx_tools}-ppx" ];
unpackCmd = "tar -xjf $curSrc";
buildInputs = [ ocaml findlib ocamlbuild ppx_tools lwt async ];
propagatedBuildInputs = [ ocplib-endian sexplib ];
buildInputs = [ ocaml jbuilder findlib ];
createFindlibDestdir = true;
dontStrip = true;
propagatedBuildInputs = [ sexplib ocplib-endian ];
meta = with stdenv.lib; {
homepage = https://github.com/mirage/ocaml-cstruct;
description = "Map OCaml arrays onto C-like structs";
buildPhase = "jbuilder build -p cstruct";
inherit (jbuilder) installPhase;
meta = {
description = "Access C-like structures directly from OCaml";
license = stdenv.lib.licenses.isc;
maintainers = [ maintainers.vbgl maintainers.ericbmerritt ];
platforms = ocaml.meta.platforms or [];
homepage = "https://github.com/mirage/ocaml-cstruct";
maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms;
};
}

12
pkgs/development/ocaml-modules/cstruct/lwt.nix Normal file
View File

@ -0,0 +1,12 @@
{ stdenv, ocaml, cstruct, lwt }:
assert stdenv.lib.versionAtLeast ocaml.version "4.02";
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-cstruct-lwt-${version}";
inherit (cstruct) version src unpackCmd buildInputs installPhase meta;
propagatedBuildInputs = [ cstruct lwt ];
buildPhase = "${cstruct.buildPhase}-lwt";
}

13
pkgs/development/ocaml-modules/cstruct/ppx.nix Normal file
View File

@ -0,0 +1,13 @@
{ stdenv, ocaml, cstruct, ppx_tools_versioned }:
assert stdenv.lib.versionAtLeast ocaml.version "4.02";
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ppx_cstruct-${version}";
inherit (cstruct) version src unpackCmd installPhase meta;
buildInputs = cstruct.buildInputs ++ [ ppx_tools_versioned ];
propagatedBuildInputs = [ cstruct ];
buildPhase = "jbuilder build -p ppx_cstruct";
}

12
pkgs/development/ocaml-modules/cstruct/unix.nix Normal file
View File

@ -0,0 +1,12 @@
{ stdenv, ocaml, cstruct }:
assert stdenv.lib.versionAtLeast ocaml.version "4.02";
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-cstruct-unix-${version}";
inherit (cstruct) version src unpackCmd buildInputs installPhase meta;
propagatedBuildInputs = [ cstruct ];
buildPhase = "${cstruct.buildPhase}-unix";
}

6
pkgs/development/ocaml-modules/nocrypto/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, opam, topkg
, cpuid, ocb-stubblr
, cstruct, zarith, ppx_sexp_conv, sexplib
, lwt ? null
, cstruct-lwt ? null
}:
with stdenv.lib;
let withLwt = lwt != null; in
let withLwt = cstruct-lwt != null; in
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-nocrypto-${version}";
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ocaml findlib ocamlbuild topkg opam cpuid ocb-stubblr
ppx_sexp_conv ];
propagatedBuildInputs = [ cstruct zarith sexplib ] ++ optional withLwt lwt;
propagatedBuildInputs = [ cstruct zarith sexplib ] ++ optional withLwt cstruct-lwt;
buildPhase = ''
LD_LIBRARY_PATH=${cpuid}/lib/ocaml/${ocaml.version}/site-lib/stubslibs/ \

4
pkgs/development/ocaml-modules/otr/default.nix
View File

@ -1,5 +1,5 @@
{stdenv, buildOcaml, fetchFromGitHub, ocamlbuild, findlib, topkg, ocaml, opam,
ppx_tools, ppx_sexp_conv, cstruct, sexplib, result, nocrypto, astring}:
ppx_tools, ppx_sexp_conv, cstruct, ppx_cstruct, sexplib, result, nocrypto, astring}:
let ocamlFlags = "-I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/"; in
@ -16,7 +16,7 @@ buildOcaml rec {
sha256 = "07zzix5mfsasqpqdx811m0x04gp8mq1ayf4b64998k98027v01rr";
};
buildInputs = [ ocamlbuild findlib topkg ppx_tools ppx_sexp_conv opam ];
buildInputs = [ ocamlbuild findlib topkg ppx_tools ppx_sexp_conv opam ppx_cstruct ];
propagatedBuildInputs = [ cstruct sexplib result nocrypto astring ];
buildPhase = ''

4
pkgs/development/ocaml-modules/tls/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, buildOcaml, fetchFromGitHub, findlib, ocamlbuild, ocaml_oasis
, ppx_tools, ppx_sexp_conv, result, x509, nocrypto, cstruct, ounit
, ppx_tools, ppx_sexp_conv, result, x509, nocrypto, cstruct, ppx_cstruct, cstruct-unix, ounit
, lwt ? null}:
with stdenv.lib;
@ -19,7 +19,7 @@ buildOcaml rec {
sha256 = "19q2hzxiasz9pzczgb63kikg0mc9mw98dfvch5falf2rincycj24";
};
buildInputs = [ ocamlbuild findlib ocaml_oasis ppx_sexp_conv ounit ];
buildInputs = [ ocamlbuild findlib ocaml_oasis ppx_sexp_conv ounit ppx_cstruct cstruct-unix ];
propagatedBuildInputs = [ cstruct nocrypto result x509 ] ++
optional withLwt lwt;

6
pkgs/development/ocaml-modules/x509/default.nix
View File

@ -1,4 +1,6 @@
{stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, asn1-combinators, nocrypto, ounit, ocaml_oasis, ppx_sexp_conv}:
{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, asn1-combinators, nocrypto
, ounit, ocaml_oasis, ppx_sexp_conv, cstruct-unix
}:
buildOcaml rec {
name = "x509";
@ -13,7 +15,7 @@ buildOcaml rec {
sha256 = "07cc3z6h87460z3f4vz8nlczw5jkc4vjhix413z9x6nral876rn7";
};
buildInputs = [ ocaml ocaml_oasis findlib ounit ppx_sexp_conv ];
buildInputs = [ ocaml ocaml_oasis findlib ounit ppx_sexp_conv cstruct-unix ];
propagatedBuildInputs = [ asn1-combinators nocrypto ];
configureFlags = "--enable-tests";

32
pkgs/development/ocaml-modules/yojson/default.nix
View File

@ -1,16 +1,26 @@
{ stdenv, fetchzip, ocaml, findlib, cppo, easy-format, biniou }:
{ stdenv, fetchzip, ocaml, findlib, jbuilder, cppo, easy-format, biniou }:
let
pname = "yojson";
param =
if stdenv.lib.versionAtLeast ocaml.version "4.01" then {
version = "1.3.3";
sha256 = "02l11facbr6bxrxq95vrcp1dxapp02kv7g4gq8rm62pb3dj5c6g7";
if stdenv.lib.versionAtLeast ocaml.version "4.02" then {
version = "1.4.0";
sha256 = "0rzn4yihfi0psd2qmgrx5fvwpby87sqx4zws3ijf49f7wbpycccv";
buildInputs = [ jbuilder ];
extra = { inherit (jbuilder) installPhase; };
} else {
version = "1.2.3";
sha256 = "10dvkndgwanvw4agbjln7kgb1n9s6lii7jw82kwxczl5rd1sgmvl";
buildInputs = [];
extra = {
createFindlibDestdir = true;
makeFlags = "PREFIX=$(out)";
preBuild = "mkdir $out/bin";
};
};
in
stdenv.mkDerivation {
stdenv.mkDerivation ({
name = "ocaml${ocaml.version}-${pname}-${param.version}";
@ -19,18 +29,10 @@ stdenv.mkDerivation {
inherit (param) sha256;
};
buildInputs = [ ocaml findlib ];
buildInputs = [ ocaml findlib ] ++ param.buildInputs;
propagatedBuildInputs = [ cppo easy-format biniou ];
createFindlibDestdir = true;
makeFlags = "PREFIX=$(out)";
preBuild = ''
mkdir $out/bin
'';
meta = with stdenv.lib; {
description = "An optimized parsing and printing library for the JSON format";
homepage = "http://mjambon.com/${pname}.html";
@ -38,4 +40,4 @@ stdenv.mkDerivation {
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms or [];
};
}
} // param.extra)

10
pkgs/development/python-modules/zope_testrunner/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy3k
, fetchpatch
, zope_interface
, zope_exceptions
, zope_testing
@ -11,15 +11,15 @@
buildPythonPackage rec {
pname = "zope.testrunner";
version = "4.7.0";
name = "${pname}-${version}";
version = "4.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "8ffcb4989829544a83d27e42b2eeb28f8fc134bd847d71ce8dca54f710526ef0";
extension = "zip";
sha256 = "039z9q5i1r6fqzlm224nmaxn896k4a9sb1237dv406ncdldd7jaz";
};
patches = [ ./test-selection.patch ];
propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ];
meta = with stdenv.lib; {

5
pkgs/development/python-modules/zope_testrunner/test-selection.patch Normal file
View File

@ -0,0 +1,5 @@
--- a/src/zope/testrunner/tests/testrunner-test-selection.txt
+++ b/src/zope/testrunner/tests/testrunner-test-selection.txt
@@ -235 +235 @@ and by test within the module using the --test (-t) option:
- >>> sys.argv = 'test -u -vv -ssample1 -m_one -mtest1 -tx0 -ty0'.split()
+ >>> sys.argv = 'test -u -vv -ssample1 -m_one -mtest1 -t_x0 -t_y0'.split()

251
pkgs/development/tools/chefdk/Gemfile.lock
View File

@ -1,33 +1,27 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
app_conf (0.4.2)
artifactory (2.8.1)
ast (2.3.0)
backports (3.7.0)
berkshelf (5.6.4)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (>= 2.0.2, < 4.0)
backports (3.10.3)
berkshelf (6.3.1)
buff-config (~> 2.0)
buff-extensions (~> 2.0)
buff-shell_out (~> 1.0)
chef (>= 12.7.2)
cleanroom (~> 1.0)
concurrent-ruby (~> 1.0)
faraday (~> 0.9)
httpclient (~> 2.7)
minitar (~> 0.5, >= 0.5.4)
mixlib-archive (~> 0.4)
mixlib-shellout (~> 2.0)
octokit (~> 4.0)
retryable (~> 2.0)
ridley (~> 5.0)
solve (> 2.0, < 4.0)
solve (~> 4.0)
thor (~> 0.19, < 0.19.2)
berkshelf-api-client (3.0.0)
faraday (~> 0.9)
httpclient (~> 2.7)
ridley (>= 4.5, < 6.0)
blankslate (2.1.2.4)
buff-config (2.0.0)
buff-extensions (~> 2.0)
varia_model (~> 0.6)
@ -42,16 +36,17 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
chef (12.19.36)
chef (13.6.4)
addressable
bundler (>= 1.10)
chef-config (= 12.19.36)
chef-zero (>= 4.8)
chef-config (= 13.6.4)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
iniparse (~> 1.4)
iso8601 (~> 0.9.1)
mixlib-archive (~> 0.4)
mixlib-authentication (~> 1.4)
mixlib-cli (~> 1.7)
@ -60,7 +55,7 @@ GEM
net-sftp (~> 2.1, >= 2.1.2)
net-ssh (>= 2.9, < 5.0)
net-ssh-multi (~> 1.2, >= 1.2.1)
ohai (>= 8.6.0.alpha.1, < 13)
ohai (~> 13.0)
plist (~> 3.2)
proxifier (~> 1.0)
rspec-core (~> 3.5)
@ -71,14 +66,14 @@ GEM
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
chef-config (12.19.36)
chef-config (13.6.4)
addressable
fuzzyurl
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
chef-dk (1.3.40)
chef-dk (2.3.4)
addressable (>= 2.3.5, < 2.6)
chef (~> 12.5)
chef (~> 13.0)
chef-provisioning (~> 2.0)
cookbook-omnifetch (~> 0.5)
diff-lcs (~> 1.0)
@ -87,147 +82,153 @@ GEM
mixlib-cli (~> 1.7)
mixlib-shellout (~> 2.0)
paint (~> 1.0)
solve (> 2.0, < 4.0)
chef-provisioning (2.2.1)
cheffish (>= 4.0, < 6.0)
solve (> 2.0, < 5.0)
chef-provisioning (2.6.0)
cheffish (>= 4.0, < 14.0)
inifile (>= 2.0.2)
mixlib-install (>= 1.0, < 3.0)
mixlib-install (>= 1.0)
net-scp (~> 1.0)
net-ssh (>= 2.9, < 5.0)
net-ssh-gateway (~> 1.2)
net-ssh-gateway (> 1.2, < 3.0)
winrm (~> 2.0)
winrm-elevated (~> 1.0)
winrm-fs (~> 1.0)
chef-vault (2.9.1)
chef-zero (5.3.2)
chef-vault (3.3.0)
chef-zero (13.1.0)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 4.0)
mixlib-log (~> 1.3)
rack (~> 2.0)
uuidtools (~> 2.1)
cheffish (5.0.1)
chef-zero (~> 5.0)
cheffish (13.1.0)
chef-zero (~> 13.0)
net-ssh
chefspec (6.2.0)
chef (>= 12.0)
fauxhai (>= 3.6, < 5)
chefspec (7.1.0)
chef (>= 12.14.89)
fauxhai (>= 4, < 6)
rspec (~> 3.0)
cleanroom (1.0.0)
coderay (1.1.1)
cookbook-omnifetch (0.5.1)
coderay (1.1.2)
concurrent-ruby (1.0.5)
cookbook-omnifetch (0.8.0)
mixlib-archive (~> 0.4)
cucumber-core (2.0.0)
backports (~> 3.6)
gherkin (~> 4.0)
cucumber-core (3.0.0)
backports (>= 3.8.0)
cucumber-tag_expressions (>= 1.0.1)
gherkin (>= 4.1.3)
cucumber-tag_expressions (1.0.1)
diff-lcs (1.3)
diffy (3.2.0)
docker-api (1.33.3)
excon (>= 0.38.0)
json
docker-api (1.34.0)
excon (>= 0.47.0)
multi_json
erubis (2.7.0)
excon (0.55.0)
faraday (0.9.2)
excon (0.59.0)
faraday (0.13.1)
multipart-post (>= 1.2, < 3)
fauxhai (4.1.0)
fauxhai (5.5.0)
net-ssh
ffi (1.9.18)
ffi-yajl (2.3.0)
ffi-yajl (2.3.1)
libyajl2 (~> 1.2)
foodcritic (10.2.2)
foodcritic (12.2.1)
cucumber-core (>= 1.3)
erubis
ffi-yajl (~> 2.0)
nokogiri (>= 1.5, < 2.0)
rake
rufus-lru (~> 1.0)
treetop (~> 1.4)
yajl-ruby (~> 1.1)
fuzzyurl (0.9.0)
gherkin (4.1.1)
gherkin (5.0.0)
git (1.3.0)
gssapi (1.2.0)
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
hashie (3.5.5)
highline (1.7.8)
hitimes (1.2.4)
hashie (3.5.6)
highline (1.7.10)
hitimes (1.2.6)
htmlentities (4.3.4)
httpclient (2.8.3)
inifile (3.0.0)
iniparse (1.4.2)
inspec (1.19.2)
iniparse (1.4.4)
inspec (1.45.13)
addressable (~> 2.4)
faraday (>= 0.9.0)
hashie (~> 3.4)
htmlentities
json (>= 1.8, < 3.0)
method_source (~> 0.8)
mixlib-log
parallel (~> 1.9)
parslet (~> 1.5)
pry (~> 0)
rainbow (~> 2)
rspec (~> 3)
rspec-its (~> 1.2)
rubyzip (~> 1.1)
sslshake (~> 1)
semverse
sslshake (~> 1.2)
thor (~> 0.19)
toml (~> 0.1)
train (>= 0.22.0, < 1.0)
tomlrb (~> 1.2)
train (~> 0.29, >= 0.29.2)
ipaddress (0.8.3)
json (2.0.3)
kitchen-inspec (0.17.0)
iso8601 (0.9.1)
json (2.1.0)
kitchen-inspec (0.20.0)
hashie (~> 3.4)
inspec (>= 0.34.0, < 2.0.0)
test-kitchen (~> 1.6)
kitchen-vagrant (1.1.0)
kitchen-vagrant (1.2.1)
test-kitchen (~> 1.4)
knife-spork (1.6.3)
knife-spork (1.7.1)
app_conf (>= 0.4.0)
chef (>= 11.0.0)
diffy (>= 3.0.1)
git (>= 1.2.5)
libyajl2 (1.2.0)
little-plugger (1.1.4)
logging (2.2.0)
logging (2.2.2)
little-plugger (~> 1.1)
multi_json (~> 1.10)
method_source (0.8.2)
mini_portile2 (2.1.0)
method_source (0.9.0)
mini_portile2 (2.3.0)
minitar (0.5.4)
mixlib-archive (0.4.1)
mixlib-log
mixlib-authentication (1.4.1)
mixlib-log
mixlib-authentication (1.4.2)
mixlib-cli (1.7.0)
mixlib-config (2.2.4)
mixlib-install (2.1.12)
artifactory
mixlib-install (3.8.0)
mixlib-shellout
mixlib-versioning
thor
mixlib-log (1.7.1)
mixlib-shellout (2.2.7)
mixlib-versioning (1.1.0)
molinillo (0.5.7)
multi_json (1.12.1)
mixlib-shellout (2.3.2)
mixlib-versioning (1.2.2)
molinillo (0.6.4)
multi_json (1.12.2)
multipart-post (2.0.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (4.1.0)
net-ssh (4.2.0)
net-ssh-gateway (1.3.0)
net-ssh (>= 2.6.5)
net-ssh-multi (1.2.1)
net-ssh (>= 2.6.5)
net-ssh-gateway (>= 1.2.0)
net-telnet (0.1.1)
nio4r (2.0.0)
nokogiri (1.7.1)
mini_portile2 (~> 2.1.0)
nio4r (2.1.0)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
nori (2.6.0)
octokit (4.7.0)
sawyer (~> 0.8.0, >= 0.5.3)
ohai (8.23.0)
chef-config (>= 12.5.0.alpha.1, < 13)
ohai (13.6.0)
chef-config (>= 12.5.0.alpha.1, < 14)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
ipaddress
@ -239,25 +240,24 @@ GEM
systemu (~> 2.6.4)
wmi-lite (~> 1.0)
paint (1.0.1)
parallel (1.11.1)
parser (2.4.0.0)
ast (~> 2.2)
parslet (1.5.0)
blankslate (~> 2.0)
plist (3.2.0)
parallel (1.12.0)
parser (2.4.0.2)
ast (~> 2.3)
parslet (1.8.1)
plist (3.3.0)
polyglot (0.3.5)
powerpack (0.1.1)
proxifier (1.0.3)
pry (0.10.4)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
public_suffix (2.0.5)
rack (2.0.1)
rainbow (2.2.1)
rake (12.0.0)
method_source (~> 0.9.0)
public_suffix (3.0.1)
rack (2.0.3)
rainbow (2.2.2)
rake
rake (12.3.0)
retryable (2.0.4)
ridley (5.1.0)
ridley (5.1.1)
addressable
buff-config (~> 2.0)
buff-extensions (~> 2.0)
@ -267,7 +267,7 @@ GEM
celluloid-io (~> 0.16.1)
chef-config (>= 12.5.0)
erubis
faraday (~> 0.9.0)
faraday (~> 0.9)
hashie (>= 2.0.2, < 4.0.0)
httpclient (~> 2.7)
json (>= 1.7.7)
@ -275,33 +275,34 @@ GEM
retryable (~> 2.0)
semverse (~> 2.0)
varia_model (~> 0.6)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-core (3.5.4)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
rspec (3.7.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-core (3.7.0)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-support (~> 3.7.0)
rspec-its (1.2.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
rspec-mocks (3.5.0)
rspec-mocks (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.0)
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (0.48.1)
rubocop (0.51.0)
parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
rainbow (>= 2.2.2, < 3.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.8.1)
rubyntlm (0.6.1)
ruby-progressbar (1.9.0)
rubyntlm (0.6.2)
rubyzip (1.2.1)
rufus-lru (1.1.0)
safe_yaml (1.0.4)
@ -309,38 +310,39 @@ GEM
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
semverse (2.0.0)
serverspec (2.38.0)
serverspec (2.41.3)
multi_json
rspec (~> 3.0)
rspec-its
specinfra (~> 2.53)
specinfra (~> 2.72)
sfl (2.3)
slop (3.6.0)
solve (3.1.0)
molinillo (>= 0.5)
solve (4.0.0)
molinillo (~> 0.6)
semverse (>= 1.1, < 3.0)
specinfra (2.67.7)
specinfra (2.72.1)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
sfl
sslshake (1.1.0)
sslshake (1.2.0)
syslog-logger (1.6.8)
systemu (2.6.5)
test-kitchen (1.16.0)
mixlib-install (>= 1.2, < 3.0)
test-kitchen (1.19.1)
mixlib-install (~> 3.6)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (~> 1.1)
net-ssh (>= 2.9, < 5.0)
net-ssh-gateway (~> 1.2)
safe_yaml (~> 1.0)
thor (~> 0.19, < 0.19.2)
winrm (~> 2.0)
winrm-elevated (~> 1.0)
winrm-fs (~> 1.0.2)
thor (0.19.1)
timers (4.0.4)
hitimes
toml (0.1.2)
parslet (~> 1.5.0)
train (0.23.0)
tomlrb (1.2.6)
train (0.29.2)
docker-api (~> 1.26)
json (>= 1.8, < 3.0)
mixlib-shellout (~> 2.0)
@ -348,14 +350,14 @@ GEM
net-ssh (>= 2.9, < 5.0)
winrm (~> 2.0)
winrm-fs (~> 1.0)
treetop (1.6.8)
treetop (1.6.9)
polyglot (~> 0.3)
unicode-display_width (1.1.3)
unicode-display_width (1.3.0)
uuidtools (2.1.5)
varia_model (0.6.0)
buff-extensions (~> 2.0)
hashie (>= 2.0.2, < 4.0.0)
winrm (2.2.1)
winrm (2.2.3)
builder (>= 2.1.2)
erubis (~> 2.7)
gssapi (~> 1.2)
@ -367,13 +369,12 @@ GEM
winrm-elevated (1.1.0)
winrm (~> 2.0)
winrm-fs (~> 1.0)
winrm-fs (1.0.1)
winrm-fs (1.0.2)
erubis (~> 2.7)
logging (>= 1.6.1, < 3.0)
rubyzip (~> 1.1)
winrm (~> 2.0)
wmi-lite (1.0.0)
yajl-ruby (1.3.0)
PLATFORMS
ruby
@ -396,4 +397,4 @@ DEPENDENCIES
test-kitchen
BUNDLED WITH
1.14.4
1.14.6

8
pkgs/development/tools/chefdk/default.nix
View File

@ -1,9 +1,11 @@
{ stdenv, lib, bundlerEnv, ruby, perl, autoconf }:
{ stdenv, lib, bundlerEnv, ruby_2_4, perl, autoconf }:
bundlerEnv {
name = "chefdk-1.3.40";
# Last updated via:
# nix-shell -p bundix -p gcc -p libxml2 -p zlib --run "bundix -mdl"
name = "chefdk-2.3.4";
inherit ruby;
ruby = ruby_2_4;
gemdir = ./.;
buildInputs = [ perl autoconf ];

430
pkgs/development/tools/chefdk/gemset.nix
View File

File diff suppressed because it is too large Load Diff

6
pkgs/development/tools/haskell/ihaskell/wrapper.nix
View File

@ -1,4 +1,4 @@
{ stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, ihaskell, jupyter, packages }:
{ stdenv, writeScriptBin, makeWrapper, buildEnv, haskell, ghcWithPackages, jupyter, packages }:
let
ihaskellEnv = ghcWithPackages (self: [
self.ihaskell
@ -9,8 +9,8 @@ let
ihaskellSh = writeScriptBin "ihaskell-notebook" ''
#! ${stdenv.shell}
export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH"
export PATH="${stdenv.lib.makeBinPath ([ ihaskell ihaskellEnv jupyter ])}"
${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${jupyter}/bin/jupyter notebook
export PATH="${stdenv.lib.makeBinPath ([ ihaskellEnv jupyter ])}"
${ihaskellEnv}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${jupyter}/bin/jupyter notebook
'';
in
buildEnv {

23
pkgs/development/tools/misc/d-feet/default.nix
View File

@ -1,31 +1,22 @@
{ stdenv, pkgconfig, fetchurl, itstool, intltool, libxml2, glib, gtk3
, pythonPackages, makeWrapper, gnome3, libwnck3 }:
, python3Packages, wrapGAppsHook, gnome3, libwnck3 }:
let
version = "${major}.12";
version = "${major}.13";
major = "0.3";
in pythonPackages.buildPythonApplication rec {
in python3Packages.buildPythonApplication rec {
name = "d-feet-${version}";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz";
sha256 = "054hl56rii9ff7rzl42h7993ywjbxmhlcd7bk8fi1c2bx98c6s68";
sha256 = "1md3lzs55sg04ds69dbginpxqvgg3qnf1lfx3vmsxph6bbd2y6ll";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libxml2 itstool intltool glib gtk3
gnome3.defaultIconTheme makeWrapper libwnck3
];
nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook libxml2 ];
buildInputs = [ glib gtk3 gnome3.defaultIconTheme libwnck3 ];
propagatedBuildInputs = with pythonPackages; [ pygobject3 pep8 ];
preFixup =
''
wrapProgram $out/bin/d-feet \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share"
'';
propagatedBuildInputs = with python3Packages; [ pygobject3 pep8 ];
meta = {
description = "D-Feet is an easy to use D-Bus debugger";

8
pkgs/games/solarus/default.nix
View File

@ -5,18 +5,20 @@
stdenv.mkDerivation rec {
name = "solarus-${version}";
version = "1.4.5";
src = fetchFromGitHub {
owner = "christopho";
repo = "solarus";
rev = "d9fdb9fdb4e1b9fc384730a9279d134ae9f2c70e";
sha256 = "0xjx789d6crm322wmkqyq9r288vddsha59yavhy78c4r01gs1p5v";
};
buildInputs = [ cmake luajit SDL2
SDL2_image SDL2_ttf physfs
openal libmodplug libvorbis ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "A Zelda-like ARPG game engine";
longDescription = ''
@ -28,5 +30,5 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.Nate-Devv ];
platforms = platforms.linux;
};
}

6
pkgs/misc/emulators/higan/default.nix
View File

@ -10,12 +10,12 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "higan-${version}";
version = "105";
version = "106";
sourceName = "higan_v${version}-source";
src = fetchurl {
urls = [ "http://download.byuu.org/${sourceName}.7z" ];
sha256 = "1lpj345vlnwcywhzq1fzxwl08zc2x4d103rgyyp7yw8m0f8f9sdl";
sha256 = "063dzp9wrdnbvagraxi31xg0154y2gf67rrd0mnc8h104cgzjr35";
curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick...
};
@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
Game Boy, Game Boy Color, Game Boy Advance;
- Sega's Master System, Game Gear, Mega Drive;
- NEC's PC Engine, SuperGrafx;
- Bandai' WonderSwan, WonderSwan Color.
- Bandai's WonderSwan, WonderSwan Color.
'';
homepage = https://byuu.org/higan/;
license = licenses.gpl3Plus;

13
pkgs/os-specific/linux/criu/criu-2.12.1-glibc-2.26.patch Normal file
View File

@ -0,0 +1,13 @@
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -650,3 +650,2 @@ static void zombie_prepare_signals(void)
(1 << SIGSYS) |\
- (1 << SIGUNUSED)|\
(1 << SIGSTKFLT)|\
--- a/test/zdtm/static/pthread01.c
+++ b/test/zdtm/static/pthread01.c
@@ -45,3 +45,3 @@ static char *decode_signal(const sigset_t *s, char *buf)
COLLECT(SIGXFSZ); COLLECT(SIGVTALRM); COLLECT(SIGPROF); COLLECT(SIGWINCH); COLLECT(SIGIO);
- COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS); COLLECT(SIGUNUSED);
+ COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS);
#undef COLLECT

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

@ -11,11 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "18m0sjgcfvzc86w49fd3kxw145nmrsvc5w7zf42nxdiklmszbr1k";
};
patches = [ ./criu-2.12.1-glibc-2.26.patch ];
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig docbook_xsl ];
buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python ];
patchPhase = ''
postPatch = ''
chmod +w ./scripts/gen-offsets.sh
substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump
substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" ""

10
pkgs/os-specific/linux/kernel/linux-testing.nix
View File

@ -1,13 +1,13 @@
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.14-rc8";
modDirVersion = "4.14.0-rc8";
extraMeta.branch = "4.14";
version = "4.15-rc1";
modDirVersion = "4.15.0-rc1";
extraMeta.branch = "4.15";
src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "0ir2ggflm1xjnn1kvv2c99m5zni5kg0ygzlpm588wnhkzd93nqjh";
sha256 = "1l7c132qb5qjd80hga03ivssfq65brqyd95sb4rd065dqrixp20n";
};
# Should the testing kernels ever be built on Hydra?

9
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -1,4 +1,6 @@
{ runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl
, libelf ? null
, utillinux ? null
, writeTextFile, ubootTools
, hostPlatform
}:
@ -230,13 +232,18 @@ let
};
in
assert stdenv.lib.versionAtLeast version "4.15" -> libelf != null;
assert stdenv.lib.versionAtLeast version "4.15" -> utillinux != null;
stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKernelPatches) configfile) // {
name = "linux-${version}";
enableParallelBuilding = true;
nativeBuildInputs = [ perl bc nettools openssl gmp libmpc mpfr ]
++ optional (stdenv.platform.kernelTarget == "uImage") ubootTools;
++ optional (stdenv.platform.kernelTarget == "uImage") ubootTools
++ optional (stdenv.lib.versionAtLeast version "4.15") libelf
++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux
;
hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" ];

6
pkgs/servers/dict/default.nix
View File

@ -13,7 +13,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ bison flex libtool which ];
enableParallelBuilding = true;
# Makefile(.in) contains "clientparse.c clientparse.h: clientparse.y" which
# causes bison to run twice, and break the build when this happens in
# parallel. Test with "make -j clientparse.c clientparse.h". The error
# message may be "mv: cannot move 'y.tab.c' to 'clientparse.c'".
enableParallelBuilding = false;
patchPhase = "patch -p0 < ${./buildfix.diff}";
configureFlags = [

7
pkgs/servers/rpcbind/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, libnsl, libtirpc
{ fetchurl, stdenv, pkgconfig, libnsl, libtirpc, fetchpatch
, useSystemd ? true, systemd }:
stdenv.mkDerivation rec {
@ -12,6 +12,11 @@ stdenv.mkDerivation rec {
patches = [
./sunrpc.patch
(fetchpatch {
name = "CVE-2017-8779.patch";
url = "https://raw.githubusercontent.com/guidovranken/rpcbomb/e6da9e489aa8ad000b0ad5ac9abc5b4eefc3a769/rpcbind_patch.txt";
sha256 = "0w231w8fxihgrn526np078j3vbj3ylvjvxjmfpjvqhga5zg821ab";
})
];
buildInputs = [ libnsl libtirpc ]

4
pkgs/shells/dgsh/default.nix
View File

@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
patches = [ ./glibc-2.26.patch ];
nativeBuildInputs = [ autoconf automake pkgconfig libtool check
bison git gettext gperf perl texinfo help2man ncurses
];
@ -31,6 +33,8 @@ stdenv.mkDerivation rec {
make PREFIX=$out config
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "The Directed Graph Shell";
homepage = http://www.dmst.aueb.gr/dds/sw/dgsh;

12
pkgs/shells/dgsh/glibc-2.26.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/core-tools/src/dgsh-httpval.c b/core-tools/src/dgsh-httpval.c
index 8b5dce3..7b43c3d 100644
--- a/core-tools/src/dgsh-httpval.c
+++ b/core-tools/src/dgsh-httpval.c
@@ -40,6 +40,7 @@
#include <sys/stat.h>
#include <unistd.h>
#include <stdlib.h>
+#include <stdint.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>

4
pkgs/tools/networking/strongswan/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "strongswan-${version}";
version = "5.6.0";
version = "5.6.1";
src = fetchurl {
url = "http://download.strongswan.org/${name}.tar.bz2";
sha256 = "04vvha2zgsg1cq05cnn6sf7a4hq9ndnsfxpw1drm5v9l4vcw0kd1";
sha256 = "0lxbyiary8iapx3ysw40czrmxf983fhfzs5mvz2hk1j1mpc85hp0";
};
dontPatchELF = true;

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

@ -2164,8 +2164,6 @@ with pkgs;
ftgl = callPackage ../development/libraries/ftgl { };
ftgl212 = callPackage ../development/libraries/ftgl/2.1.2.nix { };
ftop = callPackage ../os-specific/linux/ftop { };
fsfs = callPackage ../tools/filesystems/fsfs { };
@ -2729,7 +2727,7 @@ with pkgs;
ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {
inherit (haskellPackages) ihaskell ghcWithPackages;
inherit (haskellPackages) ghcWithPackages;
jupyter = python3.withPackages (ps: [ ps.jupyter ps.notebook ]);
@ -7078,9 +7076,7 @@ with pkgs;
cheat = callPackage ../applications/misc/cheat { };
chefdk = callPackage ../development/tools/chefdk {
ruby = ruby_2_0;
};
chefdk = callPackage ../development/tools/chefdk { };
matter-compiler = callPackage ../development/compilers/matter-compiler {};
@ -10086,7 +10082,7 @@ with pkgs;
olm = callPackage ../development/libraries/olm { };
oneko = callPackage ../applications/misc/oneko { };
oneko = callPackage ../applications/misc/oneko { };
oniguruma = callPackage ../development/libraries/oniguruma { };
@ -10668,7 +10664,9 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL;
};
SDL2_image = callPackage ../development/libraries/SDL2_image { };
SDL2_image = callPackage ../development/libraries/SDL2_image {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { };
@ -12597,7 +12595,6 @@ with pkgs;
linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.p9_fixes
kernelPatches.modinst_arg_list_too_long
] ++ lib.optionals ((platform.kernelArch or null) == "mips") [
kernelPatches.mips_fpureg_emu
@ -13449,6 +13446,7 @@ with pkgs;
iosevka = callPackage ../data/fonts/iosevka {
nodejs = nodejs-8_x;
};
iosevka-bin = callPackage ../data/fonts/iosevka/bin.nix {};
ipafont = callPackage ../data/fonts/ipafont {};
ipaexfont = callPackage ../data/fonts/ipaexfont {};
@ -20038,4 +20036,6 @@ with pkgs;
};
wal-g = callPackage ../tools/backup/wal-g {};
tlwg = callPackage ../data/fonts/tlwg { };
}

15
pkgs/top-level/ocaml-packages.nix
View File

@ -176,10 +176,17 @@ let
cryptokit = callPackage ../development/ocaml-modules/cryptokit { };
cstruct = callPackage ../development/ocaml-modules/cstruct {
cstruct =
if lib.versionAtLeast ocaml.version "4.2"
then callPackage ../development/ocaml-modules/cstruct {}
else callPackage ../development/ocaml-modules/cstruct/1.9.0.nix { lwt = ocaml_lwt; };
cstruct-lwt = callPackage ../development/ocaml-modules/cstruct/lwt.nix {
lwt = ocaml_lwt;
};
cstruct-unix = callPackage ../development/ocaml-modules/cstruct/unix.nix {};
csv =
if lib.versionAtLeast ocaml.version "4.2"
then callPackage ../development/ocaml-modules/csv { }
@ -380,9 +387,7 @@ let
mtime = callPackage ../development/ocaml-modules/mtime { };
nocrypto = callPackage ../development/ocaml-modules/nocrypto {
lwt = ocaml_lwt;
};
nocrypto = callPackage ../development/ocaml-modules/nocrypto { };
notty = callPackage ../development/ocaml-modules/notty {
lwt = ocaml_lwt;
@ -570,6 +575,8 @@ let
then callPackage ../development/ocaml-modules/ppx_blob {}
else null;
ppx_cstruct = callPackage ../development/ocaml-modules/cstruct/ppx.nix {};
ppx_derivers = callPackage ../development/ocaml-modules/ppx_derivers {};
ppx_deriving =

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

@ -21477,6 +21477,8 @@ EOF
name = "carbon-${version}";
version = graphiteVersion;
disabled = isPy3k;
src = pkgs.fetchurl {
url = "mirror://pypi/c/carbon/${name}.tar.gz";
sha256 = "142smpmgbnjinvfb6s4ijazish4vfgzyd8zcmdkh55y051fkixkn";
@ -21488,6 +21490,7 @@ EOF
homepage = http://graphite.wikidot.com/;
description = "Backend data caching and persistence daemon for Graphite";
maintainers = with maintainers; [ rickynils offline ];
license = licenses.asl20;
};
};