Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk 2018-11-22 10:10:40 +01:00
commit 2219e2578e
125 changed files with 2865 additions and 906 deletions

View File

@ -41,6 +41,18 @@ rec {
# think of it as an infix operator `g extends f` that mimics the syntax from
# Java. It may seem counter-intuitive to have the "base class" as the second
# argument, but it's nice this way if several uses of `extends` are cascaded.
#
# To get a better understanding how `extends` turns a function with a fix
# point (the package set we start with) into a new function with a different fix
# point (the desired packages set) lets just see, how `extends g f`
# unfolds with `g` and `f` defined above:
#
# extends g f = self: let super = f self; in super // g self super;
# = self: let super = { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; }; in super // g self super
# = self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; } // g self { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; }
# = self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; } // { foo = "foo" + " + "; }
# = self: { foo = "foo + "; bar = "bar"; foobar = self.foo + self.bar; }
#
extends = f: rattrs: self: let super = rattrs self; in super // f self super;
# Compose two extending functions of the type expected by 'extends'

View File

@ -82,6 +82,9 @@ rec {
aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; version = "8"; };
aarch64_be = { bits = 64; significantByte = bigEndian; family = "arm"; version = "8"; };
i386 = { bits = 32; significantByte = littleEndian; family = "x86"; };
i486 = { bits = 32; significantByte = littleEndian; family = "x86"; };
i586 = { bits = 32; significantByte = littleEndian; family = "x86"; };
i686 = { bits = 32; significantByte = littleEndian; family = "x86"; };
x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; };

View File

