public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #28548 from WilliButz/packageUpdates 

update packages: watchman, feh, whois, duc, evemu and debianutils
This commit is contained in:
Jörg Thalheim 2017-08-25 07:57:57 +01:00 committed by GitHub
parent 702c327c42 c6ee3231b7
commit 56429bf9e3
8 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -619,6 +619,7 @@
vrthra = "Rahul Gopinath <rahul@gopinath.org>"; vrthra = "Rahul Gopinath <rahul@gopinath.org>";
vyp = "vyp <elisp.vim@gmail.com>"; vyp = "vyp <elisp.vim@gmail.com>";
wedens = "wedens <kirill.wedens@gmail.com>"; wedens = "wedens <kirill.wedens@gmail.com>";
willibutz = "Willi Butz <willibutz@posteo.de>";
willtim = "Tim Philip Williams <tim.williams.public@gmail.com>"; willtim = "Tim Philip Williams <tim.williams.public@gmail.com>";
winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>"; winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
wizeman = "Ricardo M. Correia <rcorreia@wizy.org>"; wizeman = "Ricardo M. Correia <rcorreia@wizy.org>";

6
pkgs/applications/graphics/feh/default.nix
View File

@ -6,11 +6,11 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "feh-${version}"; name = "feh-${version}";
version = "2.19.1"; version = "2.19.3";
src = fetchurl { src = fetchurl {
url = "http://feh.finalrewind.org/${name}.tar.bz2"; url = "http://feh.finalrewind.org/${name}.tar.bz2";
sha256 = "1d4ycmai3dpajl0bdr9i56646g4h5j1lb95jjn0nckwcddcj927c"; sha256 = "1l3yvv0l0ggwlfyhk84p2g9mrqvzqrg1fgalf88kzppvb9jppjay";
}; };
outputs = [ "out" "man" "doc" ]; outputs = [ "out" "man" "doc" ];
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
description = "A light-weight image viewer"; description = "A light-weight image viewer";
homepage = https://derf.homelinux.org/projects/feh/; homepage = https://derf.homelinux.org/projects/feh/;
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.viric ]; maintainers = [ maintainers.viric maintainers.willibutz ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

4
pkgs/applications/misc/wordnet/default.nix
View File

@ -1,7 +1,7 @@
{stdenv, fetchurl, tcl, tk, xlibsWrapper, makeWrapper}: {stdenv, fetchurl, tcl, tk, xlibsWrapper, makeWrapper}:
let version = "3.0"; in stdenv.mkDerivation rec {
stdenv.mkDerivation { version = "3.0";
name = "wordnet-${version}"; name = "wordnet-${version}";
src = fetchurl { src = fetchurl {
url = "http://wordnetcode.princeton.edu/${version}/WordNet-${version}.tar.bz2"; url = "http://wordnetcode.princeton.edu/${version}/WordNet-${version}.tar.bz2";

16
pkgs/development/tools/watchman/default.nix
View File

@ -1,20 +1,22 @@
{ stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre { stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre,
, confFile ? config.watchman.confFile or null libtool, pkgconfig, openssl,
confFile ? config.watchman.confFile or null
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "watchman-${version}"; name = "watchman-${version}";
version = "4.7.0"; version = "4.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = "watchman"; repo = "watchman";
rev = "v${version}"; rev = "v${version}";
sha256 = "0xnd7jvrmyxhlw2ggd37swv1mk6vw9j91fdxps6njgvnlfg9zs5n"; sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal";
}; };
buildInputs = [ autoconf automake pcre ]; buildInputs = [ pcre openssl ];
nativeBuildInputs = [ autoconf automake pkgconfig libtool ];
configureFlags = [ configureFlags = [
"--enable-lenient" "--enable-lenient"
@ -26,6 +28,10 @@ stdenv.mkDerivation rec {
"--disable-statedir" "--disable-statedir"
]; ];
prePatch = ''
patchShebangs .
'';
preConfigure = '' preConfigure = ''
./autogen.sh ./autogen.sh
''; '';

10
pkgs/tools/misc/debianutils/default.nix
View File

@ -1,16 +1,12 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
let stdenv.mkDerivation rec {
checksums = { version = "4.8.2";
"4.8.1" = "09phylg8ih1crgxjadkdb8idbpj9ap62a7cbh8qdx2gyvh5mqf9c";
};
in stdenv.mkDerivation rec {
version = "4.8.1";
name = "debianutils-${version}"; name = "debianutils-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://debian/pool/main/d/debianutils/debianutils_${version}.tar.xz"; url = "mirror://debian/pool/main/d/debianutils/debianutils_${version}.tar.xz";
sha256 = checksums."${version}"; sha256 = "0s3w3svcsh984zinkxvpzxi7dc0ginqk0nk299fkrr6k7wlmzssd";
}; };
meta = { meta = {

4
pkgs/tools/misc/duc/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "duc-${version}"; name = "duc-${version}";
version = "1.4.1"; version = "1.4.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zevv"; owner = "zevv";
repo = "duc"; repo = "duc";
rev = "${version}"; rev = "${version}";
sha256 = "0rnar2zacsb9rvdmp1a62xixhy69s5vh0nwgrklqxhb19qkzhdp7"; sha256 = "1h7vll8a78ijan9bmnimmsviywmc39x8h9iikx8vm98kwyxi4xif";
}; };
buildInputs = [ autoreconfHook pkgconfig tokyocabinet cairo pango ncurses ]; buildInputs = [ autoreconfHook pkgconfig tokyocabinet cairo pango ncurses ];

6
pkgs/tools/networking/whois/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, perl, gettext }: { stdenv, fetchFromGitHub, perl, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "5.2.17"; version = "5.2.18";
name = "whois-${version}"; name = "whois-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rfc1036"; owner = "rfc1036";
repo = "whois"; repo = "whois";
rev = "v${version}"; rev = "v${version}";
sha256 = "15jnzk0js8wxiapz1bw7jnck0fl3mcli56f9635z9x7vk63ss68z"; sha256 = "0jzyq1rj6balc6a28swzgspv55xhkc75dw6wsn159in4ap61bzmi";
}; };
buildInputs = [ perl gettext ]; buildInputs = [ perl gettext ];
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
select the appropriate WHOIS server for most queries. select the appropriate WHOIS server for most queries.
''; '';
homepage = http://packages.qa.debian.org/w/whois.html; homepage = https://packages.qa.debian.org/w/whois.html;
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ fpletz ]; maintainers = with maintainers; [ fpletz ];
platforms = platforms.linux; platforms = platforms.linux;

6
pkgs/tools/system/evemu/default.nix
View File

@ -4,14 +4,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "evemu-${version}"; name = "evemu-${version}";
version = "2.4.0"; version = "2.6.0";
# We could have downloaded a release tarball from cgit, but it changes hash # We could have downloaded a release tarball from cgit, but it changes hash
# each time it is downloaded :/ # each time it is downloaded :/
src = fetchgit { src = fetchgit {
url = git://git.freedesktop.org/git/evemu; url = git://git.freedesktop.org/git/evemu;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "07iha13xrpf4z59rzl9cm2h1zkc5xhyipbd3ajd3c1d4hhpn9w9s"; sha256 = "1m38fxwy2s82vb2qm9aqxinws12akmqqq7q66is931lc3awqkbah";
}; };
nativeBuildInputs = [ pkgconfig autoreconfHook ]; nativeBuildInputs = [ pkgconfig autoreconfHook ];
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Records and replays device descriptions and events to emulate input devices through the kernel's input system"; description = "Records and replays device descriptions and events to emulate input devices through the kernel's input system";
homepage = http://www.freedesktop.org/wiki/Evemu/; homepage = https://www.freedesktop.org/wiki/Evemu/;
repositories.git = git://git.freedesktop.org/git/evemu; repositories.git = git://git.freedesktop.org/git/evemu;
license = licenses.gpl2; license = licenses.gpl2;
maintainers = [ maintainers.amorsillo ]; maintainers = [ maintainers.amorsillo ];