Merge branch 'master' into staging

This commit is contained in:
Vladimír Čunát 2017-01-06 21:05:43 +01:00
commit 5f5681ee7f
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
74 changed files with 3443 additions and 1659 deletions

View file

@ -214,6 +214,7 @@
jerith666 = "Matt McHenry <github@matt.mchenryfamily.org>";
jfb = "James Felix Black <james@yamtime.com>";
jgeerds = "Jascha Geerds <jascha@jgeerds.name>";
jgertm = "Tim Jaeger <jger.tm@gmail.com>";
jgillich = "Jakob Gillich <jakob@gillich.me>";
jirkamarsik = "Jirka Marsik <jiri.marsik89@gmail.com>";
joachifm = "Joachim Fasting <joachifm@fastmail.fm>";

View file

@ -153,6 +153,17 @@ with lib;
# alsa
(mkRenamedOptionModule [ "sound" "enableMediaKeys" ] [ "sound" "mediaKeys" "enable" ])
# postgrey
(mkMergedOptionModule [ [ "services" "postgrey" "inetAddr" ] [ "services" "postgrey" "inetPort" ] ] [ "services" "postgrey" "socket" ] (config: let
value = p: getAttrFromPath p config;
inetAddr = [ "services" "postgrey" "inetAddr" ];
inetPort = [ "services" "postgrey" "inetPort" ];
in
if value inetAddr == null
then { path = "/var/run/postgrey.sock"; }
else { addr = value inetAddr; port = value inetPort; }
))
# Options that are obsolete and have no replacement.
(mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "")
(mkRemovedOptionModule [ "programs" "bash" "enable" ] "")

View file

