From 4962864417775803ab32a92eacf6857e77fffa70 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 Apr 2009 08:12:16 +0000 Subject: [PATCH] * Fixed the mount-cifs source URL (copied from the stdenv-branch). svn path=/nixpkgs/trunk/; revision=14958 --- pkgs/build-support/vm/default.nix | 9 +++------ pkgs/os-specific/linux/mount-cifs/default.nix | 5 ++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index d8d2a8db522..42bc2f5652d 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -13,14 +13,11 @@ rec { rootModules = ["cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8"]; }; - + + # !!! should use the mount_cifs package in all-packages.nix here. mountCifs = (makeStaticBinaries stdenv).mkDerivation { name = "mount.cifs"; - src = fetchurl { - name = "mount.cifs.c"; - url = "http://websvn.samba.org/cgi-bin/viewcvs.cgi/*checkout*/branches/SAMBA_3_0/source/client/mount.cifs.c?rev=6103"; - sha256 = "19205gd3pv8g519hlbjaw559wqgf0h2vkln9xgqaqip2h446qarp"; - }; + src = mount_cifs.src; buildInputs = [nukeReferences]; buildCommand = '' ensureDir $out/bin diff --git a/pkgs/os-specific/linux/mount-cifs/default.nix b/pkgs/os-specific/linux/mount-cifs/default.nix index d8c901b77f4..490e6e05cba 100644 --- a/pkgs/os-specific/linux/mount-cifs/default.nix +++ b/pkgs/os-specific/linux/mount-cifs/default.nix @@ -4,9 +4,8 @@ stdenv.mkDerivation { name = "mount.cifs"; src = fetchurl { - name = "mount.cifs.c"; - url = "http://websvn.samba.org/cgi-bin/viewcvs.cgi/*checkout*/branches/SAMBA_3_0/source/client/mount.cifs.c?rev=6103"; - sha256 = "19205gd3pv8g519hlbjaw559wqgf0h2vkln9xgqaqip2h446qarp"; + url = http://nixos.org/tarballs/mount_cifs-20090330.c; + sha256 = "1d9v3qzic3d12vna8g7d1zsl1piwm20f6xhck319rbfkrdg0smnl"; }; buildCommand = ''