diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-05 10:28:58 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-05 10:28:58 +0100 |
commit | b1acaffe67afd838900fe22ad35cf0dda24eff63 (patch) | |
tree | facc558b711b96b0d302fe070963e696e17fa2f3 /pkgs/tools/misc | |
parent | 556a28908e01ca1d44962d8570b5e73be949eca6 (diff) | |
parent | b054851d18585daf67626d92b03fab418c590840 (diff) | |
download | nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar.gz nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar.bz2 nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar.lz nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar.xz nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar.zst nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/colord/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/misc/parallel/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/snapper/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/system-config-printer/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/tldr/default.nix | 37 | ||||
-rw-r--r-- | pkgs/tools/misc/youtube-dl/default.nix | 4 |
6 files changed, 54 insertions, 7 deletions
diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 40c9ddf8c946..3ba5a138e5a7 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -16,14 +16,20 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-udevrulesdir=$out/lib/udev/rules.d" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--localstatedir=/var" "--disable-bash-completion" ]; + # don't touch /var at install time, colord creates what it needs at runtime + postPatch = '' + sed -i -e "s|if test -w .*;|if false;|" src/Makefile.in + sed -i -e "s|if test -w .*;|if false;|" src/Makefile.am + ''; + buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection bashCompletion argyllcms automake autoconf libgudev ]; postInstall = '' - rm -fr $out/var/lib/colord mkdir -p $out/etc/bash_completion.d cp -v data/colormgr $out/etc/bash_completion.d ''; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index ca347cfe8425..7e8a8312f509 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20151122"; + name = "parallel-20151222"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0phn9dlkqlq3cq468ypxbbn78bsjcin743pyvf8ip4qg6jz662jm"; + sha256 = "03czpnsj77xxzqxzzr1b39ym9acn94hknzbilbh28v5q1wk7r4mf"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 0f28b15ea973..41a5a6797d14 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoconf, automake, boost, pkgconfig, libtool, acl, libxml2, btrfsProgs, dbus_libs, docbook_xsl, libxslt, docbook_xml_dtd_45, diffutils, pam, utillinux, attr, gettext }: +{ stdenv, fetchgit, autoconf, automake, boost, pkgconfig, libtool, acl, libxml2, btrfs-progs, dbus_libs, docbook_xsl, libxslt, docbook_xml_dtd_45, diffutils, pam, utillinux, attr, gettext }: stdenv.mkDerivation rec { name = "snapper-0.2.4"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "ec4b829430bd7181995e66a26ac86e8ac71c27e77faf8eb06db71d645c6f859b"; }; - buildInputs = [ autoconf automake boost pkgconfig libtool acl libxml2 btrfsProgs dbus_libs docbook_xsl libxslt docbook_xml_dtd_45 diffutils pam utillinux attr gettext ]; + buildInputs = [ autoconf automake boost pkgconfig libtool acl libxml2 btrfs-progs dbus_libs docbook_xsl libxslt docbook_xml_dtd_45 diffutils pam utillinux attr gettext ]; patchPhase = '' # work around missing btrfs/version.h; otherwise, use "-DHAVE_BTRFS_VERSION_H" diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 51cb1d22a49e..6b0be9d2f6e8 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -36,9 +36,13 @@ stdenv.mkDerivation rec { ( cd $out/share/system-config-printer/troubleshoot mv .__init__.py-wrapped __init__.py ) + + # Upstream issue: https://github.com/twaugh/system-config-printer/issues/28 + sed -i -e "s|/usr/bin|$out/bin|" "$out/share/dbus-1/services/org.fedoraproject.Config.Printing.service" ''; meta = { homepage = http://cyberelk.net/tim/software/system-config-printer/; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix new file mode 100644 index 000000000000..49c2736095e4 --- /dev/null +++ b/pkgs/tools/misc/tldr/default.nix @@ -0,0 +1,37 @@ +{stdenv, clang, fetchurl, curl}: + +with stdenv.lib; + +let version = "1.0"; in +stdenv.mkDerivation { + name = "tldr-${version}"; + + src = fetchurl { + url = "https://github.com/tldr-pages/tldr-cpp-client/archive/v${version}.tar.gz"; + sha256 = "11k2pc4vfhx9q3cfd1145sdwhis9g0zhw4qnrv7s7mqnslzrrkgw"; + }; + + meta = { + inherit version; + description = "Simplified and community-driven man pages"; + longDescription = '' + tldr pages gives common use cases for commands, so you don't need to hunt through a man page for the correct flags. + ''; + homepage = http://tldr-pages.github.io; + license = licenses.mit; + maintainers = [maintainers.taeer]; + platforms = platforms.linux; + + }; + + buildInputs = [curl clang]; + + preBuild = '' + cd src + ''; + + installPhase = '' + install -d $prefix/bin + install tldr $prefix/bin + ''; +} diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 6080f38a8019..cdd213b0eba5 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchurl { url = "http://yt-dl.org/downloads/${meta.version}/${name}.tar.gz"; - sha256 = "cceeb606e723c0291de85eecb9a551ca887f3be4db786ad621011a9201a482b1"; + sha256 = "0b0pk8h2iswdiyf65c0zcwcad9dm2hid67fnfafj7d3ikp4kfbvk"; }; buildInputs = [ makeWrapper zip pandoc ]; @@ -24,7 +24,7 @@ buildPythonPackage rec { ''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"''; meta = with stdenv.lib; { - version = "2015.11.24"; + version = "2016.01.01"; homepage = http://rg3.github.io/youtube-dl/; repositories.git = https://github.com/rg3/youtube-dl.git; description = "Command-line tool to download videos from YouTube.com and other sites"; |