diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 35 | ||||
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 17 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 79 |
3 files changed, 61 insertions, 70 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc4370e9eedc..9450ef9915e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1567,6 +1567,8 @@ in pillow; }; + fastd = callPackage ../tools/networking/fastd { }; + fatsort = callPackage ../tools/filesystems/fatsort { }; fcitx = callPackage ../tools/inputmethods/fcitx { @@ -2305,7 +2307,7 @@ in less = callPackage ../tools/misc/less { }; lf = callPackage ../tools/misc/lf {}; - + lhasa = callPackage ../tools/compression/lhasa {}; libcpuid = callPackage ../tools/misc/libcpuid { }; @@ -2417,10 +2419,6 @@ in libtool = darwin.cctools; }; - nodejs-5_x = callPackage ../development/web/nodejs/v5.nix { - libtool = darwin.cctools; - }; - nodejs-6_x = callPackage ../development/web/nodejs/v6.nix { libtool = darwin.cctools; }; @@ -2434,10 +2432,6 @@ in nodejs = pkgs.nodejs-6_x; }; - nodePackages_5_x = callPackage ../development/node-packages/default-v5.nix { - nodejs = pkgs.nodejs-5_x; - }; - nodePackages_4_x = callPackage ../development/node-packages/default-v4.nix { nodejs = pkgs.nodejs-4_x; }; @@ -5287,7 +5281,10 @@ in erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; - erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { odbcSupport = true; }; + erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + odbcSupport = true; + }; erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; @@ -6425,6 +6422,8 @@ in xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; + xcbuild = callPackage ../development/tools/xcbuild { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; }; + xmlindent = callPackage ../development/web/xmlindent {}; xpwn = callPackage ../development/mobile/xpwn {}; @@ -8174,6 +8173,8 @@ in libu2f-server = callPackage ../development/libraries/libu2f-server { }; + libuecc = callPackage ../development/libraries/libuecc { }; + libui = callPackage ../development/libraries/libui { }; libunity = callPackage ../development/libraries/libunity { }; @@ -11023,9 +11024,11 @@ in # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. linuxPackages_testing = linuxPackagesFor pkgs.linux_testing; - linuxPackages_custom = {version, src, configfile}: - recurseIntoAttrs (linuxPackagesFor (pkgs.linuxManualConfig {inherit version src configfile; - allowImportFromDerivation=true;})); + linuxPackages_custom = { version, src, configfile }: + recurseIntoAttrs (linuxPackagesFor (pkgs.linuxManualConfig { + inherit version src configfile; + allowImportFromDerivation = true; + })); # Build a kernel for Xen dom0 linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); @@ -11068,7 +11071,7 @@ in # A function to build a manually-configured kernel linuxManualConfig = pkgs.buildLinux; - buildLinux = callPackage ../os-specific/linux/kernel/manual-config.nix {}; + buildLinux = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); keyutils = callPackage ../os-specific/linux/keyutils { }; @@ -15049,7 +15052,9 @@ in gtk = gtk2; }; - kodiPlain = callPackage ../applications/video/kodi { }; + kodiPlain = callPackage ../applications/video/kodi { + libva = libva-full; + }; xbmcPlain = kodiPlain; kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 9bebfa3d9158..74d4e1707a11 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -23,20 +23,11 @@ let sha256 = "0r5pfbjbmdj46h20jm3iqmy969qd27ajyf0phjhgykv6j0cqjlgd"; }; - imagick = if isPhp7 then imagick34 else imagick31; - - imagick31 = assert !isPhp7; buildPecl { - name = "imagick-3.1.2"; - sha256 = "14vclf2pqcgf3w8nzqbdw0b9v30q898344c84jdbw2sa62n6k1sj"; - configureFlags = "--with-imagick=${pkgs.imagemagick.dev}"; - buildInputs = [ pkgs.pkgconfig ]; - }; - - imagick34 = buildPecl { - name = "imagick-3.4.0RC4"; - sha256 = "0fdkzdv3r8sm6y1x11kp3rxsimq6zf15xvi0mhn57svmnan4zh0i"; + imagick = buildPecl { + name = "imagick-3.4.3RC1"; + sha256 = "0siyxpszjz6s095s2g2854bhprjq49rf22v6syjiwvndg1pc9fsh"; configureFlags = "--with-imagick=${pkgs.imagemagick.dev}"; - buildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; }; # No support for PHP 7 yet diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 00ba343e685f..d3fb4e646c3b 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -21,57 +21,52 @@ with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; let - unstable = pkgs.releaseTools.aggregate - { name = "nixpkgs-${jobs.tarball.version}"; - meta.description = "Release-critical builds for the Nixpkgs unstable channel"; - constituents = - [ jobs.tarball - jobs.metrics - jobs.manual - jobs.lib-tests - jobs.stdenv.x86_64-linux - jobs.stdenv.i686-linux - jobs.stdenv.x86_64-darwin - jobs.linux.x86_64-linux - jobs.linux.i686-linux - jobs.python.x86_64-linux - jobs.python.i686-linux - jobs.python.x86_64-darwin - jobs.python3.x86_64-linux - jobs.python3.i686-linux - jobs.python3.x86_64-darwin - # Many developers use nix-repl - jobs.nix-repl.x86_64-linux - jobs.nix-repl.i686-linux - jobs.nix-repl.x86_64-darwin - # Needed by travis-ci to test PRs - jobs.nox.i686-linux - jobs.nox.x86_64-linux - jobs.nox.x86_64-darwin - # Ensure that X11/GTK+ are in order. - jobs.thunderbird.x86_64-linux - jobs.thunderbird.i686-linux - # Ensure that basic stuff works on darwin - jobs.git.x86_64-darwin - jobs.mysql.x86_64-darwin - jobs.vim.x86_64-darwin - ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools; - }; - lib = pkgs.lib; jobs = - rec { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; }; + { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; }; metrics = import ./metrics.nix { inherit pkgs nixpkgs; }; manual = import ../../doc; lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs; }; - # for consistency with NixOS tested job - tested = unstable; - inherit unstable; - + unstable = pkgs.releaseTools.aggregate + { name = "nixpkgs-${jobs.tarball.version}"; + meta.description = "Release-critical builds for the Nixpkgs unstable channel"; + constituents = + [ jobs.tarball + jobs.metrics + jobs.manual + jobs.lib-tests + jobs.stdenv.x86_64-linux + jobs.stdenv.i686-linux + jobs.stdenv.x86_64-darwin + jobs.linux.x86_64-linux + jobs.linux.i686-linux + jobs.python.x86_64-linux + jobs.python.i686-linux + jobs.python.x86_64-darwin + jobs.python3.x86_64-linux + jobs.python3.i686-linux + jobs.python3.x86_64-darwin + # Many developers use nix-repl + jobs.nix-repl.x86_64-linux + jobs.nix-repl.i686-linux + jobs.nix-repl.x86_64-darwin + # Needed by travis-ci to test PRs + jobs.nox.i686-linux + jobs.nox.x86_64-linux + jobs.nox.x86_64-darwin + # Ensure that X11/GTK+ are in order. + jobs.thunderbird.x86_64-linux + jobs.thunderbird.i686-linux + # Ensure that basic stuff works on darwin + jobs.git.x86_64-darwin + jobs.mysql.x86_64-darwin + jobs.vim.x86_64-darwin + ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools; + }; stdenvBootstrapTools.i686-linux = { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "i686-linux"; }) dist test; }; |