Merge staging into staging-next

This commit is contained in:
Frederik Rietdijk 2018-07-31 13:19:43 +02:00
commit e7702dc7b7
32 changed files with 645 additions and 249 deletions

View File

@ -836,9 +836,10 @@ passthru = {
These can optionally be compressed using <command>gzip</command> These can optionally be compressed using <command>gzip</command>
(<filename>.tar.gz</filename>, <filename>.tgz</filename> or (<filename>.tar.gz</filename>, <filename>.tgz</filename> or
<filename>.tar.Z</filename>), <command>bzip2</command> <filename>.tar.Z</filename>), <command>bzip2</command>
(<filename>.tar.bz2</filename> or <filename>.tbz2</filename>) or (<filename>.tar.bz2</filename>, <filename>.tbz2</filename> or
<command>xz</command> (<filename>.tar.xz</filename> or <filename>.tbz</filename>) or <command>xz</command>
<filename>.tar.lzma</filename>). (<filename>.tar.xz</filename>, <filename>.tar.lzma</filename> or
<filename>.txz</filename>).
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>

View File

@ -1,21 +1,16 @@
{ fetchurl, stdenv, pkgconfig, pulseaudioFull, gtkmm2, libglademm { fetchurl, stdenv, meson, ninja, gettext, pkgconfig, pulseaudioFull, gtkmm3, dbus-glib, wrapGAppsHook }:
, dbus-glib, GConf, gconfmm, intltool }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "paprefs-0.9.10"; name = "paprefs-1.0";
src = fetchurl { src = fetchurl {
url = "https://freedesktop.org/software/pulseaudio/paprefs/${name}.tar.xz"; url = "https://freedesktop.org/software/pulseaudio/paprefs/${name}.tar.xz";
sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716"; sha256 = "0y77i9gaaassvvjrpwb4xbgqcmr51zmj5rh4z8zm687i5izf84md";
}; };
buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus-glib gconfmm ]; nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook ];
nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ pulseaudioFull gtkmm3 dbus-glib ];
propagatedUserEnvPkgs = [ GConf ];
configureFlags = [ "--disable-lynx" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "PulseAudio Preferences"; description = "PulseAudio Preferences";

View File

@ -23,6 +23,5 @@ stdenv.mkDerivation rec {
homepage = http://6xq.net/projects/pianobar/; homepage = http://6xq.net/projects/pianobar/;
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.mit; # expat version license = licenses.mit; # expat version
maintainers = with maintainers; [ eduarrrd ];
}; };
} }

View File

@ -3,6 +3,7 @@
, meson , meson
, ninja , ninja
, pkgconfig , pkgconfig
, itstool
, libxml2 , libxml2
, desktop-file-utils , desktop-file-utils
, wrapGAppsHook , wrapGAppsHook
@ -20,6 +21,7 @@
, libbs2b , libbs2b
, libsamplerate , libsamplerate
, libsndfile , libsndfile
, libebur128
, boost , boost
, fftwFloat , fftwFloat
, calf , calf
@ -40,13 +42,13 @@ let
]; ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "pulseeffects-${version}"; name = "pulseeffects-${version}";
version = "4.1.7"; version = "4.2.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wwmm"; owner = "wwmm";
repo = "pulseeffects"; repo = "pulseeffects";
rev = "v${version}"; rev = "v${version}";
sha256 = "13yj1958jsz76zxi3ag133i4337cicvm5b58l22g2xvbqa5vraq9"; sha256 = "0s3lc0xkr48wzk0b6akq4yw19n0iwfi9jyji8bpdgj5y7kjg5mqm";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -54,6 +56,7 @@ in stdenv.mkDerivation rec {
ninja ninja
pkgconfig pkgconfig
libxml2 libxml2
itstool
desktop-file-utils desktop-file-utils
wrapGAppsHook wrapGAppsHook
]; ];
@ -70,6 +73,7 @@ in stdenv.mkDerivation rec {
gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-bad
lilv lv2 serd sord sratom lilv lv2 serd sord sratom
libbs2b libbs2b
libebur128
libsamplerate libsamplerate
libsndfile libsndfile
boost boost

View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, wrapGAppsHook { stdenv, fetchurl, wrapGAppsHook
, tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }: , tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }:
let let
version = "3.28.1"; version = "3.30.1";
pname = "gnome-latex"; pname = "gnome-latex";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1z481izrx057wraphnr82kxnpmmi8nvl7jswyylzm22kfs0mw402"; sha256 = "0yvkp311ikmiypzj2q6ypvyw5migxiqp8lwhyl3qq6mk6p0x66w8";
}; };
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";

View File

@ -31,6 +31,5 @@ stdenv.mkDerivation rec {
description = "Simple, yet powerful and good looking image viewer"; description = "Simple, yet powerful and good looking image viewer";
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.eduarrrd ];
}; };
} }

View File

@ -20,6 +20,5 @@ stdenv.mkDerivation {
description = "File manager written in Qt/C++"; description = "File manager written in Qt/C++";
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.eduarrrd ];
}; };
} }

View File

@ -0,0 +1,60 @@
{ stdenv, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }:
let
version = "1.4.10";
# TODO: must build the extension instead of downloading it. But since it's
# literally an asset that is indifferent regardless of the platform, this
# might be just enough.
webext = fetchurl {
url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}-an.fx.xpi";
sha256 = "0rgwzv1qahqy52q7zz4dklnwx7w4x3gj92ka8n0ypgf9fjjnmqas";
};
in buildGoPackage rec {
inherit version;
name = "browsh-${version}";
goPackagePath = "browsh";
src = fetchFromGitHub {
owner = "browsh-org";
repo = "browsh";
rev = "v${version}";
sha256 = "0lvb20zziknlbgy509ccpvlc21sqjc53xar26blmb6sdl6yqkj0w";
};
buildInputs = [ go-bindata ];
# embed the web extension in a go file and place it where it's supposed to
# be. See
# https://github.com/browsh-org/browsh/blob/9abc3aaa3f575ca6ec9a483408d9fdfcf76300fa/interfacer/contrib/xpi2bin.sh
preBuild = ''
xpiprefix="$(mktemp -d)"
cp "${webext}" "$xpiprefix/browsh.xpi"
go-bindata \
-prefix "$xpiprefix" \
-pkg browsh \
-o "$NIX_BUILD_TOP/go/src/${goPackagePath}/interfacer/src/browsh/webextension.go" \
"$xpiprefix/browsh.xpi"
sed \
-e 's:Asset("/browsh.xpi"):Asset("browsh.xpi"):g' \
-i "$NIX_BUILD_TOP/go/src/${goPackagePath}/interfacer/src/browsh/firefox.go"
'';
postBuild = ''
mv "$NIX_BUILD_TOP/go/bin/src" "$NIX_BUILD_TOP/go/bin/browsh"
'';
goDeps = ./deps.nix;
meta = with stdenv.lib; {
description = "A fully-modern text-based browser, rendering to TTY and browsers";
homepage = https://www.brow.sh/;
maintainers = [ maintainers.kalbasit ];
license = stdenv.lib.licenses.lgpl21;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
};
}

View File

