diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-06 15:24:20 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-06 15:24:20 +0200 |
commit | 741bf840dad05cd1728481045466811ae8ae8281 (patch) | |
tree | 93ce9aef00773772dfb9b782f20e20b79f024d48 | |
parent | fe195af94462a6769f2e2c38c1d5739337c20d57 (diff) |
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c5396ed513f3d399f73f38ab78a066667f, reversing
changes made to a27ca029ee2b39e04d7d2a516a7228f4b62067fb.
Conflicts:
pkgs/development/libraries/ncurses/default.nix
53 files changed, 385 insertions, 652 deletions
diff --git a/doc/haskell-users-guide.md b/doc/haskell-users-guide.md index 446f08eb697c..b06a81e5b36a 100644 --- a/doc/haskell-users-guide.md +++ b/doc/haskell-users-guide.md @@ -666,27 +666,6 @@ to find out the store path of the system's zlib library. Now, you can The same thing applies to `cabal configure`, of course, if you're building with `cabal-install` instead of Stack. -## Creating statically linked binaries - -There are two levels of static linking. The first option is to configure the -build with the Cabal flag `--disable-executable-dynamic`. In Nix expressions, -this can be achieved by setting the attribute: - - enableSharedExecutables = false; - -That gives you a binary with statically linked Haskell libraries and -dynamically linked system libraries. - -To link both Haskell libraries and system libraries statically, the additional -flags `--ghc-option=-optl=-static --ghc-option=-optl=-pthread` need to be used. -In Nix, this is accomplished with: - - configureFlags = [ "--ghc-option=-optl=-static" "--ghc-option=-optl=-pthread" ]; - -It's important to realize, however, that most system libraries in Nix are built -as shared libraries only, i.e. there is just no static library available that -Cabal could link! - # Other resources diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 071a4d45ba23..121fca951642 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -144,7 +144,6 @@ jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>"; jzellner = "Jeff Zellner <jeffz@eml.cc>"; kamilchm = "Kamil Chmielewski <kamil.chm@gmail.com>"; - kampfschlaefer = "Arnold Krille <arnold@arnoldarts.de>"; khumba = "Bryan Gardiner <bog@khumba.net>"; kkallio = "Karn Kallio <tierpluspluslists@gmail.com>"; koral = "Koral <koral@mailoo.org>"; @@ -180,7 +179,6 @@ meditans = "Carlo Nucera <meditans@gmail.com>"; meisternu = "Matt Miemiec <meister@krutt.org>"; michelk = "Michel Kuhlmann <michel@kuhlmanns.info>"; - michaelpj = "Michael Peyton Jones <michaelpj@gmail.com>"; mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>"; mschristiansen = "Mikkel Christiansen <mikkel@rheosystems.com>"; modulistic = "Pablo Costa <modulistic@gmail.com>"; diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix index a1cfd84365a2..a3e50b422920 100644 --- a/nixos/modules/services/mail/opensmtpd.nix +++ b/nixos/modules/services/mail/opensmtpd.nix @@ -46,17 +46,6 @@ in { is left empty, the OpenSMTPD server will not start. ''; }; - - procPackages = mkOption { - type = types.listOf types.path; - default = []; - description = '' - Packages to search for filters, tables, queues, and schedulers. - - Add OpenSMTPD-extras here if you want to use the filters, etc. from - that package. - ''; - }; }; }; @@ -83,19 +72,12 @@ in { }; }; - systemd.services.opensmtpd = let - procEnv = pkgs.buildEnv { - name = "opensmtpd-procs"; - paths = [ opensmtpd ] ++ cfg.procPackages; - pathsToLink = [ "/libexec/opensmtpd" ]; - }; - in { + systemd.services.opensmtpd = { wantedBy = [ "multi-user.target" ]; wants = [ "network.target" ]; after = [ "network.target" ]; preStart = "mkdir -p /var/spool"; serviceConfig.ExecStart = "${opensmtpd}/sbin/smtpd -d -f ${conf} ${args}"; - environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd"; }; environment.systemPackages = [ (pkgs.runCommand "opensmtpd-sendmail" {} '' diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 8370eca21e52..adbc6099c95a 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -71,10 +71,11 @@ let ${coreutils}/bin/rm -f $tmp $tmp.ns ''; + # pre-up and pre-down hooks were added in NM 0.9.10, but we still use 0.9.0 dispatcherTypesSubdirMap = { "basic" = ""; - "pre-up" = "pre-up.d/"; - "pre-down" = "pre-down.d/"; + /*"pre-up" = "pre-up.d/"; + "pre-down" = "pre-down.d/";*/ }; in { diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 03e647b1b1e7..9ffede48bf52 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -59,7 +59,7 @@ let # place the interface which is named after the device at the beginning. wlanListDeviceFirst = device: interfaces: if hasAttr device interfaces - then mapAttrsToList (n: v: v//{_iName=n;}) (filterAttrs (n: _: n==device) interfaces) ++ mapAttrsToList (n: v: v//{_iName=n;}) (filterAttrs (n: _: n!=device) interfaces) + then [{"${device}"=interfaces.device; _iName=device;}] ++ mapAttrsToList (n: v: v//{_iName=n;}) (filterAttrs (n: _: n!=device) interfaces) else mapAttrsToList (n: v: v // {_iName = n;}) interfaces; # udev script that configures a physical wlan device and adds virtual interfaces diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 67ec6b5a419e..6f25693f734e 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib, perl, intltool, libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame, - expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */ + expat, libid3tag, ffmpeg /*, portaudio - given up fighting their portaudio.patch */ }: stdenv.mkDerivation rec { @@ -19,13 +19,11 @@ stdenv.mkDerivation rec { rm -r lib-src-rm/ ''; - configureFlags = "--with-libsamplerate"; - buildInputs = [ pkgconfig gettext wxGTK gtk expat alsaLib libsndfile soxr libid3tag - ffmpeg libmad lame libvorbis flac soundtouch - ]; #ToDo: detach sbsms + ffmpeg libmad lame libvorbis flac + ]; #ToDo: soundtouch, detach sbsms dontDisableStatic = true; doCheck = true; diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix deleted file mode 100644 index 8176a3404702..000000000000 --- a/pkgs/applications/audio/jackmix/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, pkgs, jack ? pkgs.libjack2 }: - -stdenv.mkDerivation rec { - name = "jackmix-0.5.2"; - src = fetchurl { - url = https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz; - sha256 = "18f5v7g66mgarhs476frvayhch7fy4nyjf2xivixc061ipn0m82j"; - }; - - buildInputs = [ - pkgs.pkgconfig - pkgs.scons - pkgs.kde4.qt4 - pkgs.lash - jack - ]; - - buildPhase = '' - scons - ''; - installPhase = '' - mkdir -p $out/bin - cp jackmix/jackmix $out/bin - ''; - - meta = { - description = "Matrix-Mixer for the Jack-Audio-connection-Kit"; - homepage = http://www.arnoldarts.de/jackmix/; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.kampfschlaefer ]; - platforms = stdenv.lib.platforms.linux; - }; -} - - diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 702911fee744..ea638de7925d 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -245,7 +245,7 @@ rec { /* =============== simple script files ==================== */ - # also have a look at enblend-enfuse in all-packages.nix + # also have a look at enblendenfuse in all-packages.nix exposureBlend = scriptDerivation { name = "exposure-blend"; src = fetchurl { diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index b11ed1a99df7..88912cbda55d 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, fetchurl, gnumake, pkgconfig , boost, gettext, tclap, wxGTK , freeglut, glew, libXi, libXmu, mesa -, autopanosiftc, enblend-enfuse, exiv2, ilmbase, lensfun, libpng, libtiff +, autopanosiftc, enblendenfuse, exiv2, ilmbase, lensfun, libpng, libtiff , openexr, panotools, perlPackages }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # commandline tools needed by the hugin batch processor # you may have to tell hugin (in the preferences) where these binaries reside - propagatedUserEnvPackages = [ autopanosiftc enblend-enfuse gnumake + propagatedUserEnvPackages = [ autopanosiftc enblendenfuse gnumake perlPackages.ImageExifTool ]; diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 9339bfef6e03..c4a82966238a 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, flex, bison, libpcap, libdnet, libnfnetlink, libnetfilter_queue}: +{stdenv, fetchurl, flex, bison, libpcap}: stdenv.mkDerivation rec { name = "daq-2.0.5"; @@ -9,9 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0vdwb0r9kdlgj4g0i0swafbc7qik0zmks17mhqji8cl7hpdva13p"; }; - buildInputs = [ flex bison libpcap libdnet libnfnetlink libnetfilter_queue]; - - configureFlags = "--enable-nfq-module=yes --with-dnet-includes=${libdnet}/includes --with-dnet-libraries=${libdnet}/lib"; + buildInputs = [ flex bison libpcap ]; meta = { description = "Data AcQuisition library (DAQ), for packet I/O"; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 62c784a7fb79..ea7e09626994 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -1,4 +1,4 @@ -{stdenv, makeWrapper, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}: +{stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}: stdenv.mkDerivation rec { version = "2.9.7.2"; @@ -10,15 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1gmlrh9ygpd5h6nnrr4090wk5n2yq2yrvwi7q6xbm6lxj4rcamyv"; }; - buildInputs = [ makeWrapper libpcap pcre libdnet daq zlib flex bison ]; - - enableParallelBuilding = true; - - configureFlags = "--disable-static-daq --enable-control-socket --with-daq-includes=${daq}/includes --with-daq-libraries=${daq}/lib --dynamic-preprocessor-lib-dir $out/lib/snort_dynamicpreprocessor/ --dynamic-engine-lib-dir $out/lib/snort_dynamicengine"; - - postInstall = '' - wrapProgram $out/bin/snort --add-flags "--daq-dir ${daq}/lib/daq" - ''; + buildInputs = [ libpcap pcre libdnet daq zlib flex bison ]; meta = { description = "Network intrusion prevention and detection system (IDS/IPS)"; diff --git a/pkgs/applications/networking/iptraf-ng/default.nix b/pkgs/applications/networking/iptraf-ng/default.nix deleted file mode 100644 index 368d78a36f90..000000000000 --- a/pkgs/applications/networking/iptraf-ng/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, ncurses }: - -stdenv.mkDerivation rec { - version = "1.1.4"; - name = "iptraf-ng-${version}"; - - src = fetchurl { - url = "https://fedorahosted.org/releases/i/p/iptraf-ng/${name}.tar.gz"; - sha256 = "02gb8z9h2s6s1ybyikywz7jgb1mafdx88hijfasv3khcgkq0q53r"; - }; - - buildInputs = [ ncurses ]; - - configurePhase = '' - ./configure --prefix=$out/usr --sysconfdir=$out/etc \ - --localstatedir=$out/var --sbindir=$out/bin - ''; - - meta = { - description = "A console-based network monitoring utility (fork of iptraf)"; - longDescription = '' - IPTraf-ng is a console-based network monitoring utility. IPTraf-ng - gathers data like TCP connection packet and byte counts, interface - statistics and activity indicators, TCP/UDP traffic breakdowns, and LAN - station packet and byte counts. IPTraf-ng features include an IP traffic - monitor which shows TCP flag information, packet and byte counts, ICMP - details, OSPF packet types, and oversized IP packet warnings; interface - statistics showing IP, TCP, UDP, ICMP, non-IP and other IP packet counts, - IP checksum errors, interface activity and packet size counts; a TCP and - UDP service monitor showing counts of incoming and outgoing packets for - common TCP and UDP application ports, a LAN statistics module that - discovers active hosts and displays statistics about their activity; TCP, - UDP and other protocol display filters so you can view just the traffic - you want; logging; support for Ethernet, FDDI, ISDN, SLIP, PPP, and - loopback interfaces; and utilization of the built-in raw socket interface - of the Linux kernel, so it can be used on a wide variety of supported - network cards. - ''; - homepage = https://fedorahosted.org/iptraf-ng/; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.devhell ]; - }; -} diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index e657215f2cd5..e47d2569b109 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, docutils, python }: let version = "0.9.0"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "git-hub-${version}"; src = fetchFromGitHub { @@ -11,6 +11,20 @@ stdenv.mkDerivation rec { owner = "sociomantic"; }; + meta = with stdenv.lib; { + inherit version; + description = "Git command line interface to GitHub"; + longDescription = '' + A simple command line interface to GitHub, enabling most useful GitHub + tasks (like creating and listing pull request or issues) to be accessed + directly through the Git command line. + ''; + homepage = https://github.com/sociomantic/git-hub; + license = licenses.gpl3Plus; + platforms = with platforms; linux; + maintainers = with maintainers; [ nckx ]; + }; + buildInputs = [ python ]; nativeBuildInputs = [ docutils ]; @@ -27,18 +41,4 @@ stdenv.mkDerivation rec { # Remove inert ftdetect vim plugin and a README that's a man page subset: rm -r $out/share/{doc,vim} ''; - - meta = with stdenv.lib; { - inherit version; - inherit (src.meta) homepage; - description = "Git command line interface to GitHub"; - longDescription = '' - A simple command line interface to GitHub, enabling most useful GitHub - tasks (like creating and listing pull request or issues) to be accessed - directly through the Git command line. - ''; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; - }; } diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index f563bebd9db8..db29360c9ecb 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -8,7 +8,6 @@ , stdenv, fetchurl, apr, aprutil, zlib, sqlite , apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null , sasl ? null, serf ? null -, branch ? "1.9" }: assert bdbSupport -> aprutil.bdbSupport; @@ -16,26 +15,15 @@ assert httpServer -> apacheHttpd != null; assert pythonBindings -> swig != null && python != null; assert javahlBindings -> jdk != null && perl != null; -let - config = { - "1.9".ver_min = "2"; - "1.9".sha1 = "fb9db3b7ddf48ae37aa8785872301b59bfcc7017"; - - "1.8".ver_min = "14"; - "1.8".sha1 = "0698efc58373e7657f6dd3ce13cab7b002ffb497"; - }; -in -assert builtins.hasAttr branch config; - stdenv.mkDerivation (rec { - version = "${branch}." + config.${branch}.ver_min; + version = "1.9.2"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion/${name}.tar.bz2"; - inherit (config.${branch}) sha1; + sha1 = "fb9db3b7ddf48ae37aa8785872301b59bfcc7017"; }; buildInputs = [ zlib apr aprutil sqlite ] diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index d56ef9649679..22935064c4b4 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, qt5 }: +{ stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { - name = "smplayer-15.9.0"; + name = "smplayer-14.9.0.6690"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "1yx6kikaj9v5aj8aavvrcklx283wl6wrnpl905hjc7v03kgp1ac5"; + sha256 = "0nmw69kg8rqvl9icyx1r1v1pyxg6560363l0kyqyja18j79a3j2y"; }; patches = [ ./basegui.cpp.patch ]; - buildInputs = [ qt5.script ]; + buildInputs = [ qt4 ]; preConfigure = '' makeFlags="PREFIX=$out" diff --git a/pkgs/build-support/build-fhs-chrootenv/env.nix b/pkgs/build-support/build-fhs-chrootenv/env.nix index a2ac8288e8ec..b659655f74b9 100644 --- a/pkgs/build-support/build-fhs-chrootenv/env.nix +++ b/pkgs/build-support/build-fhs-chrootenv/env.nix @@ -182,12 +182,6 @@ let setupLibDirs = if isTargetBuild then setupLibDirs_target else setupLibDirs_multi; - setupIncludeDir = '' - if [ -x "${staticUsrProfileTarget}/include" ] - then - ln -s "${staticUsrProfileTarget}/include" - fi - ''; # the target profile is the actual profile that will be used for the chroot setupTargetProfile = '' @@ -198,7 +192,6 @@ let cd usr ${linkProfile staticUsrProfileTarget} ${setupLibDirs} - ${setupIncludeDir} cd .. rm -rf usr/etc usr/var ''; diff --git a/pkgs/data/fonts/symbola/default.nix b/pkgs/data/ |