diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/filesystems/bindfs/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/misc/grub/2.0x.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/system/logrotate/default.nix | 26 | ||||
-rw-r--r-- | pkgs/tools/text/ledger2beancount/default.nix | 19 |
4 files changed, 35 insertions, 27 deletions
diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index cc6916869b6..12052100db3 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, fuse, pkg-config }: stdenv.mkDerivation rec { - version = "1.14.9"; + version = "1.15.1"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "0fnij365dn4ihkpfc92x63inxxwpminzffyj55krp1w02canpl5n"; + sha256 = "sha256-BN01hKbN+a9DRNQDxiGFyp+rMc465aJdAQG8EJNsaKs="; }; nativeBuildInputs = [ pkg-config ]; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { meta = { description = "A FUSE filesystem for mounting a directory to another location"; homepage = "https://bindfs.org"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ lovek323 ]; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ lovek323 lovesegfault ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index bc933312afc..b97d086b972 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,10 +1,12 @@ { lib, stdenv, fetchgit, flex, bison, python3, autoconf, automake, gnulib, libtool , gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config , fuse # only needed for grub-mount +, runtimeShell , zfs ? null , efiSupport ? false , zfsSupport ? false , xenSupport ? false +, kbdcompSupport ? false, ckbcomp }: with lib; @@ -53,6 +55,13 @@ stdenv.mkDerivation rec { ./fix-bash-completion.patch ]; + postPatch = if kbdcompSupport then '' + sed -i util/grub-kbdcomp.in -e 's@\bckbcomp\b@${ckbcomp}/bin/ckbcomp@' + '' else '' + echo '#! ${runtimeShell}' > util/grub-kbdcomp.in + echo 'echo "Compile grub2 with { kbdcompSupport = true; } to enable support for this command."' >> util/grub-kbdcomp.in + ''; + nativeBuildInputs = [ bison flex python3 pkg-config autoconf automake ]; buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ] ++ optional doCheck qemu diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index 513b48c6630..e91cd6da6b9 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -14,27 +14,21 @@ stdenv.mkDerivation rec { }; # Logrotate wants to access the 'mail' program; to be done. - patchPhase = '' - sed -i -e 's,[a-z/]\+gzip,${gzip}/bin/gzip,' \ - -e 's,[a-z/]\+gunzip,${gzip}/bin/gunzip,' configure.ac - - ${lib.optionalString (mailutils != null) '' - sed -i -e 's,[a-z/]\+mail,${mailutils}/bin/mail,' configure.ac - ''} - ''; - - autoreconfPhase = '' - ./autogen.sh - ''; + configureFlags = [ + "--with-compress-command=${gzip}/bin/gzip" + "--with-uncompress-command=${gzip}/bin/gunzip" + ] ++ lib.optionals (mailutils != null) [ + "--with-default-mail-command=${mailutils}/bin/mail" + ]; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ popt ]; - meta = { + meta = with lib; { homepage = "https://fedorahosted.org/releases/l/o/logrotate/"; description = "Rotates and compresses system logs"; - license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.viric ]; - platforms = lib.platforms.all; + license = licenses.gpl2Plus; + maintainers = [ maintainers.viric ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/text/ledger2beancount/default.nix b/pkgs/tools/text/ledger2beancount/default.nix index fe2078222d2..b3f48085d1d 100644 --- a/pkgs/tools/text/ledger2beancount/default.nix +++ b/pkgs/tools/text/ledger2beancount/default.nix @@ -4,21 +4,26 @@ with lib; let perlDeps = with perlPackages; [ - ConfigOnion DateCalc - FileBaseDir YAMLLibYAML - GetoptLongDescriptive DateTimeFormatStrptime + DateCalc + DateTimeFormatStrptime + enum + FileBaseDir + GetoptLongDescriptive + ListMoreUtils + RegexpCommon StringInterpolate + YAMLLibYAML ]; in stdenv.mkDerivation rec { pname = "ledger2beancount"; - version = "2.1"; + version = "2.5"; src = fetchFromGitHub { - owner = "zacchiro"; + owner = "beancount"; repo = "ledger2beancount"; rev = version; - sha256 = "0w88jb1x0w02jwwf6ipx3cxr89kzffrrdqws3556zrvvs01bh84j"; + sha256 = "0kimp8l9ax37grfv5r5iw0g0xnrpkak022fl10y3i7kc4nyi1s99"; }; phases = [ @@ -50,7 +55,7 @@ in stdenv.mkDerivation rec { Conversion is based on (concrete) syntax, so that information that is not meaningful for accounting reasons but still valuable (e.g., comments, formatting, etc.) can be preserved. ''; - homepage = "https://github.com/zacchiro/ledger2beancount"; + homepage = "https://github.com/beancount/ledger2beancount"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ pablovsky ]; |