@ -0,0 +1,272 @@
[
{
goPackagePath = "github.com/NYTimes/gziphandler";
fetch = {
type = "git";
url = "https://github.com/NYTimes/gziphandler";
rev = "5032c8878b9dd46cfe8c625c0d9b9f258a560ee8";
sha256 = "1avn8xb78xmmc61fjycpc81yrkfi42fna8zgzdqba6v7g8gq8a3x";
};
}
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
type = "git";
url = "https://github.com/davecgh/go-spew";
rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
};
}
{
goPackagePath = "github.com/hpcloud/tail";
fetch = {
type = "git";
url = "https://github.com/hpcloud/tail";
rev = "a1dbeea552b7c8df4b542c66073e393de198a800";
sha256 = "0nssmn8j0yavs8099gwb69qpd1k9yd2z28bii6i4y61v0grb6bc2";
};
}
{
goPackagePath = "github.com/fsnotify/fsnotify";
fetch = {
type = "git";
url = "https://github.com/fsnotify/fsnotify";
rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
{
goPackagePath = "github.com/gdamore/encoding";
fetch = {
type = "git";
url = "https://github.com/gdamore/encoding";
rev = "b23993cbb6353f0e6aa98d0ee318a34728f628b9";
sha256 = "0d7irqpx2fa9vkxgkhf04yiwazsm10fxh0yk86x5crflhph5fv8a";
};
}
{
goPackagePath = "github.com/gdamore/tcell";
fetch = {
type = "git";
url = "https://github.com/gdamore/tcell";
rev = "de7e78efa4a71b3f36c7154989c529dbdf9ae623";
sha256 = "1ly3gqkziw01cb7h64k0wc4myzfcsr9hl7xznxd8k2yqzqvmhljz";
};
}
{
goPackagePath = "github.com/go-errors/errors";
fetch = {
type = "git";
url = "https://github.com/go-errors/errors";
rev = "a6af135bd4e28680facf08a3d206b454abc877a4";
sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp";
};
}
{
goPackagePath = "github.com/gorilla/websocket";
fetch = {
type = "git";
url = "https://github.com/gorilla/websocket";
rev = "5ed622c449da6d44c3c8329331ff47a9e5844f71";
sha256 = "1yhcwraijdk6lx7f6m9p6i1b3zfh2hq80l1nfpnckfn10gh72aw7";
};
}
{
goPackagePath = "github.com/hashicorp/hcl";
fetch = {
type = "git";
url = "https://github.com/hashicorp/hcl";
rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
};
}
{
goPackagePath = "github.com/lucasb-eyer/go-colorful";
fetch = {
type = "git";
url = "https://github.com/lucasb-eyer/go-colorful";
rev = "c7842319cf3ac2eff253e8b3ebe15fcc56b6414a";
sha256 = "00v2x6qchhi6vv09w29kcyr9i0kq4n4daaj3vk1c4nfj2z7xx5hc";
};
}
{
goPackagePath = "github.com/magiconair/properties";
fetch = {
type = "git";
url = "https://github.com/magiconair/properties";
rev = "c2353362d570a7bfa228149c62842019201cfb71";
sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
};
}
{
goPackagePath = "github.com/mattn/go-runewidth";
fetch = {
type = "git";
url = "https://github.com/mattn/go-runewidth";
rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb";
sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
};
}
{
goPackagePath = "github.com/mitchellh/mapstructure";
fetch = {
type = "git";
url = "https://github.com/mitchellh/mapstructure";
rev = "f15292f7a699fcc1a38a80977f80a046874ba8ac";
sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al";
};
}
{
goPackagePath = "github.com/onsi/ginkgo";
fetch = {
type = "git";
url = "https://github.com/onsi/ginkgo";
rev = "3774a09d95489ccaa16032e0770d08ea77ba6184";
sha256 = "0x0gc89vgq38xhgmi2h22bhr73cf2gmk42g89nz89k8dgg9hhr25";
};
}
{
goPackagePath = "github.com/onsi/gomega";
fetch = {
type = "git";
url = "https://github.com/onsi/gomega";
rev = "b6ea1ea48f981d0f615a154a45eabb9dd466556d";
sha256 = "14179j7pj1h2vx60i68x2m6650ldji4xhanhc702i8a8iy7b49ja";
};
}
{
goPackagePath = "github.com/pelletier/go-toml";
fetch = {
type = "git";
url = "https://github.com/pelletier/go-toml";
rev = "c2dbbc24a97911339e01bda0b8cabdbd8f13b602";
sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz";
};
}
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "816c9085562cd7ee03e7f8188a1cfd942858cded";
sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k";
};
}
{
goPackagePath = "github.com/pmezard/go-difflib";
fetch = {
type = "git";
url = "https://github.com/pmezard/go-difflib";
rev = "792786c7400a136282c1664665ae0a8db921c6c2";
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
};
}
{
goPackagePath = "github.com/shibukawa/configdir";
fetch = {
type = "git";
url = "https://github.com/shibukawa/configdir";
rev = "e180dbdc8da04c4fa04272e875ce64949f38bd3e";
sha256 = "0vbma9jkwh0ifz8dk2ssgmy7aiaify63lpa0lah7i4dkkxr94c9z";
};
}
{
goPackagePath = "github.com/spf13/afero";
fetch = {
type = "git";
url = "https://github.com/spf13/afero";
rev = "787d034dfe70e44075ccc060d346146ef53270ad";
sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1";
};
}
{
goPackagePath = "github.com/spf13/cast";
fetch = {
type = "git";
url = "https://github.com/spf13/cast";
rev = "8965335b8c7107321228e3e3702cab9832751bac";
sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
};
}
{
goPackagePath = "github.com/spf13/jwalterweatherman";
fetch = {
type = "git";
url = "https://github.com/spf13/jwalterweatherman";
rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
};
}
{
goPackagePath = "github.com/spf13/pflag";
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
rev = "3ebe029320b2676d667ae88da602a5f854788a8a";
sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp";
};
}
{
goPackagePath = "github.com/spf13/viper";
fetch = {
type = "git";
url = "https://github.com/spf13/viper";
rev = "d493c32b69b8c6f2377bf30bc4d70267ffbc0793";
sha256 = "1jq46790rkjn6c1887wz98dqjk792ij6wnrifzk1maglmfb061hh";
};
}
{
goPackagePath = "github.com/stretchr/testify";
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686";
sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
};
}
{
goPackagePath = "github.com/ulule/limiter";
fetch = {
type = "git";
url = "https://github.com/ulule/limiter";
rev = "af07f8759cbc68c744a15ffbfdabf35f7aff5e3b";
sha256 = "1c68vz9r0442lkj206l6k03nssxx3ys8ddg7d2p2brdanfbprzrq";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "a0f8a16cb08c06df97cbdf9c47f4731ba548c33c";
sha256 = "1pnvrhi2minkn9mfa9p70b5jnixx8il5yqp08ad1w7kl34c21ma2";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "bd9dbc187b6e1dacfdd2722a87e83093c2d7bd6e";
sha256 = "0zj8s3q2fznmap1nfr8pv4hz8xqixmkyhr6slq4baf8rvcb4mvbj";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "0605a8320aceb4207a5fb3521281e17ec2075476";
sha256 = "1pak7q9ivwxh5bnjk00pkrs9ri9vmbyccvza56fl6138w397h49j";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://github.com/go-yaml/yaml";
rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
};
}
]

View File

