Author: amiddelk
Date: Sat Jan 14 09:31:12 2012
New Revision: 31528
URL: https://nixos.org/websvn/nix/?rev=31528&sc=1
Log:
Removed the now obsolete firmware-linux-free package.
Deleted:
nixpkgs/trunk/pkgs/os-specific/linux/firmware/firmware-linux-free/
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
Sat Jan 14 09:30:24 2012 (r31527)
+++
nixpkgs/trunk/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
Sat Jan 14 09:31:12 2012 (r31528)
@@ -1,3 +1,8 @@
+# TODO: some files are not at the right place.
+# For now, we take the strategy of adding symlinks to fix this,
+# however it is probably better to extract the files from
+# the appropriate debian binary packages.
+
{stdenv, fetchurl}:
stdenv.mkDerivation {
@@ -8,10 +13,13 @@
sha256 =
"94fe856d00f63559486b7684c0fae9b30bee599c6d7dea8c7e00d2dcb548ee8a";
};
- phases = [ "unpackPhase" "installPhase" "postInstall" ];
+ phases = [ "unpackPhase" "patchPhase" "installPhase" "postInstall" ];
+
+ patchPhase = "rm -rf debian defines TODO";
installPhase = "ensureDir $out && cp -ra * $out/";
+ # repeat the same trick for radeon, 3com, etc.
postInstall = "ln -s $out/realtek/rtlwifi $out/rtlwifi";
meta = {
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jan 14 09:30:24
2012 (r31527)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jan 14 09:31:12
2012 (r31528)
@@ -6013,7 +6013,6 @@
qemu_kvm = callPackage ../os-specific/linux/qemu-kvm { };
firmwareLinuxNonfree = callPackage
../os-specific/linux/firmware/firmware-linux-nonfree { };
- firmwareLinuxFree = callPackage
../os-specific/linux/firmware/firmware-linux-free { };
radeontools = callPackage ../os-specific/linux/radeontools { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
