diff options
Diffstat (limited to 'pkgs/tools/misc')
42 files changed, 416 insertions, 310 deletions
diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix new file mode 100644 index 000000000000..80791756e659 --- /dev/null +++ b/pkgs/tools/misc/antimicro/default.nix @@ -0,0 +1,22 @@ +{ stdenv, cmake, pkgconfig, SDL2, qt5, xlibs, fetchzip }: + +stdenv.mkDerivation rec { + name = "antimicro-${version}"; + version = "2.18"; + + src = fetchzip { + url = "https://github.com/Ryochan7/antimicro/archive/${version}.tar.gz"; + sha256 = "0kyl4xl2am50v2xscgy2irpcdj78f7flgfhljyjck4ynf8d40vb7"; + }; + + buildInputs = [ + cmake pkgconfig SDL2 qt5.base qt5.tools xlibs.libXtst + ]; + + meta = with stdenv.lib; { + description = "GUI for mapping keyboard and mouse controls to a gamepad"; + homepage = "https://github.com/Ryochan7/antimicro"; + maintainers = with maintainers; [ jb55 ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix deleted file mode 100644 index 626fb5c2321e..000000000000 --- a/pkgs/tools/misc/asciinema/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchFromGitHub, goPackages }: - -goPackages.buildGoPackage rec { - name = "asciinema-${version}"; - version = "1.1.1"; - - goPackagePath = "github.com/asciinema/asciinema"; - - src = fetchFromGitHub { - owner = "asciinema"; - repo = "asciinema"; - rev = "d6f7cabcd085e237872f13d0ab5580964cb64fb2"; - sha256 = "0ip7wcqzf5wax99c1fjmnwd38q88z1xiyv9cfbjyk47npdqb8173"; - }; - - meta = { - homepage = https://asciinema.org/; - license = stdenv.lib.licenses.gpl3; - description = "Terminal session recorder"; - maintainers = with stdenv.lib.maintainers; [ lassulus ]; - }; -} diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix new file mode 100644 index 000000000000..342c014faaae --- /dev/null +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, perl, dpkg }: + +stdenv.mkDerivation rec { + name = "bdf2psf-${version}"; + version = "1.132"; + + src = fetchurl { + url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; + sha256 = "01r8v6qi6klsgi66ld86c78cdz308mywrm9j101d73nsxgx6qhzz"; + }; + + buildInputs = [ dpkg ]; + + dontConfigure = true; + dontBuild = true; + + unpackPhase = "dpkg-deb -x $src ."; + installPhase = " + substituteInPlace usr/bin/bdf2psf --replace /usr/bin/perl ${perl}/bin/perl + mv usr/bin . + cp -r . $out + "; + + meta = { + description = "BDF to PSF converter"; + homepage = https://packages.debian.org/sid/bdf2psf; + longDescription = '' + Font converter to generate console fonts from BDF source fonts + ''; + license = stdenv.lib.licenses.gpl2; + }; +} \ No newline at end of file diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index 308232ac2fe8..1bbabcf5523f 100644 --- a/pkgs/tools/misc/bmon/default.nix +++ b/pkgs/tools/misc/bmon/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "bmon-${version}"; - version = "3.7"; + version = "3.8"; src = fetchFromGitHub { owner = "tgraf"; repo = "bmon"; rev = "v${version}"; - sha256 = "0rh0r8gabcsqq3d659yqk8nz6y4smsi7p1vwa2v584m2l2d0rqd6"; + sha256 = "19jv14r9j9n54bqhidw3z11z3wys1v2cagqpsxn0kjga1gkg87xs"; }; buildInputs = [ autoconf automake pkgconfig ncurses confuse libnl ]; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 9f91a1acc608..267ed4db67ca 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, fetchgit, bashCompletion +{ stdenv, fetchzip, fetchgit, bashCompletion , glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus -, automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection }: +, automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection, argyllcms }: stdenv.mkDerivation rec { - name = "colord-1.2.3"; + name = "colord-1.2.12"; - src = fetchurl { + src = fetchzip { url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz"; - sha256 = "1z3l6hb3b08fixfra6m887a2j3lvhib6vp798ik16jfh375gr490"; + sha256 = "0rvvbpxd5x479v4p6pck317mlf3j29s154i1n8hlx8n4znhwrb0k"; }; enableParallelBuilding = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection - bashCompletion ]; + bashCompletion argyllcms automake autoconf ]; postInstall = '' rm -fr $out/var/lib/colord diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix index 8ae137bbd899..72656d2969de 100644 --- a/pkgs/tools/misc/cpulimit/default.nix +++ b/pkgs/tools/misc/cpulimit/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://limitcpu.sourceforge.net/"; description = "A tool to throttle the CPU usage of programs"; - platforms = with platforms; linux ++ freebsd ++ darwin; + platforms = with platforms; linux ++ freebsd; license = licenses.gpl2; maintainer = [maintainers.rycee]; }; diff --git a/pkgs/tools/misc/cv/default.nix b/pkgs/tools/misc/cv/default.nix index 5b54ed1d4cf7..a92bfcdb35d3 100644 --- a/pkgs/tools/misc/cv/default.nix +++ b/pkgs/tools/misc/cv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cv-${version}"; - version = "0.7.1"; + version = "0.8"; src = fetchFromGitHub { owner = "Xfennec"; repo = "cv"; rev = "v${version}"; - sha256 = "1dcq45mz443mzzf344ap5dgsazhcrn3aislxs57jqbg4p5bbmh1b"; + sha256 = "17vfcv0n1ib4rh1hdl126aid7cnnk94avzlk9yp7y855iml8xzs4"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/debbindiff/default.nix b/pkgs/tools/misc/debbindiff/default.nix deleted file mode 100644 index f5fcb37324ee..000000000000 --- a/pkgs/tools/misc/debbindiff/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchgit, pythonPackages, docutils -, acl, binutils, bzip2, cdrkit, cpio, diffutils, e2fsprogs, file, gettext -, gnupg, gzip, pdftk, poppler_utils, rpm, squashfsTools, unzip, vim, xz -}: - -pythonPackages.buildPythonPackage rec { - name = "debbindiff-${version}"; - version = "26"; - - namePrefix = ""; - - src = fetchgit { - url = "git://anonscm.debian.org/reproducible/debbindiff.git"; - rev = "refs/tags/${version}"; - sha256 = "18637gc7c92mwcpx3dvh6xild0sb9bwsgfcrjplmh7s8frvlvkv6"; - }; - - postPatch = '' - # Different pkg name in debian - sed -i setup.py -e "s@'magic'@'Magic-file-extensions'@" - - # Upstream doesn't provide a PKG-INFO file - sed -i setup.py -e "/'rpm',/d" - ''; - - # Still missing these tools: ghc javap showttf sng - propagatedBuildInputs = (with pythonPackages; [ debian magic ]) ++ - [ acl binutils bzip2 cdrkit cpio diffutils e2fsprogs file gettext gnupg - gzip pdftk poppler_utils rpm squashfsTools unzip vim xz ]; - - doCheck = false; # Calls 'mknod' in squashfs tests, which needs root - - postInstall = '' - mv $out/bin/debbindiff.py $out/bin/debbindiff - mkdir -p $out/share/man/man1 - ${docutils}/bin/rst2man.py debian/debbindiff.1.rst $out/share/man/man1/debbindiff.1 - ''; - - meta = with stdenv.lib; { - description = "Highlight differences between two builds of Debian packages, and even other kind of files"; - homepage = https://wiki.debian.org/ReproducibleBuilds; - license = licenses.gpl3Plus; - maintainers = [ maintainers.dezgeg ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index f8925d26beac..b6158ab64454 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -1,30 +1,50 @@ {stdenv, fetchurl, perl, CryptSSLeay, LWP, unzip, xz, dpkg, TimeDate, DBFile , FileDesktopEntry, libxslt, docbook_xsl, python3, setuptools, makeWrapper -, perlPackages +, perlPackages, curl, gnupg, diffutils +, sendmailPath ? "/var/setuid-wrappers/sendmail" }: + stdenv.mkDerivation rec { - version = "2.15.4"; + version = "2.15.8"; name = "debian-devscripts-${version}"; + src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - sha256 = "03ldbx07ga9df7z9yiq6grb6cms1dr8hlbis2hvbmfcs6gcr3q72"; + sha256 = "1zw7phaigncblxb3jp4m8pk165hylk1f088k51nhj9d7z5iz6bbx"; }; + buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile FileDesktopEntry libxslt python3 setuptools makeWrapper - perlPackages.ParseDebControl ]; + perlPackages.ParseDebControl perlPackages.LWPProtocolHttps + curl gnupg diffutils ]; + preConfigure = '' export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}"; - sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile - sed -e 's/ translated_manpages//; s/--install-layout=deb//; s@--root="[^ ]*"@--prefix="'"$out"'"@' -i Makefile */Makefile tgtpy="$out/lib/${python3.libPrefix}/site-packages" mkdir -p "$tgtpy" export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy" - sed -re "s@/usr( |$|/)@$out\\1@" -i Makefile* */Makefile* - sed -re "s@/etc( |$|/)@$out/etc\\1@" -i Makefile* */Makefile* - - # Completion currently spams every shell startup with an error. Disable for now: - sed "/\/bash_completion\.d/d" -i scripts/Makefile + find po4a scripts -type f -exec sed -r \ + -e "s@/usr/bin/gpg(2|)@${gnupg}/bin/gpg2@g" \ + -e "s@/usr/(s|)bin/sendmail@${sendmailPath}@g" \ + -e "s@/usr/bin/diff@${diffutils}/bin/diff@g" \ + -e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv2@g" \ + -e "s@(command -v|/usr/bin/)curl@${curl}/bin/curl@g" \ + -i {} + + sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile + sed -r \ + -e "s@/usr( |$|/)@$out\\1@g" \ + -e "s@/etc( |$|/)@$out/etc\\1@g" \ + -e 's/ translated_manpages//; s/--install-layout=deb//; s@--root="[^ ]*"@--prefix="'"$out"'"@' \ + -i Makefile* */Makefile* ''; + + makeFlags = [ + "DESTDIR=$(out)" + "PREFIX=" + "COMPL_DIR=/share/bash-completion/completions" + "PERLMOD_DIR=/share/devscripts" + ]; + postInstall = '' sed -re 's@(^|[ !`"])/bin/bash@\1${stdenv.shell}@g' -i "$out/bin"/* for i in "$out/bin"/*; do @@ -34,9 +54,10 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$out/lib/python3.4/site-packages" done ''; - meta = { + + meta = with stdenv.lib; { description = ''Debian package maintenance scripts''; - license = "GPL (various)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO - maintainers = with stdenv.lib.maintainers; [raskin]; + license = licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO + maintainers = with maintainers; [raskin]; }; } diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix new file mode 100644 index 000000000000..e6c672d83441 --- /dev/null +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchgit, pythonPackages, docutils +, acl, binutils, bzip2, cdrkit, cpio, diffutils, e2fsprogs, file, gettext +, gnupg, gzip, pdftk, poppler_utils, rpm, sqlite, squashfsTools, unzip, vim, xz +}: + +pythonPackages.buildPythonPackage rec { + name = "diffoscope-${version}"; + version = "29"; + + namePrefix = ""; + + src = fetchgit { + url = "git://anonscm.debian.org/reproducible/diffoscope.git"; + rev = "refs/tags/${version}"; + sha256 = "0q7hx2wm9gvzl1f7iilr9pjwpv8i2anscqan7cgk80v90s2pakrf"; + }; + + postPatch = '' + # Different pkg name in debian + sed -i setup.py -e "s@'magic'@'Magic-file-extensions'@" + + # Upstream doesn't provide a PKG-INFO file + sed -i setup.py -e "/'rpm',/d" + ''; + + # Still missing these tools: ghc javap showttf sng + propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c magic ssdeep ]) ++ + [ acl binutils bzip2 cdrkit cpio diffutils e2fsprogs file gettext gnupg + gzip pdftk poppler_utils rpm sqlite squashfsTools unzip vim xz ]; + + doCheck = false; # Calls 'mknod' in squashfs tests, which needs root + + postInstall = '' + mv $out/bin/diffoscope.py $out/bin/diffoscope + mkdir -p $out/share/man/man1 + ${docutils}/bin/rst2man.py debian/diffoscope.1.rst $out/share/man/man1/diffoscope.1 + ''; + + meta = with stdenv.lib; { + description = "Perform in-depth comparison of files, archives, and directories"; + longDescription = '' + diffoscope will try to get to the bottom of what makes files or directories + different. It will recursively unpack archives of many kinds and transform + various binary formats into more human readable form to compare them. It can + compare two tarballs, ISO images, or PDF just as easily. The differences can + be shown in a text or HTML report. + + diffoscope is developed as part of the "reproducible builds" Debian + project and was formerly known as "debbindiff". + ''; + homepage = https://wiki.debian.org/ReproducibleBuilds; + license = licenses.gpl3Plus; + maintainers = [ maintainers.dezgeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index f21b879d5e56..e05889fdb4b2 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, go }: let - version = "2.6.0"; + version = "2.7.0"; in stdenv.mkDerivation { name = "direnv-${version}"; src = fetchurl { url = "http://github.com/zimbatm/direnv/archive/v${version}.tar.gz"; name = "direnv-${version}.tar.gz"; - sha256 = "b85aac4d6a4ddf2daf193aabb3b2faf89e56507d33d763ab74cc7eb0b524ac03"; + sha256 = "3cfa8f41e740c0dc09d854f3833058caec0ea0d67d19e950f97eee61106b0daf"; }; buildInputs = [ go ]; diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix new file mode 100644 index 000000000000..8770a5858875 --- /dev/null +++ b/pkgs/tools/misc/entr/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, coreutils, ncurses }: + +stdenv.mkDerivation rec { + name = "entr-${version}"; + version = "3.2"; + + src = fetchurl { + url = "http://entrproject.org/code/${name}.tar.gz"; + sha256 = "0ikigpfzyjmr8j6snwlvxzqamrjbhlv78m8w1h0h7kzczc5f1vmi"; + }; + + postPatch = '' + substituteInPlace Makefile.bsd --replace /bin/echo echo + substituteInPlace entr.c --replace /bin/cat ${coreutils}/bin/cat + substituteInPlace entr.c --replace /usr/bin/clear ${ncurses}/bin/clear + substituteInPlace entr.1 --replace /bin/cat cat + substituteInPlace entr.1 --replace /usr/bin/clear clear + ''; + dontAddPrefix = true; + doCheck = true; + checkTarget = "test"; + installFlags = [ "PREFIX=$(out)" ]; + + meta = { + homepage = http://entrproject.org/; + description = "Run arbitrary commands when files change."; + + license = stdenv.lib.licenses.isc; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index c91d418d870e..a50717d53992 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -1,8 +1,7 @@ { stdenv, fetchurl, tcl, makeWrapper }: -let version = "5.45"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { + version = "5.45"; name = "expect-${version}"; src = fetchurl { @@ -27,7 +26,8 @@ stdenv.mkDerivation { for i in $out/bin/*; do wrapProgram $i \ --prefix PATH : "${tcl}/bin" \ - --prefix TCLLIBPATH ' ' $out/lib/* + --prefix TCLLIBPATH ' ' $out/lib/* \ + ${stdenv.lib.optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version}"} done ''; @@ -35,7 +35,7 @@ stdenv.mkDerivation { description = "A tool for automating interactive applications"; homepage = http://expect.nist.gov/; license = "Expect"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 847090101184..2b9c2297af28 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -3,10 +3,10 @@ }: stdenv.mkDerivation rec { - name = "gparted-0.22.0"; + name = "gparted-0.23.0"; src = fetchurl { - sha256 = "09vg5lxvh81x54ps5ayfjd4jl84wprn42i1wifnfmj44dqd5wxda"; + sha256 = "0m57bni3nkbbqq920ydzvasy2qc5j6w6bdssyn12jk4157gxvlbz"; url = "mirror://sourceforge/gparted/${name}.tar.bz2"; }; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { partitions. GParted enables you to change the partition organization while preserving the partition contents. ''; - homepage = http://gparted.sourceforge.net; + homepage = http://gparted.org; license = licenses.gpl2Plus; - platforms = with platforms; linux; + platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index f8f0f0880792..2880666e8db2 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -20,7 +20,7 @@ let canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems); inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.x-2015-07-05"; + version = "2.x-2015-07-27"; unifont_bdf = fetchurl { url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { src = fetchFromSavannah { repo = "grub"; - rev = "0d7c7f751dc5a8338497bef8b38f78153c4f0464"; - sha256 = "1vkd7na3kp9ri4xsd3zznvnrjzz1qsz62fycg941pm2k18r3m7xd"; + rev = "72fc110d95129410443b898e931ff7a1db75312e"; + sha256 = "0l2hws8h1jhww5s0m8pkwdggacpqb7fvz2jx83syg7ynczpgzbxs"; }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 790870cf302f..315c7145cbe3 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -11,7 +11,7 @@ let inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.0-git-2015-07-04"; + version = "1.2.0"; unifont_bdf = fetchurl { url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; @@ -28,12 +28,12 @@ let in ( stdenv.mkDerivation rec { - name = "trustedGRUB-${version}"; + name = "trustedGRUB2-${version}"; src = fetchgit { url = "https://github.com/Sirrix-AG/TrustedGRUB2"; - rev = "1865d07bdef7f39916790c77103fb85e99de14a4"; - sha256 = "e6bd9edfeb653e98e585fd691a31533b649b2fca1f4a903c70f6ea371014c9f7"; + rev = "1ff54a5fbe02ea01df5a7de59b1e0201e08d4f76"; + sha256 = "8c17bd7e14dd96ae9c4e98723f4e18ec6b21d45ac486ecf771447649829d0b34"; }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; diff --git a/pkgs/tools/misc/ipad_charge/default.nix b/pkgs/tools/misc/ipad_charge/default.nix new file mode 100644 index 000000000000..df987ed86c1c --- /dev/null +++ b/pkgs/tools/misc/ipad_charge/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, libusb }: + +let version = "2015-02-03"; in +stdenv.mkDerivation rec { + name = "ipad_charge-${version}"; + + src = fetchFromGitHub { + sha256 = "0f40hqx1dbqpwrhyf42h5982jwqv8j5zp5hwwakz6600hyqvnnz7"; + rev = "bb24e1c3a79016cfdffb9d28189485766d655ec6"; + repo = "ipad_charge"; + owner = "mkorenkov"; + }; + + buildInputs = [ libusb ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace " -o root -g root" "" \ + --replace "/usr" "$out" + sed "/rules\.d/d" -i Makefile + ''; + + enableParallelBuilding = true; + + preInstall = '' + mkdir -p $out/bin + ''; + + meta = with stdenv.lib; { + inherit version; + inherit (src.meta) homepage; + description = "Apple device USB charging utility for Linux"; + longDescription = '' + USB charging control utility used to enable/disable charging of an Apple + device connected to USB port. For a list of supported devices, see + https://github.com/mkorenkov/ipad_charge#supported-devices. + ''; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; + }; +} diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 0892061a50d0..6ffd36312a3e 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg -, perl, procps, gnugrep, gawk, findutils, gnused }: +, perl, procps, gnugrep, gawk, findutils, gnused +, withProcps ? stdenv.isLinux }: stdenv.mkDerivation rec { name = "keychain-${version}"; @@ -26,12 +27,16 @@ stdenv.mkDerivation rec { --prefix PATH ":" "${gnused}/bin" \ --prefix PATH ":" "${findutils}/bin" \ --prefix PATH ":" "${gawk}/bin" \ - --prefix PATH ":" "${procps}/bin" + ${if withProcps then ("--prefix PATH \":\" ${procps}/bin") else ""} ''; meta = { description = "Keychain management tool"; homepage = "http://www.funtoo.org/Keychain"; license = stdenv.lib.licenses.gpl2; + # other platforms are untested (AFAIK) + platforms = + with stdenv.lib; + platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/misc/logstash-forwarder/default.nix b/pkgs/tools/misc/logstash-forwarder/default.nix index a20b1d577754..44fa1cb7cfb1 100644 --- a/pkgs/tools/misc/logstash-forwarder/default.nix +++ b/pkgs/tools/misc/logstash-forwarder/default.nix @@ -1,15 +1,21 @@ -{ stdenv, fetchgit, go_1_3 }: -stdenv.mkDerivation { - name = "logstash-forwarder-20141216"; - src = fetchgit { - url = https://github.com/elasticsearch/logstash-forwarder.git; - rev = "6082bd8aaecb2180f5b56f4fb1b2940a6935ef7b"; - sha256 = "1686rlx5p7d2806cg8y4376m4l7nvg1yjgg52ccrs0v4fnqs6292"; +{ stdenv, fetchFromGitHub, go }: + +stdenv.mkDerivation rec { + name = "logstash-forwarder-${version}"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "elasticsearch"; + repo = "logstash-forwarder"; + rev = "v${version}"; + sha256 = "05g7366w8f7h75n1ia7njdpmparr6sfvn45xxfh5412zigqidz6l"; }; - buildInputs = [ go_1_3 ]; + + buildInputs = [ go ]; + installPhase = '' mkdir -p $out/bin - cp build/bin/logstash-forwarder $out/bin + find . -name logstash-forwarder -type f -exec cp {} $out/bin \; ''; meta = { diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix index 7f43ccdb6258..081868589bc7 100644 --- a/pkgs/tools/misc/logstash/default.nix +++ b/pkgs/tools/misc/logstash/default.nix @@ -1,31 +1,27 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.4.2"; + version = "1.5.3"; name = "logstash-${version}"; src = fetchurl { url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}.tar.gz"; - sha256 = "0sc0bwyf96fzs5h3d7ii65v9vvpfbm7w67vk1im9djnlz0d1ggnm"; + sha256 = "1an476k4q2shdxvhcx4fzbrcpk6isjrrvzlb6ivxfqg5fih3cg7b"; }; - dontBuild = true; - dontPatchELF = true; - dontStrip = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; dontPatchShebangs = true; installPhase = '' mkdir -p $out/bin mkdir -p $out/vendor mkdir -p $out/lib - mkdir -p $out/locales - mkdir -p $out/patterns cp -a bin $out cp -a vendor $out cp -a lib $out - cp -a locales $out - cp -a patterns $out - patchShebangs $out/bin + cp Gemfile* $out ''; meta = { diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 403068b1bf7d..b731c0409f31 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpipeline, db, groff }: stdenv.mkDerivation rec { - name = "man-db-2.7.1"; + name = "man-db-2.7.2"; src = fetchurl { url = "mirror://savannah/man-db/${name}.tar.xz"; - sha256 = "03ly0hbpgjnag576rgccanaisn7f6422q5qxrj64vyzslc2651y4"; + sha256 = "14p4sr57qc02gfnpybcnv33fb7gr266iqsyq7z4brs6wa6plwrr2"; }; buildInputs = [ pkgconfig libpipeline db groff ]; diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix deleted file mode 100644 index 81e05a8790e5..000000000000 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, goPackages, fetchurl, callPackage }: - -with goPackages; - -buildGoPackage rec { - version = "r3.1.2"; - name = "mongodb-tools"; - goPackagePath = "github.com/mongodb/mongo-tools"; - - src = fetchurl { - name = "${name}.tar.gz"; - url = "https://github.com/mongodb/mongo-tools/archive/${version}.tar.gz"; - sha256 = "1dag8ar95jlfk6rm99y4p3dymcy2s2qnwd9jwqhw9fxr110mgf5s"; - }; - - buildInputs = [ gopass go-flags crypto mgo openssl spacelog - oglematchers goconvey tomb ]; - - subPackages = [ "bsondump/main" "mongostat/main" "mongofiles/main" - "mongoexport/main" "mongoimport/main" "mongorestore/main" - "mongodump/main" "mongotop/main" "mongooplog/main" ]; - - buildPhase = '' - for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog; do - echo Building $i - go build -o go/bin/$i go/src/${goPackagePath}/$i/main/$i.go - done - ''; - - dontInstallSrc = true; - - meta = with lib; { - description = "Tools for MongoDB"; - homepage = https://github.com/mongodb/mongo-tools; - license = licenses.asl20; - maintainers = with maintainers; [ mschristiansen ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 843672fa26cf..feb5710282fd 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchurl, libxml2, libxslt, docbook-xsl, perl, IPCRun, TimeDate, TimeDuration, makeWrapper }: +{ stdenv, fetchurl, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perl, IPCRun, TimeDate, TimeDuration, makeWrapper }: with stdenv.lib; stdenv.mkDerivation rec { name = "moreutils-${version}"; - version = "0.55"; + version = "0.57"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_${version}.orig.tar.gz"; - sha256 = "1dcah2jx8dbznn8966xl7sf1jrld2qfh6l6xcmx9dsnf8p8mr7fs"; + sha256 = "078dpkwwwrv8hxnylbc901kib2d1rr3hsja37j6dlpjfcfq58z9s"; }; preBuild = '' substituteInPlace Makefile --replace /usr/share/xml/docbook/stylesheet/docbook-xsl ${docbook-xsl}/xml/xsl/docbook ''; - buildInputs = [ libxml2 libxslt docbook-xsl makeWrapper ]; + buildInputs = [ libxml2 libxslt docbook-xsl docbook_xml_dtd_44 makeWrapper ]; propagatedBuildInputs = [ perl IPCRun TimeDate TimeDuration ]; diff --git a/pkgs/tools/misc/ngrok/default.nix b/pkgs/tools/misc/ngrok/default.nix deleted file mode 100644 index c3019d722afd..000000000000 --- a/pkgs/tools/misc/ngrok/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, git, fetchFromGitHub, goPackages }: - -with goPackages; - -buildGoPackage rec { - name = "ngrok-1.7"; - goPackagePath = "ngrok"; - - src = fetchFromGitHub { - rev = "b7d5571aa7f12ac304b8f8286b855cc64dd9bab8"; - owner = "inconshreveable"; - repo = "ngrok"; - sha256 = "0a5iq9l9f2xdg6gnc9pj0iczhycv1w5iwcqgzzap83xfpy01xkh4"; - }; - - subPackages = [ "main/ngrok" "main/ngrokd" ]; - - preConfigure = '' - sed -e '/jteeuwen\/go-bindata/d' \ - -e '/export GOPATH/d' \ - -e 's/go get/#go get/' \ - -e 's|bin/go-bindata|go-bindata|' -i Makefile - make assets BUILDTAGS=release - export sourceRoot=$sourceRoot/src/ngrok - ''; - - buildInputs = [ git log4go websocket go-vhost mousetrap termbox-go rcrowley.go-metrics - yaml-v1 go-bindata go-update binarydist osext ]; - - buildFlags = "-tags release"; - - dontInstallSrc = true; - - meta = with stdenv.lib; { - description = "Reverse proxy that creates a secure tunnel between from a public endpoint t -o a locally running web service"; - homepage = https://ngrok.com/; - license = licenses.asl20; - maintainers = with maintainers; [ iElectric cstrahan ]; - platforms = with platforms; linux ++ darwin; - }; - -} diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index cfbe32e579c5..d96ca1080d83 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,23 +1,23 @@ -{ fetchurl, stdenv, perl }: +{ fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20150622"; + name = "parallel-20150822"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0j7gg88zk2r4jv3mvmrl4bhwcv9k8rxanygp6lssbx685ab9qfln"; + sha256 = "1ij7bjxhk2866mzh0v0v2m629b6d39r5ivwdzmh72s471m9hg45d"; }; - patchPhase = - '' sed -i "src/parallel" -e's|/usr/bin/perl|${perl}/bin/perl|g' - ''; + nativeBuildInputs = [ makeWrapper ]; - preBuild = - # The `sem' program wants to write to `~/.parallel'. - '' export HOME="$PWD" - ''; + preFixup = '' + sed -i 's,#![ ]*/usr/bin/env[ ]*perl,#!${perl}/bin/perl,' $out/bin/* + + wrapProgram $out/bin/parallel \ + --prefix PATH : "${procps}/bin" \ + --prefix PATH : "${perl}/bin" \ + ''; - buildInputs = [ perl ]; doCheck = true; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index 303fdb3dbe07..3ebb0397a8f3 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl, makeWrapper, lrzsz }: +{ stdenv, fetchFromGitHub, makeWrapper, lrzsz }: stdenv.mkDerivation rec { - name = "picocom-1.7"; + name = "picocom-${version}"; + version = "1.8"; - src = fetchurl { - url = "http://picocom.googlecode.com/files/${name}.tar.gz"; - sha256 = "17hjq713naq02xar711aw24qqd52p591mj1h5n97cni1ga7irwyh"; + src = fetchFromGitHub { + owner = "npat-efault"; + repo = "picocom"; + rev = version; + sha256 = "1954hnmnnr9yj5skynj2x5wjap8vlr4ski2rhwr36p5pzwmr9gni"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/pipelight/pipelight.patch b/pkgs/tools/misc/pipelight/pipelight.patch index bde6ecf943d9..66dd0fdab4c0 100644 --- a/pkgs/tools/misc/pipelight/pipelight.patch +++ b/pkgs/tools/misc/pipelight/pipelight.patch @@ -43,7 +43,7 @@ diff -urN pipelight.old/bin/pipelight-plugin.in pipelight.new/bin/pipelight-plug -fi +download_file() +{ -+ curl --cacert /etc/ssl/certs/ca-bundle.crt -o "$1" "$2" ++ curl --cacert /etc/ssl/certs/ca-certificates.crt -o "$1" "$2" +} # Use shasum instead of sha256sum on MacOS / *BSD @@ -111,7 +111,7 @@ diff -urN pipelight.old/share/install-dependency pipelight.new/share/install-dep -fi +download_file() +{ -+ curl --cacert /etc/ssl/certs/ca-bundle.crt -o "$1" "$2" ++ curl --cacert /etc/ssl/certs/ca-certificates.crt -o "$1" "$2" +} +get_download_size() +{ diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index 79cb29b20ca3..40540ad1c20d 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchgit, makeWrapper, curl, spidermonkey }: +{ stdenv, fetchFromGitHub, makeWrapper, curl, spidermonkey }: stdenv.mkDerivation rec { name = "plowshare4-${version}"; - version = "1.1.0"; - src = fetchgit { - url = "https://code.google.com/p/plowshare/"; - rev = "87bd955e681ddda05009ca8594d727260989d5ed"; - sha256 = "0cbsnalmr6fa1ijsn1j1p9fdqi3ii96bx3xabgvvbbqkl7q938f9"; + src = fetchFromGitHub { + owner = "mcrapet"; + repo = "plowshare"; + rev = "v${version}"; + sha256 = "1xxkdv4q97dfzbcdnmy5079a59fwh8myxlvdr2dlxdv70fb72sq9"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix index 903c8617128a..55c44770c3e1 100644 --- a/pkgs/tools/misc/profile-cleaner/default.nix +++ b/pkgs/tools/misc/profile-cleaner/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite }: stdenv.mkDerivation rec { - version = "2.34"; + version = "2.35"; name = "profile-cleaner-${version}"; src = fetchFromGitHub { owner = "graysky2"; repo = "profile-cleaner"; rev = "v${version}"; - sha256 = "17z73xyn31668f7vmbj7xs659fcrm0m0mnzja7hz6lipfaviqxrs"; + sha256 = "0gashrzhpgcy98zsyc6b3awfp15j1x0nq82h60kvfjbs6xxzvszh"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 574178222c6f..11d6991b89cb 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl} : stdenv.mkDerivation { - name = "remind-3.1.14"; + name = "remind-3.1.15"; src = fetchurl { - url = http://www.roaringpenguin.com/files/download/remind-03.01.14.tar.gz; - sha256 = "1b9ij3r95lf14q6dyh8ilzc3y5yxxc1iss8wj3i49n6zjvklml8a"; + url = http://www.roaringpenguin.com/files/download/remind-03.01.15.tar.gz; + sha256 = "1hcfcxz5fjzl7606prlb7dgls5kr8z3wb51h48s6qm8ang0b9nla"; }; meta = { diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 1688c2d329f3..6e2ba20875db 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff }: stdenv.mkDerivation rec { - name = "rrdtool-1.5.3"; + name = "rrdtool-1.5.4"; src = fetchurl { url = "http://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz"; - sha256 = "17qjqq7k50xfahza1gkcfchzss2jjmgr422dzs4kx13lrzsv5rvr"; + sha256 = "169zbidc5h88w064qmj6x5rzczkrrfrcgwc3f2i2h8f0hzda7viz"; }; buildInputs = [ gettext perl pkgconfig libxml2 pango cairo groff ]; diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix new file mode 100644 index 000000000000..e21da0deca2d --- /dev/null +++ b/pkgs/tools/misc/scanmem/default.nix @@ -0,0 +1,23 @@ +{ stdenv, autoconf, automake, intltool, libtool, fetchFromGitHub, readline }: + +stdenv.mkDerivation rec { + version = "0.15.2"; + name = "scanmem-${version}"; + src = fetchFromGitHub { + owner = "scanmem"; + repo = "scanmem"; + rev = "v${version}"; + sha256 = "0f93ac5rycf46q60flab5nl7ksadjls13axijg5j5wy1yif0k094"; + }; + buildInputs = [ autoconf automake intltool libtool readline ]; + preConfigure = '' + ./autogen.sh + ''; + meta = { + homepage = "https://github.com/scanmem/scanmem"; + description = "Memory scanner for finding and poking addresses in executing processes"; + maintainers = [ stdenv.lib.maintainers.chattered ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix index 418afee8135f..92cc800d83d3 100644 --- a/pkgs/tools/misc/screenfetch/default.nix +++ b/pkgs/tools/misc/screenfetch/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, makeWrapper -, coreutils, gawk, procps, gnused, findutils, xdpyinfo, xprop +, coreutils, gawk, procps, gnused, findutils, xdpyinfo, xprop, gnugrep }: stdenv.mkDerivation { @@ -28,6 +28,7 @@ stdenv.mkDerivation { --prefix PATH : "${findutils}/bin" \ --prefix PATH : "${xdpyinfo}/bin" \ --prefix PATH : "${xprop}/bin" \ + --prefix PATH : "${gnugrep}/bin" ''; meta = { diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix index 3da62874c13c..cf62039fc036 100644 --- a/pkgs/tools/misc/sdl-jstest/default.nix +++ b/pkgs/tools/misc/sdl-jstest/default.nix @@ -1,11 +1,11 @@ { fetchgit, stdenv, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl }: stdenv.mkDerivation rec { - name = "sdl-jstest-20150611"; + name = "sdl-jstest-20150625"; src = fetchgit { url = "https://github.com/Grumbel/sdl-jstest"; - rev = "684d168e5526da16760dcfc6d40da0103ab284cc"; - sha256 = "fc110a858edc2defc5cd8b176a5ce74666d3957d0268b861d0f9669362a1bd03"; + rev = "3f54b86ebe0d2f95e9c1d034bc4ed02d6d2b6409"; + sha256 = "d33e0a2c66b551ecf333590f1a6e1730093af31cee1be8757748624d42e14df1"; }; buildInputs = [ SDL SDL2 ncurses ]; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index d84d00e2ba2c..32f6312a798f 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "0.10.2015.05.24"; + version = "0.10.2015.08.24"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "0dzd5n4zvrplvm3sx017ym7jlngp4pn8nra9qx9n4wq6h4c6n6a5"; + sha256 = "1w5jknqdlyw60pxx1wmx2xqkp968r9m3xdgm95ls1pjjp0pm047c"; }; pythonPaths = [ pycrypto ]; diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 4d3de16434b4..1e90ecfee328 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -51,6 +51,10 @@ in stdenv.mkDerivation { for i in $out/lib/udev/rules.d/*; do sed -i "s,RUN+=\",\\0$out,g; s,/usr/sbin,/bin,g" "$i" done + + for i in man/*; do + install -D $i $out/share/man/man''${i##*.}/$(basename $i) + done ''; passthru = { inherit enableRDW; }; diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix index 04f3a31aa48a..cc51af22f851 100644 --- a/pkgs/tools/misc/umlet/default.nix +++ b/pkgs/tools/misc/umlet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { major = "13"; - minor = "2"; + minor = "3"; version = "${major}.${minor}"; name = "umlet-${version}"; src = fetchurl { url = "http://www.umlet.com/umlet_${major}_${minor}/umlet_${version}.zip"; - sha256 = "19jngb2sr212lh3yi43bqq2skhd9cxa8yfbfc3i6fbm2v0b7i2xf"; + sha256 = "0fbr51xknk98qz576lcl25qz0s1snns2yb0j54d77xkw7pnxmvzr"; }; buildInputs = [ unzip ]; diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix new file mode 100644 index 000000000000..589f7d9a94b7 --- /dev/null +++ b/pkgs/tools/misc/urjtag/default.nix @@ -0,0 +1,38 @@ +{ stdenv, autoconf, automake, pkgconfig, gettext, intltool, libtool, bison +, flex, fetchgit, makeWrapper +, jedecSupport ? false +, pythonBindings ? false +, python3 ? null +}: + +stdenv.mkDerivation rec { + version = "0.10"; + name = "urjtag-${version}"; + + src = fetchgit { + url = "git://git.code.sf.net/p/urjtag/git"; + rev = "7ba12da7845af7601e014a2a107670edc5d6997d"; + sha256 = "834401d851728c48f1c055d24dc83b6173c701bf352d3a964ec7ff1aff3abf6a"; + }; + + buildInputs = [ gettext pkgconfig autoconf automake libtool makeWrapper ] + ++ stdenv.lib.optional pythonBindings python3; + + configureFlags = '' + --prefix=/ + ${if jedecSupport then "--enable-jedec-exp" else "--disable-jedec-exp"} + ${if pythonBindings then "--enable-python" else "--disable-python"} + ''; + preConfigure = "cd urjtag; ./autogen.sh"; + + makeFlags = [ "DESTDIR=$(out)" ]; + + meta = { + description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more"; + homepage = "http://urjtag.org/"; + license = with stdenv.lib.licenses; [ gpl2Plus lgpl21Plus ]; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice + maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ]; + }; +} + diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index abe6a8adc146..d07e99e26604 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonPackage rec { - version = "0.5.2"; + version = "0.6.0"; name = "vdirsyncer-${version}"; namePrefix = ""; src = fetchurl { - url = "https://github.com/untitaker/vdirsyncer/archive/${version}.tar.gz"; - sha256 = "02k6ijj0z0r08l50ignm2ngd4ax84l0r1wshh1is0wcfr70d94h9"; + url = "https://pypi.python.org/packages/source/v/vdirsyncer/${name}.tar.gz"; + sha256 = "1mb0pws5vsgnmyp5dp5m5jvgl6jcvdamxjz7wmgvxkw6n1vrcahd"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix index d76e393aaaa7..d02ce41b6aa1 100644 --- a/pkgs/tools/misc/wyrd/default.nix +++ b/pkgs/tools/misc/wyrd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, ncurses, remind }: +{ stdenv, fetchurl, ocaml, ncurses, remind, camlp4 }: stdenv.mkDerivation rec { version = "1.4.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0zlrg602q781q8dij62lwdprpfliyy9j1rqfqcz8p2wgndpivddj"; }; - buildInputs = [ ocaml ncurses remind ]; + buildInputs = [ ocaml ncurses remind camlp4 ]; preferLocalBuild = true; diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index 16a54c819464..33c9489a70d0 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -1,52 +1,27 @@ -x@{builderDefsPackage - , libX11, xproto, libXt, libICE - , libSM, libXext - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, libX11, xproto, libXt, libICE, libSM, libXext }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="xdaliclock"; - version = "2.43"; - name="${baseName}-${version}"; - project="${baseName}"; - url="http://www.jwz.org/${project}/${name}.tar.gz"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; +stdenv.mkDerivation rec { + name = "xdaliclock-${version}"; + version = "2.43"; + + src = fetchurl { + url="http://www.jwz.org/xdaliclock/${name}.tar.gz"; sha256 = "194zzp1a989k2v8qzfr81gdknr8xiz16d6fdl63jx9r3mj5klmvb"; }; - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "prepareDirs" "doMakeInstall"]; + sourceRoot = "${name}/X11"; - prepareDirs = a.fullDepEntry '' - mkdir -p "$out/bin" "$out/share" "$out/share/man/man1" - '' ["minInit" "defEnsureDir"]; + buildInputs = [ libX11 xproto libXt libICE libSM libXext ]; - goSrcDir = "cd X11"; + preInstall = '' + mkdir -vp $out/bin $out/share/man/man1 + ''; - meta = { + meta = with stdenv.lib; { description = "A clock application that morphs digits when they are changed"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux ++ freebsd; - license = a.lib.licenses.free; #TODO BSD on Gentoo, looks like MIT - downloadPage = "http://www.jwz.org/xdaliclock/"; - inherit version; - updateWalker = true; + maintainers = with maintainers; [ raskin rycee ]; + platforms = with platforms; linux ++ freebsd; + license = licenses.free; #TODO BSD on Gentoo, looks like MIT + downloadPage = http://www.jwz.org/xdaliclock/; }; -}) x +} diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index eb3375730188..e9f7eadc9146 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -10,17 +10,17 @@ buildPythonPackage rec { name = "youtube-dl-${version}"; - version = "2015.05.29"; + version = "2015.08.28"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0lgxir2i5ipplg57wk8gnbbsdrk7szqnyb1bxr97f3h0rbm4dfij"; + sha256 = "0iahbynd6fw097a4cc57w26szlbqsmhb8v5ny6qrcil0d4wdqqvp"; }; buildInputs = [ makeWrapper zip pandoc ]; # Ensure ffmpeg is available in $PATH for post-processing & transcoding support. - postInstall = stdenv.lib.optionalString (ffmpeg != null) + postInstall = stdenv.lib.optionalString (ffmpeg != null) ''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"''; meta = with stdenv.lib; { |