Merge branch 'master' into staging

This commit is contained in:
Vladimír Čunát 2017-07-05 09:53:53 +02:00
commit 9e1c7ddaae
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
96 changed files with 1859 additions and 518 deletions

View file

@ -423,4 +423,12 @@ rec {
else if isInt x then "int"
else "string";
/* deprecated:
For historical reasons, imap has an index starting at 1.
But for consistency with the rest of the library we want an index
starting at zero.
*/
imap = imap1;
}

View file

@ -77,15 +77,21 @@ rec {
*/
foldl' = builtins.foldl' or foldl;
/* Map with index
FIXME(zimbatm): why does this start to count at 1?
/* Map with index starting from 0
Example:
imap (i: v: "${v}-${toString i}") ["a" "b"]
imap0 (i: v: "${v}-${toString i}") ["a" "b"]
=> [ "a-0" "b-1" ]
*/
imap0 = f: list: genList (n: f n (elemAt list n)) (length list);
/* Map with index starting from 1
Example:
imap1 (i: v: "${v}-${toString i}") ["a" "b"]
=> [ "a-1" "b-2" ]
*/
imap = f: list: genList (n: f (n + 1) (elemAt list n)) (length list);
imap1 = f: list: genList (n: f (n + 1) (elemAt list n)) (length list);
/* Map and concatenate the result.

View file

@ -16,6 +16,7 @@
acowley = "Anthony Cowley <acowley@gmail.com>";
adelbertc = "Adelbert Chang <adelbertc@gmail.com>";
adev = "Adrien Devresse <adev@adev.name>";
adisbladis = "Adam Hose <adis@blad.is>";
Adjective-Object = "Maxwell Huang-Hobbs <mhuan13@gmail.com>";
adnelson = "Allen Nelson <ithinkican@gmail.com>";
adolfogc = "Adolfo E. García Castro <adolfo.garcia.cr@gmail.com>";
@ -267,6 +268,7 @@
jpierre03 = "Jean-Pierre PRUNARET <nix@prunetwork.fr>";
jpotier = "Martin Potier <jpo.contributes.to.nixos@marvid.fr>";
jraygauthier = "Raymond Gauthier <jraygauthier@gmail.com>";
jtojnar = "Jan Tojnar <jtojnar@gmail.com>";
juliendehos = "Julien Dehos <dehos@lisic.univ-littoral.fr>";
jwiegley = "John Wiegley <johnw@newartisans.com>";
jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>";
@ -606,6 +608,7 @@
z77z = "Marco Maggesi <maggesi@math.unifi.it>";
zagy = "Christian Zagrodnick <cz@flyingcircus.io>";
zalakain = "Unai Zalakain <contact@unaizalakain.info>";
zarelit = "David Costa <david@zarel.net>";
zauberpony = "Elmar Athmer <elmar@athmer.org>";
zef = "Zef Hemel <zef@zef.me>";
zimbatm = "zimbatm <zimbatm@zimbatm.com>";

View file

@ -98,7 +98,7 @@ rec {
/* Close a set of modules under the imports relation. */
closeModules = modules: args:
let
toClosureList = file: parentKey: imap (n: x:
toClosureList = file: parentKey: imap1 (n: x:
if isAttrs x || isFunction x then
let key = "${parentKey}:anon-${toString n}"; in
unifyModuleSyntax file key (unpackSubmodule (applyIfFunction key) x args)

View file

@ -33,7 +33,7 @@ rec {
concatImapStrings (pos: x: "${toString pos}-${x}") ["foo" "bar"]
=> "1-foo2-bar"
*/
concatImapStrings = f: list: concatStrings (lib.imap f list);
concatImapStrings = f: list: concatStrings (lib.imap1 f list);
/* Place an element between each element of a list
@ -70,7 +70,7 @@ rec {
concatImapStringsSep "-" (pos: x: toString (x / pos)) [ 6 6 6 ]
=> "6-3-2"
*/
concatImapStringsSep = sep: f: list: concatStringsSep sep (lib.imap f list);
concatImapStringsSep = sep: f: list: concatStringsSep sep (lib.imap1 f list);
/* Construct a Unix-style search path consisting of each `subDir"
directory of the given list of packages.

View file

@ -179,9 +179,9 @@ rec {
description = "list of ${elemType.description}s";
check = isList;
merge = loc: defs:
map (x: x.value) (filter (x: x ? value) (concatLists (imap (n: def:
map (x: x.value) (filter (x: x ? value) (concatLists (imap1 (n: def:
if isList def.value then
imap (m: def':
imap1 (m: def':
(mergeDefinitions
(loc ++ ["[definition ${toString n}-entry ${toString m}]"])
elemType
@ -220,7 +220,7 @@ rec {
if isList def.value then
{ inherit (def) file;
value = listToAttrs (
imap (elemIdx: elem:
imap1 (elemIdx: elem:
{ name = elem.name or "unnamed-${toString defIdx}.${toString elemIdx}";
value = elem;
}) def.value);
@ -233,7 +233,7 @@ rec {
name = "loaOf";
description = "list or attribute set of ${elemType.description}s";
check = x: isList x || isAttrs x;
merge = loc: defs: attrOnly.merge loc (imap convertIfList defs);
merge = loc: defs: attrOnly.merge loc (imap1 convertIfList defs);
getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name?>"]);
getSubModules = elemType.getSubModules;
substSubModules = m: loaOf (elemType.substSubModules m);

View file

@ -91,7 +91,8 @@ def _get_latest_version_pypi(package, extension):
if release['filename'].endswith(extension):
# TODO: In case of wheel we need to do further checks!
sha256 = release['digests']['sha256']
else:
sha256 = None
return version, sha256

View file

@ -17,7 +17,7 @@ let
# }
merge = loc: defs:
zipAttrs
(flatten (imap (n: def: imap (m: def':
(flatten (imap1 (n: def: imap1 (m: def':
maintainer.merge (loc ++ ["[${toString n}-${toString m}]"])
[{ inherit (def) file; value = def'; }]) def.value) defs));
};

View file

@ -44,7 +44,7 @@ let
cniConfig = pkgs.buildEnv {
name = "kubernetes-cni-config";
paths = imap (i: entry:
paths = imap1 (i: entry:
pkgs.writeTextDir "${toString (10+i)}-${entry.type}.conf" (builtins.toJSON entry)
) cfg.kubelet.cni.config;
};

View file

@ -11,7 +11,7 @@ let
trim = chars: str: let
nonchars = filter (x : !(elem x.value chars))
(imap (i: v: {ind = (sub i 1); value = v;}) (stringToCharacters str));
(imap0 (i: v: {ind = i; value = v;}) (stringToCharacters str));
in
if length nonchars == 0 then ""
else substring (head nonchars).ind (add 1 (sub (last nonchars).ind (head nonchars).ind)) str;

View file

@ -253,7 +253,7 @@ in {
{ source = overrideNameserversScript;
target = "NetworkManager/dispatcher.d/02overridedns";
}
++ lib.imap (i: s: {
++ lib.imap1 (i: s: {
inherit (s) source;
target = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}";
}) cfg.dispatcherScripts;

View file

@ -71,7 +71,7 @@ let
name = "multihead${toString num}";
inherit config;
};
in imap mkHead cfg.xrandrHeads;
in imap1 mkHead cfg.xrandrHeads;
xrandrDeviceSection = let
monitors = flip map xrandrHeads (h: ''

View file

@ -0,0 +1,29 @@
{ stdenv, fetchFromGitHub, python3Packages, pkgs }:
python3Packages.buildPythonApplication rec {
name = "dr14_tmeter-${version}";
version = "1.0.16";
disabled = !python3Packages.isPy3k;
src = fetchFromGitHub {
owner = "simon-r";
repo = "dr14_t.meter";
rev = "v${version}";
sha256 = "1nfsasi7kx0myxkahbd7rz8796mcf5nsadrsjjpx2kgaaw5nkv1m";
};
propagatedBuildInputs = with pkgs; [
python3Packages.numpy flac vorbis-tools ffmpeg faad2 lame
];
# There are no tests
doCheck = false;
meta = with stdenv.lib; {
description = "Compute the DR14 of a given audio file according to the procedure described by the Pleasurize Music Foundation";
license = licenses.gpl3Plus;
homepage = http://dr14tmeter.sourceforge.net/;
maintainers = [ maintainers.adisbladis ];
};
}

View file

@ -1,21 +1,21 @@
{ stdenv, fetchurl, alsaLib, expat, glib, libjack2, libX11, libpng
{ stdenv, fetchurl, alsaLib, expat, glib, libjack2, libXext, libX11, libpng
, libpthreadstubs, libsmf, libsndfile, lv2, pkgconfig, zita-resampler
}:
stdenv.mkDerivation rec {
version = "0.9.12";
version = "0.9.14";
name = "drumgizmo-${version}";
src = fetchurl {
url = "http://www.drumgizmo.org/releases/${name}/${name}.tar.gz";
sha256 = "0kqrss9v3vpznmh4jgi3783wmprr645s3i485jlvdscpysjfkh6z";
sha256 = "1q2jghjz0ygaja8dgvxp914if8yyzpa204amdcwb9yyinpxsahz4";
};
configureFlags = [ "--enable-lv2" ];
buildInputs = [
alsaLib expat glib libjack2 libX11 libpng libpthreadstubs libsmf
libsndfile lv2 pkgconfig zita-resampler
alsaLib expat glib libjack2 libXext libX11 libpng libpthreadstubs
libsmf libsndfile lv2 pkgconfig zita-resampler
];
meta = with stdenv.lib; {

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, cmake, gettext, pkgconfig, extra-cmake-modules
, boost, subversion, apr, aprutil
, boost, subversion, apr, aprutil, kwindowsystem
, qtscript, qtwebkit, grantlee, karchive, kconfig, kcoreaddons, kguiaddons, kiconthemes, ki18n
, kitemmodels, kitemviews, kio, kparts, sonnet, kcmutils, knewstuff, knotifications
, knotifyconfig, ktexteditor, threadweaver, kdeclarative, libkomparediff2 }:
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules ];
buildInputs = [
boost subversion apr aprutil
boost subversion apr aprutil kwindowsystem
qtscript qtwebkit grantlee karchive kconfig kcoreaddons kguiaddons kiconthemes
ki18n kitemmodels kitemviews kio kparts sonnet kcmutils knewstuff
knotifications knotifyconfig ktexteditor threadweaver kdeclarative

View file

@ -1,41 +1,42 @@
{ stdenv, fetchurl, gettext, glib, gtk2, hicolor_icon_theme, json_c
, lcms2, libpng , makeWrapper, pkgconfig, python2Packages
, scons, swig
}:
{ stdenv, fetchFromGitHub, gtk3, intltool, json_c, lcms2, libpng, librsvg,
pkgconfig, python2Packages, scons, swig, wrapGAppsHook }:
let
inherit (python2Packages) python pygtk numpy;
inherit (python2Packages) python pycairo pygobject3 numpy;
in stdenv.mkDerivation rec {
name = "mypaint-${version}";
version = "1.1.0";
version = "1.2.1";
src = fetchurl {
url = "http://download.gna.org/mypaint/${name}.tar.bz2";
sha256 = "0f7848hr65h909c0jkcx616flc0r4qh53g3kd1cgs2nr1pjmf3bq";
src = fetchFromGitHub {
owner = "mypaint";
repo = "mypaint";
rev = "bcf5a28d38bbd586cc9d4cee223f849fa303864f";
sha256 = "1zwx7n629vz1jcrqjqmw6vl6sxdf81fq6a5jzqiga8167gg8s9pf";
fetchSubmodules = true;
};
buildInputs = [
gettext glib gtk2 json_c lcms2 libpng makeWrapper pkgconfig pygtk
python scons swig
];
nativeBuildInputs = [ intltool pkgconfig scons swig wrapGAppsHook ];
propagatedBuildInputs = [ hicolor_icon_theme numpy ];
buildInputs = [ gtk3 json_c lcms2 libpng librsvg pycairo pygobject3 python ];
propagatedBuildInputs = [ numpy ];
buildPhase = "scons prefix=$out";
installPhase = ''
scons prefix=$out install
sed -i -e 's|/usr/bin/env python2.7|${python}/bin/python|' $out/bin/mypaint
wrapProgram $out/bin/mypaint \
--prefix PYTHONPATH : $PYTHONPATH \
--prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share"
'';
preFixup = ''
gappsWrapperArgs+=(--prefix PYTHONPATH : $PYTHONPATH)
'';
meta = with stdenv.lib; {
description = "A graphics application for digital painters";
homepage = http://mypaint.intilinux.com;
homepage = http://mypaint.org/;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
maintainers = with maintainers; [ goibhniu jtojnar ];
};
}

View file

@ -1,4 +1,6 @@
{ stdenv, fetchFromGitHub, libX11, imlib2, giflib, libexif }:
{ stdenv, fetchFromGitHub, libX11, imlib2, giflib, libexif, conf ? null }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "sxiv-${version}";
@ -16,12 +18,16 @@ stdenv.mkDerivation rec {
--replace /usr/local $out
'';
configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
buildInputs = [ libX11 imlib2 giflib libexif ];
meta = {
description = "Simple X Image Viewer";
homepage = "https://github.com/muennich/sxiv";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
maintainers = with maintainers; [ jfrankenau fuuzetsu ];
};
}

View file

@ -0,0 +1,31 @@
{ stdenv, fetchgit, ncurses, conf ? null }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "noice-${version}";
version = "0.6";
src = fetchgit {
url = "git://git.2f30.org/noice.git";
rev = "refs/tags/v${version}";
sha256 = "03rwglcy47fh6rb630vws10m95bxpcfv47nxrlws2li2ljam8prw";
};
configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
buildInputs = [ ncurses ];
buildFlags = [ "LDLIBS=-lncurses" ];
installFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
meta = {
description = "Small ncurses-based file browser";
homepage = https://git.2f30.org/noice/;
license = licenses.bsd2;
platforms = platforms.all;
maintainers = with maintainers; [ jfrankenau ];
};
}

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "pdfpc";
version = "4.0.6";
version = "4.0.7";
src = fetchFromGitHub {
repo = "pdfpc";
owner = "pdfpc";
rev = "v${version}";
sha256 = "05cfx45i0xnwvclrbwlmqsjj2sk1galk62dc0mrkhr6293mbp1mx";
sha256 = "00qfmmk8h762p53z46g976z7j4fbxyi16w5axzsv1ymvdq95ds8c";
};
nativeBuildInputs = [ cmake pkgconfig vala ];

View file

@ -1,25 +1,21 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, urwid, pythonOlder }:
{ stdenv, python3Packages, fetchFromGitHub }:
buildPythonPackage rec {
python3Packages.buildPythonApplication rec {
name = "urlscan-${version}";
version = "0.8.3";
version = "0.8.6";
src = fetchFromGitHub {
owner = "firecat53";
repo = "urlscan";
rev = version;
# (equivalent but less nice(?): rev = "00333f6d03bf3151c9884ec778715fc605f58cc5")
sha256 = "0l40anfznam4d3q0q0jp2wwfrvfypz9ppbpjyzjdrhb3r2nizb0y";
sha256 = "1v26fni64n0lbv37m35plh2bsrvhpb4ibgmg2mv05qfc3df721s5";
};
propagatedBuildInputs = [ urwid ];
# FIXME doesn't work with 2.7; others than 2.7 and 3.5 were not tested (yet)
disabled = !pythonOlder "3.5";
propagatedBuildInputs = [ python3Packages.urwid ];
meta = with stdenv.lib; {
description = "Mutt and terminal url selector (similar to urlview)";
license = licenses.gpl2;
maintainers = [ maintainers.dpaetzel ];
maintainers = with maintainers; [ dpaetzel jfrankenau ];
};
}

View file

@ -81,7 +81,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "7.0.1";
version = "7.0.2";
lang = "en-US";
@ -91,7 +91,7 @@ let
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
sha256 = "1zmczf1bpbd85zcrs5qw91d1xmplikbna5xs053jnjl6pbbq1fs9";
sha256 = "0xdw8mvyxz9vaxikzsj4ygzp36m4jfhvhqfiyaiiywpf39rqpkqr";
};
"i686-linux" = fetchurl {
@ -99,7 +99,7 @@ let
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
sha256 = "0mdlgmqkryg0i55jgf3x1nnjni0x45g1xcjwsfacsck3m70v4flq";
sha256 = "0m522i8zih5sj18dyzk9im7gmpmrbf96657v38m3pxn4ci38b83z";
};
};
in
@ -190,6 +190,12 @@ stdenv.mkDerivation rec {
// Stop obnoxious first-run redirection.
lockPref("noscript.firstRunRedirection", false);
// Insist on using IPC for communicating with Tor
//
// Defaults to creating $TBB_HOME/TorBrowser/Data/Tor/{socks,control}.socket
lockPref("extensions.torlauncher.control_port_use_ipc", true);
lockPref("extensions.torlauncher.socks_port_use_ipc", true);
EOF
# Hard-code path to TBB fonts; see also FONTCONFIG_FILE in
@ -233,6 +239,9 @@ stdenv.mkDerivation rec {
# Initialize the Tor data directory.
mkdir -p "\$HOME/TorBrowser/Data/Tor"
# TBB will fail if ownership is too permissive
chmod 0700 "\$HOME/TorBrowser/Data/Tor"
# Initialize the browser profile state. Note that the only data
# copied from the Store payload is the initial bookmark file, which is
# never updated once created. All other files under user's profile

View file

@ -48,9 +48,9 @@ in {
sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb";
};
terraform_0_9_10 = generic {
version = "0.9.10";
sha256 = "0sg8czfn4hh7cf7zcdqwkygsvm9p47f5bi6kbl37bx9rn6bi5m6s";
terraform_0_9_11 = generic {
version = "0.9.11";
sha256 = "045zcpd4g9c52ynhgh3213p422ahds63mzhmd2iwcmj88g8i1w6x";
doCheck = true;
};
}

View file

@ -8,6 +8,17 @@ let
version = "4.0.4";
runtimeDeps = [
udev libnotify
];
deps = (with xorg; [
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
libXrender libX11 libXtst libXScrnSaver
]) ++ [
gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
] ++ runtimeDeps;
desktopItem = makeDesktopItem rec {
name = "Franz";
exec = name;
@ -28,17 +39,6 @@ in stdenv.mkDerivation rec {
# don't remove runtime deps
dontPatchELF = true;
deps = (with xorg; [
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
libXrender libX11 libXtst libXScrnSaver
]) ++ [
gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
# runtime deps
] ++ [
udev libnotify
];
unpackPhase = ''
tar xzf $src
'';
@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
description = "A free messaging app that combines chat & messaging services into one application";
homepage = http://meetfranz.com;
license = licenses.free;
maintainers = [ stdenv.lib.maintainers.gnidorah ];
maintainers = [ maintainers.gnidorah ];
platforms = ["i686-linux" "x86_64-linux"];
hydraPlatforms = [];
};

View file

@ -6,7 +6,18 @@ let
bits = if stdenv.system == "x86_64-linux" then "x64"
else "ia32";
version = "0.5.9";
version = "0.5.10";
runtimeDeps = [
udev libnotify
];
deps = (with xorg; [
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
libXrender libX11 libXtst libXScrnSaver libxcb
]) ++ [
gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
] ++ runtimeDeps;
myIcon = fetchurl {
url = "https://raw.githubusercontent.com/saenzramiro/rambox/9e4444e6297dd35743b79fe23f8d451a104028d5/resources/Icon.png";
@ -25,24 +36,13 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox-${version}-${bits}.tar.gz";
sha256 = if bits == "x64" then
"0wx1cj3h1h28lhvl8ysmvr2wxq39lklk37361i598vph2pvnibi0" else
"1dqjd5rmml63h3y43n1r68il3pn8zwy0wwr0866cnpizsbis96fy";
"1i5jbhsfdbhr0rsb5w2pfpwjiagz47ppxk65qny3ay3lr4lbccn3" else
"1p1m6vsa9xvl3pjf3pygvllyk7j4q9vnlzmrizb8f5q30fpls25x";
};
# don't remove runtime deps
dontPatchELF = true;
deps = (with xorg; [
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
libXrender libX11 libXtst libXScrnSaver libxcb
]) ++ [
gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
# runtime deps
] ++ [
udev libnotify
];
installPhase = ''
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" rambox
patchelf --set-rpath "$out/opt/rambox:${stdenv.lib.makeLibraryPath deps}" rambox

View file

@ -10,7 +10,7 @@
}:
stdenv.mkDerivation rec {
version = "0.23.5";
version = "0.24.2";
name = "notmuch-${version}";
passthru = {
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://notmuchmail.org/releases/${name}.tar.gz";
sha256 = "0ry2k9sdwd1vw8cf6svch8wk98523s07mwxvsf7b8kghqnrr89n6";
sha256 = "0lfchvapk11qazdgsxj42igp9mpp83zbd0h1jj6r3ifmhikajxma";
};
buildInputs = [

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake
, extra-cmake-modules, qtbase, qtscript
, ki18n, kio, knotifications, knotifyconfig, kdoctools, kross, kcmutils, kdelibs4support
, libktorrent, boost, taglib
, libktorrent, boost, taglib, libgcrypt, kplotting
}:
stdenv.mkDerivation rec {
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ cmake qtbase qtscript
ki18n kio knotifications knotifyconfig kross kcmutils kdelibs4support
libktorrent taglib
libktorrent taglib libgcrypt kplotting
];
enableParallelBuilding = true;

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, which
, boost, libtorrentRasterbar, qmake, qtbase, qttools
, boost, libtorrentRasterbar, qtbase, qttools
, debugSupport ? false # Debugging
, guiSupport ? true, dbus_libs ? null # GUI (disable to run headless)
, webuiSupport ? true # WebUI
@ -10,14 +10,14 @@ assert guiSupport -> (dbus_libs != null);
with stdenv.lib;
stdenv.mkDerivation rec {
name = "qbittorrent-${version}";
version = "3.3.12";
version = "3.3.13";
src = fetchurl {
url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
sha256 = "0vs626khavhqqnq2hrwrxyc8ihbngharcf1fd37nwccvy13qqljn";
sha256 = "13a6rv4f4xgbjh6nai7fnqb04rh7i2kjpp7y2z5j1wyy4x8pncc4";
};
nativeBuildInputs = [ pkgconfig which qmake ];
nativeBuildInputs = [ pkgconfig which ];
buildInputs = [ boost libtorrentRasterbar qtbase qttools ]
++ optional guiSupport dbus_libs;
@ -34,9 +34,9 @@ stdenv.mkDerivation rec {
] ++ optional debugSupport "--enable-debug";
# The lrelease binary is named lrelease instead of lrelease-qt4
patches = [ ./fix-lrelease.patch];
patches = [ ./fix-lrelease.patch ];
# https://github.com/qbittorrent/qBittorrent/issues/1992
# https://github.com/qbittorrent/qBittorrent/issues/1992
enableParallelBuilding = false;
meta = {

View file

@ -1,8 +1,9 @@
{ mkDerivation, lib, fetchurl,
cmake, extra-cmake-modules, qtwebkit, qtscript, grantlee,
kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin,
kiconthemes, knewstuff, sqlcipher, qca-qt5, kdelibs4support, kactivities,
knotifyconfig, krunner, libofx, shared_mime_info }:
kiconthemes, knewstuff, sqlcipher, qca-qt5, kactivities, karchive,
kguiaddons, knotifyconfig, krunner, kwindowsystem, libofx, shared_mime_info
}:
mkDerivation rec {
name = "skrooge-${version}";
@ -17,7 +18,7 @@ mkDerivation rec {
buildInputs = [ qtwebkit qtscript grantlee kxmlgui kwallet kparts kdoctools
kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5
kdelibs4support kactivities knotifyconfig krunner libofx
kactivities karchive kguiaddons knotifyconfig krunner kwindowsystem libofx
];
meta = with lib; {

View file

@ -26,7 +26,9 @@ buildGoPackage rec {
outputs = [ "bin" "out" "data" ];
postInstall = ''
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
install_name_tool -delete_rpath $out/lib $bin/bin/gogs
'' + ''
mkdir $data
cp -R $src/{public,templates} $data

View file

@ -88,7 +88,7 @@ in stdenv.mkDerivation {
'';
patches = optional enableHardening ./hardened.patch
++ [ ./qtx11extras.patch ];
++ [ ./qtx11extras.patch ./linux-4.12.patch ];
postPatch = ''
sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \

View file

@ -62,6 +62,9 @@ stdenv.mkDerivation {
for i in *
do
cd $i
# Files within the guest additions ISO are using DOS line endings
sed -re '/^(@@|---|\+\+\+)/!s/$/\r/' ${../linux-4.12.patch} \
| patch -d vboxguest -p4
find . -type f | xargs sed 's/depmod -a/true/' -i
make
cd ..

View file

@ -0,0 +1,80 @@
commit 47fee9325e3b5feed0dbc4ba9e2de77c6d55e3bb
Author: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
Date: Wed May 17 09:42:23 2017 +0000
Runtime/r0drv: Linux 4.12 5-level page table adaptions
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@66927 cfe28804-0f27-0410-a406-dd0f0b0b656f
diff --git a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
index 28dc33f963..41ed058860 100644
--- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
@@ -902,6 +902,9 @@ static struct page *rtR0MemObjLinuxVirtToPage(void *pv)
union
{
pgd_t Global;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
+ p4d_t Four;
+#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
pud_t Upper;
#endif
@@ -917,12 +920,26 @@ static struct page *rtR0MemObjLinuxVirtToPage(void *pv)
u.Global = *pgd_offset(current->active_mm, ulAddr);
if (RT_UNLIKELY(pgd_none(u.Global)))
return NULL;
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
+ u.Four = *p4d_offset(&u.Global, ulAddr);
+ if (RT_UNLIKELY(p4d_none(u.Four)))
+ return NULL;
+ if (p4d_large(u.Four))
+ {
+ pPage = p4d_page(u.Four);
+ AssertReturn(pPage, NULL);
+ pfn = page_to_pfn(pPage); /* doing the safe way... */
+ AssertCompile(P4D_SHIFT - PAGE_SHIFT < 31);
+ pfn += (ulAddr >> PAGE_SHIFT) & ((UINT32_C(1) << (P4D_SHIFT - PAGE_SHIFT)) - 1);
+ return pfn_to_page(pfn);
+ }
+ u.Upper = *pud_offset(&u.Four, ulAddr);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
u.Upper = *pud_offset(&u.Global, ulAddr);
+#endif
if (RT_UNLIKELY(pud_none(u.Upper)))
return NULL;
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
if (pud_large(u.Upper))
{
pPage = pud_page(u.Upper);
@@ -931,8 +948,8 @@ static struct page *rtR0MemObjLinuxVirtToPage(void *pv)
pfn += (ulAddr >> PAGE_SHIFT) & ((UINT32_C(1) << (PUD_SHIFT - PAGE_SHIFT)) - 1);
return pfn_to_page(pfn);
}
-# endif
-
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
u.Middle = *pmd_offset(&u.Upper, ulAddr);
#else /* < 2.6.11 */
u.Middle = *pmd_offset(&u.Global, ulAddr);
diff --git a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
index 5afdee9e71..20aab0817f 100644
--- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
@@ -159,6 +159,11 @@
# include <asm/tlbflush.h>
#endif
+/* for set_pages_x() */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
+# include <asm/set_memory.h>
+#endif
+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)
# include <asm/smap.h>
#else

View file

@ -47,6 +47,7 @@ Options:
--leave-dotGit Keep the .git directories.
--fetch-submodules Fetch submodules.
--builder Clone as fetchgit does, but url, rev, and out option are mandatory.
--quiet Only print the final json summary.
"
exit 1
}

View file

@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "papirus-icon-theme-${version}";
version = "20170616";
src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam";
repo = "papirus-icon-theme";
rev = "${version}";
sha256 = "008nkmxp3f9qqljif3v9ns3a8mflzffv2mm5zgjng9pmdl5x70j4";
};
dontBuild = true;
installPhase = ''
install -dm 755 $out/share/icons
cp -dr Papirus{,-Dark,-Light} $out/share/icons/
cp -dr ePapirus $out/share/icons/
'';
meta = with stdenv.lib; {
description = "Papirus icon theme for Linux";
homepage = "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme";
license = licenses.lgpl3;
platforms = platforms.all;
};
}

