diff options
Diffstat (limited to 'pkgs/tools')
79 files changed, 269 insertions, 300 deletions
diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix index 035b4fd6ee73..c7c7b9e55674 100644 --- a/pkgs/tools/X11/xvkbd/default.nix +++ b/pkgs/tools/X11/xvkbd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configurePhase = '' xmkmf -a ''; meta = with stdenv.lib; { - description = "virtual keyboard for X window system"; + description = "Virtual keyboard for X window system"; longDescription = '' xvkbd is a virtual (graphical) keyboard program for X Window System which provides facility to enter characters onto other clients (softwares) by clicking on a diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index c8717ad1f6cb..be7d534b3d6e 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "lxd-${version}"; - version = "2.0.0.rc4"; + version = "2.0.2"; rev = "lxd-${version}"; goPackagePath = "github.com/lxc/lxd"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "lxc"; repo = "lxd"; - sha256 = "1rpyyj6d38d9kmb47dcmy1x41fiacj384yx01yslsrj2l6qxcdjn"; + sha256 = "1rs9g1snjymg6pjz5bj77zk5wbs0w8xmrfxzqs32w6zr1dxhf9hs"; }; goDeps = ./deps.json; @@ -19,10 +19,6 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ lxc ]; - postInstall = '' - cp go/src/$goPackagePath/scripts/lxd-images $bin/bin - ''; - meta = with stdenv.lib; { description = "Daemon based on liblxc offering a REST API to manage containers"; homepage = https://github.com/lxc/lxd; diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index e73e71da51a2..b0b9444a2380 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ]; meta = { - description = "opensource disk backup software"; + description = "Opensource disk backup software"; homepage = http://www.partimage.org; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index bcbc8a846474..1c313beae9fd 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildInputs = [ python librsync gnused ]; meta = { - description = "backup system trying to combine best a mirror and an incremental backup system"; + description = "Backup system trying to combine best a mirror and an incremental backup system"; homepage = http://rdiff-backup.nongnu.org/; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/pkgs/tools/cd-dvd/bashburn/default.nix index 1a14aae62636..ada58e87fd0a 100644 --- a/pkgs/tools/cd-dvd/bashburn/default.nix +++ b/pkgs/tools/cd-dvd/bashburn/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "bash script CD Burner Writer"; + description = "Bash script CD Burner Writer"; longDescription = '' It might not be the best looking application out there, but it works. It’s simple, fast and small, and can handle most things you throw at it. diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index f46ddd1c5369..d12169a0fd9a 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.bzip.org"; - description = "high-quality data compression program"; + description = "High-quality data compression program"; platforms = stdenv.lib.platforms.all; maintainers = []; diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix index 44f6a0bb7a45..cf616a21e0aa 100644 --- a/pkgs/tools/compression/lbzip2/default.nix +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://lbzip2.org/; - description = "parallel bzip2 compression utility"; + description = "Parallel bzip2 compression utility"; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index b0dfd79b9bac..a800a19e12b9 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.nongnu.org/lzip/lzip.html"; - description = "a lossless data compressor based on the LZMA algorithm"; + description = "A lossless data compressor based on the LZMA algorithm"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index b2246e73328f..a5cd54bf74d9 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://savannah.nongnu.org/projects/davfs2"; - description = "mount WebDAV shares like a typical filesystem"; + description = "Mount WebDAV shares like a typical filesystem"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix index 5b33e31958c5..a30709d4c920 100644 --- a/pkgs/tools/filesystems/extundelete/default.nix +++ b/pkgs/tools/filesystems/extundelete/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ e2fsprogs ]; meta = with stdenv.lib; { - description = "utility that can recover deleted files from an ext3 or ext4 partition"; + description = "Utility that can recover deleted files from an ext3 or ext4 partition"; homepage = http://extundelete.sourceforge.net/; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/grive/default.nix b/pkgs/tools/filesystems/grive/default.nix index e9a7204f0e6c..63d3bbc3373a 100644 --- a/pkgs/tools/filesystems/grive/default.nix +++ b/pkgs/tools/filesystems/grive/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "an open source (experimental) Linux client for Google Drive"; + description = "An open source (experimental) Linux client for Google Drive"; homepage = https://github.com/Grive/grive; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix index fa0349689119..4e027a53ffcb 100644 --- a/pkgs/tools/filesystems/zerofree/default.nix +++ b/pkgs/tools/filesystems/zerofree/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://intgat.tigress.co.uk/rmy/uml/index.html; - description = "zero free blocks from ext2, ext3 and ext4 file-systems"; + description = "Zero free blocks from ext2, ext3 and ext4 file-systems"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.theuni ]; }; diff --git a/pkgs/tools/graphics/bins/default.nix b/pkgs/tools/graphics/bins/default.nix index 579ec802e092..63bf9aae5521 100644 --- a/pkgs/tools/graphics/bins/default.nix +++ b/pkgs/tools/graphics/bins/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { ''; meta = { - description = "generates static HTML photo albums"; + description = "Generates static HTML photo albums"; homepage = http://bins.sautret.org; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index c9b1febcc93a..78a66721b0c9 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://cgit.freedesktop.org/xorg/app/editres/"; - description = "a dynamic resource editor for X Toolkit applications"; + description = "A dynamic resource editor for X Toolkit applications"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index ba58bd86a747..819728032bb6 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; meta = with stdenv.lib; { - description = "encrypt files with Advanced Encryption Standard (AES)"; + description = "Encrypt files with Advanced Encryption Standard (AES)"; homepage = http://www.aescrypt.com/; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 qknight ]; diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix index e479167dc159..dc170bcd14bb 100644 --- a/pkgs/tools/misc/apt-offline/default.nix +++ b/pkgs/tools/misc/apt-offline/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { preFixup = ''rm "$out/bin/apt-offline-gui"''; meta = with stdenv.lib; { - description = "offline APT package manager"; + description = "Offline APT package manager"; license = licenses.gpl3; maintainers = [ maintainers.falsifian ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/tools/misc/autorevision/default.nix new file mode 100644 index 000000000000..058fa4881e84 --- /dev/null +++ b/pkgs/tools/misc/autorevision/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, asciidoc, libxml2, docbook_xml_dtd_45, libxslt +, docbook_xsl, diffutils, coreutils, gnugrep +}: + +stdenv.mkDerivation rec { + name = "autorevision-${version}"; + version = "1.14"; + + src = fetchurl { + url = "https://github.com/Autorevision/autorevision/releases/download/v%2F${version}/autorevision-${version}.tgz"; + sha256 = "0h0ig922am9qd0nbri3i6p4k789mv5iavxzxwylclg0mfgx43qd2"; + }; + + buildInputs = [ + asciidoc libxml2 docbook_xml_dtd_45 libxslt docbook_xsl + ]; + + installFlags = [ "prefix=$(out)" ]; + + postInstall = '' + sed -e "s|cmp|${diffutils}/bin/cmp|" \ + -e "s|cat|${coreutils}/bin/cat|" \ + -e "s|grep|${gnugrep}/bin/grep|" \ + -i "$out/bin/autorevision" + ''; + + meta = with stdenv.lib; { + description = "Extracts revision metadata from your VCS repository"; + homepage = https://autorevision.github.io/; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 72a8f61bf3f0..305a32edadeb 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = "make install DESTDIR=$out"; meta = { - description = "a shell extension that manages your environment"; + description = "A shell extension that manages your environment"; longDescription = '' Once hooked into your shell direnv is looking for an .envrc file in your current directory before every prompt. diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index fc56c58f138c..c4b099956251 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.0.2"; + version = "2.0.3"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "08w8s33cfk7bi6g8wshqchhl0ayld647wvg4xngclc22d7l94rrm"; + sha256 = "1p6gl36g3ips5ry2mqcfsr49siki5lx7xhqjl0sy9bsx26vnzgrc"; }; dontBuild = true; diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix index a70f69c47834..50d75de69cce 100644 --- a/pkgs/tools/misc/hakuneko/default.nix +++ b/pkgs/tools/misc/hakuneko/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, wxGTK, openssl, curl }: +{ stdenv, fetchurl, wxGTK30, openssl, curl }: stdenv.mkDerivation rec { name = "hakuneko-${version}"; - version = "1.3.12"; + version = "1.4.1"; src = fetchurl { url = "mirror://sourceforge/hakuneko/hakuneko_${version}_src.tar.gz"; - sha256 = "24e7281a7f68b24e5260ee17ecfa1c5a3ffec408c8ea6e0121ae6c161898b698"; + sha256 = "d7e066e3157445f273ccf14172c05077759da036ffe700a28a409fde862b69a7"; }; preConfigure = '' @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { --replace /bin/bash $shell ''; - buildInputs = [ wxGTK openssl curl ]; + buildInputs = [ wxGTK30 openssl curl ]; meta = { description = "Manga downloader"; diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/pkgs/tools/misc/proxytunnel/default.nix index 993a36ea9092..a51b6238cd52 100644 --- a/pkgs/tools/misc/proxytunnel/default.nix +++ b/pkgs/tools/misc/proxytunnel/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { installPhase = ''make DESTDIR="$out" PREFIX="" install''; meta = { - description = "program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"; + description = "Program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"; homepage = http://proxytunnel.sourceforge.net/download.php; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index 54a6b0309b00..3bf704ca68e9 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "open source firmware for mp3 players"; + description = "Open source firmware for mp3 players"; homepage = http://www.rockbox.org; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 652c4f989050..8367bde6fddb 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -1,40 +1,29 @@ { stdenv, fetchurl, fetchpatch, ncurses, utmp, pam ? null }: stdenv.mkDerivation rec { - name = "screen-4.3.1"; + name = "screen-4.4.0"; src = fetchurl { url = "mirror://gnu/screen/${name}.tar.gz"; - sha256 = "0qwxd4axkgvxjigz9xs0kcv6qpfkrzr2gm43w9idx0z2mvw4jh7s"; + sha256 = "12r12xwhsg59mlprikbbmn60gh8lqhrvyar7mlxg4fwsfma2lwpg"; }; - preConfigure = '' - configureFlags="--enable-telnet --enable-pam --infodir=$out/share/info --mandir=$out/share/man --with-sys-screenrc=/etc/screenrc --enable-colors256" - sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in - ''; - - # TODO: remove when updating the version of screen. Only patches for 4.3.1 - patches = [ - (fetchpatch { - name = "CVE-2015-6806.patch"; - stripLen = 1; - url = "http://git.savannah.gnu.org/cgit/screen.git/patch/?id=b7484c224738247b510ed0d268cd577076958f1b"; - sha256 = "160zhpzi80qkvwib78jdvx4jcm2c2h59q5ap7hgnbz4xbkb3k37l"; - }) - ] ++ stdenv.lib.optional stdenv.isDarwin (fetchurl { - url = "http://savannah.gnu.org/file/screen-utmp.patch\?file_id=34815"; - sha256 = "192dsa8hm1zw8m638avzhwhnrddgizhyrwaxgwa96zr9vwai2nvc"; - }); + configureFlags= [ + "--enable-telnet" + "--enable-pam" + "--with-sys-screenrc=/etc/screenrc" + "--enable-colors256" + ]; buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isLinux pam ++ stdenv.lib.optional stdenv.isDarwin utmp; doCheck = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.gnu.org/software/screen/; description = "A window manager that multiplexes a physical terminal"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; longDescription = '' GNU Screen is a full-screen window manager that multiplexes a physical @@ -58,7 +47,7 @@ stdenv.mkDerivation rec { terminal. ''; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ peti jgeerds ]; + platforms = platforms.unix; + maintainers = with maintainers; [ peti jgeerds vrthra ]; }; } diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index 3fc015c77043..e8b93569c729 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "units-${version}"; - version = "2.12"; + version = "2.13"; src = fetchurl { url = "mirror://gnu/units/${name}.tar.gz"; - sha256 = "1jxvjknz2jhq773jrwx9gc1df3gfy73yqmkjkygqxzpi318yls3q"; + sha256 = "1awhjw9zjlfb8s5g3yyx63f7ddfcr1sanlbxpqifmrgq24ql198b"; }; buildInputs = [ readline ]; @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { description = "Unit conversion tool"; homepage = https://www.gnu.org/software/units/; license = [ licenses.gpl3Plus ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + maintainers = [ maintainers.vrthra ]; }; } diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 4bf195977094..1a8621effd54 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -3,12 +3,12 @@ # Packaging documentation at: # https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst pythonPackages.buildPythonApplication rec { - version = "0.11.0"; + version = "0.11.2"; name = "vdirsyncer-${version}"; src = fetchurl { url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz"; - sha256 = "1bf0vk29qdswar0q4267aamfriq3134302i2p3qcqxpmmcwx3qfv"; + sha256 = "15isw2jhjfxi213wdj9d8mwq2m58k8bwf831qnxrjcz7j7bwy7mj"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 1187191185d7..9ffd66472579 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -12,11 +12,11 @@ buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.05.21.2"; + version = "2016.06.19.1"; src = fetchurl { url = "http://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "66f94fc97012c4c7a6338dc4df6ec62af66dcfc144c5e8c8cd8b5519756f1a98"; + sha256 = "223c496be84dd57ba9f7d6a132a2732b67c79c7e26e64ecae1439472c10d0d45"; }; buildInputs = [ makeWrapper zip pandoc ]; diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 4bc68aba29df..31f39b887c56 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://developers.yubico.com/yubikey-personalization-gui; - description = "a QT based cross-platform utility designed to facilitate reconfiguration of the Yubikey"; + description = "A QT based cross-platform utility designed to facilitate reconfiguration of the Yubikey"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 8b8b5074fc39..dbf0b9af8abc 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://developers.yubico.com/yubikey-personalization; - description = "a library and command line tool to personalize YubiKeys"; + description = "A library and command line tool to personalize YubiKeys"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 106dcf2f184c..78541a5d9f2c 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -1,28 +1,37 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, autoreconfHook , openssl, c-ares, libxml2, sqlite, zlib, libssh2 , Security }: stdenv.mkDerivation rec { name = "aria2-${version}"; - version = "1.23.0"; + version = "1.24.0"; - src = fetchurl { - url = "https://github.com/tatsuhiro-t/aria2/releases/download/release-${version}/${name}.tar.xz"; - sha256 = "14qz7686zxnhbaqj6l1hqpkykhpygm74h2mzwhh13gqmcj38alaq"; + src = fetchFromGitHub { + owner = "aria2"; + repo = "aria2"; + rev = "release-${version}"; + sha256 = "0sb8s2rf2l0x7m8fx8kys7vad0lfw3k9071iai03kxplkdvg96n9"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++ stdenv.lib.optional stdenv.isDarwin Security; + patches = stdenv.lib.optionals stdenv.isDarwin [ + (fetchpatch { + url = https://github.com/aria2/aria2/commit/1e59e357af626edc870b7f53c1ae8083658d0d1a.patch; + sha256 = "1xjj4ll1v6adl6vdkl84v0mh7ma6p469ph1wpvksxrq6qp8345qj"; + }) + ]; + configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ]; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/tatsuhiro-t/aria2; + homepage = https://aria2.github.io; description = "A lightweight, multi-protocol, multi-source, command-line download utility"; maintainers = with maintainers; [ koral jgeerds ]; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index c92403a1af51..2269e1a09c7b 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "02jqkwihp4im58qdnyd7d6m37ym9168gy35cql8gviq2w03yznpk"; + sha256 = "10rimw6ldnaijbjz1vmkrbrr5swbbqjydjrxd4y5xj2r8whq2mph"; }; buildInputs = [ boost zlib openssl ]; diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index 1d0c9d55076e..c579d12b6bd4 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://keepalived.org; - description = "routing software written in C"; + description = "Routing software written in C"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/tools/networking/mpack/default.nix b/pkgs/tools/networking/mpack/default.nix index 5a1095506424..41266e65aa09 100644 --- a/pkgs/tools/networking/mpack/default.nix +++ b/pkgs/tools/networking/mpack/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = "configureFlags=--mandir=$out/share/man"; meta = { - description = "utilities for encoding and decoding binary files in MIME"; + description = "Utilities for encoding and decoding binary files in MIME"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index b89d2adea6bc..23d4117f8b84 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://nbd.sourceforge.net"; - description = "map arbitrary files as block devices over the network"; + description = "Map arbitrary files as block devices over the network"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.peti ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 5e8931579cb3..a24f350d3f0b 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -3,20 +3,14 @@ , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas , makeWrapper, udev, libgudev, hicolor_icon_theme }: -let - pn = "network-manager-applet"; - major = "1.0"; - # With version 1.0.12 of NM, we are no longer in sync - # version = "${networkmanager.version}.10"; - version = "${major}.10"; -in - stdenv.mkDerivation rec { - name = "network-manager-applet-${version}"; + name = "${pname}-${version}"; + pname = "network-manager-applet"; + version = networkmanager.version; src = fetchurl { - url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz"; - sha256 = "1szh5jyijxm6z55irkp5s44pwah0nikss40mx7pvpk38m8zaqidh"; + url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${name}.tar.xz"; + sha256 = "02b42e7c17c9cd6c840563750da92ce58da1ec621df7f0c2402016026e727756"; }; configureFlags = [ "--sysconfdir=/etc" ]; @@ -34,10 +28,9 @@ stdenv.mkDerivation rec { ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' ]; - preInstall = - '' - installFlagsArray=( "sysconfdir=$out/etc" ) - ''; + preInstall = '' + installFlagsArray=( "sysconfdir=$out/etc" ) + ''; preFixup = '' wrapProgram "$out/bin/nm-applet" \ @@ -50,10 +43,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://projects.gnome.org/NetworkManager/; + homepage = http://projects.gnome.org/NetworkManager/; description = "NetworkManager control applet for GNOME"; - license = licenses.gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ phreedom urkud rickynils ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/network-manager/0.9.8.nix b/pkgs/tools/networking/network-manager/0.9.8/default.nix index 4fad1ca2ab9a..4fad1ca2ab9a 100644 --- a/pkgs/tools/networking/network-manager/0.9.8.nix +++ b/pkgs/tools/networking/network-manager/0.9.8/default.nix diff --git a/pkgs/tools/networking/network-manager/libnl-3.2.25.patch b/pkgs/tools/networking/network-manager/0.9.8/libnl-3.2.25.patch index 17c2966b7064..17c2966b7064 100644 --- a/pkgs/tools/networking/network-manager/libnl-3.2.25.patch +++ b/pkgs/tools/networking/network-manager/0.9.8/libnl-3.2.25.patch diff --git a/pkgs/tools/networking/network-manager/nixos-purity.patch b/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch index 831b2010fcfc..831b2010fcfc 100644 --- a/pkgs/tools/networking/network-manager/nixos-purity.patch +++ b/pkgs/tools/networking/network-manager/0.9.8/nixos-purity.patch diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 34506cb823d0..5b1d56c0184c 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -5,12 +5,14 @@ , ethtool, gnused, coreutils, file, inetutils }: stdenv.mkDerivation rec { - name = "network-manager-${version}"; - version = "1.0.12"; + name = "network-manager-${version}"; + pname = "NetworkManager"; + major = "1.2"; + version = "${major}.2"; src = fetchurl { - url = "mirror://gnome/sources/NetworkManager/1.0/NetworkManager-${version}.tar.xz"; - sha256 = "17jan0g5jzp8mrpklyacwdgnnw016m1c5pc4az5im6qhc260yirs"; + url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; + sha256 = "41d8082e027f58bb5fa4181f93742606ab99c659794a18e2823eff22df0eecd9"; }; preConfigure = '' @@ -61,34 +63,30 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; - patches = [ ./nm-platform.patch ]; - - preInstall = - '' - installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" ) - ''; + preInstall = '' + installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" "runstatedir=$out/var/run" ) + ''; - postInstall = - '' - mkdir -p $out/lib/NetworkManager + postInstall = '' + mkdir -p $out/lib/NetworkManager - # FIXME: Workaround until NixOS' dbus+systemd supports at_console policy - substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"' + # FIXME: Workaround until NixOS' dbus+systemd supports at_console policy + substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"' - # rename to network-manager to be in style - mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service + # rename to network-manager to be in style + mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service - # systemd in NixOS doesn't use `systemctl enable`, so we need to establish - # aliases ourselves. - ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service - ln -s $out/etc/systemd/system/network-manager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service - ''; + # systemd in NixOS doesn't use `systemctl enable`, so we need to establish + # aliases ourselves. + ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service + ln -s $out/etc/systemd/system/network-manager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service + ''; meta = with stdenv.lib; { - homepage = http://projects.gnome.org/NetworkManager/; + homepage = http://projects.gnome.org/NetworkManager/; description = "Network configuration and management tool"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ phreedom urkud rickynils domenkozar ]; - platforms = platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ phreedom urkud rickynils domenkozar obadz ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/network-manager/l2tp-purity.patch b/pkgs/tools/networking/network-manager/l2tp-purity.patch deleted file mode 100644 index c9117c5325b6..000000000000 --- a/pkgs/tools/networking/network-manager/l2tp-purity.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/nm-l2tp-service.c b/src/nm-l2tp-service.c -index d2c9dc4..e61d3d2 100644 ---- a/src/nm-l2tp-service.c -+++ b/src/nm-l2tp-service.c -@@ -655,9 +655,7 @@ nm_find_ipsec (void) - { - static const char *ipsec_binary_paths[] = - { -- "/sbin/ipsec", -- "/usr/sbin/ipsec", -- "/usr/local/sbin/ipsec", -+ "@strongswan@/bin/ipsec", - NULL - }; - -@@ -677,9 +675,7 @@ nm_find_l2tpd (void) - { - static const char *l2tp_binary_paths[] = - { -- "/sbin/xl2tpd", -- "/usr/sbin/xl2tpd", -- "/usr/local/sbin/xl2tpd", -+ "@xl2tpd@/bin/xl2tpd", - NULL - }; - diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix index f415b4f3bedd..3cb6034db85d 100644 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -1,43 +1,42 @@ -{ stdenv, fetchFromGitHub, substituteAll, automake, autoconf, libtool, intltool, pkgconfig -, networkmanager, ppp, xl2tpd, strongswan +{ stdenv, fetchFromGitHub, automake, autoconf, libtool, intltool, pkgconfig +, networkmanager, networkmanagerapplet, ppp, xl2tpd, strongswan, libsecret , withGnome ? true, gnome3 }: stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - pname = "NetworkManager-l2tp"; - version = "0.9.8.7"; + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-l2tp"; + version = networkmanager.version; src = fetchFromGitHub { - owner = "seriyps"; - repo = "NetworkManager-l2tp"; - rev = version; - sha256 = "07gl562p3f6l2wn64f3vvz1ygp3hsfhiwh4sn04c3fahfdys69zx"; + owner = "nm-l2tp"; + repo = "network-manager-l2tp"; + rev = version; + sha256 = "1zqdhm7pzhaq6q8pddj9ki25qs9m6qwqgzc5x07a0qffla2rq5j1"; }; - buildInputs = [ networkmanager ppp ] + buildInputs = [ networkmanager ppp networkmanagerapplet libsecret ] ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ]; nativeBuildInputs = [ automake autoconf libtool intltool pkgconfig ]; - configureScript = "./autogen.sh"; + postPatch = '' + sed -i -e 's%"\(/usr/sbin\|/usr/pkg/sbin\|/usr/local/sbin\)/[^"]*",%%g' ./src/nm-l2tp-service.c - configureFlags = - if withGnome then "--with-gnome" else "--without-gnome"; + substituteInPlace ./src/nm-l2tp-service.c \ + --replace /sbin/ipsec ${strongswan}/bin/ipsec \ + --replace /sbin/xl2tpd ${xl2tpd}/bin/xl2tpd + ''; - postConfigure = "sed 's/-Werror//g' -i Makefile */Makefile"; + preConfigure = "./autogen.sh"; - patches = - [ ( substituteAll { - src = ./l2tp-purity.patch; - inherit xl2tpd strongswan; - }) - ]; + configureFlags = + if withGnome then "--with-gnome" else "--without-gnome"; meta = with stdenv.lib; { description = "L2TP plugin for NetworkManager"; inherit (networkmanager.meta) platforms; homepage = https://github.com/seriyps/NetworkManager-l2tp; license = licenses.gpl2; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar obadz ]; }; } diff --git a/pkgs/tools/networking/network-manager/nm-platform.patch b/pkgs/tools/networking/network-manager/nm-platform.patch deleted file mode 100644 index 880d1a2e4921..000000000000 --- a/pkgs/tools/networking/network-manager/nm-platform.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c -index 8803377..14e5726 100644 ---- a/src/platform/nm-platform.c -+++ b/src/platform/nm-platform.c -@@ -39,6 +39,12 @@ - #include "nm-enum-types.h" - #include "nm-core-internal.h" - -+#if HAVE_LIBNL_INET6_ADDR_GEN_MODE && HAVE_KERNEL_INET6_ADDR_GEN_MODE -+#include <linux/if_link.h> -+#else -+#define IN6_ADDR_GEN_MODE_NONE 1 -+#endif -+ - #define ADDRESS_LIFETIME_PADDING 5 - - G_STATIC_ASSERT (sizeof ( ((NMPlatformLink *) NULL)->addr.data ) == NM_UTILS_HWADDR_LEN_MAX); diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index 6a93100fa105..43eb681be295 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -2,15 +2,13 @@ , withGnome ? true, gnome3, procps, kmod }: stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - pname = "NetworkManager-openconnect"; - version = "1.0.2"; - -# FixMe: Change version back to "networkmanager.version" + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-openconnect"; + version = networkmanager.version; src = fetchurl { - url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz"; - sha256 = "03k05s3aaxcwrip3g3r13bx80wbg7vh5sssc7mvg27c4cdc0a2hj"; + url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz"; + sha256 = "522979593e21b4e884112816708db9eb66148b3491580dacfad53472b94aafec"; }; buildInputs = [ openconnect networkmanager libsecret ] @@ -31,15 +29,6 @@ stdenv.mkDerivation rec { --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" ''; - postConfigure = '' - substituteInPlace "./auth-dialog/Makefile" \ - --replace "-Wstrict-prototypes" "" \ - --replace "-Werror" "" - substituteInPlace "properties/Makefile" \ - --replace "-Wstrict-prototypes" "" \ - --replace "-Werror" "" - ''; - meta = { description = "NetworkManager's OpenConnect plugin"; inherit (networkmanager.meta) maintainers platforms; diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index 4b98600611e4..34e3a3e2959a 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -2,13 +2,13 @@ , withGnome ? true, gnome3, procps, kmod }: stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - pname = "NetworkManager-openvpn"; + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-openvpn"; version = networkmanager.version; src = fetchurl { - url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz"; - sha256 = "132xwkgyfnpma7m6b06jhrd1g9xk5dlpx8alnsf03ls3z92bd0n9"; + url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz"; + sha256 = "47a6d219a781eff8491c7876b7fb95b12dcfb8f8a05f916f95afc65c7babddef"; }; buildInputs = [ openvpn networkmanager libsecret ] @@ -33,15 +33,6 @@ stdenv.mkDerivation rec { --replace "/sbin/openvpn" "${openvpn}/sbin/openvpn" ''; - postConfigure = '' - substituteInPlace "./auth-dialog/Makefile" \ - --replace "-Wstrict-prototypes" "" \ - --replace "-Werror" "" - substituteInPlace "properties/Makefile" \ - --replace "-Wstrict-prototypes" "" \ - --replace "-Werror" "" - ''; - meta = { description = "NetworkManager's OpenVPN plugin"; inherit (networkmanager.meta) maintainers platforms; diff --git a/pkgs/tools/networking/network-manager/pptp-purity.patch b/pkgs/tools/networking/network-manager/pptp-purity.patch deleted file mode 100644 index 88af666b6580..000000000000 --- a/pkgs/tools/networking/network-manager/pptp-purity.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/nm-pptp-service.c b/src/nm-pptp-service.c -index 68a5759..568bbfe 100644 ---- a/src/nm-pptp-service.c -+++ b/src/nm-pptp-service.c -@@ -730,9 +730,7 @@ nm_find_pppd (void) - { - static const char *pppd_binary_paths[] = - { -- "/sbin/pppd", -- "/usr/sbin/pppd", -- "/usr/local/sbin/pppd", -+ "@ppp@/sbin/pppd", - NULL - }; - -@@ -752,9 +750,7 @@ nm_find_pptp (void) - { - static const char *pptp_binary_paths[] = - { -- "/sbin/pptp", -- "/usr/sbin/pptp", -- "/usr/local/sbin/pptp", -+ "@pptp@/sbin/pptp", - NULL - }; - diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix index 1b1cf69119e4..a9bee0c74811 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig, substituteAll +{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig , libsecret, withGnome ? true, gnome3 }: stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - pname = "NetworkManager-pptp"; + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-pptp"; version = networkmanager.version; src = fetchurl { - url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz"; - sha256 = "1gn1f8r32wznk4rsn2lg2slw1ccli00svz0fi4bx0qiylimlbyln"; + url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz"; + sha256 = "a72cb88ecc0a9edec836e8042c592d68b8b290c0d78082e6b25cf08b46c6be5d"; }; buildInputs = [ networkmanager pptp ppp libsecret ] @@ -17,17 +17,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; - configureFlags = - if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"; + postPatch = '' + sed -i -e 's%"\(/usr/sbin\|/usr/pkg/sbin\|/usr/local/sbin\)/[^"]*",%%g' ./src/nm-pptp-service.c - postConfigure = "sed 's/-Werror//g' -i Makefile */Makefile"; + substituteInPlace ./src/nm-pptp-service.c \ + --replace /sbin/pptp ${pptp}/bin/pptp \ + --replace /sbin/pppd ${ppp}/bin/pppd + ''; - patches = - [ ( substituteAll { - src = ./pptp-purity.patch; - inherit ppp pptp; - }) - ]; + configureFlags = + if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"; meta = { description = "PPtP plugin for NetworkManager"; diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix index 64de5408c7e0..97b2001d7592 100644 --- a/pkgs/tools/networking/network-manager/vpnc.nix +++ b/pkgs/tools/networking/network-manager/vpnc.nix @@ -2,13 +2,13 @@ , withGnome ? true, gnome3, procps, kmod }: stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - pname = "NetworkManager-vpnc"; + name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; + pname = "NetworkManager-vpnc"; version = networkmanager.version; src = fetchurl { - url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz"; - sha256 = "0hycplnc78688sgpzdh3ifra6chascrh751mckqkp1j553bri0jk"; + url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz"; + sha256 = "e900f6500026f8c3ee4feb92e1d0a0c0abbee9ba507dad915b47a8ab7df9e1f3"; }; buildInputs = [ vpnc networkmanager libsecret ] @@ -30,15 +30,6 @@ stdenv.mkDerivation rec { --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" ''; - postConfigure = '' - substituteInPlace "./auth-dialog/Makefile" \ - --replace "-Wstrict-prototypes" "" \ - --replace "-Werror" "" - substituteInPlace "properties/Makefile" \ - --replace "-Wstrict-prototypes" "" \ - --replace "-Werror" "" - ''; - meta = { description = "NetworkManager's VPNC plugin"; inherit (networkmanager.meta) maintainers platforms; diff --git a/pkgs/tools/networking/ratools/default.nix b/pkgs/tools/networking/ratools/default.nix index 423c58450c56..00c1c86ea8b5 100644 --- a/pkgs/tools/networking/ratools/default.nix +++ b/pkgs/tools/networking/ratools/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "a fast, dynamic, multi-threading framework for IPv6 Router Advertisements"; + description = "A fast, dynamic, multi-threading framework for IPv6 Router Advertisements"; homepage = https://github.com/danrl/ratools; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index 2fec2ac1bd58..b50d619b437d 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "utility for secure encrypted channels between sockets"; + description = "Utility for secure encrypted channels between sockets"; homepage = "https://www.tarsnap.com/spiped.html"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/networking/ssh-ident/default.nix b/pkgs/tools/networking/ssh-ident/default.nix new file mode 100644 index 000000000000..605986935f01 --- /dev/null +++ b/pkgs/tools/networking/ssh-ident/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, makeWrapper, python }: + +stdenv.mkDerivation rec { + name = "ssh-ident-${version}"; + version = "2016-04-21"; + src = fetchFromGitHub { + owner = "ccontavalli"; + repo = "ssh-ident"; + rev = "ebf8282728211dc4448d50f7e16e546ed03c22d2"; + sha256 = "1jf19lz1gwn7cyp57j8d4zs5bq13iw3kw31m8nvr8h6sib2pf815"; + }; + + buildInputs = [ makeWrapper ]; + installPhase = '' + mkdir -p $out/bin + install -m 755 ssh-ident $out/bin/ssh-ident + wrapProgram $out/bin/ssh-ident \ + --prefix PATH : "${python}/bin/python" + ''; + + meta = { + homepage = https://github.com/ccontavalli/ssh-ident; + description = "Start and use ssh-agent and load identities as necessary"; + license = stdenv.lib.licenses.bsd2; + maintainers = with stdenv.lib.maintainers; [ telotortium ]; + }; +} diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 96169ab294ce..2f12aaa7ee23 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "universal tls/ssl wrapper"; + description = "Universal tls/ssl wrapper"; homepage = "http://www.stunnel.org/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 684b9b13a804..1443c9bfb7d7 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unbound-${version}"; - version = "1.5.8"; + version = "1.5.9"; src = fetchurl { url = "http://unbound.net/downloads/${name}.tar.gz"; - sha256 = "33567a20f73e288f8daa4ec021fbb30fe1824b346b34f12677ad77899ecd09be"; + sha256 = "01328cfac99ab5b8c47115151896a244979e442e284eb962c0ea84b7782b6990"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index e1905e2deb65..b183b653d26e 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.unix-ag.uni-kl.de/~massar/vpnc/"; - description = "virtual private network (VPN) client for Cisco's VPN concentrators"; + description = "Virtual private network (VPN) client for Cisco's VPN concentrators"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 9b9909a89432..42309b49bb8a 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -3,11 +3,11 @@ , libiconv, libpsl ? null, openssl ? null }: stdenv.mkDerivation rec { - name = "wget-1.17.1"; + name = "wget-1.18"; src = fetchurl { url = "mirror://gnu/wget/${name}.tar.xz"; - sha256 = "1jcpvl5sxb2ag8yahpy370c5jlfb097a21k2mhsidh4wxdhrnmgy"; + sha256 = "1hcwx8ww3sxzdskkx3l7q70a7wd6569yrnjkw9pw013cf9smpddm"; }; patches = [ ./remove-runtime-dep-on-openssl-headers.patch ]; diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix index 7f9df88abdea..89d795c8e505 100644 --- a/pkgs/tools/package-management/gx/default.nix +++ b/pkgs/tools/package-management/gx/default.nix @@ -20,4 +20,11 @@ buildGoPackage rec { ''; goDeps = ./deps.json; + + meta = with stdenv.lib; { + description = "A packaging tool built around IPFS"; + homepage = https://github.com/whyrusleeping/gx; + license = licenses.mit; + maintainers = with maintainers; [ zimbatm ]; + }; } diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix index 195dafe3d711..912c870c27b0 100644 --- a/pkgs/tools/package-management/gx/go/default.nix +++ b/pkgs/tools/package-management/gx/go/default.nix @@ -24,4 +24,11 @@ buildGoPackage rec { src = gx.src; } ]; + + meta = with stdenv.lib; { + description = "A tool for importing go packages into gx"; + homepage = https://github.com/whyrusleeping/gx-go; + license = licenses.mit; + maintainer = with maintainers; [ zimbatm ]; + }; } diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index 8593fe69733a..4766968b06fd 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "free implementation of the OpenPGP standard for encrypting and signing data"; + description = "Free implementation of the OpenPGP standard for encrypting and signing data"; homepage = http://www.gnupg.org/; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index 65d43ec9dbee..932bf508c2fa 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gnupg.org/"; - description = "free implementation of the OpenPGP standard for encrypting and signing data"; + description = "Free implementation of the OpenPGP standard for encrypting and signing data"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 6119f708070d..a1cbcb458c59 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://gnupg.org; - description = "a complete and free implementation of the OpenPGP standard"; + description = "A complete and free implementation of the OpenPGP standard"; license = licenses.gpl3Plus; maintainers = with maintainers; [ wkennington peti fpletz ]; platforms = platforms.all; diff --git a/pkgs/tools/security/stricat/default.nix b/pkgs/tools/security/stricat/default.nix index 64ebb4c0ca26..3dd00718af79 100644 --- a/pkgs/tools/security/stricat/default.nix +++ b/pkgs/tools/security/stricat/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "multi-use cryptographic tool based on the STRIBOB algorithm"; + description = "Multi-use cryptographic tool based on the STRIBOB algorithm"; homepage = "https://www.stribob.com/stricat/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 03d73183704f..961a4d4e0365 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -12,13 +12,13 @@ in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz"; sha256 = if stdenv.is64bit then - "1n3k0bhjmbmj1rdgyifqya6135wapafqygfviv6x52ng8sa2jhk1" else - "169f90w0fl4pqq9dbhzr6pkk15gqvp7813asqqh1p7s2a32zczza"; + "08zik2id1rkcl5cw4yscdgb8rdahx342j1fps576465sziy5z06x" else + "062ddifhdbzj9hjcnvjnqb1is2ydrv9x7hzam4jkpsfvllf4hxcg"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix index 5a2173139403..a4aec5369fc5 100644 --- a/pkgs/tools/security/vidalia/default.nix +++ b/pkgs/tools/security/vidalia/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.torproject.org/projects/vidalia.html.en; repositories.git = https://git.torproject.org/vidalia; - description = "a cross-platform graphical controller for the Tor software, built using the Qt framework"; + description = "A cross-platform graphical controller for the Tor software, built using the Qt framework"; license = licenses.gpl2Plus; maintainers = [ maintainers.phreedom ]; platforms = platforms.all; diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index bed7d5369579..511da154c507 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { homepage = https://code.google.com/p/volatility; - description = "advanced memory forensics framework"; + description = "Advanced memory forensics framework"; maintainers = with maintainers; [ bosu ]; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/tools/system/dcfldd/default.nix b/pkgs/tools/system/dcfldd/default.nix index 27ebbf3518fc..240cc36f7266 100644 --- a/pkgs/tools/system/dcfldd/default.nix +++ b/pkgs/tools/system/dcfldd/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ ]; meta = with stdenv.lib; { - description = "an enhanced version of GNU dd"; + description = "An enhanced version of GNU dd"; homepage = http://dcfldd.sourceforge.net/; diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix index 63a6e7e1fa30..1876bac496da 100644 --- a/pkgs/tools/system/dfc/default.nix +++ b/pkgs/tools/system/dfc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://projects.gw-computing.net/projects/dfc"; - description = "displays file system space usage using graphs and colors"; + description = "Displays file system space usage using graphs and colors"; license="free"; maintainers = with stdenv.lib.maintainers; [qknight]; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index b6f3de5f5cde..02c76798fd77 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://skarnet.org/software/s6-rc/; - description = "a service manager for s6-based systems"; + description = "A service manager for s6-based systems"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ pmahoney ]; diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/tools/system/safecopy/default.nix index 304d8f21eb28..5e7ec51bf107 100644 --- a/pkgs/tools/system/safecopy/default.nix +++ b/pkgs/tools/system/safecopy/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "data recovery tool for damaged hardware"; + description = "Data recovery tool for damaged hardware"; longDescription = '' Safecopy is a data recovery tool which tries to extract as much data as possible from a diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix index 58036af1a947..a297f9371001 100644 --- a/pkgs/tools/system/tm/default.nix +++ b/pkgs/tools/system/tm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "http://vicerveza.homeunix.net/~viric/soft/tm"; - description = "terminal mixer - multiplexer for the i/o of terminal applications"; + description = "Terminal mixer - multiplexer for the i/o of terminal applications"; license = licenses.gpl2; maintainers = with maintainers; [ viric ]; platforms = platforms.all; diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index a5050047256b..00df3c45f4ff 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { meta = { homepage = "http://mama.indstate.edu/users/ice/tree/"; - description = "command to produce a depth indented directory listing"; + description = "Command to produce a depth indented directory listing"; license = stdenv.lib.licenses.gpl2; longDescription = '' diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index 8e65eda8f540..cad1230ac87a 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://vicerveza.homeunix.net/~viric/soft/ts"; - description = "task spooler - batch queue"; + description = "Task spooler - batch queue"; license = licenses.gpl2; maintainers = with maintainers; [ viric ]; platforms = platforms.all; diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix index ca9de0590ca2..0eb64fe1d18a 100644 --- a/pkgs/tools/text/gist/default.nix +++ b/pkgs/tools/text/gist/default.nix @@ -18,7 +18,7 @@ buildRubyGem rec { dontStrip = true; meta = with lib; { - description = "upload code to https://gist.github.com (or github enterprise)"; + description = "Upload code to https://gist.github.com (or github enterprise)"; homepage = "http://defunkt.io/gist/"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; diff --git a/pkgs/tools/text/qprint/default.nix b/pkgs/tools/text/qprint/default.nix index 3bb147f7dd27..2eae12561861 100644 --- a/pkgs/tools/text/qprint/default.nix +++ b/pkgs/tools/text/qprint/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.fourmilab.ch/webtools/qprint/"; license = stdenv.lib.licenses.publicDomain; - description = "encode and decode Quoted-Printable files"; + description = "Encode and decode Quoted-Printable files"; maintainers = [ stdenv.lib.maintainers.tv ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index 0d6d424fa7c4..fcd7d350f308 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "silver-searcher-${version}"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "ggreer"; repo = "the_silver_searcher"; rev = "${version}"; - sha256 = "1xmvdi2nbmwkmrdwkqm3zm596dz1zx87bn8i0ylkmy8rvb8ybgdv"; + sha256 = "0mz0i41fb6yrvn5x99bwaa66wqv5c8s5wd9pbnn90mgppxbn1037"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix index ffd275069da4..bdb33196db94 100644 --- a/pkgs/tools/typesetting/biber/default.nix +++ b/pkgs/tools/typesetting/biber/default.nix @@ -3,17 +3,18 @@ , EncodeEUCJPASCII, EncodeHanExtra, EncodeJIS2K, ExtUtilsLibBuilder , FileSlurp, IPCRun3, Log4Perl, LWPProtocolHttps, ListAllUtils, ListMoreUtils , ModuleBuild, MozillaCA, ReadonlyXS, RegexpCommon, TextBibTeX, UnicodeCollate -, UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter }: +, UnicodeLineBreak, URI, XMLLibXMLSimple, XMLLibXSLT, XMLWriter, ClassAccessor +, TextRoman, DataUniqid }: let - version = "1.9"; + version = "2.4"; pn = "biblatex-biber"; in buildPerlPackage { name = "biber-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${pn}/${pn}/${version}/${pn}.tar.gz"; - sha256 = "1a3iq7l9i54f8nfzjmp1qdb6aqm7977q1g4san470010fkfbvjdc"; + sha256 = "1gccbs5vzs3fca41d9dwl6nrdljnh29yls8xzfw04hd57yrfn5w4"; }; buildInputs = [ @@ -22,6 +23,7 @@ buildPerlPackage { ExtUtilsLibBuilder FileSlurp IPCRun3 Log4Perl LWPProtocolHttps ListAllUtils ListMoreUtils ModuleBuild MozillaCA ReadonlyXS RegexpCommon TextBibTeX UnicodeCollate UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter + ClassAccessor TextRoman DataUniqid ]; preConfigure = "touch Makefile.PL"; buildPhase = "perl Build.PL --prefix=$out; ./Build build"; diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix index e6c63e029561..cef212b2a134 100644 --- a/pkgs/tools/typesetting/pdfgrep/default.nix +++ b/pkgs/tools/typesetting/pdfgrep/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "a tool to search text in PDF files"; + description = "A tool to search text in PDF files"; homepage = http://pdfgrep.sourceforge.net/; license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [qknight]; diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix index eacd0316b464..61936e766c5e 100644 --- a/pkgs/tools/typesetting/tex/tex4ht/default.nix +++ b/pkgs/tools/typesetting/tex/tex4ht/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://tug.org/tex4ht/"; - description = "a system to convert (La)TeX documents to HTML and various other formats"; + description = "A system to convert (La)TeX documents to HTML and various other formats"; license = stdenv.lib.licenses.lppl12; }; } diff --git a/pkgs/tools/typesetting/tex/texlive-new/bin.nix b/pkgs/tools/typesetting/tex/texlive-new/bin.nix index 403bea2783d8..f497444eb39a 100644 --- a/pkgs/tools/typesetting/tex/texlive-new/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive-new/bin.nix @@ -64,6 +64,12 @@ core = stdenv.mkDerivation rec { perl ]; + postPatch = '' + for i in texk/kpathsea/mktex*; do + sed -i '/^mydir=/d' "$i" + done + ''; + preConfigure = '' rm -r libs/{cairo,freetype2,gd,gmp,graphite2,harfbuzz,icu,libpaper,libpng} \ libs/{mpfr,pixman,poppler,potrace,xpdf,zlib,zziplib} diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix index 558d9102352b..29e1c45245f7 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix @@ -17,7 +17,7 @@ rec { '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; meta = { - description = "the moderncv class for TeXLive"; + description = "The moderncv class for TeXLive"; # Actually, arch-independent.. hydraPlatforms = []; }; diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix index 189d418b0391..caa140d42c79 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix @@ -17,7 +17,7 @@ rec { '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; meta = { - description = "the moderntimeline extensions for moderncv"; + description = "The moderntimeline extensions for moderncv"; # Actually, arch-independent.. hydraPlatforms = []; }; diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 34b6226ff98d..c038ca7c1bbe 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -26,7 +26,7 @@ in pythonPackages.buildPythonApplication rec { meta = { homepage = http://cloudinit.readthedocs.org; - description = "provides configuration and customization of cloud instance"; + description = "Provides configuration and customization of cloud instance"; maintainers = [ lib.maintainers.madjar ]; platforms = lib.platforms.all; }; |