@ -3841,6 +3841,11 @@
github = "sauyon";
name = "Sauyon Lee";
};
sboosali = {
email = "SamBoosalis@gmail.com";
github = "sboosali";
name = "Sam Boosalis";
};
schmitthenner = {
email = "development@schmitthenner.eu";
github = "fkz";

View File

@ -247,6 +247,10 @@ in
# a collision with an apparently unrelated environment
# variable with the same name exported by dhcpcd.
interface_order='lo lo[0-9]*'
'' + optionalString config.services.nscd.enable ''
# Invalidate the nscd cache whenever resolv.conf is
# regenerated.
libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service 2> /dev/null'
'' + optionalString (length resolvconfOptions > 0) ''
# Options as described in resolv.conf(5)
resolv_conf_options='${concatStringsSep " " resolvconfOptions}'

View File

@ -103,6 +103,7 @@
./programs/less.nix
./programs/light.nix
./programs/mosh.nix
./programs/mininet.nix
./programs/mtr.nix
./programs/nano.nix
./programs/npm.nix

View File

@ -0,0 +1,39 @@
# Global configuration for mininet
# kernel must have NETNS/VETH/SCHED
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.programs.mininet;
generatedPath = with pkgs; makeSearchPath "bin" [
iperf ethtool iproute socat
];
pyEnv = pkgs.python.withPackages(ps: [ ps.mininet-python ]);
mnexecWrapped = pkgs.runCommand "mnexec-wrapper"
{ buildInputs = [ pkgs.makeWrapper pkgs.pythonPackages.wrapPython ]; }
''
makeWrapper ${pkgs.mininet}/bin/mnexec \
$out/bin/mnexec \
--prefix PATH : "${generatedPath}"
ln -s ${pyEnv}/bin/mn $out/bin/mn
# mn errors out without a telnet binary
# pkgs.telnet brings an undesired ifconfig into PATH see #43105
ln -s ${pkgs.telnet}/bin/telnet $out/bin/telnet
'';
in
{
options.programs.mininet.enable = mkEnableOption "Mininet";
config = mkIf cfg.enable {
virtualisation.vswitch.enable = true;
environment.systemPackages = [ mnexecWrapped ];
};
}

View File

@ -29,7 +29,7 @@ with lib;
config = mkIf config.services.gnome3.seahorse.enable {
environment.systemPackages = [ pkgs.gnome3.seahorse ];
environment.systemPackages = [ pkgs.gnome3.seahorse pkgs.gnome3.dconf ];
services.dbus.packages = [ pkgs.gnome3.seahorse ];

View File

@ -99,19 +99,23 @@ in {
message = "Cannot specify both config and configText";
}
];
systemd.tmpfiles.rules = [
"d /var/cache/netdata 0755 ${cfg.user} ${cfg.group} -"
"Z /var/cache/netdata - ${cfg.user} ${cfg.group} -"
"d /var/log/netdata 0755 ${cfg.user} ${cfg.group} -"
"Z /var/log/netdata - ${cfg.user} ${cfg.group} -"
"d /var/lib/netdata 0755 ${cfg.user} ${cfg.group} -"
"Z /var/lib/netdata - ${cfg.user} ${cfg.group} -"
"d /etc/netdata 0755 ${cfg.user} ${cfg.group} -"
"Z /etc/netdata - ${cfg.user} ${cfg.group} -"
];
systemd.services.netdata = {
description = "Real time performance monitoring";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
path = (with pkgs; [ gawk curl ]) ++ lib.optional cfg.python.enable
(pkgs.python3.withPackages cfg.python.extraPackages);
preStart = concatStringsSep "\n" (map (dir: ''
mkdir -vp ${dir}
chmod 750 ${dir}
chown -R ${cfg.user}:${cfg.group} ${dir}
'') [ "/var/cache/netdata"
"/var/log/netdata"
"/var/lib/netdata" ]);
serviceConfig = {
User = cfg.user;
Group = cfg.group;

View File

@ -1,9 +1,9 @@
let
version = "2.1.3";
sha256 = "0il18r229r32jzwsjksp8cc63rp6cf6c0j5dvbfzrnv1zndw0cg3";
cargoSha256 = "08dyb0lgf66zfq9xmfkhcn6rj070d49dm0rjl3v39sfag6sryz20";
version = "2.2.1";
sha256 = "1m65pks2jk83j82f1i901p03qb54xhcp6gfjngcm975187zzvmcq";
cargoSha256 = "1mf1jgphwvhlqkvzrgbhnqfyqgf3ljc1l9zckyilzmw5k4lf4g1w";
patches = [
./patches/vendored-sources-2.1.patch
./patches/vendored-sources-2.2.patch
];
in
import ./parity.nix { inherit version sha256 cargoSha256 patches; }

View File

@ -1,7 +1,7 @@
let
version = "2.0.8";
sha256 = "1bz6dvx8wxhs3g447s62d9091sard2x7w2zd6iy7hf76wg0p73hr";
cargoSha256 = "0wj93md87fr7a9ag73h0rd9xxqscl0lhbj3g3kvnqrqz9xxajing";
patches = [ ./patches/vendored-sources-2.0.patch ];
version = "2.1.6";
sha256 = "0njkypszi0fjh9y0zfgxbycs4c1wpylk7wx6xn1pp6gqvvri6hav";
cargoSha256 = "116sj7pi50k5gb1i618g4pgckqaf8kb13jh2a3shj2kwywzzcgjs";
patches = [ ./patches/vendored-sources-2.1.patch ];
in
import ./parity.nix { inherit version sha256 cargoSha256 patches; }

View File

@ -14,7 +14,7 @@ index 72652ad2f..3c0eca89a 100644
+
+[source."https://github.com/nikvolf/parity-tokio-ipc"]
+git = "https://github.com/nikvolf/parity-tokio-ipc"
+rev = "7c9bbe3bc45d8e72a92b0951acc877da228abd50"
+rev = "c0f80b40399d7f08ef1e6869569640eb28645f56"
+replace-with = "vendored-sources"
+
+[source."https://github.com/nikvolf/tokio-named-pipes"]

View File

@ -44,7 +44,7 @@ index 72652ad2f..3c0eca89a 100644
+
+[source."https://github.com/paritytech/jsonrpc.git"]
+git = "https://github.com/paritytech/jsonrpc.git"
+branch = "parity-1.11"
+branch = "parity-2.2"
+replace-with = "vendored-sources"
+
+[source."https://github.com/paritytech/libusb-rs"]

View File

@ -0,0 +1,31 @@
{ stdenv, fetchurl, cmake, pkgconfig
, alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio
, libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack
}:
stdenv.mkDerivation rec {
name = "traverso-${version}";
version = "0.49.5";
src = fetchurl {
url = "http://traverso-daw.org/traverso-0.49.5.tar.gz";
sha256 = "169dsqrf807ciavrd82d3iil0xy0r3i1js08xshcrn80ws9hv63m";
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ alsaLib fftw flac.dev libjack2 lame
libmad libpulseaudio libsamplerate.dev libsndfile.dev libvorbis
portaudio qtbase wavpack ];
cmakeFlags = [ "-DWANT_PORTAUDIO=1" "-DWANT_PULSEAUDIO=1" "-DWANT_MP3_ENCODE=1" "-DWANT_LV2=0" ];
enableParallelBuilding = true;
hardeningDisable = [ "format" ];
meta = with stdenv.lib; {
description = "Cross-platform multitrack audio recording and audio editing suite";
homepage = http://traverso-daw.org/;
license = with licenses; [ gpl2Plus lgpl21Plus ];
platforms = platforms.all;
maintainers = with maintainers; [ coconnor ];
};
}

View File

@ -0,0 +1,91 @@
diff --git a/app/app.pro b/app/app.pro
index 4d47065..a39a320 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -18,6 +18,8 @@
TARGET = mindforger
TEMPLATE = app
+include(../config.pri)
+
QT += widgets
mfner {
@@ -297,7 +299,7 @@ RESOURCES += \
# See http://doc.qt.io/qt-5/qmake-advanced-usage.html
binfile.files += mindforger
-binfile.path = /usr/bin/
+binfile.path = $$PREFIX/bin/
INSTALLS += binfile
# ########################################
diff --git a/config.pri b/config.pri
new file mode 100644
index 0000000..ce05df1
--- /dev/null
+++ b/config.pri
@@ -0,0 +1,3 @@
+isEmpty(PREFIX) {
+ PREFIX = /usr
+}
diff --git a/deps/discount/discount.pro b/deps/discount/discount.pro
index a8dfe35..ec16468 100644
--- a/deps/discount/discount.pro
+++ b/deps/discount/discount.pro
@@ -5,6 +5,8 @@
# Webpage: http://www.pell.portland.or.us/~orc/Code/discount/
#
+include(../../config.pri)
+
QT -= core gui
TARGET = discount
@@ -46,7 +48,7 @@ unix:!symbian {
maemo5 {
target.path = /opt/usr/lib
} else {
- target.path = /usr/lib
+ target.path = $$PREFIX/lib
}
INSTALLS += target
}
diff --git a/mindforger.pro b/mindforger.pro
index ae627f2..0953856 100644
--- a/mindforger.pro
+++ b/mindforger.pro
@@ -32,6 +32,8 @@ TEMPLATE = subdirs
SUBDIRS = deps lib app
+include(config.pri)
+
# build dependencies
lib.depends = deps
app.depends = lib
@@ -44,20 +46,20 @@ app.depends = lib
#IMPORTANT: binfile MUST be specified in app/app.pro (project next to/that builds binary)
docfiles.files += doc/*
-docfiles.path = /usr/share/doc/mindforger/
+docfiles.path = $$PREFIX/share/doc/mindforger/
INSTALLS += docfiles
manfiles.files += man/*
-manfiles.path = /usr/share/man/man1/
+manfiles.path = $$PREFIX/share/man/man1/
INSTALLS += manfiles
iconfiles.files += app/resources/icons/*
-iconfiles.path = /usr/share/icons/mindforger/
+iconfiles.path = $$PREFIX/share/icons/mindforger/
INSTALLS += iconfiles
# experiment w/ file
shortcutfiles.files += app/resources/gnome-shell/mindforger.desktop
-shortcutfiles.path = /usr/share/applications/
+shortcutfiles.path = $$PREFIX/share/applications/
INSTALLS += shortcutfiles
# eof

View File

@ -0,0 +1,45 @@
{ stdenv, fetchurl, qmake, qtbase, qtwebkit }:
stdenv.mkDerivation rec {
name = "mindforger-${version}";
version = "1.48.2";
src = fetchurl {
url = "https://github.com/dvorka/mindforger/releases/download/1.48.0/mindforger_${version}.tgz";
sha256 = "1wlrl8hpjcpnq098l3n2d1gbhbjylaj4z366zvssqvmafr72iyw4";
};
nativeBuildInputs = [ qmake ] ;
buildInputs = [ qtbase qtwebkit ] ;
doCheck = true;
enableParallelBuilding = true ;
patches = [ ./build.patch ] ;
postPatch = ''
substituteInPlace deps/discount/version.c.in --subst-var-by TABSTOP 4
substituteInPlace app/resources/gnome-shell/mindforger.desktop --replace /usr "$out"
'';
preConfigure = ''
export AC_PATH="$PATH"
pushd deps/discount
./configure.sh
popd
'';
qmakeFlags = [ "-r mindforger.pro" "CONFIG+=mfnoccache" ] ;
meta = with stdenv.lib; {
description = "Thinking Notebook & Markdown IDE";
longDescription = ''
MindForger is actually more than an editor or IDE - it's human
mind inspired personal knowledge management tool
'';
homepage = https://www.mindforger.com;
license = licenses.gpl2Plus;
platforms = platforms.all;
};
}

View File

@ -1,41 +0,0 @@
{stdenv, fetchgit, cmake, ninja, boost, libpng, glfw3, epoxy, guile, pkgconfig
, libGLU_combined, libX11, libpthreadstubs, libXau, libXdmcp, libXrandr, libXext
, libXinerama, libXxf86vm, libXcursor, libXfixes
}:
stdenv.mkDerivation rec {
version = "0.0pre20160820";
name = "ao-${version}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
cmake ninja boost libpng glfw3 epoxy guile libGLU_combined libX11
libpthreadstubs libXau libXdmcp libXrandr libXext libXinerama libXxf86vm
libXcursor libXfixes
];
src = fetchgit {
url = https://github.com/mkeeter/ao;
rev = "69fadb81543cc9031e4a7ec2036c7f2ab505a620";
sha256 = "1717k72vr0i5j7bvxmd6q16fpvkljnqfa1hr3i4yq8cjdsj69my7";
};
cmakeFlags = "-G Ninja";
installPhase = ''
ninja install
cd ..
cp lib/lib* bind/lib* "$out/lib"
cp -r bin "$out/bin"
mkdir "$out/doc"
cp -r doc "$out/doc/ao"
cp -r examples "$out/doc/ao/examples"
cp -r bind "$out/bind"
'';
meta = {
inherit version;
description = ''Homoiconic CAD package'';
license = stdenv.lib.licenses.gpl2Plus ; # Some parts can be extracted and used under LGPL2+
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
broken = true; # 2018-04-10
};
}

View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
${xmlstarlet}/bin/xmlstarlet ed --inplace -P -d '//get[@src="http://download.processing.org/reference.zip"]' build/build.xml
install -D -m0444 ${fetchurl {
url = http://download.processing.org/reference.zip;
sha256 = "0dli1bdgw8hsx7g7b048ap81v2za9maa6pfcwdqm3qkfypr8q7pr";
sha256 = "0ai0cr62gc7n6y22ki3qibyj1qnlaxv1miqxmmahfk3hpbyfqz9n";
}
} ./java/reference.zip

View File

@ -0,0 +1,19 @@
{ stdenv, ghcWithPackages, makeWrapper, packages ? (pkgSet: []) }:
let
termonadEnv = ghcWithPackages (self: [ self.termonad ] ++ packages self);
in stdenv.mkDerivation {
name = "termonad-with-packages-${termonadEnv.version}";
nativeBuildInputs = [ makeWrapper ];
buildCommand = ''
mkdir -p $out/bin $out/share
makeWrapper ${termonadEnv}/bin/termonad $out/bin/termonad \
--set NIX_GHC "${termonadEnv}/bin/ghc"
'';
# trivial derivation
preferLocalBuild = true;
allowSubstitutes = false;
}

View File

@ -0,0 +1,28 @@
{ buildGoPackage
, fetchFromGitHub
, lib
}:
buildGoPackage rec {
name = "wtf-${version}";
version = "0.4.0";
goPackagePath = "github.com/senorprogrammer/wtf";
src = fetchFromGitHub {
owner = "senorprogrammer";
repo = "wtf";
rev = "${version}";
sha256 = "1vgjqmw27baiq9brmnafic3w3hw11p5qc6ahbdxi5n5n4bx7j6vn";
};
buildFlagsArray = [ "-ldflags=" "-X main.version=${version}" ];
meta = with lib; {
description = "The personal information dashboard for your terminal";
homepage = http://wtfutil.com/;
license = licenses.mpl20;
maintainers = with maintainers; [ kalbasit ];
platforms = platforms.linux ++ platforms.darwin;
};
}

View File

@ -12,6 +12,7 @@
gdk_pixbuf,
glib,
gnome2,
gnome3,
gtk3,
libuuid,
libX11,
@ -31,7 +32,8 @@
udev,
xorg,
zlib,
xdg_utils
xdg_utils,
wrapGAppsHook
}:
let rpath = lib.makeLibraryPath [
@ -83,14 +85,16 @@ in stdenv.mkDerivation rec {
dontBuild = true;
dontPatchELF = true;
nativeBuildInputs = [ dpkg ];
nativeBuildInputs = [ dpkg wrapGAppsHook ];
buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme ];
unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";
installPhase = ''
mkdir -p $out
mkdir -p $out $out/bin
cp -R usr/* $out
cp -R usr/share $out
cp -R opt/ $out/opt
export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "kubetail-${version}";
version = "1.6.4";
version = "1.6.5";
src = fetchFromGitHub {
owner = "johanhaleby";
repo = "kubetail";
rev = "${version}";
sha256 = "13y3g27z2v4jx1cvphcwl0a5xshm6vcqcxasid5sbg6cpwc2xc66";
sha256 = "0q8had1bi1769wd6h1c43gq0cvr5qj1fvyglizlyq1gm8qi2dx7n";
};
installPhase = ''

View File

@ -0,0 +1,58 @@
{ jre, stdenv, fetchurl, makeWrapper, makeDesktopItem }:
let
desktopItem = makeDesktopItem rec {
name = "netlogo";
exec = name;
icon = name;
comment = "A multi-agent programmable modeling environment";
desktopName = "NetLogo";
categories = "Science;";
};
in
stdenv.mkDerivation rec {
name = "netlogo-${version}";
version = "6.0.4";
src = fetchurl {
url = "https://ccl.northwestern.edu/netlogo/${version}/NetLogo-${version}-64.tgz";
sha256 = "0dcd9df4dfb218826a74f9df42163fa588908a1dfe58864106936f8dfb76acec";
};
src1 = fetchurl {
name = "netlogo.png";
url = "https://netlogoweb.org/assets/images/desktopicon.png";
sha256 = "1i43lhr31lzva8d2r0dxpcgr58x496gb5vmb0h2da137ayvifar8";
};
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -pv $out/share/netlogo $out/share/icons/hicolor/256x256/apps $out/share/applications $out/share/doc
cp -rv app $out/share/netlogo
cp -v readme.md $out/share/doc/
# launcher with `cd` is required b/c otherwise the model library isn't usable
makeWrapper "${jre}/bin/java" "$out/bin/netlogo" \
--run "cd $out/share/netlogo/app" \
--add-flags "-jar netlogo-${version}.jar"
cp $src1 $out/share/icons/hicolor/256x256/apps/netlogo.png
cp ${desktopItem}/share/applications/* $out/share/applications
'';
meta = with stdenv.lib; {
description = "A multi-agent programmable modeling environment";
longDescription = ''
NetLogo is a multi-agent programmable modeling environment. It is used by
many tens of thousands of students, teachers and researchers worldwide.
'';
homepage = https://ccl.northwestern.edu/netlogo/index.shtml;
license = licenses.gpl2;
maintainers = [ maintainers.dpaetzel ];
platforms = platforms.linux;
};
}

View File

@ -4,17 +4,13 @@ with rustPlatform;
buildRustPackage rec {
name = "pijul-${version}";
version = "0.10.0";
version = "0.11.0";
src = fetchurl {
url = "https://pijul.org/releases/${name}.tar.gz";
sha256 = "1lkipcp83rfsj9yqddvb46dmqdf2ch9njwvjv8f3g91rmfjcngys";
sha256 = "e60793ab124e9054c1d5509698acbae507ebb2fab5364d964067bc9ae8b6b5e5";
};
cargoPatches = [
./libpijul.patch
];
nativeBuildInputs = [ pkgconfig ];
postInstall = ''
@ -29,7 +25,7 @@ buildRustPackage rec {
doCheck = false;
cargoSha256 = "1419mlxa4p53hm5qzfd1yi2k0n1bcv8kaslls1nyx661vknhfamw";
cargoSha256 = "1r76azmka1d76ff0ddfhzr24b0ry496qrp13945i3vs0fgzk2sdz";
meta = with stdenv.lib; {
description = "A distributed version control system";

View File

@ -1,61 +0,0 @@
--- 2/pijul-0.10.0/Cargo.lock 1970-01-01 01:00:00.000000000 +0100
+++ pijul-0.10.0/Cargo.lock 2018-10-28 10:09:48.557639255 +0000
@@ -552,7 +552,7 @@
[[package]]
name = "libpijul"
-version = "0.10.0"
+version = "0.10.1"
dependencies = [
"base64 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -577,9 +577,29 @@
[[package]]
name = "libpijul"
-version = "0.10.0"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-replace = "libpijul 0.10.0"
+dependencies = [
+ "base64 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bs58 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "chrono 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "flate2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ignore 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sanakirja 0.8.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thrussh-keys 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
[[package]]
name = "line"
@@ -917,7 +937,7 @@
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"ignore 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"isatty 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "libpijul 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libpijul 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
"line 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"pager 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1796,7 +1816,7 @@
"checksum lazycell 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a6f08839bc70ef4a3fe1d566d5350f519c5912ea86be0df1740a7d247c7fc0ef"
"checksum libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "6fd41f331ac7c5b8ac259b8bf82c75c0fb2e469bbf37d2becbba9a6a2221965b"
"checksum libflate 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "1a429b86418868c7ea91ee50e9170683f47fd9d94f5375438ec86ec3adb74e8e"
-"checksum libpijul 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "80fd579ba6762eac3f12c9624d5496edaba5a2f2e8785bcf8310372328e06ebe"
+"checksum libpijul 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cf6fc1aa0e9402f8283bdeb2507cfb6798d2f2f973da34c3f4b0c96a456b74cd"
"checksum line 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ecdd22a3856203276b7854e16213139428e82922530438f36356e5b361ea4a42"
"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
"checksum log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "89f010e843f2b1a31dbd316b3b8d443758bc634bed37aabade59c686d644e0a2"

View File

@ -177,7 +177,7 @@ stdenv.mkDerivation {
/**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64"
else if targetPlatform.isAarch32 then endianPrefix + "arm"
else if targetPlatform.isx86_64 then "x86-64"
else if targetPlatform.isi686 then "i386"
else if targetPlatform.isx86 then "i386"
else if targetPlatform.isMips then {
"mips" = "btsmipn32"; # n32 variant
"mipsel" = "ltsmipn32"; # n32 variant

View File

@ -1,9 +1,5 @@
{ stdenv, cacert, git, rust, cargo-vendor, python3 }:
let
fetchcargo = import ./fetchcargo.nix {
inherit stdenv cacert git rust cargo-vendor python3;
};
in
{ stdenv, cacert, git, cargo, rustc, cargo-vendor, fetchcargo, python3 }:
{ name, cargoSha256 ? "unset"
, src ? null
, srcs ? null
@ -45,7 +41,7 @@ in stdenv.mkDerivation (args // {
patchRegistryDeps = ./patch-registry-deps;
buildInputs = [ cacert git rust.cargo rust.rustc ] ++ buildInputs;
buildInputs = [ cacert git cargo rustc ] ++ buildInputs;
patches = cargoPatches ++ patches;

View File

@ -1,4 +1,4 @@
{ stdenv, cacert, git, rust, cargo-vendor, python3 }:
{ stdenv, cacert, git, cargo, cargo-vendor, python3 }:
let cargo-vendor-normalise = stdenv.mkDerivation {
name = "cargo-vendor-normalise";
src = ./cargo-vendor-normalise.py;
@ -20,7 +20,7 @@ in
{ name ? "cargo-deps", src, srcs, patches, sourceRoot, sha256, cargoUpdateHook ? "" }:
stdenv.mkDerivation {
name = "${name}-vendor";
nativeBuildInputs = [ cacert cargo-vendor git cargo-vendor-normalise rust.cargo ];
nativeBuildInputs = [ cacert cargo-vendor git cargo-vendor-normalise cargo ];
inherit src srcs patches sourceRoot;
phases = "unpackPhase patchPhase installPhase";

View File

@ -0,0 +1,18 @@
{ callPackage }:
{ rustc, cargo, ... }: {
rust = {
inherit rustc cargo;
};
buildRustPackage = callPackage ./default.nix {
inherit rustc cargo;
fetchcargo = callPackage ./fetchcargo.nix {
inherit cargo;
};
};
rustcSrc = callPackage ../../development/compilers/rust/rust-src.nix {
inherit rustc;
};
}

View File

@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/1fba236a8a8f685aaf55029d20ab24d7e4cbc5ba.tar.gz";
sha256 = "0yy6ass2c0vn81pcvb0ksc1qh3hlw2q97937vp73jawghgwsy9qv";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3487551670de487866a34bd466b33b5146087882.tar.gz";
sha256 = "10kag8qmlsnj3qwq0zxb6apd2z7jg17srvhsax5lgbwvlymbnckb";
}

View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl, autoconf, ... }:
{ stdenv, fetchurl, autoconf, git, ... }:
stdenv.mkDerivation rec {
name = "gambit-bootstrap-${version}";
version = "4.8.9";
tarball_version = "v4_8_9";
version = "4.9.1";
tarball_version = "v4_9_1";
src = fetchurl {
url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-${tarball_version}-devel.tgz";
sha256 = "b7f86c794711792ca556ce41f8bc7043dffc395c01bb6d8d119bc2f454f89fbf";
url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-${tarball_version}-devel.tgz";
sha256 = "10kzv568gimp9nzh5xw0h01vw50wi68z3awfp9ibqrpq2l0n7mw7";
};
buildInputs = [ autoconf ];
buildInputs = [ autoconf git ];
configurePhase = ''
./configure --prefix=$out

View File

@ -1,8 +1,8 @@
{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, SRC }:
{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, src }:
stdenv.mkDerivation rec {
name = "gambit-${version}";
src = SRC;
inherit src;
bootstrap = import ./bootstrap.nix ( pkgs );

View File

@ -1,11 +1,10 @@
{ stdenv, callPackage, fetchurl }:
callPackage ./build.nix {
version = "4.9.0";
SRC = fetchurl {
url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_0-devel.tgz";
sha256 = "0wyfpjs244zrbrdil9rfkdgcawvms84z0r77qwhwadghma4dqgjf";
version = "4.9.1";
src = fetchurl {
url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_1-devel.tgz";
sha256 = "10kzv568gimp9nzh5xw0h01vw50wi68z3awfp9ibqrpq2l0n7mw7";
};
inherit stdenv;
}

View File

@ -1,12 +1,13 @@
{ stdenv, callPackage, fetchgit }:
{ stdenv, callPackage, fetchFromGitHub }:
callPackage ./build.nix {
version = "unstable-2018-09-03";
# git-version = "4.9.0";
SRC = fetchgit {
url = "https://github.com/feeley/gambit.git";
rev = "7cdc7e7b9194b2c088c0667efaf7686a4ffd0d8a";
sha256 = "06mmi8jkinihfirz4gjfw2lhxhskiqf3d47sihzx10r60asyqcxg";
version = "unstable-2018-11-19";
# git-version = "4.9.1-8-g61c6cb50";
src = fetchFromGitHub {
owner = "feeley";
repo = "gambit";
rev = "61c6cb500f4756be1e52095d5ab4501752525a70";
sha256 = "1knpb40y1g09c6yqd2fsxm3bk56bl5xrrwfsd7nqa497x6ngm5pn";
};
inherit stdenv;
}

View File

@ -1,20 +1,20 @@
{ stdenv, makeStaticLibraries,
coreutils, rsync, bash,
openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql,
version, git-version, GAMBIT, SRC }:
version, git-version, gambit, src }:
# TODO: distinct packages for gerbil-release and gerbil-devel
# TODO: make static compilation work
stdenv.mkDerivation rec {
name = "gerbil-${version}";
src = SRC;
inherit src;
# Use makeStaticLibraries to enable creation of statically linked binaries
buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb postgresql ];
buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries;
buildInputs = [ GAMBIT coreutils rsync bash ]
buildInputs = [ gambit rsync bash ]
++ buildInputs_libraries ++ buildInputs_staticLibraries;
NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];
@ -66,9 +66,9 @@ EOF
export GERBIL_HOME=$out
case "\$1" in -:*) GSIOPTIONS=\$1 ; shift ;; esac
if [[ \$# = 0 ]] ; then
exec ${GAMBIT}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - ;
exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - ;
else
exec ${GAMBIT}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@"
exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@"
fi
EOF
runHook postInstall

View File

@ -1,12 +1,14 @@
{ stdenv, callPackage, fetchurl, gambit }:
{ stdenv, callPackage, fetchFromGitHub, gambit }:
callPackage ./build.nix {
version = "0.13";
git-version = "0.13";
GAMBIT = gambit;
SRC = fetchurl {
url = "https://github.com/vyzo/gerbil/archive/v0.13.tar.gz";
sha256 = "1qs0vdq2lgxlpw20s8jzw2adx1xk9wb3w2m4a8vp6bb8hagmfr5l";
callPackage ./build.nix rec {
version = "0.14";
git-version = "0.14";
inherit gambit;
src = fetchFromGitHub {
owner = "vyzo";
repo = "gerbil";
rev = "v${version}";
sha256 = "0n078lkf8m391kr99ipb1v2dpi5vkikz9nj0p7kfjg43868my3v7";
};
inherit stdenv;
}

View File

@ -1,13 +1,14 @@
{ stdenv, callPackage, fetchgit, gambit-unstable }:
{ stdenv, callPackage, fetchFromGitHub, gambit-unstable }:
callPackage ./build.nix {
version = "unstable-2018-09-06";
git-version = "0.14-DEV";
GAMBIT = gambit-unstable;
SRC = fetchgit {
url = "https://github.com/vyzo/gerbil.git";
rev = "184cb635c82517d5d75d7966dcdf1d25ad863dac";
sha256 = "1ljzbpc36i9zpzfwra5hpfbgzj1dyzzp50h5jf976n8qr9x4l7an";
version = "unstable-2018-11-19";
git-version = "0.15-DEV-2-g7d09a4ce";
gambit = gambit-unstable;
src = fetchFromGitHub {
owner = "vyzo";
repo = "gerbil";
rev = "7d09a4cebe03d755a1791e77279e156a74e07685";
sha256 = "1mqi9xcjk59sqbh1fx65a4fa4mqm35py4xqxq6086bcyhkm1nzwa";
};
inherit stdenv;
}

View File

@ -24,30 +24,30 @@ let
in
stdenv.mkDerivation rec {
version = "8.2.1";
version = "8.2.2";
name = "ghc-${version}-binary";
src = fetchurl ({
"i686-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz";
sha256 = "d86f9c157dd4161a8acb14062c131c8985a4f65fc856603c373502be1d50c95e";
sha256 = "08w2ik55dp3n95qikmrflc91lsiq01xp53ki3jlhnbj8fqnxfrwy";
};
"x86_64-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz";
sha256 = "543b81bf610240bd0398111d6c6607a9094dc2d159b564057d46c8a3d1aaa130";
sha256 = "0ahv26304pqi3dm7i78si4pxwvg5f5dc2jwsfgvcrhcx5g30bqj8";
};
"armv7l-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb8-linux.tar.xz";
sha256 = "0f0e5e1d4fad3fa1a87ca1fe0d19242f4a94d158b7b8a08f99efefd98b51b019";
sha256 = "1jmv8qmnh5bn324fivbwdcaj55kvw7cb2zq9pafmlmv3qwwx7s46";
};
"aarch64-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-deb8-linux.tar.xz";
sha256 = "61dab9c95ef9f9af8bce7338863fda3e42945eb46194b12d922b6d0dc245d0c2";
sha256 = "1k2amylcp1ad67c75h1pqf7czf9m0zj1i7hdc45ghjklnfq9hrk7";
};
"x86_64-darwin" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
sha256 = "900c802025fb630060dbd30f9738e5d107a4ca5a50d5c1262cd3e69fe4467188";
sha256 = "09swx71gh5habzbx55shz2xykgr96xkcy09nzinnm4z0yxicy3zr";
};
}.${stdenv.hostPlatform.system}
or (throw "cannot bootstrap GHC on this platform"));

View File

@ -174,7 +174,7 @@ stdenv.mkDerivation rec {
disallowedReferences = [ go_bootstrap ];
meta = with stdenv.lib; {
branch = "1.9";
branch = "1.10";
homepage = http://golang.org/;
description = "The Go Programming language";
license = licenses.bsd3;

View File

@ -184,7 +184,7 @@ stdenv.mkDerivation rec {
disallowedReferences = [ go_bootstrap ];
meta = with stdenv.lib; {
branch = "1.9";
branch = "1.11";
homepage = http://golang.org/;
description = "The Go Programming language";
license = licenses.bsd3;

View File

@ -5,18 +5,18 @@
let
name = "${pname}-${version}";
pname = "guile-sdl2";
version = "0.2.0";
version = "0.3.1";
in stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "https://files.dthompson.us/${pname}/${name}.tar.gz";
sha256 = "0yq9lsl17cdvj77padvpk3jcw2g6g0pck9jrchc7n2767rrc012b";
sha256 = "0bw7x2lx90k4banc5k7yfkn3as93y25gr1xdr225ll7lmij21k64";
};
nativeBuildInputs = [ libtool pkgconfig ];
buildInputs = [
guile libtool pkgconfig
SDL2 SDL2_image SDL2_ttf SDL2_mixer
guile SDL2 SDL2_image SDL2_ttf SDL2_mixer
];
configureFlags = [

View File

@ -694,11 +694,6 @@ self: super: {
# We cannot build this package w/o the C library from <http://www.phash.org/>.
phash = markBroken super.phash;
# https://github.com/deech/fltkhs/issues/16
# linking fails because the build doesn't pull in the libGLU_combined libraries
fltkhs = markBroken super.fltkhs;
fltkhs-fluid-examples = dontDistribute super.fltkhs-fluid-examples;
# We get lots of strange compiler errors during the test suite run.
jsaddle = dontCheck super.jsaddle;

View File

@ -63,7 +63,7 @@ self: super: {
hspec-core = self.hspec-core_2_6_0;
hspec-discover = self.hspec-discover_2_6_0;
hspec-megaparsec = doJailbreak super.hspec-megaparsec; # newer versions need megaparsec 7.x
hspec-meta = self.hspec-meta_2_5_6;
hspec-meta = self.hspec-meta_2_6_0;
JuicyPixels = self.JuicyPixels_3_3_2;
lens = self.lens_4_17;
megaparsec = dontCheck (doJailbreak super.megaparsec);

File diff suppressed because it is too large Load Diff

View File

@ -1,21 +0,0 @@
{stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "arb";
version = "2.9.0pre20161013";
src = fetchFromGitHub {
owner = "fredrik-johansson";
repo = "${pname}";
rev = "10bc615ce5999caf4723444b2b1219b74781d8a4";
sha256 = "1xb40x3hv9nh76aizhskj5gdhalgn7r95a7zji2nn4ih3lmh40hl";
};
buildInputs = [ mpir gmp mpfr flint ];
configureFlags = [ "--with-gmp=${gmp}" "--with-mpir=${mpir}" "--with-mpfr=${mpfr}" "--with-flint=${flint}" ];
meta = {
inherit version;
description = ''A library for arbitrary-precision interval arithmetic'';
license = stdenv.lib.licenses.lgpl21Plus;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
};
}

View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "1.6.0";
version = "1.6.1";
pname = "enchant";
src = fetchurl {
url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz";
sha256 = "0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g";
url = "https://github.com/AbiWord/${pname}/releases/download/${pname}-1-6-1/${name}.tar.gz";
sha256 = "1xg3m7mniyqyff8qv46jbfwgchb6di6qxdjnd5sfir7jzv0dkw5y";
};
nativeBuildInputs = [ pkgconfig ];
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Generic spell checking library";
homepage = http://www.abisource.com/enchant;
homepage = https://abiword.github.io/enchant;
platforms = platforms.unix;
license = licenses.lgpl21;
};

View File

@ -0,0 +1,52 @@
{ stdenv, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi
, freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng
, libtiff, freetype, cf-private, Cocoa, AGL, GLUT
}:
let
version = "1.4.x-r13121";
in stdenv.mkDerivation {
name = "fltk-${version}";
src = fetchurl {
url = "http://fltk.org/pub/fltk/snapshots/fltk-${version}.tar.gz";
sha256 = "1v8wxvxcbk99i82x2v5fpqg5vj8n7g8a38g30ry7nzcjn5sf3r63";
};
preConfigure = "make clean";
patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
libGLU_combined
libjpeg
zlib
libpng
libXft
];
configureFlags = [
"--enable-gl"
"--enable-largefile"
"--enable-shared"
"--enable-threads"
"--enable-xft"
];
propagatedBuildInputs = [ inputproto ]
++ (if stdenv.isDarwin
then [ Cocoa AGL GLUT freetype libtiff cf-private /* Needed for NSDefaultRunLoopMode */ ]
else [ xlibsWrapper libXi freeglut ]);
enableParallelBuilding = true;
meta = {
description = "A C++ cross-platform lightweight GUI library";
homepage = http://www.fltk.org;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
license = stdenv.lib.licenses.gpl2;
};
}

View File

@ -5,14 +5,14 @@
stdenv.mkDerivation (rec {
name = "libgit2-${version}";
version = "0.26.6";
version = "0.26.8";
# keep the version in sync with pythonPackages.pygit2 and gnome3.libgit2-glib
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
sha256 = "17pjvprmdrx4h6bb1hhc98w9qi6ki7yl57f090n9kbhswxqfs7s3";
sha256 = "0wmjgvz8nrpk2dsn5bcc87nl0j5hb6pah2hzrj0b6jkk9mnin9fl";
};
cmakeFlags = [ "-DTHREADSAFE=ON" ];

View File

@ -1,182 +0,0 @@
{ stdenv, fetchgit, perl, yasm
, vp8DecoderSupport ? true # VP8 decoder
, vp8EncoderSupport ? true # VP8 encoder
, vp9DecoderSupport ? true # VP9 decoder
, vp9EncoderSupport ? true # VP9 encoder
, extraWarningsSupport ? false # emit non-fatal warnings
, werrorSupport ? false # treat warnings as errors (not available with all compilers)
, debugSupport ? false # debug mode
, gprofSupport ? false # gprof profiling instrumentation
, gcovSupport ? false # gcov coverage instrumentation
, sizeLimitSupport ? true # limit max size to allow in the decoder
, optimizationsSupport ? true # compiler optimization flags
, runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime
, thumbSupport ? false # build arm assembly in thumb mode
, examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples)
, fastUnalignedSupport ? true # use unaligned accesses if supported by hardware
, debugLibsSupport ? false # include debug version of each library
, postprocSupport ? true # postprocessing
, multithreadSupport ? true # multithreaded decoding & encoding
, internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders)
, memTrackerSupport ? false # track memory usage
, spatialResamplingSupport ? true # spatial sampling (scaling)
, realtimeOnlySupport ? false # build for real-time encoding
, ontheflyBitpackingSupport ? false # on-the-fly bitpacking in real-time encoding
, errorConcealmentSupport ? false # decoder conceals losses
, smallSupport ? false # favor smaller binary over speed
, postprocVisualizerSupport ? false # macro block/block level visualizers
, unitTestsSupport ? false, curl ? null, coreutils ? null # unit tests
, webmIOSupport ? true # input from and output to webm container
, libyuvSupport ? true # libyuv
, decodePerfTestsSupport ? false # build decoder perf tests with unit tests
, encodePerfTestsSupport ? false # build encoder perf tests with unit tests
, multiResEncodingSupport ? false # multiple-resolution encoding
, temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising
, coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range
, vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9
# Experimental features
, experimentalSpatialSvcSupport ? false # Spatial scalable video coding
, experimentalFpMbStatsSupport ? false
, experimentalEmulateHardwareSupport ? false
}:
let
inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin;
inherit (stdenv.lib) enableFeature optional optionals;
in
assert isi686 || isx86_64 || isAarch32 || isMips; # Requires ARM with floating point support
assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport;
assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport;
/* If spatialResamplingSupport not enabled, build will fail with undeclared variable errors.
Variables called in vpx_scale/generic/vpx_scale.c are declared by vpx_scale/vpx_scale_rtcd.pl,
but is only executed if spatialResamplingSupport is enabled */
assert spatialResamplingSupport;
assert postprocVisualizerSupport -> postprocSupport;
assert unitTestsSupport -> curl != null && coreutils != null;
assert vp9HighbitdepthSupport -> (vp9DecoderSupport || vp9EncoderSupport);
assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport;
stdenv.mkDerivation rec {
name = "libvpx-git-${version}";
version = "2015-2-12";
src = fetchgit {
url = "https://chromium.googlesource.com/webm/libvpx";
/* DO NOT under any circumstance ever just bump the git commit without
confirming changes have not been made to the configure system */
rev = "f4c29ae9ea16c502c980a81ca9683327d5051929";
sha256 = "1w17vpcy44wlpr2icbwhcf3mrinybwy0bhif30p707hbxfxrj474";
};
patchPhase = ''patchShebangs .'';
outputs = [ "bin" "dev" "out" ];
setOutputFlags = false;
configurePlatforms = [];
configureFlags = [
(enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8")
(enableFeature vp8EncoderSupport "vp8-encoder")
(enableFeature vp8DecoderSupport "vp8-decoder")
(enableFeature (vp9EncoderSupport || vp9DecoderSupport) "vp9")
(enableFeature vp9EncoderSupport "vp9-encoder")
(enableFeature vp9DecoderSupport "vp9-decoder")
(enableFeature extraWarningsSupport "extra-warnings")
(enableFeature werrorSupport "werror")
"--disable-install-docs"
(enableFeature examplesSupport "install-bins")
"--enable-install-libs"
"--disable-install-srcs"
(enableFeature debugSupport "debug")
(enableFeature gprofSupport "gprof")
(enableFeature gcovSupport "gcov")
# Required to build shared libraries
(enableFeature (!isCygwin) "pic")
(enableFeature (isi686 || isx86_64) "use-x86inc")
(enableFeature optimizationsSupport "optimizations")
(enableFeature runtimeCpuDetectSupport "runtime-cpu-detect")
(enableFeature thumbSupport "thumb")
"--enable-libs"
(enableFeature examplesSupport "examples")
"--disable-docs"
"--as=yasm"
# Limit default decoder max to WHXGA
(if sizeLimitSupport then "--size-limit=5120x3200" else null)
(enableFeature fastUnalignedSupport "fast-unaligned")
"--disable-codec-srcs"
(enableFeature debugLibsSupport "debug-libs")
(enableFeature isMips "dequant-tokens")
(enableFeature isMips "dc-recon")
(enableFeature postprocSupport "postproc")
(enableFeature (postprocSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-postproc")
(enableFeature multithreadSupport "multithread")
(enableFeature internalStatsSupport "internal-stats")
(enableFeature memTrackerSupport "mem-tracker")
(enableFeature spatialResamplingSupport "spatial-resampling")
(enableFeature realtimeOnlySupport "realtime-only")
(enableFeature ontheflyBitpackingSupport "onthefly-bitpacking")
(enableFeature errorConcealmentSupport "error-concealment")
# Shared libraries are only supported on ELF platforms
(if isDarwin || isCygwin then
"--enable-static --disable-shared"
else
"--disable-static --enable-shared")
(enableFeature smallSupport "small")
(enableFeature postprocVisualizerSupport "postproc-visualizer")
(enableFeature unitTestsSupport "unit-tests")
(enableFeature webmIOSupport "webm-io")
(enableFeature libyuvSupport "libyuv")
(enableFeature decodePerfTestsSupport "decode-perf-tests")
(enableFeature encodePerfTestsSupport "encode-perf-tests")
(enableFeature multiResEncodingSupport "multi-res-encoding")
(enableFeature temporalDenoisingSupport "temporal-denoising")
(enableFeature (temporalDenoisingSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-temporal-denoising")
(enableFeature coefficientRangeCheckingSupport "coefficient-range-checking")
(enableFeature (vp9HighbitdepthSupport && is64bit) "vp9-highbitdepth")
(enableFeature (experimentalSpatialSvcSupport ||
experimentalFpMbStatsSupport ||
experimentalEmulateHardwareSupport) "experimental")
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
#"--extra-cflags="
#"--prefix="
#"--libc="
#"--libdir="
"--enable-external-build"
# libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version)
# See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure
# Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14
"--force-target=${stdenv.hostPlatform.config}${
if stdenv.hostPlatform.isDarwin then
if stdenv.hostPlatform.osxMinVersion == "10.10" then "14"
else if stdenv.hostPlatform.osxMinVersion == "10.9" then "13"
else if stdenv.hostPlatform.osxMinVersion == "10.8" then "12"
else if stdenv.hostPlatform.osxMinVersion == "10.7" then "11"
else if stdenv.hostPlatform.osxMinVersion == "10.6" then "10"
else if stdenv.hostPlatform.osxMinVersion == "10.5" then "9"
else "8"
else ""}-gcc"
(if stdenv.hostPlatform.isCygwin then "--enable-static-msvcrt" else "")
] # Experimental features
++ optional experimentalSpatialSvcSupport "--enable-spatial-svc"
++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats"
++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware";
nativeBuildInputs = [ perl yasm ];
buildInputs = [ ]
++ optionals unitTestsSupport [ coreutils curl ];
enableParallelBuilding = true;
postInstall = ''moveToOutput bin "$bin" '';
meta = with stdenv.lib; {
description = "WebM VP8/VP9 codec SDK";
homepage = https://www.webmproject.org/;
license = licenses.bsd3;
maintainers = with maintainers; [ codyopel ];
platforms = platforms.all;
};
}

View File

@ -2,21 +2,15 @@
stdenv.mkDerivation rec {
name = "fastjet-${version}";
version = "3.3.1";
version = "3.3.2";
src = fetchurl {
url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz";
sha256 = "0lvchyh9q2p8lb10isazw0wbwzs24yg7gxyhpj9xpvz5hydyvgvn";
sha256 = "1hk3k7dyik640dzg21filpywc2dl862nl2hbpg384hf5pw9syn9z";
};
buildInputs = [ python2 ];
postPatch = ''
substituteInPlace plugins/SISCone/SISConeBasePlugin.cc \
--replace 'structure_of<UserScaleBase::StructureType>()' \
'structure_of<UserScaleBase>()'
'';
configureFlags = [
"--enable-allcxxplugins"
"--enable-pyext"

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "herwig-${version}";
version = "7.1.3";
version = "7.1.4";
src = fetchurl {
url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2";
sha256 = "1iq1h5ap86729c4pfkswzfh0l2v20fyvqsb15c35g0407l54wfqm";
sha256 = "1awr1jz0q873x8bgwiilzklhk1zkgm6slvpychpnvsf9vk05mmdx";
};
nativeBuildInputs = [ autoconf automake libtool ];
@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
homepage = https://herwig.hepforge.org/;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ veprbl ];
broken = stdenv.isAarch64; # doesn't compile: ignoring return value of 'FILE* freopen...
};
}

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "thepeg-${version}";
version = "2.1.3";
version = "2.1.4";
src = fetchurl {
url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2";
sha256 = "030wpk78mwb56iph5iqmblsxgzpydsa25bbkv07bihihfm8gds0n";
sha256 = "1x9dfxmsbmzmsxrv3cczfyrnqkxjcpy89v6v7ycysrx9k8qkf320";
};
buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ];

View File

@ -27,7 +27,7 @@ qtModule {
++ optional (stdenv.isDarwin && lib.versionAtLeast qtbase.version "5.9.0") qtmultimedia
++ optional (lib.versionAtLeast qtbase.version "5.11.0") qtwebchannel;
buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]
++ optionals (stdenv.isDarwin) (with darwin.apple_sdk.frameworks; [ OpenGL ])
++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ cf-private OpenGL ])
++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ hyphen ];
nativeBuildInputs = [
bison2 flex gdb gperf perl pkgconfig python2 ruby

View File

@ -0,0 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, enum34
, grpc_google_iam_v1
, google_api_core
, pytest
}:
buildPythonPackage rec {
pname = "google-cloud-asset";
version = "0.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "cec2f44a670371e24e6140c454fdac3ed06be0a021042c6756a3284b505335c7";
};
checkInputs = [ pytest ];
propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Cloud Asset API API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,31 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, enum34
, google_api_core
, pytest
}:
buildPythonPackage rec {
pname = "google-cloud-automl";
version = "0.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "793d463f78d22a822196cb3e34b247fbdba07eeae15ceadb911f5ccecd843f87";
};
checkInputs = [ pytest ];
propagatedBuildInputs = [ enum34 google_api_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Cloud AutoML API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,36 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, google_resumable_media
, google_api_core
, google_cloud_core
, pandas
, pyarrow
, pytest
, mock
, ipython
}:
buildPythonPackage rec {
pname = "google-cloud-bigquery";
version = "1.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "d559ba1e05cf6a960e09bb5aab3aeb4d50ad9e08c77a20a17c01c9b2bd8d6cb7";
};
checkInputs = [ pytest mock ipython ];
propagatedBuildInputs = [ google_resumable_media google_api_core google_cloud_core pandas pyarrow ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Google BigQuery API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,30 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, google_api_core
, pytest
}:
buildPythonPackage rec {
pname = "google-cloud-bigquery-datatransfer";
version = "0.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "f5b5d0de43805fa9ebb620c58e1d27e6d32d2fc8e9a2f954ee170f7a026c8757";
};
checkInputs = [ pytest ];
propagatedBuildInputs = [ google_api_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "BigQuery Data Transfer API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,33 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, grpc_google_iam_v1
, google_api_core
, google_cloud_core
, pytest
, mock
}:
buildPythonPackage rec {
pname = "google-cloud-bigtable";
version = "0.31.0";
src = fetchPypi {
inherit pname version;
sha256 = "b6c8572697b5fdc7fcb95d88f87b8c84cea5a7aef2d57d3de0d6a9e2b0e8424f";
};
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ grpc_google_iam_v1 google_api_core google_cloud_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Google Cloud Bigtable API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,30 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, google_api_core
, pytest
}:
buildPythonPackage rec {
pname = "google-cloud-container";
version = "0.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "a89afcb1fe96bc9361c231c223c3bbe19fa3787caeb4697cd5778990e1077270";
};
checkInputs = [ pytest ];
propagatedBuildInputs = [ google_api_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Google Container Engine API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,30 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, google_api_core
, pytest
}:
buildPythonPackage rec {
pname = "google-cloud-dataproc";
version = "0.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "531dbd3e5862df5e67751efdcd89f00d0ded35f3a87a18fd3245e1c365080720";
};
checkInputs = [ pytest ];
propagatedBuildInputs = [ google_api_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Google Cloud Dataproc API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, google_api_core
, google_cloud_core
, pytest
, mock
}:
buildPythonPackage rec {
pname = "google-cloud-datastore";
version = "1.7.1";
src = fetchPypi {
inherit pname version;
sha256 = "03c1a06b0d94ac2f801513c9255bd5fc8773d036f0e59d63ffe1152cfe4320de";
};
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ google_api_core google_cloud_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Google Cloud Datastore API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,31 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, enum34
, google_api_core
, pytest
}:
buildPythonPackage rec {
pname = "google-cloud-dlp";
version = "0.9.0";
src = fetchPypi {
inherit pname version;
sha256 = "408e5c6820dc53dd589a7bc378d25c2cf5817c448b7c7b1268bc745ecbe04ec3";
};
checkInputs = [ pytest ];
propagatedBuildInputs = [ enum34 google_api_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Cloud Data Loss Prevention (DLP) API API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, google_api_core
, google_cloud_core
, pytest
, mock
}:
buildPythonPackage rec {
pname = "google-cloud-dns";
version = "0.29.0";
src = fetchPypi {
inherit pname version;
sha256 = "f6ea35676c59b6bfd4a2e6aa42670c6ed3505ba46f7117cdc953094e568f404e";
};
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ google_api_core google_cloud_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Google Cloud DNS API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,31 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, google_cloud_logging
, pytest
, mock
}:
buildPythonPackage rec {
pname = "google-cloud-error-reporting";
version = "0.30.0";
src = fetchPypi {
inherit pname version;
sha256 = "768a5c3ed7a96b60f051717c1138e561493ab0ef4dd4acbcf9e2b1cc2d09e06a";
};
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ google_cloud_logging ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Stackdriver Error Reporting API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,35 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, google_api_core
, google_cloud_core
, pytest
}:
buildPythonPackage rec {
pname = "google-cloud-firestore";
version = "0.30.0";
src = fetchPypi {
inherit pname version;
sha256 = "7f990572ace890867bbbc63c9d700c1d2635ba4c799e05f30b6fdca490021243";
};
checkInputs = [ pytest ];
propagatedBuildInputs = [ google_api_core google_cloud_core ];
# tests were not included with release
# See issue https://github.com/googleapis/google-cloud-python/issues/6380
doCheck = false;
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Google Cloud Firestore API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, enum34
, grpc_google_iam_v1
, google_api_core
, pytest
}:
buildPythonPackage rec {
pname = "google-cloud-iot";
version = "0.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "1502fa6d64f8f0f7c0e34e71c82c5daacc8fd8f78256cfadef5ae06c5efcc3b4";
};
checkInputs = [ pytest ];
propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Cloud IoT API API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
# maintainers = [ maintainers. ];
};
}

