diff options
author | Orivej Desh <orivej@gmx.fr> | 2017-12-10 15:24:30 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2017-12-10 15:24:30 +0000 |
commit | dd604d575f59c771965d6d5d4707505ea7374012 (patch) | |
tree | bc9a34d5a9c3843140f23d9366db7352a345a4e1 /pkgs/top-level | |
parent | 926aaa48702a1a18c1179b72a8832f25842401ca (diff) | |
parent | b459c8475c58f7c8d529ebeadcbebbfe00ddf6eb (diff) | |
download | nixlib-dd604d575f59c771965d6d5d4707505ea7374012.tar nixlib-dd604d575f59c771965d6d5d4707505ea7374012.tar.gz nixlib-dd604d575f59c771965d6d5d4707505ea7374012.tar.bz2 nixlib-dd604d575f59c771965d6d5d4707505ea7374012.tar.lz nixlib-dd604d575f59c771965d6d5d4707505ea7374012.tar.xz nixlib-dd604d575f59c771965d6d5d4707505ea7374012.tar.zst nixlib-dd604d575f59c771965d6d5d4707505ea7374012.zip |
Merge branch 'master' into staging
* master: (39 commits) pythonPackages: rename dns -> dnspython awesome: fix LUA_PATH/LUA_CPATH to lgi [now for version 3.5] qt4: fix qmake on darwin and delete custom install phase python.buildEnv: always include the $out output nix-bash-completions: lazy load aware install borg: 1.1.1 -> 1.1.3 nixos/programs/bash: document that /etc/bash_completion.d is obsolete ocamlPackages.markup: 0.7.4 -> 0.7.5 hhvm: 3.21 -> 3.23.2 ocamlPackages.ulex: 1.1 -> 1.2 notmuch: 0.25.2 -> 0.25.3 gmime3: 3.0.1 -> 3.0.5 qt4: fix darwin install phase nixos/programs/bash: Let bash-completion lazy load scripts Revert "gmime: 3.0.1 -> 3.0.5" rawtherapee: delete unused files pythonPackages: rename dns -> dnspython nixpkgs: remove sqlite/kyotocabinet deps for leveldb tor-browser-bundle-bin: 7.0.10 -> 7.0.11 networkmanager: remove restart after suspend from resume ...
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 13 | ||||
-rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 17 |
3 files changed, 18 insertions, 14 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2be5e568fe7c..8840d70bc131 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6277,7 +6277,7 @@ with pkgs; metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { }; - ber_metaocaml_003 = callPackage ../development/compilers/ocaml/ber-metaocaml-003.nix { }; + ber_metaocaml = callPackage ../development/compilers/ocaml/ber-metaocaml-104.nix { }; ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; @@ -13923,8 +13923,7 @@ with pkgs; altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins { } ); bitcoin = altcoins.bitcoin; bitcoin-xt = altcoins.bitcoin-xt; - - cryptop = callPackage ../applications/altcoins/cryptop { }; + cryptop = altcoins.cryptop; libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix { secp256k1 = secp256k1.override { enableECDH = true; }; @@ -16527,14 +16526,8 @@ with pkgs; rawtherapee = callPackage ../applications/graphics/rawtherapee { fftw = fftwSinglePrec; - cmake = cmake_2_8; # problems after 3.4 -> 3.6.0 }; - rawtherapee-git = lowPrio (callPackage ../applications/graphics/rawtherapee/dev.nix { - fftw = fftwSinglePrec; - cmake = cmake_2_8; # problems after 3.4 -> 3.6.0 - }); - rclone = callPackage ../applications/networking/sync/rclone { }; rcs = callPackage ../applications/version-management/rcs { }; @@ -19448,6 +19441,8 @@ with pkgs; kompose = callPackage ../applications/networking/cluster/kompose { }; + kontemplate = callPackage ../applications/networking/cluster/kontemplate { }; + kops = callPackage ../applications/networking/cluster/kops { }; lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 2003f30ef2e2..52a921dcc0ed 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -369,7 +369,7 @@ let magick = callPackage ../development/ocaml-modules/magick { }; - markup = callPackage ../development/ocaml-modules/markup { lwt = lwt2; }; + markup = callPackage ../development/ocaml-modules/markup { lwt = ocaml_lwt; }; menhir = callPackage ../development/ocaml-modules/menhir { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8affc1249bfb..5b10697deb43 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4523,7 +4523,8 @@ in { discogs_client = callPackage ../development/python-modules/discogs_client { }; - dns = callPackage ../development/python-modules/dns { }; + dnspython = callPackage ../development/python-modules/dnspython { }; + dns = self.dnspython; # Alias for compatibility, 2017-12-10 docker = callPackage ../development/python-modules/docker {}; @@ -5600,6 +5601,14 @@ in { }; }; + gurobipy = if stdenv.system == "x86_64-darwin" + then callPackage ../development/python-modules/gurobipy/darwin.nix { + inherit (pkgs.darwin) cctools insert_dylib; + } + else if stdenv.system == "x86_64-linux" + then callPackage ../development/python-modules/gurobipy/linux.nix {} + else throw "gurobipy not yet supported on ${stdenv.system}"; + helper = buildPythonPackage rec { pname = "helper"; version = "2.4.1"; @@ -11830,7 +11839,7 @@ in { name = "sleekxmpp-${version}"; version = "1.3.1"; - propagatedBuildInputs = with self ; [ dns pyasn1 ]; + propagatedBuildInputs = with self ; [ dnspython pyasn1 ]; src = pkgs.fetchurl { url = "mirror://pypi/s/sleekxmpp/${name}.tar.gz"; @@ -16674,7 +16683,7 @@ in { buildInputs = with self; [ nose mock pyopenssl ]; - propagatedBuildInputs = with self; [ urllib3 dns]; + propagatedBuildInputs = with self; [ urllib3 dnspython ]; postPatch = '' sed -i '19s/dns/"dnspython"/' setup.py @@ -18544,7 +18553,7 @@ in { nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with pkgs; [ alsaLib ffmpeg libv4l sqlite libvpx ]; - propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml python-otr ]; + propagatedBuildInputs = with self; [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ]; }; |