Merge pull request #186180 from AndersonTorres/remove-tarballs-nixos

Remove references to tarballs.nixos.org

4 files changed, 68 insertions, 47 deletions

diff --git a/pkgs/data/fonts/fixedsys-excelsior/default.nix b/pkgs/data/fonts/fixedsys-excelsior/default.nix
index 8bdbc2d4c4f0..cb9d5e73ed2a 100644
--- a/pkgs/data/fonts/fixedsys-excelsior/default.nix
+++ b/pkgs/data/fonts/fixedsys-excelsior/default.nix
@@ -1,17 +1,12 @@
 { lib, fetchurl } :
 
 let
-  major = "3";
-  minor = "00";
-  version = "${major}.${minor}";
+  version = "3.00";
 in fetchurl rec {
   name = "fixedsys-excelsior-${version}";
 
-  urls = [
-    "http://www.fixedsysexcelsior.com/fonts/FSEX300.ttf"
-    "https://raw.githubusercontent.com/chrissimpkins/codeface/master/fonts/fixed-sys-excelsior/FSEX300.ttf"
-    "http://tarballs.nixos.org/sha256/6ee0f3573bc5e33e93b616ef6282f49bc0e227a31aa753ac76ed2e3f3d02056d"
-  ];
+  url = "https://raw.githubusercontent.com/chrissimpkins/codeface/master/fonts/fixed-sys-excelsior/FSEX300.ttf";
+
   downloadToTemp = true;
   recursiveHash = true;
   postFetch = ''
@@ -21,8 +16,8 @@ in fetchurl rec {
   sha256 = "32d6f07f1ff08c764357f8478892b2ba5ade23427af99759f34a0ba24bcd2e37";
 
   meta = {
-    description = "Pan-unicode version of Fixedsys, a classic DOS font";
     homepage = "http://www.fixedsysexcelsior.com/";
+    description = "Pan-unicode version of Fixedsys, a classic DOS font";
     platforms = lib.platforms.all;
     license = lib.licenses.publicDomain;
     maintainers = [ lib.maintainers.ninjatrappeur ];
diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix
index 4bc06a97a7b2..dc26eaf1001a 100644
--- a/pkgs/development/libraries/imlib/default.nix
+++ b/pkgs/development/libraries/imlib/default.nix
@@ -1,13 +1,23 @@
-{ lib, stdenv, fetchurl, fetchpatch
-, libX11, libXext, xorgproto, libjpeg, giflib, libtiff, libpng
+{ lib
+, stdenv
+, fetchurl
+, fetchpatch
+, giflib
+, libX11
+, libXext
+, libjpeg
+, libpng
+, libtiff
+, xorgproto
 }:
 
 stdenv.mkDerivation rec {
   pname = "imlib";
   version = "1.9.15";
+
   src = fetchurl {
-    url = "https://tarballs.nixos.org/imlib-${version}.tar.gz";
-    sha256 = "0ggjxyvgp4pxc0b88v40xj9daz90518ydnycw7qax011gxpr12d3";
+    url = "https://ftp.acc.umu.se/pub/GNOME/sources/imlib/1.9/${pname}-${version}.tar.gz";
+    hash = "sha256-o4mQb38hgK7w4czb5lEoIH3VkuyAbIQWYP2S+7bv8j0=";
   };
 
   patches = [
@@ -34,7 +44,15 @@ stdenv.mkDerivation rec {
     "--x-libraries=${libX11.out}/lib"
   ];
 
-  buildInputs = [ libjpeg libXext libX11 xorgproto libtiff giflib libpng ];
+  buildInputs = [
+    libjpeg
+    libXext
+    libX11
+    xorgproto
+    libtiff
+    giflib
+    libpng
+  ];
 
   meta = with lib; {
     description = "An image loading and rendering library for X11";
diff --git a/pkgs/tools/filesystems/aefs/default.nix b/pkgs/tools/filesystems/aefs/default.nix
index c523255ddb04..5364b62c29cc 100644
--- a/pkgs/tools/filesystems/aefs/default.nix
+++ b/pkgs/tools/filesystems/aefs/default.nix
@@ -1,21 +1,22 @@
-{ lib, stdenv, fetchurl, fetchpatch, fuse }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, fuse
+, git
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "aefs";
-  version = "0.4pre259-8843b7c";
+  version = "unstable-2015-05-06";
 
-  src = fetchurl {
-    url = "http://tarballs.nixos.org/aefs-${version}.tar.bz2";
-    sha256 = "167hp58hmgdavg2mqn5dx1xgq24v08n8d6psf33jhbdabzx6a6zq";
+  src = fetchFromGitHub {
+    owner = "edolstra";
+    repo = "aefs";
+    rev = "e7a9bf8cfa9166668fe1514cc1afd31fc4e10e9a";
+    hash = "sha256-a3YQWxJ7+bYhf1W1kdIykV8U1R4dcDZJ7K3NvNxbF0s=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/edolstra/aefs/commit/15d8df8b8d5dc1ee20d27a86c4d23163a67f3123.patch";
-      sha256 = "0k36hsyvf8a0ji2hpghgqff2fncj0pllxn8p0rs0aj4h7j2vp4iv";
-    })
-  ];
-
   # autoconf's AC_CHECK_HEADERS and AC_CHECK_LIBS fail to detect libfuse on
   # Darwin if FUSE_USE_VERSION isn't set at configure time.
   #
@@ -26,13 +27,16 @@ stdenv.mkDerivation rec {
   #     $ grep -R FUSE_USE_VERSION
   configureFlags = lib.optional stdenv.isDarwin "CPPFLAGS=-DFUSE_USE_VERSION=26";
 
+  nativeBuildInputs = [ autoreconfHook git ];
+
   buildInputs = [ fuse ];
 
   meta = with lib; {
     homepage = "https://github.com/edolstra/aefs";
     description = "A cryptographic filesystem implemented in userspace using FUSE";
-    platforms = platforms.unix;
     maintainers = [ maintainers.eelco ];
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
+    broken = stdenv.isDarwin;
   };
 }
diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix
index babcbcfc6c33..97545204bfd4 100644
--- a/pkgs/tools/virtualization/ec2-api-tools/default.nix
+++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix
@@ -1,31 +1,35 @@
-{ lib, stdenv, fetchurl, unzip, makeWrapper, jre }:
+{ lib
+, stdenv
+, fetchurl
+, unzip
+, makeWrapper
+, jre
+}:
 
 stdenv.mkDerivation rec {
   pname = "ec2-api-tools";
   version = "1.7.5.1";
 
   src = fetchurl {
-    url = "http://tarballs.nixos.org/ec2-api-tools-${version}.zip";
-    sha256 = "0figmvcm82ghmpz3018ihysz8zpxpysgbpdx7rmciq9y80qbw6l5";
+    url = "http://s3.amazonaws.com/ec2-downloads/${pname}-${version}.zip";
+    sha256 = "sha256-hRq+MEA+4chqPr3d9bS//X70tYcRBTD+rfAJVNmuLzo=";
   };
 
   nativeBuildInputs = [ makeWrapper unzip ];
 
-  installPhase =
-    ''
-      d=$out/libexec/ec2-api-tools
-      mkdir -p $d
-      mv * $d
-      rm $d/bin/*.cmd # Windows stuff
-
-      for i in $d/bin/*; do
-          b=$(basename $i)
-          if [ $b = "ec2-cmd" ]; then continue; fi
-          makeWrapper $i $out/bin/$(basename $i) \
-            --set EC2_HOME $d \
-            --set JAVA_HOME ${jre}
-      done
-    ''; # */
+  installPhase = ''
+    d=$out/libexec/ec2-api-tools
+    mkdir -p $d
+    mv * $d
+    rm $d/bin/*.cmd # Windows stuff
+    for i in $d/bin/*; do
+      b=$(basename $i)
+      if [ $b = "ec2-cmd" ]; then continue; fi
+      makeWrapper $i $out/bin/$(basename $i) \
+        --set EC2_HOME $d \
+        --set JAVA_HOME ${jre}
+    done
+  '';
 
   meta = {
     homepage = "http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351";