From 01f91267e26d5b765c300d49ac28deb97778ef2b Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 29 May 2018 18:42:45 +0200 Subject: gitAndTools.svn-all-fast-export: 1.0.11 -> 1.0.12 patch for https://github.com/svn-all-fast-export/svn2git/pull/40 is contained in this release, so we can drop it here. --- .../git-and-tools/svn-all-fast-export/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix') diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix index 2dfa61952a57..e3ceccdcf3bd 100644 --- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, qmake, qtbase, qttools, subversion, apr }: let - version = "1.0.11"; + version = "1.0.12"; in stdenv.mkDerivation { name = "svn-all-fast-export-${version}"; @@ -10,18 +10,9 @@ stdenv.mkDerivation { owner = "svn-all-fast-export"; repo = "svn2git"; rev = version; - sha256 = "0lhnw8f15j4wkpswhrjd7bp9xkhbk32zmszaxayzfhbdl0g7pzwj"; + sha256 = "158w2ynz16dlp992g8nfk7v2f5962z88b4xyv5dyjvbl4l1v7r0v"; }; - # https://github.com/svn-all-fast-export/svn2git/pull/40 - patches = [ - (fetchpatch { - name = "pr40.patch"; - sha256 = "0mwncklzncsifql9zlxlbj3clsif5p2v1xs8nmxrw44mqvaysjw3"; - url = https://github.com/svn-all-fast-export/svn2git/compare/f00d5a5...flokli:nixos-20180326.patch; - }) - ]; - nativeBuildInputs = [ qmake qttools ]; buildInputs = [ apr.dev subversion.dev qtbase ]; -- cgit 1.4.1