diff --git a/default.nix b/default.nix index ef475dd..081f7dc 100644 --- a/default.nix +++ b/default.nix @@ -51,6 +51,6 @@ let # # pijul = callPackage ./pijul.nix { rustPlatform = super.makeRustPlatform { inherit (self.rustChannelOf { date = "2019-01-04"; channel = "nightly"; }) rustc cargo; }; }; # pijul = callPackage ./pijul.nix { rustPlatform = super.makeRustPlatform { inherit (_self.latest.rustChannels.nightly) rustc cargo; }; }; myR = super.rWrapper.override { packages = with super.rPackages; [ ggplot2 lintr tikzDevice rlang ]; }; - gledger = callPackage ./gledger { }; + ledgerTools = callPackage ./ledger-tools { }; }; in _self diff --git a/gledger/default.nix b/gledger/default.nix deleted file mode 100644 index 14c8303..0000000 --- a/gledger/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, gnupg, ledger, writeScriptBin }: - -let gledger = '' -''; -in stdenv.mkDerivation { - pname = "gledger"; - version = "2"; - - phases = [ "installPhase" "fixupPhase" ]; - - binpath = stdenv.lib.makeBinPath [ gnupg ledger ]; - installPhase = '' - mkdir -p $out/bin - substituteAll ${./gledger} $out/bin/gledger - cp ${./gledger-camt-csv} $out/bin/gledger-camt-csv - chmod +x $out/bin/* - ''; - - meta = with stdenv.lib; { - description = "GNUPG wrapper and tools for ledger"; - maintainers = with maintainers; [ spacefrogg ]; - }; -} diff --git a/ledger-tools/default.nix b/ledger-tools/default.nix new file mode 100644 index 0000000..d59c3e8 --- /dev/null +++ b/ledger-tools/default.nix @@ -0,0 +1,21 @@ +{ stdenv, gnupg, ledger, writeScriptBin }: + +stdenv.mkDerivation { + pname = "ledger-tools"; + version = "2"; + + phases = [ "installPhase" "fixupPhase" ]; + + binpath = stdenv.lib.makeBinPath [ gnupg ]; # use ledger once in nixpkgs + installPhase = '' + mkdir -p $out/bin + cp ${./ledger-camt-csv} $out/bin/ledger-camt-csv + substituteAllInPlace $out/bin/ledger-camt-csv + chmod +x $out/bin/* + ''; + + meta = with stdenv.lib; { + description = "ledger tools"; + maintainers = with maintainers; [ spacefrogg ]; + }; +} diff --git a/gledger/gledger b/ledger-tools/gledger similarity index 100% rename from gledger/gledger rename to ledger-tools/gledger diff --git a/gledger/gledger-camt-csv b/ledger-tools/ledger-camt-csv similarity index 81% rename from gledger/gledger-camt-csv rename to ledger-tools/ledger-camt-csv index ad32026..67443f1 100644 --- a/gledger/gledger-camt-csv +++ b/ledger-tools/ledger-camt-csv @@ -3,8 +3,9 @@ # Sparkasse Germany VISA CSV format set -e +PATH=@binpath@:$PATH -[ $# -ge 2 ] || { printf "Usage: gledger-camt-csv [-visa | -camt] CSV ACCOUNT\n">&2; exit 1; } +[ $# -ge 2 ] || { printf "Usage: ledger-camt-csv [-visa | -camt] CSV ACCOUNT\n">&2; exit 1; } CAMT_HDR=",date,posted,,note,,,,,,,payee,pIBAN,pBIC,amount,," VISA_HDR=",date,posted,oAmount,oCommodity,,amount,,payee,note,,,,,," @@ -34,7 +35,7 @@ OUTFILE=$BASEDIR/tmp/$(basename "${INFILE%.CSV}.ledger") { echo "$HDR"; tail -n+2 "$INFILE"; } | sed -e 's/";"/","/g' | iconv -f ISO-8859-1 -t UTF-8 >$MANGLED -gledger convert "$MANGLED" --input-date-format "$DATE_FMT" --invert --rich-data --account $2 >$OUTFILE +ledger convert "$MANGLED" --input-date-format "$DATE_FMT" --invert --rich-data --account $2 >$OUTFILE echo "$BASEDIR/new/"$(basename "$OUTFILE") >&2 rm -f "$MANGLED" mv "$INFILE" "$BASEDIR/cur"