@ -4,17 +4,17 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "makemkv-${ver}"; name = "makemkv-${ver}";
ver = "1.12.2"; ver = "1.12.3";
builder = ./builder.sh; builder = ./builder.sh;
src_bin = fetchurl { src_bin = fetchurl {
url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"; url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz";
sha256 = "0ylybq0776am5yy064b55q0jja1q1p9dscwmn7f1p3igzv15rypj"; sha256 = "0rggpzp7gp4y6gxnhl4saxpdwnaivwkildpwbjjh7zvmgka3749a";
}; };
src_oss = fetchurl { src_oss = fetchurl {
url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"; url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz";
sha256 = "063rgb88zbh4zwysyhjn4awykcnc90qgsx6d8ggm27wy849306v1"; sha256 = "1w0l2rq9gyzli5ilw82v27d8v7fmchc1wdzcq06q1bsm9wmnbx1r";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

View File

@ -126,7 +126,7 @@ fi
if [[ "$isCpp" = 1 ]]; then if [[ "$isCpp" = 1 ]]; then
if [[ "$cppInclude" = 1 ]]; then if [[ "$cppInclude" = 1 ]]; then
NIX_@infixSalt@_CFLAGS_COMPILE+=" ${NIX_@infixSalt@_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}" NIX_@infixSalt@_CFLAGS_COMPILE+=" ${NIX_@infixSalt@_CXXSTDLIB_COMPILE:-@default_cxx_stdlib_compile@}"
fi fi
NIX_@infixSalt@_CFLAGS_LINK+=" $NIX_@infixSalt@_CXXSTDLIB_LINK" NIX_@infixSalt@_CFLAGS_LINK+=" $NIX_@infixSalt@_CXXSTDLIB_LINK"
fi fi

View File

@ -1,7 +1,7 @@
findTarball() { findTarball() {
local suffix i local suffix i
if [ -d "$1/tarballs/" ]; then if [ -d "$1/tarballs/" ]; then
for suffix in tar.gz tgz tar.bz2 tbz2 tar.xz tar.lzma; do for suffix in tar.gz tgz tar.bz2 tbz2 tbz tar.xz txz tar.lzma; do
for i in $1/tarballs/*.$suffix; do echo $i; break; done for i in $1/tarballs/*.$suffix; do echo $i; break; done
done | sort | head -1 done | sort | head -1
return return

View File

@ -1,22 +1,29 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook { stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gtk3, wrapGAppsHook
, glib, appstream-glib, gobjectIntrospection , glib, amtk, appstream-glib, gobjectIntrospection
, webkitgtk, gettext, itstool, gsettings-desktop-schemas }: , webkitgtk, gettext, itstool, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "devhelp-${version}"; name = "devhelp-${version}";
version = "3.28.1"; version = "3.30.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/devhelp/${gnome3.versionBranch version}/${name}.tar.xz"; url = "mirror://gnome/sources/devhelp/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "08a8xizjqz68k30zd37r7g516azhan9bbrjsvv10hjd5dg3f476s"; sha256 = "1rzilsn0v8dj86djankllc5f10d58f6rwg4w1fffh5zly10nlli5";
}; };
nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook appstream-glib gobjectIntrospection ]; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobjectIntrospection ];
buildInputs = [ buildInputs = [
glib gtk3 webkitgtk glib gtk3 webkitgtk amtk
gnome3.defaultIconTheme gsettings-desktop-schemas gnome3.defaultIconTheme gsettings-desktop-schemas
]; ];
doCheck = true;
postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file
patchShebangs meson_post_install.py
'';
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = "devhelp"; packageName = "devhelp";

View File

@ -3,13 +3,13 @@
stdenv.mkDerivation ( rec { stdenv.mkDerivation ( rec {
name = "ponyc-${version}"; name = "ponyc-${version}";
version = "0.24.2"; version = "0.24.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ponylang"; owner = "ponylang";
repo = "ponyc"; repo = "ponyc";
rev = version; rev = version;
sha256 = "0g32bccbbwad9894zv2wjimbp8bpcj4ldddfdm4p2n8vcw6vi5y3"; sha256 = "1p75h1ldi9iskqkwic5h426cwi45042p3agh9sdl6gld9s7lc9a6";
}; };
buildInputs = [ llvm makeWrapper which ]; buildInputs = [ llvm makeWrapper which ];

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "clojure-${version}"; name = "clojure-${version}";
version = "1.9.0.381"; version = "1.9.0.391";
src = fetchurl { src = fetchurl {
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "18aqfjm6vbhlflxdnpcr9gib00zg2ys5hck4kfxr9rc4aylnn9pi"; sha256 = "1720nbp891mhdjp37z1ns7rg8yapk3a7h1a1rkzhx7abngpwwjcz";
}; };
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];

View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl { stdenv, fetchurl
, pkgconfig, gnome3, dbus, xvfb_run }: , pkgconfig, gnome3, dbus, xvfb_run }:
let let
version = "4.99.1"; version = "5.0.0";
pname = "amtk"; pname = "amtk";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "00fhvw5y638z584s8cfdslh47ngfzcgx4f0b0456sw8p754j3f8d"; sha256 = "1zriix7bdwcg0868mfc7jy6zbwjwdmjwbh0ah6dbddrhiabrda8j";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -3,9 +3,10 @@
# use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib)
, utillinuxMinimal ? null , utillinuxMinimal ? null
# this is just for tests (not in closure of any regular package) # this is just for tests (not in the closure of any regular package)
, coreutils, dbus, libxml2, tzdata, desktop-file-utils , doCheck ? stdenv.config.doCheckByDefault or false
, shared-mime-info, doCheck ? false , coreutils, dbus, libxml2, tzdata
, desktop-file-utils, shared-mime-info
}: }:
with stdenv.lib; with stdenv.lib;
@ -66,8 +67,7 @@ stdenv.mkDerivation rec {
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
buildInputs = [ libelf setupHook pcre ] buildInputs = [ libelf setupHook pcre ]
++ optionals stdenv.isLinux [ utillinuxMinimal ] # for libmount ++ optionals stdenv.isLinux [ utillinuxMinimal ]; # for libmount
++ optionals doCheck [ tzdata libxml2 desktop-file-utils shared-mime-info ];
nativeBuildInputs = [ pkgconfig perl python gettext ]; nativeBuildInputs = [ pkgconfig perl python gettext ];
@ -114,7 +114,8 @@ stdenv.mkDerivation rec {
-i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c
''; '';
inherit doCheck; checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ];
preCheck = optionalString doCheck '' preCheck = optionalString doCheck ''
export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH"
export TZDIR="${tzdata}/share/zoneinfo" export TZDIR="${tzdata}/share/zoneinfo"
@ -139,6 +140,8 @@ stdenv.mkDerivation rec {
sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c
''; '';
inherit doCheck;
passthru = { passthru = {
gioModuleDir = "lib/gio/modules"; gioModuleDir = "lib/gio/modules";
inherit flattenInclude; inherit flattenInclude;

View File

@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
"tcp_open" "tcp_write_queue_order" "tcp_try_write" "tcp_writealot" "tcp_open" "tcp_write_queue_order" "tcp_try_write" "tcp_writealot"
"multiple_listen" "delayed_accept" "multiple_listen" "delayed_accept"
"shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack" "shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack"
"tty_pty"
]; ];
tdRegexp = lib.concatStringsSep "\\|" toDisable; tdRegexp = lib.concatStringsSep "\\|" toDisable;
in lib.optionalString doCheck '' in lib.optionalString doCheck ''

View File

@ -50,6 +50,12 @@ let
configurePhase = ":"; configurePhase = ":";
configureFlags = [
# NOTE: Patents expired on June 17 2018.
# For details see: https://www.phoronix.com/scan.php?page=news_item&px=OpenGL-Texture-Float-Freed
"texture-float"
];
makeFlags = "INSTALL_DIR=\${out} CC=cc CXX=c++"; makeFlags = "INSTALL_DIR=\${out} CC=cc CXX=c++";
enableParallelBuilding = true; enableParallelBuilding = true;

View File

@ -4,11 +4,7 @@
, llvmPackages, libffi, libomxil-bellagio, libva-minimal , llvmPackages, libffi, libomxil-bellagio, libva-minimal
, libelf, libvdpau, valgrind-light, python2 , libelf, libvdpau, valgrind-light, python2
, libglvnd , libglvnd
, grsecEnabled ? false
, enableRadv ? true , enableRadv ? true
# Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa.
# It's overridden for mesa_drivers.
, enableTextureFloats ? false
, galliumDrivers ? null , galliumDrivers ? null
, driDrivers ? null , driDrivers ? null
, vulkanDrivers ? null , vulkanDrivers ? null
@ -67,7 +63,7 @@ let
in in
let let
version = "18.1.4"; version = "18.1.5";
branch = head (splitString "." version); branch = head (splitString "." version);
in in
@ -81,7 +77,7 @@ let self = stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
]; ];
sha256 = "12zm9hc3v4wnzhqyrvf2kfnz55idzdn82hs3ry940l45bn5lhq9h"; sha256 = "69dbe6f1a6660386f5beb85d4fcf003ee23023ed7b9a603de84e9a37e8d98dea";
}; };
prePatch = "patchShebangs ."; prePatch = "patchShebangs .";
@ -90,7 +86,6 @@ let self = stdenv.mkDerivation {
# revive ./dricore-gallium.patch when it gets ported (from Ubuntu), as it saved # revive ./dricore-gallium.patch when it gets ported (from Ubuntu), as it saved
# ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog # ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog
patches = [ patches = [
./glx_ro_text_segm.patch # fix for grsecurity/PaX
./symlink-drivers.patch ./symlink-drivers.patch
./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl
]; ];
@ -115,8 +110,6 @@ let self = stdenv.mkDerivation {
("--with-vulkan-drivers=" + ("--with-vulkan-drivers=" +
builtins.concatStringsSep "," vulkanDrivers)) builtins.concatStringsSep "," vulkanDrivers))
++ [ ++ [
(enableFeature enableTextureFloats "texture-float")
(enableFeature grsecEnabled "glx-rts")
(enableFeature stdenv.isLinux "dri3") (enableFeature stdenv.isLinux "dri3")
(enableFeature stdenv.isLinux "nine") # Direct3D in Wine (enableFeature stdenv.isLinux "nine") # Direct3D in Wine
"--enable-libglvnd" "--enable-libglvnd"
@ -135,7 +128,6 @@ let self = stdenv.mkDerivation {
"--enable-xvmc" "--enable-xvmc"
"--enable-vdpau" "--enable-vdpau"
"--enable-shared-glapi" "--enable-shared-glapi"
"--enable-sysfs"
"--enable-llvm-shared-libs" "--enable-llvm-shared-libs"
"--enable-omx-bellagio" "--enable-omx-bellagio"
"--enable-va" "--enable-va"
@ -272,7 +264,7 @@ let self = stdenv.mkDerivation {
homepage = https://www.mesa3d.org/; homepage = https://www.mesa3d.org/;
license = licenses.mit; # X11 variant, in most files license = licenses.mit; # X11 variant, in most files
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ eduarrrd vcunat ]; maintainers = with maintainers; [ vcunat ];
}; };
}; };
in self in self

View File

@ -1,25 +0,0 @@
diff --git a/configure.ac b/configure.ac
index 5068913..3d4271e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -429,6 +429,20 @@ AC_SUBST([GLESv2_LIB_GLOB])
AC_SUBST([VG_LIB_GLOB])
AC_SUBST([GLAPI_LIB_GLOB])
+
+dnl readonly text segment on x86 hardened platforms
+AC_ARG_ENABLE([glx_rts],
+ [AS_HELP_STRING([--enable-glx-rts],
+ [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])],
+ [enable_glx_rts="$enableval"],
+ [enable_glx_rts=no])
+if test "x$enable_glx_rts" = xyes; then
+ DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT"
+else
+ enable_glx_rts=no
+fi
+
+
dnl
dnl Arch/platform-specific settings
dnl

View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl, fetchpatch { stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl
, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
, withData ? true, poppler_data , withData ? true, poppler_data
, qt5Support ? false, qtbase ? null , qt5Support ? false, qtbase ? null
@ -8,7 +8,7 @@
}: }:
let # beware: updates often break cups-filters build let # beware: updates often break cups-filters build
version = "0.66.0"; version = "0.67.0";
mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/poppler-${version}.tar.xz"; url = "${meta.homepage}/poppler-${version}.tar.xz";
sha256 = "1rzar5f27xzkjih07yi8kxcinvk4ny4nhimyacpvqx7vmlqn829c"; sha256 = "1yb6agmcxf0ixqm65d4aknl0hgmswf94x0k59ic0qqav1wd4yjm3";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -33,11 +33,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ninja pkgconfig ]; nativeBuildInputs = [ cmake ninja pkgconfig ];
patches = lib.optional stdenv.isDarwin (fetchpatch {
url = "https://cgit.freedesktop.org/poppler/poppler/patch/?id=267228bb071016621c80fc8514927905164aaeea";
sha256 = "0i2sbxz1mrsnj75qgqaadayjgs48ay2mhrbkij95djy6am44m54k";
});
# Not sure when and how to pass it. It seems an upstream bug anyway. # Not sure when and how to pass it. It seems an upstream bug anyway.
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";

View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl { stdenv, fetchurl
, amtk, gnome3, gtksourceview4, libuchardet, libxml2, pkgconfig }: , amtk, gnome3, gtksourceview4, libuchardet, libxml2, pkgconfig }:
let let
version = "4.1.1"; version = "4.2.0";
pname = "tepl"; pname = "tepl";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "13kflywpc6iyfpc9baaa54in5vzn4p7i3dh9pr2ival2nkxfnkp2"; sha256 = "1kcwcr72dv3xwi2ni579c9raa0cnbazfnmy6mgapzn6dir1d8fc8";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -14,17 +14,15 @@ assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null
with stdenv.lib; with stdenv.lib;
let stdenv.mkDerivation rec {
version = "3.0.3.1"; version = "3.0.4";
in
stdenv.mkDerivation {
name = "wxwidgets-${version}"; name = "wxwidgets-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wxWidgets"; owner = "wxWidgets";
repo = "wxWidgets"; repo = "wxWidgets";
rev = "v${version}"; rev = "v${version}";
sha256 = "1b90in65k1ij6kyk41knxs86i6hx5lkz30gpvzdvh0cbjagv5asq"; sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1";
}; };
buildInputs = buildInputs =
@ -44,11 +42,7 @@ stdenv.mkDerivation {
+ "fix_assertion_using_hide_in_destroy.diff"; + "fix_assertion_using_hide_in_destroy.diff";
sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy"; sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy";
}) })
# "Add support for WebKit2GTK+ in wxWebView". Will be in 3.0.4 ];
] ++ optional (!withGtk2) (fetchpatch {
url = "https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc893fb7516731ca9c71e0d0bbc5ae9ff7.patch";
sha256 = "0gxd83xajm7gdv9rdzyvqwa2p5nz29nr23i0zx2dgfpsvz2qjp3q";
});
configureFlags = configureFlags =
[ "--disable-precomp-headers" "--enable-mediactrl" [ "--disable-precomp-headers" "--enable-mediactrl"
@ -87,7 +81,7 @@ stdenv.mkDerivation {
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = {
platforms = with platforms; darwin ++ linux; platforms = with platforms; darwin ++ linux;
license = licenses.wxWindows; license = licenses.wxWindows;

View File

@ -40,6 +40,7 @@ let
FileSlurp FileSlurp
IOCompress IOCompress
IPCRun IPCRun
JSON
JSONAny JSONAny
JSONXS JSONXS
LWP LWP

View File

@ -18,6 +18,7 @@ appleDerivation {
cp runtime/OldClasses.subproj/List.h $out/include/objc/List.h cp runtime/OldClasses.subproj/List.h $out/include/objc/List.h
cp runtime/NSObjCRuntime.h $out/include/objc/NSObjCRuntime.h cp runtime/NSObjCRuntime.h $out/include/objc/NSObjCRuntime.h
cp runtime/NSObject.h $out/include/objc/NSObject.h cp runtime/NSObject.h $out/include/objc/NSObject.h
cp runtime/Object.h $out/include/objc/Object.h
cp runtime/Protocol.h $out/include/objc/Protocol.h cp runtime/Protocol.h $out/include/objc/Protocol.h
cp runtime/hashtable.h $out/include/objc/hashtable.h cp runtime/hashtable.h $out/include/objc/hashtable.h
cp runtime/hashtable2.h $out/include/objc/hashtable2.h cp runtime/hashtable2.h $out/include/objc/hashtable2.h

View File

@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
description = "Pretty small HTTP server - a command-line tool to share files"; description = "Pretty small HTTP server - a command-line tool to share files";
homepage = https://github.com/mgorny/pshs; homepage = https://github.com/mgorny/pshs;
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.eduarrrd ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
}; };
} }

View File

@ -1,13 +0,0 @@
diff --git a/configure.ac b/configure.ac
index 3c71472..71b5c3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -620,6 +620,8 @@ AC_ARG_WITH([caps],
if test "x${with_caps}" != "xno"; then
AC_SEARCH_LIBS([cap_init], [cap], [], [])
+ AS_IF([test "x${with_caps}" != "xyes" -a "x${with_caps}" != "x"],
+ LIBS="-L${with_caps}/lib $LIBS")
# Only give an error on hosts that we know could support capabilities
AC_CHECK_HEADERS([sys/capability.h], [], [

View File

@ -1,9 +1,9 @@
{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook { lib, stdenv, fetchurl, pkgconfig, intltool, autoreconfHook
, libsndfile, libtool , libsndfile, libtool, makeWrapper
, xorg, libcap, alsaLib, glib , xorg, libcap, alsaLib, glib, gnome3
, avahi, libjack2, libasyncns, lirc, dbus , avahi, libjack2, libasyncns, lirc, dbus
, sbc, bluez5, udev, openssl, fftwFloat , sbc, bluez5, udev, openssl, fftwFloat
, speexdsp, systemd, webrtc-audio-processing, gconf ? null , speexdsp, systemd, webrtc-audio-processing
, x11Support ? false , x11Support ? false
@ -17,8 +17,6 @@
, airtunesSupport ? false , airtunesSupport ? false
, gconfSupport ? false
, bluetoothSupport ? false , bluetoothSupport ? false
, remoteControlSupport ? false , remoteControlSupport ? false
@ -33,27 +31,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; name = "${if libOnly then "lib" else ""}pulseaudio-${version}";
version = "11.1"; version = "12.2";
src = fetchurl { src = fetchurl {
url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz"; url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz";
sha256 = "17ndr6kc7hpv4ih4gygwlcpviqifbkvnk4fbwf4n25kpb991qlpj"; sha256 = "0ma0p8iry7fil7qb4pm2nx2pm65kq9hk9xc4r5wkf14nqbzni5l0";
}; };
patches = [ ./caps-fix.patch (fetchpatch {
name = "glibc-2.27.patch";
url = "https://cgit.freedesktop.org/pulseaudio/pulseaudio/patch/?id=dfb0460fb4743aec047cdf755a660a9ac2d0f3fb";
sha256 = "1bi6rbfdjyl6wn0jql4k18xa4hm5l2lpf1sc5j77f8l6jw956afv";
}) ]
++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
name = "padsp-fix.patch";
url = "https://git.alpinelinux.org/cgit/aports/plain/testing/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch?id=167be02bf4618a90328e2b234f6a63a5dc05f244";
sha256 = "0gf4w25zi123ghk0njapysvrlljkc3hyanacgiswfnnm1i8sab1q";
});
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig intltool autoreconfHook ]; nativeBuildInputs = [ pkgconfig intltool autoreconfHook makeWrapper ];
propagatedBuildInputs = propagatedBuildInputs =
lib.optionals stdenv.isLinux [ libcap ]; lib.optionals stdenv.isLinux [ libcap ];
@ -69,7 +56,6 @@ stdenv.mkDerivation rec {
++ lib.optional useSystemd systemd ++ lib.optional useSystemd systemd
++ lib.optionals stdenv.isLinux [ alsaLib udev ] ++ lib.optionals stdenv.isLinux [ alsaLib udev ]
++ lib.optional airtunesSupport openssl ++ lib.optional airtunesSupport openssl
++ lib.optional gconfSupport gconf
++ lib.optionals bluetoothSupport [ bluez5 sbc ] ++ lib.optionals bluetoothSupport [ bluez5 sbc ]
++ lib.optional remoteControlSupport lirc ++ lib.optional remoteControlSupport lirc
++ lib.optional zeroconfSupport avahi ++ lib.optional zeroconfSupport avahi
@ -125,6 +111,12 @@ stdenv.mkDerivation rec {
'' ''
+ ''moveToOutput lib/cmake "$dev" ''; + ''moveToOutput lib/cmake "$dev" '';
preFixup = lib.optionalString stdenv.isLinux ''
wrapProgram $out/libexec/pulse/gsettings-helper \
--prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${name}" \
--prefix GIO_EXTRA_MODULES : "${lib.getLib gnome3.dconf}/lib/gio/modules"
'';
meta = { meta = {
description = "Sound server for POSIX and Win32 systems"; description = "Sound server for POSIX and Win32 systems";
homepage = http://www.pulseaudio.org/; homepage = http://www.pulseaudio.org/;

View File

@ -801,11 +801,11 @@ _defaultUnpack() {
else else
case "$fn" in case "$fn" in
*.tar.xz | *.tar.lzma) *.tar.xz | *.tar.lzma | *.txz)
# Don't rely on tar knowing about .xz. # Don't rely on tar knowing about .xz.
xz -d < "$fn" | tar xf - xz -d < "$fn" | tar xf -
;; ;;
*.tar | *.tar.* | *.tgz | *.tbz2) *.tar | *.tar.* | *.tgz | *.tbz2 | *.tbz)
# GNU tar can automatically select the decompression method # GNU tar can automatically select the decompression method
# (info "(tar) gzip"). # (info "(tar) gzip").
tar xf "$fn" tar xf "$fn"

View File

@ -9553,12 +9553,16 @@ with pkgs;
gtkmathview = callPackage ../development/libraries/gtkmathview { }; gtkmathview = callPackage ../development/libraries/gtkmathview { };
glib = callPackage ../development/libraries/glib { glib = callPackage ../development/libraries/glib (let
}; glib-untested = glib.override { doCheck = false; };
glib-tested = glib.override { # checked version separate to break cycles in {
doCheck = true; # break dependency cycles
libffi = libffi.override { doCheck = true; }; # these things are only used for tests, they don't get into the closure
}; shared-mime-info = shared-mime-info.override { glib = glib-untested; };
desktop-file-utils = desktop-file-utils.override { glib = glib-untested; };
dbus = dbus.override { systemd = null; };
});
glibmm = callPackage ../development/libraries/glibmm { }; glibmm = callPackage ../development/libraries/glibmm { };
glib-networking = callPackage ../development/libraries/glib-networking {}; glib-networking = callPackage ../development/libraries/glib-networking {};
@ -10988,19 +10992,16 @@ with pkgs;
libGLDarwinOr = alternative: if stdenv.isDarwin then libGLDarwin else alternative; libGLDarwinOr = alternative: if stdenv.isDarwin then libGLDarwin else alternative;
mesa_noglu = callPackage ../development/libraries/mesa { mesa_noglu = callPackage ../development/libraries/mesa {
# makes it slower, but during runtime we link against just mesa_drivers
# through /run/opengl-driver*, which is overriden according to config.grsecurity
# grsecEnabled = true; # no more support in nixpkgs ATM
llvmPackages = llvmPackages_6; llvmPackages = llvmPackages_6;
}; };
mesa_glu = callPackage ../development/libraries/mesa-glu { }; mesa_glu = callPackage ../development/libraries/mesa-glu { };
mesa_drivers =
let mo = mesa_noglu.override { # NOTE: 2018-07-12: legacy alias:
grsecEnabled = config.grsecurity or false; # gcsecurity bussiness is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/
enableTextureFloats = true; # floating point textures patents are expired,
}; # so package reduced to alias
in mo.drivers; mesa_drivers = mesa_noglu;
## End libGL/libGLU/Mesa stuff ## End libGL/libGLU/Mesa stuff
@ -12960,11 +12961,9 @@ with pkgs;
}; };
pulseaudioFull = pulseaudio.override { pulseaudioFull = pulseaudio.override {
gconf = gnome2.GConf;
x11Support = true; x11Support = true;
jackaudioSupport = true; jackaudioSupport = true;
airtunesSupport = true; airtunesSupport = true;
gconfSupport = true;
bluetoothSupport = true; bluetoothSupport = true;
remoteControlSupport = true; remoteControlSupport = true;
zeroconfSupport = true; zeroconfSupport = true;
@ -15473,6 +15472,8 @@ with pkgs;
inherit (pythonPackages) pyserial pygtk; inherit (pythonPackages) pyserial pygtk;
}; };
browsh = callPackage ../applications/networking/browsers/browsh { };
chromium = callPackage ../applications/networking/browsers/chromium { chromium = callPackage ../applications/networking/browsers/chromium {
channel = "stable"; channel = "stable";
pulseSupport = config.pulseaudio or true; pulseSupport = config.pulseaudio or true;
@ -17711,9 +17712,7 @@ with pkgs;
panotools = callPackage ../applications/graphics/panotools { }; panotools = callPackage ../applications/graphics/panotools { };
paprefs = callPackage ../applications/audio/paprefs { paprefs = callPackage ../applications/audio/paprefs { };
inherit (gnome2) libglademm gconfmm GConf;
};
pavucontrol = callPackage ../applications/audio/pavucontrol { }; pavucontrol = callPackage ../applications/audio/pavucontrol { };

View File

@ -490,16 +490,16 @@ let self = _self // overrides; _self = with self; {
}; };
ArchiveTarWrapper = buildPerlPackage rec { ArchiveTarWrapper = buildPerlPackage rec {
name = "Archive-Tar-Wrapper-0.31"; name = "Archive-Tar-Wrapper-0.33";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.31.tar.gz; url = mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.33.tar.gz;
sha256 = "18rvqzy7m900ikq7r4hxpja21wcsh3z6rz7qhs4ksgc0dpdqb9qd"; sha256 = "0z6ngvgl4w4nihvmwkg77gmi5h7a695b83dpyybxhx4j3bj1izca";
}; };
propagatedBuildInputs = [ FileWhich IPCRun LogLog4perl ]; propagatedBuildInputs = [ FileWhich IPCRun LogLog4perl ];
meta = { meta = {
description = "API wrapper around the 'tar' utility"; description = "API wrapper around the 'tar' utility";
}; };
buildInputs = [ TestSimple13 ]; buildInputs = [ Dumbbench TestSimple13 ];
}; };
ArchiveZip = buildPerlPackage { ArchiveZip = buildPerlPackage {
@ -518,10 +518,10 @@ let self = _self // overrides; _self = with self; {
ArchiveZip_1_53 = ArchiveZip; ArchiveZip_1_53 = ArchiveZip;
AudioScan = buildPerlPackage rec { AudioScan = buildPerlPackage rec {
name = "Audio-Scan-1.00"; name = "Audio-Scan-1.01";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz"; url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/${name}.tar.gz";
sha256 = "00aj95mv5dsyi0cnmd8b6i6hvvw1xiczgkmc5mv775p385q3pcfm"; sha256 = "0jk3djnk6yf0jsjh8qk3mj8bkx4avp6i4czcpr5xrbf7f41744l3";
}; };
buildInputs = [ pkgs.zlib TestWarn ]; buildInputs = [ pkgs.zlib TestWarn ];
NIX_CFLAGS_COMPILE = "-I${pkgs.zlib.dev}/include"; NIX_CFLAGS_COMPILE = "-I${pkgs.zlib.dev}/include";
@ -572,10 +572,10 @@ let self = _self // overrides; _self = with self; {
}; };
AuthenRadius = buildPerlPackage rec { AuthenRadius = buildPerlPackage rec {
name = "Authen-Radius-0.26"; name = "Authen-Radius-0.27";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.26.tar.gz; url = mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.27.tar.gz;
sha256 = "4f272c19b8a9f6514a1107e98efae6773208233df4db11f2dc4764b4784b17c3"; sha256 = "e5a3052fe46dc38424c1947da92e623e8996216f97bd7be72221eb6c5f7c09f8";
}; };
buildInputs = [ TestNoWarnings ]; buildInputs = [ TestNoWarnings ];
propagatedBuildInputs = [ DataHexDump NetIP ]; propagatedBuildInputs = [ DataHexDump NetIP ];
@ -878,10 +878,10 @@ let self = _self // overrides; _self = with self; {
}; };
BusinessISMN = buildPerlPackage rec { BusinessISMN = buildPerlPackage rec {
name = "Business-ISMN-1.131"; name = "Business-ISMN-1.132";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz"; url = "mirror://cpan/authors/id/B/BD/BDFOY/${name}.tar.gz";
sha256 = "1xyc7x4c4xl930rz7grs1l52f1vg4rbiv0c6xlxdsim8qsh7k94g"; sha256 = "009dbkjx1s918qn6hm5qmc0rlqagiazhwg3m7rrfci7mw80hyb6g";
}; };
propagatedBuildInputs = [ TieCycle ]; propagatedBuildInputs = [ TieCycle ];
meta = { meta = {
@ -2838,10 +2838,10 @@ let self = _self // overrides; _self = with self; {
}; };
CPANPerlReleases = buildPerlPackage rec { CPANPerlReleases = buildPerlPackage rec {
name = "CPAN-Perl-Releases-3.68"; name = "CPAN-Perl-Releases-3.70";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz"; url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz";
sha256 = "00d97zlg0npa8sr9d8lzj2zqwx7vkq6cypccdm2g669ls5h82shs"; sha256 = "1yv9gq3rzhccskmpd9nn2n8v8zc6r9rlq5x47l0yva29yfgqb16r";
}; };
meta = { meta = {
homepage = https://github.com/bingos/cpan-perl-releases; homepage = https://github.com/bingos/cpan-perl-releases;
@ -4859,6 +4859,20 @@ let self = _self // overrides; _self = with self; {
}; };
}; };
Dumbbench = buildPerlPackage {
name = "Dumbbench-0.111";
src = fetchurl {
url = mirror://cpan/authors/id/B/BD/BDFOY/Dumbbench-0.111.tar.gz;
sha256 = "1ixjb9y9d0k1vd4mzbi4sgvr99ay4z9jkgychf0r5gbjsskkq7fk";
};
propagatedBuildInputs = [ CaptureTiny ClassXSAccessor DevelCheckOS NumberWithError StatisticsCaseResampling ];
meta = {
description = "More reliable benchmarking with the least amount of thinking";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
homepage = "https://github.com/briandfoy/dumbbench";
};
};
EmailAbstract = buildPerlPackage rec { EmailAbstract = buildPerlPackage rec {
name = "Email-Abstract-3.008"; name = "Email-Abstract-3.008";
src = fetchurl { src = fetchurl {
@ -5341,10 +5355,10 @@ let self = _self // overrides; _self = with self; {
}; };
ExporterTiny = buildPerlPackage { ExporterTiny = buildPerlPackage {
name = "Exporter-Tiny-1.000000"; name = "Exporter-Tiny-1.002001";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.000000.tar.gz; url = mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002001.tar.gz;
sha256 = "ffdd77d57de099e8f64dd942ef12a00a3f4313c2531f342339eeed2d366ad078"; sha256 = "a82c334c02ce4b0f9ea77c67bf77738f76a9b8aa4bae5c7209d1c76453d3c48d";
}; };
meta = { meta = {
description = "An exporter with the features of Sub::Exporter but only core dependencies"; description = "An exporter with the features of Sub::Exporter but only core dependencies";
@ -5602,17 +5616,18 @@ let self = _self // overrides; _self = with self; {
}; };
}; };
FCGIClient = buildPerlPackage rec { FCGIClient = buildPerlModule rec {
name = "FCGI-Client-0.08"; name = "FCGI-Client-0.09";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/T/TO/TOKUHIROM/FCGI-Client-0.08.tar.gz; url = mirror://cpan/authors/id/T/TO/TOKUHIROM/FCGI-Client-0.09.tar.gz;
sha256 = "1rvhfnyhib1aslr06x8s0yfykaf44j5glj0rxz9ani7z6l0p2vqa"; sha256 = "1s11casbv0jmkcl5dk8i2vhfy1nc8rg43d3bg923zassrq4wndym";
}; };
propagatedBuildInputs = [ AnyMoose ]; propagatedBuildInputs = [ Moo TypeTiny ];
meta = { meta = {
description = "client library for fastcgi protocol"; description = "client library for fastcgi protocol";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
}; };
buildInputs = [ ModuleBuildTiny ];
}; };
FCGIProcManager = buildPerlPackage { FCGIProcManager = buildPerlPackage {
@ -5824,12 +5839,12 @@ let self = _self // overrides; _self = with self; {
}; };
FileHandleUnget = buildPerlPackage rec { FileHandleUnget = buildPerlPackage rec {
name = "FileHandle-Unget-0.1629"; name = "FileHandle-Unget-0.1634";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz"; url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz";
sha256 = "65925ec334d239c79f4a446716fb0816acb010de495ffd6b23d677f5bcc54362"; sha256 = "380f34ad3ce5e9ec661d4c468bb3392231c162317d4172df378146b42aab1785";
}; };
buildInputs = [ FileSlurp TestCompile UNIVERSALrequire URI ]; buildInputs = [ FileSlurper TestCompile UNIVERSALrequire URI ];
meta = { meta = {
homepage = https://github.com/coppit/filehandle-unget/; homepage = https://github.com/coppit/filehandle-unget/;
description = "FileHandle which supports multi-byte unget"; description = "FileHandle which supports multi-byte unget";
@ -6129,6 +6144,19 @@ let self = _self // overrides; _self = with self; {
}; };
}; };
FileTemp = buildPerlPackage {
name = "File-Temp-0.2308";
src = fetchurl {
url = mirror://cpan/authors/id/E/ET/ETHER/File-Temp-0.2308.tar.gz;
sha256 = "1m6iz26znn85r7pnnwlqsda0x5mm2c8qcz5ickl945dbw8icp88w";
};
meta = {
description = "return name and handle of a temporary file safely";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
homepage = "https://github.com/Perl-Toolchain-Gang/File-Temp";
};
};
FileTouch = buildPerlPackage rec { FileTouch = buildPerlPackage rec {
name = "File-Touch-0.11"; name = "File-Touch-0.11";
src = fetchurl { src = fetchurl {
@ -6610,12 +6638,12 @@ let self = _self // overrides; _self = with self; {
}; };
grepmail = buildPerlPackage rec { grepmail = buildPerlPackage rec {
name = "grepmail-5.3105"; name = "grepmail-5.3111";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz"; url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz";
sha256 = "c74fb7a0cd4549d98c78395c2485b00788ca655109358ca0ec550ea71588a5d4"; sha256 = "d0984e3f7a1be17ae014575f70c1678151a5bcc9622185dc5a052cb63271a761";
}; };
buildInputs = [ FileSlurp TestCompile URI ]; buildInputs = [ FileHomeDir FileSlurper TestCompile UNIVERSALrequire URI ];
propagatedBuildInputs = [ MailMboxMessageParser TimeDate ]; propagatedBuildInputs = [ MailMboxMessageParser TimeDate ];
outputs = [ "out" ]; outputs = [ "out" ];
meta = { meta = {
@ -7688,6 +7716,18 @@ let self = _self // overrides; _self = with self; {
}; };
}; };
IOSessionData = buildPerlPackage {
name = "IO-SessionData-1.03";
src = fetchurl {
url = mirror://cpan/authors/id/P/PH/PHRED/IO-SessionData-1.03.tar.gz;
sha256 = "1p9d77pqy9a8dbgw7h7vmmkg0rlckk19dchd4c8gvcyv7qm73934";
};
outputs = [ "out" "dev" ]; # no "devdoc"
meta = {
description = "supporting module for SOAP::Lite";
};
};
IOSocketIP = buildPerlModule { IOSocketIP = buildPerlModule {
name = "IO-Socket-IP-0.39"; name = "IO-Socket-IP-0.39";
src = fetchurl { src = fetchurl {
@ -7711,10 +7751,10 @@ let self = _self // overrides; _self = with self; {
}; };
IOSocketSSL = buildPerlPackage rec { IOSocketSSL = buildPerlPackage rec {
name = "IO-Socket-SSL-2.056"; name = "IO-Socket-SSL-2.058";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/S/SU/SULLR/${name}.tar.gz"; url = "mirror://cpan/authors/id/S/SU/SULLR/${name}.tar.gz";
sha256 = "91451ecc28b243a78b438f0a42db24c4b60a86f088879b38e40bdbd697818259"; sha256 = "746cd17c292cfc206b394497a060b0582d0b06a1040e6bb27e6530d56786e40b";
}; };
propagatedBuildInputs = [ NetSSLeay ]; propagatedBuildInputs = [ NetSSLeay ];
# Fix path to default certificate store. # Fix path to default certificate store.
@ -8689,10 +8729,10 @@ let self = _self // overrides; _self = with self; {
}; };
LogAny = buildPerlPackage rec { LogAny = buildPerlPackage rec {
name = "Log-Any-1.705"; name = "Log-Any-1.706";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/P/PR/PREACTION/${name}.tar.gz"; url = "mirror://cpan/authors/id/P/PR/PREACTION/${name}.tar.gz";
sha256 = "85c7c5189a8bfc2ffb6f879b4cd04dd77f94bc5abc3800b4330f42f43fb9a696"; sha256 = "3ed0e5a4b7d490ab00624b7f905421239261f1dc976192aad2c0d1509bec08be";
}; };
# Syslog test fails. # Syslog test fails.
preCheck = "rm t/syslog.t"; preCheck = "rm t/syslog.t";
@ -8853,10 +8893,10 @@ let self = _self // overrides; _self = with self; {
}; };
LWP = buildPerlPackage rec { LWP = buildPerlPackage rec {
name = "libwww-perl-6.34"; name = "libwww-perl-6.35";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/E/ET/ETHER/libwww-perl-6.34.tar.gz; url = mirror://cpan/authors/id/E/ET/ETHER/libwww-perl-6.35.tar.gz;
sha256 = "260363fd4204c0ddf7cd76f7b70e22beb3b5186e4c346f250a59288b52dc114c"; sha256 = "dda2578d7b32152c4afce834761a61d117de286c705a9f7972c7ac6032ca5953";
}; };
propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]; propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -8864,7 +8904,7 @@ let self = _self // overrides; _self = with self; {
license = with licenses; [ artistic1 gpl1Plus ]; license = with licenses; [ artistic1 gpl1Plus ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
buildInputs = [ TestFatal TestRequiresInternet ]; buildInputs = [ TestFatal TestNeeds TestRequiresInternet ];
}; };
LWPAuthenOAuth = buildPerlPackage rec { LWPAuthenOAuth = buildPerlPackage rec {
@ -9018,12 +9058,12 @@ let self = _self // overrides; _self = with self; {
}; };
MailMboxMessageParser = buildPerlPackage rec { MailMboxMessageParser = buildPerlPackage rec {
name = "Mail-Mbox-MessageParser-1.5106"; name = "Mail-Mbox-MessageParser-1.5111";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz"; url = "mirror://cpan/authors/id/D/DC/DCOPPIT/${name}.tar.gz";
sha256 = "d65fc8e8ce84273abbc14220d15813d93ddf6c7a256cdc24de156cb6c08923be"; sha256 = "5723c0aa9cc10bab9ed1e3bfd9d5c95f7159e71c1a475414eb1af1dee3a46237";
}; };
buildInputs = [ FileSlurp TestCompile TextDiff URI ]; buildInputs = [ FileSlurper TestCompile TestPod TestPodCoverage TextDiff UNIVERSALrequire URI ];
propagatedBuildInputs = [ FileHandleUnget ]; propagatedBuildInputs = [ FileHandleUnget ];
meta = { meta = {
homepage = https://github.com/coppit/mail-mbox-messageparser; homepage = https://github.com/coppit/mail-mbox-messageparser;
@ -9634,10 +9674,10 @@ let self = _self // overrides; _self = with self; {
}; };
ModuleCoreList = buildPerlPackage { ModuleCoreList = buildPerlPackage {
name = "Module-CoreList-5.20180626"; name = "Module-CoreList-5.20180720";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180626.tar.gz; url = mirror://cpan/authors/id/B/BI/BINGOS/Module-CoreList-5.20180720.tar.gz;
sha256 = "1x9r0s4rlqziccb05p4k3aljx242ssx1abw5yl5ixn2c0g9ykll1"; sha256 = "0l6dyj4m4qgv2yzq3pp0bkvg1j9nh9mcm1p4x3g3j93gkba7whws";
}; };
meta = { meta = {
homepage = http://dev.perl.org/; homepage = http://dev.perl.org/;
@ -9936,10 +9976,10 @@ let self = _self // overrides; _self = with self; {
}; };
}; };
Mojolicious = buildPerlPackage rec { Mojolicious = buildPerlPackage rec {
name = "Mojolicious-7.87"; name = "Mojolicious-7.88";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz";
sha256 = "898a24a4344eaafe97cf0b8da2fbc89e0e21cc328f5e5a39a44774f8144989b1"; sha256 = "4c4c9c05131fcd175cd6370e15d2586baec1a3ec882cb6971e1f5f52b5e0d785";
}; };
meta = { meta = {
homepage = https://mojolicious.org/; homepage = https://mojolicious.org/;
@ -11018,13 +11058,13 @@ let self = _self // overrides; _self = with self; {
}; };
NetAmazonS3 = buildPerlPackage rec { NetAmazonS3 = buildPerlPackage rec {
name = "Net-Amazon-S3-0.80"; name = "Net-Amazon-S3-0.84";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/R/RC/RCONOVER/${name}.tar.gz"; url = mirror://cpan/authors/id/L/LL/LLAP/Net-Amazon-S3-0.84.tar.gz;
sha256 = "efb73dd9a96078742cb8564f7b58f5abe5168277342c7634961d63b4ef278848"; sha256 = "9e995f7d7982d4ab3510bf30e842426b341be20e4b7e6fe48edafeb067f49626";
}; };
buildInputs = [ TestException ]; buildInputs = [ TestDeep TestException ];
propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RegexpCommon TermEncoding TermProgressBarSimple VMEC2SecurityCredentialCache XMLLibXML ]; propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule LWPUserAgentDetermined MIMETypes MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions RefUtil RegexpCommon TermEncoding TermProgressBarSimple XMLLibXML ];
meta = { meta = {
description = "Use the Amazon S3 - Simple Storage Service"; description = "Use the Amazon S3 - Simple Storage Service";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@ -11122,12 +11162,12 @@ let self = _self // overrides; _self = with self; {
}; };
NetDNS = buildPerlPackage rec { NetDNS = buildPerlPackage rec {
name = "Net-DNS-1.15"; name = "Net-DNS-1.16";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/N/NL/NLNETLABS/${name}.tar.gz"; url = "mirror://cpan/authors/id/N/NL/NLNETLABS/${name}.tar.gz";
sha256 = "1ad46ba6438b846a94b4f50d53ecfda55f504a17e11b94effb087ff9329e61d0"; sha256 = "8163eebaf46d1a870b6f596684f345da7c3a7461d7dba2b85f23e02d8982ea37";
}; };
propagatedBuildInputs = [ DigestHMAC ]; propagatedBuildInputs = [ DigestHMAC IOSocketIP ];
makeMakerFlags = "--noonline-tests"; makeMakerFlags = "--noonline-tests";
meta = { meta = {
description = "Perl Interface to the Domain Name System"; description = "Perl Interface to the Domain Name System";
@ -11430,6 +11470,20 @@ let self = _self // overrides; _self = with self; {
}; };
}; };
NumberWithError = buildPerlPackage {
name = "Number-WithError-1.01";
src = fetchurl {
url = mirror://cpan/authors/id/S/SM/SMUELLER/Number-WithError-1.01.tar.gz;
sha256 = "0m7my372rcj2d3j8xvhqdlhnnvxqabasvpvvhdkyli3qgrra1xnz";
};
propagatedBuildInputs = [ ParamsUtil prefork ];
buildInputs = [ TestLectroTest ];
meta = {
description = "Numbers with error propagation and scientific rounding";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
};
NTLM = buildPerlPackage rec { NTLM = buildPerlPackage rec {
name = "NTLM-1.09"; name = "NTLM-1.09";
src = fetchurl { src = fetchurl {
@ -11658,10 +11712,10 @@ let self = _self // overrides; _self = with self; {
}; };
ParallelForkManager = buildPerlPackage rec { ParallelForkManager = buildPerlPackage rec {
name = "Parallel-ForkManager-1.19"; name = "Parallel-ForkManager-1.20";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/Y/YA/YANICK/${name}.tar.gz"; url = "mirror://cpan/authors/id/Y/YA/YANICK/${name}.tar.gz";
sha256 = "f1de2e9875eeb77d65f80338905dedd522f3913822502982f805aa71cde5a472"; sha256 = "7cc4c1c3b0e676b61ffa90f82f4128e8057327449ca86a9beb2f39217023f289";
}; };
buildInputs = [ TestWarn ]; buildInputs = [ TestWarn ];
meta = { meta = {
@ -11781,10 +11835,10 @@ let self = _self // overrides; _self = with self; {
}; };
Parent = buildPerlPackage { Parent = buildPerlPackage {
name = "parent-0.236"; name = "parent-0.237";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/C/CO/CORION/parent-0.236.tar.gz; url = mirror://cpan/authors/id/C/CO/CORION/parent-0.237.tar.gz;
sha256 = "0yhjps1fprifhvzdwwl09bp1ngyqx85rvyn96j34papn0jypx0rd"; sha256 = "1bnaadzf51g6zrpq6pvvgds2cc9d4w1vck7sapkd3hb5hmjdk28h";
}; };
}; };
@ -11874,10 +11928,10 @@ let self = _self // overrides; _self = with self; {
}; };
PathTiny = buildPerlPackage { PathTiny = buildPerlPackage {
name = "Path-Tiny-0.104"; name = "Path-Tiny-0.106";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.104.tar.gz; url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.106.tar.gz;
sha256 = "c69f1dcfeb4aa004086deb9bc14c7d79f45798b947f1efbd634a3442e267aaef"; sha256 = "308e39087b626013569a15783b896d61916fd1e67d06017f40cff567af36464d";
}; };
meta = { meta = {
description = "File path utility"; description = "File path utility";
@ -12427,10 +12481,10 @@ let self = _self // overrides; _self = with self; {
}; };
PPIxQuoteLike = buildPerlModule rec { PPIxQuoteLike = buildPerlModule rec {
name = "PPIx-QuoteLike-0.005"; name = "PPIx-QuoteLike-0.006";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.005.tar.gz; url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.006.tar.gz;
sha256 = "13jvbjiqpm52kknjryzk3v4rnq70rzmx7w1bny9v5m5j6g029a4s"; sha256 = "1gyp3ywnhpv7k3cqdgywpinz7wgqzg38iailcnyiwgl62wib0bsq";
}; };
propagatedBuildInputs = [ PPI ]; propagatedBuildInputs = [ PPI ];
meta = { meta = {
@ -12440,10 +12494,10 @@ let self = _self // overrides; _self = with self; {
}; };
PPIxRegexp = buildPerlModule rec { PPIxRegexp = buildPerlModule rec {
name = "PPIx-Regexp-0.060"; name = "PPIx-Regexp-0.061";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/W/WY/WYANT/${name}.tar.gz"; url = "mirror://cpan/authors/id/W/WY/WYANT/${name}.tar.gz";
sha256 = "885e172bbfde54c240bdfd6013fc6e1b76bdd19c211901d2128f3873938ff377"; sha256 = "e2d63a4102024e15994c685672d30c6d708272a1600abcd6241e6f2c1b3b7c92";
}; };
propagatedBuildInputs = [ PPI ]; propagatedBuildInputs = [ PPI ];
meta = { meta = {
@ -12783,6 +12837,18 @@ let self = _self // overrides; _self = with self; {
}; };
}; };
prefork = buildPerlPackage {
name = "prefork-1.04";
src = fetchurl {
url = mirror://cpan/authors/id/A/AD/ADAMK/prefork-1.04.tar.gz;
sha256 = "1xzxx9wgrrfl1ys05yglp2q3bwscvdzlnsiybqk8drbvwlzj5kz3";
};
meta = {
description = "Optimized module loading for forking or non-forking processes";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
};
PodPerldoc = buildPerlPackage rec { PodPerldoc = buildPerlPackage rec {
name = "Pod-Perldoc-3.28"; name = "Pod-Perldoc-3.28";
src = fetchurl { src = fetchurl {
@ -12997,6 +13063,18 @@ let self = _self // overrides; _self = with self; {
}; };
}; };
RefUtil = buildPerlPackage {
name = "Ref-Util-0.204";
src = fetchurl {
url = mirror://cpan/authors/id/A/AR/ARC/Ref-Util-0.204.tar.gz;
sha256 = "1q85y5lzgl8wz5qnz3j6mch2fmllr668h54wszaz6i6gp8ysfps1";
};
meta = {
description = "Utility functions for checking references";
license = with stdenv.lib.licenses; [ mit ];
};
};
RegexpAssemble = buildPerlPackage rec { RegexpAssemble = buildPerlPackage rec {
name = "Regexp-Assemble-0.38"; name = "Regexp-Assemble-0.38";
src = fetchurl { src = fetchurl {
@ -13372,18 +13450,19 @@ let self = _self // overrides; _self = with self; {
}; };
SOAPLite = buildPerlPackage { SOAPLite = buildPerlPackage {
name = "SOAP-Lite-1.11"; name = "SOAP-Lite-1.27";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.11.tar.gz; url = mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.27.tar.gz;
sha256 = "1zhy06v72r95ih3lx5rlx0bvkq214ndmcmn97m5k2rkxxy4ybpp4"; sha256 = "00fkvmnxiy5mr45rj5qmxmflw0xdkw2gihm48iha2i8smdmi0ng3";
}; };
propagatedBuildInputs = [ ClassInspector HTTPDaemon LWP TaskWeaken URI XMLParser ]; propagatedBuildInputs = [ ClassInspector IOSessionData LWPProtocolHttps TaskWeaken XMLParser ];
meta = { meta = {
description = "Perl's Web Services Toolkit"; description = "Perl's Web Services Toolkit";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
}; };
buildInputs = [ TestWarn XMLParserLite ];
}; };
Socket = buildPerlPackage { Socket = buildPerlPackage {
@ -13532,10 +13611,10 @@ let self = _self // overrides; _self = with self; {
}; };
SQLAbstract = buildPerlPackage rec { SQLAbstract = buildPerlPackage rec {
name = "SQL-Abstract-1.85"; name = "SQL-Abstract-1.86";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz";
sha256 = "9f44afe031a0cc63a6ccabaa46ba7ec58ef4db940559cee7fbc2dfbbf37bccab"; sha256 = "e7a7f7da5e6fa42f495860e92e9138b8a0964ca7674c95bd6ff1b1ce21aa8cdf";
}; };
buildInputs = [ TestDeep TestException TestWarn ]; buildInputs = [ TestDeep TestException TestWarn ];
propagatedBuildInputs = [ HashMerge MROCompat Moo ]; propagatedBuildInputs = [ HashMerge MROCompat Moo ];
@ -13658,11 +13737,22 @@ let self = _self // overrides; _self = with self; {
}; };
}; };
StatisticsDescriptive = buildPerlModule { StatisticsCaseResampling = buildPerlPackage {
name = "Statistics-Descriptive-3.0613"; name = "Statistics-CaseResampling-0.15";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0613.tar.gz; url = mirror://cpan/authors/id/S/SM/SMUELLER/Statistics-CaseResampling-0.15.tar.gz;
sha256 = "ee053899c06bb042c7ff3a0d32feabe457ed0a2c893355633288436a49707ead"; sha256 = "11whlh2dl7l6wrrnfmpbsg7ldcn316iccl1aaa4j5lqhdyyl6745";
};
meta = {
description = "Efficient resampling and calculation of medians with confidence intervals";
};
};
StatisticsDescriptive = buildPerlModule {
name = "Statistics-Descriptive-3.0701";
src = fetchurl {
url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0701.tar.gz;
sha256 = "35b09ed91b8660a6095c272a36ed2c61b3c660aa535fc23a20beadf7769e1919";
}; };
meta = { meta = {
#homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/; # berlios shut down; I found no replacement #homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/; # berlios shut down; I found no replacement
@ -14689,10 +14779,10 @@ let self = _self // overrides; _self = with self; {
}; };
Test2Suite = buildPerlPackage rec { Test2Suite = buildPerlPackage rec {
name = "Test2-Suite-0.000114"; name = "Test2-Suite-0.000115";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz";
sha256 = "439b37d63ffcee7876bc43b4830d4e40c454f02646faff0131e7d36d46fa8c45"; sha256 = "02be3428a0965aeb21245d44bbadda69b94dc76cd68d5695352c996ac7fc3638";
}; };
propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ];
meta = { meta = {
@ -15157,6 +15247,18 @@ let self = _self // overrides; _self = with self; {
}; };
}; };
TestLectroTest = buildPerlPackage {
name = "Test-LectroTest-0.5001";
src = fetchurl {
url = mirror://cpan/authors/id/T/TM/TMOERTEL/Test-LectroTest-0.5001.tar.gz;
sha256 = "0dfpkvn06499gczch4gfmdb05fdj82vlqy7cl6hz36l9jl6lyaxc";
};
meta = {
description = "Easy, automatic, specification-based tests";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
};
TestLongString = buildPerlPackage rec { TestLongString = buildPerlPackage rec {
name = "Test-LongString-0.17"; name = "Test-LongString-0.17";
src = fetchurl { src = fetchurl {
@ -15238,10 +15340,10 @@ let self = _self // overrides; _self = with self; {
TestMockObject = buildPerlPackage rec { TestMockObject = buildPerlPackage rec {
name = "Test-MockObject-1.20161202"; name = "Test-MockObject-1.20180705";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/C/CH/CHROMATIC/${name}.tar.gz"; url = "mirror://cpan/authors/id/C/CH/CHROMATIC/${name}.tar.gz";
sha256 = "14b225fff3645338697976dbbe2c39e44c1c93536855b78b3bbc6e9bfe94a0a2"; sha256 = "4516058d5d511155c1c462dab4027d762d6a474b99f73bf7da20b5ffbd024518";
}; };
buildInputs = [ CGI TestException TestWarn ]; buildInputs = [ CGI TestException TestWarn ];
propagatedBuildInputs = [ UNIVERSALcan UNIVERSALisa ]; propagatedBuildInputs = [ UNIVERSALcan UNIVERSALisa ];
@ -15664,10 +15766,10 @@ let self = _self // overrides; _self = with self; {
}; };
TestSimple13 = buildPerlPackage rec { TestSimple13 = buildPerlPackage rec {
name = "Test-Simple-1.302136"; name = "Test-Simple-1.302138";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302136.tar.gz; url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302138.tar.gz;
sha256 = "8d9a5c53b0309257af58b55177045f7d94e095e1c1416cb1e11aae4c1cdad446"; sha256 = "568615a551075d3657cb0cbca55cf3672734c954f0306e9823ecd002aa911655";
}; };
meta = { meta = {
description = "Basic utilities for writing tests"; description = "Basic utilities for writing tests";
@ -15726,16 +15828,17 @@ let self = _self // overrides; _self = with self; {
}; };
TestTempDirTiny = buildPerlPackage rec { TestTempDirTiny = buildPerlPackage rec {
name = "Test-TempDir-Tiny-0.017"; name = "Test-TempDir-Tiny-0.018";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-TempDir-Tiny-0.017.tar.gz; url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-TempDir-Tiny-0.018.tar.gz;
sha256 = "0y2km1lbvp4hhsah2yc8vacp705zi1ijflsf7lkvqh640q6p5m55"; sha256 = "10ay3zbihyxn4nbb1f0fmr4szag8iy8pd27v8j6idq6cgzys3dyp";
}; };
meta = { meta = {
description = "Temporary directories that stick around when tests fail"; description = "Temporary directories that stick around when tests fail";
license = with stdenv.lib.licenses; [ asl20 ]; license = with stdenv.lib.licenses; [ asl20 ];
homepage = "https://github.com/dagolden/Test-TempDir-Tiny"; homepage = "https://github.com/dagolden/Test-TempDir-Tiny";
}; };
propagatedBuildInputs = [ FileTemp ];
}; };
TestTCP = buildPerlPackage rec { TestTCP = buildPerlPackage rec {
@ -16509,10 +16612,10 @@ let self = _self // overrides; _self = with self; {
}; };
ThreadQueue = buildPerlPackage rec { ThreadQueue = buildPerlPackage rec {
name = "Thread-Queue-3.12"; name = "Thread-Queue-3.13";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/${name}.tar.gz"; url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/${name}.tar.gz";
sha256 = "0wpqdbdfa4mw8lpcaw1lp2d553gl65cl8mli1srj8wrg0kaxshhx"; sha256 = "1s6wpxy07mr03krkzjr5r02cswsj18dd38aa5f16dfrgvp6xm8vb";
}; };
meta = { meta = {
description = "Thread-safe queues"; description = "Thread-safe queues";
@ -16988,10 +17091,10 @@ let self = _self // overrides; _self = with self; {
}; };
URIdb = buildPerlModule { URIdb = buildPerlModule {
name = "URI-db-0.18"; name = "URI-db-0.19";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.18.tar.gz; url = mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.19.tar.gz;
sha256 = "460a1d3b9a45779f56dbbeebc60612370b32771f3158c87da981857163b43e0b"; sha256 = "c4999deaf451652216032c8e327ff6e6d655539eac379095bb69b0c369efa658";
}; };
propagatedBuildInputs = [ URINested ]; propagatedBuildInputs = [ URINested ];
meta = { meta = {
@ -17512,6 +17615,19 @@ let self = _self // overrides; _self = with self; {
propagatedBuildInputs = [ LWP ]; propagatedBuildInputs = [ LWP ];
}; };
XMLParserLite = buildPerlPackage {
name = "XML-Parser-Lite-0.721";
src = fetchurl {
url = mirror://cpan/authors/id/P/PH/PHRED/XML-Parser-Lite-0.721.tar.gz;
sha256 = "1fh8g77nkfv9n07ivilnfxdapx6jx13whf8q0anrmnxrr9pa6qjq";
};
buildInputs = [ TestRequires ];
meta = {
description = "Lightweight pure-perl XML Parser (based on regexps)";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
};
XMLXPath = buildPerlPackage rec { XMLXPath = buildPerlPackage rec {
name = "XML-XPath-1.42"; name = "XML-XPath-1.42";
src = fetchurl { src = fetchurl {
@ -17753,10 +17869,10 @@ let self = _self // overrides; _self = with self; {
}; };
YAMLLibYAML = buildPerlPackage rec { YAMLLibYAML = buildPerlPackage rec {
name = "YAML-LibYAML-0.70"; name = "YAML-LibYAML-0.72";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/T/TI/TINITA/${name}.tar.gz"; url = "mirror://cpan/authors/id/T/TI/TINITA/${name}.tar.gz";
sha256 = "1lqgal20v79ij68jhrpg57vxsv4sdahgmqdv88vg0388y776n95j"; sha256 = "0dn50pranjyai4gclb501m29y0ks03y87g132wqpb469rb3sjd0g";
}; };
}; };
@ -17795,7 +17911,6 @@ let self = _self // overrides; _self = with self; {
TextAbbrev = null; # part of Perl 5.22 TextAbbrev = null; # part of Perl 5.22
TextTabsWrap = null; # part of Perl 5.22 TextTabsWrap = null; # part of Perl 5.22
DigestSHA = null; DigestSHA = null;
FileTemp = null;
"if" = null; "if" = null;
TestSimple = null; TestSimple = null;