diff --git a/lib/maintainers.nix b/lib/maintainers.nix index a1ec32aba0e..4ad066b7599 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -14,6 +14,7 @@ aflatter = "Alexander Flatter "; aherrmann = "Andreas Herrmann "; ak = "Alexander Kjeldaas "; + akaWolf = "Artjom Vejsel "; akc = "Anders Claesson "; algorith = "Dries Van Daele "; all = "Nix Committers "; @@ -67,7 +68,7 @@ couchemar = "Andrey Pavlov "; cstrahan = "Charles Strahan "; cwoac = "Oliver Matthews "; - DamienCassou = "Damien Cassou "; + DamienCassou = "Damien Cassou "; davidrusu = "David Rusu "; dbohdan = "Danyil Bohdan "; DerGuteMoritz = "Moritz Heidkamp "; @@ -123,6 +124,7 @@ jagajaga = "Arseniy Seroka "; jb55 = "William Casarin "; jcumming = "Jack Cummings "; + jefdaj = "Jeffrey David Johnson "; jfb = "James Felix Black "; jgeerds = "Jascha Geerds "; jirkamarsik = "Jirka Marsik "; diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index 4fef62cbffd..202639f9870 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -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 - ''; }; } diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 0aa8ee0da82..474b93b4984 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -192,6 +192,16 @@ let description = "Whether to log authentication failures in /var/log/faillog."; }; + 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"} ''; }; diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index 99915438f92..ba09f04d502 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -105,7 +105,7 @@ in { tokenAuth = mkOption { description = '' Kubernetes apiserver token authentication file. See - + ''; default = {}; example = literalExample '' @@ -120,7 +120,7 @@ in { authorizationMode = mkOption { description = '' Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC). See - + ''; default = "AlwaysAllow"; type = types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC"]; @@ -129,7 +129,7 @@ in { authorizationPolicy = mkOption { description = '' Kubernetes apiserver authorization policy file. See - + ''; default = []; example = literalExample '' @@ -159,18 +159,37 @@ in { }; runtimeConfig = mkOption { - description = "Api runtime configuration"; + description = '' + Api runtime configuration. See + + ''; 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 + + ''; 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"; }; }; }) diff --git a/nixos/modules/services/misc/confd.nix b/nixos/modules/services/misc/confd.nix index 98738b6497b..50532a8a16f 100644 --- a/nixos/modules/services/misc/confd.nix +++ b/nixos/modules/services/misc/confd.nix @@ -63,7 +63,7 @@ in { package = mkOption { description = "Confd package to use."; - default = pkgs.goPackages.confd; + default = pkgs.confd; type = types.package; }; }; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 6a1799dedc8..f987c4792e9 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -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"; }; diff --git a/nixos/modules/services/security/hologram.nix b/nixos/modules/services/security/hologram.nix index f9abf38942f..58f308df7a2 100644 --- a/nixos/modules/services/security/hologram.nix +++ b/nixos/modules/services/security/hologram.nix @@ -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}"; }; }; }; diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index 69ca13a7147..b5155246fda 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -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 = '' diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix new file mode 100644 index 00000000000..e6c95729c6e --- /dev/null +++ b/pkgs/applications/altcoins/bitcoin-xt.nix @@ -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; + }; +} diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index a49e4dc9f90..762ef804f83 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -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; }; diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index ffd920427ac..c9d9ad57487 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -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; { diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 7f8a42b077e..abea6201e75 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -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; diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 828019011fc..e768a692f59 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -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 ]; diff --git a/pkgs/applications/misc/xca/0001-Fix-for-openssl-1.0.1i.patch b/pkgs/applications/misc/xca/0001-Fix-for-openssl-1.0.1i.patch deleted file mode 100644 index 9bfe3831c4a..00000000000 --- a/pkgs/applications/misc/xca/0001-Fix-for-openssl-1.0.1i.patch +++ /dev/null @@ -1,57 +0,0 @@ -From abd9d530776e8bb6d8f05312fc3ae3044796139c Mon Sep 17 00:00:00 2001 -From: Oliver Winker -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 -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 - Reviewed-by: Kurt Roeckx - Reviewed-by: Tim Hudson ---- ---- - 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 - diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index d5fa5e5ec56..fdd136cc838 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -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" diff --git a/pkgs/applications/science/programming/kframework/default.nix b/pkgs/applications/science/programming/kframework/default.nix deleted file mode 100644 index e8a4f2b3156..00000000000 --- a/pkgs/applications/science/programming/kframework/default.nix +++ /dev/null @@ -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 - }; -} diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 806d2f546cf..c068847c331 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -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 ]; diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index 15035a345d4..62a58ee985c 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -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" ) ''; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 6ad59a087e9..2363ccd910b 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -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 diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index bc1f9a9043d..861a12f1f09 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -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 ]; diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index f0d3be6487c..5d65fbc0dea 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -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; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5e135a99973..e107e0b1458 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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; + } diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix index 464d2f66e45..e3dfc9fe0a9 100644 --- a/pkgs/development/libraries/getdata/default.nix +++ b/pkgs/development/libraries/getdata/default.nix @@ -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; { diff --git a/pkgs/development/libraries/qt-5/5.3/0014-mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.3/0014-mkspecs-libgl.patch new file mode 100644 index 00000000000..94a031d1257 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.3/0014-mkspecs-libgl.patch @@ -0,0 +1,15 @@ +Ensure Qt knows where libGL is. + +Author: Bjørn Forsman +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 = diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix index 7f4e0b60c2d..d1a049d78a7 100644 --- a/pkgs/development/libraries/qt-5/5.3/default.nix +++ b/pkgs/development/libraries/qt-5/5.3/default.nix @@ -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" diff --git a/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch new file mode 100644 index 00000000000..94a031d1257 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch @@ -0,0 +1,15 @@ +Ensure Qt knows where libGL is. + +Author: Bjørn Forsman +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 = diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix index 6ec57787e22..2e4a1c1c161 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix @@ -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 = '' diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix new file mode 100644 index 00000000000..01ddbf31428 --- /dev/null +++ b/pkgs/development/libraries/qt-5/qt-env.nix @@ -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" < 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; { diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 71185643a9e..2036e62ee94 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -421,4 +421,8 @@ in outputs = [ "out" "doc" ]; }; + xrdb = attrs: attrs // { + configureFlags = "--with-cpp=${args.mcpp}/bin/mcpp"; + }; + } diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index c91d418d870..a50717d5399 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -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 ]; }; } diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 4a3b90f56d8..d96ca1080d8 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -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; diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix index 15581744173..531af472cb4 100644 --- a/pkgs/tools/text/xurls/default.nix +++ b/pkgs/tools/text/xurls/default.nix @@ -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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b19e384f823..8222886f241 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 7c319e36517..6b93b4ec244 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -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 { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ab9738c6c7..3dc84c72c45 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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;