@ -4,6 +4,43 @@ with lib; let
cfg = config.services.postgrey;
natural = with types; addCheck int (x: x >= 0);
natural' = with types; addCheck int (x: x > 0);
socket = with types; addCheck (either (submodule unixSocket) (submodule inetSocket)) (x: x ? "path" || x ? "port");
inetSocket = with types; {
options = {
addr = mkOption {
type = nullOr string;
default = null;
example = "127.0.0.1";
description = "The address to bind to. Localhost if null";
};
port = mkOption {
type = natural';
default = 10030;
description = "Tcp port to bind to";
};
};
};
unixSocket = with types; {
options = {
path = mkOption {
type = path;
default = "/var/run/postgrey.sock";
description = "Path of the unix socket";
};
mode = mkOption {
type = string;
default = "0777";
description = "Mode of the unix socket";
};
};
};
in {
options = {
@ -13,21 +50,83 @@ in {
default = false;
description = "Whether to run the Postgrey daemon";
};
inetAddr = mkOption {
type = nullOr string;
default = null;
example = "127.0.0.1";
description = "The inet address to bind to. If none given, bind to /var/run/postgrey.sock";
};
inetPort = mkOption {
type = int;
default = 10030;
description = "The tcp port to bind to";
socket = mkOption {
type = socket;
default = {
path = "/var/run/postgrey.sock";
mode = "0777";
};
example = {
addr = "127.0.0.1";
port = 10030;
};
description = "Socket to bind to";
};
greylistText = mkOption {
type = string;
default = "Greylisted for %%s seconds";
description = "Response status text for greylisted messages";
description = "Response status text for greylisted messages; use %%s for seconds left until greylisting is over and %%r for mail domain of recipient";
};
greylistAction = mkOption {
type = string;
default = "DEFER_IF_PERMIT";
description = "Response status for greylisted messages (see access(5))";
};
greylistHeader = mkOption {
type = string;
default = "X-Greylist: delayed %%t seconds by postgrey-%%v at %%h; %%d";
description = "Prepend header to greylisted mails; use %%t for seconds delayed due to greylisting, %%v for the version of postgrey, %%d for the date, and %%h for the host";
};
delay = mkOption {
type = natural;
default = 300;
description = "Greylist for N seconds";
};
maxAge = mkOption {
type = natural;
default = 35;
description = "Delete entries from whitelist if they haven't been seen for N days";
};
retryWindow = mkOption {
type = either string natural;
default = 2;
example = "12h";
description = "Allow N days for the first retry. Use string with appended 'h' to specify time in hours";
};
lookupBySubnet = mkOption {
type = bool;
default = true;
description = "Strip the last N bits from IP addresses, determined by IPv4CIDR and IPv6CIDR";
};
IPv4CIDR = mkOption {
type = natural;
default = 24;
description = "Strip N bits from IPv4 addresses if lookupBySubnet is true";
};
IPv6CIDR = mkOption {
type = natural;
default = 64;
description = "Strip N bits from IPv6 addresses if lookupBySubnet is true";
};
privacy = mkOption {
type = bool;
default = true;
description = "Store data using one-way hash functions (SHA1)";
};
autoWhitelist = mkOption {
type = nullOr natural';
default = 5;
description = "Whitelist clients after successful delivery of N messages";
};
whitelistClients = mkOption {
type = listOf path;
default = [];
description = "Client address whitelist files (see postgrey(8))";
};
whitelistRecipients = mkOption {
type = listOf path;
default = [];
description = "Recipient address whitelist files (see postgrey(8))";
};
};
};
@ -52,10 +151,10 @@ in {
};
systemd.services.postgrey = let
bind-flag = if isNull cfg.inetAddr then
"--unix=/var/run/postgrey.sock"
bind-flag = if cfg.socket ? "path" then
''--unix=${cfg.socket.path} --socketmode=${cfg.socket.mode}''
else
"--inet=${cfg.inetAddr}:${cfg.inetPort}";
''--inet=${optionalString (cfg.socket.addr != null) (cfg.socket.addr + ":")}${toString cfg.socket.port}'';
in {
description = "Postfix Greylisting Service";
wantedBy = [ "multi-user.target" ];
@ -67,7 +166,23 @@ in {
'';
serviceConfig = {
Type = "simple";
ExecStart = ''${pkgs.postgrey}/bin/postgrey ${bind-flag} --pidfile=/var/run/postgrey.pid --group=postgrey --user=postgrey --dbdir=/var/postgrey --greylist-text="${cfg.greylistText}"'';
ExecStart = ''${pkgs.postgrey}/bin/postgrey \
${bind-flag} \
--group=postgrey --user=postgrey \
--dbdir=/var/postgrey \
--delay=${toString cfg.delay} \
--max-age=${toString cfg.maxAge} \
--retry-window=${toString cfg.retryWindow} \
${if cfg.lookupBySubnet then "--lookup-by-subnet" else "--lookup-by-host"} \
--ipv4cidr=${toString cfg.IPv4CIDR} --ipv6cidr=${toString cfg.IPv6CIDR} \
${optionalString cfg.privacy "--privacy"} \
--auto-whitelist-clients=${toString (if cfg.autoWhitelist == null then 0 else cfg.autoWhitelist)} \
--greylist-action=${cfg.greylistAction} \
--greylist-text="${cfg.greylistText}" \
--x-greylist-header="${cfg.greylistHeader}" \
${concatMapStringsSep " " (x: "--whitelist-clients=" + x) cfg.whitelistClients} \
${concatMapStringsSep " " (x: "--whitelist-recipients=" + x) cfg.whitelistRecipients}
'';
Restart = "always";
RestartSec = 5;
TimeoutSec = 10;

View file

@ -99,7 +99,7 @@ in
makeSearchPathOutput "lib" "lib/${pkgs.python.libPrefix}/site-packages"
[ pkgs.mod_python
pkgs.pythonPackages.trac
pkgs.setuptools
pkgs.pythonPackages.setuptools
pkgs.pythonPackages.genshi
pkgs.pythonPackages.psycopg2
subversion

View file

@ -22,12 +22,18 @@ let
kernel = config.boot.kernelPackages;
splKernelPkg = kernel.spl;
zfsKernelPkg = kernel.zfs;
zfsUserPkg = pkgs.zfs;
packages = if config.boot.zfs.enableUnstable then {
spl = kernel.splUnstable;
zfs = kernel.zfsUnstable;
zfsUser = pkgs.zfsUnstable;
} else {
spl = kernel.spl;
zfs = kernel.zfs;
zfsUser = pkgs.zfs;
};
autosnapPkg = pkgs.zfstools.override {
zfs = zfsUserPkg;
zfs = packages.zfsUser;
};
zfsAutoSnap = "${autosnapPkg}/bin/zfs-auto-snapshot";
@ -54,6 +60,18 @@ in
options = {
boot.zfs = {
enableUnstable = mkOption {
type = types.bool;
default = false;
description = ''
Use the unstable zfs package. This might be an option, if the latest
kernel is not yet supported by a published release of ZFS. Enabling
this option will install a development version of ZFS on Linux. The
version will have already passed an extensive test suite, but it is
more likely to hit an undiscovered bug compared to running a released
version of ZFS on Linux.
'';
};
extraPools = mkOption {
type = types.listOf types.str;
@ -218,16 +236,16 @@ in
boot = {
kernelModules = [ "spl" "zfs" ] ;
extraModulePackages = [ splKernelPkg zfsKernelPkg ];
extraModulePackages = with packages; [ spl zfs ];
};
boot.initrd = mkIf inInitrd {
kernelModules = [ "spl" "zfs" ];
extraUtilsCommands =
''
copy_bin_and_libs ${zfsUserPkg}/sbin/zfs
copy_bin_and_libs ${zfsUserPkg}/sbin/zdb
copy_bin_and_libs ${zfsUserPkg}/sbin/zpool
copy_bin_and_libs ${packages.zfsUser}/sbin/zfs
copy_bin_and_libs ${packages.zfsUser}/sbin/zdb
copy_bin_and_libs ${packages.zfsUser}/sbin/zpool
'';
extraUtilsCommandsTest = mkIf inInitrd
''
@ -264,14 +282,14 @@ in
zfsSupport = true;
};
environment.etc."zfs/zed.d".source = "${zfsUserPkg}/etc/zfs/zed.d/*";
environment.etc."zfs/zed.d".source = "${packages.zfsUser}/etc/zfs/zed.d/*";
system.fsPackages = [ zfsUserPkg ]; # XXX: needed? zfs doesn't have (need) a fsck
environment.systemPackages = [ zfsUserPkg ]
++ optional enableAutoSnapshots autosnapPkg; # so the user can run the command to see flags
system.fsPackages = [ packages.zfsUser ]; # XXX: needed? zfs doesn't have (need) a fsck
environment.systemPackages = [ packages.zfsUser ]
++ optional enableAutoSnapshots autosnapPkg; # so the user can run the command to see flags
services.udev.packages = [ zfsUserPkg ]; # to hook zvol naming, etc.
systemd.packages = [ zfsUserPkg ];
services.udev.packages = [ packages.zfsUser ]; # to hook zvol naming, etc.
systemd.packages = [ packages.zfsUser ];
systemd.services = let
getPoolFilesystems = pool:
@ -298,7 +316,7 @@ in
RemainAfterExit = true;
};
script = ''
zpool_cmd="${zfsUserPkg}/sbin/zpool"
zpool_cmd="${packages.zfsUser}/sbin/zpool"
("$zpool_cmd" list "${pool}" >/dev/null) || "$zpool_cmd" import -d ${cfgZfs.devNodes} -N ${optionalString cfgZfs.forceImportAll "-f"} "${pool}"
'';
};
@ -314,7 +332,7 @@ in
RemainAfterExit = true;
};
script = ''
${zfsUserPkg}/sbin/zfs set nixos:shutdown-time="$(date)" "${pool}"
${packages.zfsUser}/sbin/zfs set nixos:shutdown-time="$(date)" "${pool}"
'';
};

View file

@ -1,6 +1,4 @@
{ stdenv, python2Packages, fetchurl, gettext
, pkgconfig, libofa, ffmpeg, chromaprint
}:
{ stdenv, python2Packages, fetchurl, gettext, chromaprint }:
let
version = "1.3.2";
@ -14,12 +12,7 @@ in pythonPackages.buildPythonApplication {
sha256 = "0821xb7gyg0rhch8s3qkzmak90wjpcxkv9a364yv6bmqc12j6a77";
};
buildInputs = [
pkgconfig
ffmpeg
libofa
gettext
];
buildInputs = [ gettext ];
propagatedBuildInputs = with pythonPackages; [
pyqt4

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "atom-${version}";
version = "1.12.7";
version = "1.12.9";
src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
sha256 = "1kkw6wixri8iddnmscza1d4riq4m9yr78y0d9y76vdnxarma0bfq";
sha256 = "1yp4wwv0vxsad7jqkn2rj4n7k2ccgqscs89p3j6z8vpm6as0i6sg";
name = "${name}.deb";
};

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey
, libtool, libuv, luajit, luaPackages, man, ncurses, perl, pkgconfig
, libtool, libuv, luajit, luaPackages, ncurses, perl, pkgconfig
, unibilium, makeWrapper, vimUtils, xsel, gperf
, withPython ? true, pythonPackages, extraPythonPackages ? []
@ -118,10 +118,7 @@ let
# triggers on buffer overflow bug while running tests
hardeningDisable = [ "fortify" ];
preConfigure = ''
substituteInPlace runtime/autoload/man.vim \
--replace /usr/bin/man ${man}/bin/man
'' + stdenv.lib.optionalString stdenv.isDarwin ''
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
export DYLD_LIBRARY_PATH=${jemalloc}/lib
substituteInPlace src/nvim/CMakeLists.txt --replace " util" ""
'';

View file

@ -11,12 +11,12 @@
assert stdenv ? glibc;
stdenv.mkDerivation rec {
version = "2.2.0";
version = "2.2.1";
name = "darktable-${version}";
src = fetchurl {
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
sha256 = "3eca193831faae58200bb1cb6ef29e658bce43a81706b54420953a7c33d79377";
sha256 = "da843190f08e02df19ccbc02b9d1bef6bd242b81499494c7da2cccdc520e24fc";
};
buildInputs =
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
--prefix LD_LIBRARY_PATH ":" "$out/lib/darktable"
)
'';
meta = with stdenv.lib; {
description = "Virtual lighttable and darkroom for photographers";
homepage = https://www.darktable.org;

View file

@ -2,14 +2,14 @@
}:
with pythonPackages; buildPythonApplication rec {
version = "2.5";
version = "2.7";
name = "buku-${version}";
src = fetchFromGitHub {
owner = "jarun";
repo = "buku";
rev = "v${version}";
sha256 = "0m6km37zylinsblwm2p8pm760xlsf9m82xyws3762xs8zxbnfmsd";
sha256 = "1hb5283xaz1ll3iv5542i6f9qshrdgg33dg7gvghz0fwdh8i0jbk";
};
buildInputs = [

View file

@ -1,13 +1,14 @@
{ stdenv, fetchgit, fftw, ncurses, libpulseaudio }:
{ stdenv, fetchFromGitHub, fftw, ncurses, libpulseaudio }:
stdenv.mkDerivation rec {
version = "2016-06-02";
version = "1.5";
name = "cli-visualizer-${version}";
src = fetchgit {
url = "https://github.com/dpayne/cli-visualizer.git";
rev = "bc0104eb57e7a0b3821510bc8f93cf5d1154fa8e";
sha256 = "16768gyi85mkizfn874q2q9xf32knw08z27si3k5bk99492dxwzw";
src = fetchFromGitHub {
owner = "dpayne";
repo = "cli-visualizer";
rev = version;
sha256 = "18qv4ya64qmczq94dnynrnzn7pwhmzbn14r05qcvbbwv7r8gclzs";
};
postPatch = ''

View file

@ -1,12 +1,12 @@
{ stdenv, fetchgit, python3 }:
stdenv.mkDerivation {
name = "cortex-2014-08-01";
name = "cortex-2015-08-23";
src = fetchgit {
url = "https://github.com/gglucas/cortex";
rev = "e749de6c21aae02386f006fd0401d22b9dcca424";
sha256 = "d5d59c5257107344122c701eb370f3740f9957b6b898ac798d797a4f152f614c";
rev = "ff10ff860479fe2f50590c0f8fcfc6dc34446639";
sha256 = "0pa2kkkcnmf56d5d5kknv0gfahddym75xripd4kgszaj6hsib3zg";
};
buildInputs = [ stdenv python3 ];

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonApplication rec {
version = "0.3.1";
version = "0.4.1";
name = "haxor-news-${version}";
src = fetchurl {
url = "https://github.com/donnemartin/haxor-news/archive/0.3.1.tar.gz";
sha256 = "0jglx8fy38sjyszvvg7mvmyk66l53kyq4i09hmgdz7hb1hrm9m2m";
url = "https://github.com/donnemartin/haxor-news/archive/${version}.tar.gz";
sha256 = "0d3an7by33hjl8zg48y7ig6r258ghgbdkpp1psa9jr6n2nk2w9mr";
};
propagatedBuildInputs = with pythonPackages; [

View file

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, ncurses }:
stdenv.mkDerivation rec {
version = "1.0.7";
version = "1.0.9";
name = "mdp-${version}";
src = fetchFromGitHub {
owner = "visit1985";
repo = "mdp";
rev = version;
sha256 = "10jkv8g04vvhik42y0qqcbn05hlnfsgbljhx69hx1sfn7js2d8g4";
sha256 = "183flp52zfady4f8f3vgapr5f5k6cvanmj2hw293v6pw71qnafmd";
};
makeFlags = [ "PREFIX=$(out)" ];

View file

@ -1,17 +1,19 @@
{ stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }:
pythonPackages.buildPythonApplication rec {
version = "1.10.0";
version = "1.13.0";
name = "rtv-${version}";
src = fetchFromGitHub {
owner = "michael-lazar";
repo = "rtv";
rev = "v${version}";
sha256 = "1gm5jyqqssf69lfx0svhzsb9m0dffm6zsf9jqnwh6gjihfz25a45";
sha256 = "0rxncbzb4a7zlfxmnn5jm6yvwviaaj0v220vwv82hkjiwcdjj8jf";
};
propagatedBuildInputs = with pythonPackages; [
beautifulsoup4
mailcap-fix
tornado
requests2
six

View file

@ -1,26 +1,23 @@
{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2 }:
{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2, pkgconfig }:
let
version = "0.2.1";
in
stdenv.mkDerivation rec {
version = "0.4.0";
name = "sc-im-${version}";
src = fetchFromGitHub {
owner = "andmarti1424";
repo = "sc-im";
rev = "v${version}";
sha256 = "0v6b8xksvd12vmz198vik2ranyr5mhnp85hl9yxh9svibs7jxsbb";
sha256 = "1v1cfmfqs5997bqlirp6p7smc3qrinq8dvsi33sk09r33zkzyar0";
};
buildInputs = [ yacc ncurses libxml2 ];
buildInputs = [ yacc ncurses libxml2 pkgconfig ];
buildPhase = ''
cd src
sed "s,prefix=/usr,prefix=$out," Makefile
sed "s,-I/usr/include/libxml2,-I$libxml2," Makefile
sed -i "s,prefix=/usr,prefix=$out," Makefile
sed -i "s,-I/usr/include/libxml2,-I$libxml2," Makefile
make
export DESTDIR=$out

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pythonPackages }:
stdenv.mkDerivation rec {
version = "2.0";
version = "2.3";
name = "weather-${version}";
src = fetchurl {
url = "http://fungi.yuggoth.org/weather/src/${name}.tar.xz";
sha256 = "0yil363y9iyr4mkd7xxq0p2260wh50f9i5p0map83k9i5l0gyyl0";
sha256 = "0inij30prqqcmzjwcmfzjjn0ya5klv18qmajgxipz1jr3lpqs546";
};
nativeBuildInputs = [ pythonPackages.wrapPython ];

View file

@ -12,6 +12,7 @@
, enableWideVine ? false
, cupsSupport ? true
, pulseSupport ? false
, commandLineArgs ? ""
}:
let
@ -76,6 +77,7 @@ in stdenv.mkDerivation {
mkdir -p "$out/bin"
eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
${commandLineArgs} \
${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled}
ed -v -s "$out/bin/chromium" << EOF

View file

@ -6,6 +6,9 @@
, alsaLib, libXdamage, libXtst, libXrandr, expat, cups
, dbus_libs, gtk2, gdk_pixbuf, gcc
# command line arguments which are always set e.g "--disable-gpu"
, commandLineArgs ? ""
# Will crash without.
, systemd
@ -106,7 +109,7 @@ in stdenv.mkDerivation rec {
#!${bash}/bin/sh
export LD_LIBRARY_PATH=$rpath\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
export PATH=$binpath\''${PATH:+:\$PATH}
$out/share/google/$appname/google-$appname "\$@"
$out/share/google/$appname/google-$appname ${commandLineArgs} "\$@"
EOF
chmod +x $exe

View file

@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
pname = "discord";
version = "0.0.11";
version = "0.0.13";
name = "${pname}-${version}";
src = fetchurl {
url = "https://cdn-canary.discordapp.com/apps/linux/${version}/${pname}-canary-${version}.tar.gz";
sha256 = "1lk53vm14vr5pb8xxcx6hinpc2mkdns2xxv0bfzxvlmhfr6d6y18";
sha256 = "1pwb8y80z1bmfln5wd1vrhras0xygd1j15sib0g9vaig4mc55cs6";
};
libPath = stdenv.lib.makeLibraryPath [
@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
--set-rpath "$out:$libPath" \
$out/DiscordCanary
paxmark m $out/DiscordCanary
ln -s $out/DiscordCanary $out/bin/
ln -s $out/discord.png $out/share/pixmaps

View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
version = "0.8.20";
version = "0.8.21";
name = "irssi-${version}";
src = fetchurl {
urls = [ "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz" ];
sha256 = "0riz2wsdcs5hx5rwynm99fi01973lfrss21y8qy30dw2m9v0zqpm";
sha256 = "0fxacadhdzl3n0231mqjv2gcmj1fj85azhbbsk0fq7xmf1da7ha2";
};
buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ];

View file

@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, python3Packages }:
stdenv.mkDerivation rec {
name = "bean-add-2016-10-03";
name = "bean-add-2016-12-02";
src = fetchFromGitHub {
owner = "simon-v";
repo = "bean-add";
rev = "41deacc09b992db5eede34fefbfb2c0faeba1652";
sha256 = "09xdsskk5rc3xsf1v1vq7nkdxrxy8w2fixx2vdv8c97ak6a4hrca";
rev = "8038dabf5838c880c8e750c0e65cf0da4faf40b9";
sha256 = "016ybq570xicj90x4kxrbxhzdvkjh0d6v3r6s3k3qfzz2c5vwh09";
};
propagatedBuildInputs = with python3Packages; [ python ];

View file

@ -1,13 +1,13 @@
{ stdenv, fetchhg, pkgs, pythonPackages }:
pythonPackages.buildPythonApplication rec {
version = "2.0b12";
version = "2.0b13";
name = "beancount-${version}";
namePrefix = "";
src = pkgs.fetchurl {
url = "mirror://pypi/b/beancount/${name}.tar.gz";
sha256 = "0n0wyi2yhmf8l46l5z68psk4rrzqkgqaqn93l0wnxsmp1nmqly9z";
sha256 = "16gkcq28bwd015b1qhdr5d7vhxid8xfn6ia4n9n8dnl5n448yqkm";
};
buildInputs = with pythonPackages; [ nose ];

View file

@ -1,19 +1,17 @@
{ stdenv, pkgs, fetchurl, python3Packages, fetchFromGitHub, fetchzip, python3, beancount }:
python3Packages.buildPythonApplication rec {
version = "1.0";
version = "1.2";
name = "fava-${version}";
src = fetchFromGitHub {
owner = "aumayr";
repo = "fava";
rev = "v${version}";
sha256 = "0dm4x6z80m04r9qa55psvz7f41qnh13hnj2qhvxkrk22yqmkqrka";
src = fetchurl {
url = "https://github.com/beancount/fava/archive/v${version}.tar.gz";
sha256 = "0sykx054w4cvr0pgbqph0lmkxffafl83k5ir252gl5znxgcvg6yw";
};
assets = fetchzip {
url = "https://github.com/aumayr/fava/releases/download/v${version}/beancount-fava-${version}.tar.gz";
sha256 = "1vvidwfn5882dslz6qqkkd84m7w52kd34x10qph8yhipyjv1dimc";
url = "https://github.com/beancount/fava/releases/download/v${version}/beancount-fava-${version}.tar.gz";
sha256 = "1lk6s3s6xvvwbcbkr1qpr9bqdgwspk3vms25zjd6xcs21s3hchmp";
};
buildInputs = with python3Packages; [ pytest_30 ];

View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "skrooge-${version}";
version = "2.5.0";
version = "2.6.0";
src = fetchurl {
url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
sha256 = "03ayrrr7rrj1jl1qh3sgn56hbi44wn4ldgcj08b93mqw7wdvpglp";
sha256 = "13sd669rx66fpk9pm72nr2y69k2h4mcs4b904i9xm41i0fiy6szp";
};
nativeBuildInputs = [ cmake ecm makeQtWrapper ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "lean-${version}";
version = "2016-12-30";
version = "2017-01-06";
src = fetchFromGitHub {
owner = "leanprover";
repo = "lean";
rev = "fd4fffea27c442b12a45f664a8680ebb47482ca3";
sha256 = "1izbjxbr1nvv5kv2b7qklqjx2b1qmwrxhmvk0f2lrl9pxz9h0bmd";
rev = "6f8ccb5873b6f72d735e700e25044e99c6ebb7b6";
sha256 = "1nxbqdc6faxivbrifb7b9j5zl5kml9w5pa63afh93z2ng7mn0jyg";
};
buildInputs = [ gmp mpfr cmake gperftools ];

View file

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

View file

@ -0,0 +1,27 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
atlassian-stash (0.7.0)
commander (~> 4.1.2)
git (>= 1.2.5)
json (>= 1.7.5)
launchy (~> 2.4.2)
commander (4.1.6)
highline (~> 1.6.11)
git (1.3.0)
highline (1.6.21)
json (2.0.2)
launchy (2.4.3)
addressable (~> 2.3)
public_suffix (2.0.5)
PLATFORMS
ruby
DEPENDENCIES
atlassian-stash
BUNDLED WITH
1.13.6

View file

@ -0,0 +1,21 @@
{ lib, bundlerEnv, ruby }:
bundlerEnv rec {
name = "bitbucket-server-cli-${version}";
version = (import gemset).atlassian-stash.version;
inherit ruby;
gemfile = ./Gemfile;
lockfile = ./Gemfile.lock;
gemset = ./gemset.nix;
pname = "atlassian-stash";
meta = with lib; {
description = "A command line interface to interact with BitBucket Server (formerly Atlassian Stash)";
homepage = https://bitbucket.org/atlassian/bitbucket-server-cli;
license = licenses.mit;
maintainers = with maintainers; [ jgertm ];
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,66 @@
{
addressable = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw";
type = "gem";
};
version = "2.5.0";
};
atlassian-stash = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rsf9h5w5wiglwv0fqwp45fq06fxbg68cqkc3bpqvps1i1qm0p6i";
type = "gem";
};
version = "0.7.0";
};
commander = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0x9i8hf083wjlgj09nl1p9j8sr5g7amq0fdmxjqs4cxdbg3wpmsb";
type = "gem";
};
version = "4.1.6";
};
git = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1waikaggw7a1d24nw0sh8fd419gbf7awh000qhsf411valycj6q3";
type = "gem";
};
version = "1.3.0";
};
highline = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1";
type = "gem";
};
version = "1.6.21";
};
json = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lhinj9vj7mw59jqid0bjn2hlfcnq02bnvsx9iv81nl2han603s0";
type = "gem";
};
version = "2.0.2";
};
launchy = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2";
type = "gem";
};
version = "2.4.3";
};
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q";
type = "gem";
};
version = "2.0.5";
};
}

View file

@ -22,6 +22,8 @@ in
rec {
# Try to keep this generally alphabetized
bitbucket-server-cli = callPackage ./bitbucket-server-cli { };
darcsToGit = callPackage ./darcs-to-git { };
diff-so-fancy = callPackage ./diff-so-fancy { };

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "transcrypt-${version}";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "elasticdog";
repo = "transcrypt";
rev = "v${version}";
sha256 = "195hi8lq1i9rfcwj3raw4pa7fhvv3ghznxp4crmbjm7c0sqilcpd";
sha256 = "12n8714my9i93lysqa3dj1z5xgi10iv5y1mnsqki9zn5av3lgqkq";
};
buildInputs = [ git makeWrapper openssl ];

View file

@ -0,0 +1,35 @@
{ stdenv, fetchurl, python2Packages, git }:
python2Packages.buildPythonApplication rec {
version = "1.4.2";
name = "git-up-${version}";
src = fetchurl {
url = "mirror://pypi/g/git-up/${name}.zip";
sha256 = "121ia5gyjy7js6fbsx9z98j2qpq7rzwpsj8gnfvsbz2d69g0vl7q";
};
buildInputs = [ git ] ++ (with python2Packages; [ nose ]);
propagatedBuildInputs = with python2Packages; [ click colorama docopt GitPython six termcolor ];
# 1. git fails to run as it cannot detect the email address, so we set it
# 2. $HOME is by default not a valid dir, so we have to set that too
# https://github.com/NixOS/nixpkgs/issues/12591
preCheck = ''
export HOME=$TMPDIR
git config --global user.email "nobody@example.com"
git config --global user.name "Nobody"
'';
postInstall = ''
rm -r $out/${python2Packages.python.sitePackages}/PyGitUp/tests
'';
meta = with stdenv.lib; {
homepage = http://github.com/msiemens/PyGitUp;
description = "A git pull replacement that rebases all local branches when pulling.";
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.all;
};
}

View file

@ -0,0 +1,20 @@
boost: LIBS += -lboost_serialization
expat: LIBS += -lexpat
expat: PKGCONFIG -= expat
cairo {
PKGCONFIG += cairo
LIBS -= $$system(pkg-config --variable=libdir cairo)/libcairo.a
}
pyside {
PKGCONFIG -= pyside
INCLUDEPATH += $$system(pkg-config --variable=includedir pyside)
INCLUDEPATH += $$system(pkg-config --variable=includedir pyside)/QtCore
INCLUDEPATH += $$system(pkg-config --variable=includedir pyside)/QtGui
INCLUDEPATH += $$system(pkg-config --variable=includedir QtGui)
LIBS += -lpyside-python2.7
}
shiboken {
PKGCONFIG -= shiboken
INCLUDEPATH += $$system(pkg-config --variable=includedir shiboken)
LIBS += -lshiboken-python2.7
}

View file

@ -0,0 +1,126 @@
{ lib, stdenv, fetchurl, qt4, pkgconfig, boost, expat, cairo, python2Packages,
cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip,
poppler, imagemagick, glew, openexr, ffmpeg, opencolorio, openimageio,
qmake4Hook, libpng, mesa_noglu, lndir }:
let
minorVersion = "2.1";
version = "${minorVersion}.9";
OpenColorIO-Configs = fetchurl {
url = "https://github.com/MrKepzie/OpenColorIO-Configs/archive/Natron-v${minorVersion}.tar.gz";
sha256 = "9eec5a02ca80c9cd8e751013cb347ea982fdddd592a4a9215cce462e332dac51";
};
seexpr = stdenv.mkDerivation rec {
version = "1.0.1";
name = "seexpr-${version}";
src = fetchurl {
url = "https://github.com/wdas/SeExpr/archive/rel-${version}.tar.gz";
sha256 = "1ackh0xs4ip7mk34bam8zd4qdymkdk0dgv8x0f2mf6gbyzzyh7lp";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ libpng flex bison ];
};
buildPlugin = { pluginName, sha256, buildInputs, preConfigure ? "" }:
stdenv.mkDerivation {
name = "openfx-${pluginName}-${version}";
src = fetchurl {
url = "https://github.com/MrKepzie/Natron/releases/download/${version}/openfx-${pluginName}-${version}.tar.xz";
inherit sha256;
};
inherit buildInputs;
preConfigure = ''
makeFlagsArray+=("CONFIG=release")
makeFlagsArray+=("PLUGINPATH=$out/Plugins/OFX/Natron")
${preConfigure}
'';
};
lodepngcpp = fetchurl {
url = https://raw.githubusercontent.com/lvandeve/lodepng/a70c086077c0eaecbae3845e4da4424de5f43361/lodepng.cpp;
sha256 = "1dxkkr4jbmvlwfr7m16i1mgcj1pqxg9s1a7y3aavs9rrk0ki8ys2";
};
lodepngh = fetchurl {
url = https://raw.githubusercontent.com/lvandeve/lodepng/a70c086077c0eaecbae3845e4da4424de5f43361/lodepng.h;
sha256 = "14drdikd0vws3wwpyqq7zzm5z3kg98svv4q4w0hr45q6zh6hs0bq";
};
CImgh = fetchurl {
url = https://raw.githubusercontent.com/dtschump/CImg/572c12d82b2f59ece21be8f52645c38f1dd407e6/CImg.h;
sha256 = "0n4qfxj8j6rmj4svf68gg2pzg8d1pb74bnphidnf8i2paj6lwniz";
};
plugins = map buildPlugin [
({
pluginName = "arena";
sha256 = "0qba13vn9qdfax7nqlz1ps27zspr5kh795jp1xvbmwjzjzjpkqkf";
buildInputs = [
pkgconfig pango librsvg librevenge libcdr opencolorio libxml2 libzip
poppler imagemagick
];
preConfigure = ''
sed -i 's|pkg-config poppler-glib|pkg-config poppler poppler-glib|g' Makefile.master
for i in Extra Bundle; do
cp ${lodepngcpp} $i/lodepng.cpp
cp ${lodepngh} $i/lodepng.h
done
'';
})
({
pluginName = "io";
sha256 = "0s196i9fkgr9iw92c94mxgs1lkxbhynkf83vmsgrldflmf0xjky7";
buildInputs = [
pkgconfig libpng ffmpeg openexr opencolorio openimageio boost mesa_noglu
seexpr
];
})
({
pluginName = "misc";
sha256 = "02h79jrll0c17azxj16as1mks3lmypm4m3da4mms9sg31l3n82qi";
buildInputs = [
mesa_noglu
];
preConfigure = ''
cp ${CImgh} CImg/CImg.h
'';
})
];
in
stdenv.mkDerivation {
inherit version;
name = "natron-${version}";
src = fetchurl {
url = "https://github.com/MrKepzie/Natron/releases/download/${version}/Natron-${version}.tar.xz";
sha256 = "1wdc0zqriw2jhlrhzs6af3kagrv22cm086ffnbr1x43mgc9hfhjp";
};
buildInputs = [
pkgconfig qt4 boost expat cairo python2Packages.pyside python2Packages.pysideShiboken
];
nativeBuildInputs = [ qmake4Hook python2Packages.wrapPython ];
preConfigure = ''
export MAKEFLAGS=-j$NIX_BUILD_CORES
cp ${./config.pri} config.pri
mkdir OpenColorIO-Configs
tar -xf ${OpenColorIO-Configs} --strip-components=1 -C OpenColorIO-Configs
'';
postFixup = ''
for i in ${lib.escapeShellArgs plugins}; do
${lndir}/bin/lndir $i $out
done
wrapProgram $out/bin/Natron \
--set PYTHONPATH "$PYTHONPATH"
'';
meta = with stdenv.lib; {
description = "Node-graph based, open-source compositing software";
longDescription = ''
Node-graph based, open-source compositing software. Similar in
functionalities to Adobe After Effects and Nuke by The Foundry.
'';
homepage = https://natron.inria.fr/;
license = stdenv.lib.licenses.gpl2;
maintainers = [ maintainers.puffnfresh ];
platforms = platforms.linux;
};
}

View file

@ -7,7 +7,7 @@ let
commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
version = "8.1.20161224";
version = "8.1.20170106";
commonPreConfigure = ''
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
@ -19,12 +19,12 @@ let
in stdenv.mkDerivation (rec {
inherit version;
name = "ghc-${version}";
rev = "2689a1692636521777f007861a484e7064b2d696";
rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd";
src = fetchgit {
url = "git://git.haskell.org/ghc.git";
inherit rev;
sha256 = "0rk6xy7kgxx849nprq1ji459p88nyy93236g841m5p6mdh7mmrcr";
sha256 = "1h064nikx5srsd7qvz19f6dxvnpfjp0b3b94xs1f4nar18hzf4j0";
};
postPatch = "patchShebangs .";
@ -86,9 +86,6 @@ in stdenv.mkDerivation (rec {
} // stdenv.lib.optionalAttrs (cross != null) {
name = "${cross.config}-ghc-${version}";
# Some fixes for cross-compilation to iOS. See https://phabricator.haskell.org/D2710 (D2711,D2712,D2713)
patches = [ ./D2710.patch ./D2711.patch ./D2712.patch ./D2713.patch ];
preConfigure = commonPreConfigure + ''
sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk
'';

View file

@ -54,7 +54,7 @@ self: super: {
src = pkgs.fetchFromGitHub {
owner = "joeyh";
repo = "git-annex";
sha256 = "1a87kllzxmjwkz5arq4c3bp7qfkabn0arbli6s6i68fkgm19s4gr";
sha256 = "1vy6bj7f8zyj4n1r0gpi0r7mxapsrjvhwmsi5sbnradfng5j3jya";
rev = drv.version;
};
})).overrideScope (self: super: {
@ -192,7 +192,8 @@ self: super: {
then dontCheck (overrideCabal super.hakyll (drv: {
testToolDepends = [];
}))
else super.hakyll;
# https://github.com/jaspervdj/hakyll/issues/491
else dontCheck super.hakyll;
# Heist's test suite requires system pandoc
heist = overrideCabal super.heist (drv: {

View file

@ -855,9 +855,6 @@ default-package-overrides:
- hjsmin ==0.2.0.2
- hjsonpointer ==1.0.0.2
- hjsonschema ==1.1.0.1
- hledger ==1.0.1
- hledger-interest ==1.5.1
- hledger-lib ==1.0.1
- hlibgit2 ==0.18.0.15
- hlibsass ==0.1.5.0
- hlint ==1.9.35
@ -2010,6 +2007,7 @@ default-package-overrides:
extra-packages:
- aeson < 0.8 # newer versions don't work with GHC 6.12.3
- aeson < 1.1 # required by stack
- aeson-pretty < 0.8 # required by elm compiler
- binary > 0.7 && < 0.8 # binary 0.8.x is the latest, but it's largely unsupported so far
- Cabal == 1.18.* # required for cabal-install et al on old GHC versions
@ -3416,8 +3414,6 @@ dont-distribute-packages:
electrum-mnemonic: [ i686-linux, x86_64-linux, x86_64-darwin ]
elevator: [ i686-linux, x86_64-linux, x86_64-darwin ]
elision: [ i686-linux, x86_64-linux, x86_64-darwin ]
elm-export-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ]
elm-export: [ i686-linux, x86_64-linux, x86_64-darwin ]
elocrypt: [ i686-linux, x86_64-linux, x86_64-darwin ]
emacs-keys: [ i686-linux, x86_64-linux, x86_64-darwin ]
email-postmark: [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -4075,7 +4071,6 @@ dont-distribute-packages:
hakyll-sass: [ i686-linux, x86_64-linux, x86_64-darwin ]
hakyll-series: [ i686-linux, x86_64-linux, x86_64-darwin ]
hakyll-shakespeare: [ i686-linux, x86_64-linux, x86_64-darwin ]
hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ]
halberd: [ i686-linux, x86_64-linux, x86_64-darwin ]
halfs: [ i686-linux, x86_64-linux, x86_64-darwin ]
halipeto: [ i686-linux, x86_64-linux, x86_64-darwin ]

File diff suppressed because it is too large Load diff

View file

@ -4,4 +4,4 @@ mkdir smack
cd smack
tar xfvz $src
mkdir -p $out/share/java
cp smack-*.jar $out/share/java
cp libs/smack-*.jar $out/share/java

View file

@ -1,12 +1,12 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "smack-3.4.1";
name = "smack-4.1.9";
builder = ./builder.sh;
src = fetchurl {
url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_4_1.tar.gz;
sha256 = "13jm93b0dsfxr62brq1hagi9fqk7ip3pi80svq10zh5kcpk77jf4";
url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_4_1_9.tar.gz;
sha256 = "009x0qcxd4dkvwcjz2nla470pwbabwvg37wc21pslpw42ldi0bzp";
};
meta = {

View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
patches = stdenv.lib.optional stdenv.isLinux ./libmemcached-fix-linking-with-libpthread.patch
++ stdenv.lib.optional stdenv.isDarwin (fetchpatch {
url = "https://raw.githubusercontent.com/Homebrew/homebrew/bfd4a0a4626b61c2511fdf573bcbbc6bbe86340e/Library/Formula/libmemcached.rb";
sha256 = "1nvxwdkxj2a2g39z0g8byxjwnw4pa5xlvsmdk081q63vmfywh7zb";
sha256 = "1gjf3vd7hiyzxjvlg2zfc3y2j0lyr6nhbws4xb5dmin3csyp8qb8";
});
buildInputs = [ libevent ];

View file

@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
doCheck = true;
crossAttrs.doCheck = false;
meta = with lib; {
description = "A multi-platform support library with a focus on asynchronous I/O";
homepage = https://github.com/libuv/libuv;

View file

@ -2,9 +2,19 @@
# Optional Dependencies
, openssl ? null, libev ? null, zlib ? null
#, jansson ? null, boost ? null, libxml2 ? null, jemalloc ? null
, enableHpack ? false, jansson ? null
, enableAsioLib ? false, boost ? null
, enableGetAssets ? false, libxml2 ? null
, enableJemalloc ? false, jemalloc ? null
}:
assert enableHpack -> jansson != null;
assert enableAsioLib -> boost != null;
assert enableGetAssets -> libxml2 != null;
assert enableJemalloc -> jemalloc != null;
with { inherit (stdenv.lib) optional; };
stdenv.mkDerivation rec {
name = "nghttp2-${version}";
version = "1.17.0";
@ -18,7 +28,11 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "lib" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl libev zlib ];
buildInputs = [ openssl libev zlib ]
++ optional enableHpack jansson
++ optional enableAsioLib boost
++ optional enableGetAssets libxml2
++ optional enableJemalloc jemalloc;
enableParallelBuilding = true;

View file

@ -1,26 +1,30 @@
{ stdenv, fetchurl, python, buildPythonPackage, gmp }:
{ stdenv, fetchurl, buildPythonPackage, pycryptodome }:
buildPythonPackage rec {
name = "pycrypto-2.6.1";
namePrefix = "";
# This is a dummy package providing the drop-in replacement pycryptodome.
# https://github.com/NixOS/nixpkgs/issues/21671
src = fetchurl {
url = "mirror://pypi/p/pycrypto/${name}.tar.gz";
sha256 = "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj";
};
let
version = pycryptodome.version;
pname = "pycrypto";
in buildPythonPackage rec {
name = "${pname}-${version}";
preConfigure = ''
sed -i 's,/usr/include,/no-such-dir,' configure
sed -i "s!,'/usr/include/'!!" setup.py
# Cannot build wheel otherwise (zip 1980 issue)
SOURCE_DATE_EPOCH=315532800;
# We need to have a dist-info folder, so let's create one with setuptools
unpackPhase = ''
echo "from setuptools import setup; setup(name='${pname}', version='${version}', install_requires=['pycryptodome'])" > setup.py
'';
buildInputs = stdenv.lib.optional (!python.isPypy or false) gmp; # optional for pypy
propagatedBuildInputs = [ pycryptodome ];
doCheck = !(python.isPypy or stdenv.isDarwin); # error: AF_UNIX path too long
# Our dummy has no tests
doCheck = false;
meta = {
homepage = "http://www.pycrypto.org/";
description = "Python Cryptography Toolkit";
platforms = stdenv.lib.platforms.unix;
platforms = pycryptodome.meta.platforms;
};
}

View file

@ -340,7 +340,7 @@ let
rzmq = [ pkgs.zeromq3 ];
SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ];
sdcTable = [ pkgs.gmp pkgs.glpk ];
seewave = [ pkgs.fftw pkgs.libsndfile ];
seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ];
seqinr = [ pkgs.zlib ];
seqminer = [ pkgs.zlib pkgs.bzip2 ];
showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype ];

View file

@ -1,7 +1,7 @@
{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }:
let
version = "1.2.2";
version = "1.4.13";
name = "electron-${version}";
meta = with stdenv.lib; {
@ -17,7 +17,7 @@ let
src = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
sha256 = "0jqzs1297f6w7s4j9pd7wyyqbidb0c61yjz47raafslg6nljgp1c";
sha256 = "1fd8axaln31c550dh7dnfwigrp44ahp142cklpdc57mz34xjawp3";
name = "${name}.zip";
};
@ -45,7 +45,7 @@ let
src = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip";
sha256 = "0rqlpj3400qjsfj8k4lwajrwv5l6f8mhrpvsma7p36fw5qjbwp1z";
sha256 = "0aa4wrba1y7pab5g6bzxagj5dfl9bqrbpj3bbi5v5gsd0h34k0yx";
name = "${name}.zip";
};

View file

@ -0,0 +1,40 @@
{ stdenv, fetchFromGitHub, gcc, scons, pkgconfig, libX11, libXcursor
, libXinerama, libXrandr, libXrender, freetype, openssl, alsaLib
, libpulseaudio, mesa, mesa_glu, zlib }:
stdenv.mkDerivation rec {
name = "godot-${version}";
version = "2.1.1-stable";
src = fetchFromGitHub {
owner = "godotengine";
repo = "godot";
rev = version;
sha256 = "071qkm1l6yn2s9ha67y15w2phvy5m5wl3wqvrslhfmnsir3q3k01";
};
buildInputs = [
gcc scons pkgconfig libX11 libXcursor libXinerama libXrandr libXrender
freetype openssl alsaLib libpulseaudio mesa mesa_glu zlib
];
patches = [ ./pkg_config_additions.patch ];
enableParallelBuilding = true;
buildPhase = ''
scons platform=x11 prefix=$out -j $NIX_BUILD_CORES
'';
installPhase = ''
mkdir $out/bin -p
cp bin/godot.* $out/bin/
'';
meta = {
homepage = "http://godotengine.org";
description = "Free and Open Source 2D and 3D game engine";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -0,0 +1,12 @@
+++ build/platform/x11/detect.py
@@ -132,6 +132,10 @@
env.ParseConfig('pkg-config xinerama --cflags --libs')
env.ParseConfig('pkg-config xcursor --cflags --libs')
env.ParseConfig('pkg-config xrandr --cflags --libs')
+ env.ParseConfig('pkg-config xrender --cflags --libs')
+ env.ParseConfig('pkg-config osmesa --cflags')
+ env.ParseConfig('pkg-config glu --cflags --libs')
+ env.ParseConfig('pkg-config zlib --cflags --libs')
if (env['builtin_openssl'] == 'no'):
env.ParseConfig('pkg-config openssl --cflags --libs')

View file

@ -1,47 +1,18 @@
{ stdenv, lib, gox, gotools, buildGoPackage, fetchFromGitHub
, fetchgit, fetchhg, fetchbzr, fetchsvn }:
stdenv.mkDerivation rec {
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "packer-${version}";
version = "0.10.1";
version = "0.12.1";
src = (import ./deps.nix {
inherit stdenv lib gox gotools buildGoPackage fetchgit fetchhg fetchbzr fetchsvn;
}).out;
goPackagePath = "github.com/mitchellh/packer";
buildInputs = [ src.go gox gotools ];
subPackages = [ "." ];
configurePhase = ''
export GOPATH=$PWD/share/go
export XC_ARCH=$(go env GOARCH)
export XC_OS=$(go env GOOS)
mkdir $GOPATH/bin
cd $GOPATH/src/github.com/mitchellh/packer
# Don't fetch the deps
substituteInPlace "Makefile" --replace ': deps' ':'
# Avoid using git
sed \
-e "s|GITBRANCH:=.*||" \
-e "s|GITSHA:=.*|GITSHA=${src.rev}|" \
-i Makefile
sed \
-e "s|GIT_COMMIT=.*|GIT_COMMIT=${src.rev}|" \
-e "s|GIT_DIRTY=.*|GIT_DIRTY=|" \
-i "scripts/build.sh"
'';
buildPhase = ''
make generate releasebin
'';
installPhase = ''
mkdir -p $out/bin
mv bin/* $out/bin
'';
src = fetchFromGitHub {
owner = "mitchellh";
repo = "packer";
rev = "v${version}";
sha256 = "05wd8xf4nahpg96wzligk5av10p0xd2msnb3imk67qgbffrlvmvi";
};
meta = with stdenv.lib; {
description = "A tool for creating identical machine images for multiple platforms from a single source configuration";

View file

@ -1,560 +0,0 @@
{ stdenv, lib, gox, gotools, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
buildGoPackage rec {
name = "packer-${version}";
version = "20160507-${stdenv.lib.strings.substring 0 7 rev}";
rev = "4e5f65131b5491ab44ff8aa0626abe4a85597ac0";
buildInputs = [ gox gotools ];
goPackagePath = "github.com/mitchellh/packer";
src = fetchgit {
inherit rev;
url = "https://github.com/mitchellh/packer";
sha256 = "1a61f022h4ygnkp1lyr7vhq5w32a3f061dymgkqmz4c3b8fzcc10";
};
extraSrcs = [
{
goPackagePath = "github.com/ActiveState/tail";
src = fetchgit {
url = "https://github.com/ActiveState/tail";
rev = "1a0242e795eeefe54261ff308dc685f7d29cc58c";
sha256 = "0hhr2962xmbqzbf2p79xfrzbmjm33h61fj5zlazj7a55bwxn688d";
};
}
{
goPackagePath = "github.com/Azure/azure-sdk-for-go";
src = fetchgit {
url = "https://github.com/Azure/azure-sdk-for-go";
rev = "a1883f7b98346e4908a6c25230c95a8a3026a10c";
sha256 = "0pxqi0b8qwcc687si3zh6w1d594rxd6kn2wzx23clbp2nc5w3wf4";
};
}
{
goPackagePath = "github.com/Azure/go-autorest";
src = fetchgit {
url = "https://github.com/Azure/go-autorest";
rev = "b01ec2b60f95678fa759f796bac3c6b9bceaead4";
sha256 = "1vqwy4m26ps5lmp066zgiz04s7r2dwa832zjlfmpgha7id16pa0c";
};
}
{
goPackagePath = "github.com/Azure/go-ntlmssp";
src = fetchgit {
url = "https://github.com/Azure/go-ntlmssp";
rev = "e0b63eb299a769ea4b04dadfe530f6074b277afb";
sha256 = "19bn9ds12cyf8y3w5brnxwg8lwdkg16ww9hmnq14y2kmli42l14m";
};
}
{
goPackagePath = "github.com/armon/go-radix";
src = fetchgit {
url = "https://github.com/armon/go-radix";
rev = "4239b77079c7b5d1243b7b4736304ce8ddb6f0f2";
sha256 = "0md8li1gv4ji4vr63cfa2bcmslba94dzw6awzn5ndnpmdb7np6vh";
};
}
{
goPackagePath = "github.com/aws/aws-sdk-go";
src = fetchgit {
url = "https://github.com/aws/aws-sdk-go";
rev = "8041be5461786460d86b4358305fbdf32d37cfb2";
sha256 = "06ilyl1z5mn6i0afd8ila4lr2vwqdgq5zby8v4v2g3dd39qi6jq2";
};
}
{
goPackagePath = "github.com/bgentry/speakeasy";
src = fetchgit {
url = "https://github.com/bgentry/speakeasy";
rev = "36e9cfdd690967f4f690c6edcc9ffacd006014a0";
sha256 = "0grr82p10dk51l082xaqkpq3izj5bhby3l15gj866kngybfb4nzr";
};
}
{
goPackagePath = "github.com/dgrijalva/jwt-go";
src = fetchgit {
url = "https://github.com/dgrijalva/jwt-go";
rev = "f2193411bd642f7db03249fd79d5292c9b34916a";
sha256 = "0nkzn8i5f7x3wyi7mhhj9vpdbkdjvrb9hhrw0fqy6vcghia6dhrj";
};
}
{
goPackagePath = "github.com/digitalocean/godo";
src = fetchgit {
url = "https://github.com/digitalocean/godo";
rev = "6ca5b770f203b82a0fca68d0941736458efa8a4f";
sha256 = "00di15gdv47jfdr1l8cqphmlv5bzalxk7dk53g3mif7vwhs8749j";
};
}
{
goPackagePath = "github.com/dylanmei/iso8601";
src = fetchgit {
url = "https://github.com/dylanmei/iso8601";
rev = "2075bf119b58e5576c6ed9f867b8f3d17f2e54d4";
sha256 = "0px5aq4w96yyjii586h3049xm7rvw5r8w7ph3axhyismrqddqgx1";
};
}
{
goPackagePath = "github.com/dylanmei/winrmtest";
src = fetchgit {
url = "https://github.com/dylanmei/winrmtest";
rev = "025617847eb2cf9bd1d851bc3b22ed28e6245ce5";
sha256 = "1i0wq6r1vm3nhnia3ycm5l590gyia7cwh6971ppnn4rrdmvsw2qh";
};
}
{
goPackagePath = "github.com/go-ini/ini";
src = fetchgit {
url = "https://github.com/go-ini/ini";
rev = "afbd495e5aaea13597b5e14fe514ddeaa4d76fc3";
sha256 = "0dl5ibrrq2i887i0bf8a9m887rhnpgv6wmwyc1sj8a75c0yd02da";
};
}
{
goPackagePath = "github.com/google/go-querystring";
src = fetchgit {
url = "https://github.com/google/go-querystring";
rev = "2a60fc2ba6c19de80291203597d752e9ba58e4c0";
sha256 = "117211606pv0p3p4cblpnirrrassprrvvcq2svwpplsq5vff1rka";
};
}
{
goPackagePath = "github.com/hashicorp/atlas-go";
src = fetchgit {
url = "https://github.com/hashicorp/atlas-go";
rev = "95fa852edca41c06c4ce526af4bb7dec4eaad434";
sha256 = "002lpvxi6my8dk4d4ks091ad66bj6rnz4xchbzpqwvp7n8097aqz";
};
}
{
goPackagePath = "github.com/hashicorp/errwrap";
src = fetchgit {
url = "https://github.com/hashicorp/errwrap";
rev = "7554cd9344cec97297fa6649b055a8c98c2a1e55";
sha256 = "0kmv0p605di6jc8i1778qzass18m0mv9ks9vxxrfsiwcp4la82jf";
};
}
{
goPackagePath = "github.com/hashicorp/go-checkpoint";
src = fetchgit {
url = "https://github.com/hashicorp/go-checkpoint";
rev = "e4b2dc34c0f698ee04750bf2035d8b9384233e1b";
sha256 = "0qjfk1fh5zmn04yzxn98zam8j4ay5mzd5kryazqj01hh7szd0sh5";
};
}
{
goPackagePath = "github.com/hashicorp/go-cleanhttp";
src = fetchgit {
url = "https://github.com/hashicorp/go-cleanhttp";
rev = "875fb671b3ddc66f8e2f0acc33829c8cb989a38d";
sha256 = "0ammv6gn9cmh6padaaw76wa6xvg22a9b3sw078v9chcvfk2bggha";
};
}
{
goPackagePath = "github.com/hashicorp/go-multierror";
src = fetchgit {
url = "https://github.com/hashicorp/go-multierror";
rev = "d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5";
sha256 = "0dc02mvv11hvanh12nhw8jsislnxf6i4gkh6vcil0x23kj00z3iz";
};
}
{
goPackagePath = "github.com/hashicorp/go-rootcerts";
src = fetchgit {
url = "https://github.com/hashicorp/go-rootcerts";
rev = "6bb64b370b90e7ef1fa532be9e591a81c3493e00";
sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9";
};
}
{
goPackagePath = "github.com/hashicorp/go-version";
src = fetchgit {
url = "https://github.com/hashicorp/go-version";
rev = "7e3c02b30806fa5779d3bdfc152ce4c6f40e7b38";
sha256 = "0ibqaq6z02himzci4krbfhqdi8fw2gzj9a8z375nl3qbzdgzqnm7";
};
}
{
goPackagePath = "github.com/hashicorp/yamux";
src = fetchgit {
url = "https://github.com/hashicorp/yamux";
rev = "df949784da9ed028ee76df44652e42d37a09d7e4";
sha256 = "080bmbdaq88ri2pn63mcjc4kq2y2sy1742ypqfgrvwssa1ynvnhy";
};
}
{
goPackagePath = "github.com/hpcloud/tail";
src = fetchgit {
url = "https://github.com/hpcloud/tail";
rev = "1a0242e795eeefe54261ff308dc685f7d29cc58c";
sha256 = "0hhr2962xmbqzbf2p79xfrzbmjm33h61fj5zlazj7a55bwxn688d";
};
}
{
goPackagePath = "github.com/jmespath/go-jmespath";
src = fetchgit {
url = "https://github.com/jmespath/go-jmespath";
rev = "c01cf91b011868172fdcd9f41838e80c9d716264";
sha256 = "0lp2m33a6x2pjbv5xlbbcr48qri32s84hcgm3xmgvmrx6zyi74zg";
};
}
{
goPackagePath = "github.com/kardianos/osext";
src = fetchgit {
url = "https://github.com/kardianos/osext";
rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc";
sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a";
};
}
{
goPackagePath = "github.com/klauspost/compress";
src = fetchgit {
url = "https://github.com/klauspost/compress";
rev = "f86d2e6d8a77c6a2c4e42a87ded21c6422f7557e";
sha256 = "17f9zxrs2k8q5kghppjnbn0xzl3i4fgl4852kj8cg94b51s5ll9f";
};
}
{
goPackagePath = "github.com/klauspost/cpuid";
src = fetchgit {
url = "https://github.com/klauspost/cpuid";
rev = "349c675778172472f5e8f3a3e0fe187e302e5a10";
sha256 = "1y7gqpcpcb29ws77328vfm30s8nsrbxyylfpb8ksb8wwg062yv6v";
};
}
{
goPackagePath = "github.com/klauspost/crc32";
src = fetchgit {
url = "https://github.com/klauspost/crc32";
rev = "999f3125931f6557b991b2f8472172bdfa578d38";
sha256 = "1sxnq3i7wvcdqx0l91jc04nf5584ym8dxzkz3xvivm8p7kz2xjns";
};
}
{
goPackagePath = "github.com/klauspost/pgzip";
src = fetchgit {
url = "https://github.com/klauspost/pgzip";
rev = "47f36e165cecae5382ecf1ec28ebf7d4679e307d";
sha256 = "00jcx3pdwxi4r2l3m4b8jb17b2srckz488cmjvd1vqkr85a0jp2x";
};
}
{
goPackagePath = "github.com/kr/fs";
src = fetchgit {
url = "https://github.com/kr/fs";
rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b";
sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly";
};
}
{
goPackagePath = "github.com/masterzen/simplexml";
src = fetchgit {
url = "https://github.com/masterzen/simplexml";
rev = "95ba30457eb1121fa27753627c774c7cd4e90083";
sha256 = "0pwsis1f5n4is0nmn6dnggymj32mldhbvihv8ikn3nglgxclz4kz";
};
}
{
goPackagePath = "github.com/masterzen/winrm";
src = fetchgit {
url = "https://github.com/masterzen/winrm";
rev = "54ea5d01478cfc2afccec1504bd0dfcd8c260cfa";
sha256 = "1d4khg7c4vw645id0x301zkgidm4ah6nkmiq52j8wsivi85yhn66";
};
}
{
goPackagePath = "github.com/masterzen/xmlpath";
src = fetchgit {
url = "https://github.com/masterzen/xmlpath";
rev = "13f4951698adc0fa9c1dda3e275d489a24201161";
sha256 = "1y81h7ymk3dp3w3a2iy6qd1dkm323rkxa27dzxw8vwy888j5z8bk";
};
}
{
goPackagePath = "github.com/mattn/go-isatty";
src = fetchgit {
url = "https://github.com/mattn/go-isatty";
rev = "56b76bdf51f7708750eac80fa38b952bb9f32639";
sha256 = "0l8lcp8gcqgy0g1cd89r8vk96nami6sp9cnkx60ms1dn6cqwf5n3";
};
}
{
goPackagePath = "github.com/mitchellh/cli";
src = fetchgit {
url = "https://github.com/mitchellh/cli";
rev = "5c87c51cedf76a1737bf5ca3979e8644871598a6";
sha256 = "1ajxzh3winjnmqhd4yn6b6f155vfzi0dszhzl4a00zb5pdppp1rd";
};
}
{
goPackagePath = "github.com/mitchellh/go-fs";
src = fetchgit {
url = "https://github.com/mitchellh/go-fs";
rev = "a34c1b9334e86165685a9449b782f20465eb8c69";
sha256 = "11sy85p77ffmavpiichzybrfvjm1ilsi4clx98n3363arksavs5i";
};
}
{
goPackagePath = "github.com/mitchellh/go-homedir";
src = fetchgit {
url = "https://github.com/mitchellh/go-homedir";
rev = "d682a8f0cf139663a984ff12528da460ca963de9";
sha256 = "0vsiby9fbkaz7q067wmc6s5pzgpq4gdfx66cj2a1lbdarf7j1kbs";
};
}
{
goPackagePath = "github.com/mitchellh/go-vnc";
src = fetchgit {
url = "https://github.com/mitchellh/go-vnc";
rev = "723ed9867aed0f3209a81151e52ddc61681f0b01";
sha256 = "0nlya2rbmwb3jycqsyah1pn4386712mfrfiprprkbzcna9q7lp1h";
};
}
{
goPackagePath = "github.com/mitchellh/iochan";
src = fetchgit {
url = "https://github.com/mitchellh/iochan";
rev = "87b45ffd0e9581375c491fef3d32130bb15c5bd7";
sha256 = "1435kdcx3j1xgr6mm5c7w7hjx015jb20yfqlkp93q143hspf02fx";
};
}
{
goPackagePath = "github.com/mitchellh/mapstructure";
src = fetchgit {
url = "https://github.com/mitchellh/mapstructure";
rev = "281073eb9eb092240d33ef253c404f1cca550309";
sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh";
};
}
{
goPackagePath = "github.com/mitchellh/multistep";
src = fetchgit {
url = "https://github.com/mitchellh/multistep";
rev = "162146fc57112954184d90266f4733e900ed05a5";
sha256 = "0ydhbxziy9204qr43pjdh88y2jg34g2mhzdapjyfpf8a1rin6dn3";
};
}
{
goPackagePath = "github.com/mitchellh/panicwrap";
src = fetchgit {
url = "https://github.com/mitchellh/panicwrap";
rev = "a1e50bc201f387747a45ffff020f1af2d8759e88";
sha256 = "0w5y21psgrl1afsap613c3qw84ik7zhnalnv3bf6r51hyv187y69";
};
}
{
goPackagePath = "github.com/mitchellh/prefixedio";
src = fetchgit {
url = "https://github.com/mitchellh/prefixedio";
rev = "6e6954073784f7ee67b28f2d22749d6479151ed7";
sha256 = "0an2pnnda33ns94v7x0sv9kmsnk62r8xm0cj4d69f2p63r85fdp6";
};
}
{
goPackagePath = "github.com/mitchellh/reflectwalk";
src = fetchgit {
url = "https://github.com/mitchellh/reflectwalk";
rev = "eecf4c70c626c7cfbb95c90195bc34d386c74ac6";
sha256 = "1nm2ig7gwlmf04w7dbqd8d7p64z2030fnnfbgnd56nmd7dz8gpxq";
};
}
{
goPackagePath = "github.com/nu7hatch/gouuid";
src = fetchgit {
url = "https://github.com/nu7hatch/gouuid";
rev = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3";
sha256 = "175alsrjb2a1qzwp1l323vwwpirzaj95yfqqfi780698myhpb52k";
};
}
{
goPackagePath = "github.com/packer-community/winrmcp";
src = fetchgit {
url = "https://github.com/packer-community/winrmcp";
rev = "f1bcf36a69fa2945e65dd099eee11b560fbd3346";
sha256 = "0pj5gfbmx507lp1w3gfn23x0rn0x5rih9nqij9g8d9c4m1sx3275";
};
}
{
goPackagePath = "github.com/pierrec/lz4";
src = fetchgit {
url = "https://github.com/pierrec/lz4";
rev = "383c0d87b5dd7c090d3cddefe6ff0c2ffbb88470";
sha256 = "0l23bmzqfvgh61zlikj6iakg0kz7lybs8zf0nscylskl2hlr09rp";
};
}
{
goPackagePath = "github.com/pierrec/xxHash";
src = fetchgit {
url = "https://github.com/pierrec/xxHash";
rev = "5a004441f897722c627870a981d02b29924215fa";
sha256 = "146ibrgvgh61jhbbv9wks0mabkci3s0m68sg6shmlv1yixkw6gja";
};
}
{
goPackagePath = "github.com/pkg/sftp";
src = fetchgit {
url = "https://github.com/pkg/sftp";
rev = "e84cc8c755ca39b7b64f510fe1fffc1b51f210a5";
sha256 = "0v6g9j9pnkqz72x5409y8gd8ycniziydvsjb4298dkd21d3b94dg";
};
}
{
goPackagePath = "github.com/rackspace/gophercloud";
src = fetchgit {
url = "https://github.com/rackspace/gophercloud";
rev = "53d1dc4400e1ebcd37a0e01d8c1fe2f4db3b99d2";
sha256 = "0rdyljj395k1w7xnxw1i76w29fgl517mvs7bsqll35lss2gbhan2";
};
}
{
goPackagePath = "github.com/satori/go.uuid";
src = fetchgit {
url = "https://github.com/satori/go.uuid";
rev = "d41af8bb6a7704f00bc3b7cba9355ae6a5a80048";
sha256 = "0lw8k39s7hab737rn4nngpbsganrniiv7px6g41l6f6vci1skyn2";
};
}
{
goPackagePath = "github.com/tent/http-link-go";
src = fetchgit {
url = "https://github.com/tent/http-link-go";
rev = "ac974c61c2f990f4115b119354b5e0b47550e888";
sha256 = "0iwq842pvp5y77cr25yanj1cgqzmkz1aw6jzgjrrmlqqkdad5z8c";
};
}
{
goPackagePath = "github.com/ugorji/go";
src = fetchgit {
url = "https://github.com/ugorji/go";
rev = "646ae4a518c1c3be0739df898118d9bccf993858";
sha256 = "0njncpdbh115l5mxyks08jh91kdmy0mvbmxj9mr1psv5k97gf0pn";
};
}
{
goPackagePath = "golang.org/x/crypto";
src = fetchgit {
url = "https://go.googlesource.com/crypto";
rev = "1f22c0103821b9390939b6776727195525381532";
sha256 = "05ahvn9g9cj7797n8ryfxv2g26v3lx1pza9d9pg97iw0rvar9i1h";
};
}
{
goPackagePath = "golang.org/x/net";
src = fetchgit {
url = "https://go.googlesource.com/net";
rev = "6ccd6698c634f5d835c40c1c31848729e0cecda1";
sha256 = "05c7kdjkvf7hrdiv1k12nyss6s8chhakqn1adxbrrahr6rl1nhpj";
};
}
{
goPackagePath = "golang.org/x/oauth2";
src = fetchgit {
url = "https://go.googlesource.com/oauth2";
rev = "8a57ed94ffd43444c0879fe75701732a38afc985";
sha256 = "10pxnbsy1lnx7a1x6g3cna5gdm11aal1r446dpmpgj94xiw96mxv";
};
}
{
goPackagePath = "google.golang.org/api";
src = fetchgit {
url = "https://code.googlesource.com/google-api-go-client";
rev = "ddff2aff599105a55549cf173852507dfa094b7f";
sha256 = "03058zh0v997fxmlvd8r4m63r3z0fzg6fval6wnxw3wq22m7h3yx";
};
}
{
goPackagePath = "google.golang.org/cloud";
src = fetchgit {
url = "https://code.googlesource.com/gocloud";
rev = "5a3b06f8b5da3b7c3a93da43163b872c86c509ef";
sha256 = "03zrw3mgh82gvfgz17k97n8hivnvvplc42c7vyr76i90n1mv29g7";
};
}
{
goPackagePath = "gopkg.in/fsnotify.v1";
src = fetchgit {
url = "https://gopkg.in/fsnotify.v1";
rev = "8611c35ab31c1c28aa903d33cf8b6e44a399b09e";
sha256 = "17a7z88860hhmbgmpc2si1n67s8zk3vzwv5r4wyhrsljcq0bcv9q";
};
}
{
goPackagePath = "gopkg.in/tomb.v1";
src = fetchgit {
url = "https://gopkg.in/tomb.v1";
rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8";
sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
};
}
{
goPackagePath = "gopkg.in/xmlpath.v2";
src = fetchgit {
url = "https://gopkg.in/xmlpath.v2";
rev = "860cbeca3ebcc600db0b213c0e83ad6ce91f5739";
sha256 = "0jgvd0y78fir4vkcj8acs0pdvlc0xr7i7cspbkm2yjm8wv23p63h";
};
}
];
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "pipes-${version}";
version = "1.1.0";
version = "1.2.0";
src = fetchurl {
url = "https://github.com/pipeseroni/pipes.sh/archive/v${version}.tar.gz";
sha256 = "1225llbm0zfnkqykfi7qz7z5p102pwldmj22761m653jy0ahi7w2";
sha256 = "1v0xhgq30zkfjk9l5g8swpivh7rxfjbzhbjpr2c5c836wgn026fb";
};
buildInputs = with pkgs; [ bash ];

View file

@ -9,56 +9,64 @@ with stdenv.lib;
let
buildKernel = any (n: n == configFile) [ "kernel" "all" ];
buildUser = any (n: n == configFile) [ "user" "all" ];
in
assert any (n: n == configFile) [ "kernel" "user" "all" ];
assert buildKernel -> kernel != null;
common = { version, sha256 } @ args : stdenv.mkDerivation rec {
name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
stdenv.mkDerivation rec {
name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
src = fetchFromGitHub {
owner = "zfsonlinux";
repo = "spl";
rev = "spl-${version}";
inherit sha256;
};
version = "0.6.5.8";
patches = [ ./const.patch ./install_prefix.patch ];
src = fetchFromGitHub {
owner = "zfsonlinux";
repo = "spl";
rev = "spl-${version}";
sha256 = "000yvaccqlkrq15sdz0734fp3lkmx58182cdcfpm4869i0q7rf0s";
};
nativeBuildInputs = [ autoreconfHook ];
patches = [ ./const.patch ./install_prefix.patch ];
hardeningDisable = [ "pic" ];
nativeBuildInputs = [ autoreconfHook ];
hardeningDisable = [ "pic" ];
preConfigure = ''
substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid
substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin"
substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
'';
configureFlags = [
"--with-config=${configFile}"
] ++ optionals buildKernel [
"--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
"--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
enableParallelBuilding = true;
meta = {
description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";
longDescription = ''
This kernel module is a porting layer for ZFS to work inside the linux
kernel.
preConfigure = ''
substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid
substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin"
substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
'';
homepage = http://zfsonlinux.org/;
platforms = platforms.linux;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];
configureFlags = [
"--with-config=${configFile}"
] ++ optionals buildKernel [
"--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
"--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
enableParallelBuilding = true;
meta = {
description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";
longDescription = ''
This kernel module is a porting layer for ZFS to work inside the linux
kernel.
'';
homepage = http://zfsonlinux.org/;
platforms = platforms.linux;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];
};
};
}
in
assert any (n: n == configFile) [ "kernel" "user" "all" ];
assert buildKernel -> kernel != null;
{
splStable = common {
version = "0.6.5.8";
sha256 = "000yvaccqlkrq15sdz0734fp3lkmx58182cdcfpm4869i0q7rf0s";
};
splUnstable = common {
version = "0.7.0-rc2";
sha256 = "1y7jlyj8jwgrgnd6hiabms5h9430b6wjbnr3pwb16mv40wns1i65";
};
}

View file

@ -1,16 +1,16 @@
{ stdenv, fetchurl, libmnl, kernel ? null }:
# module requires Linux >= 4.1 https://www.wireguard.io/install/#kernel-requirements
assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.1";
# module requires Linux >= 3.18 https://www.wireguard.io/install/#kernel-requirements
assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.18";
let
name = "wireguard-${version}";
version = "0.0.20161230";
version = "0.0.20170105";
src = fetchurl {
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
sha256 = "15p3k8msk3agr0i96k12y5h4fxv0gc8zqjk15mizd3wwmw6pgjb9";
sha256 = "15iqb1a85aygbf3myw6r79i5h3vpjam1rs6xrnf5kgvgmvp91n8v";
};
meta = with stdenv.lib; {
@ -46,6 +46,9 @@ let
buildInputs = [ libmnl ];
makeFlags = [
"WITH_BASHCOMPLETION=yes"
"WITH_WGQUICK=yes"
"WITH_SYSTEMDUNITS=yes"
"DESTDIR=$(out)"
"PREFIX=/"
"-C" "tools"

View file

@ -1,117 +1,161 @@
{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils
{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils, fetchpatch
, configFile ? "all"
# Userspace dependencies
, zlib, libuuid, python
, zlib, libuuid, python, attr
# Kernel dependencies
, kernel ? null, spl ? null
, kernel ? null, spl ? null, splUnstable ? null
}:
with stdenv.lib;
let
buildKernel = any (n: n == configFile) [ "kernel" "all" ];
buildUser = any (n: n == configFile) [ "user" "all" ];
in
assert any (n: n == configFile) [ "kernel" "user" "all" ];
assert buildKernel -> kernel != null && spl != null;
common = { version, sha256, extraPatches, spl, inkompatibleKernelVersion ? null } @ args:
if buildKernel &&
(inkompatibleKernelVersion != null) &&
versionAtLeast kernel.version inkompatibleKernelVersion then
throw "linux v${kernel.version} is not yet supported by zfsonlinux v${version}"
else stdenv.mkDerivation rec {
name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
stdenv.mkDerivation rec {
name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
src = fetchFromGitHub {
owner = "zfsonlinux";
repo = "zfs";
rev = "zfs-${version}";
inherit sha256;
};
version = "0.6.5.8";
patches = extraPatches;
src = fetchFromGitHub {
owner = "zfsonlinux";
repo = "zfs";
rev = "zfs-${version}";
sha256 = "0qccz1832p3i80qlrrrypypspb9sy9hmpgcfx9vmhnqmkf0yri4a";
};
buildInputs = [ autoreconfHook nukeReferences ]
++ optionals buildKernel [ spl ]
++ optionals buildUser [ zlib libuuid python attr ];
patches = [ ./nix-build.patch ];
# for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
NIX_CFLAGS_LINK = "-lgcc_s";
buildInputs = [ autoreconfHook nukeReferences ]
++ optionals buildKernel [ spl ]
++ optionals buildUser [ zlib libuuid python ];
hardeningDisable = [ "pic" ];
# for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
NIX_CFLAGS_LINK = "-lgcc_s";
hardeningDisable = [ "pic" ];
preConfigure = ''
substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs"
substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs"
substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount"
substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount" "${utillinux}/bin/mount"
substituteInPlace ./udev/rules.d/* --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id"
substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/ztest" "$out/sbin/ztest"
substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/zdb" "$out/sbin/zdb"
substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d"
substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d"
substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc"
substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc"
substituteInPlace ./module/Makefile.in --replace "/bin/cp" "cp"
substituteInPlace ./etc/systemd/system/zfs-share.service.in \
--replace "@bindir@/rm " "${coreutils}/bin/rm "
./autogen.sh
'';
configureFlags = [
"--with-config=${configFile}"
] ++ optionals buildUser [
"--with-dracutdir=$(out)/lib/dracut"
"--with-udevdir=$(out)/lib/udev"
"--with-systemdunitdir=$(out)/etc/systemd/system"
"--with-systemdpresetdir=$(out)/etc/systemd/system-preset"
"--with-mounthelperdir=$(out)/bin"
"--sysconfdir=/etc"
"--localstatedir=/var"
"--enable-systemd"
] ++ optionals buildKernel [
"--with-spl=${spl}/libexec/spl"
"--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
"--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
enableParallelBuilding = true;
installFlags = [
"sysconfdir=\${out}/etc"
"DEFAULT_INITCONF_DIR=\${out}/default"
];
postInstall = ''
# Prevent kernel modules from depending on the Linux -dev output.
nuke-refs $(find $out -name "*.ko")
'' + optionalString buildUser ''
# Remove provided services as they are buggy
rm $out/etc/systemd/system/zfs-import-*.service
sed -i '/zfs-import-scan.service/d' $out/etc/systemd/system/*
for i in $out/etc/systemd/system/*; do
substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target"
done
# Fix pkgconfig.
ln -s ../share/pkgconfig $out/lib/pkgconfig
# Remove tests because they add a runtime dependency on gcc
rm -rf $out/share/zfs/zfs-tests
'';
meta = {
description = "ZFS Filesystem Linux Kernel module";
longDescription = ''
ZFS is a filesystem that combines a logical volume manager with a
Copy-On-Write filesystem with data integrity detection and repair,
snapshotting, cloning, block devices, deduplication, and more.
preConfigure = ''
substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs"
substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs"
substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount"
substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount" "${utillinux}/bin/mount"
substituteInPlace ./udev/rules.d/* --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id"
substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/ztest" "$out/sbin/ztest"
substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/zdb" "$out/sbin/zdb"
substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d"
substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d"
substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc"
substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc"
substituteInPlace ./module/Makefile.in --replace "/bin/cp" "cp"
substituteInPlace ./etc/systemd/system/zfs-share.service.in \
--replace "@bindir@/rm " "${coreutils}/bin/rm "
./autogen.sh
'';
homepage = http://zfsonlinux.org/;
license = licenses.cddl;
platforms = platforms.linux;
maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];
};
}
configureFlags = [
"--with-config=${configFile}"
] ++ optionals buildUser [
"--with-dracutdir=$(out)/lib/dracut"
"--with-udevdir=$(out)/lib/udev"
"--with-systemdunitdir=$(out)/etc/systemd/system"
"--with-systemdpresetdir=$(out)/etc/systemd/system-preset"
"--with-mounthelperdir=$(out)/bin"
"--sysconfdir=/etc"
"--localstatedir=/var"
"--enable-systemd"
] ++ optionals buildKernel [
"--with-spl=${spl}/libexec/spl"
"--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
"--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
enableParallelBuilding = true;
installFlags = [
"sysconfdir=\${out}/etc"
"DEFAULT_INITCONF_DIR=\${out}/default"
];
postInstall = ''
# Prevent kernel modules from depending on the Linux -dev output.
nuke-refs $(find $out -name "*.ko")
'' + optionalString buildUser ''
# Remove provided services as they are buggy
rm $out/etc/systemd/system/zfs-import-*.service
sed -i '/zfs-import-scan.service/d' $out/etc/systemd/system/*
for i in $out/etc/systemd/system/*; do
substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target"
done
# Fix pkgconfig.
ln -s ../share/pkgconfig $out/lib/pkgconfig
# Remove tests because they add a runtime dependency on gcc
rm -rf $out/share/zfs/zfs-tests
'';
meta = {
description = "ZFS Filesystem Linux Kernel module";
longDescription = ''
ZFS is a filesystem that combines a logical volume manager with a
Copy-On-Write filesystem with data integrity detection and repair,
snapshotting, cloning, block devices, deduplication, and more.
'';
homepage = http://zfsonlinux.org/;
license = licenses.cddl;
platforms = platforms.linux;
maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];
};
};
in
assert any (n: n == configFile) [ "kernel" "user" "all" ];
assert buildKernel -> kernel != null && spl != null;
{
# also check if kernel version constraints in
# ./nixos/modules/tasks/filesystems/zfs.nix needs
# to be adapted
zfsStable = common {
# comment/uncomment if breaking kernel versions are known
inkompatibleKernelVersion = "4.9";
version = "0.6.5.8";
# this package should point to the latest release.
sha256 = "0qccz1832p3i80qlrrrypypspb9sy9hmpgcfx9vmhnqmkf0yri4a";
extraPatches = [
(fetchpatch {
url = "https://github.com/Mic92/zfs/compare/zfs-0.6.5.8...nixos-zfs-0.6.5.8.patch";
sha256 = "14kqqphzg02m9a7qncdhff8958cfzdrvsid3vsrm9k75lqv1w08z";
})
];
inherit spl;
};
zfsUnstable = common {
# comment/uncomment if breaking kernel versions are known
inkompatibleKernelVersion = "4.10";
version = "0.7.0-rc2";
# this package should point to a version / git revision compatible with the latest kernel release
sha256 = "197y2jyav9h1ksri9kzqvrwmzpb58mlgw27vfvgd4bvxpwfxq53s";
extraPatches = [
(fetchpatch {
url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc2...nixos-zfs-0.7.0-rc2.patch";
sha256 = "1p33bwd6p5r5phbqb657x8h9x3bd012k2mdmbzgnb09drh9v0r82";
})
(fetchpatch {
name = "Kernel_4.9_zfs_aio_fsync_removal.patch";
url = "https://github.com/zfsonlinux/zfs/commit/99ca173929cb693012dabe98bcee4f12ec7e6e92.patch";
sha256 = "10npvpj52rpq88vdsn7zkdhx2lphzvqypsd9abdadjbqkwxld9la";
})
];
spl = splUnstable;
};
}

View file

@ -1,134 +0,0 @@
diff --git a/Makefile.am b/Makefile.am
index f8abb5f..82e8fb6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,10 +11,10 @@ endif
if CONFIG_KERNEL
SUBDIRS += module
-extradir = @prefix@/src/zfs-$(VERSION)
+extradir = @prefix@/libexec/zfs-$(VERSION)
extra_HEADERS = zfs.release.in zfs_config.h.in
-kerneldir = @prefix@/src/zfs-$(VERSION)/$(LINUX_VERSION)
+kerneldir = @prefix@/zfs-$(VERSION)/$(LINUX_VERSION)
nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS)
endif
diff --git a/include/Makefile.am b/include/Makefile.am
index a94cad5..a160fe2 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -29,6 +29,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif
if CONFIG_KERNEL
-kerneldir = @prefix@/src/zfs-$(VERSION)/include
+kerneldir = @prefix@/include
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
index 595d1db..d41375d 100644
--- a/include/linux/Makefile.am
+++ b/include/linux/Makefile.am
@@ -18,6 +18,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif
if CONFIG_KERNEL
-kerneldir = @prefix@/src/zfs-$(VERSION)/include/linux
+kerneldir = @prefix@/include/linux
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
index 77ecfb2..52b3612 100644
--- a/include/sys/Makefile.am
+++ b/include/sys/Makefile.am
@@ -114,6 +114,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif
if CONFIG_KERNEL
-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys
+kerneldir = @prefix@/include/sys
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff --git a/include/sys/fm/Makefile.am b/include/sys/fm/Makefile.am
index 8bca5d8..a5eafcd 100644
--- a/include/sys/fm/Makefile.am
+++ b/include/sys/fm/Makefile.am
@@ -16,6 +16,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif
if CONFIG_KERNEL
-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm
+kerneldir = @prefix@/include/sys/fm
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff --git a/include/sys/fm/fs/Makefile.am b/include/sys/fm/fs/Makefile.am
index fdc9eb5..807c47c 100644
--- a/include/sys/fm/fs/Makefile.am
+++ b/include/sys/fm/fs/Makefile.am
@@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif
if CONFIG_KERNEL
-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fm/fs
+kerneldir = @prefix@/include/sys/fm/fs
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff --git a/include/sys/fs/Makefile.am b/include/sys/fs/Makefile.am
index 0859b9f..b0c6eec 100644
--- a/include/sys/fs/Makefile.am
+++ b/include/sys/fs/Makefile.am
@@ -13,6 +13,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif
if CONFIG_KERNEL
-kerneldir = @prefix@/src/zfs-$(VERSION)/include/sys/fs
+kerneldir = @prefix@/include/sys/fs
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
diff --git a/module/Makefile.in b/module/Makefile.in
index d4ddee2..876c811 100644
--- a/module/Makefile.in
+++ b/module/Makefile.in
@@ -18,9 +18,9 @@ modules:
@# installed devel headers, or they may be in the module
@# subdirectory when building against the spl source tree.
@if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
- /bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
+ cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
- /bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
+ cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
else \
echo -e "\n" \
"*** Missing spl symbols ensure you have built the spl:\n" \
@@ -28,6 +28,8 @@ modules:
"*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \
exit 1; \
fi
+ @# when copying a file out of the nix store, we need to make it writable again.
+ chmod +w @SPL_SYMBOLS@
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@
clean:
@@ -42,15 +44,15 @@ clean:
modules_install:
@# Install the kernel modules
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
- INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \
+ INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \
INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \
KERNELRELEASE=@LINUX_VERSION@
@# Remove extraneous build products when packaging
- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
- if [ -n "$(DESTDIR)" ]; then \
+ kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
+ if [ -n "@prefix@" ]; then \
find $$kmoddir -name 'modules.*' | xargs $(RM); \
fi
- sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
+ sysmap=@prefix@/$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
if [ -f $$sysmap ]; then \
depmod -ae -F $$sysmap @LINUX_VERSION@; \
fi

View file

@ -28,6 +28,14 @@ let
};
};
in rec {
deu2eng = makeDictdDBFreedict (fetchurl {
url = http://prdownloads.sourceforge.net/freedict/deu-eng.tar.gz;
sha256 = "0dqrhv04g4f5s84nbgisgcfwk5x0rpincif0yfhfh4sc1bsvzsrb";
}) "deu-eng" "de_DE";
eng2deu = makeDictdDBFreedict (fetchurl {
url = http://prdownloads.sourceforge.net/freedict/eng-deu.tar.gz;
sha256 = "01x12p72sa3071iff3jhzga8588440f07zr56r3x98bspvdlz73r";
}) "eng-deu" "en_EN";
nld2eng = makeDictdDBFreedict (fetchurl {
url = http://prdownloads.sourceforge.net/freedict/nld-eng.tar.gz;
sha256 = "1vhw81pphb64fzsjvpzsnnyr34ka2fxizfwilnxyjcmpn9360h07";

View file

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "gotty-${version}";
version = "0.0.10";
version = "0.0.13";
rev = "v${version}";
goPackagePath = "github.com/yudai/gotty";
@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev;
owner = "yudai";
repo = "gotty";
sha256 = "0gvnbr61d5si06ik2j075jg00r9b94ryfgg06nqxkf10dp8lgi09";
sha256 = "1hsfjyjjzr1zc9m8bnhid1ag6ipcbx59111y9p7k8az8jiyr112g";
};
goDeps = ./deps.nix;

View file

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

View file

@ -29,14 +29,14 @@
let
opt = stdenv.lib.optional;
mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
major = "0.19";
minor = "19";
major = "0.20";
minor = "";
in stdenv.mkDerivation rec {
name = "mpd-${major}.${minor}";
name = "mpd-${major}${if minor == "" then "" else "." + minor}";
src = fetchurl {
url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz";
sha256 = "07af1m2lgblyiq0gcs26zv8n22wrhrpmf49xsm338h1n87d6r1dw";
sha256 = "068nxsfkp2ppcjh3fmcbapkiwnjpvkii73bfydpw4bf2yphdvsa8";
};
patches = stdenv.lib.optionals stdenv.isDarwin ./darwin-enable-cxx-exceptions.patch;

View file

@ -8,12 +8,24 @@ stdenv.mkDerivation {
sha256 = "1jkjvvnjcyxpql97xjjx0kwvy70kxpiznr2zpjy2hhci5s10zmpq";
};
# Patches from Gentoo / Fedora
# https://bugs.gentoo.org/257360
# https://bugzilla.redhat.com/show_bug.cgi?id=426068
# https://bugzilla.redhat.com/show_bug.cgi?id=243036
patches = [
./dvd+rw-tools-7.0-dvddl.patch
./dvd+rw-tools-7.0-glibc2.6.90.patch
./dvd+rw-tools-7.0-wctomb.patch
./dvd+rw-tools-7.0-wexit.patch
./dvd+rw-tools-7.1-layerbreaksetup.patch
];
buildInputs = [cdrkit m4];
preBuild = ''
makeFlags="prefix=$out"
'';
# Incompatibility with Linux 2.6.23 headers, see
# http://www.mail-archive.com/cdwrite@other.debian.org/msg11464.html
NIX_CFLAGS_COMPILE = "-DINT_MAX=__INT_MAX__";

View file

@ -0,0 +1,13 @@
--- ./growisofs_mmc.cpp.joe 2006-04-27 20:45:00.788446635 +0200
+++ ./growisofs_mmc.cpp 2006-04-27 20:46:01.666824300 +0200
@@ -1412,9 +1412,7 @@
blocks += 15, blocks &= ~15;
if (blocks <= split)
- fprintf (stderr,":-( more than 50%% of space will be *wasted*!\n"
- " use single layer media for this recording\n"),
- exit (FATAL_START(EMEDIUMTYPE));
+ fprintf (stderr,":-? more than 50%% of space will be *wasted*!\n");
blocks /= 16;
blocks += 1;

View file

@ -0,0 +1,11 @@
diff -up dvd+rw-tools-7.0/transport.hxx.glibc2.6.90 dvd+rw-tools-7.0/transport.hxx
--- dvd+rw-tools-7.0/transport.hxx.glibc2.6.90 2007-08-15 12:56:17.000000000 +0200
+++ dvd+rw-tools-7.0/transport.hxx 2007-08-15 12:56:42.000000000 +0200
@@ -11,6 +11,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
+#include <limits.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>

View file

@ -0,0 +1,11 @@
--- ./transport.hxx~ 2008-03-25 21:24:47.000000000 -0400
+++ ./transport.hxx 2008-03-25 21:25:36.000000000 -0400
@@ -116,7 +116,7 @@
extern "C" char *plusminus_locale()
{ static class __plusminus {
private:
- char str[4];
+ char str[MB_LEN_MAX];
public:
__plusminus() { setlocale(LC_CTYPE,ENV_LOCALE);
int l = wctomb(str,(wchar_t)(unsigned char)'±');

View file

@ -0,0 +1,11 @@
--- dvd+rw-tools-7.0/dvd+rw-format.cpp.wexit 2007-06-21 12:42:30.000000000 +0200
+++ dvd+rw-tools-7.0/dvd+rw-format.cpp 2007-06-21 12:44:13.000000000 +0200
@@ -245,7 +245,7 @@ int main (int argc, char *argv[])
alarm(1);
while ((waitpid(pid,&i,0) != pid) && !WIFEXITED(i)) ;
if (WEXITSTATUS(i) == 0) fprintf (stderr,"\n");
- exit (0);
+ exit (WEXITSTATUS(i));
}
#endif

View file

@ -0,0 +1,93 @@
diff -ur dvd+rw-tools-7.1-orig/growisofs.c dvd+rw-tools-7.1/growisofs.c
--- dvd+rw-tools-7.1-orig/growisofs.c 2008-03-04 10:15:03.000000000 +0100
+++ dvd+rw-tools-7.1/growisofs.c 2009-09-06 22:39:33.000000000 +0200
@@ -535,7 +535,7 @@
*/
int get_mmc_profile (void *fd);
int plusminus_r_C_parm (void *fd,char *C_parm);
-pwrite64_t poor_mans_setup (void *fd,off64_t leadout);
+pwrite64_t poor_mans_setup (void *fd,off64_t leadout,unsigned int lbreak);
char *plusminus_locale ();
int __1x ();
/*
@@ -2447,7 +2447,7 @@
goto out;
}
if (!progress.final) progress.final = tracksize;
- tracksize = layer_break*CD_BLOCK*2;
+ //tracksize = layer_break*CD_BLOCK*2;
}
}
else if (capacity > outoff)
@@ -2648,7 +2648,7 @@
* further details on poor_mans_setup
*/
pwrite64_method = poor_mans_setup (ioctl_handle,
- outoff+tracksize);
+ outoff+tracksize, (unsigned int)layer_break);
}
if (!progress.final)
diff -ur dvd+rw-tools-7.1-orig/growisofs_mmc.cpp dvd+rw-tools-7.1/growisofs_mmc.cpp
--- dvd+rw-tools-7.1-orig/growisofs_mmc.cpp 2008-03-04 18:47:49.000000000 +0100
+++ dvd+rw-tools-7.1/growisofs_mmc.cpp 2009-09-06 20:52:46.000000000 +0200
@@ -1612,7 +1612,7 @@
return 0;
}
-static void plus_r_dl_split (Scsi_Command &cmd,off64_t size)
+static void plus_r_dl_split (Scsi_Command &cmd,off64_t size,unsigned int lbreak)
{ int err;
unsigned int blocks,split;
unsigned char dvd_20[4+8];
@@ -1644,10 +1644,17 @@
" use single layer media for this recording\n"),
exit (FATAL_START(EMEDIUMTYPE));
- blocks /= 16;
- blocks += 1;
- blocks /= 2;
- blocks *= 16;
+ if (lbreak)
+ {
+ blocks=lbreak;
+ }
+ else
+ {
+ blocks /= 16;
+ blocks += 1;
+ blocks /= 2;
+ blocks *= 16;
+ }
fprintf (stderr,"%s: splitting layers at %u blocks\n",
ioctl_device,blocks);
@@ -2010,7 +2017,7 @@
typedef ssize_t (*pwrite64_t)(int,const void *,size_t,off64_t);
extern "C"
-pwrite64_t poor_mans_setup (void *fd,off64_t leadout)
+pwrite64_t poor_mans_setup (void *fd,off64_t leadout,unsigned int lbreak)
{ Scsi_Command cmd(ioctl_handle=fd);
int err,profile=mmc_profile&0xFFFF;
@@ -2059,7 +2066,7 @@
case 0x2B: // DVD+R Double Layer
plusminus_pages_setup(cmd,profile);
if (profile==0x2B && next_track==1 && dvd_compat && leadout)
- plus_r_dl_split (cmd,leadout);
+ plus_r_dl_split (cmd,leadout,lbreak);
atexit (plus_r_finalize);
if (next_wr_addr)
{ atsignals (no_r_finalize);
diff -ur dvd+rw-tools-7.1-orig/transport.hxx dvd+rw-tools-7.1/transport.hxx
--- dvd+rw-tools-7.1-orig/transport.hxx 2008-03-01 11:34:43.000000000 +0100
+++ dvd+rw-tools-7.1/transport.hxx 2009-09-06 20:53:53.000000000 +0200
@@ -9,6 +9,7 @@
#if defined(__unix) || defined(__unix__)
#include <stdio.h>
#include <stdlib.h>
+#include <limits.h>
#include <unistd.h>
#include <string.h>
#include <sys/types.h>

View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python2, ncurses, readline,
autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite
, liburcu, attr
, liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which
}:
let
s = # Generated upstream information
@ -15,7 +15,7 @@ let
buildInputs = [
fuse bison flex_2_5_35 openssl python2 ncurses readline
autoconf automake libtool pkgconfig zlib libaio libxml2
acl sqlite liburcu attr
acl sqlite liburcu attr makeWrapper
];
# Some of the headers reference acl
propagatedBuildInputs = [
@ -32,7 +32,7 @@ rec {
'';
configureFlags = [
''--with-mountutildir="$out/sbin" --localstatedir=/var''
''--localstatedir=/var''
];
makeFlags = "DESTDIR=$(out)";
@ -48,6 +48,7 @@ rec {
postInstall = ''
cp -r $out/$out/* $out
rm -r $out/nix
wrapProgram $out/sbin/mount.glusterfs --set PATH "${stdenv.lib.makeBinPath [ coreutils gnused attr gnugrep which]}"
'';
src = fetchurl {

View file

@ -14,6 +14,8 @@ buildGoPackage rec {
sha256 = "0r099mk9r6f52qqhx0ifb1xa8f2isqvyza80z9mcpi5zkd96174l";
};
outputs = [ "bin" "out" "man" ];
buildInputs = [ ncurses ];
goDeps = ./deps.nix;
@ -25,6 +27,8 @@ buildGoPackage rec {
postInstall = ''
cp $src/bin/fzf-tmux $bin/bin
mkdir -p $man/share/man
cp -r $src/man/man1 $man/share/man
mkdir -p $out/share/vim-plugins
ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name}
'';

View file

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, pythonPackages, httpie }:
pythonPackages.buildPythonApplication rec {
version = "0.2.0";
version = "0.8.0";
name = "http-prompt";
src = fetchFromGitHub {
rev = "v${version}";
repo = "http-prompt";
owner = "eliangcs";
sha256 = "0hgw3kx9rfdg394darms3vqcjm6xw6qrm8gnz54nahmyxnhrxnpp";
sha256 = "0zvkmdc6mhc5kk7cbrgzxsl8n2d02gnxy1sppm83mhwx6s1dkz30";
};
propagatedBuildInputs = with pythonPackages; [

View file

@ -0,0 +1,31 @@
{ stdenv, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonPackage rec {
baseName = "mitmproxy";
name = "${baseName}-${version}";
version = "1.0.2";
src = fetchFromGitHub {
owner = baseName;
repo = baseName;
rev = "v${version}";
sha256 = "19nqg7s1034fal8sb2rjssgcpvxh50yidyjhnbfmmi8v3fbvpbwl";
};
propagatedBuildInputs = with python3Packages; [
pyopenssl pyasn1 urwid pillow flask click pyperclip blinker
construct pyparsing html2text tornado brotlipy requests2
sortedcontainers passlib cssutils h2 ruamel_yaml jsbeautifier
watchdog editorconfig
];
# Tests fail due to an error with a decorator
doCheck = false;
meta = with stdenv.lib; {
description = "Man-in-the-middle proxy";
homepage = "http://mitmproxy.org/";
license = licenses.mit;
maintainers = with maintainers; [ fpletz ];
};
}

View file

@ -1,6 +1,7 @@
{ fetchurl, stdenv, sqlite, pkgconfig, autoreconfHook
, xapian, glib, gmime, texinfo , emacs, guile
, gtk3, webkitgtk24x, libsoup, icu }:
, gtk3, webkitgtk24x, libsoup, icu
, withMug ? stdenv.isLinux }:
stdenv.mkDerivation rec {
version = "0.9.18";
@ -13,8 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [
sqlite pkgconfig xapian glib gmime texinfo emacs guile libsoup icu
autoreconfHook
gtk3 webkitgtk24x ];
autoreconfHook ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x ];
preBuild = ''
# Fix mu4e-builddir (set it to $out)
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
'';
# Install mug and msg2pdf
postInstall = ''
postInstall = stdenv.lib.optionalString withMug ''
cp -v toys/msg2pdf/msg2pdf $out/bin/
cp -v toys/mug/mug $out/bin/
'';

View file

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "shfmt-${version}";
version = "0.2.0";
version = "1.1.0";
rev = "v${version}";
goPackagePath = "github.com/mvdan/sh";
@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "mvdan";
repo = "sh";
inherit rev;
sha256 = "07jf9v6583vvmk07fp7xdlnh7rvgl6f06ib2588g3xf1wk9vrq3d";
sha256 = "0h1qy27z6j1cgkk3hkvl7w3wjqc5flgn92r3j6frn8k2wzwj7zhz";
};
meta = with stdenv.lib; {

View file

@ -161,17 +161,7 @@ in
fetchMavenArtifact = callPackage ../build-support/fetchmavenartifact { };
packer = callPackage ../development/tools/packer {
# Go 1.7 changed the linker flag format
buildGoPackage = buildGo16Package;
gotools = self.gotools.override {
buildGoPackage = buildGo16Package;
go = self.go_1_6;
};
gox = self.gox.override {
buildGoPackage = buildGo16Package;
};
};
packer = callPackage ../development/tools/packer { };
fetchpatch = callPackage ../build-support/fetchpatch { };
@ -1557,7 +1547,10 @@ in
emscripten = callPackage ../development/compilers/emscripten { };
emscriptenfastcomp-unwrapped = callPackage ../development/compilers/emscripten-fastcomp { };
emscriptenfastcomp-wrapped = wrapCC emscriptenfastcomp-unwrapped;
emscriptenfastcomp-wrapped = wrapCCWith ccWrapperFun stdenv.cc.libc ''
# hardening flags break WASM support
cat > $out/nix-support/add-hardening.sh
'' emscriptenfastcomp-unwrapped;
emscriptenfastcomp = symlinkJoin {
name = "emscriptenfastcomp";
paths = [ emscriptenfastcomp-wrapped emscriptenfastcomp-unwrapped ];
@ -1875,6 +1868,8 @@ in
git-lfs = callPackage ../applications/version-management/git-lfs { };
git-up = callPackage ../applications/version-management/git-up { };
gitfs = callPackage ../tools/filesystems/gitfs { };
gitinspector = callPackage ../applications/version-management/gitinspector { };
@ -1951,6 +1946,8 @@ in
gocryptfs = callPackage ../tools/filesystems/gocrypfs { };
godot = callPackage ../development/tools/godot {};
go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { };
go-pup = callPackage ../development/tools/pup { };
@ -2821,6 +2818,8 @@ in
miredo = callPackage ../tools/networking/miredo { };
mitmproxy = callPackage ../tools/networking/mitmproxy { };
mjpegtoolsFull = callPackage ../tools/video/mjpegtools { };
mjpegtools = self.mjpegtoolsFull.override {
@ -11306,10 +11305,12 @@ in
seturgent = callPackage ../os-specific/linux/seturgent { };
spl = callPackage ../os-specific/linux/spl {
inherit (callPackage ../os-specific/linux/spl {
configFile = "kernel";
inherit kernel;
};
}) splStable splUnstable;
spl = splStable;
sysdig = callPackage ../os-specific/linux/sysdig {};
@ -11333,10 +11334,12 @@ in
x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { };
zfs = callPackage ../os-specific/linux/zfs {
inherit (callPackage ../os-specific/linux/zfs {
configFile = "kernel";
inherit kernel spl;
};
}) zfsStable zfsUnstable;
zfs = zfsStable;
});
# The current default kernel / kernel modules.
@ -11645,9 +11648,11 @@ in
statifier = callPackage ../os-specific/linux/statifier { };
spl = callPackage ../os-specific/linux/spl {
inherit (callPackage ../os-specific/linux/spl {
configFile = "user";
};
}) splStable splUnstable;
spl = splStable;
sysdig = callPackage ../os-specific/linux/sysdig {
kernel = null;
@ -11851,9 +11856,11 @@ in
zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { };
zfs = callPackage ../os-specific/linux/zfs {
inherit (callPackage ../os-specific/linux/zfs {
configFile = "user";
};
}) zfsStable zfsUnstable;
zfs = zfsStable;
### DATA
@ -14204,6 +14211,8 @@ in
neomutt = callPackage ../applications/networking/mailreaders/neomutt { };
natron = callPackage ../applications/video/natron { };
notion = callPackage ../applications/window-managers/notion { };
openshift = callPackage ../applications/networking/cluster/openshift { };
@ -14600,7 +14609,7 @@ in
qscreenshot = callPackage ../applications/graphics/qscreenshot {
qt = qt4;
};
qsyncthingtray = qt5.callPackage ../applications/misc/qsyncthingtray { };
qsynth = callPackage ../applications/audio/qsynth { };

View file

@ -1509,13 +1509,11 @@ in {
awscli = buildPythonPackage rec {
name = "awscli-${version}";
version = "1.11.30";
namePrefix = "";
src = pkgs.fetchurl {
version = "1.11.35";
namePrefix = "";
src = pkgs.fetchurl {
url = "mirror://pypi/a/awscli/${name}.tar.gz";
sha256 = "07km02wnjbaf745cs8j6zlwk9c2561l82zvr23a6d3qzs8wwxicf";
sha256 = "0k6y8cg311bqak5x9pilg80w6f76dcbzm6xcdrw6rjnk6v4xwy70";
};
# No tests included
@ -2865,11 +2863,11 @@ in {
blinker = buildPythonPackage rec {
name = "blinker-${version}";
version = "1.3";
version = "1.4";
src = pkgs.fetchurl {
url = "mirror://pypi/b/blinker/${name}.tar.gz";
sha256 = "6811010809262261e41ab7b92f3f6d23f35cf816fbec2bc05077992eebec6e2f";
sha256 = "1dpq0vb01p36jjwbhhd08ylvrnyvcc82yxx3mwjx6awrycjyw6j7";
};
meta = {
@ -3074,12 +3072,11 @@ in {
};
botocore = buildPythonPackage rec {
version = "1.4.87"; # This version is required by awscli
version = "1.4.92"; # This version is required by awscli
name = "botocore-${version}";
src = pkgs.fetchurl {
url = "mirror://pypi/b/botocore/${name}.tar.gz";
sha256 = "0fga1zjffsn2h50hbw7s4lcv6zwz5dcjgvjncl5y392mhivlrika";
sha256 = "08rpsfqd2g4iqvi1id8yhmyz2mc299dnr4aikkwjm24rih75p9aj";
};
propagatedBuildInputs =
@ -4125,15 +4122,22 @@ in {
construct = buildPythonPackage rec {
name = "construct-2.5.2";
name = "construct-${version}";
version = "2.8.10";
src = pkgs.fetchurl {
url = "mirror://pypi/c/construct/${name}.tar.gz";
sha256 = "084h02p0m8lhmlywlwjdg0kd0hd6sz481c96qwcm5wddxrqn4nv6";
src = pkgs.fetchFromGitHub {
owner = "construct";
repo = "construct";
rev = "v${version}";
sha256 = "1xfmmc5pihn3ql9f7blrciy06y2bwczqvkbcpvh96dmgqwc3wys3";
};
propagatedBuildInputs = with self; [ six ];
# Tests fail with the following error on Python 3.5+
# TypeError: not all arguments converted during string formatting
doCheck = pythonOlder "3.5";
meta = {
description = "Powerful declarative parser (and builder) for binary data";
homepage = http://construct.readthedocs.org/;
@ -4272,15 +4276,25 @@ in {
};
credstash = buildPythonPackage rec {
name = "credstash-${version}";
version = "1.11.0";
pname = "credstash";
version = "1.13.2";
name = "${pname}-${version}";
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/e2/64/6abae87b8da07c262d50b51eed540096ed1f6e01539bf2f2d4c3f718c8c6/credstash-1.11.0.tar.gz";
sha256 = "03qm8bjfskzkkmgcy5dr70x9pxabjb3fi0v0nxicg1kryy64k0dz";
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
sha256 = "b6283e565e3e441e8f74efcca54ece9697db16ce2e930fb5b6f7c0ab929c377e";
};
propagatedBuildInputs = with self; [ pycrypto boto3 docutils ];
propagatedBuildInputs = with self; [ cryptography boto3 pyyaml docutils ];
# No tests in archive
doCheck = false;
meta = {
description = "A utility for managing secrets in the cloud using AWS KMS and DynamoDB";
homepage = https://github.com/LuminalOSS/credstash;
license = licenses.asl20;
};
};
cython = buildPythonPackage rec {
@ -5406,11 +5420,11 @@ in {
};
cssutils = buildPythonPackage (rec {
name = "cssutils-0.9.9";
name = "cssutils-1.0.1";
src = pkgs.fetchurl {
url = mirror://pypi/c/cssutils/cssutils-0.9.9.zip;
sha256 = "139yfm9yz9k33kgqw4khsljs10rkhhxyywbq9i82bh2r31cil1pp";
url = mirror://pypi/c/cssutils/cssutils-1.0.1.tar.gz;
sha256 = "0qwha9x1wml2qmipbcz03gndnlwhzrjdvw9i09si247a90l8p8fq";
};
buildInputs = with self; [ self.mock ];
@ -7337,35 +7351,6 @@ in {
};
git-up = buildPythonPackage rec {
version = "1.4.2";
name = "git-up-${version}";
src = pkgs.fetchurl {
url = "mirror://pypi/g/git-up/${name}.zip";
sha256 = "121ia5gyjy7js6fbsx9z98j2qpq7rzwpsj8gnfvsbz2d69g0vl7q";
};
buildInputs = with self; [ pkgs.git nose ];
propagatedBuildInputs = with self; [ click colorama docopt GitPython six termcolor ];
# git fails to run as it cannot detect the email address, so we set it
# $HOME is by default not a valid dir, so we have to set that too
# https://github.com/NixOS/nixpkgs/issues/12591
preCheck = ''
export HOME=$TMPDIR
git config --global user.email "nobody@example.com"
git config --global user.name "Nobody"
'';
meta = {
homepage = http://github.com/msiemens/PyGitUp;
description = "A git pull replacement that rebases all local branches when pulling.";
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
};
};
GitPython = buildPythonPackage rec {
version = "2.0.8";
name = "GitPython-${version}";
@ -12683,12 +12668,13 @@ in {
xdis = buildPythonPackage rec {
name = "xdis-${version}";
version = "2.3.1";
version = "3.2.4";
src = pkgs.fetchurl {
url = "mirror://pypi/x/xdis/${name}.tar.gz";
sha256 = "1bi53n9fifjz2ja5inm546vzhjpgwx6n0qrhp106fss7bdm44a4v";
sha256 = "0g2lh70837vigcbc1i58349wp2xzrhlsg2ahc92sn8d3jwxja4dk";
};
propagatedBuildInputs = with self; [ nose ];
propagatedBuildInputs = with self; [ nose six ];
meta = {
description = "Python cross-version byte-code disassembler and marshal routines";
homepage = https://github.com/rocky/python-xdis/;
@ -14633,31 +14619,91 @@ in {
};
};
brotlipy = buildPythonPackage rec {
name = "brotlipy-${version}";
version = "0.6.0";
mitmproxy = buildPythonPackage rec {
baseName = "mitmproxy";
name = "${baseName}-${version}";
version = "0.17.1";
src = pkgs.fetchFromGitHub {
owner = "mitmproxy";
repo = "mitmproxy";
rev = "v${version}";
sha256 = "0a50mkvm3zf9cbs0pf6bwy00bhmy4d1l9as8c9m0bgrk6hq7h53p";
src = pkgs.fetchurl {
url = "mirror://pypi/b/brotlipy/${name}.tar.gz";
sha256 = "10s2y19zywfkf3sksrw81czhva759aki0clld2pnnlgf64sz7016";
};
propagatedBuildInputs = with self; [
pyopenssl pyasn1 urwid pillow lxml flask protobuf click
ConfigArgParse pyperclip blinker construct pyparsing html2text tornado
];
doCheck = false;
propagatedBuildInputs = with self; [ cffi enum34 construct ];
meta = {
description = ''Man-in-the-middle proxy'';
homepage = "http://mitmproxy.org/";
description = "Python bindings for the reference Brotli encoder/decoder";
homepage = "https://github.com/python-hyper/brotlipy/";
license = licenses.mit;
broken = true;
};
};
sortedcontainers = buildPythonPackage rec {
name = "sortedcontainers-${version}";
version = "1.5.7";
src = pkgs.fetchurl {
url = "mirror://pypi/s/sortedcontainers/${name}.tar.gz";
sha256 = "1sjh8lccbmvwna91mlhl5m3z4320p07h063b8x8br4p4cll49w0g";
};
# tries to run tests for all python versions and uses virtualenv weirdly
doCheck = false;
#buildInputs = with self; [ tox nose ];
meta = {
description = "Python Sorted Container Types: SortedList, SortedDict, and SortedSet";
homepage = "http://www.grantjenks.com/docs/sortedcontainers/";
license = licenses.asl20;
};
};
hyperframe = buildPythonPackage rec {
name = "hyperframe-${version}";
version = "4.0.1";
src = pkgs.fetchurl {
url = "mirror://pypi/h/hyperframe/${name}.tar.gz";
sha256 = "0hsfq0jigwa0i58z7vbnp62l7za49gmlg75vnygq2ijhkidkcmwa";
};
meta = {
description = "HTTP/2 framing layer for Python";
homepage = "http://hyper.rtfd.org/";
license = licenses.mit;
};
};
h2 = buildPythonPackage rec {
name = "h2-${version}";
version = "2.5.1";
src = pkgs.fetchurl {
url = "mirror://pypi/h/h2/${name}.tar.gz";
sha256 = "0xhzm5vcfhdq3mihynwh4ljwi0r06lvzk3ypr0gmmbcp1x43ffb7";
};
propagatedBuildInputs = with self; [ enum34 hpack hyperframe ];
meta = {
description = "HTTP/2 State-Machine based protocol implementation";
homepage = "http://hyper.rtfd.org/";
license = licenses.mit;
};
};
editorconfig = buildPythonPackage rec {
name = "EditorConfig-${version}";
version = "0.12.1";
src = pkgs.fetchurl {
url = "mirror://pypi/e/editorconfig/${name}.tar.gz";
sha256 = "1qxqy9wfrpb2ldrk5nzidkpymc55lpf9lg3m8c8a5531jmbwhlwb";
};
meta = {
description = "EditorConfig File Locator and Interpreter for Python";
homepage = "http://editorconfig.org/";
license = licenses.psfl;
};
};
@ -15034,16 +15080,16 @@ in {
};
mutagen = buildPythonPackage (rec {
name = "mutagen-1.34";
name = "mutagen-1.36";
src = pkgs.fetchurl {
url = "mirror://pypi/m/mutagen/${name}.tar.gz";
sha256 = "06anfzpjajwwh25n3afavwafrix3abahgwfr2zinrhqh2w98kw5s";
sha256 = "1kabb9b81hgvpd3wcznww549vss12b1xlvpnxg1r6n4c7gikgvnp";
};
# Needed for tests only
buildInputs = [ pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz
pkgs.glibcLocales
buildInputs = with self; [ pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz
pkgs.glibcLocales pytest
];
LC_ALL = "en_US.UTF-8";
@ -15540,20 +15586,13 @@ in {
hpack = buildPythonPackage rec {
name = "hpack-${version}";
version = "2.0.1";
version = "2.3.0";
src = pkgs.fetchurl {
url = "mirror://pypi/h/hpack/hpack-${version}.tar.gz";
sha256 = "1k4wa8c52bd6x109bn6hc945595w6aqgzj6ipy6c2q7vxkzalzhd";
sha256 = "1ad0fx4d7a52zf441qzhjc7vwy9v3qdrk1zyf06ikz8y2nl9mgai";
};
propagatedBuildInputs = with self; [
];
buildInputs = with self; [
];
meta = with stdenv.lib; {
description = "========================================";
homepage = "http://hyper.rtfd.org";
@ -17995,11 +18034,19 @@ in {
parsedatetime = buildPythonPackage rec {
name = "parsedatetime-${version}";
version = "1.5";
version = "2.1";
meta = {
description = "Parse human-readable date/time text";
homepage = "https://github.com/bear/parsedatetime";
license = licenses.asl20;
};
buildInputs = with self; [ PyICU nose ];
src = pkgs.fetchurl {
url = "mirror://pypi/p/parsedatetime/${name}.tar.gz";
sha256 = "1as0mm4ql3z0324nc9bys2s1ngh507i317p16b79rx86wlmvx9ix";
sha256 = "0bdgyw6y3v7bcxlx0p50s8drxsh5bb5cy2afccqr3j90amvpii8p";
};
};
@ -19988,10 +20035,14 @@ in {
buildInputs = [ pkgs.libev ];
libEvSharedLibrary =
if !stdenv.isDarwin
then "${pkgs.libev}/lib/libev.so.4"
else "${pkgs.libev}/lib/libev.4.dylib";
postPatch = ''
libev_so=${pkgs.libev}/lib/libev.so.4
test -f "$libev_so" || { echo "ERROR: File $libev_so does not exist, please fix nix expression for pyev"; exit 1; }
sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"$libev_so\"|" setup.py
test -f "${libEvSharedLibrary}" || { echo "ERROR: File ${libEvSharedLibrary} does not exist, please fix nix expression for pyev"; exit 1; }
sed -i -e "s|libev_dll_name = find_library(\"ev\")|libev_dll_name = \"${libEvSharedLibrary}\"|" setup.py
'';
meta = {
@ -21501,12 +21552,12 @@ in {
};
pyperclip = buildPythonPackage rec {
version = "1.5.11";
version = "1.5.27";
name = "pyperclip-${version}";
src = pkgs.fetchurl {
url = "mirror://pypi/p/pyperclip/${name}.zip";
sha256 = "07q8krmi7phizzp192x3j7xbk1gzhc1kc3jp4mxrm32dn84sp1vh";
sha256 = "1i9zxm7qc49n9yxfb41c0jbmmp2hpzx98kaizjl7qmgiv3snvjx3";
};
doCheck = false;
@ -22914,16 +22965,38 @@ in {
};
};
typing = buildPythonPackage rec {
name = "typing-${version}";
version = "3.5.3.0";
src = pkgs.fetchurl {
url = "mirror://pypi/t/typing/${name}.tar.gz";
sha256 = "08gz3grrh3vph5ib1w5x1ssnpzvj077x030lx63fxs4kwg3slbfa";
};
meta = {
description = "Backport of typing module to Python versions older than 3.5";
homepage = "https://docs.python.org/3.5/library/typing.html";
license = licenses.psfl;
};
};
ruamel_yaml = buildPythonPackage rec {
name = "ruamel.yaml-${version}";
version = "0.10.13";
version = "0.13.7";
# needs ruamel_ordereddict for python2 support
disabled = !isPy3k;
src = pkgs.fetchurl {
url = "mirror://pypi/r/ruamel.yaml/${name}.tar.gz";
sha256 = "0r9mn5lm9dcxpy0wpn18cp7i5hkvjvknv3dxg8d9ca6km39m4asn";
sha256 = "1vca2552k0kmhr9msg1bbfdvp3p9im17x1a6npaw221vlgg15z7h";
};
propagatedBuildInputs = with self; [ ruamel_base ruamel_ordereddict ];
# Tests cannot load the module to test
doCheck = false;
propagatedBuildInputs = with self; [ ruamel_base typing ];
meta = {
description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
@ -26188,14 +26261,14 @@ in {
urwid = buildPythonPackage (rec {
name = "urwid-1.3.0";
name = "urwid-1.3.1";
# multiple: NameError: name 'evl' is not defined
doCheck = false;
src = pkgs.fetchurl {
url = "mirror://pypi/u/urwid/${name}.tar.gz";
sha256 = "29f04fad3bf0a79c5491f7ebec2d50fa086e9d16359896c9204c6a92bc07aba2";
sha256 = "18cnd1wdjcas08x5qwa5ayw6jsfcn33w4d9f7q3s29fy6qzc1kng";
};
meta = {
@ -27538,11 +27611,11 @@ EOF
zope_testing = buildPythonPackage rec {
name = "zope.testing-${version}";
version = "4.5.0";
version = "4.6.1";
src = pkgs.fetchurl {
url = "mirror://pypi/z/zope.testing/${name}.tar.gz";
sha256 = "1yvglxhzvhl45mndvn9gskx2ph30zz1bz7rrlyfs62fv2pvih90s";
sha256 = "1vvxhjmzl7vw2i1akfj1xbggwn36270ym7f2ic9xwbaswfw1ap56";
};
doCheck = !isPyPy;
@ -30057,6 +30130,24 @@ EOF
};
};
mailcap-fix = buildPythonPackage rec {
name = "mailcap-fix-${version}";
version = "1.0.1";
disabled = isPy36; # this fix is merged into python 3.6
src = pkgs.fetchurl {
url = "mirror://pypi/m/mailcap-fix/${name}.tar.gz";
sha256 = "02lijkq6v379r8zkqg9q2srin3i80m4wvwik3hcbih0s14v0ng0i";
};
meta = with stdenv.lib; {
description = "A patched mailcap module that conforms to RFC 1524";
homepage = "https://github.com/michael-lazar/mailcap_fix";
license = licenses.unlicense;
};
};
maildir-deduplicate = buildPythonPackage rec {
name = "maildir-deduplicate-${version}";
version = "1.0.2";