diff options
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r-- | pkgs/tools/text/aha/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/reckon/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/text/xidel/default.nix | 10 |
3 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index b83f97a4b8d7..9851f9596c36 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "aha-${version}"; - version = "0.4.9"; + version = "0.4.10.2"; src = fetchFromGitHub { - sha256 = "0g7awnh7z4cj3kkmldg6kl8dsvdvs46vbf273crmpswk0r4hzj80"; + sha256 = "14n0py8dzlvirawb8brq143nq0sy9s2z6in5589krrya0frlrlkj"; rev = version; repo = "aha"; owner = "theZiz"; diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix index 370fcf265d51..b6340fd2df46 100644 --- a/pkgs/tools/text/reckon/default.nix +++ b/pkgs/tools/text/reckon/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Flexibly import bank account CSV files into Ledger for command line accounting"; license = licenses.mit; - maintainers = "mckean.kylej@gmail.com"; + maintainers = [ "mckean.kylej@gmail.com" ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix index c76e0f49734e..91cecce61225 100644 --- a/pkgs/tools/text/xidel/default.nix +++ b/pkgs/tools/text/xidel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, patchelf }: +{ stdenv, fetchurl, dpkg }: stdenv.mkDerivation rec { name = "xidel-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { } else throw "xidel is not supported on ${stdenv.system}"; - buildInputs = [ dpkg patchelf ]; + buildInputs = [ dpkg ]; unpackPhase = '' dpkg-deb -x ${src} ./ @@ -34,9 +34,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/bin" cp -a usr/* "$out/" - interpreter="$(echo ${stdenv.glibc.out}/lib/ld-linux*)" - patchelf --set-interpreter "$interpreter" "$out/bin/xidel" - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [stdenv.glibc]}" "$out/bin/xidel" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/bin/xidel" ''; meta = with stdenv.lib; { @@ -45,7 +43,7 @@ stdenv.mkDerivation rec { # source contains no license info (AFAICS), but sourceforge says GPLv2 license = licenses.gpl2; # more platforms will be supported when we switch to source build - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; } |