Merge branch 'master.upstream' into staging.upstream

This commit is contained in:
William A. Kennington III 2015-08-29 17:48:49 -07:00
commit afe1f0f127
43 changed files with 690 additions and 629 deletions

View file

@ -14,6 +14,7 @@
aflatter = "Alexander Flatter <flatter@fastmail.fm>";
aherrmann = "Andreas Herrmann <andreash87@gmx.ch>";
ak = "Alexander Kjeldaas <ak@formalprivacy.com>";
akaWolf = "Artjom Vejsel <akawolf0@gmail.com>";
akc = "Anders Claesson <akc@akc.is>";
algorith = "Dries Van Daele <dries_van_daele@telenet.be>";
all = "Nix Committers <nix-commits@lists.science.uu.nl>";
@ -67,7 +68,7 @@
couchemar = "Andrey Pavlov <couchemar@yandex.ru>";
cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>";
cwoac = "Oliver Matthews <oliver@codersoffortune.net>";
DamienCassou = "Damien Cassou <damien.cassou@gmail.com>";
DamienCassou = "Damien Cassou <damien@cassou.me>";
davidrusu = "David Rusu <davidrusu.me@gmail.com>";
dbohdan = "Danyil Bohdan <danyil.bohdan@gmail.com>";
DerGuteMoritz = "Moritz Heidkamp <moritz@twoticketsplease.de>";
@ -123,6 +124,7 @@
jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>";
jb55 = "William Casarin <bill@casarin.me>";
jcumming = "Jack Cummings <jack@mudshark.org>";
jefdaj = "Jeffrey David Johnson <jefdaj@gmail.com>";
jfb = "James Felix Black <james@yamtime.com>";
jgeerds = "Jascha Geerds <jg@ekby.de>";
jirkamarsik = "Jirka Marsik <jiri.marsik89@gmail.com>";

View file

@ -37,13 +37,5 @@ in
) cfg.profiles;
};
};
security.pam.services.apparmor.text = ''
## AppArmor changes hats according to `order`: first try user, then
## group, and finally fall back to a hat called "DEFAULT"
##
## For now, enable debugging as this is an experimental feature.
session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug
'';
};
}

View file

@ -192,6 +192,16 @@ let
description = "Whether to log authentication failures in <filename>/var/log/faillog</filename>.";
};
enableAppArmor = mkOption {
default = false;
type = types.bool;
description = ''
Enable support for attaching AppArmor profiles at the
user/group level, e.g., as part of a role based access
control scheme.
'';
};
text = mkOption {
type = types.nullOr types.lines;
description = "Contents of the PAM service file.";
@ -294,6 +304,8 @@ let
"session optional ${pkgs.pam}/lib/security/pam_motd.so motd=${motd}"}
${optionalString cfg.pamMount
"session optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
${optionalString (cfg.enableAppArmor && config.security.apparmor.enable)
"session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"}
'';
};

View file

