From e7cd9077a8fa0d3acd434e6de09902aabe3a3425 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 21 Nov 2015 20:55:10 +0000 Subject: [PATCH] s3sync: delete dead project According to http://s3sync.net/wiki.html, https://github.com/ms4720/s3sync was supposed to take over the development but nothing has happened in 4 years. The project is unfortunately dead and is our only dependency to ruby 1.8. --- .../doc/manual/release-notes/rl-unstable.xml | 8 +++++ pkgs/tools/networking/s3sync/default.nix | 29 ------------------- pkgs/top-level/all-packages.nix | 4 --- 3 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 pkgs/tools/networking/s3sync/default.nix diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index 65aa36586cb0..f7564ddb5bbe 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -74,6 +74,14 @@ nginx.override { + + s3sync is removed, as it hasn't been + developed by upstream for 4 years and only runs with ruby 1.8. + For an actively-developer alternative look at + tarsnap and others. + + + diff --git a/pkgs/tools/networking/s3sync/default.nix b/pkgs/tools/networking/s3sync/default.nix deleted file mode 100644 index 1ab3e062ca00..000000000000 --- a/pkgs/tools/networking/s3sync/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, ruby, makeWrapper }: - -stdenv.mkDerivation { - name = "s3sync-1.2.6"; - - src = fetchurl { - url = http://s3.amazonaws.com/ServEdge_pub/s3sync/s3sync.tar.gz; # !!! - sha256 = "19467mgym0da0hifhkcbivccdima7gkaw3k8q760ilfbwgwxcn7f"; - }; - - buildInputs = [ makeWrapper ]; - - installPhase = - '' - mkdir -p $out/libexec/s3sync - cp *.rb $out/libexec/s3sync - makeWrapper "${ruby}/bin/ruby $out/libexec/s3sync/s3cmd.rb" $out/bin/s3cmd - makeWrapper "${ruby}/bin/ruby $out/libexec/s3sync/s3sync.rb" $out/bin/s3sync - - mkdir -p $out/share/doc/s3sync - cp README* $out/share/doc/s3sync/ - ''; # */ - - meta = { - homepage = http://s3sync.net/; - description = "Command-line tools to manipulate Amazon S3 buckets"; - license = stdenv.lib.licenses.free; # some custom as-is in file headers - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb164a4cafc9..c52a3d085f47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2932,10 +2932,6 @@ let s3cmd = callPackage ../tools/networking/s3cmd { }; - s3sync = callPackage ../tools/networking/s3sync { - ruby = ruby_1_8; - }; - s6Dns = callPackage ../tools/networking/s6-dns { }; s6LinuxUtils = callPackage ../os-specific/linux/s6-linux-utils { };