Author: urkud
Date: Tue Jan 3 15:50:39 2012
New Revision: 31239
URL: https://nixos.org/websvn/nix/?rev=31239&sc=1
Log:
Merge trunk
Added:
nixpkgs/branches/libpng15/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/
- copied from r31238,
nixpkgs/trunk/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/
nixpkgs/branches/libpng15/pkgs/tools/networking/networkmanagement/
- copied from r31238,
nixpkgs/trunk/pkgs/tools/networking/networkmanagement/
Replaced:
nixpkgs/branches/libpng15/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix
- copied unchanged from r31238,
nixpkgs/trunk/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix
nixpkgs/branches/libpng15/pkgs/tools/networking/networkmanagement/default.nix
- copied unchanged from r31238,
nixpkgs/trunk/pkgs/tools/networking/networkmanagement/default.nix
Deleted:
nixpkgs/branches/libpng15/pkgs/development/libraries/openssl/1.0.0e.nix
Modified:
nixpkgs/branches/libpng15/ (props changed)
nixpkgs/branches/libpng15/pkgs/applications/graphics/xscreensaver/default.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/applications/misc/xneur/0.8.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/applications/networking/browsers/firefox/9.0.nix
nixpkgs/branches/libpng15/pkgs/applications/networking/browsers/icecat-4/
(props changed)
nixpkgs/branches/libpng15/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/
(props changed)
nixpkgs/branches/libpng15/pkgs/build-support/clang-wrapper/ (props changed)
nixpkgs/branches/libpng15/pkgs/build-support/gcc-wrapper/ (props changed)
nixpkgs/branches/libpng15/pkgs/build-support/release/debian-build.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/build-support/release/nix-build.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/build-support/release/rpm-build.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/build-support/release/source-tarball.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.10.1.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.10.2.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.8.2.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/compilers/ghc/6.8.3.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/aterm/2.8.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/fltk/fltk13.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/glibc-2.9/ (props
changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/goocanvas/ (props
changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/openssl/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/ortp/default.nix
nixpkgs/branches/libpng15/pkgs/development/libraries/pcre/default.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/development/libraries/readline/readline6.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/development/tools/misc/autoconf/2.13.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/development/tools/misc/gnum4/default.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/misc/tex/pgf/1.x.nix (props changed)
nixpkgs/branches/libpng15/pkgs/misc/tex/pgf/2.x.nix (props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/atheros/r3867.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/generic.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.25.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.28.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.29.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kernel/linux-2.6.33.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/qemu-kvm/default.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/os-specific/linux/util-linux-ng/ (props
changed)
nixpkgs/branches/libpng15/pkgs/servers/mail/dovecot/1.1.1.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/shells/bash/4.1.nix (props changed)
nixpkgs/branches/libpng15/pkgs/shells/bash/4.2.nix (props changed)
nixpkgs/branches/libpng15/pkgs/stdenv/generic/setup.sh (props changed)
nixpkgs/branches/libpng15/pkgs/stdenv/linux/make-bootstrap-tools.nix
(props changed)
nixpkgs/branches/libpng15/pkgs/tools/networking/wget/default.nix (props
changed)
nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/libpng15/pkgs/applications/networking/browsers/firefox/9.0.nix
==============================================================================
---
nixpkgs/branches/libpng15/pkgs/applications/networking/browsers/firefox/9.0.nix
Tue Jan 3 15:39:05 2012 (r31238)
+++
nixpkgs/branches/libpng15/pkgs/applications/networking/browsers/firefox/9.0.nix
Tue Jan 3 15:50:39 2012 (r31239)
@@ -15,14 +15,14 @@
rec {
- firefoxVersion = "9.0";
+ firefoxVersion = "9.0.1";
- xulVersion = "9.0"; # this attribute is used by other packages
+ xulVersion = "9.0.1"; # this attribute is used by other packages
src = fetchurl {
url =
"http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";;
- sha1 = "f79324ec6205e4c23d51d8ab2e790de1b2541657";
+ sha1 = "e0748d86753eead5c0929d74158c601bf33b5db0";
};
commonConfigureFlags =
Modified:
nixpkgs/branches/libpng15/pkgs/development/libraries/openssl/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/libraries/openssl/default.nix
Tue Jan 3 15:39:05 2012 (r31238)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/openssl/default.nix
Tue Jan 3 15:50:39 2012 (r31239)
@@ -6,11 +6,6 @@
opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
(throw "openssl needs its platform name cross building" null)
stdenv.cross;
-
- hurdGNUSourcePatch = fetchurl {
- url =
http://patch-tracker.debian.org/patch/series/dl/openssl/1.0.0e-2.1/gnu_source.patch;
- sha256 = "0zp4x8bql92fbqywnigqfsfj2vvabb66wv6g6zgzh0y6js1ic4pn";
- };
in
stdenv.mkDerivation {
@@ -22,8 +17,16 @@
};
patches =
- stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch
- ++ stdenv.lib.optional (stdenv.system == "x86_64-freebsd")
./freebsd-x86_64-asm.patch;
+ [ # Allow the location of the X509 certificate file (the CA
+ # bundle) to be set through the environment variable
+ # ‘OPENSSL_X509_CERT_FILE’. This is necessary because the
+ # default location ($out/ssl/cert.pem) doesn't exist, and
+ # hardcoding something like /etc/ssl/cert.pem is impure and
+ # cannot be overriden per-process. For security, the
+ # environment variable is ignored for setuid binaries.
+ ./cert-file.patch
+ ]
+ ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
buildNativeInputs = [ perl ];
@@ -34,6 +37,8 @@
configureFlags = "shared --libdir=lib";
+ makeFlags = "MANDIR=$(out)/share/man";
+
postInstall =
''
# If we're building dynamic libraries, then don't install static
@@ -49,17 +54,6 @@
export configureFlags="--libdir=lib
--cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}"
'';
- patches = stdenv.lib.optionals (opensslCrossSystem == "hurd-x86") [
- # OpenSSL only defines _GNU_SOURCE on Linux, but we need it on GNU
- hurdGNUSourcePatch
-
- # Use the target settings from Debian's "debian-hurd-i386" target.
- # see
http://patch-tracker.debian.org/patch/series/view/openssl/1.0.0e-2.1/debian-targets.patch
- # In particular, this sets the shared library extension properly so that
- # make install succeeds
- ./hurd-target.patch
- ];
-
postInstall = ''
# Openssl installs readonly files, which otherwise we can't strip.
# This could at some stdenv hash change be put out of crossAttrs, too
Modified: nixpkgs/branches/libpng15/pkgs/development/libraries/ortp/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/development/libraries/ortp/default.nix
Tue Jan 3 15:39:05 2012 (r31238)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/ortp/default.nix
Tue Jan 3 15:50:39 2012 (r31239)
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- name = "ortp-0.16.4";
+ name = "ortp-0.18.0";
src = fetchurl {
url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz";
- sha256 = "0yb835l9spic4518ghb28jlwc0ihqjzpd0bgysgjf7z3bbg7km90";
+ sha256 = "1cgx9xid0abk3cad3xjdvx7p9whinlhrviphyrd9zkhhx7ddkih2";
};
meta = {
Copied:
nixpkgs/branches/libpng15/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix
(from r31238,
nixpkgs/trunk/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/libpng15/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix
Tue Jan 3 15:50:39 2012 (r31239, copy of r31238,
nixpkgs/trunk/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix)
@@ -0,0 +1,29 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+ name = "iwlwifi-5150-ucode-8.24.2.2";
+
+ src = fetchurl {
+ url =
"http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-5150-ucode-8.24.2.2.tgz";;
+ sha256 =
"d253e6ff6624639aded67c82df98b2bc4a66eb66400848d5614921d513540cf9";
+ };
+
+ buildPhase = "true";
+
+ installPhase = ''
+ ensureDir "$out"
+ chmod -x *
+ cp * "$out"
+ '';
+
+ meta = {
+ description = "Firmware for the Intel 5150 wireless card";
+
+ longDescription = ''
+ This package provides version 1 of the Intel wireless card
+ firmware. It contains the `iwlwifi-5150-2.ucode' file.
+ '';
+
+ homepage = http://intellinuxwireless.org/;
+ };
+}
Copied:
nixpkgs/branches/libpng15/pkgs/tools/networking/networkmanagement/default.nix
(from r31238, nixpkgs/trunk/pkgs/tools/networking/networkmanagement/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/libpng15/pkgs/tools/networking/networkmanagement/default.nix
Tue Jan 3 15:50:39 2012 (r31239, copy of r31238,
nixpkgs/trunk/pkgs/tools/networking/networkmanagement/default.nix)
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, gettext, kdelibs, kde_workspace, networkmanager }:
+
+let
+ pname = "networkmanagement";
+ version = "0.8.98";
+ name = "${pname}-${version}";
+in
+stdenv.mkDerivation {
+ inherit name;
+
+ src = fetchurl {
+ url = "mirror://kde/unstable/${pname}/${version}/src/${name}.tar.bz2";
+ sha256 = "0bb8096q6yx4657jc20f50mfsjyfd1wz0npa6in030ydzm5jk3ax";
+ };
+
+ buildInputs = [ kdelibs kde_workspace networkmanager ];
+ buildNativeInputs = [ gettext ];
+
+ NIX_CFLAGS_COMPILE="-I${kde_workspace}/include/solid/control";
+
+ meta = {
+ homepage =
https://projects.kde.org/projects/extragear/base/networkmanagement;
+ description = "KDE Plasmoid for controlling NetworkManager";
+ inherit (kdelibs.meta) platforms;
+ maintainers = [ stdenv.lib.maintainers.urkud ];
+ };
+}
Modified: nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Tue Jan 3
15:39:05 2012 (r31238)
+++ nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Tue Jan 3
15:50:39 2012 (r31239)
@@ -4299,7 +4299,6 @@
neon029 = callPackage ../development/libraries/neon/0.29.nix {
compressionSupport = true;
sslSupport = true;
- openssl = opensslNew;
};
nethack = builderDefsPackage (import ../games/nethack) {
@@ -4373,8 +4372,6 @@
fetchurl = fetchurlBoot;
};
- opensslNew = callPackage ../development/libraries/openssl/1.0.0e.nix { };
-
ortp = callPackage ../development/libraries/ortp { };
p11_kit = callPackage ../development/libraries/p11-kit { };
@@ -5311,6 +5308,8 @@
iwlwifi5000ucode = callPackage
../os-specific/linux/firmware/iwlwifi-5000-ucode { };
+ iwlwifi5150ucode = callPackage
../os-specific/linux/firmware/iwlwifi-5150-ucode { };
+
iwlwifi6000ucode = callPackage
../os-specific/linux/firmware/iwlwifi-6000-ucode { };
iwlwifi6000g2aucode = callPackage
../os-specific/linux/firmware/iwlwifi-6000g2a-ucode { };
@@ -6677,7 +6676,7 @@
firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
- firefoxPkgs = pkgs.firefox80Pkgs;
+ firefoxPkgs = pkgs.firefox90Pkgs;
firefox36Pkgs = callPackage
../applications/networking/browsers/firefox/3.6.nix {
inherit (gtkLibs) gtk pango;
@@ -8096,6 +8095,8 @@
liblikeback = callPackage ../development/libraries/liblikeback { };
+ networkmanagement = callPackage ../tools/networking/networkmanagement {
};
+
partitionManager = callPackage ../tools/misc/partition-manager { };
polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
