Author: amiddelk
Date: Thu Jan 12 17:16:11 2012
New Revision: 31501
URL: https://nixos.org/websvn/nix/?rev=31501&sc=1
Log:
Added firmware-linux-nonfree and directly also the free variant.
Todo for later: take the files from the various .deb files instead of the
source distribution.
This version already improves upon my previous implementation, hence I commit
it.
Added:
nixpkgs/trunk/pkgs/os-specific/linux/firmware/firmware-linux-free/
nixpkgs/trunk/pkgs/os-specific/linux/firmware/firmware-linux-free/default.nix
nixpkgs/trunk/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/
nixpkgs/trunk/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
Deleted:
nixpkgs/trunk/pkgs/os-specific/linux/firmware/dwmw2/
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/firmware/rtl8192c/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added:
nixpkgs/trunk/pkgs/os-specific/linux/firmware/firmware-linux-free/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/os-specific/linux/firmware/firmware-linux-free/default.nix
Thu Jan 12 17:16:11 2012 (r31501)
@@ -0,0 +1,21 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+ name = "firmware-linux-free-3";
+
+ src = fetchurl {
+ url = "mirror://debian/pool/main/f/firmware-free/firmware-free_3.tar.gz";
+ sha256 =
"8363230e56365dd6b5e8ae9fd6cefab83472f4842f7221ffc2d890eaf7d7f1ef";
+ };
+
+ phases = [ "unpackPhase" "installPhase" ];
+
+ installPhase = ''ensureDir $out && cp -ra * $out/'';
+
+ meta = {
+ description = "Free kernel firmware (packaged by Debian)";
+ homepage = "http://packages.debian.org/sid/firmware-linux-nonfree";;
+ license = "free";
+ priority = "10";
+ };
+}
Added:
nixpkgs/trunk/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
Thu Jan 12 17:16:11 2012 (r31501)
@@ -0,0 +1,24 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+ name = "firmware-linux-nonfree-0.34";
+
+ src = fetchurl {
+ url =
"mirror://debian/pool/non-free/f/firmware-nonfree/firmware-nonfree_0.34.tar.gz";
+ sha256 =
"94fe856d00f63559486b7684c0fae9b30bee599c6d7dea8c7e00d2dcb548ee8a";
+ };
+
+ phases = [ "unpackPhase" "installPhase" "postInstall" ];
+
+ installPhase = "ensureDir $out && cp -ra * $out/";
+
+ postInstall = "ln -s $out/realtek/rtlwifi $out/rtlwifi";
+
+ meta = {
+ description = "Non-free kernel firmware (packaged by Debian)";
+ homepage = "http://packages.debian.org/sid/firmware-linux-nonfree";;
+ license = "unfree-redistributable-firmware";
+ priority = "10";
+ };
+}
+
Modified: nixpkgs/trunk/pkgs/os-specific/linux/firmware/rtl8192c/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/firmware/rtl8192c/default.nix Thu Jan
12 16:59:58 2012 (r31500)
+++ nixpkgs/trunk/pkgs/os-specific/linux/firmware/rtl8192c/default.nix Thu Jan
12 17:16:11 2012 (r31501)
@@ -1,18 +1,14 @@
-{stdenv, linuxFirmware}:
-let
- src = linuxFirmware;
- dir = "rtlwifi";
- file = "rtl8192cfw.bin";
- meta = {
- description = "Firmware for the Realtek RTL8192c wireless cards";
- homepage = "http://www.realtek.com";;
- license = "non-free";
- };
-in stdenv.mkDerivation {
+{stdenv, firmwareLinuxNonfree}:
+stdenv.mkDerivation {
name = "rtl8192c-fw";
- inherit src meta dir file;
+ src = firmwareLinuxNonfree;
phases = [ "installPhase" ];
+ installPhase = "ensureDir $out/rtlwifi && cp
$src/realtek/rtlwifi/rtl8192cfw.bin $out/rtlwifi/rtl8192cfw.bin";
- installPhase = "ensureDir $out/$dir && cp $src/$dir/$file $out/$dir/$file";
+ meta = {
+ description = "Firmware for the Realtek RTL8192c wireless cards";
+ homepage = "http://www.realtek.com";;
+ license = "non-free";
+ };
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Jan 12 16:59:58
2012 (r31500)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Jan 12 17:16:11
2012 (r31501)
@@ -6006,6 +6006,9 @@
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 { };
radeonR700 = callPackage ../os-specific/linux/firmware/radeon-r700 { };
@@ -6026,8 +6029,6 @@
rtkit = callPackage ../os-specific/linux/rtkit { };
- linuxFirmware = callPackage ../os-specific/linux/firmware/dwmw2 { };
-
rtl8192cfw = callPackage ../os-specific/linux/firmware/rtl8192c { };
rtl8168e2fw = callPackage ../os-specific/linux/firmware/rtl8168e-2 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
