From df995253e3271caede033a49b14cb302a6d57fcd Mon Sep 17 00:00:00 2001 From: Moritz Ulrich <moritz@tarn-vedra.de> Date: Fri, 7 Nov 2014 16:23:59 +0100 Subject: [PATCH] ledger3: Update to 3.1 This commit also adds pkgs.ledger2 and pkgs.ledger3 plus a default attribute pkgs.ledger pointing at ledger3. --- .../office/ledger/{3.0.nix => default.nix} | 12 +++++++----- pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 10 insertions(+), 7 deletions(-) rename pkgs/applications/office/ledger/{3.0.nix => default.nix} (78%) diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/default.nix similarity index 78% rename from pkgs/applications/office/ledger/3.0.nix rename to pkgs/applications/office/ledger/default.nix index 6118d377a79f..34aa7c769d01 100644 --- a/pkgs/applications/office/ledger/3.0.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -2,16 +2,18 @@ , texinfo, gnused }: let - rev = "5961384"; + version = "3.1"; in stdenv.mkDerivation { - name = "ledger-3.0.4.${rev}"; + name = "ledger-${version}"; + # NOTE: fetchgit because ledger has submodules not included in the + # default github tarball. src = fetchgit { - url = "git://github.com/ledger/ledger.git"; - inherit rev; - sha256 = "0fmmhr3as4v2kb6h64k1fq979080cqhd75jvxfg7axk2mylb6b3q"; + url = "https://github.com/ledger/ledger.git"; + rev = "refs/tags/v${version}"; + sha256 = "1l5y4k830jyw7n1nnhssci3qahq091fj5cxcr77znk20nclz851s"; }; buildInputs = [ cmake boost gmp mpfr libedit python texinfo gnused ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 283841873859..5e6a16aaf70b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9945,8 +9945,9 @@ let links = callPackage ../applications/networking/browsers/links { }; - ledger = callPackage ../applications/office/ledger/2.6.3.nix { }; - ledger3 = callPackage ../applications/office/ledger/3.0.nix { }; + ledger2 = callPackage ../applications/office/ledger/2.6.3.nix { }; + ledger3 = callPackage ../applications/office/ledger { }; + ledger = ledger3; lighttable = callPackage ../applications/editors/lighttable {};