summary refs log tree commit diff
path: root/pkgs/os-specific/linux/firmware
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2011-10-25 09:27:41 +0000
committerPeter Simons <simons@cryp.to>2011-10-25 09:27:41 +0000
commita5324f21323cb8758eb60cd10c24d79570f5567f (patch)
tree614129523199df7f245de35ae4460f09633bf670 /pkgs/os-specific/linux/firmware
parentdd9e83b77faa321fe9cb8e11e79070c792d07d50 (diff)
downloadnixlib-a5324f21323cb8758eb60cd10c24d79570f5567f.tar
nixlib-a5324f21323cb8758eb60cd10c24d79570f5567f.tar.gz
nixlib-a5324f21323cb8758eb60cd10c24d79570f5567f.tar.bz2
nixlib-a5324f21323cb8758eb60cd10c24d79570f5567f.tar.lz
nixlib-a5324f21323cb8758eb60cd10c24d79570f5567f.tar.xz
nixlib-a5324f21323cb8758eb60cd10c24d79570f5567f.tar.zst
nixlib-a5324f21323cb8758eb60cd10c24d79570f5567f.zip
pkgs/os-specific/linux/firmware/bcm43xx: please do not use fetchsvn in base system
Replaced use of fetchsvn with fetchurl. Please note that machines behind a
company firewall usually cannot access svn://-style URLs, which means that
nixos-rebuild is going to fail. HTTP works fine, though.

The URL I used to download the tar.gz archive is probably not stable, or
rather, the tar.gz archive generated by Gitweb at that URL might have a
different checksum every time it's generated. I'm not sure what else to do,
though. Could a kind firmware expert please improve the situation further?

Also, I wonder what is the purpose of the sed expression in the command

    cp $i $out/brcm/$(echo $i | sed 's/\(.*\.fw\).*/\1/')

...? The downloaded directory doesn't seem to contain any files that would
match that expression?

svn path=/nixpkgs/trunk/; revision=30010
Diffstat (limited to 'pkgs/os-specific/linux/firmware')
-rw-r--r--pkgs/os-specific/linux/firmware/bcm43xx/default.nix14
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix
index 87670cb52238..36ef83581f82 100644
--- a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix
+++ b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix
@@ -1,14 +1,12 @@
-{ stdenv, fetchsvn }:
+{ stdenv, fetchurl }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "bcm43xx-firmware-610.811";
 
-  # For convenience, get it from the Debian SVN repo.  Upstream seems to be
-  # https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=tree;f=brcm
-  src = fetchsvn {
-    url = svn://svn.debian.org/kernel/dists/trunk/firmware-nonfree/brcm80211/brcm;
-    rev = 17441;
-    sha256 = "0dpc3kwgrslr3i00vx9pvvk2xvcwwf24yrbh6d5gxq9r1q65p8sz";
+  src = fetchurl {
+    url = "https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=snapshot;h=e62f89cefb4660a16b192c57b446cac975836d05;sf=tgz";
+    sha256 = "a4409c3ed21b5650da9277873e4b05228937ed65526bffd9c93d09cbdf7935b2";
+    name = "brcm-e62f89cefb4660a16b192c57b446cac975836d05.tar.gz";
   };
 
   buildPhase = "true";