@ -105,7 +105,7 @@ in {
tokenAuth = mkOption {
description = ''
Kubernetes apiserver token authentication file. See
<link xlink:href="https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/authentication.md"/>
<link xlink:href="http://kubernetes.io/v1.0/docs/admin/authentication.html"/>
'';
default = {};
example = literalExample ''
@ -120,7 +120,7 @@ in {
authorizationMode = mkOption {
description = ''
Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC). See
<link xlink:href="https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/authorization.md"/>
<link xlink:href="http://kubernetes.io/v1.0/docs/admin/authorization.html"/>
'';
default = "AlwaysAllow";
type = types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC"];
@ -129,7 +129,7 @@ in {
authorizationPolicy = mkOption {
description = ''
Kubernetes apiserver authorization policy file. See
<link xlink:href="https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/authorization.md"/>
<link xlink:href="http://kubernetes.io/v1.0/docs/admin/authorization.html"/>
'';
default = [];
example = literalExample ''
@ -159,18 +159,37 @@ in {
};
runtimeConfig = mkOption {
description = "Api runtime configuration";
description = ''
Api runtime configuration. See
<link xlink:href="http://kubernetes.io/v1.0/docs/admin/cluster-management.html"/>
'';
default = "";
example = "api/all=false,api/v1=true";
type = types.str;
};
admissionControl = mkOption {
description = "Kubernetes admission control plugins to use.";
description = ''
Kubernetes admission control plugins to use. See
<link xlink:href="http://kubernetes.io/v1.0/docs/admin/admission-controllers.html"/>
'';
default = ["AlwaysAdmit"];
example = [
"NamespaceLifecycle" "NamespaceExists" "LimitRanger"
"SecurityContextDeny" "ServiceAccount" "ResourceQuota"
];
type = types.listOf types.str;
};
serviceAccountKey = mkOption {
description = ''
Kubernetes apiserver PEM-encoded x509 RSA private or public key file,
used to verify ServiceAccount tokens.
'';
default = null;
type = types.nullOr types.path;
};
extraOpts = mkOption {
description = "Kubernetes apiserver extra command line options.";
default = "";
@ -235,8 +254,26 @@ in {
type = types.str;
};
serviceAccountPrivateKey = mkOption {
description = ''
Kubernetes controller manager PEM-encoded private RSA key file used to
sign service account tokens
'';
default = null;
type = types.nullOr types.path;
};
rootCaFile = mkOption {
description = ''
Kubernetes controller manager certificate authority file included in
service account's token secret.
'';
default = null;
type = types.nullOr types.path;
};
extraOpts = mkOption {
description = "Kubernetes controller extra command line options.";
description = "Kubernetes controller manager extra command line options.";
default = "";
type = types.str;
};
@ -294,7 +331,10 @@ in {
};
apiServers = mkOption {
description = "Kubernetes kubelet list of Kubernetes API servers for publishing events, and reading pods and services.";
description = ''
Kubernetes kubelet list of Kubernetes API servers for publishing events,
and reading pods and services.
'';
default = ["${cfg.apiserver.address}:${toString cfg.apiserver.port}"];
type = types.listOf types.str;
};
@ -413,17 +453,14 @@ in {
${optionalString (cfg.apiserver.runtimeConfig!="")
"--runtime-config=${cfg.apiserver.runtimeConfig}"} \
--admission_control=${concatStringsSep "," cfg.apiserver.admissionControl} \
${optionalString (cfg.apiserver.serviceAccountKey!=null)
"--service-account-key-file=${cfg.apiserver.serviceAccountKey}"} \
--logtostderr=true \
${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \
${cfg.apiserver.extraOpts}
'';
User = "kubernetes";
};
postStart = ''
until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.apiserver.address}:${toString cfg.apiserver.port}/'; do
sleep 1;
done
'';
};
})
@ -456,6 +493,10 @@ in {
--address=${cfg.controllerManager.address} \
--port=${toString cfg.controllerManager.port} \
--master=${cfg.controllerManager.master} \
${optionalString (cfg.controllerManager.serviceAccountPrivateKey!=null)
"--service-account-private-key-file=${cfg.controllerManager.serviceAccountPrivateKey}"} \
${optionalString (cfg.controllerManager.rootCaFile!=null)
"--root-ca-file=${cfg.controllerManager.rootCaFile}"} \
--logtostderr=true \
${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \
${cfg.controllerManager.extraOpts}
@ -509,6 +550,8 @@ in {
${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \
${cfg.proxy.extraOpts}
'';
Restart = "always"; # Retry connection
RestartSec = "5s";
};
};
})

View file

@ -63,7 +63,7 @@ in {
package = mkOption {
description = "Confd package to use.";
default = pkgs.goPackages.confd;
default = pkgs.confd;
type = types.package;
};
};

View file

@ -200,13 +200,13 @@ in {
staticRootPath = mkOption {
description = "Root path for static assets.";
default = "${cfg.package}/share/go/src/github.com/grafana/grafana/public";
default = "${cfg.package.out}/share/go/src/github.com/grafana/grafana/public";
type = types.str;
};
package = mkOption {
description = "Package to use.";
default = pkgs.goPackages.grafana;
default = pkgs.grafana-backend;
type = types.package;
};
@ -319,7 +319,7 @@ in {
wantedBy = ["multi-user.target"];
after = ["networking.target"];
serviceConfig = {
ExecStart = "${cfg.package}/bin/grafana --config ${cfgFile} web";
ExecStart = "${cfg.package-backend}/bin/grafana --config ${cfgFile} web";
WorkingDirectory = cfg.dataDir;
User = "grafana";
};

View file

@ -95,7 +95,7 @@ in {
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = "${pkgs.goPackages.hologram}/bin/hologram-server --debug --conf ${cfgFile}";
ExecStart = "${pkgs.hologram}/bin/hologram-server --debug --conf ${cfgFile}";
};
};
};

View file

@ -67,7 +67,6 @@ in {
description = "Open_vSwitch Database Server";
wantedBy = [ "multi-user.target" ];
after = [ "systemd-udev-settle.service" ];
wants = [ "vswitchd.service" ];
path = [ cfg.package ];
restartTriggers = [ db cfg.package ];
# Create the config database
@ -108,6 +107,7 @@ in {
systemd.services.vswitchd = {
description = "Open_vSwitch Daemon";
wantedBy = [ "multi-user.target" ];
bindsTo = [ "ovsdb.service" ];
after = [ "ovsdb.service" ];
path = [ cfg.package ];
@ -135,8 +135,8 @@ in {
systemd.services.ovs-monitor-ipsec = {
description = "Open_vSwitch Ipsec Daemon";
wantedBy = [ "multi-user.target" ];
requires = [ "racoon.service" ];
after = [ "vswitchd.service" ];
requires = [ "ovsdb.service" ];
before = [ "vswitchd.service" "racoon.service" ];
environment.UNIXCTLPATH = "/tmp/ovsdb.ctl.sock";
serviceConfig = {
ExecStart = ''

View file

@ -0,0 +1,39 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost
, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, curl
, withGui }:
with stdenv.lib;
stdenv.mkDerivation rec{
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-xt-" + version;
xt_version = "0.11A";
version = xt_version;
src = fetchurl {
url = "https://github.com/bitcoinxt/bitcoinxt/archive/v0.11A.tar.gz";
sha256 = "129cbqf6bln6rhdk70c6nfwdjk6afvsaaw4xdyp0pnfand8idz7n";
};
buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib
miniupnpc utillinux protobuf curl ]
++ optionals withGui [ qt4 qrencode ];
configureFlags = [
"--with-boost-libdir=${boost.lib}/lib"
"--with-libcurl-headers=${curl}/include"
] ++ optionals withGui [ "--with-gui=qt4" ];
meta = {
description = "Peer-to-peer electronic cash system";
longDescription= ''
Bitcoin XT is an implementation of a Bitcoin full node, based upon the
source code of Bitcoin Core. It is built by taking the latest stable
Core release, applying a series of patches, and then doing deterministic
builds so anyone can check the downloads correspond to the source code.
'';
homepage = "https://bitcoinxt.software/";
maintainers = with maintainers; [ jefdaj ];
license = licenses.mit;
platforms = platforms.unix;
};
}

View file

@ -5,6 +5,9 @@ rec {
bitcoin = callPackage ./bitcoin.nix { withGui = true; };
bitcoind = callPackage ./bitcoin.nix { withGui = false; };
bitcoin-xt = callPackage ./bitcoin-xt.nix { withGui = true; };
bitcoind-xt = callPackage ./bitcoin-xt.nix { withGui = false; };
darkcoin = callPackage ./darkcoin.nix { withGui = true; };
darkcoind = callPackage ./darkcoin.nix { withGui = false; };

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, alsaLib, cmake, gtk, libjack2, libgnomecanvas
, libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2
, pkgconfig }:
, pkgconfig, openssl }:
stdenv.mkDerivation rec {
name = "petri-foo-${version}";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ alsaLib cmake gtk libjack2 libgnomecanvas libpthreadstubs
libsamplerate libsndfile libtool libxml2 pkgconfig
libsamplerate libsndfile libtool libxml2 pkgconfig openssl
];
meta = with stdenv.lib; {

View file

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "calibre-${version}";
version = "2.35.0";
version = "2.36.0";
src = fetchurl {
url = "https://github.com/kovidgoyal/calibre/releases/download/v${version}/${name}.tar.xz";
sha256 = "13sic0l16myvka8mgpr56h6qlpf1cwx8xlf4acp3qz6gsmz3r23x";
sha256 = "1my7fjj1lc28mhmvb85rcc4c5bwsycs6bgmafbx9agil5bgrbnb2";
};
inherit python;

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "qtpass-${version}";
version = "0.8.4";
version = "1.0.1";
src = fetchurl {
url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz";
sha256 = "14avh04q559p64ska1w814pbwv0742aaqln036pw99fjxav685g0";
sha256 = "1mmncvamvwr3hizc1jgpb5kscl9idmrfd2785jhwi87q11wjrwxz";
};
buildInputs = [ git gnupg makeWrapper pass qt5.base ];

View file

@ -1,57 +0,0 @@
From abd9d530776e8bb6d8f05312fc3ae3044796139c Mon Sep 17 00:00:00 2001
From: Oliver Winker <oliver@oli1170.net>
Date: Tue, 12 Aug 2014 19:08:05 +0200
Subject: [PATCH] Fix for openssl 1.0.1i
Fixes following application error
---
Errors
error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error
---
Due to openssl 1.0.1i change:
---
commit 03b04ddac162c7b7fa3c57eadccc5a583a00d291
Author: Emilia Kasper <emilia@openssl.org>
Date: Wed Jul 2 19:02:33 2014 +0200
Fix OID handling:
- Upon parsing, reject OIDs with invalid base-128 encoding.
- Always NUL-terminate the destination buffer in OBJ_obj2txt printing function.
CVE-2014-3508
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
---
---
lib/x509v3ext.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/x509v3ext.cpp b/lib/x509v3ext.cpp
index cf74c32..d94cbda 100644
--- a/lib/x509v3ext.cpp
+++ b/lib/x509v3ext.cpp
@@ -27,6 +27,8 @@ x509v3ext::x509v3ext(const X509_EXTENSION *n)
x509v3ext::x509v3ext(const x509v3ext &n)
{
ext = NULL;
+ if (!n.isValid())
+ return;
set(n.ext);
}
@@ -743,7 +745,7 @@ X509_EXTENSION *x509v3ext::get() const
bool x509v3ext::isValid() const
{
- return ext->value->length > 0 &&
+ return ext && ext->value && ext->value->length > 0 &&
OBJ_obj2nid(ext->object) != NID_undef;
}
--
2.0.1

View file

@ -2,21 +2,13 @@
stdenv.mkDerivation rec {
name = "xca-${version}";
version = "0.9.3";
version = "1.3.0";
src = fetchurl {
url = "mirror://sourceforge/xca/${name}.tar.gz";
sha256 = "1fn6kh8mdy65rrgjif7j9wn3mxg1mrrcnhzpi86hfy24ic6bahk8";
sha256 = "0k21d4lfkn0nlj8az6067dmc5dgy5cidspljagmh5frsv576wnzg";
};
patches = [ ./0001-Fix-for-openssl-1.0.1i.patch ];
configurePhase = ''
export PATH=$PATH:${which}/bin
export QTDIR=${qt4}
prefix=$out ./configure ${openssl} ${libtool}
'';
postInstall = ''
wrapProgram "$out/bin/xca" \
--prefix LD_LIBRARY_PATH : "${qt4}/lib:${gcc.cc}/lib:${gcc.cc}/lib64:${openssl}/lib:${libtool}/lib"

View file

@ -1,102 +0,0 @@
{ stdenv, fetchFromGitHub, maven, openjdk8, releaseTools }:
# TODO:
# - Investigate builds on platforms other than 64-bit linux
# - Separate package for Maven cache? This would speed up builds and
# theoretically could still be pure
# - Find a way to prevent Maven from downloading artifacts irrelevant
# to the platform for which we are building
releaseTools.mvnBuild rec {
name = "kframework-20150415";
mvn8 = maven.override {
jdk = openjdk8; # K uses Java 8. The official docs reference the
# Oracle VM, but it's been working with OpenJDK
};
src = fetchFromGitHub {
owner = "kframework";
repo = "k";
rev = "85a41bc024"; # nightly build for April 15th, 2015
sha256 = "01ndfdnqxp2w86pg3ax39sxayb2pfm39lj1h3818zzn86gqwa1vc";
};
buildInputs = [ mvn8 openjdk8 ];
preSetupPhase = ''
# z3 needs this to pass tests
export LD_LIBRARY_PATH=$(cat $NIX_CC/nix-support/orig-cc)/lib
# not sure if this does anything, since it might only speed up incremental builds
export MAVEN_OPTS="-XX:+TieredCompilation"
'';
mvnAssembly = ''
mvn package -Dcheckstyle.skip -Dmaven.test.skip=true -Dmaven.repo.local=$M2_REPO
'';
mvnRelease = ''
true # do nothing, since mvn package is sufficient
'';
# this is a custom version of k-distribution/src/main/scripts/lib/k
kscript = ''
#!/usr/bin/env bash
export JAVA=${openjdk8}/bin/java
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$out/lib"
export K_OPTS="-Xms64m -Xmx1024m -Xss32m -XX:+TieredCompilation"
export MISC_ARGS="-Djava.awt.headless=true"
export ARGS="$MISC_ARGS $K_OPTS"
$JAVA $ARGS -cp "$out/share/kframework/lib/java/*" org.kframework.main.Main "$@"
'';
finalPhase = ''
# set some environment variables
export K_ROOT=$PWD/k-distribution/target/release/k/
export K_SHARE=$out/share/kframework/
# make requisite directories
mkdir -p $out/lib $K_SHARE/lib/native
# copy over bin
cp -R $K_ROOT/bin $K_SHARE/
# symlink $out/bin to $out/share/kframework/bin
ln -s $K_SHARE/bin $out/bin
# copy everything relevant to $out/share/kframework
# we may want to consider adding the documentation etc.
cp -R $K_ROOT/include $K_SHARE/
cp -R $K_ROOT/lib/java $K_SHARE/lib/
cp -R $K_ROOT/lib/native/linux $K_SHARE/lib/native/
cp -R $K_ROOT/lib/native/linux64 $K_SHARE/lib/native/
# remove Windows batch scripts
rm $K_SHARE/bin/*.bat # */
# TODO: fix these scripts so they work
rm $K_SHARE/bin/kserver $K_SHARE/bin/stop-kserver
# make our k wrapper script and substitute $out for its value
echo -n "$kscript" | sed "s:\$out:$out:g" > $K_SHARE/lib/k
chmod +x $K_SHARE/lib/k
# symlink requisite binaries
ln -s $K_SHARE/lib/k $out/lib/k
ln -s $K_SHARE/lib/native/linux/sdf2table $out/bin/sdf2table
ln -s $K_SHARE/lib/native/linux64/z3 $out/bin/z3
ln -s $K_SHARE/lib/native/linux64/libz3.so $out/lib/libz3.so
ln -s $K_SHARE/lib/native/linux64/libz3java.so $out/lib/libz3java.so
# patch Z3 so it uses the right interpreter/libs
patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath $(cat $NIX_CC/nix-support/orig-cc)/lib \
--force-rpath \
$K_SHARE/lib/native/linux64/z3
'';
meta = {
description = "A rewrite-based executable semantic framework in which programming languages, type systems and formal analysis tools can be defined";
homepage = http://www.kframework.org;
license = stdenv.lib.licenses.bsd3; # technically it is the UIUC/NCSA license
# but LLVM uses that license as well and
# it is marked as BSD3
maintainers = [ stdenv.lib.maintainers.taktoa ];
platforms = stdenv.lib.platforms.linux; # I haven't done testing on other OSes, but
# since it's Java it should run anywhere
};
}

View file

@ -8,12 +8,13 @@
}:
buildPythonPackage rec {
name = "spyder-2.2.5";
name = "spyder-${version}";
version = "2.3.6";
namePrefix = "";
src = fetchurl {
url = "https://spyderlib.googlecode.com/files/${name}.zip";
sha256 = "1bxc5qs2bqc21s6kxljsfxnmwgrgnyjfr9mkwzg9njpqsran3bp2";
url = "https://pypi.python.org/packages/source/s/spyder/${name}.zip";
sha256 = "0e6502e0d3f270ea8916d1a3d7ca29915801d31932db399582bc468c01d535e2";
};
buildInputs = [ unzip ];
@ -23,6 +24,11 @@ buildPythonPackage rec {
# There is no test for spyder
doCheck = false;
# Use setuptools instead of distutils.
preConfigure = ''
export USE_SETUPTOOLS=True
'';
desktopItem = makeDesktopItem {
name = "Spyder";
exec = "spyder";
@ -49,7 +55,7 @@ buildPythonPackage rec {
environment for the Python language with advanced editing, interactive
testing, debugging and introspection features.
'';
homepage = https://code.google.com/p/spyderlib/;
homepage = https://github.com/spyder-ide/spyder/;
license = licenses.mit;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];

View file

@ -30,6 +30,7 @@ mkDerivation rec {
preBuild = ''
makeFlagsArray=(
XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml"
LIBS=""
prefix="$out"
)
'';

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, makeWrapper, go, lxc, sqlite, iproute, bridge-utils, devicemapper,
btrfsProgs, iptables, bash, e2fsprogs, xz}:
btrfsProgs, iptables, bash, e2fsprogs, xz, utillinux}:
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
installPhase = ''
install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker
install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit
makeWrapper $out/libexec/docker/docker $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin:${e2fsprogs}/sbin:${xz}/bin"
makeWrapper $out/libexec/docker/docker $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin:${e2fsprogs}/sbin:${xz}/bin:${utillinux}/bin"
# systemd
install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service

View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "urweb";
version = "20150520";
version = "20150819";
name = "${pname}-${version}";
src = fetchurl {
url = "http://www.impredicative.com/ur/${name}.tgz";
sha256 = "06pl6z4sh5fvh72drz4bp70yynr4i1rawc97ww5wag8976dirwrm";
sha256 = "0gpdlq3aazx121k3ia94qfa4dyv04q7478x2p6hvcjamn18vk56n";
};
buildInputs = [ stdenv.cc file openssl mlton mysql postgresql sqlite ];

View file

@ -1,4 +1,4 @@
{ go, govers, lib }:
{ go, govers, parallel, lib }:
{ name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? ""
@ -41,7 +41,7 @@ go.stdenv.mkDerivation (
(builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // {
name = "go${go.meta.branch}-${name}";
nativeBuildInputs = [ go ]
nativeBuildInputs = [ go parallel ]
++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs;
buildInputs = [ go ] ++ buildInputs;
@ -62,7 +62,7 @@ go.stdenv.mkDerivation (
rmdir extraSrc
'') + ''
GOPATH=$NIX_BUILD_TOP/go:$GOPATH
export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
runHook postConfigure
'';
@ -80,38 +80,39 @@ go.stdenv.mkDerivation (
runHook renameImports
PIDS=()
if [ -n "$subPackages" ] ; then
for p in $subPackages ; do
go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p &
PIDS+=("$!")
done
else
pushd go/src
while read d; do
{
echo "$d" | grep -q "/_" && continue
[ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && continue
local OUT
if ! OUT="$(go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d 2>&1)"; then
if ! echo "$OUT" | grep -q 'no buildable Go source files'; then
echo "$OUT" >&2
exit 1
fi
fi
if [ -n "$OUT" ]; then
echo "$OUT" >&2
fi
} &
PIDS+=("$!")
done < <(find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq)
popd
fi
buildGoDir() {
local d; local cmd;
cmd="$1"
d="$2"
echo "$d" | grep -q "/_" && return 0
[ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0
local OUT
if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v $d 2>&1)"; then
if ! echo "$OUT" | grep -q 'no buildable Go source files'; then
echo "$OUT" >&2
return 1
fi
fi
if [ -n "$OUT" ]; then
echo "$OUT" >&2
fi
return 0
}
# Exit on error from the parallel process
for PID in "''${PIDS[@]}"; do
wait $PID || exit 1
done
getGoDirs() {
local type;
type="$1"
if [ -n "$subPackages" ]; then
echo "$subPackages" | sed "s,\(^\| \),\1$goPackagePath/,g"
else
pushd go/src >/dev/null
find "$goPackagePath" -type f -name \*$type.go -exec dirname {} \; | sort | uniq
popd >/dev/null
fi
}
export -f buildGoDir # parallel needs to see the function
getGoDirs "" | parallel -j $NIX_BUILD_CORES buildGoDir install
runHook postBuild
'';
@ -119,25 +120,7 @@ go.stdenv.mkDerivation (
checkPhase = args.checkPhase or ''
runHook preCheck
PIDS=()
if [ -n "$subPackages" ] ; then
for p in $subPackages ; do
go test -p $NIX_BUILD_CORES -v $goPackagePath/$p &
PIDS+=("$!")
done
else
pushd go/src
while read d; do
go test -p $NIX_BUILD_CORES -v $d &
PIDS+=("$!")
done < <(find $goPackagePath -type f -name \*_test.go -exec dirname {} \; | sort | uniq)
popd
fi
# Exit on error from the parallel process
for PID in "''${PIDS[@]}"; do
wait $PID || exit 1
done
getGoDirs test | parallel -j $NIX_BUILD_CORES buildGoDir test
runHook postCheck
'';
@ -146,19 +129,17 @@ go.stdenv.mkDerivation (
runHook preInstall
mkdir -p $out
pushd "$NIX_BUILD_TOP/go"
while read f; do
echo "$f" | grep -q '^./\(src\|pkg/[^/]*\)/${goPackagePath}' || continue
mkdir -p "$(dirname "$out/share/go/$f")"
cp "$NIX_BUILD_TOP/go/$f" "$out/share/go/$f"
done < <(find . -type f)
popd
if [ -z "$dontInstallSrc" ]; then
pushd "$NIX_BUILD_TOP/go"
while read f; do
echo "$f" | grep -q '^./\(src\|pkg/[^/]*\)/${goPackagePath}' || continue
mkdir -p "$(dirname "$out/share/go/$f")"
cp "$NIX_BUILD_TOP/go/$f" "$out/share/go/$f"
done < <(find . -type f)
popd
fi
mkdir -p $bin
dir="$NIX_BUILD_TOP/go/bin"
[ -e "$dir" ] && cp -r $dir $out
[ -e "$dir" ] && cp -r $dir $bin
runHook postInstall
'';
@ -168,7 +149,7 @@ go.stdenv.mkDerivation (
cat $file ${removeExpr removeReferences} > $file.tmp
mv $file.tmp $file
chmod +x $file
done < <(find $out/bin -type f 2>/dev/null)
done < <(find $bin/bin -type f 2>/dev/null)
'';
disallowedReferences = lib.optional (!allowGoReference) go
@ -178,6 +159,9 @@ go.stdenv.mkDerivation (
enableParallelBuilding = enableParallelBuilding;
# I prefer to call this dev but propagatedBuildInputs expects $out to exist
outputs = [ "out" "bin" ];
meta = {
# Add default meta information
platforms = lib.platforms.all;

View file

@ -465,6 +465,7 @@ self: super: {
static-resources = dontCheck super.static-resources;
strive = dontCheck super.strive; # fails its own hlint test with tons of warnings
svndump = dontCheck super.svndump;
tar = dontCheck super.tar; #http://hydra.nixos.org/build/25088435/nixlog/2 (fails only on 32-bit)
thumbnail-plus = dontCheck super.thumbnail-plus;
tickle = dontCheck super.tickle;
tpdb = dontCheck super.tpdb;
@ -1017,4 +1018,7 @@ self: super: {
# https://github.com/brendanhay/amazonka/issues/203
amazonka-core = dontCheck super.amazonka-core;
# https://github.com/agocorona/MFlow/issues/63
MFlow = addBuildTool super.MFlow self.cpphs;
}

View file

@ -1,9 +1,9 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "getdata-0.8.8";
name = "getdata-0.8.9";
src = fetchurl {
url = "mirror://sourceforge/getdata/${name}.tar.bz2";
sha256 = "1p5sncbr0bjrx1ki57di0j9rl5ksv0hbfy7bkcb4vaz9z9mrn8xj";
sha256 = "1cgwrflpp9ia2cwnhmwp45nmsg15ymjh03pysrfigyfmag94ac51";
};
meta = with stdenv.lib; {

View file

@ -0,0 +1,15 @@
Ensure Qt knows where libGL is.
Author: Bjørn Forsman <bjorn.forsman@gmail.com>
diff -uNr qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf
--- qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf 2014-09-11 12:48:07.000000000 +0200
+++ qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf 2015-08-23 13:03:30.617473019 +0200
@@ -13,7 +13,7 @@
QMAKE_INCDIR_X11 =
QMAKE_LIBDIR_X11 =
QMAKE_INCDIR_OPENGL =
-QMAKE_LIBDIR_OPENGL =
+QMAKE_LIBDIR_OPENGL = @mesa@/lib
QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
QMAKE_INCDIR_EGL =

View file

@ -81,7 +81,8 @@ stdenv.mkDerivation rec {
(substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; })
(substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; })
./0013-qtwebkit-glib-2.44.patch
];
] ++ optional mesaSupported
(substituteAll { src = ./0014-mkspecs-libgl.patch; inherit mesa; });
preConfigure = ''
export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH"

View file

@ -0,0 +1,15 @@
Ensure Qt knows where libGL is.
Author: Bjørn Forsman <bjorn.forsman@gmail.com>
diff -uNr qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf
--- qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf 2014-09-11 12:48:07.000000000 +0200
+++ qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf 2015-08-23 13:03:30.617473019 +0200
@@ -13,7 +13,7 @@
QMAKE_INCDIR_X11 =
QMAKE_LIBDIR_X11 =
QMAKE_INCDIR_OPENGL =
-QMAKE_LIBDIR_OPENGL =
+QMAKE_LIBDIR_OPENGL = @mesa@/lib
QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
QMAKE_INCDIR_EGL =

View file

@ -71,7 +71,8 @@ stdenv.mkDerivation {
(substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; })
(substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; })
./0013-xdg_config_dirs.patch
]
] ++ optional mesaSupported
(substituteAll { src = ./0014-mkspecs-libgl.patch; inherit mesa; })
++ (optional decryptSslTraffic ./0100-ssl.patch);
preConfigure = ''

View file

@ -0,0 +1,31 @@
{ runCommand, lndir }:
{ paths, qtbase }:
runCommand "qt-env" { inherit paths qtbase; } ''
mkdir -p "$out/bin" "$out/mkspecs" "$out/include" "$out/lib" "$out/share"
cp "$qtbase/bin/qmake" "$out/bin"
cat >"$out/bin/qt.conf" <<EOF
[Paths]
Prefix = $out
Plugins = lib/qt5/plugins
Imports = lib/qt5/imports
Qml2Imports = lib/qt5/qml
Documentation = share/doc/qt5
EOF
for path in $paths; do
if [[ -d "$path/mkspecs" ]]; then
${lndir}/bin/lndir -silent "$path/mkspecs" "$out/mkspecs"
for dir in bin include lib share; do
if [[ -d "$path/$dir" ]]; then
${lndir}/bin/lndir -silent "$path/$dir" "$out/$dir"
fi
done
fi
done
''

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qtLib, sdkBuild ? false, withDocumentation ? true }:
{ stdenv, fetchurl, makeWrapper, qtLib, withDocumentation ? false }:
with stdenv.lib;
@ -9,31 +9,21 @@ let
in
stdenv.mkDerivation rec {
# The package name depends on wether we are just building the QtCreator package or the whole Qt SDK
# If we are building the QtCreator package: qtcreator-version
# If we are building the QtSDK package, the Qt version is also included: qtsdk-version-qt-version
name = "qt${if sdkBuild then "sdk" else "creator"}-${version}"
+ optionalString sdkBuild "-qt-${qtLib.version}";
name = "qtcreator-${version}";
src = fetchurl {
url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz";
sha256 = "1asbfphws0aqs92gjgh0iqzr1911kg51r9al44jxpfk88yazjzgm";
};
# This property can be used in a nix development environment to refer to the Qt package
# eg: export QTDIR=${qtSDK.qt}
qt = qtLib;
# We must only propagate Qt (including qmake) when building the QtSDK
propagatedBuildInputs = if sdkBuild then [ qtLib ] else [];
buildInputs = if sdkBuild == false then [ qtLib ] else [];
buildInputs = [ makeWrapper qtLib.base qtLib.script qtLib.quickcontrols qtLib.declarative ];
doCheck = false;
enableParallelBuilding = true;
preConfigure = ''
qmake -spec linux-g++ "QT_PRIVATE_HEADERS=${qtLib}/include" qtcreator.pro
qmake -spec linux-g++ qtcreator.pro
'';
buildFlags = optionalString withDocumentation " docs";
@ -54,6 +44,11 @@ stdenv.mkDerivation rec {
Type=Application
Categories=Qt;Development;IDE;
__EOF__
# Wrap the qtcreator binary
wrapProgram $out/bin/qtcreator \
--prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
--prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \
--prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH"
'';
meta = {
@ -63,9 +58,9 @@ stdenv.mkDerivation rec {
tailored to the needs of Qt developers. It includes features such as an
advanced code editor, a visual debugger and a GUI designer.
'';
homepage = "http://qt-project.org/wiki/Category:Tools::QtCreator";
homepage = "https://wiki.qt.io/Category:Tools::QtCreator";
license = "LGPL";
maintainers = [ maintainers.bbenoist ];
maintainers = [ maintainers.akaWolf maintainers.bbenoist ];
platforms = platforms.all;
};
}

View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }:
let
version = "3.0.0";
version = "3.1.0";
inherit (stdenv.lib) optional maintainers licenses platforms;
in stdenv.mkDerivation {
name = "iojs-${version}";
src = fetchurl {
url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
sha256 = "0maxxmr6y7z3y3r88nhcnfzmpvbhs5p8knyz886bh2shgzd6nzqf";
sha256 = "15qh5pscg3588hyf4yfhma34gjkg87v5i4xzxj804g6m52m6y727";
};
prePatch = ''

View file

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "1f0l2cqp2g3llhr9jl6jj15k0wb5q8n29vqj99xy4p5hqs78jk8g";
};
patches = [ ./header-order.patch ];
patches = [ ./header-order.patch ./public-buildproject.patch ];
postPatch = ''
cp campaigns/tutorial-part4.map{,.orig}

View file

@ -0,0 +1,21 @@
diff -Nru glob2-0.9.4.4/src/Game.h glob2-0.9.4.4.new/src/Game.h
--- glob2-0.9.4.4/src/Game.h 2009-08-29 16:39:06.000000000 -0400
+++ glob2-0.9.4.4.new/src/Game.h 2015-08-29 00:59:07.843398596 -0400
@@ -148,7 +148,7 @@
TOP_TO_BOTTOM,
BOTTOM_TO_TOP
};
-
+public:
struct BuildProject
{
int posX;
@@ -158,7 +158,7 @@
int unitWorking;
int unitWorkingFuture;
};
-
+private:
///Initiates Game
void init(GameGUI *gui, MapEdit* edit);

View file

@ -85,17 +85,6 @@ rec {
yankring = YankRing;
CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "CheckAttach-2015-06-22";
src = fetchgit {
url = "git://github.com/chrisbra/CheckAttach";
rev = "a1d86be7e69b25b41ce1a7fe2d2844330f783b68";
sha256 = "b8921c826f5a122e9b128301c620b8b3d3fd88a15a2b0634fdea01062fba2c1f";
};
dependencies = [];
};
CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "CSApprox-2013-07-26";
src = fetchgit {
@ -107,12 +96,23 @@ rec {
};
CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "CheckAttach-2015-06-22";
src = fetchgit {
url = "git://github.com/chrisbra/CheckAttach";
rev = "a1d86be7e69b25b41ce1a7fe2d2844330f783b68";
sha256 = "b8921c826f5a122e9b128301c620b8b3d3fd88a15a2b0634fdea01062fba2c1f";
};
dependencies = [];
};
Gist = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "Gist-2015-07-04";
name = "Gist-2015-08-13";
src = fetchgit {
url = "git://github.com/mattn/gist-vim";
rev = "52e2d54a038baf548de01c9413a6ebc8860fa111";
sha256 = "32b9c0ccc51b846651ac49d496060b842a57ca342bdc1038b16c59c1b34b0ca0";
rev = "ea7dc962c5c2ac2a1c4adc94d54cac190d713648";
sha256 = "0b96a572018de25120fe91eea17b8ee2844881c88ab63e03d999c22fc292f11e";
};
dependencies = [];
@ -152,22 +152,22 @@ rec {
};
Supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "Supertab-2015-02-15";
name = "Supertab-2015-08-23";
src = fetchgit {
url = "git://github.com/ervandew/supertab";
rev = "c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7";
sha256 = "e9e4054c683435b36adf87bebb4895c06a7e85130a807d8c9307588d4744b04b";
rev = "43b98dd2c74977a02473d923c159d4110c94273e";
sha256 = "35255894ad3f6701417b0796d24880d8727e2d4ee05c5bb29c207eb127b435a0";
};
dependencies = [];
};
Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "Syntastic-2015-07-29";
name = "Syntastic-2015-08-14";
src = fetchgit {
url = "git://github.com/scrooloose/syntastic";
rev = "a01107ffa66fdd38d3ea0fcc769f3582349c5a3f";
sha256 = "66b2ef4ad41f30ed409c77e05e637b9c122e62a4acda98d2f89c9205227eba64";
rev = "47c70b3e1e388d8f9cc7c6d9687efc047df843ac";
sha256 = "7c6a1dc4eef9ec29c09f3a6f60792a9df78b4d86b7f41fc278ae95670c24b40a";
};
dependencies = [];
@ -207,22 +207,22 @@ rec {
};
The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "The_NERD_tree-2015-07-13";
name = "The_NERD_tree-2015-07-30";
src = fetchgit {
url = "git://github.com/scrooloose/nerdtree";
rev = "86e2e40af161e65a3ad671214f16f23af360a5a7";
sha256 = "de4f35757f6e14644e59a7ba3e5d0a10ffe04aea9d192f2f81bba24d14c7595c";
rev = "bcf3de4fdffae45fc7c85b6b84a01b37177924aa";
sha256 = "969c3d81f85674303fb295c55da6be3339ffa8658ed98cb20f92eb21551da847";
};
dependencies = [];
};
UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "UltiSnips-2015-07-27";
name = "UltiSnips-2015-08-21";
src = fetchgit {
url = "git://github.com/sirver/ultisnips";
rev = "67fbdb2ad8c965378bdd60c892d3a43049caf3f1";
sha256 = "487fd113adc9a2c66ae6c12cbbd21e283e1a9c024a65910398ecf26322772c07";
rev = "e48d8a28e55e931a3340dae937aa7f66954815ad";
sha256 = "8859aeebd30fc48e481ec11ba7f38c2d91ceae979fbc2045969b077e2b0cf124";
};
dependencies = [];
@ -277,6 +277,17 @@ rec {
};
"css_color_5056" = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "css_color_5056-2015-06-22";
src = fetchgit {
url = "git://github.com/ap/vim-css-color";
rev = "ceb028b27eae0550533501b1f02cb512a482ba85";
sha256 = "d428970699b59b0da89d3cf73be39f62c2751512919fa2773baa241a9f79fccd";
};
dependencies = [];
};
ctrlp = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "ctrlp-2013-07-29";
src = fetchgit {
@ -288,6 +299,28 @@ rec {
};
ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "ctrlp-py-matcher-2015-07-18";
src = fetchgit {
url = "git://github.com/FelikZ/ctrlp-py-matcher";
rev = "9e84cf8072866b92faf5082cb93a554b75e35fd0";
sha256 = "7d4d5f7da148ddc9c8956aca87f53d9d0ff458b8fb4bc4ab2a9bff2ee6026cde";
};
dependencies = [];
};
ctrlp-z = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "ctrlp-z-2013-05-08";
src = fetchgit {
url = "git://github.com/amiorin/ctrlp-z";
rev = "7845735a3d63a68ed63aa3a5363b178c48f199bf";
sha256 = "14c5240e6ab373cbd04d105a46808aed4a324472ddfd67b993534bf5d726e93f";
};
dependencies = [];
};
extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "extradite-2015-01-26";
src = fetchgit {
@ -300,22 +333,22 @@ rec {
};
fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "fugitive-2015-07-20";
name = "fugitive-2015-08-02";
src = fetchgit {
url = "git://github.com/tpope/vim-fugitive";
rev = "03cc95cc198ea94a6a003a92cd0e58af4416ec25";
sha256 = "cab17591d0eeb0fff4520855347467d85baf56b444dd60b797323d164e92a9de";
rev = "b319b694539017dcd789dc2c42f784a30d7b28b8";
sha256 = "88e0ac84a016969cf6231ae3705b931d3ee7d0902417c50d7c1397d80b1534b4";
};
dependencies = [];
};
ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "ghcmod-2015-07-26";
name = "ghcmod-2015-08-05";
src = fetchgit {
url = "git://github.com/eagletmt/ghcmod-vim";
rev = "caf086cd84fe0b26f24f0f93233d4c0c98bce524";
sha256 = "04fa2558baab2b9d93c49f3d984f0ed8196513875095ab7117f39b02087bfeeb";
rev = "ff8fe7d64d0db35be9a753e2c2a289760ab02dd5";
sha256 = "db5a932e4604bed9d4a7d6ff06367f9cae93a87424fc79d2fade7c15061ab563";
};
dependencies = [];
@ -366,11 +399,11 @@ rec {
};
neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "neco-ghc-2015-07-05";
name = "neco-ghc-2015-08-22";
src = fetchgit {
url = "git://github.com/eagletmt/neco-ghc";
rev = "2ad708360c8f64732a0827618cddfd23e89a8664";
sha256 = "ff18dcb7e5b076f88acc51dd508729635a76c619e592db010af6e877ff7afa92";
rev = "8ef2df39c83826f7beeb3ea290e05223e43d8571";
sha256 = "7f688cadf2fdb483d9541dd77a893fdca97dc59bed609a9a38a48293939b1e5b";
};
dependencies = [];
@ -388,11 +421,11 @@ rec {
};
idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "idris-vim-2015-07-19";
name = "idris-vim-2015-08-14";
src = fetchgit {
url = "git://github.com/idris-hackers/idris-vim";
rev = "91b695a9120268a9b9828a0665e89b3c39a1f070";
sha256 = "df16f45fd6c79f44c7da179c6cfc06e1d43aa801832249b12d8134c476db7ff9";
rev = "45680a3c412f2cc8d40aff512e5e9ace44002922";
sha256 = "e053a37cb14228a49be265c5fa1af96d3bae1a5a5ceffdd21e3c4547a79656b1";
};
dependencies = [];
@ -443,22 +476,22 @@ rec {
};
vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-buffergator-2015-07-12";
name = "vim-buffergator-2015-08-15";
src = fetchgit {
url = "git://github.com/jeetsukumaran/vim-buffergator";
rev = "28f818ea0aea6771c153efb91a35fc0ab9a16700";
sha256 = "d19710b41d24b2e5611e5c2977dc7fac47f3d9899b80c44da2f5d08b3538551a";
rev = "ed3bfc2b560f687075d9c2225079bfe43f1f2390";
sha256 = "f2024ecf447e5cca2d66efdb6d31e2890e7210e142728873ab521b8c5ea17c11";
};
dependencies = [];
};
tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "tslime-vim-2015-02-10";
name = "tslime-vim-2015-08-14";
src = fetchgit {
url = "git://github.com/jgdavey/tslime.vim";
rev = "71ec1cbe8f9ead9805f8e0c3b76c590aeb5ed0b7";
sha256 = "81f45f579dcc239ce0b9689044d0e92969f7538759ab0cd88596c7a010d8730b";
rev = "4a8091956e331d7b1d4187a2883b720dfec7e9dd";
sha256 = "e63113f80c056484c462f6d1eb4634cbe4c6c29170f76f4c992adc17b3539a25";
};
dependencies = [];
@ -531,11 +564,11 @@ rec {
};
vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-easymotion-2015-07-25";
name = "vim-easymotion-2015-08-06";
src = fetchgit {
url = "git://github.com/lokaltog/vim-easymotion";
rev = "eab003a0991608464b58c90c56be5d9c6b64d840";
sha256 = "6f5d4942481c41c1a88c45066ea51019ee4ecd4235e0f54c549cb7df2b8b59e6";
rev = "0806257ca6432ac7beb75c4319dadf7f3ba9907b";
sha256 = "529f836da3a546c507ec99f7c827902a75472fefe570a93258360bfa4c253909";
};
dependencies = [];
@ -590,11 +623,11 @@ rec {
};
racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "racer-2015-07-29";
name = "racer-2015-08-25";
src = fetchgit {
url = "git://github.com/phildawes/racer";
rev = "25150ce32e5936b38933d66324830fedb95a8c7c";
sha256 = "40a3d9c22f50f69e45e8f551a655c2ca327fd07b8872059f2938983387e07707";
rev = "7074f2ceb84f121d6b933bacf8f619f313e0fdaf";
sha256 = "0dc7815d6eb2bd7f934a86a7d7c4acfc85097d7f131a23ccaa39216544aaaf7b";
};
dependencies = [];
buildPhase = ''
@ -604,44 +637,44 @@ rec {
};
neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "neocomplete-vim-2015-07-25";
name = "neocomplete-vim-2015-08-22";
src = fetchgit {
url = "git://github.com/shougo/neocomplete.vim";
rev = "aaa1f08b06bfcc2a329dba12a37ce8e1578636bd";
sha256 = "56c2dc4431858432763bcf134ebbc74272d6f3cdd2db5f9a8b21f2e4a8b028c8";
rev = "39661033cce39ebd013451b49809e94ade3ba08c";
sha256 = "7a1482f44ff7a1fb27273d12023da25028c9fa393e6cbfcf9c417fecdb09f0b2";
};
dependencies = [];
};
neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "neosnippet-snippets-2015-07-27";
name = "neosnippet-snippets-2015-08-21";
src = fetchgit {
url = "git://github.com/shougo/neosnippet-snippets";
rev = "a34e67d4b3f91bf2320cd7ce1e85bbd300c6095e";
sha256 = "773170fddb95bc5df1b26abc52e29338f3d5515a5afd99719aa23d9569c5389d";
rev = "f72814aee4f8530b0f22ca9fa814e1e6473ba543";
sha256 = "934177c1c51e3a386f21b678fceaa46a6ea63c7570ab71afa25f35fe30119777";
};
dependencies = [];
};
neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "neosnippet-vim-2015-07-23";
name = "neosnippet-vim-2015-08-25";
src = fetchgit {
url = "git://github.com/shougo/neosnippet.vim";
rev = "e619d43571a675057461f29f2c039dab64728f32";
sha256 = "8682bba6039962c01ffa0f9946a1f2a8e8a37ffda2d32862d72c5ee3d87241c5";
rev = "19dc3db526f4441b7a419dd7899d84d5ab3f599f";
sha256 = "422448182499941494b1280f93a2b6bc7995531bd2f8af2820d52bdc0c000f66";
};
dependencies = [];
};
vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vimproc-vim-2015-07-22";
name = "vimproc-vim-2015-08-22";
src = fetchgit {
url = "git://github.com/shougo/vimproc.vim";
rev = "0555aecded8737435747e903efc4b6f3241cc62c";
sha256 = "0a9445214c6733d21d56ebe278f2e0bc1027b08eb7763df95b8d0ebd34850a60";
rev = "150d5fd04fed462831b99539dfe9920a00a7cea6";
sha256 = "baa6557377d7f64c7cd36bf8f7a5439d31c3d869ec8eb9e1e1e8c0d1c0852ccd";
};
dependencies = [];
buildInputs = [ which ];
@ -656,11 +689,11 @@ rec {
};
vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vimshell-vim-2015-07-25";
name = "vimshell-vim-2015-08-25";
src = fetchgit {
url = "git://github.com/shougo/vimshell.vim";
rev = "adb2a0d95e9b0009d152c35c930eb04875562d87";
sha256 = "fe52fef67c242756c67ec134634b380077e16729d59b1dcd8f50e41512010723";
rev = "05c9001a7fa15aedb444566e2753b901924460a3";
sha256 = "aa68b059d5c9d00189ab50014924c920391b76bc448bdda4d82ab6de4ec8b435";
};
dependencies = [ "vimproc-vim" ];
};
@ -677,11 +710,11 @@ rec {
};
vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-quickrun-2015-07-27";
name = "vim-quickrun-2015-08-09";
src = fetchgit {
url = "git://github.com/thinca/vim-quickrun";
rev = "c22f2f50614a68d8f60ae334cc4545dbc57051a9";
sha256 = "fef4f13c3d1946040cb4e4ceba6a89759fc77c1f72f2f7f038df644620a41398";
rev = "ec9f7f2c26dd49ffaf4f3ce8c6254c76696fbf41";
sha256 = "dc80ac9ee04329e770a549f83a6b167629daf29f513f31af0c076c237e978b5a";
};
dependencies = [];
@ -710,11 +743,11 @@ rec {
};
youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "youcompleteme-2015-07-08";
name = "youcompleteme-2015-08-25";
src = fetchgit {
url = "git://github.com/valloric/youcompleteme";
rev = "b9dd9096a34c1d720878f0058dc3e68f9e9c87ea";
sha256 = "88a3ff421300f53756359ec8e6c901fe96de492091587cf9a5e40b299698f077";
rev = "b7e9871801392b12187191673f492965d142f8ef";
sha256 = "a9db1b251d21048bd5d74914b611cc326dfa0a06737be8782f2077e145f53ca3";
};
dependencies = [];
buildInputs = [
@ -736,7 +769,7 @@ rec {
cd $target/build
cmake -G "Unix Makefiles" . $target/third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON
make ycm_support_libs -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
${bash}/bin/bash $target/install.sh --clang-completer --system-libclang
${python}/bin/python $target/third_party/ycmd/build.py --clang-completer --system-libclang
${vimHelpTags}
vimHelpTags $target
@ -833,11 +866,11 @@ rec {
};
vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-wakatime-2015-07-03";
name = "vim-wakatime-2015-08-25";
src = fetchgit {
url = "git://github.com/wakatime/vim-wakatime";
rev = "28044b7b5f5be812fd34c757632d1d814578ec9b";
sha256 = "74fa0eac0a546c7012b4a6fe5f6cd66eaa2ed40887bc61d468be148dcd538692";
rev = "9bf0d3ec459def5c67a2d9bf5aae8e588a0f3980";
sha256 = "d2ce4a890c0044f0088e335660c001764a4df075eeafc6ab32871b82f7bb728a";
};
dependencies = [];
buildInputs = [ python ];
@ -860,6 +893,17 @@ rec {
'';
};
goyo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "goyo-2015-08-08";
src = fetchgit {
url = "git://github.com/junegunn/goyo.vim";
rev = "c1293a91a3a04bcb82421b2ee711c49f83a418ae";
sha256 = "258b23f4f043569e6e0458c8035d5b00be6031b02e460136f7783da1bbadcc49";
};
dependencies = [];
};
matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "matchit-zip";
src = fetchurl {
@ -882,6 +926,16 @@ rec {
'';
};
molokai = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "molokai-2014-04-11";
src = fetchgit {
url = "git://github.com/tomasr/molokai";
rev = "db8ce13b3737d3ddea8368498183d7c204a762eb";
sha256 = "34587133f0f17b8950ed0428b3deeacc2f15933ede8bfdd000593098ed6d903a";
};
dependencies = [];
};
pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "pathogen-2014-11-06";
src = fetchgit {
@ -971,11 +1025,11 @@ rec {
};
surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "surround-2015-03-15";
name = "surround-2015-08-07";
src = fetchgit {
url = "git://github.com/tpope/vim-surround";
rev = "772ab9587b7d1e2c3bae75395c9123803059ba8a";
sha256 = "5f4c5afecaa99dc67875a2356b46cb6e8daeffca4a00a451965ca022de26cbef";
rev = "2d05440ad23f97a7874ebd9b5de3a0e65d25d85c";
sha256 = "e5372cbb384e747181e3dfe4a53f042da18bd0d6af7a01184850ecb084ddb350";
};
dependencies = [];
@ -1014,22 +1068,22 @@ rec {
};
tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "tlib-2015-05-20";
name = "tlib-2015-08-05";
src = fetchgit {
url = "git://github.com/tomtom/tlib_vim";
rev = "c9ffbef0718a35bd30eb711456e2100e4adf79f7";
sha256 = "b0752538ee629c6f2c52d3b2b2fb61247bcd186ef9610ad8ae5c7d24ea41d971";
rev = "4c128ee2fee6d97cc5c6089e7797b4ad536de2a4";
sha256 = "9cd0fc23bb332d5ae939019929d989b636b891c894f350c38234eaf084e0656c";
};
dependencies = [];
};
undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "undotree-2015-03-01";
name = "undotree-2015-08-19";
src = fetchgit {
url = "git://github.com/mbbill/undotree";
rev = "fa018f38252f58073f2987f8bf0d2d4a61e07277";
sha256 = "c52874b0b85d0a44a1f2f055a74985886af97615bac032259fc21d6ea40d6ca7";
rev = "8ff701a5bdb8d382431eb042e4faf3320883b020";
sha256 = "9c166cb812be486350a3e71eed273a630545d91e3198a214e3dce13b131aeb1d";
};
dependencies = [];
@ -1289,11 +1343,11 @@ rec {
};
vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-gitgutter-2015-07-28";
name = "vim-gitgutter-2015-08-17";
src = fetchgit {
url = "git://github.com/airblade/vim-gitgutter";
rev = "fe10e6474d70c382edcda84dc6bcd6fcd575a6c5";
sha256 = "0266775153760c86e51a83106813936c661717a1c72d4103215739aff9ad1b76";
rev = "0e66fc915c5c7d8f18eb62f69230393465812fc3";
sha256 = "cf66babbacd29eda332b0dada2f3f2fe3f3d84b5ae0bb34291303c6f0d6ecb62";
};
dependencies = [];
@ -1322,11 +1376,11 @@ rec {
};
vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-multiple-cursors-2015-05-29";
name = "vim-multiple-cursors-2015-08-07";
src = fetchgit {
url = "git://github.com/terryma/vim-multiple-cursors";
rev = "3199d34f57e1e20d2dd807b31a5a72d7f7d42e96";
sha256 = "26b43c921b416cc19482d03435516d42a209ab104bac9979b073d0db61e95186";
rev = "e37b9358980d312c1f4fbbcb4a36d1a9d4bdb415";
sha256 = "126694d6b12e710495d390b5df2fa8ae06ca6e2eadec2a04c4a3899287595ce9";
};
dependencies = [];
@ -1343,12 +1397,34 @@ rec {
};
vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-signify-2015-08-13";
src = fetchgit {
url = "git://github.com/mhinz/vim-signify";
rev = "d08f17873e3187da3f9998ddb81d81626ffb9ecf";
sha256 = "7fffc5fbd21dd4f3ea81131ccb52d992d95a73be72288457b2ec3a0fa53ce3b2";
};
dependencies = [];
};
vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-snippets-2015-07-29";
name = "vim-snippets-2015-08-23";
src = fetchgit {
url = "git://github.com/honza/vim-snippets";
rev = "814896e4d29f2b796d076935d7d079c64c351f4f";
sha256 = "173d2f52c0715dd78692b5f1d3368920ed976a05a87887b056526abfd530ffa3";
rev = "21c7f2052057304f9002b42b53391e2c89197a10";
sha256 = "11a5cf8bf8f7fbf9100a69c2457d901143aaaeea5bd29884eb93d8b4439b306d";
};
dependencies = [];
};
vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-webdevicons-2015-08-14";
src = fetchgit {
url = "git://github.com/ryanoasis/vim-devicons";
rev = "771769d21615d08b22f23c32e97e67e95db7d122";
sha256 = "8291c8be6a45d6492ad9ff2972f481d7093fff95c764b3499d0877f5365b3f27";
};
dependencies = [];
@ -1377,13 +1453,14 @@ rec {
};
vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vundle-2015-03-21";
name = "vundle-2015-08-10";
src = fetchgit {
url = "git://github.com/gmarik/vundle";
rev = "cfd3b2d388a8c2e9903d7a9d80a65539aabfe933";
sha256 = "7ce9bb0a59c8f86cedd9b3867b834bcd160f2224c187189997ef76c2bfd99d50";
rev = "0ee36b26e127cda512a8f2852a59e5a5f374c87f";
sha256 = "62fc2b756bd2a8bc9452c61de5babbb1f02de6e8122424a60862be61b8f80af1";
};
dependencies = [];
};
}

View file

@ -1,5 +1,7 @@
"CheckAttach"
"vim-webdevicons"
"css_color%5056"
"CSApprox"
"CheckAttach"
"Gist"
"Gundo"
"Hoogle"
@ -16,6 +18,8 @@
"YankRing"
"commentary"
"ctrlp"
"ctrlp-py-matcher"
"ctrlp-z"
"extradite"
"fugitive"
"ghcmod"
@ -51,6 +55,7 @@
"github:shougo/vimshell.vim"
"github:takac/vim-hardtime"
"github:thinca/vim-quickrun"
"github:tomasr/molokai"
"github:travitch/hasksyn"
"github:twinside/vim-haskellconceal"
"github:valloric/youcompleteme"
@ -63,13 +68,15 @@
"github:vim-scripts/wombat256.vim"
"github:wakatime/vim-wakatime"
"github:wincent/command-t"
"goyo"
"matchit.zip"
"pathogen"
"quickfixstatus"
"rainbow_parentheses"
"rust"
"sleuth"
"sensible"
"sensible"
"sleuth"
"snipmate"
"sourcemap"
"surround"
@ -99,6 +106,7 @@
"vim-latex-live-preview"
"vim-multiple-cursors"
"vim-signature"
"vim-signify"
"vim-snippets"
"vim2hs"
"vimwiki"

View file

@ -4,7 +4,7 @@ with goPackages;
buildGoPackage rec {
name = "skydns-${version}";
version = "2.5.0a";
version = "2.5.2b";
goPackagePath = "github.com/skynetservices/skydns";
@ -12,7 +12,7 @@ buildGoPackage rec {
owner = "skynetservices";
repo = "skydns";
rev = version;
sha256 = "18mw8bcz54i4yrv6pc73s3ffcj1vv9cwnn76c9k0bj1mxp1pmdl2";
sha256 = "01vac6bd71wky5jbd5k4a0x665bjn1cpmw7p655jrdcn5757c2lv";
};
buildInputs = with goPackages; [ go-etcd rcrowley.go-metrics influxdb go-systemd go-log dns stathat osext etcd ];

View file

@ -2,47 +2,41 @@
goPackages.buildGoPackage rec {
name = "prometheus-${version}";
version = "0.14.0";
version = "0.15.1";
goPackagePath = "github.com/prometheus/prometheus";
rev = "67e77411ba30b1b0ce0989c85b6684fb3adef430";
rev = "64349aade284846cb194be184b1b180fca629a7c";
src = fetchFromGitHub {
inherit rev;
owner = "prometheus";
repo = "prometheus";
sha256 = "06xsxigimw5i1fla0k83pf5bpmybskvy50433hs8h876gyvgjxp9";
sha256 = "0gljpwnlip1fnmhbc96hji2rc56xncy97qccm7v1z5j1nhc5fam2";
};
buildInputs = [
goPackages.consul
goPackages.dns
goPackages.fsnotify.v1
goPackages.goleveldb
goPackages.logrus
goPackages.net
goPackages.prometheus.client_golang
goPackages.prometheus.log
goPackages.yaml-v2
vim # for xxd, used in embed-static.sh
buildInputs = with goPackages; [
consul
dns
fsnotify.v1
go-zookeeper
goleveldb
httprouter
logrus
net
prometheus.client_golang
prometheus.log
yaml-v2
];
# Metadata that gets embedded into the binary
buildFlagsArray = ''
buildFlagsArray = let t = "${goPackagePath}/version"; in
''
-ldflags=
-X main.buildVersion ${version}
-X main.buildRevision ${builtins.substring 0 6 rev}
-X main.buildBranch master
-X main.buildUser nix@nixpkgs
-X main.buildDate 20150101-00:00:00
-X main.goVersion ${lib.getVersion goPackages.go}
'';
preBuild = ''
(
cd "go/src/$goPackagePath/web"
${stdenv.shell} ../utility/embed-static.sh static templates \
| gofmt > blob/files.go
)
-X ${t}.Version=${version}
-X ${t}.Revision=${builtins.substring 0 6 rev}
-X ${t}.Branch=master
-X ${t}.BuildUser=nix@nixpkgs
-X ${t}.BuildDate=20150101-00:00:00
-X ${t}.GoVersion=${lib.getVersion goPackages.go}
'';
meta = with lib; {

View file

@ -421,4 +421,8 @@ in
outputs = [ "out" "doc" ];
};
xrdb = attrs: attrs // {
configureFlags = "--with-cpp=${args.mcpp}/bin/mcpp";
};
}

View file

@ -1,8 +1,7 @@
{ stdenv, fetchurl, tcl, makeWrapper }:
let version = "5.45";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
version = "5.45";
name = "expect-${version}";
src = fetchurl {
@ -27,7 +26,8 @@ stdenv.mkDerivation {
for i in $out/bin/*; do
wrapProgram $i \
--prefix PATH : "${tcl}/bin" \
--prefix TCLLIBPATH ' ' $out/lib/*
--prefix TCLLIBPATH ' ' $out/lib/* \
${stdenv.lib.optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version}"}
done
'';
@ -35,7 +35,7 @@ stdenv.mkDerivation {
description = "A tool for automating interactive applications";
homepage = http://expect.nist.gov/;
license = "Expect";
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ wkennington ];
};
}

View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, perl }:
{ fetchurl, stdenv, perl, makeWrapper, procps }:
stdenv.mkDerivation rec {
name = "parallel-20150822";
@ -8,13 +8,14 @@ stdenv.mkDerivation rec {
sha256 = "1ij7bjxhk2866mzh0v0v2m629b6d39r5ivwdzmh72s471m9hg45d";
};
patchPhase = ''
sed -i "src/parallel" -e's|/usr/bin/perl|${perl}/bin/perl|g'
'';
nativeBuildInputs = [ makeWrapper ];
# The `sem' program wants to write to `~/.parallel'.
preBuild = ''
export HOME="$PWD"
preFixup = ''
sed -i 's,#![ ]*/usr/bin/env[ ]*perl,#!${perl}/bin/perl,' $out/bin/*
wrapProgram $out/bin/parallel \
--prefix PATH : "${procps}/bin" \
--prefix PATH : "${perl}/bin" \
'';
doCheck = true;

View file

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, go }:
stdenv.mkDerivation rec {
version = "0.6.0";
version = "0.7.0";
name = "xurls-${version}";
src = fetchFromGitHub {
owner = "mvdan";
repo = "xurls";
rev = "v${version}";
sha256 = "0v9qfvvwy0pq7wp5q19y4a61mcc1sj8vkhvhb8bk603gzprfs10z";
sha256 = "1sdxz1vqm9kidva7lilway69n4fdkqa4kdldx47jriq2hr96s7n0";
};
buildInputs = [ go ];

View file

@ -820,13 +820,13 @@ let
clib = callPackage ../tools/package-management/clib { };
consul = goPackages.consul;
consul = goPackages.consul.bin // { outputs = [ "bin" ]; };
consul-ui = callPackage ../servers/consul/ui.nix { };
consul-alerts = goPackages.consul-alerts;
consul-alerts = goPackages.consul-alerts.bin // { outputs = [ "bin" ]; };
consul-template = goPackages.consul-template;
consul-template = goPackages.consul-template.bin // { outputs = [ "bin" ]; };
corosync = callPackage ../servers/corosync { };
@ -950,7 +950,7 @@ let
mcrypt = callPackage ../tools/misc/mcrypt { };
mongodb-tools = goPackages.mongo-tools;
mongodb-tools = goPackages.mongo-tools.bin // { outputs = [ "bin" ]; };
mstflint = callPackage ../tools/misc/mstflint { };
@ -1703,7 +1703,8 @@ let
gptfdisk = callPackage ../tools/system/gptfdisk { };
grafana = callPackage ../development/tools/misc/grafana { };
grafana-frontend = callPackage ../development/tools/misc/grafana { };
grafana-backend = pkgs.goPackages.grafana.bin // { outputs = [ "bin" ]; };
grafx2 = callPackage ../applications/graphics/grafx2 {};
@ -2155,7 +2156,7 @@ let
lshw = callPackage ../tools/system/lshw { };
lxc = callPackage ../os-specific/linux/lxc { };
lxd = goPackages.lxd;
lxd = goPackages.lxd.bin // { outputs = [ "bin" ]; };
lzip = callPackage ../tools/compression/lzip { };
@ -4076,7 +4077,7 @@ let
go-repo-root = callPackage ../development/tools/misc/go-repo-root { };
gox = goPackages.gox;
gox = goPackages.gox.bin // { outputs = [ "bin" ]; };
gprolog = callPackage ../development/compilers/gprolog { };
@ -7980,11 +7981,6 @@ let
developerBuild = true;
});
qt4SDK = qtcreator.override {
sdkBuild = true;
qtLib = qt48Full;
};
qt53 = callPackage ../development/libraries/qt-5/5.3 {
mesa = mesa_noglu;
cups = if stdenv.isLinux then cups else null;
@ -7997,21 +7993,15 @@ let
qt5 = qt54;
qt5Full = appendToName "full" (qt53.override {
buildDocs = true;
buildExamples = true;
buildTests = true;
developerBuild = true;
qtEnv = callPackage ../development/libraries/qt-5/qt-env.nix {};
qt5Full = appendToName "full" (qtEnv {
qtbase = qt5.base;
paths = lib.filter (x: !(builtins.isFunction x)) (lib.attrValues qt5);
});
qt5SDK = qtcreator.override {
sdkBuild = true;
qtLib = qt5Full;
withDocumentation = true;
};
qtcreator = callPackage ../development/qtcreator {
qtLib = qt5Full; # 3.4 only supports qt5; TODO: use modularized qt>=5.4
qtLib = qt54;
withDocumentation = true;
};
@ -8668,8 +8658,8 @@ let
go = go_1_4;
buildGoPackage = import ../development/go-modules/generic {
go = go_1_4;
govers = go14Packages.govers;
inherit lib;
govers = go14Packages.govers.bin;
inherit parallel lib;
};
overrides = (config.goPackageOverrides or (p: {})) pkgs;
});
@ -8678,8 +8668,8 @@ let
go = go_1_5;
buildGoPackage = import ../development/go-modules/generic {
go = go_1_5;
govers = go15Packages.govers;
inherit lib;
govers = go15Packages.govers.bin;
inherit parallel lib;
};
overrides = (config.goPackageOverrides or (p: {})) pkgs;
});
@ -8962,7 +8952,7 @@ let
dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { };
etcd = goPackages.etcd;
etcd = goPackages.etcd.bin // { outputs = [ "bin" ]; };
ejabberd = callPackage ../servers/xmpp/ejabberd {
erlang = erlangR16;
@ -8979,7 +8969,7 @@ let
v8 = v8_3_24_10;
};
etcdctl = goPackages.etcd;
etcdctl = etcd;
exim = callPackage ../servers/mail/exim { };
@ -9378,7 +9368,7 @@ let
xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig
libxslt expat libpng zlib perl mesa_drivers spice_protocol
dbus libuuid openssl gperf m4 libevdev tradcpp libinput makeWrapper autoreconfHook
dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook
autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman;
bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null;
mesa = mesa_noglu;
@ -10088,7 +10078,7 @@ let
gotags = callPackage ../development/tools/gotags { };
golint = goPackages.lint;
golint = goPackages.lint.bin // { outputs = [ "bin" ]; };
godep = callPackage ../development/tools/godep { };
@ -10803,6 +10793,7 @@ let
callPackage = newScope { boost = boost157; };
} );
bitcoin = altcoins.bitcoin;
bitcoin-xt = altcoins.bitcoin-xt;
aumix = callPackage ../applications/audio/aumix {
gtkGUI = false;
@ -13671,6 +13662,8 @@ let
chessdb = callPackage ../games/chessdb { };
confd = pkgs.goPackages.confd.bin // { outputs = [ "bin" ]; };
construoBase = lowPrio (callPackage ../games/construo {
mesa = null;
freeglut = null;
@ -14423,8 +14416,6 @@ let
### SCIENCE/PROGRAMMING
kframework = callPackage ../applications/science/programming/kframework { };
plm = callPackage ../applications/science/programming/plm { };
### SCIENCE/LOGIC
@ -14534,6 +14525,8 @@ let
camlp5 = ocamlPackages.camlp5_strict;
};
hologram = pkgs.goPackages.hologram.bin // { outputs = [ "bin" ]; };
isabelle = import ../applications/science/logic/isabelle {
inherit (pkgs) stdenv fetchurl nettools perl polyml;
inherit (pkgs.emacs24Packages) proofgeneral;
@ -15135,7 +15128,7 @@ let
utf8proc = callPackage ../development/libraries/utf8proc { };
vault = goPackages.vault;
vault = goPackages.vault.bin // { outputs = [ "bin" ]; };
vbam = callPackage ../misc/emulators/vbam {
inherit (xlibs) libpthreadstubs;

View file

@ -51,9 +51,10 @@ let
};
net = buildFromGitHub {
rev = "3a29182c25eeabbaaf94daaeecbc7823d86261e7";
owner = "golang";
repo = "net";
rev = "3a29182c25eeabbaaf94daaeecbc7823d86261e7";
date = "2015-07-28";
owner = "golang";
repo = "net";
sha256 = "0g4w411l0v9yg8aib05kzjm9j6dwsd6nk6ayk8j0dkmqildqrx5v";
goPackagePath = "golang.org/x/net";
goPackageAliases = [
@ -102,6 +103,7 @@ let
snappy = buildFromGitHub {
rev = "0c7f8a7704bfec561913f4df52c832f094ef56f0";
date = "2015-07-21";
owner = "golang";
repo = "snappy";
sha256 = "17j421ra8jm2da8gc0sk71g3n1nizqsfx1mapn255nvs887lqm0y";
@ -128,12 +130,12 @@ let
preConfigure = ''
# Make the builtin tools available here
mkdir -p $out/bin
mkdir -p $bin/bin
eval $(go env | grep GOTOOLDIR)
find $GOTOOLDIR -type f | while read x; do
ln -sv "$x" "$out/bin"
ln -sv "$x" "$bin/bin"
done
export GOTOOLDIR=$out/bin
export GOTOOLDIR=$bin/bin
'';
excludedPackages = "\\("
@ -378,17 +380,12 @@ let
sha256 = "0xmxy8ay0wzd307x7xba3rmigvr6rjlpfk9fmn6ir2nc97ifv3i0";
};
consul = buildGoPackage rec {
consul = buildFromGitHub rec {
rev = "v0.5.2";
name = "consul-${rev}";
goPackagePath = "github.com/hashicorp/consul";
src = fetchFromGitHub {
inherit rev;
owner = "hashicorp";
repo = "consul";
sha256 = "0p3lc1p346a5ipvkf15l94gn1ml3m7zz6bx0viark3hsv0a7iij7";
};
date = rev;
owner = "hashicorp";
repo = "consul";
sha256 = "0p3lc1p346a5ipvkf15l94gn1ml3m7zz6bx0viark3hsv0a7iij7";
buildInputs = [
circbuf armon.go-metrics go-radix gomdb bolt consul-migrate go-checkpoint
@ -434,18 +431,12 @@ let
buildInputs = [ logrus docopt-go hipchat-go gopherduty ];
};
consul-migrate = buildGoPackage rec {
rev = "4977886fc950a0db1a6f0bbadca56dfabf170f9c";
name = "consul-migrate-${stdenv.lib.strings.substring 0 7 rev}";
goPackagePath = "github.com/hashicorp/consul-migrate";
src = fetchFromGitHub {
inherit rev;
owner = "hashicorp";
repo = "consul-migrate";
sha256 = "0kjziwhz1ifj4wpy5viba6z17sfgjjibdhnn73ffp7q5q8abg8w3";
};
consul-migrate = buildFromGitHub {
rev = "678fb10cdeae25ab309e99e655148f0bf65f9710";
date = "2015-05-19";
owner = "hashicorp";
repo = "consul-migrate";
sha256 = "18zqyzbc3pny700fnh4hi45i5mlsramqykikcr7lgyx7id6alf16";
buildInputs = [ raft raft-boltdb raft-mdb ];
};
@ -531,10 +522,11 @@ let
};
dns = buildFromGitHub {
rev = "bb1103f648f811d2018d4bedcb2d4b2bce34a0f1";
rev = "e59f851c912767b1db587dcabee6e6652e495c75";
date = "2015-07-22";
owner = "miekg";
repo = "dns";
sha256 = "1c1gasvzlcmgwyqhksm656p03nc76kxjxllbcw9bwfy5v7p9w7qq";
sha256 = "1zcj4drmmskwvjy5ld54qd8a34ls9651ysl3q7c2bcambax5r0hp";
};
docopt-go = buildFromGitHub {
@ -792,32 +784,22 @@ let
sha256 = "1xx6lpv1r2sji8m9w35a2fkr9v4vsgvxrrahcq9bdg75qvadq91d";
};
golang_protobuf_extensions = buildGoPackage rec {
rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a";
name = "golang-protobuf-extensions-${stdenv.lib.strings.substring 0 7 rev}";
goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
src = fetchFromGitHub {
inherit rev;
owner = "matttproud";
repo = "golang_protobuf_extensions";
sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj";
};
golang_protobuf_extensions = buildFromGitHub {
rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a";
date = "2015-04-06";
owner = "matttproud";
repo = "golang_protobuf_extensions";
sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj";
buildInputs = [ protobuf ];
};
goleveldb = buildGoPackage rec {
rev = "e9e2c8f6d3b9c313fb4acaac5ab06285bcf30b04";
name = "goleveldb-${stdenv.lib.strings.substring 0 7 rev}";
goPackagePath = "github.com/syndtr/goleveldb";
src = fetchFromGitHub {
inherit rev;
owner = "syndtr";
repo = "goleveldb";
sha256 = "0vg3pcrbdhbmanwkc5njxagi64f4k2ikfm173allcghxcjamrkwv";
};
propagatedBuildInputs = [ ginkgo gomega gosnappy ];
goleveldb = buildFromGitHub {
rev = "183614d6b32571e867df4cf086f5480ceefbdfac";
date = "2015-06-17";
owner = "syndtr";
repo = "goleveldb";
sha256 = "0crslwglkh8b3204l4zvav712a7yd2ykjnbrnny6yrq94mlvba8r";
propagatedBuildInputs = [ ginkgo gomega snappy ];
};
gollectd = buildFromGitHub {
@ -1331,6 +1313,7 @@ let
go-zookeeper = buildFromGitHub {
rev = "5bb5cfc093ad18a28148c578f8632cfdb4d802e4";
date = "2015-06-02";
owner = "samuel";
repo = "go-zookeeper";
sha256 = "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z";
@ -1343,7 +1326,6 @@ let
repo = "lint";
sha256 = "1bj7zv534hyh87bp2vsbhp94qijc5nixb06li1dzfz9n0wcmlqw9";
excludedPackages = "testdata";
dontInstallSrc = true;
buildInputs = [ tools ];
};
@ -1457,10 +1439,11 @@ let
};
httprouter = buildFromGitHub {
rev = "bde5c16eb82ff15a1734a3818d9b9547065f65b1";
rev = "6aacfd5ab513e34f7e64ea9627ab9670371b34e7";
date = "2015-07-08";
owner = "julienschmidt";
repo = "httprouter";
sha256 = "1l74pvqqhhval4vfnhca9d6i1ij69qs3ljf41w3m1l2id42rq7r9";
sha256 = "00rrjysmq898qcrf2hfwfh9s70vwvmjx2kp5w03nz1krxa4zhrkl";
};
inf = buildFromGitHub {
@ -1562,7 +1545,7 @@ let
levigo = buildGoPackage rec {
rev = "1ddad808d437abb2b8a55a950ec2616caa88969b";
name = "logrus-${stdenv.lib.strings.substring 0 7 rev}";
name = "levigo-${stdenv.lib.strings.substring 0 7 rev}";
goPackagePath = "github.com/jmhodges/levigo";
excludedPackages = "examples";
@ -1621,20 +1604,13 @@ let
propagatedBuildInputs = [ go-colortext ];
};
logrus = buildGoPackage rec {
rev = "v0.8.2";
name = "logrus-${stdenv.lib.strings.substring 0 7 rev}";
goPackagePath = "github.com/Sirupsen/logrus";
logrus = buildFromGitHub rec {
rev = "v0.8.6";
date = rev; # Trick buildFromGitHub into keeping the version number.
owner = "Sirupsen";
repo = "logrus";
sha256 = "1v2qcjy6w24jgdm7kk0f8lqpa25qxzll2x6ycqwidd3pzjhrkifa";
excludedPackages = "examples";
src = fetchFromGitHub {
inherit rev;
owner = "Sirupsen";
repo = "logrus";
sha256 = "0isihf185bw54yc72mbkf3cgfh7xj0x8ky04fs52xpj6vrmd72bv";
};
propagatedBuildInputs = [ airbrake-go bugsnag-go raven-go ];
};
@ -1742,11 +1718,11 @@ let
# Mongodb incorrectly names all of their binaries main
# Let's work around this with our own installer
installPhase = ''
mkdir -p $out/bin
mkdir -p $bin/bin
while read b; do
rm -f go/bin/main
go install $goPackagePath/$b/main
cp go/bin/main $out/bin/$b
cp go/bin/main $bin/bin/$b
done < <(find go/src/$goPackagePath -name main | xargs dirname | xargs basename -a)
'';
};
@ -1932,17 +1908,13 @@ let
sha256 = "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam";
};
beorn7.perks = buildGoPackage rec {
rev = "b965b613227fddccbfffe13eae360ed3fa822f8d";
name = "beorn7.perks-${stdenv.lib.strings.substring 0 7 rev}";
beorn7.perks = buildFromGitHub rec {
date = "2015-02-23";
owner = "beorn7";
repo = "perks";
rev = "b965b613227fddccbfffe13eae360ed3fa822f8d";
sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk";
goPackagePath = "github.com/beorn7/perks";
src = fetchFromGitHub {
inherit rev;
owner = "beorn7";
repo = "perks";
sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk";
};
};
pflag = buildGoPackage rec {
@ -2000,11 +1972,12 @@ let
propagatedBuildInputs = [ kr.text ];
};
prometheus.client_golang = buildFromGitHub {
rev = "3a499bf7fc46bc58337ce612d0cbb29c550b8118";
prometheus.client_golang = buildFromGitHub rec {
rev = "0.7.0";
date = rev; # Trick buildFromGitHub into keeping the version number
owner = "prometheus";
repo = "client_golang";
sha256 = "1hf79m83kr3b6nxxwz8qw1c5nls58j1xfaz7q6k6bb9kwabpc3gi";
sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna";
propagatedBuildInputs = [
goautoneg
protobuf
@ -2016,43 +1989,30 @@ let
excludedPackages = "examples";
};
prometheus.client_model = buildGoPackage rec {
rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
name = "prometheus-client-model-${stdenv.lib.strings.substring 0 7 rev}";
goPackagePath = "github.com/prometheus/client_model";
src = fetchFromGitHub {
inherit rev;
owner = "prometheus";
repo = "client_model";
sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
};
prometheus.client_model = buildFromGitHub {
rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
date = "2015-02-12";
owner = "prometheus";
repo = "client_model";
sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
buildInputs = [ protobuf ];
};
prometheus.log = buildGoPackage rec {
name = "prometheus-log-${version}";
version = "git-2015-05-29";
goPackagePath = "github.com/prometheus/log";
src = fetchFromGitHub {
rev = "439e5db48fbb50ebbaf2c816030473a62f505f55";
owner = "prometheus";
repo = "log";
sha256 = "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv";
};
prometheus.log = buildFromGitHub {
rev = "439e5db48fbb50ebbaf2c816030473a62f505f55";
date = "2015-05-29";
owner = "prometheus";
repo = "log";
sha256 = "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv";
propagatedBuildInputs = [ logrus ];
};
prometheus.procfs = buildGoPackage rec {
rev = "351fbfac67c8ae8bcacd468f678f5e8d5a585d3d";
name = "prometheus-procfs-${stdenv.lib.strings.substring 0 7 rev}";
goPackagePath = "github.com/prometheus/procfs";
src = fetchFromGitHub {
inherit rev;
owner = "prometheus";
repo = "procfs";
sha256 = "0hxssp6h1cs7l2cvnxj1hyacy3328hhpi1pd123f2a57aikha9ff";
};
prometheus.procfs = buildFromGitHub {
rev = "c91d8eefde16bd047416409eb56353ea84a186e4";
date = "2015-06-16";
owner = "prometheus";
repo = "procfs";
sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r";
};
pty = buildFromGitHub {
@ -2122,10 +2082,11 @@ let
};
raven-go = buildFromGitHub {
rev = "c8f8fb7c415203f52ca882e2661d21bc6dcb54d7";
rev = "74c334d7b8aaa4fd1b4fc6aa428c36fed1699e28";
date = "2015-07-21";
owner = "getsentry";
repo = "raven-go";
sha256 = "052avpl8xsqlcmjmi3v00nm23lhs95af6vpaw2sh5xckln0lfbxh";
sha256 = "1356a7h8zp1mcywnr0y83w0h4qdblp65rcf9slbx667n8x2rzda8";
};
redigo = buildFromGitHub {

View file

@ -3513,20 +3513,34 @@ let
gcutil = buildPythonPackage rec {
name = "gcutil-1.16.1";
meta.maintainers = with maintainers; [ phreedom ];
src = pkgs.fetchurl {
url = https://dl.google.com/dl/cloudsdk/release/artifacts/gcutil-1.16.1.tar.gz;
sha256 = "00jaf7x1ji9y46fbkww2sg6r6almrqfsprydz3q2swr4jrnrsx9x";
};
propagatedBuildInputs = with self; [
gflags
iso8601
ipaddr
httplib2
google_apputils
google_api_python_client
];
prePatch = ''
sed -i -e "s|google-apputils==0.4.0|google-apputils==0.4.1|g" setup.py
substituteInPlace setup.py \
--replace "httplib2==0.8" "httplib2" \
--replace "iso8601==0.1.4" "iso8601"
'';
propagatedBuildInputs = with self; [ gflags iso8601 ipaddr httplib2 google_apputils google_api_python_client ];
meta = {
description = "Command-line tool for interacting with Google Compute Engine.";
homepage = "https://cloud.google.com/compute/docs/gcutil/";
license = licenses.asl20;
maintainers = with maintainers; [ phreedom ];
};
};
gmpy = buildPythonPackage rec {
@ -3552,7 +3566,7 @@ let
gmpy2 = buildPythonPackage rec {
name = "gmpy2-2.0.6";
disabled = isPyPy;
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/g/gmpy2/${name}.zip";
md5 = "7365d880953ba54c2cdcf171c7e19b2b";
@ -6241,7 +6255,7 @@ let
description = "Coroutine-based networking library";
homepage = http://www.gevent.org/;
license = licenses.mit;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ bjornfor ];
};
};
@ -6805,14 +6819,16 @@ let
};
};
importlib = if isPy26 then (buildPythonPackage {
importlib = buildPythonPackage rec {
name = "importlib-1.0.2";
disabled = (!isPy26) || isPyPy;
src = pkgs.fetchurl {
url = "http://pypi.python.org/packages/source/i/importlib/importlib-1.0.2.tar.gz";
md5 = "4aa23397da8bd7c7426864e88e4db7e1";
};
doCheck = false;
}) else null;
};
influxdb = buildPythonPackage rec {
name = "influxdb-0.1.12";
@ -8406,7 +8422,7 @@ let
nose
modules.sqlite3
];
# Test does not work on Py3k because it calls 'python'.
# https://github.com/nipy/nibabel/issues/341
preCheck = ''
@ -9862,7 +9878,7 @@ let
protobuf2_5 = self.protobufBuild pkgs.protobuf2_5;
protobufBuild = protobuf: buildPythonPackage rec {
inherit (protobuf) name src;
disabled = isPy3k;
disabled = isPy3k || isPyPy;
propagatedBuildInputs = with self; [ protobuf google_apputils ];
@ -10324,6 +10340,10 @@ let
sha256 = "1mrh233pj584gf7la64d4xlmvdnfl4jwpxs95lnd3i4zd5drid14";
};
prePatch = ''
sed -i -e "s|if type(driver_id)==int|if type(driver_id) in (int, long)|g" cdio.py
'';
preConfigure = ''
patchShebangs .
'';
@ -11821,35 +11841,36 @@ let
};
};
qscintilla = pkgs.stdenv.mkDerivation rec {
# TODO: Qt5 support
name = "qscintilla-${version}";
version = pkgs.qscintilla.version;
disabled = isPy3k || isPyPy;
qscintilla = if isPy3k || isPyPy
then throw "qscintilla-${pkgs.qscintilla.version} not supported for interpreter ${python.executable}"
else pkgs.stdenv.mkDerivation rec {
# TODO: Qt5 support
name = "qscintilla-${version}";
version = pkgs.qscintilla.version;
src = pkgs.qscintilla.src;
src = pkgs.qscintilla.src;
buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ];
buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ];
preConfigure = ''
mkdir -p $out
lndir ${pkgs.pyqt4} $out
cd Python
${python.executable} ./configure-old.py \
--destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \
--apidir $out/api/${python.libPrefix} \
-n ${pkgs.qscintilla}/include \
-o ${pkgs.qscintilla}/lib \
--sipdir $out/share/sip
'';
preConfigure = ''
mkdir -p $out
lndir ${pkgs.pyqt4} $out
cd Python
${python.executable} ./configure-old.py \
--destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \
--apidir $out/api/${python.libPrefix} \
-n ${pkgs.qscintilla}/include \
-o ${pkgs.qscintilla}/lib \
--sipdir $out/share/sip
'';
meta = with stdenv.lib; {
description = "A Python binding to QScintilla, Qt based text editing control";
license = licenses.lgpl21Plus;
maintainers = [ "abcz2.uprola@gmail.com" ];
platforms = platforms.linux;
meta = with stdenv.lib; {
description = "A Python binding to QScintilla, Qt based text editing control";
license = licenses.lgpl21Plus;
maintainers = [ "abcz2.uprola@gmail.com" ];
platforms = platforms.linux;
};
};
};
qserve = buildPythonPackage rec {
@ -13270,6 +13291,10 @@ let
};
});
spyder = callPackage ../applications/science/spyder {
rope = if isPy3k then null else self.rope;
};
sqlalchemy = self.sqlalchemy9.override rec {
name = "SQLAlchemy-0.7.10";
disabled = isPy34;