diff options
Diffstat (limited to 'pkgs/tools/misc')
23 files changed, 305 insertions, 62 deletions
diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix index 219cb2139f58a..e479167dc159b 100644 --- a/pkgs/tools/misc/apt-offline/default.nix +++ b/pkgs/tools/misc/apt-offline/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, bash, buildPythonPackage }: +{ stdenv, fetchurl, bash, buildPythonApplication }: -buildPythonPackage rec { +buildPythonApplication rec { version = "1.3"; name = "apt-offline-${version}"; diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 192aed7489d3e..c6591927657ca 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bdf2psf-${version}"; - version = "1.134"; + version = "1.137"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "1am5ka5qrbh60jjihzqac03ii3ydprvqm3w54dc55a0zwl61njsz"; + sha256 = "08pgpwg0ccf0j4r8dbaadh1yr4h4fnvkfb5ym49kwvm2p2vxdq32"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 4d9adc6c68869..377e2d62eef6f 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, xz, gmp ? null +{ lib, stdenv, fetchurl, perl, xz, gmp ? null , aclSupport ? false, acl ? null , selinuxSupport? false, libselinux ? null, libsepol ? null , autoconf, automake114x, texinfo @@ -8,34 +8,24 @@ assert aclSupport -> acl != null; assert selinuxSupport -> libselinux != null && libsepol != null; - -with { inherit (stdenv.lib) optional optionals optionalString optionalAttrs; }; +with lib; let self = stdenv.mkDerivation rec { - name = "coreutils-8.24"; + name = "coreutils-8.25"; src = fetchurl { url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "0w11jw3fb5sslf0f72kxy7llxgk1ia3a6bcw0c9kmvxrlj355mx2"; + sha256 = "11yfrnb94xzmvi4lhclkcmkqsbhww64wf234ya1aacjvg82prrii"; }; - patches = if stdenv.isCygwin then ./coreutils-8.23-4.cygwin.patch else - (if stdenv.isArm then (fetchurl { - url = "http://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=3ba68f9e64fa2eb8af22d510437a0c6441feb5e0"; - sha256 = "1dnlszhc8lihhg801i9sz896mlrgfsjfcz62636prb27k5hmixqz"; - name = "coreutils-tail-inotify-race.patch"; - }) else null); + patches = optional stdenv.isCygwin ./coreutils-8.23-4.cygwin.patch; # The test tends to fail on btrfs and maybe other unusual filesystems. - postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' + postPatch = optionalString (!stdenv.isDarwin) '' sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh - '' + - # This is required by coreutils-tail-inotify-race.patch to avoid more deps - stdenv.lib.optionalString stdenv.isArm '' - touch -r src/stat.c src/tail.c - ''; + ''; outputs = [ "out" "info" ]; @@ -85,20 +75,18 @@ let enableParallelBuilding = false; NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; - FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.system == "armv7l-linux" || stdenv.isSunOS) "1"; + FORCE_UNSAFE_CONFIGURE = optionalString stdenv.isSunOS "1"; makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0"; # e.g. ls -> gls; grep -> ggrep - postFixup = # feel free to simplify on a mass rebuild - if withPrefix then + postFixup = optionalString withPrefix '' ( cd "$out/bin" find * -type f -executable -exec mv {} g{} \; ) - '' - else null; + ''; meta = { homepage = http://www.gnu.org/software/coreutils/; @@ -111,11 +99,11 @@ let operating system. ''; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; - maintainers = [ stdenv.lib.maintainers.eelco ]; + maintainers = [ maintainers.eelco ]; }; }; in diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index ffd01dcdc19e5..c9340e449afaa 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.15.10"; + version = "2.16.1"; name = "debian-devscripts-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - sha256 = "1yb26xpjxp9q5vsjzc9bv8vydpx2rs1v0i7phxhylfjn0fgpfnc6"; + sha256 = "096f26b0z6kwv47qy99gak40wcc8mp24n0nvqwgifcicr18qv4rz"; }; buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 6715f1ac38fd5..e54e83ef4921c 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,19 +1,19 @@ { lib, stdenv, fetchgit, fetchpatch, pythonPackages, docutils -, acl, binutils, bzip2, cbfstool, cdrkit, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc, gnupg1 -, gzip, jdk, libcaca, mono, pdftk, poppler_utils, rpm, sng, sqlite, squashfsTools, unzip, vim, xz +, acl, binutils, bzip2, cbfstool, cdrkit, colord, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc +, gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, rpm, sng, sqlite, squashfsTools, unzip, vim, xz , enableBloat ? false }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "diffoscope-${version}"; - version = "45"; + version = "49"; namePrefix = ""; src = fetchgit { url = "git://anonscm.debian.org/reproducible/diffoscope.git"; rev = "refs/tags/${version}"; - sha256 = "1wdphcmr2n0pyg7zwvczy7ik1bzjlrjb76jwbzk971lwba3ajazk"; + sha256 = "0kh96h95rp7bk8rgc1z18jwv89dyp1n36bawqyqxhwwklmrgxr66"; }; patches = @@ -29,13 +29,13 @@ pythonPackages.buildPythonPackage rec { sed -i setup.py -e "/'rpm-python',/d" ''; - # Still missing these tools: enjarify otool(maybe OS X only) showttf + # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf # Also these libraries: python3-guestfs # FIXME: move xxd into a separate package so we don't have to pull in all of vim. propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh ]) ++ [ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext gzip libcaca poppler_utils rpm sng sqlite squashfsTools unzip vim xz - ] ++ lib.optionals enableBloat [ jdk ghc fpc gnupg1 pdftk mono ]; + ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]; doCheck = false; # Calls 'mknod' in squashfs tests, which needs root diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index ae402e35c2eb6..a99e28c6f817d 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://entrproject.org/; - description = "Run arbitrary commands when files change."; + description = "Run arbitrary commands when files change"; license = stdenv.lib.licenses.isc; diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix new file mode 100644 index 0000000000000..8518a7331b954 --- /dev/null +++ b/pkgs/tools/misc/exa/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, rustPlatform, openssl, cmake, zlib }: + +with rustPlatform; + +buildRustPackage rec { + name = "exa-${version}"; + version = "2016-02-15"; + + depsSha256 = "1925nhpfph82wn755zf2nmad24f1hzbxq60gpva9sic6rnap4c1x"; + + src = fetchFromGitHub { + owner = "ogham"; + repo = "exa"; + rev = "252eba484476369bb966fb1af7f739732b968fc0"; + sha256 = "1smyy32z44zgmhyhlbjaxcgfnlbcwz7am9225yppqfdsiqqgdybf"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl zlib ]; + + # Some tests fail, but Travis ensures a proper build + doCheck = false; + + meta = with stdenv.lib; { + description = "Replacement for 'ls' written in Rust"; + longDescription = '' + exa is a modern replacement for ls. It uses colours for information by + default, helping you distinguish between many types of files, such as + whether you are the owner, or in the owning group. It also has extra + features not present in the original ls, such as viewing the Git status + for a directory, or recursing into directories with a tree view. exa is + written in Rust, so it’s small, fast, and portable. + ''; + homepage = http://bsago.me/exa; + license = licenses.mit; + maintainer = [ maintainers.ehegnes ]; + }; +} diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix new file mode 100644 index 0000000000000..39e28073abcec --- /dev/null +++ b/pkgs/tools/misc/gti/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gti-${version}"; + version = "2015-05-21"; + + src = fetchFromGitHub { + owner = "rwos"; + repo = "gti"; + rev = "edaac795b0b0ff01f2347789f96c740c764bf376"; + sha256 = "1wki7d61kcmv9s3xayky9cz84qa773x3y1z88y768hq8ifwadcbn"; + }; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man6 + cp gti $out/bin + cp gti.6 $out/share/man/man6 + ''; + + meta = with stdenv.lib; { + homepage = http://r-wos.org/hacks/gti; + license = licenses.mit; + description = "Humorous typo-based git runner; drives a car over the terminal"; + maintainers = with maintainers; [ fadenb ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/homesick/default.nix b/pkgs/tools/misc/homesick/default.nix index 9ea54f1f0b320..da167026ade52 100644 --- a/pkgs/tools/misc/homesick/default.nix +++ b/pkgs/tools/misc/homesick/default.nix @@ -13,7 +13,7 @@ bundlerEnv { ''; meta = with lib; { - description = "Your home directory is your castle. Don't leave your dotfiles behind."; + description = "Your home directory is your castle. Don't leave your dotfiles behind"; long_description = '' Homesick is sorta like rip, but for dotfiles. It uses git to clone a repository containing diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index 0c3907b89bfed..45fd27b7f4f98 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages, python }: +{ stdenv, fetchurl, buildPythonApplication, pythonPackages, python }: -buildPythonPackage rec { +buildPythonApplication rec { name = "i3minator-${version}"; version = "0.0.4"; diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix index 15bb44a0e4794..289d57f88c065 100644 --- a/pkgs/tools/misc/logstash/default.nix +++ b/pkgs/tools/misc/logstash/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems."; + description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; homepage = https://www.elastic.co/products/logstash; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix new file mode 100644 index 0000000000000..66e91ed14240f --- /dev/null +++ b/pkgs/tools/misc/mimeo/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, desktop_file_utils, file, python3Packages }: + +python3Packages.buildPythonApplication rec { + name = "mimeo-${version}"; + version = "2016.2"; + + src = fetchurl { + url = "http://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz"; + sha256 = "1y3a60983ind2cakjwxq3cgc76xhcdqz5lcpnyii34s6wviybkn1"; + }; + + buildInputs = [ file desktop_file_utils ]; + + propagatedBuildInputs = [ python3Packages.pyxdg ]; + + preConfigure = '' + substituteInPlace Mimeo.py \ + --replace "EXE_UPDATE_DESKTOP_DATABASE = 'update-desktop-database'" \ + "EXE_UPDATE_DESKTOP_DATABASE = '${desktop_file_utils}/bin/update-desktop-database'" \ + --replace "EXE_FILE = 'file'" \ + "EXE_FILE = '${file}/bin/file'" + ''; + + installPhase = "install -Dm755 Mimeo.py $out/bin/mimeo"; + + meta = with stdenv.lib; { + description = "Open files by MIME-type or file name using regular expressions"; + homepage = http://xyne.archlinux.ca/projects/mimeo/; + license = [ licenses.gpl2 ]; + maintainers = [ maintainers.rycee ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/mprime/default.nix b/pkgs/tools/misc/mprime/default.nix new file mode 100644 index 0000000000000..9a435622c7d78 --- /dev/null +++ b/pkgs/tools/misc/mprime/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchurl, unzip, pkgconfig, curl }: + +let + srcDir = + if stdenv.system == "x86_64-linux" then "linux64" + else if stdenv.system == "i686-linux" then "linux" + else if stdenv.system == "x86_64-darwin" then "macosx64" + else abort "Unsupported platform"; + gwnum = + if stdenv.system == "x86_64-linux" then "make64" + else if stdenv.system == "i686-linux" then "makefile" + else if stdenv.system == "x86_64-darwin" then "makemac" + else abort "Unsupported platform"; +in + +stdenv.mkDerivation { + name = "mprime-28.7"; + + src = fetchurl { + url = http://www.mersenne.org/ftp_root/gimps/p95v287.source.zip; + sha256 = "1k3gxhs3g8hfghzpmidhcwpwyayj8r83v8zjai1z4xgsql4jwby1"; + }; + + unpackCmd = "unzip -d src -q $curSrc"; + + buildInputs = [ unzip pkgconfig curl ]; + + patches = [ ./makefile.patch ]; + + buildPhase = '' + make -C gwnum -f ${gwnum} + echo 'override CFLAGS := $(CFLAGS)' $(pkg-config --cflags libcurl) >> ${srcDir}/makefile + echo 'override LIBS := $(LIBS)' $(pkg-config --libs libcurl) >> ${srcDir}/makefile + make -C ${srcDir} + ''; + + installPhase = '' + install -D ${srcDir}/mprime $out/bin/mprime + ''; + + meta = { + description = "Mersenne prime search / System stability tester"; + longDescription = '' + MPrime is the Linux command-line interface version of Prime95, to be run + in a text terminal or in a terminal emulator window as a remote shell + client. It is identical to Prime95 in functionality, except it lacks a + graphical user interface. + ''; + homepage = http://www.mersenne.org/; + # Unfree, because of a license requirement to share prize money if you find + # a suitable prime. http://www.mersenne.org/legal/#EULA + license = stdenv.lib.licenses.unfree; + # Untested on linux-32 and osx. Works in theory. + platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin"]; + }; +} diff --git a/pkgs/tools/misc/mprime/makefile.patch b/pkgs/tools/misc/mprime/makefile.patch new file mode 100644 index 0000000000000..7f758af7b7c4c --- /dev/null +++ b/pkgs/tools/misc/mprime/makefile.patch @@ -0,0 +1,46 @@ +diff -ru orig/linux/makefile patched/linux/makefile +--- orig/linux/makefile 2015-08-09 21:06:18.000000000 +0100 ++++ patched/linux/makefile 2016-02-16 16:25:45.988662423 +0000 +@@ -25,8 +25,8 @@ + CPP = g++ + CPPFLAGS = -I.. -I../gwnum -O2 -march=i486 -malign-double + +-LFLAGS = -Wl,-M -Wl,-L/usr/local/lib +-LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -ldl ++LFLAGS = ++LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -lrt -lstdc++ -ldl + + FACTOROBJ = factor32.o + LINUXOBJS = prime.o menu.o +diff -ru orig/linux64/makefile patched/linux64/makefile +--- orig/linux64/makefile 2015-08-09 21:06:20.000000000 +0100 ++++ patched/linux64/makefile 2016-02-16 16:25:57.076531585 +0000 +@@ -13,13 +13,13 @@ + # LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic $(shell pkg-config --static --libs libcurl) -lstdc++ -Wl,-Bdynamic -ldl + + CC = gcc +-CFLAGS = -I.. -I../gwnum -I/usr/local/include -DX86_64 -O2 ++CFLAGS = -I.. -I../gwnum -I/usr/local/include -DX86_64 -O2 + + CPP = g++ + CPPFLAGS = -I.. -I../gwnum -DX86_64 -O2 + +-LFLAGS = -Wl,-M -Wl,-L/usr/local/lib +-LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -ldl ++LFLAGS = ++LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -lrt -lstdc++ -ldl + + FACTOROBJ = factor64.o + LINUXOBJS = prime.o menu.o +diff -ru orig/macosx64/makefile patched/macosx64/makefile +--- orig/macosx64/makefile 2015-08-09 21:06:22.000000000 +0100 ++++ patched/macosx64/makefile 2016-02-16 16:19:03.988415925 +0000 +@@ -10,7 +10,7 @@ + CPPFLAGS = -I.. -I../gwnum -I../linux -O2 -DX86_64 -DCOMMAND_LINE_MPRIME -m64 + + LFLAGS = -m64 -Wl,-no_pie +-LIBS = ../gwnum/amd64/release/gwnum.a -lm -lpthread -lcurl -framework IOKit -framework CoreFoundation -lstdc++ ++LIBS = ../gwnum/amd64/release/gwnum.a -lm -lpthread -framework IOKit -framework CoreFoundation -lstdc++ + + FACTOROBJ = ../prime95/macosx64/factor64.o + OBJS = prime.o menu.o diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix index c0b1de6c1e8ce..4d6a317276a03 100644 --- a/pkgs/tools/misc/ms-sys/default.nix +++ b/pkgs/tools/misc/ms-sys/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ms-sys-${version}"; - version = "2.5.2"; + version = "2.5.3"; src = fetchurl { url = "mirror://sourceforge/ms-sys/${name}.tar.gz"; - sha256 = "0c7ld5pglcacnrvy2gzzg1ny1jyknlj9iz1mvadq3hn8ai1d83px"; + sha256 = "0mijf82cbji4laip6hiy3l5ka5mzq5sivjvyv7wxnc2fd3v7hgp0"; }; buildInputs = [ gettext ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - description = "A program for writing Microsoft compatible boot records"; + description = "A program for writing Microsoft-compatible boot records"; homepage = http://ms-sys.sourceforge.net/; license = licenses.gpl2Plus; maintainers = with maintainers; [ nckx ]; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index c45c62cb3adad..d4c920f4acc8b 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-20160122"; + name = "parallel-20160222"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1xs8y8jh7wyjs27079xz0ja7xfi4dywz8d6hbkl44mafdnnfjfiy"; + sha256 = "1sjmvinwr9j2a0jdk9y9nf2x4hhzcbl529slkwpz0vva0cwybywd"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix new file mode 100644 index 0000000000000..4c60e790238e6 --- /dev/null +++ b/pkgs/tools/misc/staruml/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, makeWrapper, dpkg, patchelf, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, udev }: + +stdenv.mkDerivation rec { + version = "2.6.0"; + name = "staruml-${version}"; + + src = + if stdenv.system == "i686-linux" then fetchurl { + url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-32-bit.deb"; + sha256 = "684d7ce7827a98af5bf17bf68d18f934fd970f13a2112a121b1f1f76d6387849"; + } else fetchurl { + url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-64-bit.deb"; + sha256 = "36e0bdc1bb57b7d808a007a3fafb1b38662d5b0793424d5ad4f51a3a6a9a636d"; + }; + + buildInputs = [ dpkg ]; + + nativeBuildInputs = [ makeWrapper ]; + + unpackPhase = '' + mkdir pkg + dpkg-deb -x $src pkg + sourceRoot=pkg + ''; + + installPhase = '' + mkdir $out + mv opt/staruml $out/bin + + ${patchelf}/bin/patchelf \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/bin/StarUML + + mkdir -p $out/lib + + ln -s ${stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/ + ln -s ${udev}/lib/libudev.so.1 $out/lib/libudev.so.0 + + wrapProgram $out/bin/StarUML \ + --prefix LD_LIBRARY_PATH : $out/lib:${glib}/lib:${gtk2}/lib:${gdk_pixbuf}/lib/:${alsaLib}/lib/:${nss}/lib/:${nspr}/lib/:${GConf}/lib/:${cups}/lib/:${libgcrypt}/lib/:${dbus}/lib/ + ''; + + meta = with stdenv.lib; { + description = "A sophisticated software modeler"; + homepage = http://staruml.io/; + license = licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 97737bce783f0..270e1c0cb62ab 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.30.2016.01.10"; + version = "0.30.2016.02.08"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "1npgjgbri7g27f9ayx39d3pbv7pa22860c0aipwwvayggs27g1sr"; + sha256 = "0nkgc43lf06h0w8k4zm5pdzp6r6jjc6j94ciljcm8333n0ykfzpr"; }; pythonPaths = [ pycrypto requests2 ]; diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index 34b65973650b9..75b3cb160671e 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -2,7 +2,7 @@ assert stdenv.isLinux; -python2Packages.buildPythonPackage rec { +python2Packages.buildPythonApplication rec { name = "trash-cli-${version}"; version = "0.12.9.14"; namePrefix = ""; diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 8901869926378..d6789bf52bc52 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.8.1"; +pythonPackages.buildPythonApplication rec { + version = "0.9.0"; name = "vdirsyncer-${version}"; namePrefix = ""; src = fetchurl { url = "https://pypi.python.org/packages/source/v/vdirsyncer/${name}.tar.gz"; - sha256 = "1abflqw6x30xd2dlj58cr5n62x98kc0ia9f9vr8l64k2z1fjlq78"; + sha256 = "0s9awjr9v60rr80xcpwmdhkf4v1yqnydahjmxwvxmh64565is465"; }; propagatedBuildInputs = with pythonPackages; [ @@ -20,6 +20,11 @@ pythonPackages.buildPythonPackage rec { atomicwrites ]; + # Unfortunately, checking this package seems a bit too complex + # https://github.com/NixOS/nixpkgs/pull/13098#issuecomment-185914025 + # https://github.com/untitaker/vdirsyncer/issues/334#issuecomment-185872854 + doCheck = false; + meta = with stdenv.lib; { homepage = https://github.com/untitaker/vdirsyncer; description = "Synchronize calendars and contacts"; diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index e0ad4bbab5fd6..197b92295a821 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { src = fetchsvn { url = "svn://svn.code.sf.net/p/xclip/code/trunk"; - sha256 = "0d6r38xas5l79l700sdm14l41vvjqhah613367ha8kcvx54zkddz"; + rev = "87"; + sha256 = "1rbcdgr73916wvzfgqjs1jhgzk8qs1yw2iiqy7ifrkjafhi37w6b"; }; buildInputs = [ xlibsWrapper libXmu autoreconfHook ]; diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/tools/misc/xdo/default.nix index e7a3d91967e66..26a5b485bf618 100644 --- a/pkgs/tools/misc/xdo/default.nix +++ b/pkgs/tools/misc/xdo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libxcb, xcbutilwm }: stdenv.mkDerivation rec { - name = "xdo-0.3"; + name = "xdo-0.5"; src = fetchurl { - url = "https://github.com/baskerville/xdo/archive/0.3.tar.gz"; - sha256 = "128flaydag9ixsai87p85r84arg2pn1j9h3zgdjwlmbcpb8d4ia8"; + url = "https://github.com/baskerville/xdo/archive/0.5.tar.gz"; + sha256 = "0sjnjs12i0gp1dg1m5jid4a3bg9am4qkf0qafyp6yn176yzcz1i6"; }; prePatch = ''sed -i "s@/usr/local@$out@" Makefile''; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index f3bfa218df4a6..9c42a4cfe000d 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, makeWrapper, ffmpeg, zip +{ stdenv, fetchurl, buildPythonApplication, makeWrapper, ffmpeg, zip , pandoc ? null }: @@ -9,14 +9,14 @@ # case someone wants to use this derivation to build a Git version of # the tool that doesn't have the formatted man page included. -buildPythonPackage rec { +buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.01.01"; + version = "2016.02.13"; src = fetchurl { url = "http://yt-dl.org/downloads/${stdenv.lib.getVersion name}/${name}.tar.gz"; - sha256 = "0b0pk8h2iswdiyf65c0zcwcad9dm2hid67fnfafj7d3ikp4kfbvk"; + sha256 = "0d6ml6nas0pnp6is73fn326ayxkdmxvarzyr96qd6gyjm9icpdcb"; }; buildInputs = [ makeWrapper zip pandoc ]; |