Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-01-31 00:46:33 +00:00 committed by GitHub
commit 81337921f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
73 changed files with 424 additions and 141 deletions

View file

@ -24,6 +24,7 @@ let
"x86_64-redox"
"powerpc64-linux"
"powerpc64le-linux"
"riscv32-linux" "riscv64-linux"
@ -72,7 +73,7 @@ in {
darwin = filterDoubles predicates.isDarwin;
freebsd = filterDoubles predicates.isFreeBSD;
# Should be better, but MinGW is unclear.
gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; });
gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.elfv1; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.elfv2; });
illumos = filterDoubles predicates.isSunOS;
linux = filterDoubles predicates.isLinux;
netbsd = filterDoubles predicates.isNetBSD;
@ -85,5 +86,5 @@ in {
embedded = filterDoubles predicates.isNone;
mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64le-linux"];
mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64-linux" "powerpc64le-linux"];
}

View file

@ -21,6 +21,19 @@ rec {
config = "powerpc64le-unknown-linux-musl";
};
ppc64-elfv1 = {
config = "powerpc64-unknown-linux-elfv1";
};
ppc64-elfv2 = {
config = "powerpc64-unknown-linux-elfv2";
};
ppc64 = ppc64-elfv2; # default to modern elfv2
ppc64-musl = {
config = "powerpc64-unknown-linux-musl";
gcc = { abi = "elfv2"; }; # for gcc configuration
};
sheevaplug = {
config = "armv5tel-unknown-linux-gnueabi";
} // platforms.sheevaplug;

View file

@ -337,10 +337,18 @@ rec {
The "gnu" ABI is ambiguous on 32-bit ARM. Use "gnueabi" or "gnueabihf" instead.
'';
}
{ assertion = platform: platform.system != "powerpc64-linux";
message = ''
The "gnu" ABI is ambiguous on big-endian 64-bit PPC. Use "elfv1" or "elfv2" instead.
'';
}
];
};
gnuabi64 = { abi = "64"; };
elfv1 = { abi = "elfv1"; };
elfv2 = { abi = "elfv2"; };
musleabi = { float = "soft"; };
musleabihf = { float = "hard"; };
musl = {};
@ -444,6 +452,7 @@ rec {
if lib.versionAtLeast (parsed.cpu.version or "0") "6"
then abis.gnueabihf
else abis.gnueabi
else if cpu == "powerpc64" then abis.elfv2
else abis.gnu
else abis.unknown;
};

View file

@ -28,7 +28,7 @@ with lib.systems.doubles; lib.runTests {
testredox = mseteq redox [ "x86_64-redox" ];
testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
testillumos = mseteq illumos [ "x86_64-solaris" ];
testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64le-linux" ];
testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" ];
testnetbsd = mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ];
testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];

View file

@ -4079,6 +4079,12 @@
githubId = 45598;
name = "William Casarin";
};
jbcrail = {
name = "Joseph Crail";
email = "jbcrail@gmail.com";
github = "jbcrail";
githubId = 6038;
};
jbedo = {
email = "cu@cua0.org";
github = "jbedo";
@ -10572,10 +10578,4 @@
github = "zupo";
githubId = 311580;
};
jbcrail = {
name = "Joseph Crail";
email = "jbcrail@gmail.com";
github = "jbcrail";
githubId = 6038;
};
}

View file

