diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2017-01-24 17:59:56 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-24 17:59:56 +0000 |
commit | e08cae373b40a4e2bffff66f535e6628b08bd2c1 (patch) | |
tree | 20d25f1d3c10f9083918ec78812685ffd3dafa86 /pkgs/top-level | |
parent | 0f91cdc45f943934a8317992326b43c4e68cda56 (diff) | |
parent | 2bcc678f5ad1eca9997b8740aef03aeda47746a8 (diff) | |
download | nixlib-e08cae373b40a4e2bffff66f535e6628b08bd2c1.tar nixlib-e08cae373b40a4e2bffff66f535e6628b08bd2c1.tar.gz nixlib-e08cae373b40a4e2bffff66f535e6628b08bd2c1.tar.bz2 nixlib-e08cae373b40a4e2bffff66f535e6628b08bd2c1.tar.lz nixlib-e08cae373b40a4e2bffff66f535e6628b08bd2c1.tar.xz nixlib-e08cae373b40a4e2bffff66f535e6628b08bd2c1.tar.zst nixlib-e08cae373b40a4e2bffff66f535e6628b08bd2c1.zip |
Merge branch 'master' into kwm
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 | 4 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 14 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 30 |
4 files changed, 45 insertions, 16 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5dd7ed8ad394..8e7bb79858f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -526,6 +526,10 @@ in kwm = callPackage ../os-specific/darwin/kwm { }; + khd = callPackage ../os-specific/darwin/khd { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; + reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {}; install_name_tool = callPackage ../os-specific/darwin/install_name_tool { }; @@ -2363,6 +2367,8 @@ in gcc = gcc49; # doesn't build with gcc5 }; + journalbeat = callPackage ../tools/system/journalbeat { }; + jp = callPackage ../development/tools/jp { }; jp2a = callPackage ../applications/misc/jp2a { }; @@ -11245,7 +11251,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.4" - kernelPatches.p9_caching_4_4 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -11262,6 +11267,7 @@ in # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking # kernelPatches.cpu-cgroup-v2."4.7" kernelPatches.modinst_arg_list_too_long + kernelPatches.p9_caching_4_9 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -11274,6 +11280,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long + kernelPatches.p9_caching_4_9 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill @@ -11674,6 +11681,8 @@ in powerdns = callPackage ../servers/dns/powerdns { }; + pdns-recursor = callPackage ../servers/dns/pdns-recursor { }; + powertop = callPackage ../os-specific/linux/powertop { }; prayer = callPackage ../servers/prayer { }; @@ -18044,4 +18053,6 @@ in simplenote = callPackage ../applications/misc/simplenote { }; hy = callPackage ../development/interpreters/hy {}; + + ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; } diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 199bc04f9bf4..eb3553f55612 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -20,6 +20,8 @@ let ansiterminal = callPackage ../development/ocaml-modules/ansiterminal { }; + apron = callPackage ../development/ocaml-modules/apron { }; + asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { }; astring = callPackage ../development/ocaml-modules/astring { }; @@ -265,6 +267,8 @@ let mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; + mlgmpidl = callPackage ../development/ocaml-modules/mlgmpidl { }; + nocrypto = callPackage ../development/ocaml-modules/nocrypto { lwt = ocaml_lwt; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0b4f53ac8613..9d8bf6930782 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8599,17 +8599,16 @@ let self = _self // overrides; _self = with self; { }; MooXTypesMooseLikeNumeric = buildPerlPackage rec { - name = "MooX-Types-MooseLike-Numeric-1.02"; + name = "MooX-Types-MooseLike-Numeric-1.03"; src = fetchurl { url = "mirror://cpan/authors/id/M/MA/MATEU/${name}.tar.gz"; - sha256 = "6186f75ab2747723fd979249ec6ee0c4550f5b47aa50c0d222cc7d3590182bb6"; + sha256 = "16adeb617b963d010179922c2e4e8762df77c75232e17320b459868c4970c44b"; }; - buildInputs = [ TestFatal ]; + buildInputs = [ Moo TestFatal ]; propagatedBuildInputs = [ MooXTypesMooseLike ]; meta = { description = "Moo types for numbers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = [ maintainers.rycee ]; }; }; @@ -9138,18 +9137,17 @@ let self = _self // overrides; _self = with self; { }; MooseXTypesCommon = buildPerlPackage rec { - name = "MooseX-Types-Common-0.001013"; + name = "MooseX-Types-Common-0.001014"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "ff0c963f5e8304acb5f64bdf9ba1f19284311148e1a8f0d1f81f123f9950f5f2"; + sha256 = "ef93718b6d2f240d50b5c3acb1a74b4c2a191869651470001a82be1f35d0ef0f"; }; buildInputs = [ ModuleBuildTiny TestDeep TestWarnings perl ]; - propagatedBuildInputs = [ MooseXTypes ]; + propagatedBuildInputs = [ MooseXTypes self."if" ]; meta = { homepage = https://github.com/moose/MooseX-Types-Common; description = "A library of commonly used type constraints"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ rycee ]; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ffb1aefdd336..061dcd68f9b6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11778,14 +11778,21 @@ in { }); foolscap = buildPythonPackage (rec { - name = "foolscap-0.10.1"; + name = "foolscap-${version}"; + version = "0.12.6"; src = pkgs.fetchurl { - url = "http://foolscap.lothar.com/releases/${name}.tar.gz"; - sha256 = "1wrnbdq3y3lfxnhx30yj9xbr3iy9512jb60k8qi1da1phalnwz5x"; + url = "mirror://pypi/f/foolscap/${name}.tar.gz"; + sha256 = "1bpmqq6485mmr5jza9q2c55l9m1bfsvsbd9drsip7p5qcsi22jrz"; }; - propagatedBuildInputs = [ self.twisted self.pyopenssl self.service-identity ]; + propagatedBuildInputs = with self; [ mock twisted pyopenssl service-identity ]; + + checkPhase = '' + # Either uncomment this, or remove this custom check phase entirely, if + # you wish to do battle with the foolscap tests. ~ C. + # trial foolscap + ''; meta = { homepage = http://foolscap.lothar.com/; @@ -25264,9 +25271,11 @@ in { ''; patchPhase = '' - substituteInPlace "scripts/syncthing-gtk" \ - --replace "/usr/share" "$out/share" - substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'" + substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'" + substituteInPlace scripts/syncthing-gtk --replace "/usr/share" "$out/share" + substituteInPlace syncthing_gtk/app.py --replace "/usr/share" "$out/share" + substituteInPlace syncthing_gtk/wizard.py --replace "/usr/share" "$out/share" + substituteInPlace syncthing-gtk.desktop --replace "/usr/bin/syncthing-gtk" "$out/bin/syncthing-gtk" ''; meta = { @@ -26094,6 +26103,13 @@ in { propagatedBuildInputs = with self; [ zope_interface ]; + # Patch t.p._inotify to point to libc. Without this, + # twisted.python.runtime.platform.supportsINotify() == False + patchPhase = optionalString stdenv.isLinux '' + substituteInPlace twisted/python/_inotify.py --replace \ + "ctypes.util.find_library('c')" "'${stdenv.glibc.out}/lib/libc.so.6'" + ''; + # Generate Twisted's plug-in cache. Twisted users must do it as well. See # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3 # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for |