View File

@ -0,0 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, enum34
, grpc_google_iam_v1
, google_api_core
, pytest
}:
buildPythonPackage rec {
pname = "google-cloud-kms";
version = "0.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "add648f9185a8724f8632b3a006ee0af4847a5ab4ca085954ff1d00a8cd2d54c";
};
checkInputs = [ pytest ];
propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Cloud Key Management Service (KMS) API API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,31 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, enum34
, google_api_core
, pytest
}:
buildPythonPackage rec {
pname = "google-cloud-language";
version = "1.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "2450e3265df129241cb21badb9d4ce2089d2652581df38e03c14a7ec85679ecb";
};
checkInputs = [ pytest ];
propagatedBuildInputs = [ enum34 google_api_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Google Cloud Natural Language API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,35 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, google_api_core
, google_cloud_core
, pytest
, mock
, webapp2
, django
, flask
}:
buildPythonPackage rec {
pname = "google-cloud-logging";
version = "1.8.0";
src = fetchPypi {
inherit pname version;
sha256 = "418ae534a8044ea5fd385fc4958763d76b8f315785d7a61f264c5a04035d02d5";
};
checkInputs = [ pytest mock webapp2 django flask ];
propagatedBuildInputs = [ google_api_core google_cloud_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Stackdriver Logging API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, google_api_core
, pandas
, pytest
, mock
}:
buildPythonPackage rec {
pname = "google-cloud-monitoring";
version = "0.30.1";
src = fetchPypi {
inherit pname version;
sha256 = "6b26d659360306d51b9fb88c5b1eb77bf49967a37b6348ae9568c083e466274d";
};
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ google_api_core pandas ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Stackdriver Monitoring API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,33 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, enum34
, grpc_google_iam_v1
, google_api_core
, pytest
, mock
}:
buildPythonPackage rec {
pname = "google-cloud-pubsub";
version = "0.38.0";
src = fetchPypi {
inherit pname version;
sha256 = "0b0481fa61faf8143c3cffc9d3fbe757423a200fbddddcf27feb2c49e3c35e58";
};
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Google Cloud Pub/Sub API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,37 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, enum34
, google_api_core
, pytest
}:
buildPythonPackage rec {
pname = "google-cloud-redis";
version = "0.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "c0fa00cafbce3e9a0e35fb7f9d754ac70b450b6496c62c20bb3a1f500aeca9e4";
};
checkInputs = [ pytest ];
propagatedBuildInputs = [ enum34 google_api_core ];
# requires old version of google-api-core (override)
preBuild = ''
sed -i "s/'google-api-core\[grpc\] >= 0.1.0, < 0.2.0dev'/'google-api-core'/g" setup.py
sed -i "s/google-api-core\[grpc\]<0.2.0dev,>=0.1.0/google-api-core/g" google_cloud_redis.egg-info/requires.txt
'';
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Google Cloud Memorystore for Redis API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, google_cloud_core
, google_api_core
, pytest
, mock
}:
buildPythonPackage rec {
pname = "google-cloud-resource-manager";
version = "0.28.1";
src = fetchPypi {
inherit pname version;
sha256 = "fc29c11dcbe9208261d377185a1ae5331bab43f2a592222a25c8aca9c8031308";
};
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ google_cloud_core google_api_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Google Cloud Resource Manager API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, google_api_core
, google_cloud_core
, pytest
, mock
}:
buildPythonPackage rec {
pname = "google-cloud-runtimeconfig";
version = "0.28.1";
src = fetchPypi {
inherit pname version;
sha256 = "f441fbc22e2d0871ecb390854aa352cf467d2751cbc0dac7578274ead813519e";
};
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ google_api_core google_cloud_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Google Cloud RuntimeConfig API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, enum34
, grpc_google_iam_v1
, google_api_core
, pytest
}:
buildPythonPackage rec {
pname = "google-cloud-securitycenter";
version = "0.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "6ef386ba065a167670ad1b67f15fb7ba9e21ce33579fa6d7fafafd5b970b3e8a";
};
checkInputs = [ pytest ];
propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Cloud Security Command Center API API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,34 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, grpc_google_iam_v1
, grpcio-gcp
, google_api_core
, google_cloud_core
, pytest
, mock
}:
buildPythonPackage rec {
pname = "google-cloud-spanner";
version = "1.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "f7140e1cb43fbf670521112f03822b63d15fbcbd2830c7cfa1b868836e04b6b4";
};
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ grpcio-gcp grpc_google_iam_v1 google_api_core google_cloud_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Cloud Spanner API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -13,8 +13,9 @@ buildPythonPackage rec {
propagatedBuildInputs = [ google_api_core ];
checkInputs = [ pytest mock ];
# needs credentials
doCheck = false;
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Cloud Speech API enables integration of Google speech recognition into applications.";

View File

@ -0,0 +1,33 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, google_resumable_media
, google_api_core
, google_cloud_core
, pytest
, mock
}:
buildPythonPackage rec {
pname = "google-cloud-storage";
version = "1.13.0";
src = fetchPypi {
inherit pname version;
sha256 = "fc32b9be41a45016ba2387e3ad23e70ccba399d626ef596409316f7cee477956";
};
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ google_resumable_media google_api_core google_cloud_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Google Cloud Storage API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, enum34
, grpc_google_iam_v1
, google_api_core
, pytest
}:
buildPythonPackage rec {
pname = "google-cloud-tasks";
version = "0.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "f874a7aabad225588263c6cbcd4d67455cc682ebb6d9f00bd06c8d2d5673b4db";
};
checkInputs = [ pytest ];
propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Cloud Tasks API API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,35 @@
{ stdenv
, buildPythonPackage
, fetchFromGitHub
, six
, google_auth
}:
buildPythonPackage rec {
pname = "google-cloud-testutils";
version = "unstable-36ffa923c7037e8b4fdcaa76272cb6267e908a9d";
# google-cloud-testutils is not "really"
# released as a python package
# but it is required for google-cloud-* tests
# so why not package it as a module
src = fetchFromGitHub {
owner = "googleapis";
repo = "google-cloud-python";
rev = "36ffa923c7037e8b4fdcaa76272cb6267e908a9d";
sha256 = "1fvcnssmpgf4lfr7l9h7cz984rbc5mfr1j1br12japcib5biwzjy";
};
propagatedBuildInputs = [ six google_auth ];
postPatch = ''
cd test_utils
'';
meta = with stdenv.lib; {
description = "System test utilities for google-cloud-python";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,30 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, google_api_core
, pytest
}:
buildPythonPackage rec {
pname = "google-cloud-texttospeech";
version = "0.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "6064bc6e2761694b708878ff3d5902c6ce5eb44a770a921e7a99caf6c2533ae3";
};
checkInputs = [ pytest ];
propagatedBuildInputs = [ google_api_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Google Cloud Text-to-Speech API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, google_api_core
, google_cloud_core
, pytest
, mock
}:
buildPythonPackage rec {
pname = "google-cloud-trace";
version = "0.19.0";
src = fetchPypi {
inherit pname version;
sha256 = "2cb774498e90143a9565dd50e2814b6b0292242a53b8804a1a529989e18b7461";
};
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ google_api_core google_cloud_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Stackdriver Trace API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, google_api_core
, google_cloud_core
, pytest
, mock
}:
buildPythonPackage rec {
pname = "google-cloud-translate";
version = "1.3.1";
src = fetchPypi {
inherit pname version;
sha256 = "4420f5b320145bf097ca9a12b18ec27c067886e2832d181f268c46c3bcb0d2e4";
};
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ google_api_core google_cloud_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Google Cloud Translation API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,30 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, google_api_core
, pytest
}:
buildPythonPackage rec {
pname = "google-cloud-videointelligence";
version = "1.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "bd0abc18070520fd5757b15356e8483149e1caebbe43019257ccb2c43cddbbbe";
};
checkInputs = [ pytest ];
propagatedBuildInputs = [ google_api_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Google Cloud Video Intelligence API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, enum34
, google_api_core
, pytest
, mock
}:
buildPythonPackage rec {
pname = "google-cloud-vision";
version = "0.34.0";
src = fetchPypi {
inherit pname version;
sha256 = "50392b2c68e40dbf725c531ba4d325bd910da6441a472ed0a3fadfd0ab8548f7";
};
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ enum34 google_api_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Cloud Vision API API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,30 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, google_api_core
, pytest
}:
buildPythonPackage rec {
pname = "google-cloud-websecurityscanner";
version = "0.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "d41a9e1a093862aa1b181fa7fdc2a94e185eb4a8f290dbdb928bc9ebd253a95f";
};
checkInputs = [ pytest ];
propagatedBuildInputs = [ google_api_core ];
checkPhase = ''
pytest tests/unit
'';
meta = with stdenv.lib; {
description = "Google Cloud Web Security Scanner API client library";
homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, six
, requests
, pytest
, mock
}:
buildPythonPackage rec {
pname = "google-resumable-media";
version = "0.3.1";
src = fetchPypi {
inherit pname version;
sha256 = "97de518f8166d442cc0b61fab308bcd319dbb970981e667ec8ded44f5ce49836";
};
checkInputs = [ pytest mock ];
propagatedBuildInputs = [ six requests ];
checkPhase = ''
py.test tests/unit
'';
meta = with stdenv.lib; {
description = "Utilities for Google Media Downloads and Resumable Uploads";
homepage = https://github.com/GoogleCloudPlatform/google-resumable-media-python;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,25 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, grpcio
, googleapis_common_protos
}:
buildPythonPackage rec {
pname = "grpc-google-iam-v1";
version = "0.11.4";
src = fetchPypi {
inherit pname version;
sha256 = "5009e831dcec22f3ff00e89405249d6a838d1449a46ac8224907aa5b0e0b1aec";
};
propagatedBuildInputs = [ grpcio googleapis_common_protos ];
meta = with stdenv.lib; {
description = "GRPC library for the google-iam-v1 service";
homepage = https://github.com/googleapis/googleapis;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -0,0 +1,24 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, grpcio
}:
buildPythonPackage rec {
pname = "grpcio-gcp";
version = "0.2.2";
src = fetchPypi {
inherit pname version;
sha256 = "e292605effc7da39b7a8734c719afb12ec4b5362add3528d8afad3aa3aa9057c";
};
propagatedBuildInputs = [ grpcio ];
meta = with stdenv.lib; {
description = "gRPC extensions for Google Cloud Platform";
homepage = https://grpc.io;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -1,19 +1,25 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, libgit2, six, cffi }:
{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, isPyPy, libgit2_0_27, six, cffi }:
buildPythonPackage rec {
pname = "pygit2";
version = "0.26.4";
version = "0.27.2";
src = fetchPypi {
inherit pname version;
sha256 = "a8a0ecce4aadac2675afa5bcda0f698bfe39ec61ac1e15b9264704d1b41bb390";
sha256 = "0d9bgxd6ch5jxz0j5cmx7c4kw933g8pgm2zxf3id1a6w9g2r7hpw";
};
preConfigure = lib.optionalString stdenv.isDarwin ''
export DYLD_LIBRARY_PATH="${libgit2}/lib"
export DYLD_LIBRARY_PATH="${libgit2_0_27}/lib"
'';
propagatedBuildInputs = [ libgit2 six ] ++ lib.optional (!isPyPy) cffi;
patches = [ (fetchpatch {
name = "dont-require-old-pycparser"; # https://github.com/libgit2/pygit2/issues/819
url = https://github.com/libgit2/pygit2/commit/1eaba181577de206d3d43ec7886d0353fc0c9f2a.patch;
sha256 = "18x1fpmywhjjr4lvakwmy34zpxfqi8pqqj48g1wcib39lh3s7l4f";
}) ];
propagatedBuildInputs = [ libgit2_0_27 six ] ++ lib.optional (!isPyPy) cffi;
preCheck = ''
# disable tests that require networking

View File

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "simanneal";
version = "0.4.1";
version = "0.4.2";
src = fetchFromGitHub {
owner = "perrygeo";
repo = "simanneal";
rev = version;
sha256 = "12499wvf7ii7cy8z2f1d472p7q9napg1lj0h9xx8l1mbr1hjlp3q";
sha256 = "0p75da4nbk6iy16aahl0ilqg605jrr6aa1pzfyd9hc7ak2vs6840";
};
checkInputs = [ pytest ];

View File

@ -0,0 +1,29 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, webob
, six
, jinja2
}:
buildPythonPackage rec {
pname = "webapp2";
version = "2.5.2";
src = fetchPypi {
inherit pname version;
sha256 = "997db622a266bd64eb7fcc9cfe823efb69277544aa92064030c16acbfb2733a5";
};
# # error in tests when running with python 3+
doCheck = false;
propagatedBuildInputs = [ webob six ];
meta = with stdenv.lib; {
description = "Taking Google App Engine's webapp to the next level";
homepage = http://webapp-improved.appspot.com;
license = licenses.asl20;
maintainers = [ maintainers.costrouc ];
};
}

View File

@ -1,4 +1,4 @@
{ stdenv, binutils , fetchurl, glibc }:
{ stdenv, binutils , fetchurl, glibc, ncurses5 }:
stdenv.mkDerivation rec {
version = "0.0.28";
@ -20,13 +20,14 @@ stdenv.mkDerivation rec {
cd tools
for exe in http_server \
kythe read_entries triples verifier \
write_entries write_tables; do
write_entries write_tables entrystream; do
echo "Patching:" $exe
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $exe
patchelf --set-rpath "${stdenv.cc.cc.lib}/lib64" $exe
patchelf --set-rpath "${stdenv.cc.cc.lib}/lib64:${ncurses5}/lib" $exe
done
cd ../
cp -R ./ $out
ln -s $out/tools $out/bin
'';
meta = with stdenv.lib; {

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "gede-${version}";
version = "2.10.9";
version = "2.12.3";
src = fetchurl {
url = "http://gede.acidron.com/uploads/source/${name}.tar.xz";
sha256 = "0av9v3r6x6anjjm4hzn8wxnvrqc8zp1g7570m5ndg7cgc3sy3bg6";
sha256 = "041wvby19dlcbb7x3yn2mbcfkrn0pkyjpgm40ngsks63kqzmkpdp";
};
nativeBuildInputs = [ qmake makeWrapper python ];

View File

@ -1,4 +1,4 @@
{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libglvnd, libogg, libvorbis, curl }:
{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libglvnd, libogg, libvorbis, curl, openal }:
stdenv.mkDerivation rec {
name = "openarena-${version}";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
installPhase = let
gameDir = "$out/openarena-$version";
interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")";
libPath = stdenv.lib.makeLibraryPath [ SDL libglvnd libogg libvorbis curl ];
libPath = stdenv.lib.makeLibraryPath [ SDL libglvnd libogg libvorbis curl openal ];
in ''
mkdir -pv $out/bin
cd $out

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "evdi-${version}";
version = "1.5.0.2";
version = "1.5.1";
src = fetchFromGitHub {
owner = "DisplayLink";
repo = "evdi";
rev = "v${version}";
sha256 = "1wjk023lpjxnspfl34c6rzkrixahfdzdkmc3hnmrdw12s3i6ca5x";
sha256 = "0jy0ia5fsx54d2wv4d2jqnc8rc5x16781a3bcb857apc47zr387h";
};
nativeBuildInputs = kernel.moduleBuildDependencies;
@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Extensible Virtual Display Interface";
platforms = platforms.linux;
license = licenses.gpl2;
homepage = http://www.displaylink.com/;
broken = versionOlder kernel.version "4.9" || versionAtLeast kernel.version "4.15" || stdenv.isAarch64;
license = with licenses; [ lgpl21 gpl2 ];
homepage = https://www.displaylink.com/;
broken = versionOlder kernel.version "4.9" || versionAtLeast kernel.version "4.18" || stdenv.isAarch64;
};
}

View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.14.81";
version = "4.14.82";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1pjvwyhag2i8i5kns8836ifpk93ssvp35m4rfxhz0kl4ag8dydjb";
sha256 = "1b8x77kf3q7nf2h3s9vnn0hzi45srxxin7f9rvg70vd7yvka5457";
};
} // (args.argsOverride or {}))

View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.18.19";
version = "4.18.20";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1g9iasj17i6z5494azsbr4pji7qj27f1fasrx36fbxy4rp1w8rkw";
sha256 = "0lzn2w8zagqk3sp6jsp155xggm1c277xjh8m0nvddvdp1yg33b38";
};
} // (args.argsOverride or {}))

View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.19.2";
version = "4.19.3";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0wyzy8i2lfhz2rf9ilygl2jgz6iyspv2amx2fzm85mwv060py361";
sha256 = "0834k2lsflp6mgxv1vs1gr4fykg5z0hd4sbbrw3z7zfhsh95fg0y";
};
} // (args.argsOverride or {}))

View File

@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.4.163";
version = "4.4.164";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1x1fixnz41q6pq1cms9z48mrac984r675m94fdm08m8ajqxddcv1";
sha256 = "041w65dxsdcdpf7isis2r4xabfm9pbhfgxxx7n9d1nv7grss3d4v";
};
} // (args.argsOverride or {}))

View File

@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.9.137";
version = "4.9.138";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1295x8a8k8bdanrpsalnaaq00mk3fl91sr14061lrgwlj0m53ckd";
sha256 = "1dr1mf7i1mwy780048gkhvy283j8331xwgrs2x5qal0xc1114c4j";
};
} // (args.argsOverride or {}))

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