Author: urkud
Date: Tue Oct 4 13:33:33 2011
New Revision: 29632
URL: https://ssl.nixos.org/websvn/nix/?rev=29632&sc=1
Log:
svn merge trunk
Added:
nixpkgs/branches/libpng15/pkgs/development/libraries/dotnetfx40/
- copied from r29631, nixpkgs/trunk/pkgs/development/libraries/dotnetfx40/
Replaced:
nixpkgs/branches/libpng15/pkgs/development/libraries/dotnetfx40/default.nix
- copied unchanged from r29631,
nixpkgs/trunk/pkgs/development/libraries/dotnetfx40/default.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/icecat-4/
(props changed)
nixpkgs/branches/libpng15/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/
(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/desktops/kde-4.5/support/shared-desktop-ontologies/
(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/fltk11.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/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
Copied:
nixpkgs/branches/libpng15/pkgs/development/libraries/dotnetfx40/default.nix
(from r29631, nixpkgs/trunk/pkgs/development/libraries/dotnetfx40/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/libpng15/pkgs/development/libraries/dotnetfx40/default.nix
Tue Oct 4 13:33:33 2011 (r29632, copy of r29631,
nixpkgs/trunk/pkgs/development/libraries/dotnetfx40/default.nix)
@@ -0,0 +1,23 @@
+{stdenv}:
+
+let
+ windir = "/cygdrive/c/WINDOWS";
+in
+{
+ pkg = stdenv.mkDerivation {
+ name = "dotnetfx-4.0";
+ src = "${windir}/Microsoft.NET/Framework/v4.0.30319";
+ buildCommand = ''
+ ensureDir $out/bin
+ ln -s $src/MSBuild.exe $out/bin
+ '';
+ };
+
+ assembly20Path = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727";
+
+ wcfPath = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v3.0/WINDOW~1";
+
+ referenceAssembly30Path =
"/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.0";
+
+ referenceAssembly35Path =
"/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.5";
+}
Modified: nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Tue Oct 4
13:31:23 2011 (r29631)
+++ nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Tue Oct 4
13:33:33 2011 (r29632)
@@ -241,7 +241,7 @@
dotnetenv = import ../build-support/dotnetenv {
inherit stdenv;
- dotnetfx = dotnetfx35;
+ dotnetfx = dotnetfx40;
};
vsenv = callPackage ../build-support/vsenv {
@@ -592,6 +592,8 @@
dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { };
+ dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { };
+
dropbear = callPackage ../tools/networking/dropbear {
enableStatic = true;
zlib = zlibStatic;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
