diff options
Diffstat (limited to 'pkgs/tools')
69 files changed, 481 insertions, 169 deletions
diff --git a/pkgs/tools/X11/virtualgl/default.nix b/pkgs/tools/X11/virtualgl/default.nix index 3ae0920b9a72..ceeadbaafaa7 100644 --- a/pkgs/tools/X11/virtualgl/default.nix +++ b/pkgs/tools/X11/virtualgl/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.virtualgl.org/; description = "X11 GL rendering in a remote computer with full 3D hw acceleration"; - license = "free"; # many parts under different free licenses + license = stdenv.lib.licenses.free; # many parts under different free licenses }; } diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 52ddb5a0f6b1..a0b3283bb04c 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "xdg-utils-1.1.0-rc1"; - + src = fetchurl { url = "http://portland.freedesktop.org/download/${name}.tar.gz"; sha256 = "00lisw4x43sp189lb7dz46j2l09y5v2fijk3d0sxx3mvwj55a1bv"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/bin/xdg-mime --replace /usr/bin/file ${file}/bin/file ''; - + meta = { homepage = http://portland.freedesktop.org/wiki/; description = "A set of command line tools that assist applications with a variety of desktop integration tasks"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/X11/xlaunch/default.nix b/pkgs/tools/X11/xlaunch/default.nix index b97c9def8227..06dfd28b7399 100644 --- a/pkgs/tools/X11/xlaunch/default.nix +++ b/pkgs/tools/X11/xlaunch/default.nix @@ -3,57 +3,61 @@ # !!! What does this package do, and does it belong in Nixpkgs? stdenv.mkDerivation { - name = "xlaunch"; - inherit xorgserver; - buildCommand = " - cat << EOF > realizeuid.c - #include <sys/types.h> - #include <unistd.h> - #include <stdio.h> - int main(int argc, char ** argv, char ** envp) - { - uid_t a,b,c; - int i; - char *nargv[10000]; - char arg1 [10]; - nargv[0]=argv[0]; - for (i=1; i<=argc; i++){ - nargv[i+1]=argv[i]; - } - nargv[1]=arg1; - getresuid (&a,&b,&c); - snprintf(arg1,8,\"%d\",a); - setresuid(c,c,c); - execve(\"\$out/libexec/xlaunch\", nargv, envp); - } + name = "xlaunch"; + inherit xorgserver; + buildCommand = " + cat << EOF > realizeuid.c + #include <sys/types.h> + #include <unistd.h> + #include <stdio.h> + int main(int argc, char ** argv, char ** envp) + { + uid_t a,b,c; + int i; + char *nargv[10000]; + char arg1 [10]; + nargv[0]=argv[0]; + for (i=1; i<=argc; i++){ + nargv[i+1]=argv[i]; + } + nargv[1]=arg1; + getresuid (&a,&b,&c); + snprintf(arg1,8,\"%d\",a); + setresuid(c,c,c); + execve(\"\$out/libexec/xlaunch\", nargv, envp); + } EOF - mkdir -p \$out/bin - mkdir -p \$out/libexec - gcc realizeuid.c -o \$out/bin/xlaunch - echo '#! ${stdenv.shell} - USER=\$(egrep '\\''^[-a-z0-9A-Z_]*:[^:]*:'\\''\$1'\\'':'\\'' /etc/passwd | sed -e '\\''s/:.*//'\\'' ) - shift - case \"\$1\" in - :*) export _display=\"\$1\"; - shift - esac - _display=\${_display:-:0} - _display=\${_display#:} - echo Using :\$_display - if [ -n \"\$DO_X_RESET\" ]; then - RESET_OPTION=\"-once\" - else - RESET_OPTION=\"-noreset\" - fi; - XCMD=\"\$(egrep \"^Environment=\" /etc/systemd/system/display-manager.service | sed -e \"s/Environment=/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver}/bin/X \\\$_XARGS_ \$RESET_OPTION )\" - PRE_XCMD=\"\$(egrep \"^ExecStartPre=\" /etc/systemd/system/display-manager.service | sed -e \"\s/ExecStartPre=//\")\" - echo \"\$PRE_XCMD\" - echo \"\$PRE_XCMD\" | bash - echo \"\$XCMD\" - echo \"\$XCMD\" | bash & - while ! test -e /tmp/.X11-unix/X\$_display &>/dev/null ; do sleep 0.5; done - su -l \${USER:-identityless-shelter} -c \"DISPLAY=:\$_display \$*\"; - ' >\$out/libexec/xlaunch - chmod a+x \$out/libexec/xlaunch - "; + mkdir -p \$out/bin + mkdir -p \$out/libexec + gcc realizeuid.c -o \$out/bin/xlaunch + echo '#! ${stdenv.shell} + USER=\$(egrep '\\''^[-a-z0-9A-Z_]*:[^:]*:'\\''\$1'\\'':'\\'' /etc/passwd | sed -e '\\''s/:.*//'\\'' ) + shift + case \"\$1\" in + :*) export _display=\"\$1\"; + shift + esac + _display=\${_display:-:0} + _display=\${_display#:} + echo Using :\$_display + if [ -n \"\$DO_X_RESET\" ]; then + RESET_OPTION=\"-once\" + else + RESET_OPTION=\"-noreset\" + fi; + XCMD=\"\$(egrep \"^Environment=\" /etc/systemd/system/display-manager.service | sed -e \"s/Environment=/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver}/bin/X \\\$_XARGS_ \$RESET_OPTION )\" + PRE_XCMD=\"\$(egrep \"^ExecStartPre=\" /etc/systemd/system/display-manager.service | sed -e \"\s/ExecStartPre=//\")\" + echo \"\$PRE_XCMD\" + echo \"\$PRE_XCMD\" | bash + echo \"\$XCMD\" + echo \"\$XCMD\" | bash & + while ! test -e /tmp/.X11-unix/X\$_display &>/dev/null ; do sleep 0.5; done + su -l \${USER:-identityless-shelter} -c \"DISPLAY=:\$_display \$*\"; + ' >\$out/libexec/xlaunch + chmod a+x \$out/libexec/xlaunch + "; + meta = { + description = ''Wrapper to parse NixOS-specific X environment and launch a custom X session''; + maintainers = [ stdenv.lib.maintainers.raskin ]; + }; } diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index d8c60c0ec3c8..41c83344c14a 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://simple-evcorr.sourceforge.net/"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; description = "Simple Event Correlator"; maintainers = [ stdenv.lib.maintainers.tv ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index cd0cea13a14d..0bf1ec736fca 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "A port of the 7-zip archiver"; # license = stdenv.lib.licenses.lgpl21Plus; + "unRAR restriction" platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.raskin ]; }; } diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix index 0852674e8c89..546f398bec3a 100644 --- a/pkgs/tools/archivers/unarj/default.nix +++ b/pkgs/tools/archivers/unarj/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "unarj-2.63a"; - + src = fetchurl { url = http://www.ibiblio.org/pub/Linux/utils/compress/unarj-2.63a.tar.gz; sha256 = "0j4sn57fq2p23pcq4ck06pm618q4vq09wgm89ilfn4c9l9x2ky1k"; @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { description = "Unarchiver of ARJ files"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index f939c968c44d..f19a2f0c5d35 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation ({ name = "unzip-6.0"; - + src = fetchurl { url = mirror://sourceforge/infozip/unzip60.tar.gz; sha256 = "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83"; @@ -27,7 +27,7 @@ stdenv.mkDerivation ({ meta = { homepage = http://www.info-zip.org; description = "An extraction utility for archives compressed in .zip format"; - license = "free"; # http://www.info-zip.org/license.html + license = stdenv.lib.licenses.free; # http://www.info-zip.org/license.html platforms = stdenv.lib.platforms.all; }; } // (if enableNLS then { diff --git a/pkgs/tools/archivers/xarchive/default.nix b/pkgs/tools/archivers/xarchive/default.nix index 2b60bef197ab..ed60e3147a8f 100644 --- a/pkgs/tools/archivers/xarchive/default.nix +++ b/pkgs/tools/archivers/xarchive/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "A GTK+ front-end for command line archiving tools"; - mainatainers = [ stdenv.lib.maintainers.iElectric ]; + maintainers = [ stdenv.lib.maintainers.iElectric ]; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix new file mode 100644 index 000000000000..500c8add4c63 --- /dev/null +++ b/pkgs/tools/audio/pasystray/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, unzip, autoconf, automake, pkgconfig, gnome_icon_theme, avahi, gtk3, libnotify, pulseaudio, x11}: + +stdenv.mkDerivation rec { + name = "pasystray-0.4.0"; + + src = fetchurl { + url = "https://github.com/christophgysin/pasystray/archive/${name}.zip"; + sha256 = "1gpb7yqcxqglv50iqbkg2lg3r0z07jm4ir2zqmvns6sgddks590w"; + }; + + buildInputs = [ unzip autoconf automake pkgconfig gnome_icon_theme avahi gtk3 libnotify pulseaudio x11 ]; + + preConfigure = '' + aclocal + autoconf + autoheader + automake --add-missing + ''; + + meta = with stdenv.lib; { + description = "PulseAudio system tray"; + homepage = "https://github.com/christophgysin/pasystray"; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.exlevan ]; + platfoms = platforms.linux; + }; +} diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix new file mode 100644 index 000000000000..5ac59327c4b1 --- /dev/null +++ b/pkgs/tools/backup/bareos/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchgit, pkgconfig, nettools, gettext, readline, openssl, python +, ncurses ? null +, sqlite ? null, postgresql ? null, mysql ? null, libcap ? null +, zlib ? null, lzo ? null, acl ? null, ceph ? null +}: + +assert sqlite != null || postgresql != null || mysql != null; + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "bareos-${version}"; + version = "14.2.1"; + + src = fetchgit { + url = "git://github.com/bareos/bareos"; + rev = "refs/tags/Release/${version}"; + sha256 = "0m7v1szi45m71zjhj3inn5hh9f4529slhiihm88rfw8006aqb6ly"; + }; + + buildInputs = [ + pkgconfig nettools gettext readline openssl python + ncurses sqlite postgresql mysql libcap zlib lzo acl ceph + ]; + + configureFlags = [ + "--exec-prefix=\${out}" + "--with-openssl=${openssl}" + "--with-python=${python}" + "--with-readline=${readline}" + "--enable-ndmp" + "--enable-lmdb" + ] ++ optional (sqlite != null) "--with-sqlite3=${sqlite}" + ++ optional (postgresql != null) "--with-postgresql=${postgresql}" + ++ optional (mysql != null) "--with-mysql=${mysql}"; + + meta = with stdenv.lib; { + homepage = http://www.bareos.org/; + description = "a fork of the bacula project."; + license = licenses.agpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix index 937cf9875132..3d3ad80e25de 100644 --- a/pkgs/tools/compression/ncompress/default.nix +++ b/pkgs/tools/compression/ncompress/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://ncompress.sourceforge.net/; - license = "public domain"; + license = stdenv.lib.licenses.publicDomain; description = "A fast, simple LZW file compressor"; }; } diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix index 3732e5b17565..4606d5bf79bd 100644 --- a/pkgs/tools/compression/zsync/default.nix +++ b/pkgs/tools/compression/zsync/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://zsync.moria.org.uk/; description = "File distribution system using the rsync algorithm"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/filesystems/btrfsprogs/3.16.nix b/pkgs/tools/filesystems/btrfsprogs/3.16.nix new file mode 100644 index 000000000000..e1d4b8bd31cf --- /dev/null +++ b/pkgs/tools/filesystems/btrfsprogs/3.16.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo +, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: + +let version = "3.16"; in + +stdenv.mkDerivation rec { + name = "btrfs-progs-${version}"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; + sha256 = "0phbrgipl04q8cdj9nnshik7b6p2bg51jxb3l1gvfc04dkgm2xls"; + }; + + buildInputs = [ + attr acl zlib libuuid e2fsprogs lzo + asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt + ]; + + # for btrfs to get the rpath to libgcc_s, needed for pthread_cancel to work + NIX_CFLAGS_LINK = "-lgcc_s"; + + makeFlags = "prefix=$(out)"; + + meta = with stdenv.lib; { + description = "Utilities for the btrfs filesystem"; + homepage = https://btrfs.wiki.kernel.org/; + license = licenses.gpl2; + maintainers = with maintainers; [ raskin wkennington ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix new file mode 100644 index 000000000000..087012d62a1f --- /dev/null +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchurl, libgcrypt, pkgconfig, glib, linuxHeaders }: + +stdenv.mkDerivation rec { + name = "duperemove-${version}"; + version = "0.09.beta2"; + + src = fetchurl { + url = "https://github.com/markfasheh/duperemove/archive/v${version}.tar.gz"; + sha256 = "0rn7lf9rjf4ypgfwms2y7b459rri4rfn809h6wx8xl9nbm5niil4"; + }; + + buildInputs = [ libgcrypt pkgconfig glib linuxHeaders ]; + + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + + meta = { + description = "A simple tool for finding duplicated extents and submitting them for deduplication"; + homepage = https://github.com/markfasheh/duperemove; + license = lib.licenses.gpl2; + + maintainers = [ lib.maintainers.bluescreen303 ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index 93f15675bd76..3eee59d458d3 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -2,7 +2,7 @@ let sourceInfo = rec { version = "2.2.2"; - url = "http://www.nilfs.org/download/nilfs-utils-${version}.tar.bz2"; + url = "http://nilfs.sourceforge.net/download/nilfs-utils-${version}.tar.bz2"; sha256 = "1w2i5wy290y03hg72lhkrnmfhap04ki0kkv5m8q60a2frbv6ydql"; baseName = "nilfs-utils"; name = "${baseName}-${version}"; diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 72b50bd4e773..5dcac6a02159 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.cybercom.net/~dcoffin/dcraw/; description = "Decoder for many camera raw picture formats"; - license = "free"; + license = stdenv.lib.licenses.free; platforms = with stdenv.lib.platforms; allBut cygwin; maintainers = [ stdenv.lib.maintainers.urkud ]; }; diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/tools/graphics/exiftags/default.nix index 531e17b92cbb..ea729d71be25 100644 --- a/pkgs/tools/graphics/exiftags/default.nix +++ b/pkgs/tools/graphics/exiftags/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://johnst.org/sw/exiftags/; description = "Displays EXIF data from JPEG files"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; }; } diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index c497d60aef9a..ee44ff975bb3 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.sentex.net/~mwandel/jhead/; description = "Exif Jpeg header manipulation tool"; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; }; } diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 0419732949d8..79902582ff41 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://pmt.sourceforge.net/pngcrush; description = "A PNG optimizer"; - license = "free"; + license = stdenv.lib.licenses.free; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index 79ca54fe0ed5..2ee419a0512f 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation { PATH="$TMP/bin:$PATH" done ''; - + meta = { homepage = http://www.povray.org/; description = "Persistence of Vision Raytracer"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix index 23c5ec11aaad..3d1a2aa5bdc0 100644 --- a/pkgs/tools/graphics/welkin/default.nix +++ b/pkgs/tools/graphics/welkin/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , jre , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ ["jre"]; buildInputs = map (n: builtins.getAttr n x) @@ -39,7 +39,7 @@ rec { sed -e 's@[.]/lib/welkin[.]jar@"'"$out"'/share/welkin/lib/welkin.jar"@' -i "$out/share/welkin/welkin.sh" chmod a+x "$out/bin/welkin" '' ["minInit" "defEnsureDir"]; - + meta = { description = "An RDF visualizer"; maintainers = with a.lib.maintainers; @@ -47,7 +47,7 @@ rec { raskin ]; hydraPlatforms = []; - license = "free-noncopyleft"; + license = a.lib.licenses.free; }; passthru = { updateInfo = { @@ -55,4 +55,3 @@ rec { }; }; }) x - diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/pkgs/tools/inputmethods/fcitx/default.nix index 28f6c97949b5..a8b3089c58ac 100644 --- a/pkgs/tools/inputmethods/fcitx/default.nix +++ b/pkgs/tools/inputmethods/fcitx/default.nix @@ -5,7 +5,8 @@ }: stdenv.mkDerivation rec { - name = "fcitx-4.2.8.5"; + name = "fcitx-${version}"; + version = "4.2.8.5"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx/${name}_dict.tar.xz"; diff --git a/pkgs/tools/inputmethods/fcitx/wrapper.nix b/pkgs/tools/inputmethods/fcitx/wrapper.nix new file mode 100644 index 000000000000..d4efb3326969 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx/wrapper.nix @@ -0,0 +1,35 @@ +{ stdenv, buildEnv, fcitx, makeWrapper, plugins }: + +# This is based on the pidgin-with-plugins package. +# Users should be able to configure what plugins are used +# by putting the following in their /etc/nixos/configuration.nix: +# environment.systemPackages = with pkgs; [ +# (fcitx-with-plugins.override { plugins = [ fcitx-anthy ]; }) +# ] +# Or, a normal user could use it by putting the following in his +# ~/.nixpkgs/config.nix: +# packageOverrides = pkgs: with pkgs; rec { +# (fcitx-with-plugins.override { plugins = [ fcitx-anthy ]; }) +# } + +let +drv = buildEnv { + name = "fcitx-with-plugins-" + (builtins.parseDrvName fcitx.name).version; + + paths = [ fcitx ] ++ plugins; + + postBuild = '' + # TODO: This could be avoided if buildEnv could be forced to create all directories + if [ -L $out/bin ]; then + rm $out/bin + mkdir $out/bin + for i in ${fcitx}/bin/*; do + ln -s $i $out/bin + done + fi + wrapProgram $out/bin/fcitx \ + --set FCITXDIR "$out/" + ''; + }; +in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) + diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index b8ee95fae92c..1da552a46e2c 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, cmake, ... }: +{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, cmake, anthy, ... }: stdenv.mkDerivation rec { version = "1.8.6"; @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { gtk3 kdelibs cmake + anthy ]; patches = [ ./immodules_cache.patch ]; @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { "--with-qt4-immodule" "--with-skk" "--with-x" + "--with-anthy-utf8" ]; dontUseCmakeConfigure = true; diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/tools/misc/aws-mturk-clt/default.nix index d2d29aae785d..4db4f3b1672b 100644 --- a/pkgs/tools/misc/aws-mturk-clt/default.nix +++ b/pkgs/tools/misc/aws-mturk-clt/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "aws-mturk-clt-1.3.0"; - + src = fetchurl { url = "http://mturk.s3.amazonaws.com/CLTSource/${name}.tar.gz"; sha256 = "06p0cbb5afmqjjlibbw9gb08jp270c7j57lhnf9ld50sm1z021ln"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://requester.mturk.com/developer; description = "Command line tools for interacting with the Amazon Mechanical Turk"; - license = "unfree-redistributable"; # Amazon http://aws.amazon.com/asl/ + license = stdenv.lib.licenses.amazonsl; longDescription = '' diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix index 1cbbb9720c9a..54edaaa033a4 100644 --- a/pkgs/tools/misc/fasd/default.nix +++ b/pkgs/tools/misc/fasd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/clvv/fasd"; description = "quick command-line access to files and directories for POSIX shells"; - license = "free"; # https://github.com/clvv/fasd/blob/master/LICENSE + license = stdenv.lib.licenses.free; # https://github.com/clvv/fasd/blob/master/LICENSE longDescription = '' Fasd is a command-line productivity booster. diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index 7f22a35e8de1..99c7a056051d 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation { makeFlags="DESTDIR=$out/bin MANDIR=$out/man/man6 DEFAULTFONTDIR=$out/share/figlet" ''; - meta = { + meta = { description = "Program for making large letters out of ordinary text"; homepage = http://www.figlet.org/; - license = "AFL-2.1"; + license = stdenv.lib.licenses.afl21; }; } diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index c4e74359b15b..2d22bdcd3026 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.flashrom.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; - license = "GPLv2"; + license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.funfunctor ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index 08e012128c24..02b804936549 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -32,7 +32,7 @@ in buildPythonPackage rec { project is inspired by tmuxinator and uses i3-py. ''; homepage = https://github.com/carlesso/i3minator; - license = "WTFPL"; # http://sam.zoy.org/wtfpl/ + license = stdenv.lib.licenses.wtfpl; maintainers = with maintainers; [ iElectric ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index 2fa712239314..08fbba873e5b 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.jgoodies.com/freeware/jdiskreport/; description = "A graphical utility to visualize disk usage"; - license = "unfree-redistributable"; #TODO freedist, libs under BSD-3 + license = stdenv.lib.licenses.unfreeRedistributable; #TODO freedist, libs under BSD-3 }; } diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix index 0dad6c2d33f3..ce4f8728a808 100644 --- a/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/pkgs/tools/misc/mysql2pgsql/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation { mv {,$out/bin/}mysql2psql ''; - meta = { + meta = { description = "converts mysql dump files to psql loadable files "; homepage = http://pgfoundry.org/projects/mysql2pgsql/; - license = "BSD-Original"; + license = stdenv.lib.licenses.bsdOriginal; }; } diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix new file mode 100644 index 000000000000..b91e6bcb3138 --- /dev/null +++ b/pkgs/tools/misc/ostree/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk_doc, gobjectIntrospection +, libgsystem, xz, e2fsprogs, libsoup, gpgme +}: + +stdenv.mkDerivation { + name = "ostree-2014.11"; + + meta = with stdenv.lib; { + description = "Git for operating system binaries"; + homepage = "http://live.gnome.org/OSTree/"; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchFromGitHub { + owner = "GNOME"; + repo = "ostree"; + rev = "v2014.11"; + sha256 = "152s94r744lyz64syagha2c4y4afblc178lr9mkk8h2d4xvp6nf5"; + }; + + nativeBuildInputs = [ + autoreconfHook pkgconfig gtk_doc gobjectIntrospection + ]; + + buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme ]; + + preAutoreconf = '' + mkdir m4 + gtkdocize + ''; +} diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index 909ed0856bb9..3501090c63c8 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.microchip.com/pickit2; - license = "nonfree"; #MicroChip-PK2 + license = stdenv.lib.licenses.unfree; #MicroChip-PK2 description = "Microchip PIC programming software for the PICKit2 programmer"; }; } diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index 0af7143a320a..a94cdea1339f 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.ivarch.com/programs/pv; description = "Tool for monitoring the progress of data through a pipeline"; - license = "Artistic-2"; + license = stdenv.lib.licenses.artistic2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/misc/w3c-css-validator/default.nix b/pkgs/tools/misc/w3c-css-validator/default.nix index f08fe87202f0..3c7aa5261a24 100644 --- a/pkgs/tools/misc/w3c-css-validator/default.nix +++ b/pkgs/tools/misc/w3c-css-validator/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, sourceFromHead, apacheAnt, tomcat, jre }: -let +let sources = [ (fetchurl { @@ -69,7 +69,7 @@ stdenv.mkDerivation { homepage = http://dev.w3.org/cvsweb/2002/css-validator/; # dependencies ship their own license files # I think all .java files are covered by this license (?) - license = "w3c"; # http://www.w3.org/Consortium/Legal/ + license = stdenv.lib.licenses.w3c; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; broken = true; diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index df1a7eedeffd..7d731650288c 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -3,9 +3,9 @@ x@{builderDefsPackage , libSM, libXext , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -35,7 +35,7 @@ rec { '' ["minInit" "defEnsureDir"]; goSrcDir = "cd X11"; - + meta = { description = "A clock application that morphs digits when they are changed"; maintainers = with a.lib.maintainers; @@ -44,7 +44,7 @@ rec { ]; platforms = with a.lib.platforms; linux ++ freebsd; - license = "free"; #TODO BSD on Gentoo, looks like MIT + license = a.lib.licenses.free; #TODO BSD on Gentoo, looks like MIT downloadPage = "http://www.jwz.org/xdaliclock/"; inherit version; updateWalker = true; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 57f002d42b6f..8d03cfae260b 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2014.11.02.1"; + version = "2014.11.04"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "17k0vcggb75nyl8ikamvz0i8q1hqm84qii7fidvnzdcf2v6fakif"; + sha256 = "073qnbl0lbv1pacqsdvccawlzgxs3kbayw3inlyqhr6xn3471jgk"; }; buildInputs = [ python ]; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.unlicense; platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ bluescreen303 simons phreedom ]; + maintainers = with stdenv.lib.maintainers; [ bluescreen303 simons phreedom AndersonTorres ]; }; } diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix index a6700284af56..7a9e3fc0d1d9 100644 --- a/pkgs/tools/networking/fdm/default.nix +++ b/pkgs/tools/networking/fdm/default.nix @@ -1,54 +1,45 @@ -x@{builderDefsPackage +{ stdenv, fetchurl , openssl, tdb, zlib, flex, bison - , ...}: -builderDefsPackage -(a : + }: let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; - - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + buildInputs = [ openssl tdb zlib flex bison ]; sourceInfo = rec { baseName="fdm"; - version="1.7"; + version = "1.7"; name="${baseName}-${version}"; url="mirror://sourceforge/${baseName}/${baseName}/${name}.tar.gz"; - hash="0apg1jasn4m5j3vh0v9lr2l3lyzy35av1ylxr0wf8k0j9w4p8i28"; + sha256 = "0apg1jasn4m5j3vh0v9lr2l3lyzy35av1ylxr0wf8k0j9w4p8i28"; }; in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +stdenv.mkDerivation { + src = fetchurl { + inherit (sourceInfo) url sha256; }; inherit (sourceInfo) name version; inherit buildInputs; - phaseNames = ["doConfigure" "fixInstall" "doMakeInstall"]; - makeFlags = ["PREFIX=$out"]; - fixInstall = a.fullDepEntry ('' + preBuild = '' + export makeFlags="$makeFlags PREFIX=$out" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Dbool=int" + sed -i */Makefile -i Makefile -e 's@ -g bin @ @' sed -i */Makefile -i Makefile -e 's@ -o root @ @' sed -i GNUmakefile -e 's@ -g $(BIN_OWNER) @ @' sed -i GNUmakefile -e 's@ -o $(BIN_GROUP) @ @' sed -i */Makefile -i Makefile -i GNUmakefile -e 's@-I-@@g' - '') ["minInit" "doUnpack"]; + ''; meta = { description = "Mail fetching and delivery tool - should do the job of getmail and procmail"; - maintainers = with a.lib.maintainers; + maintainers = with stdenv.lib.maintainers; [ raskin ]; - platforms = with a.lib.platforms; + platforms = with stdenv.lib.platforms; linux; + homepage = "http://fdm.sourceforge.net/"; + inherit (sourceInfo) version; + updateWalker = true; }; - passthru = { - updateInfo = { - downloadPage = "http://fdm.sourceforge.net/"; - }; - }; -}) x - +} diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix index f6be163bb839..6b07d5bd2f12 100644 --- a/pkgs/tools/networking/iodine/default.nix +++ b/pkgs/tools/networking/iodine/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.kryo.se/iodine/; description = "Tool to tunnel IPv4 data through a DNS server"; - license = "ISC"; + license = stdenv.lib.licenses.isc; }; } diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix index dbf393094c8e..0f75bd44d69b 100644 --- a/pkgs/tools/networking/netboot/default.nix +++ b/pkgs/tools/networking/netboot/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/netboot/${name}.tar.gz"; sha256 = "09w09bvwgb0xzn8hjz5rhi3aibysdadbg693ahn8rylnqfq4hwg0"; }; - + buildInputs = [ yacc lzo db4 ]; meta = with stdenv.lib; { description = "Mini PXE server"; maintainers = [ maintainers.raskin ]; platforms = ["x86_64-linux"]; - license = "free-noncopyleft"; + license = stdenv.lib.licenses.free; }; } \ No newline at end of file diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix index 7288bb7e39b1..858683e3374c 100644 --- a/pkgs/tools/networking/netkit/tftp/default.nix +++ b/pkgs/tools/networking/netkit/tftp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Netkit TFTP client and server"; homepage = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"; - license = "BSD-Original"; + license = stdenv.lib.licenses.bsdOriginal; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix index 9050423cfafb..9a9d41ed6a48 100644 --- a/pkgs/tools/networking/nylon/default.nix +++ b/pkgs/tools/networking/nylon/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation { meta = { homepage = http://monkey.org/~marius/nylon; description = "Proxy server, supporting SOCKS 4 and 5, as well as a mirror mode"; - license = "free"; + license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index a894de647588..453b6d8623f3 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://www.openssh.org/"; description = "An implementation of the SSH protocol"; - license = "bsd"; # multi BSD GPL-2 + license = stdenv.lib.licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ eelco ]; }; diff --git a/pkgs/tools/networking/s3sync/default.nix b/pkgs/tools/networking/s3sync/default.nix index 8390c70a4d3b..1ab3e062ca00 100644 --- a/pkgs/tools/networking/s3sync/default.nix +++ b/pkgs/tools/networking/s3sync/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "s3sync-1.2.6"; - + src = fetchurl { url = http://s3.amazonaws.com/ServEdge_pub/s3sync/s3sync.tar.gz; # !!! sha256 = "19467mgym0da0hifhkcbivccdima7gkaw3k8q760ilfbwgwxcn7f"; @@ -24,6 +24,6 @@ stdenv.mkDerivation { meta = { homepage = http://s3sync.net/; description = "Command-line tools to manipulate Amazon S3 buckets"; - license = "free-non-copyleft"; # some custom as-is in file headers + license = stdenv.lib.licenses.free; # some custom as-is in file headers }; } diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index c88557262b25..48e2fc5ef787 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - name = "siege-3.0.6"; + name = "siege-3.0.8"; src = fetchurl { - url = "http://www.joedog.org/pub/siege/${name}.tar.gz"; - sha256 = "0nwcj2s804z7yd20pa0cl010m0qgf22a02305i9jwxynwdj9kdvq"; + url = "http://download.joedog.org/siege/${name}.tar.gz"; + sha256 = "15xj0cl64mzf89i0jknqg37rkrcaqmgs4755l74b4nmp4bky7ddq"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix index 795c0cfc8ccb..ce7a4dd64340 100644 --- a/pkgs/tools/networking/stun/default.nix +++ b/pkgs/tools/networking/stun/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "Stun server and test client"; homepage = http://sourceforge.net/projects/stun/; - license = "Vovida 1.0"; # See any header file. + license = stdenv.lib.licenses.vsl10; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix new file mode 100644 index 000000000000..0743a5c62f7e --- /dev/null +++ b/pkgs/tools/networking/swaks/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, perl, perlPackages, makeWrapper }: + +stdenv.mkDerivation rec { + name = "swaks-${version}"; + version = "20130209.0"; + + src = fetchurl { + url = "http://www.jetmore.org/john/code/swaks/files/${name}.tar.gz"; + sha256 = "0z0zsjminrdjpn6a8prjdwilnr27piibh78gc5ppg0nadljnf28b"; + }; + + buildInputs = [ perl makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + mv swaks $out/bin/ + + wrapProgram $out/bin/swaks --set PERL5LIB \ + "${with perlPackages; stdenv.lib.makePerlPath [ + NetSSLeay AuthenSASL NetDNS IOSocketInet6 + ]}" + ''; + + meta = with stdenv.lib; { + homepage = "http://www.jetmore.org/john/code/swaks/"; + description = '' + A featureful, flexible, scriptable, transaction-oriented SMTP test tool + ''; + license = licenses.gpl2; + maintainers = with maintainers; [ rickynils ]; + platforms = platforms.all; + }; + +} diff --git a/pkgs/tools/package-management/opkg-utils/default.nix b/pkgs/tools/package-management/opkg-utils/default.nix new file mode 100644 index 000000000000..9a197ca763a4 --- /dev/null +++ b/pkgs/tools/package-management/opkg-utils/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "opkg-utils-20141030"; + + # No releases, only a git tree + src = fetchgit { + url = "git://git.yoctoproject.org/opkg-utils"; + rev = "762d9dadce548108d4204c2113461a7dd6f57e60"; + sha256 = "a450643fa1353b872166a3d462297fb2eb240554eed7a9186645ffd72b353417"; + }; + + preBuild = '' + makeFlagsArray+=(PREFIX="$out") + ''; + + meta = with stdenv.lib; { + description = "Helper scripts for use with the opkg package manager"; + homepage = http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg/1.nix index 3675c8bc390f..3675c8bc390f 100644 --- a/pkgs/tools/security/gnupg1/default.nix +++ b/pkgs/tools/security/gnupg/1.nix diff --git a/pkgs/tools/security/gnupg1compat/default.nix b/pkgs/tools/security/gnupg/1compat.nix index 9bd71467f0ea..9bd71467f0ea 100644 --- a/pkgs/tools/security/gnupg1compat/default.nix +++ b/pkgs/tools/security/gnupg/1compat.nix diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/20.nix index 45a25d7e2422..45a25d7e2422 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/20.nix diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix new file mode 100644 index 000000000000..8c3854ac23d6 --- /dev/null +++ b/pkgs/tools/security/gnupg/21.nix @@ -0,0 +1,30 @@ +{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, npth +, readline ? null, libusb ? null, gnutls ? null, adns ? null, openldap ? null +, zlib ? null, bzip2 ? null, pinentry ? null +}: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "gnupg-2.1.0"; + + src = fetchurl { + url = "mirror://gnupg/gnupg/${name}.tar.bz2"; + sha256 = "12q5shx6ldqad3rky154nv8f2cy57sxy9idivz93ggqm1bsw7a0n"; + }; + + buildInputs = [ + pkgconfig libgcrypt libassuan libksba npth + readline libusb gnutls adns openldap zlib bzip2 + ]; + + configureFlags = + optional (pinentry != null) "--with-pinentry-pgm=${pinentry}/bin/pinentry"; + + meta = with stdenv.lib; { + homepage = http://gnupg.org; + description = "a complete and free implementation of the OpenPGP standard"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index f8e76c4e83b1..7db547bbe1ca 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { homepage = http://code.google.com/p/torsocks/; repositories.git = https://git.torproject.org/torsocks.git; license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.phreedom ]; }; } diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index 41e227cee7e3..e88c8b7db1f5 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { homepage = https://code.google.com/p/volatility; description = "advanced memory forensics framework"; maintainers = with maintainers; [ bosu ]; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index 46c36926c366..c19b6007f018 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { baseName = "ipmiutil"; - version = "2.9.4"; + version = "2.9.5"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "1pmpmpc0wymnw8i2rxnyq3v2y7p8930b2rb8nw5w60x2vf15wlaa"; + sha256 = "1rnv72qfrijcm0kiy2lsbdckjxnxdma8sf8y6y6iypp75rcg007b"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index ccda9be9f03f..e9d8e8aabd90 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { ${if withGUI then "make DESTDIR=$out install-gui" else ""} mv $out/usr/* $out rmdir $out/usr + mv $out/sbin $out/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index 016e2ccda37c..872dbf0c20e7 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "A forensic/data recovery tool"; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; - license = "IBM Public License"; + license = stdenv.lib.licenses.ipl10; inherit version; }; } diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index 73d1f8fdff6a..004b2b58fa37 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "syslog-ng-incubator-${version}"; - version = "0.3.3"; + version = "141106-54179c5"; src = fetchFromGitHub { owner = "balabit"; repo = "syslog-ng-incubator"; - rev = name; - sha256 = "0pswajcw9f651c1jmprbf1mlr6qadiaplyygz5j16vj0d23x4mal"; + rev = "54179c5f733487fe97ee856bc27130d0b09f3d5a"; + sha256 = "1y099f7pdan1441ycycd67igcwbla2m2cgnxjfvdw76llvi35sam"; }; buildInputs = [ @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--without-ivykis" - "--with-riemann" "--with-module-dir=$(out)/lib/syslog-ng" ]; diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index a62f81052bad..cec906e1f439 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl }: +{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl +, riemann_c_client, protobufc, yacc }: stdenv.mkDerivation rec { name = "syslog-ng-${version}"; - version = "3.5.6"; + version = "3.6.1"; src = fetchurl { url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/${version}/source/syslog-ng_${version}.tar.gz"; - sha256 = "19i1idklpgn6mz0mg7194by5fjgvvh5n4v2a0rr1z0778l2038kc"; + sha256 = "1s3lsxk2pky3jkfamkw5ivpxq2kazikcvdgpmxiyn5w10dwkd0m7"; }; - buildInputs = [ eventlog pkgconfig glib python systemd perl ]; + buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc ]; configureFlags = [ "--enable-dynamic-linking" diff --git a/pkgs/tools/text/html2text/default.nix b/pkgs/tools/text/html2text/default.nix new file mode 100644 index 000000000000..27de591d8896 --- /dev/null +++ b/pkgs/tools/text/html2text/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "html2text-1.3.2a"; + + src = fetchurl { + url = http://www.mbayer.de/html2text/downloads/html2text-1.3.2a.tar.gz; + sha256 = "000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392"; + }; + + preConfigure = '' + sed -i s,/bin/echo,echo, configure + ''; + + # the --prefix has no effect + installPhase = '' + mkdir -p $out/bin $out/man/man{1,5} + cp html2text $out/bin + cp html2text.1.gz $out/man/man1 + cp html2textrc.5.gz $out/man/man5 + ''; + + meta = { + description = "html2text is a command line utility, written in C++, that converts HTML documents into plain text."; + homepage = http://www.mbayer.de/html2text/; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eikek ]; + }; +} diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index 3c0af0157a52..235dcfe74586 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Command-line interface to various pastebins"; homepage = http://wgetpaste.zlin.dk/; - license = "publicDomain"; + license = stdenv.lib.licenses.publicDomain; maintainers = with stdenv.lib.maintainers; [ qknight iElectric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index fd5a5dc5f8e5..cabb931c4470 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "Utilities for manipulating HTML and XML files"; homepage = http://www.w3.org/Tools/HTML-XML-utils/; - license = "free-non-copyleft"; #TODO W3C + license = stdenv.lib.licenses.w3c; }; } diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index efce7d4de812..ffd275069da4 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -33,7 +33,7 @@ buildPerlPackage { meta = { description = "Backend for BibLaTeX"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.ttuegel ]; }; diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix index e05e4d16a06e..ff3bad12bc52 100644 --- a/pkgs/tools/typesetting/pdfgrep/default.nix +++ b/pkgs/tools/typesetting/pdfgrep/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "a tool to search text in PDF files"; homepage = http://pdfgrep.sourceforge.net/; - license = "free"; + license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [qknight]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix index 32545abaff2d..7c58c480a791 100644 --- a/pkgs/tools/typesetting/rubber/default.nix +++ b/pkgs/tools/typesetting/rubber/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { patchPhase = "substituteInPlace configure --replace which \"type -P\""; + postInstall = "rm $out/share/rubber/modules/etex.rub"; + meta = { description = "Wrapper for LaTeX and friends"; diff --git a/pkgs/tools/typesetting/tex/disser/default.nix b/pkgs/tools/typesetting/tex/disser/default.nix index 28bcfcd97fe1..cbbc3844fefb 100644 --- a/pkgs/tools/typesetting/tex/disser/default.nix +++ b/pkgs/tools/typesetting/tex/disser/default.nix @@ -2,9 +2,9 @@ x@{builderDefsPackage , unzip, texLive, texLiveCMSuper, texLiveAggregationFun , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ ["texLive" "texLiveCMSuper" "texLiveAggregationFun"]; buildInputs = map (n: builtins.getAttr n x) @@ -36,7 +36,7 @@ rec { ''; makeFlags = ["DESTDIR=$out/share/texmf-dist"]; - + meta = { description = "Russian PhD thesis LaTeX package"; maintainers = with a.lib.maintainers; @@ -45,7 +45,7 @@ rec { ]; platforms = with a.lib.platforms; linux; # platform-independent - license = "free"; # LaTeX Project Public License + license = a.lib.licenses.free; # LaTeX Project Public License }; passthru = { updateInfo = { @@ -53,4 +53,3 @@ rec { }; }; }) x - diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix index 69d02a275b34..e3e19d82b4ec 100644 --- a/pkgs/tools/typesetting/tex/tex4ht/default.nix +++ b/pkgs/tools/typesetting/tex/tex4ht/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://tug.org/tex4ht/"; description = "a system to convert (La)TeX documents to HTML and various other formats"; - license = "LPPL-1.2"; # LaTeX Project Public License + license = stdenv.lib.licenses.lppl12; }; } diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index cbe53326339a..dad581c93d06 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ec2-ami-tools-${version}"; - version = "1.5.3"; + version = "1.5.6"; buildInputs = [ unzip makeWrapper ]; src = fetchurl { url = "http://s3.amazonaws.com/ec2-downloads/${name}.zip"; - sha256 = "0n184nxc57alg25h5bslg0cs1z854sf7f52a820ihxxknrq2dy6i"; + sha256 = "0227370qbm26qaqvscqxv6002bqwy2i5fdhbhpwfnbymh7jz59ks"; }; # Amazon EC2 requires that disk images are writable. If they're @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { ''; # */ meta = { - homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88; + homepage = https://aws.amazon.com/developertools/Amazon-EC2/368; description = "Command-line tools to create and manage Amazon EC2 virtual machine images"; - license = "unfree-redistributable"; # Amazon || (Ruby GPL-2) + license = stdenv.lib.licenses.amazonsl; }; } diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix index 34cfa662c916..5ffba07087ad 100644 --- a/pkgs/tools/virtualization/ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351; description = "Command-line tools to create and manage Amazon EC2 virtual machines"; - license = "unfree-redistributable"; #Amazon + license = stdenv.lib.licenses.amazonsl; }; } |