@ -346,7 +346,7 @@ let
webroot = mkOption {
type = types.nullOr types.str;
default = null;
example = "/var/lib/acme/acme-challenges";
example = "/var/lib/acme/acme-challenge";
description = ''
Where the webroot of the HTTP vhost is located.
<filename>.well-known/acme-challenge/</filename> directory
@ -579,12 +579,12 @@ in {
example = literalExample ''
{
"example.com" = {
webroot = "/var/www/challenges/";
webroot = "/var/lib/acme/acme-challenge/";
email = "foo@example.com";
extraDomainNames = [ "www.example.com" "foo.example.com" ];
};
"bar.example.com" = {
webroot = "/var/www/challenges/";
webroot = "/var/lib/acme/acme-challenge/";
email = "bar@example.com";
};
}

View file

@ -112,7 +112,7 @@ in
acmeRoot = mkOption {
type = types.str;
default = "/var/lib/acme/acme-challenges";
default = "/var/lib/acme/acme-challenge";
description = "Directory for the acme challenge which is PUBLIC, don't put certs or keys in here";
};

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "fomp";
version = "1.2.0";
version = "1.2.2";
src = fetchurl {
url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
sha256 = "01ld6yjrqrki6zwac8lmwmqkr5rv0sdham4pfbfkjwck4hi1gqqw";
sha256 = "sha256-xnGijydiO3B7BjSlryFuH1j/OPio9hCYbniq2IXp2W8=";
};
nativeBuildInputs = [ pkg-config wafHook ];

View file

@ -7,7 +7,7 @@ in stdenv.mkDerivation rec {
pname = "linuxband";
src = fetchurl {
url = "http://linuxband.org/assets/sources/${pname}-${version}.tar.gz";
url = "https://linuxband.org/assets/sources/${pname}-${version}.tar.gz";
sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n";
};
@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
meta = {
description = "A GUI front-end for MMA: Type in the chords, choose the groove and it will play an accompaniment";
homepage = "http://linuxband.org/";
homepage = "https://linuxband.org/";
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.magnetophon ];
platforms = lib.platforms.linux;

View file

@ -10,13 +10,13 @@ assert pcreSupport -> pcre != null;
stdenv.mkDerivation rec {
pname = "ncmpc";
version = "0.42";
version = "0.43";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "ncmpc";
rev = "v${version}";
sha256 = "1c21sbdm6pp3kwhnzc7c6ksna7madvsmfa7j91as2g8485symqv2";
sha256 = "sha256-/bynLU4/QtUawBjhcaajjuUDUwaSt6zk4/4TZqfQX3c=";
};
buildInputs = [ glib ncurses mpd_clientlib boost ]

View file

@ -12,11 +12,11 @@ assert taglibSupport -> (taglib != null);
with lib;
stdenv.mkDerivation rec {
pname = "ncmpcpp";
version = "0.9.1";
version = "0.9.2";
src = fetchurl {
url = "https://rybczak.net/ncmpcpp/stable/${pname}-${version}.tar.bz2";
sha256 = "0x35nd4v31sma8fliqdbn1nxpjyi8hv472318sfb3xbmr4wlm0fb";
sha256 = "sha256-+qv2FXyMsbJKBZryduFi+p+aO5zTgQxDuRKIYMk4Ohs=";
};
configureFlags = [ "BOOST_LIB_SUFFIX=" ]

View file

@ -12,7 +12,7 @@
}:
# Additional plugins that can be added:
# wavpack (http://www.wavpack.com/)
# wavpack (https://www.wavpack.com/)
# gme (Game music support)
# Ogg Opus support
# BS2B effect plugin (http://bs2b.sourceforge.net/)

View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "avocode";
version = "4.11.0";
version = "4.11.1";
src = fetchurl {
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
sha256 = "sha256-50aGechzlVVRQz6WOASHRjT46BKbwyhbt7/0oq2PsOg=";
sha256 = "sha256-Qe5mV9GBLHsmzMQg6dKib/sTnNdyOTj4wYQ9xd/iqJM=";
};
libPath = lib.makeLibraryPath (with xorg; [

View file

@ -35,7 +35,7 @@ let
}
// attrs
// {
name = "gimp-plugin-${name}";
name = "${gimp.name}-plugin-${name}";
buildInputs = [
gimp
gimp.gtk

View file

@ -0,0 +1,197 @@
{ stdenv
, lib
, fetchFromGitHub
, substituteAll
, pkg-config
, intltool
, babl
, gegl
, gtk2
, glib
, gdk-pixbuf
, isocodes
, pango
, cairo
, freetype
, fontconfig
, lcms
, libpng
, libjpeg
, poppler
, poppler_data
, libtiff
, libmng
, librsvg
, libwmf
, zlib
, libzip
, ghostscript
, aalib
, shared-mime-info
, python2
, libexif
, gettext
, xorg
, glib-networking
, libmypaint
, gexiv2
, harfbuzz
, mypaint-brushes1
, libwebp
, libheif
, libgudev
, openexr
, AppKit
, Cocoa
, gtk-mac-integration-gtk2
, libxslt
, automake
, autoconf
, libtool
, makeWrapper
, autoreconfHook
, gtk-doc
}:
let
python = python2.withPackages (pp: [ pp.pygtk ]);
in
stdenv.mkDerivation rec {
pname = "glimpse";
version = "0.2.0";
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "glimpse-editor";
repo = "Glimpse";
rev = "v${version}";
sha256 = "sha256-qbZQmAo7fuJWWbn0QTyxAwAenZOdsGueUq5/3IV8Njc=";
};
patches = [
# to remove compiler from the runtime closure, reference was retained via
# gimp --version --verbose output
(substituteAll {
src = ./remove-cc-reference.patch;
cc_version = stdenv.cc.cc.name;
})
../gimp/hardcode-plugin-interpreters.patch
];
postPatch = ''
ln -s ${gtk-doc}/share/gtk-doc/data/gtk-doc.make .
'';
nativeBuildInputs = [
autoreconfHook
pkg-config
intltool
gettext
automake
autoconf
makeWrapper
gtk-doc
libxslt
libtool
];
buildInputs = [
babl
gegl
gtk2
glib
gdk-pixbuf
pango
cairo
gexiv2
harfbuzz
isocodes
freetype
fontconfig
lcms
libpng
libjpeg
poppler
poppler_data
libtiff
openexr
libmng
librsvg
libwmf
zlib
libzip
ghostscript
aalib
shared-mime-info
libwebp
libheif
python
libexif
xorg.libXpm
glib-networking
libmypaint
mypaint-brushes1
] ++ lib.optionals stdenv.isDarwin [
AppKit
Cocoa
gtk-mac-integration-gtk2
] ++ lib.optionals stdenv.isLinux [
libgudev
];
# needed by gimp-2.0.pc
propagatedBuildInputs = [
gegl
];
# Check if librsvg was built with --disable-pixbuf-loader.
PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}";
preAutoreconf = ''
# The check runs before glib-networking is registered
export GIO_EXTRA_MODULES="${glib-networking}/lib/gio/modules:$GIO_EXTRA_MODULES"
'';
postFixup = ''
wrapProgram $out/bin/glimpse-${lib.versions.majorMinor version} \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
'';
passthru = rec {
# The declarations for `glimpse-with-plugins` wrapper,
# used for determining plug-in installation paths
majorVersion = "2.0";
targetPluginDir = "lib/glimpse/${majorVersion}/plug-ins";
targetScriptDir = "share/glimpse/${majorVersion}/scripts";
targetDataDir = "share/gimp/${majorVersion}";
targetLibDir = "lib/gimp/${majorVersion}";
# probably its a good idea to use the same gtk in plugins ?
gtk = gtk2;
};
configureFlags = [
"--without-webkit" # old version is required
"--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new"
"--with-icc-directory=/run/current-system/sw/share/color/icc"
# fix libdir in pc files (${exec_prefix} needs to be passed verbatim)
"--libdir=\${exec_prefix}/lib"
];
# on Darwin,
# test-eevl.c:64:36: error: initializer element is not a compile-time constant
doCheck = !stdenv.isDarwin;
enableParallelBuilding = true;
meta = with lib; {
description = "An open source image editor based on the GNU Image Manipulation Program";
longDescription = ''
Glimpse is an open source image editor based on the GNU Image Manipulation Program (GIMP). The goal is to experiment with new ideas and expand the use of free software.
'';
homepage = "https://glimpse-editor.org";
maintainers = with maintainers; [ ashkitten erictapen ];
license = licenses.gpl3Plus;
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,11 @@
# Use `glimpse-with-plugins` package for Glimpse with all plug-ins.
# If you just want a subset of plug-ins, you can specify them explicitly:
# `glimpse-with-plugins.override { plugins = with glimpsePlugins; [ gap ]; }`.
{ gimpPlugins, glimpse }:
# This attrs can be extended in the future if there happen to be glimpse-only
# plugins or some that need further modification in order to work with Glimpse.
gimpPlugins.overrideScope' (self: super: {
gimp = glimpse;
})

View file

@ -0,0 +1,13 @@
diff --git a/app/gimp-version.c b/app/gimp-version.c
index b584398231..1b40a1570f 100644
--- a/app/gimp-version.c
+++ b/app/gimp-version.c
@@ -230,7 +230,7 @@ gimp_version (gboolean be_verbose,
GIMP_BUILD_ID,
gimp_version_get_revision (),
GIMP_BUILD_PLATFORM_FAMILY,
- CC_VERSION,
+ "@cc_version@",
lib_versions);
g_free (lib_versions);

View file

@ -0,0 +1,30 @@
{ lib, symlinkJoin, glimpse, makeWrapper, glimpsePlugins, gnome3, plugins ? null }:
let
allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues glimpsePlugins);
selectedPlugins = if plugins == null then allPlugins else plugins;
extraArgs = map (x: x.wrapArgs or "") selectedPlugins;
versionBranch = lib.versions.majorMinor glimpse.version;
in
symlinkJoin {
name = "glimpse-with-plugins-${glimpse.version}";
paths = [ glimpse ] ++ selectedPlugins;
buildInputs = [ makeWrapper ];
postBuild = ''
for each in glimpse-${versionBranch} glimpse-console-${versionBranch}; do
wrapProgram $out/bin/$each \
--set GIMP2_PLUGINDIR "$out/lib/glimpse/2.0" \
--set GIMP2_DATADIR "$out/share/glimpse/2.0" \
--prefix GTK_PATH : "${gnome3.gnome-themes-extra}/lib/gtk-2.0" \
${toString extraArgs}
done
for each in glimpse glimpse-console; do
ln -sf "$each-${versionBranch}" $out/bin/$each
done
'';
}

View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "graphicsmagick";
version = "1.3.35";
version = "1.3.36";
src = fetchurl {
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
sha256 = "0l024l4hawm9s3jqrgi2j0lxgm61dqh8sgkj1017ma7y11hqv2hq";
sha256 = "0ilg6fkppb4avzais1dvi3qf6ln7v3mzj7gjm83w7pwwfpg3ynsx";
};
patches = [

View file

@ -38,6 +38,9 @@ buildPythonApplication rec {
substituteInPlace setup.py --replace 'pyxdg==0.26' 'pyxdg'
'';
# no tests executed
doCheck = false;
meta = with lib; {
description = "A simple emoji and character picker for rofi";
homepage = "https://github.com/fdw/rofimoji";

View file

@ -17,7 +17,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "A python script that will make your terminal snow";
homepage = "http://github.com/sontek/snowmachine";
homepage = "https://github.com/sontek/snowmachine";
license = with licenses; [ bsd3 ];
maintainers = with maintainers; [ djanatyn ];
};

View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "jmeter";
version = "5.4";
version = "5.4.1";
src = fetchurl {
url = "https://archive.apache.org/dist/jmeter/binaries/apache-${pname}-${version}.tgz";
sha256 = "1hbyvh0hrvfvrsf7wpnwqsry5gaziac632s0bwb5zbq6y5b0z41a";
sha256 = "sha256-TtrpmIHRzbUEiYesy9ArPzza3qShCNFtB/sVJe9hLPM=";
};
nativeBuildInputs = [ makeWrapper jre ];

View file

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
++ optional sslSupport "--enable-ssl";
meta = {
homepage = "http://sylpheed.sraoss.jp/en/";
homepage = "https://sylpheed.sraoss.jp/en/";
description = "Lightweight and user-friendly e-mail client";
maintainers = with maintainers; [ eelco ];
platforms = platforms.linux ++ platforms.darwin;

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "nextdns";
version = "1.9.6";
version = "1.10.1";
src = fetchFromGitHub {
owner = "nextdns";
repo = "nextdns";
rev = "v${version}";
sha256 = "sha256-TIXckwesu6BTPr3GBRTgegLplwTKHtmjv3yl1c0nvbY=";
sha256 = "sha256-hMI6zq176p7MI4cjMSeQ8T8UvibJW60lzsPmeAOi3ow=";
};
vendorSha256 = "sha256-kmszMqkDMaL+Z6GcZmQyeRShKKS/VGdn9vabYPW/kCc=";

View file

@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "grisbi";
version = "1.2.2";
version = "2.0.0";
src = fetchurl {
url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2";
sha256 = "1piiyyxjsjbw9gcqydvknzxmmfgh8kdqal12ywrxyxih2afwnvbw";
sha256 = "sha256-b3I87tlXhIjM/bFjhsJTNFQvZxIGKsIbsf4zZT5sHXg=";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook ];

View file

@ -26,6 +26,9 @@ python3Packages.buildPythonPackage rec {
wrapQtApp "$out"/bin/qnotero
'';
# no tests executed
doCheck = false;
meta = {
description = "Quick access to Zotero references";
homepage = "http://www.cogsci.nl/software/qnotero";

View file

@ -4,12 +4,12 @@ with lib;
stdenv.mkDerivation rec {
pname = "marvin";
version = "20.21.0";
version = "21.1.0";
src = fetchurl {
name = "marvin-${version}.deb";
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
sha256 = "sha256-OMT6t8bNeFRWFlpyg0iKt2SMNfAmIUvVKiW+cfjfBuI=";
sha256 = "sha256-HlBvtpxm8voLS6E8QQ4Ur211KSUhAkL/sv4odoy8oUo=";
};
nativeBuildInputs = [ dpkg makeWrapper ];

View file

@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "horizon-eda";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "horizon-eda";
repo = "horizon";
rev = "v${version}";
sha256 = "13c4p60vrmwmnrv2jcr2gc1cxnimy7j8yp1p6434pbbk2py9k8mx";
sha256 = "0mra6kf1c2qixfzqva6r01qms5kdabbhhblhk5is6h6nq78i8640";
};
buildInputs = [

View file

@ -5,7 +5,7 @@ stdenv.mkDerivation {
version = "1.0.3";
src = fetchzip {
url = "http://cgi.csc.liv.ac.uk/~ullrich/CLProver++/CLProver++-v1.0.3-18-04-2015.zip";
url = "https://cgi.csc.liv.ac.uk/~ullrich/CLProver++/CLProver++-v1.0.3-18-04-2015.zip";
sha256 = "10kmlg4m572qwfzi6hkyb0ypb643xw8sfb55xx7866lyh37w1q3s";
stripRoot = false;
};
@ -19,7 +19,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "Resolution-based theorem prover for Coalition Logic implemented in C++";
homepage = "http://cgi.csc.liv.ac.uk/~ullrich/CLProver++/";
homepage = "https://cgi.csc.liv.ac.uk/~ullrich/CLProver++/";
license = licenses.gpl3; # Note that while the website states that it is GPLv2 but the file in the zip as well as the comments in the source state it is GPLv3
maintainers = with maintainers; [ mgttlinger ];
platforms = [ "x86_64-linux" ];

View file

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "GiNaC is Not a CAS";
homepage = "http://www.ginac.de/";
homepage = "https://www.ginac.de/";
maintainers = with maintainers; [ lovek323 ];
license = licenses.gpl2;
platforms = platforms.all;

View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "gretl";
version = "2020e";
version = "2021a";
src = fetchurl {
url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz";
sha256 = "105y5hkzgyvad6wc3y7nn327bvrsch6jp03ckkn0w0hpnhiywzx7";
sha256 = "sha256-BDaTv6PORiBnsEaU7uXJIKuxTqIgpY44vUmSViyME0A=";
};
buildInputs = [

View file

@ -15,7 +15,7 @@
stdenv.mkDerivation rec {
pname = "fossil";
version = "2.13";
version = "2.14";
src = fetchurl {
urls =
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
"https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
];
name = "${pname}-${version}.tar.gz";
sha256 = "1xbk7bb7340x2vvn22ykii54v721fwk8vgr3xvjkvv8ff7hd6cyr";
sha256 = "sha256-uNDJIBlt2K4pFS+nRI5ROh+nxYiHG3heP7/Ae0KgX7k=";
};
nativeBuildInputs = [ installShellFiles tcl ];

View file

@ -5,14 +5,14 @@
stdenv.mkDerivation rec {
pname = "git-remote-gcrypt";
version = "1.3";
version = "1.4";
rev = version;
src = fetchFromGitHub {
inherit rev;
owner = "spwhitton";
repo = "git-remote-gcrypt";
sha256 = "0n8fzvr6y0pxrbvkywlky2bd8jvi0ayp4n9hwi84l1ldmv4a40dh";
sha256 = "sha256-uHgz8Aj5w8UOo/XbptCRKON1RAdDfFsLL9ZDEF1QrPQ=";
};
outputs = [ "out" "man" ];

View file

@ -11,6 +11,6 @@ in lib.concatLists [
(lib.optional (p ? float) "--with-float=${p.float}")
(lib.optional (p ? mode) "--with-mode=${p.mode}")
(lib.optional
(let tp = targetPlatform; in tp.isPower && tp.libc == "glibc" && tp.is64bit && tp.isLittleEndian)
(let tp = targetPlatform; in tp.isPower && tp.libc == "glibc" && tp.is64bit)
"--with-long-double-128")
]

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
let
version = "0.194";
version = "0.196";
in stdenv.mkDerivation {
pname = "metamath";
inherit version;
@ -12,7 +12,7 @@ in stdenv.mkDerivation {
owner = "metamath";
repo = "metamath-exe";
rev = "v${version}";
sha256 = "1bc5h2jdqbgna8zbhqyphlqcldz4vddg72r2rnjjjzxnxb2skvj7";
sha256 = "sha256-/ofH5fq7lUxbbRBAczsLNG3UPsOMbCdcxkB3el5OPcU=";
};
meta = with lib; {

View file

@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, libtool, autoconf, automake }:
stdenv.mkDerivation rec {
version = "0.99.8";
version = "0.99.9";
pname = "fastjson";
src = fetchFromGitHub {
repo = "libfastjson";
owner = "rsyslog";
rev = "v${version}";
sha256 = "0qhs0g9slj3p0v2z4s3cnsx44msrlb4k78ljg7714qiziqbrbwyl";
sha256 = "sha256-2LyBdJR0dV1CElcGfrlmNwX52lVtx9X/Z4h/1XFjOIs=";
};
buildInputs = [ autoconf automake libtool ];

View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
_name = "liblockfile";
version = "1.16";
version = "1.17";
name = "${_name}-${version}";
src = fetchurl {
url = "mirror://debian/pool/main/libl/${_name}/${_name}_${version}.orig.tar.gz";
sha256 = "0s8wj3y6mf1g47nvinkkm5avmqz0z6yxmdrnxpjwgz6krql3hvng";
sha256 = "sha256-bpN/NlCvq0qsGY80i4mxykLtzrF/trsJGPZCFDzP0V4=";
};
preConfigure = ''

View file

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
];
meta = with lib; {
homepage = "http://named-data.net/";
homepage = "https://named-data.net/";
description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction";
longDescription = ''
ndn-cxx is a C++ library, implementing Named Data Networking (NDN)

View file

@ -4,11 +4,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "ntbtls";
version = "0.1.2";
version = "0.2.0";
src = fetchurl {
url = "mirror://gnupg/ntbtls/ntbtls-${version}.tar.bz2";
sha256 = "1rywgdyj7prmwdi5r1rpglakqpnjskgln1mqksqm28qcwn2dnh42";
sha256 = "sha256-ZJ/nSjEdE+Q7FrJuuqkWZd22MpJbc5AlkurD7TBRnhc=";
};
outputs = [ "dev" "out" ];

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rdkafka";
version = "1.5.3";
version = "1.6.0";
src = fetchFromGitHub {
owner = "edenhill";
repo = "librdkafka";
rev = "v${version}";
sha256 = "12cc7l5vpxyrm8ca0cpm8sdl54hb8dranal8sz55r9y8igz1q1wb";
sha256 = "sha256-VCGR0Q8FcoDLr+CFTk/OLMI4zs87K/IdZS1ANmkeb4s=";
};
nativeBuildInputs = [ pkg-config ];

View file

@ -64655,7 +64655,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "The browser package manager";
homepage = http://bower.io/;
homepage = https://bower.io/;
license = "MIT";
};
production = true;
@ -81529,7 +81529,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Utility to inline images, CSS and JavaScript for a web page - useful for mobile sites";
homepage = http://github.com/remy/inliner;
homepage = https://github.com/remy/inliner;
license = "MIT";
};
production = true;
@ -83404,7 +83404,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Static analysis tool for JavaScript";
homepage = http://jshint.com/;
homepage = https://jshint.com/;
license = "MIT";
};
production = true;
@ -91362,7 +91362,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Low-code programming for event-driven applications";
homepage = http://nodered.org/;
homepage = https://nodered.org/;
license = "Apache-2.0";
};
production = true;
@ -95346,7 +95346,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Production process manager for Node.JS applications with a built-in load balancer.";
homepage = http://pm2.keymetrics.io/;
homepage = https://pm2.keymetrics.io/;
license = "AGPL-3.0";
};
production = true;
@ -110719,7 +110719,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "CLI tool for running Yeoman generators";
homepage = http://yeoman.io/;
homepage = https://yeoman.io/;
license = "BSD-2-Clause";
};
production = true;

View file

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytest, pytestcov }:
{ stdenv, lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytestCheckHook, pytestcov }:
buildPythonPackage rec {
pname = "capturer";
@ -13,10 +13,9 @@ buildPythonPackage rec {
propagatedBuildInputs = [ humanfriendly ];
checkPhase = ''
PATH=$PATH:$out/bin pytest .
'';
checkInputs = [ pytest ];
# hangs on darwin
doCheck = !stdenv.isDarwin;
checkInputs = [ pytestCheckHook ];
meta = with lib; {
description = "Easily capture stdout/stderr of the current process and subprocesses";

View file

@ -8,7 +8,6 @@
, pytest
, mock
, util-linux
, isPy38
}:
buildPythonPackage rec {
@ -24,7 +23,7 @@ buildPythonPackage rec {
# capturer is broken on darwin / py38, so we skip the test until a fix for
# https://github.com/xolox/python-capturer/issues/10 is released.
doCheck = !(isPy38 && stdenv.isDarwin);
doCheck = !stdenv.isDarwin;
checkPhase = ''
PATH=$PATH:$out/bin pytest . -k "not test_plain_text_output_format \
and not test_auto_install"

View file

@ -12,13 +12,6 @@ buildPythonPackage rec {
sha256 = "96a7dd4e9cdb39e30c7a79e5773570fd9408f7fdb58c714c293cfbb314818eb6";
};
postPatch = ''
substituteInPlace setup.py \
--replace "pyglet>=1.2.0,<=1.3.2" "pyglet" \
--replace "cloudpickle>=1.2.0,<1.4.0" "cloudpickle~=1.2"
'';
# cloudpickle range has been expanded in package but not yet released
propagatedBuildInputs = [
numpy requests six pyglet scipy cloudpickle
];

View file

@ -16,7 +16,7 @@ buildPythonPackage rec {
doCheck = false;
meta = with lib; {
homepage = "http://mpmath.org/";
homepage = "https://mpmath.org/";
description = "A pure-Python library for multiprecision floating arithmetic";
license = licenses.bsd3;
maintainers = with maintainers; [ lovek323 ];

View file

@ -1,4 +1,4 @@
{ lib, fetchPypi, buildPythonPackage, fetchFromGitHub, simplejson, redis, setproctitle, nose, pkgs }:
{ lib, stdenv, fetchPypi, buildPythonPackage, fetchFromGitHub, simplejson, redis, setproctitle, nose, pkgs }:
let
@ -31,6 +31,9 @@ buildPythonPackage rec {
sha256 = "1rkpv7gbjxl9h9g7kncmsrgmi77l7pgfq8d7dbnsr3ia2jmjqb8y";
};
# started redis-server makes this hang on darwin
doCheck = !stdenv.isDarwin;
checkPhase = ''
redis-server &
nosetests . --exclude test_worker_pids

View file

@ -1,7 +1,6 @@
{ lib, pkgs, buildPythonPackage, fetchPypi, isPy3k
, numpy
, pyqt5
, nose
}:
buildPythonPackage rec {
@ -14,15 +13,14 @@ buildPythonPackage rec {
sha256 = "b02bd2dc7de774f954544312ec1020cf2d7e03fdd23ec9eb79901da55ccb3365";
};
checkInputs = [
nose
];
propagatedBuildInputs = [
numpy
pyqt5
];
# no tests executed
doCheck = false;
meta = {
homepage = "https://github.com/hmeine/qimage2ndarray";
description = "A small python extension for quickly converting between QImages and numpy.ndarrays (in both directions)";

View file

@ -21,7 +21,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "A full-featured console (xterm et al.) user interface library";
homepage = "http://excess.org/urwid";
homepage = "https://excess.org/urwid";
repositories.git = "git://github.com/wardi/urwid.git";
license = licenses.lgpl21;
maintainers = with maintainers; [ ];

View file

@ -3871,7 +3871,7 @@ in
buildInputs = globalBuildInputs;
meta = {
description = "Static analysis tool for JavaScript";
homepage = "http://jshint.com/";
homepage = "https://jshint.com/";
license = "(MIT AND JSON)";
};
production = true;

View file

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = {
description = "CUPS Linux drivers and SDK for DYMO printers";
homepage = "http://www.dymo.com/";
homepage = "https://www.dymo.com/";
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ makefu ];
};

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "hatari";
version = "2.3.0";
version = "2.3.1";
src = fetchurl {
url = "https://download.tuxfamily.org/hatari/${version}/${pname}-${version}.tar.bz2";
sha256 = "19dqadi32hgi78hyxxcm8v2vh28vyn9w5nd1xiq683wk0ccicj5z";
sha256 = "sha256-RKL2LKmV442eCHSAaVbwucPMhOqJ4BaaY4SbY807ZL0=";
};
# For pthread_cancel

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ipset";
version = "7.9";
version = "7.10";
src = fetchurl {
url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2";
sha256 = "02mkp7vmsh609dcp02xi290sxmsgq2fsch3875dxkwfxkrl16p5p";
sha256 = "sha256-skkGukPi/jIr1BhjR2dh10mkvd9c5MImW6BLA7x+nPY=";
};
nativeBuildInputs = [ pkg-config ];

View file

@ -5,7 +5,7 @@ pythonPackages.buildPythonApplication rec {
version = "2.8";
src = fetchurl {
url = "http://excess.org/speedometer/speedometer-${version}.tar.gz";
url = "https://excess.org/speedometer/speedometer-${version}.tar.gz";
sha256 = "060bikv3gwr203jbdmvawsfhc0yq0bg1m42dk8czx1nqvwvgv6fm";
};
@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec {
meta = with lib; {
description = "Measure and display the rate of data across a network connection or data being stored in a file";
homepage = "http://excess.org/speedometer/";
homepage = "https://excess.org/speedometer/";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ Baughn ];

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "1.30.0";
version = "1.34.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
sha256 = "0gn5lwn1lk1ghv6lw0fvax0m829w09mmq8flbmcxvszfyv7x0rix";
sha256 = "sha256-bJ9BQbAe35z5cIw0HhFjM6arWf1Tdy4gRipAHywxZZk=";
};
vendorSha256 = "08zma4b58b9132h41m6frbdi502yima9lkpab87fi0q5r6qwhf1z";
vendorSha256 = "sha256-amPL0gzvqsacj7+UNJeZOQbeiBESUttbtPHxLpDykRI=";
subPackages = [ "." ];
doCheck = false; # Broken

View file

@ -114,13 +114,13 @@ let
in stdenv.mkDerivation rec {
pname = "mpd";
version = "0.22.3";
version = "0.22.4";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "MPD";
rev = "v${version}";
sha256 = "0323zxmgyrkbklnqm8i6napz8pva50cw14mzr9bvmyg64x404jgj";
sha256 = "sha256-CVi+fcmFMJMv7X4okALlVsxqsuUsirHgQT61IHdrBNE=";
};
buildInputs = [

View file

@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "timescaledb";
version = "2.0.0";
version = "2.0.1";
nativeBuildInputs = [ cmake ];
buildInputs = [ postgresql openssl ];
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "timescale";
repo = "timescaledb";
rev = "refs/tags/${version}";
sha256 = "0id1h46490mjqp8ijhv2qswpdli2nh2z15mgh6gfc2wl3bhwhi1g";
sha256 = "105zc5m3zvnrqr8409qdbycb4yp7znxmna76ri1m2djkdp5rh4q1";
};
# -DWARNINGS_AS_ERRORS=OFF to be removed once https://github.com/timescale/timescaledb/issues/2770 is fixed in upstream

View file

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "nushell";
version = "0.25.1";
version = "0.26.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "0wsl57i3cd9whqvgjdnbz05230mkn2174gqld7mzn9iiym1rkcm4";
sha256 = "sha256-v0u04xY4iEbOTeaPKmbHImNTzEgdqf1wZWV0hKOV6Vg=";
};
cargoSha256 = "1ifvfwmrl97skjwp1qwrj863npsxcgfqm4a81cvw9bqhbylbjc77";
cargoSha256 = "sha256-0Ncjy6vZqiMNB+aRzf255tsIdrnpG0a4Xoid+mAAvUk=";
nativeBuildInputs = [ pkg-config ]
++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];

View file

@ -5,13 +5,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "grml-zsh-config";
version = "0.17.4";
version = "0.18.0";
src = fetchFromGitHub {
owner = "grml";
repo = "grml-etc-core";
rev = "v${version}";
sha256 = "09c3f7s2r0cb8g9kgh3xhc8dhr1656g1q9s9i3s5imvknwqii6as";
sha256 = "sha256-5QwP+dMOm6UBbQ1X1OcHawHSi3DJIciny2sV7biE18c=";
};
buildInputs = [ zsh coreutils txt2tags procps ]

View file

@ -54,6 +54,7 @@ in
aarch64-linux = stagesLinux;
mipsel-linux = stagesLinux;
powerpc-linux = /* stagesLinux */ stagesNative;
powerpc64-linux = stagesLinux;
powerpc64le-linux = stagesLinux;
x86_64-darwin = stagesDarwin;
x86_64-solaris = stagesNix;

View file

@ -17,6 +17,8 @@ in lib.mapAttrs (n: make) (with lib.systems.examples; {
armv6l-musl = muslpi;
aarch64-musl = aarch64-multiplatform-musl;
riscv64 = riscv64;
powerpc64 = ppc64;
powerpc64-musl = ppc64-musl;
powerpc64le = powernv;
powerpc64le-musl = musl-power;
})

View file

@ -19,7 +19,8 @@ in with pkgs; rec {
tarMinimal = gnutar.override { acl = null; };
busyboxMinimal = busybox.override {
useMusl = !stdenv.targetPlatform.isRiscV;
useMusl = with stdenv.targetPlatform; !isRiscV &&
(system == "powerpc64-linux" -> parsed.abi.name != "elfv1");
enableStatic = true;
enableMinimal = true;
extraConfig = ''

View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "duply";
version = "2.2";
version = "2.3";
src = fetchurl {
url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.2.x/duply_${version}.tgz";
sha256 = "1bd7ivswxmxg64n0fnwgz6bkgckhdhz2qnnlkqqx4ccdxx15krbr";
url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.3.x/duply_${version}.tgz";
sha256 = "sha256-I1KkblFnZVOCvcWEarGsSXnzlod2+yZ4okaTpckLFbE=";
};
buildInputs = [ txt2man makeWrapper ];

View file

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
meta = {
description = "On-the-fly display switch utility";
homepage = "http://willem.engen.nl/projects/disper/";
homepage = "https://willem.engen.nl/projects/disper/";
platforms = lib.platforms.unix;
license = lib.licenses.gpl3;
};

View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "lf";
version = "19";
version = "20";
src = fetchFromGitHub {
owner = "gokcehan";
repo = "lf";
rev = "r${version}";
sha256 = "096lb0kbiqchw8mfp1vbgn9p1bqnp3h5wn172s9q4jl55l5l0kn1";
sha256 = "056g2g503ppbqqbq5nk90sl8ki1q4fixdc25a6wv15gm1inxrb4b";
};
vendorSha256 = "12njqs39ympi2mqal1cdn0smp80yzcs8xmca1iih8pbmxv51r2gg";

View file

@ -20,11 +20,11 @@
stdenv.mkDerivation rec {
pname = "mc";
version = "4.8.25";
version = "4.8.26";
src = fetchurl {
url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz";
sha256 = "12jlnabnc91xsm35g99g2wnh96jmznvrhffd18rj7fqfy8brdhgz";
sha256 = "sha256-xt6txQWV8tmiLcbCmanyizk+NYNG6/bKREqEadwWbCc=";
};
nativeBuildInputs = [ pkg-config autoreconfHook ];

View file

@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
meta = with lib; {
description = "Open files by MIME-type or file name using regular expressions";
homepage = "http://xyne.archlinux.ca/projects/mimeo/";
homepage = "https://xyne.archlinux.ca/projects/mimeo/";
license = [ licenses.gpl2 ];
maintainers = [ maintainers.rycee ];
platforms = platforms.unix;

View file

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, pkg-config
@ -10,13 +11,13 @@
rustPlatform.buildRustPackage rec {
pname = "starship";
version = "0.48.0";
version = "0.49.0";
src = fetchFromGitHub {
owner = "starship";
repo = pname;
rev = "v${version}";
sha256 = "1p37cfkcpqv74gp7g099alkqxanfc002kaq1cim6zkinx50gxjxw";
sha256 = "0mchjxlhrw73846acj99s6pig93infkbdgrmym6yzk8dg0ynx5gw";
};
nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ];
@ -31,18 +32,11 @@ rustPlatform.buildRustPackage rec {
done
'';
cargoSha256 = "02djpwvwrrp7f0ifiypx1cr1v4bkqxrhqfhy0abfjszza95fjasv";
cargoSha256 = "0w17nv3zgczaznf1pkpj26ppxzv1arlva8zdg6b3l7m8qkkz8jn2";
checkFlags = [
"--skip=directory_in_home"
"--skip=home_directory"
"--skip=directory_in_root"
"--skip=truncation_symbol_not_truncated_home"
"--skip=truncation_symbol_truncated_home"
"--skip=folder_with_glide_yaml"
"--skip=shows_multiple_tfms"
"--skip=shows_pinned_in_project_below_root_with_global_json"
];
preCheck = ''
HOME=$TMPDIR
'';
meta = with lib; {
description = "A minimal, blazing fast, and extremely customizable prompt for any shell";

View file

@ -17,11 +17,11 @@ let
pname = "bitwarden";
version = {
x86_64-linux = "1.23.1";
x86_64-linux = "1.24.6";
}.${system} or "";
sha256 = {
x86_64-linux = "1jv6w1g6b9c4xa5zy7pgzrkn8k4pyy3cdkh0nw2czn1cw2gaccs1";
x86_64-linux = "sha256-PaquU2CrtIJS1s9TKshmKxfs0L3Jhvs/sgO4ZrlJFzA=";
}.${system} or "";
meta = with lib; {

View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "facter";
version = "3.14.14";
version = "3.14.15";
src = fetchFromGitHub {
sha256 = "07pfa11i3nn2dk5g3c1qj3g7d2s8gd2fr0lmfijndaqxm7gjrn1a";
sha256 = "sha256-vRtDctiulR5YmcwNCZtSU/tsRjs1+DP07NFVSL1TSuI=";
rev = version;
repo = pname;
owner = "puppetlabs";

View file

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Video BIOS execution tool";
homepage = "http://www.codon.org.uk/~mjg59/vbetool/";
homepage = "https://www.codon.org.uk/~mjg59/vbetool/";
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
license = licenses.gpl2;

View file

@ -5,13 +5,13 @@ with lib;
let
self = stdenv.mkDerivation rec {
pname = "highlight";
version = "3.59";
version = "3.60";
src = fetchFromGitLab {
owner = "saalen";
repo = "highlight";
rev = "v${version}";
sha256 = "0sqdzivnak3gcinvkf6rkgp1p5gjx5my6cb2790nh0v53y67v2pb";
sha256 = "sha256-1EBdtORd9P5DJUmbZa9KjR3UUoHOKLbjqbxpFi5WFvQ=";
};
enableParallelBuilding = true;

View file

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, ocamlPackages }:
stdenv.mkDerivation rec {
name = "hevea-2.34";
name = "hevea-2.35";
src = fetchurl {
url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz";
sha256 = "1pzyszxw90klpcmhjqrjfc8cw6c0gm4w2blim8ydyxb6rq6qml1s";
sha256 = "sha256-8Ym62l0+WzWFXf39tbJwyZT8eiNmsBJQ12E1mtZsnss=";
};
buildInputs = with ocamlPackages; [ ocaml ocamlbuild ];

View file

@ -22229,6 +22229,19 @@ in
gimpPlugins = recurseIntoAttrs (callPackage ../applications/graphics/gimp/plugins {});
glimpse = callPackage ../applications/graphics/glimpse {
autoreconfHook = buildPackages.autoreconfHook269;
gegl = gegl_0_4;
lcms = lcms2;
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
};
glimpse-with-plugins = callPackage ../applications/graphics/glimpse/wrapper.nix {
plugins = null; # All packaged plugins enabled, if not explicit plugin list supplied
};
glimpsePlugins = recurseIntoAttrs (callPackage ../applications/graphics/glimpse/plugins {});
girara = callPackage ../applications/misc/girara {
gtk = gtk3;
};