View file

@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub, glib, gettext, bash }:
stdenv.mkDerivation rec {
name = "gnome-shell-extension-topicons-plus-${version}";
version = "v20";
src = fetchFromGitHub {
owner = "phocean";
repo = "TopIcons-plus";
rev = "01535328bd43ecb3f2c71376de6fc8d1d8a88577";
sha256 = "0pwpg72ihgj2jl9pg63y0hibdsl27srr3mab881w0gh17vwyixzi";
};
buildInputs = [ glib ];
nativeBuildInputs = [ gettext ];
makeFlags = [ "INSTALL_PATH=$(out)/share/gnome-shell/extensions" ];
meta = with stdenv.lib; {
description = "Brings all icons back to the top panel, so that it's easier to keep track of apps running in the backround";
license = licenses.gpl2;
maintainers = with maintainers; [ eperuffo ];
homepage = https://github.com/phocean/TopIcons-plus;
};
}

View file

@ -1,25 +0,0 @@
From 5972cd58bde3bc8bacfe994e5b127c411241f255 Mon Sep 17 00:00:00 2001
From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 3 Jan 2017 05:36:40 +0000
Subject: [PATCH] * config/darwin-driver.c (darwin_driver_init):
Const-correctness fixes for first_period and second_period variables.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@244010 138bc75d-0d04-0410-961f-82ee72b054a4
---
diff --git a/gcc/config/darwin-driver.c b/gcc/config/darwin-driver.c
index 0c4f0cd..e3ed79d 100644
--- a/gcc/config/darwin-driver.c
+++ b/gcc/config/darwin-driver.c
@@ -299,10 +299,10 @@ darwin_driver_init (unsigned int *decoded_options_count,
if (vers_string != NULL)
{
char *asm_major = NULL;
- char *first_period = strchr(vers_string, '.');
+ const char *first_period = strchr(vers_string, '.');
if (first_period != NULL)
{
- char *second_period = strchr(first_period+1, '.');
+ const char *second_period = strchr(first_period+1, '.');
if (second_period != NULL)
asm_major = xstrndup (vers_string, second_period-vers_string);
else

View file

@ -58,7 +58,7 @@ assert langGo -> langCC;
with stdenv.lib;
with builtins;
let version = "6.3.0";
let version = "6.4.0";
# Whether building a cross-compiler for GNU/Hurd.
crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
@ -72,8 +72,7 @@ let version = "6.3.0";
# The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
# target libraries and tools.
++ optional langAda ../gnat-cflags.patch
++ optional langFortran ../gfortran-driving.patch
++ optional hostPlatform.isDarwin ./darwin-const-correct.patch; # Kill this after 6.3.0
++ optional langFortran ../gfortran-driving.patch;
javaEcj = fetchurl {
# The `$(top_srcdir)/ecj.jar' file is automatically picked up at
@ -213,8 +212,8 @@ stdenv.mkDerivation ({
builder = ../builder.sh;
src = fetchurl {
url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
sha256 = "17xjz30jb65hcf714vn9gcxvrrji8j20xm7n33qg1ywhyzryfsph";
url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.xz";
sha256 = "1m0lr7938lw5d773dkvwld90hjlcq2282517d1gwvrfzmwgg42w5";
};
inherit patches;

View file

@ -1,40 +1,82 @@
{ stdenv, fetchgit, ocaml, zlib, pcre, neko, camlp4 }:
{ stdenv, fetchgit, bash, coreutils, ocaml, zlib, pcre, neko, camlp4 }:
stdenv.mkDerivation {
name = "haxe-3.4.2";
let
generic = { version, sha256, prePatch }:
stdenv.mkDerivation rec {
name = "haxe-${version}";
buildInputs = [ocaml zlib pcre neko camlp4];
buildInputs = [ocaml zlib pcre neko camlp4];
src = fetchgit {
url = "https://github.com/HaxeFoundation/haxe.git";
sha256 = "1m5fp183agqv8h3ynhxw4kndkpq2d6arysmirv3zl3vz5crmpwqd";
fetchSubmodules = true;
src = fetchgit {
url = https://github.com/HaxeFoundation/haxe.git;
inherit sha256;
fetchSubmodules = true;
rev = "refs/tags/${version}";
};
# Tag 3.4.2
rev = "890f8c70cf23ce6f9fe0fdd0ee514a9699433ca7";
inherit prePatch;
buildFlags = [ "all" "tools" ];
installPhase = ''
install -vd "$out/bin" "$out/lib/haxe/std"
cp -vr haxe haxelib std "$out/lib/haxe"
# make wrappers which provide a temporary HAXELIB_PATH with symlinks to multiple repositories HAXELIB_PATH may point to
for name in haxe haxelib; do
cat > $out/bin/$name <<EOF
#!{bash}/bin/bash
if [[ "\$HAXELIB_PATH" =~ : ]]; then
NEW_HAXELIB_PATH="\$(${coreutils}/bin/mktemp -d)"
IFS=':' read -ra libs <<< "\$HAXELIB_PATH"
for libdir in "\''${libs[@]}"; do
for lib in "\$libdir"/*; do
if [ ! -e "\$NEW_HAXELIB_PATH/\$(${coreutils}/bin/basename "\$lib")" ]; then
${coreutils}/bin/ln -s "--target-directory=\$NEW_HAXELIB_PATH" "\$lib"
fi
done
done
export HAXELIB_PATH="\$NEW_HAXELIB_PATH"
$out/lib/haxe/$name "\$@"
rm -rf "\$NEW_HAXELIB_PATH"
else
exec $out/lib/haxe/$name "\$@"
fi
EOF
chmod +x $out/bin/$name
done
'';
setupHook = ./setup-hook.sh;
dontStrip = true;
meta = with stdenv.lib; {
description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++";
homepage = https://haxe.org;
license = with licenses; [ gpl2 bsd2 /*?*/ ]; # -> docs/license.txt
maintainers = [ maintainers.marcweber ];
platforms = platforms.linux ++ platforms.darwin;
};
};
in {
# this old version is required to compile some libraries
haxe_3_2 = generic {
version = "3.2.1";
sha256 = "1x9ay5a2llq46fww3k07jxx8h1vfpyxb522snc6702a050ki5vz3";
prePatch = ''
sed -i -e 's|"/usr/lib/haxe/std/";|"'"$out/lib/haxe/std/"'";\n&|g' main.ml
sed -i -e 's|"neko"|"${neko}/bin/neko"|g' extra/haxelib_src/src/tools/haxelib/Main.hx
'';
};
prePatch = ''
sed -i -e 's|"/usr/lib/haxe/std/";|"'"$out/lib/haxe/std/"'";\n&|g' src/main.ml
'';
buildFlags = [ "all" "tools" ];
installPhase = ''
install -vd "$out/bin" "$out/lib/haxe/std"
install -vt "$out/bin" haxe haxelib
cp -vr std "$out/lib/haxe"
'';
setupHook = ./setup-hook.sh;
dontStrip = true;
meta = with stdenv.lib; {
description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++";
homepage = https://haxe.org;
license = with licenses; [ gpl2 bsd2 /*?*/ ]; # -> docs/license.txt
maintainers = [ maintainers.marcweber ];
platforms = platforms.linux ++ platforms.darwin;
haxe_3_4 = generic {
version = "3.4.2";
sha256 = "1m5fp183agqv8h3ynhxw4kndkpq2d6arysmirv3zl3vz5crmpwqd";
prePatch = ''
sed -i -e 's|"/usr/lib/haxe/std/";|"'"$out/lib/haxe/std/"'";\n&|g' src/main.ml
sed -i -e 's|"neko"|"${neko}/bin/neko"|g' extra/haxelib_src/src/haxelib/client/Main.hx
'';
};
}

View file

@ -1,52 +0,0 @@
{ stdenv, fetchzip, haxe, neko, pcre, sqlite, zlib }:
stdenv.mkDerivation rec {
name = "hxcpp-3.2.27";
src = let
zipFile = stdenv.lib.replaceChars ["."] [","] name;
in fetchzip {
inherit name;
url = "http://lib.haxe.org/files/3.0/${zipFile}.zip";
sha256 = "1hw4kr1f8q7f4fkzis7kvkm7h1cxhv6cf5v1iq7rvxs2fxiys7fr";
};
NIX_LDFLAGS = "-lpcre -lz -lsqlite3";
outputs = [ "out" "lib" ];
patchPhase = ''
rm -rf bin lib project/thirdparty project/libs/sqlite/sqlite3.[ch]
find . -name '*.n' -delete
sed -i -re '/(PCRE|ZLIB)_DIR|\<sqlite3\.c\>/d' project/Build.xml
sed -i -e 's/mFromFile = "@";/mFromFile = "";/' tools/hxcpp/Linker.hx
sed -i -e '/dll_ext/s,HX_CSTRING("./"),HX_CSTRING("'"$lib"'/"),' \
src/hx/Lib.cpp
'';
buildInputs = [ haxe neko pcre sqlite zlib ];
targetArch = "linux-m${if stdenv.is64bit then "64" else "32"}";
buildPhase = ''
haxe -neko project/build.n -cp tools/build -main Build
haxe -neko run.n -cp tools/run -main RunMain
haxe -neko hxcpp.n -cp tools/hxcpp -main BuildTool
(cd project && neko build.n "ndll-$targetArch")
'';
installPhase = ''
for i in bin/Linux*/*.dso; do
install -vD "$i" "$lib/$(basename "$i")"
done
find *.n toolchain/*.xml build-tool/BuildCommon.xml src include \
-type f -exec install -vD -m 0644 {} "$out/lib/haxe/hxcpp/{}" \;
'';
meta = {
homepage = "http://lib.haxe.org/p/hxcpp";
description = "Runtime support library for the Haxe C++ backend";
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -1,5 +1,7 @@
addHaxeLibPath() {
if [ ! -d "$1/lib/haxe/std" ]; then
addToSearchPath HAXELIB_PATH "$1/lib/haxe"
fi
}
envHooks+=(addHaxeLibPath)

View file

@ -24,6 +24,12 @@ stdenv.mkDerivation rec {
+ "fe87462d9c7a6ee27e28f5be5e4fc0ac87b34574.patch";
sha256 = "1jbmq6j32vg3qv20dbh82cp54886lgrh7gkcqins8a2y4l4dl3sc";
})
# https://github.com/HaxeFoundation/neko/pull/165
(fetchpatch {
url = "https://github.com/HaxeFoundation/neko/commit/"
+ "c6d9c6d796200990b3b6a53a4dc716c9192398e6.patch";
sha256 = "1pq0qhhb9gbhc3zbgylwp0amhwsz0q0ggpj6v2xgv0hfy7d63rcd";
})
];
buildInputs =

View file

@ -1,13 +1,14 @@
{stdenv, fetchFromGitHub, cmake}:
stdenv.mkDerivation rec {
name = "wla-dx-git-2016-02-27";
version = "2017-06-05";
name = "wla-dx-git-${version}";
src = fetchFromGitHub {
owner = "vhelin";
repo = "wla-dx";
rev = "8189fe8d5620584ea16563875ff3c5430527c86a";
sha256 = "02zgkcyfx7y8j6jvyi12lm29fydnd7m3rxv6g2psv23fyzmpkkir";
rev = "ae6843f9711cbc2fa6dd8c200877b40bd2bcad7f";
sha256 = "09c2kz12ld97ad41j6r8r65jknllrak1x8r43fgr26x7hdlxz5c6";
};
hardeningDisable = [ "format" ];

View file

@ -670,7 +670,7 @@ self: super: {
haste-compiler = markBroken (self.callPackage ../tools/haskell/haste/haste-compiler.nix { inherit overrideCabal; super-haste-compiler = super.haste-compiler; });
# tinc is a new build driver a la Stack that's not yet available from Hackage.
tinc = self.callPackage ../tools/haskell/tinc {};
tinc = self.callPackage ../tools/haskell/tinc { inherit (pkgs) cabal-install cabal2nix; };
# Tools that use gtk2hs-buildtools now depend on them in a custom-setup stanza
cairo = addBuildTool super.cairo self.gtk2hs-buildtools;

View file

@ -59,4 +59,12 @@ self: super: {
# https://github.com/nominolo/ghc-syb/issues/20
ghc-syb-utils = dontCheck super.ghc-syb-utils;
# Older, LTS-8-based versions don't compile.
vector = super.vector_0_12_0_1;
primitive = self.primitive_0_6_2_0;
syb = self.syb_0_7;
# Work around overly restrictive constraints on the version of 'base'.
doctest = doJailbreak super.doctest;
}

File diff suppressed because it is too large Load diff

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig
, plasma-framework, qtbase
, plasma-framework, qtbase, qttranslations
, qtquickcontrols ? null
, qtquickcontrols2 ? null }:
@ -15,7 +15,7 @@ let
inherit sha256;
};
buildInputs = [ plasma-framework qtbase qtqc ];
buildInputs = [ plasma-framework qtbase qtqc qttranslations ];
nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ];

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libbsd-${version}";
version = "0.8.4";
version = "0.8.5";
src = fetchurl {
url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz";
sha256 = "1cya8bv976ijv5yy1ix3pzbnmp9k2qqpgw3dx98k2w0m55jg2yi1";
sha256 = "0a2vq0xdhs3yyj91b0612f19fakg7a9xlqy2f993128kyhjd0ivn";
};
# darwin changes configure.ac which means we need to regenerate

View file

@ -9,6 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "1jsslwkilwrsj959dc8b479qildawz67r8m4lzxm7glcwa8cngiz";
};
patches = [
./version-1.2.1.patch
];
nativeBuildInputs = [ autoreconfHook ];
outputs = [ "out" "dev" ];

View file

@ -0,0 +1,13 @@
diff --git a/configure.ac b/configure.ac
index a254bbe..fe0247b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
define(pkg_major, 1)
-define(pkg_minor, 2.1)
-define(pkg_extra, )
+define(pkg_minor, 2)
+define(pkg_extra, 1)
define(pkg_maintainer, libunwind-devel@nongnu.org)
define(mkvers, $1.$2$3)
dnl Process this file with autoconf to produce a configure script.

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "utf8proc-${version}";
version = "2.0.2";
version = "2.1.0";
src = fetchurl {
url = "https://github.com/JuliaLang/utf8proc/archive/v${version}.tar.gz";
sha256 = "140vib1m6n5kwzkw1n9fbsi5gl6xymbd7yndwqx1sj15aakak776";
sha256 = "0q1jhdkk4f9b0zb8s2ql3sba3br5nvjsmbsaybmgj064k9hwbk15";
};
makeFlags = [ "prefix=$(out)" ];

View file

@ -6,12 +6,12 @@
stdenv.mkDerivation rec {
name = "wlc-${version}";
version = "0.0.8";
version = "0.0.9";
src = fetchgit {
url = "https://github.com/Cloudef/wlc";
rev = "refs/tags/v${version}";
sha256 = "1lkxbqnxfmbk9j9k8wq2fl5z0a9ihzalad3x1pp8w2riz41j3by6";
sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg";
fetchSubmodules = true;
};

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation {
name = "ocaml-csv-1.4.2";
name = "ocaml-csv-1.5";
src = fetchzip {
url = https://github.com/Chris00/ocaml-csv/releases/download/1.4.2/csv-1.4.2.tar.gz;
sha256 = "05s8py2qr3889c72g1q07r15pzch3j66xdphxi2sd93h5lvnpi4j";
url = https://github.com/Chris00/ocaml-csv/releases/download/1.5/csv-1.5.tar.gz;
sha256 = "1ca7jgg58j24pccs5fshis726s06fdcjshnwza5kwxpjgdbvc63g";
};
buildInputs = [ ocaml findlib ocamlbuild ];

View file

@ -5,6 +5,10 @@
, version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0"
}:
if !stdenv.lib.versionAtLeast ocaml.version "4"
then throw "lwt is not available for OCaml ${ocaml.version}"
else
let sha256 = {
"3.0.0" = "0wwhnl9hppixcsdisinj1wmffx0nv6hkpm01z9qvkngkrazi3i88";
"2.7.1" = "0w7f59havrl2fsnvs84lm7wlqpsrldg80gy5afpnpr21zkw22g8w";

View file

@ -1,4 +1,8 @@
{ stdenv, fetchurl, buildOcaml, calendar, csv, re }:
{ stdenv, fetchurl, buildOcaml, ocaml, calendar, csv, re }:
if !stdenv.lib.versionAtLeast ocaml.version "4"
then throw "pgocaml is not available for OCaml ${ocaml.version}"
else
buildOcaml {
name = "pgocaml";

View file

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "channels";
name = "${pname}-${version}";
version = "1.1.5";
version = "1.1.6";
src = fetchurl {
url = "mirror://pypi/c/channels/${name}.tar.gz";
sha256 = "a9005bcb6104d26a7f93d9cf012bcf6765a0ff444a449ac68d6e1f16721f8ed3";
sha256 = "44ab9a1f610ecc9ac25d5f90e7a44f49b18de28a05a26fe34e935af257f1eefe";
};
# Files are missing in the distribution

View file

@ -0,0 +1,26 @@
{ stdenv, buildPythonPackage, fetchPypi, requests, coverage, unittest2 }:
buildPythonPackage rec {
pname = "codecov";
version = "2.0.9";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "037h4dcl8xshlq3rj8409p11rpgnyqrhlhfq8j34s94nm0n1h76v";
};
buildInputs = [ unittest2 ]; # Tests only
propagatedBuildInputs = [ requests coverage ];
postPatch = ''
sed -i 's/, "argparse"//' setup.py
'';
meta = {
description = "Python report uploader for Codecov";
homepage = https://codecov.io/;
license = stdenv.lib.licenses.asl20;
};
}

View file

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "django-guardian";
name = "${pname}-${version}";
version = "1.4.8";
version = "1.4.9";
src = fetchurl {
url = "mirror://pypi/d/django-guardian/${name}.tar.gz";
sha256 = "039mfx47c05vl6vlld0ahyq37z7m5g68vqc38pj8iic5ysr98drm";
sha256 = "c3c0ab257c9d94ce154b9ee32994e3cff8b350c384040705514e14a9fb7c8191";
};
buildInputs = [ pytest pytestrunner pytest-django django_environ mock setuptools_scm ];

View file

@ -4,18 +4,20 @@
buildPythonPackage rec {
pname = "dogpile.cache";
version = "0.6.3";
version = "0.6.4";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "e9747f5e31f8dea1b80d6204358885f943f69e53574d88005438ca3651c44553";
sha256 = "a73aa3049cd88d7ec57a1c2e8946abdf4f14188d429c1023943fcc55c4568da1";
};
# Disable concurrency tests that often fail,
# probably some kind of timing issue.
prePatch = ''
postPatch = ''
rm tests/test_lock.py
# Failing tests. https://bitbucket.org/zzzeek/dogpile.cache/issues/116
rm tests/cache/test_memcached_backend.py
'';
buildInputs = [ pytest pytestcov mock Mako ];

View file

@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "jupyter_client";
version = "5.0.1";
version = "5.1.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "1fe573880b5ca4469ed0bece098f4b910c373d349e12525e1ea3566f5a14536b";
sha256 = "08756b021765c97bc5665390700a4255c2df31666ead8bff116b368d09912aba";
};
buildInputs = [ nose ];

View file

@ -0,0 +1,22 @@
{ stdenv, buildPythonPackage, fetchPypi, markdown }:
buildPythonPackage rec {
pname = "MarkdownSuperscript";
version = "2.0.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "1dsx21h9hkx098d5azpw81dcz23rrgzrwlymwv7jri348q26p748";
};
propagatedBuildInputs = [ markdown ];
doCheck = false; # See https://github.com/NixOS/nixpkgs/pull/26985
meta = {
description = "An extension to the Python Markdown package enabling superscript text";
homepage = https://github.com/jambonrose/markdown_superscript_extension;
license = stdenv.lib.licenses.bsd2;
};
}

View file

@ -3,14 +3,14 @@
with lib;
stdenv.mkDerivation rec {
version = "0.48.0";
version = "0.49.1";
name = "flow-${version}";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
sha256 = "13f9z4jg1v34jpaswa8kvbxkfp7flabv616vyqfvy9hafgfyisff";
sha256 = "1fjqdyl72srla7ysjg0694ym5d3f2rdl5gfq8r9ay4v15jcb5dg6";
};
installPhase = ''

View file

@ -4,17 +4,17 @@ with python27Packages;
stdenv.mkDerivation rec {
name = "google-app-engine-go-sdk-${version}";
version = "1.9.53";
version = "1.9.55";
src =
if stdenv.system == "x86_64-linux" then
fetchzip {
url = "https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_linux_amd64-${version}.zip";
sha256 = "04lfwf7ad7gi8xn891lz87b7pr2gyycgpaq96i0cgckrj2awayz2";
sha256 = "1gwrmqs69h3wbx6z0a7shdr8gn1qiwrkvh3pg6mi7dybwmd1x61h";
}
else
fetchzip {
url = "https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_darwin_amd64-${version}.zip";
sha256 = "18hgl4wz3rhaklkwaxl8gm70h7l8k225f86da682kafawrr8zhv4";
sha256 = "0b8r2fqg9m285ifz0jahd4wasv7cq61nr6p1k664w021r5y5lbvr";
};
buildInputs = [python27 makeWrapper];

View file

@ -3,16 +3,16 @@
, hpack, hspec, HUnit, language-dot, mockery, parsec, process
, QuickCheck, safe, stdenv, temporary, time, transformers, unix
, unix-compat, with-location, yaml, fetchFromGitHub
, ghc, cabal2nix, cabal-install, makeWrapper
, cabal2nix, cabal-install, makeWrapper
}:
mkDerivation {
pname = "tinc";
version = "20170228";
version = "20170624";
src = fetchFromGitHub {
owner = "sol";
repo = "tinc";
rev = "e829926a043a68a8a4dc551485c4d666837474af";
sha256 = "1zdp1mqp3jn2faw0d3jlcbrkp4azgl5ahhq5pxdn24gyq70zkchc";
rev = "70881515693fd83d381fe045ae76d5257774f5e3";
sha256 = "0c6sx3vbcnq69dhqhpi01a4p4qss24rwxiz6jmw65rj73adhj4mw";
};
isLibrary = false;
isExecutable = true;
@ -30,13 +30,12 @@ mkDerivation {
postInstall = ''
source ${makeWrapper}/nix-support/setup-hook
wrapProgram $out/bin/tinc \
--prefix PATH : '${ghc}/bin' \
--prefix PATH : '${cabal2nix}/bin' \
--prefix PATH : '${cabal-install}/bin'
'';
description = "A dependency manager for Haskell";
homepage = "https://github.com/sol/tinc#readme";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
hydraPlatforms = [ "x86_64-linux" ];
maintainers = [ stdenv.lib.maintainers.robbinch ];
}

View file

@ -0,0 +1,48 @@
{ stdenv, fetchurl, m4, makeWrapper, libbsd, perl, SysCPU }:
stdenv.mkDerivation rec {
name = "csmith-${version}";
version = "2.3.0";
src = fetchurl {
url = "http://embed.cs.utah.edu/csmith/${name}.tar.gz";
sha256 = "1mb5zgixsyf86slggs756k8a5ddmj980md3ic9sa1y75xl5cqizj";
};
nativeBuildInputs = [ m4 makeWrapper ];
buildInputs = [ libbsd perl SysCPU ];
postInstall = ''
substituteInPlace $out/bin/compiler_test.pl \
--replace '$CSMITH_HOME/runtime' $out/include/${name} \
--replace ' ''${CSMITH_HOME}/runtime' " $out/include/${name}" \
--replace '$CSMITH_HOME/src/csmith' $out/bin/csmith
substituteInPlace $out/bin/launchn.pl \
--replace '../compiler_test.pl' $out/bin/compiler_test.pl \
--replace '../$CONFIG_FILE' '$CONFIG_FILE'
wrapProgram $out/bin/launchn.pl --prefix PERL5LIB : "$PERL5LIB" $out/bin/launchn.pl
mkdir -p $out/share/csmith
mv $out/bin/compiler_test.in $out/share/csmith/
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "A random generator of C programs";
homepage = "https://embed.cs.utah.edu/csmith";
# Officially, the license is this: https://github.com/csmith-project/csmith/blob/master/COPYING
license = licenses.bsd2;
longDescription = ''
Csmith is a tool that can generate random C programs that statically and
dynamically conform to the C99 standard. It is useful for stress-testing
compilers, static analyzers, and other tools that process C code.
Csmith has found bugs in every tool that it has tested, and has been used
to find and report more than 400 previously unknown compiler bugs.
'';
maintainers = [ maintainers.dtzWill ];
platforms = platforms.all;
};
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "yarn-${version}";
version = "0.24.6";
version = "0.27.5";
src = fetchzip {
url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
sha256 = "1dxshqmz0im1a09p0x8zx1clkmkgjg3pg1gyl95fzzn6jai3nnrb";
sha256 = "0djjbdbwzlhdh6aww6awfl63nz72kj109kjxvmwk25x8dkvw795a";
};
buildInputs = [makeWrapper nodejs];

View file

@ -0,0 +1,2 @@
source 'https://rubygems.org'
gem 'mailcatcher'

View file

@ -0,0 +1,43 @@
GEM
remote: https://rubygems.org/
specs:
daemons (1.2.4)
eventmachine (1.0.9.1)
mail (2.6.6)
mime-types (>= 1.16, < 4)
mailcatcher (0.6.5)
eventmachine (= 1.0.9.1)
mail (~> 2.3)
rack (~> 1.5)
sinatra (~> 1.2)
skinny (~> 0.2.3)
sqlite3 (~> 1.3)
thin (~> 1.5.0)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
rack (1.6.8)
rack-protection (1.5.3)
rack
sinatra (1.4.8)
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
skinny (0.2.4)
eventmachine (~> 1.0.0)
thin (>= 1.5, < 1.7)
sqlite3 (1.3.13)
thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
tilt (2.0.7)
PLATFORMS
ruby
DEPENDENCIES
mailcatcher
BUNDLED WITH
1.14.4

View file

@ -0,0 +1,33 @@
{ stdenv, bundlerEnv, ruby, makeWrapper }:
stdenv.mkDerivation rec {
name = "mailcatcher-${version}";
version = (import ./gemset.nix).mailcatcher.version;
env = bundlerEnv {
name = "${name}-gems";
inherit ruby;
gemdir = ./.;
};
buildInputs = [ makeWrapper ];
unpackPhase = ":";
installPhase = ''
mkdir -p $out/bin
makeWrapper ${env}/bin/mailcatcher $out/bin/mailcatcher
makeWrapper ${env}/bin/catchmail $out/bin/catchmail
'';
meta = with stdenv.lib; {
description = "SMTP server and web interface to locally test outbound emails";
homepage = https://mailcatcher.me/;
license = licenses.mit;
maintainers = [ maintainers.zarelit ];
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,106 @@
{
daemons = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bmb4qrd95b5gl3ym5j3q6mf090209f4vkczggn49n56w6s6zldz";
type = "gem";
};
version = "1.2.4";
};
eventmachine = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "17jr1caa3ggg696dd02g2zqzdjqj9x9q2nl7va82l36f7c5v6k4z";
type = "gem";
};
version = "1.0.9.1";
};
mail = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0d7lhj2dw52ycls6xigkfz6zvfhc6qggply9iycjmcyj9760yvz9";
type = "gem";
};
version = "2.6.6";
};
mailcatcher = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h6gk8n18i5f651f244al1hscjzl27fpma4vqw0qhszqqpd5p3bx";
type = "gem";
};
version = "0.6.5";
};
mime-types = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m";
type = "gem";
};
version = "3.1";
};
mime-types-data = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm";
type = "gem";
};
version = "3.2016.0521";
};
rack = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "19m7aixb2ri7p1n0iqaqx8ldi97xdhvbxijbyrrcdcl6fv5prqza";
type = "gem";
};
version = "1.6.8";
};
rack-protection = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
type = "gem";
};
version = "1.5.3";
};
sinatra = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq";
type = "gem";
};
version = "1.4.8";
};
skinny = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1y3yvx88ylgz4d2s1wskjk5rkmrcr15q3ibzp1q88qwzr5y493a9";
type = "gem";
};
version = "0.2.4";
};
sqlite3 = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i";
type = "gem";
};
version = "1.3.13";
};
thin = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hrq9m3hb6pm8yrqshhg0gafkphdpvwcqmr7k722kgdisp3w91ga";
type = "gem";
};
version = "1.5.1";
};
tilt = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1is1ayw5049z8pd7slsk870bddyy5g2imp4z78lnvl8qsl8l0s7b";
type = "gem";
};
version = "2.0.7";
};
}

View file

@ -18,7 +18,7 @@ let
inherit stdenv requireFile writeText fetchurl haskellPackages;
};
remixPacks = imap (num: sha256: fetchurl rec {
remixPacks = imap1 (num: sha256: fetchurl rec {
name = "uqm-remix-disc${toString num}.uqm";
url = "mirror://sourceforge/sc2/${name}";
inherit sha256;

View file

@ -1,11 +1,11 @@
{stdenv, fetchurl, libnl, pkgconfig}:
stdenv.mkDerivation rec {
name = "iw-4.3";
name = "iw-4.9";
src = fetchurl {
url = "https://www.kernel.org/pub/software/network/iw/${name}.tar.xz";
sha256 = "085jyvrxzarvn5jl0fk618jjxy50nqx7ifngszc4jxk6a4ddibd6";
sha256 = "1klpvv98bnx1zm6aqalnri2vd7w80scmdaxr2qnblb6mz82whk1j";
};
buildInputs = [ libnl pkgconfig ];

View file

@ -499,7 +499,7 @@ with stdenv.lib;
KVM_APIC_ARCHITECTURE y
''}
KVM_ASYNC_PF y
${optionalString (versionAtLeast version "4.0") ''
${optionalString ((versionAtLeast version "4.0") && (versionOlder version "4.12")) ''
KVM_COMPAT? y
''}
${optionalString (versionOlder version "4.12") ''

View file

@ -0,0 +1,19 @@
{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.12";
modDirVersion = "4.12.0";
extraMeta.branch = "4.12";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1asq73lq0f81qwv21agcrpc3694fs14sja26q48y936hskn3np54";
};
kernelPatches = args.kernelPatches;
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.netfilterRPFilter = true;
} // (args.argsOverride or {}))

View file

@ -3,11 +3,11 @@
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "psmisc-23.0";
name = "psmisc-23.1";
src = fetchurl {
url = "mirror://sourceforge/psmisc/${name}.tar.xz";
sha256 = "0k7hafh9388s3hh9j943jy1qk9g1c43j02nyk0xis0ngbs632lvm";
sha256 = "0c5s94hqpwfmyswx2f96gifa6wdbpxxpkyxcrlzbxpvmrxsd911f";
};
buildInputs = [ncurses];

View file

@ -123,7 +123,7 @@ in
# to be adapted
zfsStable = common {
# comment/uncomment if breaking kernel versions are known
incompatibleKernelVersion = "4.12";
incompatibleKernelVersion = null;
version = "0.6.5.10";
@ -139,7 +139,7 @@ in
};
zfsUnstable = common {
# comment/uncomment if breaking kernel versions are known
incompatibleKernelVersion = null;
incompatibleKernelVersion = "4.12";
version = "0.7.0-rc4";

View file

@ -3,6 +3,7 @@
, withPgSQL ? false, postgresql
, withMySQL ? false, libmysql
, withSQLite ? false, sqlite
, withLDAP ? false, openldap
}:
let
@ -11,12 +12,14 @@ let
"-DHAS_DB_BYPASS_MAKEDEFS_CHECK"
] ++ lib.optional withPgSQL "-DHAS_PGSQL"
++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${lib.getDev libmysql}/include/mysql" ]
++ lib.optional withSQLite "-DHAS_SQLITE");
++ lib.optional withSQLite "-DHAS_SQLITE"
++ lib.optional withLDAP "-DHAS_LDAP");
auxlibs = lib.concatStringsSep " " ([
"-ldb" "-lnsl" "-lresolv" "-lsasl2" "-lcrypto" "-lssl"
] ++ lib.optional withPgSQL "-lpq"
++ lib.optional withMySQL "-lmysqlclient"
++ lib.optional withSQLite "-lsqlite3");
++ lib.optional withSQLite "-lsqlite3"
++ lib.optional withLDAP "-lldap");
in stdenv.mkDerivation rec {
@ -32,7 +35,8 @@ in stdenv.mkDerivation rec {
buildInputs = [ makeWrapper gnused db openssl cyrus_sasl icu pcre ]
++ lib.optional withPgSQL postgresql
++ lib.optional withMySQL libmysql
++ lib.optional withSQLite sqlite;
++ lib.optional withSQLite sqlite
++ lib.optional withLDAP openldap;
hardeningDisable = [ "format" ];
hardeningEnable = [ "pie" ];

View file

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "unifi-controller-${version}";
version = "5.5.11";
version = "5.5.19";
src = fetchurl {
url = "https://www.ubnt.com/downloads/unifi/5.5.11-5107276ec2/unifi_sysvinit_all.deb";
sha256 = "1jsixz7g7h7fdwb512flcwk0vblrsxpg4i9jdz7r72bkmvnxk7mm";
url = "https://www.ubnt.com/downloads/unifi/${version}/unifi_sysvinit_all.deb";
sha256 = "0bsfq48xjp230ir8pm9wpa5p4dh88zfy51lbi2xwpr454371ixcl";
};
buildInputs = [ dpkg ];

View file

@ -73,7 +73,7 @@ stageFuns: let
# Take the list and disallow custom overrides in all but the final stage,
# and allow it in the final flag. Only defaults this boolean field if it
# isn't already set.
withAllowCustomOverrides = lib.lists.imap
withAllowCustomOverrides = lib.lists.imap1
(index: stageFun: prevStage:
# So true by default for only the first element because one
# 1-indexing. Since we reverse the list, this means this is true

View file

@ -0,0 +1,23 @@
# Copyright 2013 Google Inc. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
"""Auth for the Google Cloud SDK.
"""
from googlecloudsdk.calliope import base
@base.ReleaseTracks(base.ReleaseTrack.ALPHA)
class Alpha(base.Group):
"""Alpha versions of gcloud commands."""

View file

@ -0,0 +1,23 @@
# Copyright 2013 Google Inc. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
"""Auth for the Google Cloud SDK.
"""
from googlecloudsdk.calliope import base
@base.ReleaseTracks(base.ReleaseTrack.BETA)
class Beta(base.Group):
"""Beta versions of gcloud commands."""

View file

@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
sha256 = "7aa6094d1f9c87f4c2c4a6bdad6a1113aac5e72ea673e659d9acbb059dfd037e";
};
buildInputs = [python27 makeWrapper];
phases = [ "installPhase" "fixupPhase" ];
@ -34,6 +35,12 @@ stdenv.mkDerivation rec {
mkdir -p "$out"
tar -xzf "$src" -C "$out" google-cloud-sdk
mkdir $out/google-cloud-sdk/lib/surface/alpha
cp ${./alpha__init__.py} $out/google-cloud-sdk/lib/surface/alpha/__init__.py
mkdir $out/google-cloud-sdk/lib/surface/beta
cp ${./beta__init__.py} $out/google-cloud-sdk/lib/surface/beta/__init__.py
# create wrappers with correct env
for program in gcloud bq gsutil git-credential-gcloud.sh; do
programPath="$out/google-cloud-sdk/bin/$program"

View file

@ -2,7 +2,7 @@
, crypto ? false, libgcrypt, gnutls, pkgconfig}:
stdenv.mkDerivation rec {
pname = "ntfs-3g";
pname = "ntfs3g";
version = "2017.3.23";
name = "${pname}-${version}";

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "cpuminer-${version}";
version = "2.4.5";
version = "2.5.0";
src = fetchurl {
url = "mirror://sourceforge/cpuminer/pooler-${name}.tar.gz";
sha256 = "130ab6vcbm9azl9w8n97fzjnjbakm0k2n3wc1bcgy5y5c8s0220h";
sha256 = "1xalrfrk5hvh1jh9kbqhib2an82ypd46vl9glaxhz3rbjld7c5pa";
};
patchPhase = if stdenv.cc.isClang then "${perl}/bin/perl ./nomacro.pl" else null;

View file

@ -1,7 +1,7 @@
{ mkDerivation, fetchurl, lib
, extra-cmake-modules, kdoctools, wrapGAppsHook
, kconfig, kinit, kpmcore
, eject, libatasmart }:
, kcrash, eject, libatasmart }:
let
pname = "partitionmanager";
@ -22,5 +22,5 @@ in mkDerivation rec {
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
# refer to kpmcore for the use of eject
buildInputs = [ eject libatasmart ];
propagatedBuildInputs = [ kconfig kinit kpmcore ];
propagatedBuildInputs = [ kconfig kcrash kinit kpmcore ];
}

View file

@ -14,13 +14,13 @@ let
in stdenv.mkDerivation rec {
name = "tlp-${version}";
version = "0.9";
version = "1.0";
src = fetchFromGitHub {
owner = "linrunner";
repo = "TLP";
rev = "${version}";
sha256 = "1gwi0h9klhdvqfqvmn297l1vyhj4g9dqvf50lcbswry02mvnd2vn";
sha256 = "0gq1y1qnzwyv7cw32g4ymlfssi2ayrbnd04y4l242k6n41d05bij";
};
makeFlags = [ "DESTDIR=$(out)"

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, jre }:
let
version = "1.7.06";
version = "1.7.23";
jar = fetchurl {
name = "burpsuite.jar";
url = "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar";
sha256 = "13x3x0la2jmm7zr66mvczzlmsy1parfibnl9s4iwi1nls4ikv7kl";
sha256 = "1y83qisn9pkn88vphpli7h8nacv8jv3sq0h04zbri25nfkgvl4an";
};
launcher = ''
#!${stdenv.shell}

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "iperf-3.1.7";
name = "iperf-3.2";
src = fetchurl {
url = "http://downloads.es.net/pub/iperf/${name}.tar.gz";
sha256 = "0kvk8d0a3dcxc8fisyprbn01y8akxj4sx8ld5dh508p9dx077vx4";
sha256 = "07cwrl9q5pmfjlh6ilpk7hm25lpkcaf917zhpmfq918lhrpv61zj";
};
postInstall = ''

View file

@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
url = "http://ftp.de.debian.org/debian/pool/main/u/ucspi-tcp/ucspi-tcp_0.88-3.diff.gz";
sha256 = "0mzmhz8hjkrs0khmkzs5i0s1kgmgaqz07h493bd5jj5fm5njxln6";
})
./remove-setuid.patch
];
# Apply Debian patches

View file

@ -0,0 +1,15 @@
diff --git a/hier.c b/hier.c
index 5663ada..1d73b84 100644
--- a/hier.c
+++ b/hier.c
@@ -2,8 +2,8 @@
void hier()
{
- h(auto_home,-1,-1,02755);
- d(auto_home,"bin",-1,-1,02755);
+ h(auto_home,-1,-1,0755);
+ d(auto_home,"bin",-1,-1,0755);
c(auto_home,"bin","tcpserver",-1,-1,0755);
c(auto_home,"bin","tcprules",-1,-1,0755);

View file

@ -9,11 +9,11 @@ let
in
stdenv.mkDerivation rec {
name = "afl-${version}";
version = "2.43b";
version = "2.44b";
src = fetchurl {
url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
sha256 = "1jv2y9b53k3p8hngm78ikakhcf4vv3yyz6ip17jhg5gsis29gdwx";
sha256 = "0wvx4ibr5hhav9mld1gncdvfzb4iky85gam3x8a43ispjddyya6m";
};
# Note: libcgroup isn't needed for building, just for the afl-cgroup

View file

@ -1,8 +1,22 @@
{ stdenv, fetchurl, gtk2, atk, gdk_pixbuf, pango, makeWrapper }:
{ stdenv, fetchurl, gtk2, atk, gdk_pixbuf, glib, pango, fontconfig, zlib, xorg, upx, patchelf }:
let
dynlibPath = stdenv.lib.makeLibraryPath
[ gtk2 atk gdk_pixbuf pango ];
([ gtk2 atk gdk_pixbuf glib pango fontconfig zlib stdenv.cc.cc.lib ]
++ (with xorg; [
libX11
libXext
libXrender
libXrandr
libSM
libXfixes
libXdamage
libXcursor
libXinerama
libXi
libXcomposite
libXxf86vm
]));
in
stdenv.mkDerivation rec {
name = "jd-gui-${version}";
@ -13,14 +27,18 @@ stdenv.mkDerivation rec {
sha256 = "0jrvzs2s836yvqi41c7fq0gfiwf187qg765b9r1il2bjc0mb3dqv";
};
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ upx patchelf ];
phases = "unpackPhase installPhase";
unpackPhase = "tar xf ${src}";
installPhase = ''
mkdir -p $out/bin && mv jd-gui $out/bin
wrapProgram $out/bin/jd-gui \
--prefix LD_LIBRARY_PATH ":" "${dynlibPath}"
mkdir -p $out/bin
upx -d jd-gui -o $out/bin/jd-gui
patchelf \
--set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \
--set-rpath ${dynlibPath} \
$out/bin/jd-gui
'';
meta = {

View file

@ -1,7 +1,7 @@
{
mkDerivation, lib, fetchgit, fetchpatch,
extra-cmake-modules, kdoctools, wrapGAppsHook,
kconfig, kinit, kparts
kcrash, kconfig, kinit, kparts
}:
mkDerivation rec {
@ -32,7 +32,7 @@ mkDerivation rec {
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
propagatedBuildInputs = [ kconfig kinit kparts ];
propagatedBuildInputs = [ kconfig kcrash kinit kparts ];
meta = with lib; {
homepage = http://kdiff3.sourceforge.net/;

View file

@ -765,7 +765,6 @@ with pkgs;
isLibrary = false;
enableSharedExecutables = false;
executableToolDepends = [ makeWrapper ];
doCheck = stdenv.is64bit; # https://github.com/NixOS/cabal2nix/issues/272
postInstall = ''
exe=$out/libexec/${drv.pname}-${drv.version}/${drv.pname}
install -D $out/bin/${drv.pname} $exe
@ -2734,6 +2733,8 @@ with pkgs;
kzipmix = callPackage_i686 ../tools/compression/kzipmix { };
mailcatcher = callPackage ../development/web/mailcatcher { };
makebootfat = callPackage ../tools/misc/makebootfat { };
matrix-synapse = callPackage ../servers/matrix-synapse { };
@ -3323,6 +3324,8 @@ with pkgs;
ngrok = callPackage ../tools/networking/ngrok { };
noice = callPackage ../applications/misc/noice { };
noip = callPackage ../tools/networking/noip { };
nomad = callPackage ../applications/networking/cluster/nomad { };
@ -4530,6 +4533,8 @@ with pkgs;
uriparser = callPackage ../development/libraries/uriparser {};
urlscan = callPackage ../applications/misc/urlscan { };
urlview = callPackage ../applications/misc/urlview {};
usbmuxd = callPackage ../tools/misc/usbmuxd {};
@ -5473,9 +5478,10 @@ with pkgs;
psc-package = haskell.lib.justStaticExecutables
(haskellPackages.callPackage ../development/compilers/purescript/psc-package { });
inherit (ocamlPackages) haxe;
hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { };
inherit (ocamlPackages.haxe) haxe_3_2 haxe_3_4;
haxe = haxe_3_4;
haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { });
inherit (haxePackages) hxcpp;
hhvm = callPackage ../development/compilers/hhvm {
boost = boost160;
@ -6664,6 +6670,13 @@ with pkgs;
cscope = callPackage ../development/tools/misc/cscope { };
csmith = callPackage ../development/tools/misc/csmith {
inherit (perlPackages) perl SysCPU;
# Workaround optional dependency on libbsd that's
# currently broken on Darwin.
libbsd = if stdenv.isDarwin then null else libbsd;
};
csslint = callPackage ../development/web/csslint { };
libcxx = llvmPackages.libcxx;
@ -11983,6 +11996,22 @@ with pkgs;
];
};
linux_4_12 = callPackage ../os-specific/linux/kernel/linux-4.12.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
kernelPatches.p9_fixes
# See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
# when adding a new linux version
kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.modinst_arg_list_too_long
]
++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
];
};
linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@ -12153,7 +12182,7 @@ with pkgs;
linux = linuxPackages.kernel;
# Update this when adding the newest kernel major version!
linuxPackages_latest = linuxPackages_4_11;
linuxPackages_latest = linuxPackages_4_12;
linux_latest = linuxPackages_latest.kernel;
# Build the kernel modules for the some of the kernels.
@ -12164,6 +12193,7 @@ with pkgs;
linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
linuxPackages_4_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_11);
linuxPackages_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_12);
# Don't forget to update linuxPackages_latest!
# Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.
@ -12179,7 +12209,7 @@ with pkgs;
linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }));
# Hardened linux
linux_hardened = let linux = pkgs.linux_4_11; in linux.override {
linux_hardened = let linux = pkgs.linuxPackages_latest.kernel; in linux.override {
extraConfig = import ../os-specific/linux/kernel/hardened-config.nix {
inherit stdenv;
inherit (linux) version;
@ -12940,6 +12970,8 @@ with pkgs;
paper-icon-theme = callPackage ../data/icons/paper-icon-theme { };
papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { };
pecita = callPackage ../data/fonts/pecita {};
paratype-pt-mono = callPackage ../data/fonts/paratype-pt/mono.nix {};
@ -13626,6 +13658,8 @@ with pkgs;
doodle = callPackage ../applications/search/doodle { };
dr14_tmeter = callPackage ../applications/audio/dr14_tmeter { };
draftsight = callPackage ../applications/graphics/draftsight { };
droopy = callPackage ../applications/networking/droopy {
@ -17568,6 +17602,7 @@ with pkgs;
gnomeExtensions = {
caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { };
dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { };
topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { };
};
hsetroot = callPackage ../tools/X11/hsetroot { };
@ -18702,10 +18737,10 @@ with pkgs;
inherit (callPackage ../applications/networking/cluster/terraform {})
terraform_0_8_5
terraform_0_8_8
terraform_0_9_10;
terraform_0_9_11;
terraform_0_8 = terraform_0_8_8;
terraform_0_9 = terraform_0_9_10;
terraform_0_9 = terraform_0_9_11;
terraform = terraform_0_9;
terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {};

View file

@ -0,0 +1,120 @@
{ stdenv, fetchzip, fetchFromGitHub, newScope, haxe, neko, nodejs, wine, php, python3, jdk, mono, haskellPackages, fetchpatch }:
let
self = haxePackages;
callPackage = newScope self;
haxePackages = with self; {
withCommas = stdenv.lib.replaceChars ["."] [","];
# simulate "haxelib dev $libname ."
simulateHaxelibDev = libname: ''
devrepo=$(mktemp -d)
mkdir -p "$devrepo/${withCommas libname}"
echo $(pwd) > "$devrepo/${withCommas libname}/.dev"
export HAXELIB_PATH="$HAXELIB_PATH:$devrepo"
'';
installLibHaxe = { libname, version, files ? "*" }: ''
mkdir -p "$out/lib/haxe/${withCommas libname}/${withCommas version}"
echo -n "${version}" > $out/lib/haxe/${withCommas libname}/.current
cp -dpR ${files} "$out/lib/haxe/${withCommas libname}/${withCommas version}/"
'';
buildHaxeLib = {
libname,
version,
sha256,
meta,
...
} @ attrs:
stdenv.mkDerivation (attrs // {
name = "${libname}-${version}";
buildInputs = (attrs.buildInputs or []) ++ [ haxe neko ]; # for setup-hook.sh to work
src = fetchzip rec {
name = "${libname}-${version}";
url = "http://lib.haxe.org/files/3.0/${withCommas name}.zip";
inherit sha256;
stripRoot = false;
};
installPhase = attrs.installPhase or ''
runHook preInstall
(
if [ $(ls $src | wc -l) == 1 ]; then
cd $src/* || cd $src
else
cd $src
fi
${installLibHaxe { inherit libname version; }}
)
runHook postInstall
'';
meta = {
homepage = "http://lib.haxe.org/p/${libname}";
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.all;
description = throw "please write meta.description";
} // attrs.meta;
});
hxcpp = buildHaxeLib rec {
libname = "hxcpp";
version = "3.4.64";
sha256 = "04gyjm6wqmsm0ifcfkxmq1yv8xrfzys3z5ajqnvvjrnks807mw8q";
postFixup = ''
for f in $out/lib/haxe/${withCommas libname}/${withCommas version}/{,project/libs/nekoapi/}bin/Linux{,64}/*; do
chmod +w "$f"
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) "$f" || true
patchelf --set-rpath ${ stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] } "$f" || true
done
'';
meta.description = "Runtime support library for the Haxe C++ backend";
};
hxjava = buildHaxeLib {
libname = "hxjava";
version = "3.2.0";
sha256 = "1vgd7qvsdxlscl3wmrrfi5ipldmr4xlsiwnj46jz7n6izff5261z";
meta.description = "Support library for the Java backend of the Haxe compiler";
propagatedBuildInputs = [ jdk ];
};
hxcs = buildHaxeLib {
libname = "hxcs";
version = "3.4.0";
sha256 = "0f5vgp2kqnpsbbkn2wdxmjf7xkl0qhk9lgl9kb8d5wdy89nac6q6";
meta.description = "Support library for the C# backend of the Haxe compiler";
propagatedBuildInputs = [ mono ];
};
hxnodejs_4 = buildHaxeLib {
libname = "hxnodejs";
version = "4.0.9";
sha256 = "0b7ck48nsxs88sy4fhhr0x1bc8h2ja732zzgdaqzxnh3nir0bajm";
meta.description = "Extern definitions for node.js 4.x";
};
hxnodejs_6 = let
libname = "hxnodejs";
version = "6.9.0";
in stdenv.mkDerivation rec {
name = "${libname}-${version}";
src = fetchFromGitHub {
owner = "HaxeFoundation";
repo = "hxnodejs";
rev = "cf80c6a";
sha256 = "0mdiacr5b2m8jrlgyd2d3vp1fha69lcfb67x4ix7l7zfi8g460gs";
};
installPhase = installLibHaxe { inherit libname version; };
meta = {
homepage = "http://lib.haxe.org/p/${libname}";
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.all;
description = "Extern definitions for node.js 6.9";
};
};
};
in self

View file

@ -12623,6 +12623,15 @@ let self = _self // overrides; _self = with self; {
};
};
SysCPU = buildPerlPackage rec {
name = "Sys-CPU-0.61";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MZ/MZSANFORD/${name}.tar.gz";
sha256 = "1r6976bs86j7zp51m5vh42xlyah951jgdlkimv202413kjvqc2i5";
};
buildInputs = stdenv.lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Carbon;
};
SysHostnameLong = buildPerlPackage rec {
name = "Sys-Hostname-Long-1.4";
src = fetchurl {

View file

@ -3809,6 +3809,8 @@ in {
};
};
codecov = callPackage ../development/python-modules/codecov {};
cogapp = buildPythonPackage rec {
version = "2.3";
name = "cogapp-${version}";
@ -7060,6 +7062,18 @@ in {
};
};
google-compute-engine = buildPythonPackage rec {
version = "2.3.0";
name = "google-compute-engine-${version}";
src = pkgs.fetchurl {
url = "mirror://pypi/g/google-compute-engine/google-compute-engine-${version}.tar.gz";
sha256 = "1pjj95b3l61h8xz5kjfcgnql066cr8bq5wl480a6dxd2inw8mynf";
};
propagatedBuildInputs = with self; [ boto ];
};
googlecl = buildPythonPackage rec {
version = "0.9.14";
name = "googlecl-${version}";
@ -13407,6 +13421,8 @@ in {
};
};
markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript {};
markdown-macros = buildPythonPackage rec {
name = "markdown-macros-${version}";
version = "0.1.2";
@ -30304,8 +30320,6 @@ EOF
uranium = callPackage ../development/python-modules/uranium { };
urlscan = callPackage ../applications/misc/urlscan { };
vine = buildPythonPackage rec {
name = "vine-${version}";
version = "1.1.3";