diff --git a/pkgs/build-support/fetchgitrevision/default.nix b/pkgs/build-support/fetchgitrevision/default.nix new file mode 100644 index 000000000000..d1e96f4bee5b --- /dev/null +++ b/pkgs/build-support/fetchgitrevision/default.nix @@ -0,0 +1,10 @@ +runCommand: git: repository: branch: + import (runCommand "head-revision" + { buildInputs = [ git ]; + dummy = builtins.currentTime; + } + '' + rev=$(git ls-remote ${repository} | grep "refs/${branch}$" | awk '{ print $1 }') + echo "[ \"$rev\" ]" > $out + echo Latest revision in ${branch} is $rev + ''); diff --git a/pkgs/build-support/fetchsvnrevision/default.nix b/pkgs/build-support/fetchsvnrevision/default.nix new file mode 100644 index 000000000000..288451a225c7 --- /dev/null +++ b/pkgs/build-support/fetchsvnrevision/default.nix @@ -0,0 +1,10 @@ +runCommand: subversion: repository: + import (runCommand "head-revision" + { buildInputs = [ subversion ]; + dummy = builtins.currentTime; + } + '' + rev=$(echo p | svn ls -v --depth empty ${repository} |awk '{ print $1 }') + echo "[ \"$rev\" ]" > $out + echo Latest revision is $rev + '') \ No newline at end of file diff --git a/pkgs/development/libraries/taglib/1.7.nix b/pkgs/development/libraries/taglib/live.nix similarity index 52% rename from pkgs/development/libraries/taglib/1.7.nix rename to pkgs/development/libraries/taglib/live.nix index 1e8cfb564e99..35af2ff51958 100644 --- a/pkgs/development/libraries/taglib/1.7.nix +++ b/pkgs/development/libraries/taglib/live.nix @@ -1,13 +1,17 @@ -{stdenv, fetchsvn, zlib, cmake}: +{stdenv, fetchsvn, fetchsvnrevision, zlib, cmake +, repository ? "svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib" +, rev ? fetchsvnrevision repository +, src ? fetchsvn { + url = repository; + rev = rev; + } +}: stdenv.mkDerivation { - name = "taglib-1.7a"; - - src = fetchsvn { - url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib; - rev = 1145554; - }; - + name = "taglib-live"; + + inherit src; + cmakeFlags = [ "-DWITH-ASF=ON" "-DWITH-MP4=ON" ]; buildInputs = [ zlib cmake ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92b399ab5f22..df7ff332412d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -263,6 +263,8 @@ let inherit stdenv git; }; + fetchgitrevision = import ../build-support/fetchgitrevision runCommand git; + fetchmtn = import ../build-support/fetchmtn { inherit monotone stdenv; cacheDB = getConfig ["fetchmtn" "cacheDB"] ""; @@ -273,6 +275,8 @@ let inherit stdenv subversion openssh; sshSupport = true; }; + + fetchsvnrevision = import ../build-support/fetchsvnrevision runCommand subversion; fetchsvnssh = import ../build-support/fetchsvnssh { inherit stdenv subversion openssh expect; @@ -4036,7 +4040,7 @@ let taglib = callPackage ../development/libraries/taglib { }; - taglib17 = callPackage ../development/libraries/taglib/1.7.nix { }; + taglib_live = callPackage ../development/libraries/taglib/live.nix { }; taglib_extras = callPackage ../development/libraries/taglib-extras { };