diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 8b21f98409ef..6c43cc877df8 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -223,7 +223,7 @@ with lib.maintainers; {
};
freedesktop = {
- members = [ jtojnar ];
+ members = [ ];
scope = "Maintain Freedesktop.org packages for graphical desktop.";
shortName = "freedesktop.org packaging";
};
@@ -258,7 +258,6 @@ with lib.maintainers; {
members = [
bobby285271
hedning
- jtojnar
dasj19
maxeaubrey
];
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index cebb90bf32c8..b291d38da671 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -2562,6 +2562,14 @@ cp /var/lib/redis/dump.rdb "/var/lib/redis-mastodon/dump.rdb"
like firefox.
+
+
+ The default scribus version is now 1.5,
+ while version 1.4 is still available as
+ scribus_1_4
+ (#172700).
+
+
The Nextcloud module now supports to create a Mysql database
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 3136a9607b60..4f4643e505bc 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -905,6 +905,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `nss` package was split into `nss_esr` and `nss_latest`, with `nss` being an alias for `nss_esr`. This was done to ease maintenance of `nss` and dependent high-profile packages like `firefox`.
+- The default `scribus` version is now 1.5, while version 1.4 is still available as `scribus_1_4` ([#172700](https://github.com/NixOS/nixpkgs/pull/172700)).
+
- The Nextcloud module now supports to create a Mysql database automatically
with `services.nextcloud.database.createLocally` enabled.
diff --git a/nixos/tests/fontconfig-default-fonts.nix b/nixos/tests/fontconfig-default-fonts.nix
index 664afc9bf44c..1284ee4887e3 100644
--- a/nixos/tests/fontconfig-default-fonts.nix
+++ b/nixos/tests/fontconfig-default-fonts.nix
@@ -3,7 +3,6 @@ import ./make-test-python.nix ({ lib, ... }:
name = "fontconfig-default-fonts";
meta.maintainers = with lib.maintainers; [
- jtojnar
];
nodes.machine = { config, pkgs, ... }: {
diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix
index 2f9e40616d57..b1f0f8cea3ff 100644
--- a/pkgs/applications/accessibility/contrast/default.nix
+++ b/pkgs/applications/accessibility/contrast/default.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
description = "Checks whether the contrast between two colors meet the WCAG requirements";
homepage = "https://gitlab.gnome.org/World/design/contrast";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix
index de4b7a3176f6..a63088245fdd 100644
--- a/pkgs/applications/audio/easyeffects/default.nix
+++ b/pkgs/applications/audio/easyeffects/default.nix
@@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
description = "Audio effects for PipeWire applications.";
homepage = "https://github.com/wwmm/easyeffects";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
badPlatforms = [ "aarch64-linux" ];
};
diff --git a/pkgs/applications/audio/osdlyrics/default.nix b/pkgs/applications/audio/osdlyrics/default.nix
index 0c14b8be2b6b..b0e1f6df867a 100644
--- a/pkgs/applications/audio/osdlyrics/default.nix
+++ b/pkgs/applications/audio/osdlyrics/default.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
description = "Standalone lyrics fetcher/displayer";
homepage = "https://github.com/osdlyrics/osdlyrics";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/audio/spot/default.nix b/pkgs/applications/audio/spot/default.nix
index 7dab868b941a..acd0c13811a6 100644
--- a/pkgs/applications/audio/spot/default.nix
+++ b/pkgs/applications/audio/spot/default.nix
@@ -79,6 +79,6 @@ stdenv.mkDerivation rec {
description = "Native Spotify client for the GNOME desktop";
homepage = "https://github.com/xou816/spot";
license = licenses.mit;
- maintainers = with maintainers; [ jtojnar tomfitzhenry ];
+ maintainers = with maintainers; [ tomfitzhenry ];
};
}
diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix
index e2b208f891a8..aca5e867d6c9 100644
--- a/pkgs/applications/backup/deja-dup/default.nix
+++ b/pkgs/applications/backup/deja-dup/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://wiki.gnome.org/Apps/DejaDup";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix
index a5cf2d560c01..1267ce2a211f 100644
--- a/pkgs/applications/editors/sublime/3/common.nix
+++ b/pkgs/applications/editors/sublime/3/common.nix
@@ -130,7 +130,7 @@ in stdenv.mkDerivation (rec {
meta = with lib; {
description = "Sophisticated text editor for code, markup and prose";
homepage = "https://www.sublimetext.com/";
- maintainers = with maintainers; [ jtojnar wmertens demin-dmitriy zimbatm ];
+ maintainers = with maintainers; [ wmertens demin-dmitriy zimbatm ];
license = licenses.unfree;
platforms = [ "x86_64-linux" "i686-linux" ];
};
diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix
index 81eaa442425b..1ca5dff62b79 100644
--- a/pkgs/applications/editors/sublime/4/common.nix
+++ b/pkgs/applications/editors/sublime/4/common.nix
@@ -141,7 +141,7 @@ in stdenv.mkDerivation (rec {
meta = with lib; {
description = "Sophisticated text editor for code, markup and prose";
homepage = "https://www.sublimetext.com/";
- maintainers = with maintainers; [ jtojnar wmertens demin-dmitriy zimbatm ];
+ maintainers = with maintainers; [ wmertens demin-dmitriy zimbatm ];
license = licenses.unfree;
platforms = [ "aarch64-linux" "x86_64-linux" ];
};
diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix
index 63725b97431b..6895a334f1e5 100644
--- a/pkgs/applications/graphics/gcolor3/default.nix
+++ b/pkgs/applications/graphics/gcolor3/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
description = "A simple color chooser written in GTK3";
homepage = "https://gitlab.gnome.org/World/gcolor3";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 55c95c95cf73..552e89ca9ffa 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -177,7 +177,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "The GNU Image Manipulation Program";
homepage = "https://www.gimp.org/";
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
license = licenses.gpl3Plus;
platforms = platforms.unix;
mainProgram = "gimp";
diff --git a/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix b/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix
index f1bac3dd76c4..58ccdea7e190 100644
--- a/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix
+++ b/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
description = "Inkscape extension which removes all matrix transforms by applying them recursively to shapes";
homepage = "https://github.com/Klowner/inkscape-applytransforms";
license = licenses.gpl2Only;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix
index b93b4794db81..7c0b3dbeee26 100644
--- a/pkgs/applications/graphics/mypaint/default.nix
+++ b/pkgs/applications/graphics/mypaint/default.nix
@@ -105,6 +105,6 @@ in buildPythonApplication rec {
homepage = "http://mypaint.org/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [ goibhniu jtojnar ];
+ maintainers = with maintainers; [ goibhniu ];
};
}
diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix
index 17a811aa87f8..f6f96514a42e 100644
--- a/pkgs/applications/graphics/openimageio/2.x.nix
+++ b/pkgs/applications/graphics/openimageio/2.x.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.openimageio.org";
description = "A library and tools for reading and writing images";
license = licenses.bsd3;
- maintainers = with maintainers; [ goibhniu jtojnar ];
+ maintainers = with maintainers; [ goibhniu ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 098d330f004a..9720b88be870 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -41,11 +41,11 @@
stdenv.mkDerivation rec {
pname = "shotwell";
- version = "0.30.15";
+ version = "0.30.16";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-OlKtYLEC2g31902wMcRdTM8mNRPJVGFu4WZL9PTpvck=";
+ sha256 = "sha256-yYgs+9rTA8uBYbFJrLtMYX++fKn2q24i0XTiRH51GPo=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index 63923188db7b..b2c34a883510 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -34,13 +34,13 @@
buildPythonApplication rec {
pname = "orca";
- version = "42.0";
+ version = "42.1";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "LCUXmrQbJgsY8f+Jm+uv5olDi0nf/SEd78l2olCT9zo=";
+ sha256 = "6p6dLehwg4ewUqe+FqXmnOqfZ2jfrrRee9meRmNxYt4=";
};
patches = [
diff --git a/pkgs/applications/networking/breitbandmessung/default.nix b/pkgs/applications/networking/breitbandmessung/default.nix
index 31f33be38670..ff14695cce84 100644
--- a/pkgs/applications/networking/breitbandmessung/default.nix
+++ b/pkgs/applications/networking/breitbandmessung/default.nix
@@ -1,32 +1,12 @@
{ lib
, stdenv
-, alsa-lib
-, at-spi2-atk
-, at-spi2-core
-, atk
-, autoPatchelfHook
-, cairo
-, cups
-, dbus
-, dpkg
-, expat
, fetchurl
-, gdk-pixbuf
-, glib
-, gtk3
-, libdrm
-, libxkbcommon
+, dpkg
+, electron_16
, makeWrapper
-, mesa
, nixosTests
-, nspr
-, nss
-, pango
-, pciutils
-, systemd
+, nodePackages
, undmg
-, writeShellScriptBin
-, xorg
}:
let
@@ -34,19 +14,6 @@ let
version = "3.1.0";
- # At first start, the program checks for supported operating systems by calling `lsb_release -a`
- # and only runs when it finds Debian/Ubuntu. So we present us as Debian an make it happy.
- fake-lsb-release = writeShellScriptBin "lsb_release" ''
- echo "Distributor ID: Debian"
- echo "Description: Debian GNU/Linux 10 (buster)"
- echo "Release: 10"
- echo "Codename: buster"
- '';
-
- binPath = lib.makeBinPath [
- fake-lsb-release
- ];
-
systemArgs = rec {
x86_64-linux = rec {
src = fetchurl {
@@ -54,68 +21,41 @@ let
sha256 = "sha256-jSP+H9ej9Wd+swBZSy9uMi2ExSTZ191FGZhqaocTl7w=";
};
- dontUnpack = true;
-
nativeBuildInputs = [
- autoPatchelfHook
dpkg
makeWrapper
+ nodePackages.asar
];
- buildInputs = runtimeDependencies;
-
- runtimeDependencies = [
- alsa-lib
- at-spi2-atk
- at-spi2-core
- atk
- cairo
- cups
- dbus
- expat
- gdk-pixbuf
- glib
- gtk3
- libdrm
- libxkbcommon
- mesa
- nspr
- nss
- pango
- pciutils
- systemd
- xorg.libX11
- xorg.libXcomposite
- xorg.libXdamage
- xorg.libXext
- xorg.libXfixes
- xorg.libXrandr
- xorg.libxcb
- xorg.libxshmfence
- ];
+ unpackPhase = "dpkg-deb -x $src .";
installPhase = ''
- dpkg-deb -x $src $out
mkdir -p $out/bin
+ mv usr/share $out/share
+ mkdir -p $out/share/breitbandmessung/resources
- chmod -R g-w $out
+ asar e opt/Breitbandmessung/resources/app.asar $out/share/breitbandmessung/resources
- addAutoPatchelfSearchPath --no-recurse $out/opt/Breitbandmessung
- autoPatchelfFile $out/opt/Breitbandmessung/breitbandmessung
+ # At first start, the program checks for supported operating systems by using the `bizzby-lsb-release`
+ # module and only runs when it finds Debian/Ubuntu. So we present us as Debian and make it happy.
+ cat < $out/share/breitbandmessung/resources/node_modules/bizzby-lsb-release/lib/lsb-release.js
+ module.exports = function release() {
+ return {
+ distributorID: "Debian",
+ description: "Debian GNU/Linux 10 (buster)",
+ release: "10",
+ codename: "buster"
+ }
+ }
+ EOF
- makeWrapper $out/opt/Breitbandmessung/breitbandmessung $out/bin/breitbandmessung \
- --prefix PATH : ${binPath}
-
- mv $out/usr/share $out/share
- rmdir $out/usr
+ makeWrapper ${electron_16}/bin/electron $out/bin/breitbandmessung \
+ --add-flags $out/share/breitbandmessung/resources/build/electron.js
# Fix the desktop link
substituteInPlace $out/share/applications/breitbandmessung.desktop \
--replace /opt/Breitbandmessung $out/bin
'';
-
- dontAutoPatchelf = true;
- dontPatchELF = true;
};
x86_64-darwin = {
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 031439f75d23..5cd12fbd2826 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -1,21 +1,21 @@
{
"stable": {
- "version": "101.0.4951.64",
- "sha256": "1xyqm32y9v1hn8ji6qfw6maynqgg3266j58dq4x4aqsm2gj9cn4w",
- "sha256bin64": "14ijrj7h2y72ppyysz6jv40c01lbnan7z69cl24asch2zjlgwv8v",
+ "version": "102.0.5005.61",
+ "sha256": "07vbi3gn9g4n04b2qi2hm34r122snrqaifa46yk3pyh1d79rfdqs",
+ "sha256bin64": "100n8k3d9k5bq58irc36ig6m5m0lxggffyk4crqqqcib2anqd0zv",
"deps": {
"gn": {
- "version": "2022-03-14",
+ "version": "2022-04-14",
"url": "https://gn.googlesource.com/gn",
- "rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb",
- "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3"
+ "rev": "fd9f2036f26d83f9fcfe93042fb952e5a7fe2167",
+ "sha256": "0b5xs0chcv3hfhy71rycsmgxnqbm375a333hwav8929k9cbi5p9h"
}
},
"chromedriver": {
- "version": "101.0.4951.41",
- "sha256_linux": "0zsh6cm7h1m0k5mx1cd29knxjxaadjjcbp7m5fr2mx9c21a1nlcr",
- "sha256_darwin": "09py50436y81lw2vk44256dmzsg8dqj14fd0g0gs1cc3ps6q4awl",
- "sha256_darwin_aarch64": "0krjijd0zgwg8d44miz43xrjdlvfiymbrrz5r1hzpx64555ch12y"
+ "version": "102.0.5005.27",
+ "sha256_linux": "1978xwj9kf8nihgakmnzgibizq6wp74qp2d2fxgrsgggjy1clmbv",
+ "sha256_darwin": "0abnqpdm5hgirzj9g2zwkjcc7cwnnr3va4qn09g5yqndlbvi9nqd",
+ "sha256_darwin_aarch64": "0mw7vypghnw3qdci8g11hgfwbfln471dq1mymxn4bi7691xxb6a2"
}
},
"beta": {
diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix
index 84f46f1b60d8..1daa5d351a8c 100644
--- a/pkgs/applications/networking/browsers/elinks/default.nix
+++ b/pkgs/applications/networking/browsers/elinks/default.nix
@@ -4,7 +4,7 @@
, # Incompatible licenses, LGPLv3 - GPLv2
enableGuile ? false, guile ? null
, enablePython ? false, python ? null
-, enablePerl ? (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null
+, enablePerl ? (!stdenv.isDarwin) && (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null
# re-add javascript support when upstream supports modern spidermonkey
}:
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index aad4b24d7404..24b65db364d0 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -43,21 +43,6 @@ python3.pkgs.buildPythonApplication rec {
gettext wrapGAppsHook
];
- # Workaround for https://dev.gajim.org/gajim/gajim/-/issues/10719.
- # We don't use plugin release URL because it's updated in place.
- plugins = fetchFromGitLab {
- domain = "dev.gajim.org";
- owner = "gajim";
- repo = "gajim-plugins";
- rev = "fea522e4360cec6ceacbf1df92644ab3343d4b99";
- sha256 = "sha256-CmwEiLsdldoOfgHfWL/5hf/dp0HEDNAIlc5N0Np20KE=";
- };
-
- postPatch = ''
- mkdir -p gajim/data/plugins
- cp -r $plugins/plugin_installer gajim/data/plugins
- '';
-
dontWrapGApps = true;
preFixup = ''
@@ -65,7 +50,7 @@ python3.pkgs.buildPythonApplication rec {
'';
propagatedBuildInputs = with python3.pkgs; [
- nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools packaging
+ nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools packaging gssapi
] ++ lib.optionals enableE2E [ pycrypto python-gnupg ]
++ lib.optional enableRST docutils
++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]
@@ -88,7 +73,7 @@ python3.pkgs.buildPythonApplication rec {
description = "Jabber client written in PyGTK";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ raskin abbradar ];
- downloadPage = "http://gajim.org/downloads.php";
+ downloadPage = "http://gajim.org/download/";
platforms = lib.platforms.linux;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index ad7a588d9cea..1bf0e329073d 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
description = "Logger service for Telepathy framework";
homepage = "https://telepathy.freedesktop.org/components/telepathy-logger/";
license = licenses.lgpl21;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.gnu ++ platforms.linux; # Arbitrary choice
};
}
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
index 8464619f1e73..3a979885984a 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
description = "An account manager and channel dispatcher for the Telepathy framework";
homepage = "https://telepathy.freedesktop.org/components/telepathy-mission-control/";
license = licenses.lgpl21Only;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/office/scribus/1_4.nix b/pkgs/applications/office/scribus/1_4.nix
new file mode 100644
index 000000000000..a6427d0f890b
--- /dev/null
+++ b/pkgs/applications/office/scribus/1_4.nix
@@ -0,0 +1,52 @@
+{ lib, stdenv, fetchurl, pkg-config, freetype, lcms, libtiff, libxml2
+, libart_lgpl, qt4, python2, cups, fontconfig, libjpeg
+, zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }:
+
+let
+ icon = fetchurl {
+ url = "https://gist.githubusercontent.com/ejpcmac/a74b762026c9bc4000be624c3d085517/raw/18edc497c5cb6fdeef1c8aede37a0ee68413f9d3/scribus-icon-centered.svg";
+ sha256 = "0hq3i7c2l50445an9glhhg47kj26y16svfajc6naqn307ph9vzc3";
+ };
+
+ pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]);
+in stdenv.mkDerivation rec {
+ pname = "scribus";
+ version = "1.4.8";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992";
+ };
+
+ nativeBuildInputs = [ pkg-config cmake ];
+ buildInputs = with xorg;
+ [ freetype lcms libtiff libxml2 libart_lgpl qt4
+ pythonEnv cups fontconfig
+ libjpeg zlib libpng podofo hunspell cairo
+ boost # for internal 2geom library
+ libXaw libXext libX11 libXtst libXi libXinerama
+ libpthreadstubs libXau libXdmcp
+ imagemagick # To build the icon
+ ];
+
+ postPatch = ''
+ substituteInPlace scribus/util_ghostscript.cpp \
+ --replace 'QString gsName("gs");' \
+ 'QString gsName("${ghostscript}/bin/gs");'
+ '';
+
+ postInstall = ''
+ for i in 16 24 48 64 96 128 256 512; do
+ mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps
+ convert -background none -resize ''${i}x''${i} ${icon} $out/share/icons/hicolor/''${i}x''${i}/apps/scribus.png
+ done
+ '';
+
+ meta = {
+ maintainers = [ lib.maintainers.marcweber ];
+ platforms = lib.platforms.linux;
+ description = "Desktop Publishing (DTP) and Layout program for Linux";
+ homepage = "https://www.scribus.net";
+ license = lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix
index a6427d0f890b..d3f706bbf054 100644
--- a/pkgs/applications/office/scribus/default.nix
+++ b/pkgs/applications/office/scribus/default.nix
@@ -1,52 +1,143 @@
-{ lib, stdenv, fetchurl, pkg-config, freetype, lcms, libtiff, libxml2
-, libart_lgpl, qt4, python2, cups, fontconfig, libjpeg
-, zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }:
+{ boost
+, cairo
+, cmake
+, cups
+, fetchurl
+, fetchpatch
+, fontconfig
+, freetype
+, harfbuzzFull
+, hunspell
+, lcms2
+, libjpeg
+, libtiff
+, libxml2
+, mkDerivation
+, pixman
+, pkg-config
+, podofo
+, poppler
+, poppler_data
+, python3
+, qtbase
+, qtimageformats
+, qttools
+, lib
+}:
let
- icon = fetchurl {
- url = "https://gist.githubusercontent.com/ejpcmac/a74b762026c9bc4000be624c3d085517/raw/18edc497c5cb6fdeef1c8aede37a0ee68413f9d3/scribus-icon-centered.svg";
- sha256 = "0hq3i7c2l50445an9glhhg47kj26y16svfajc6naqn307ph9vzc3";
- };
-
- pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]);
-in stdenv.mkDerivation rec {
+ pythonEnv = python3.withPackages (
+ ps: [
+ ps.pillow
+ ps.tkinter
+ ]
+ );
+in
+mkDerivation rec {
pname = "scribus";
- version = "1.4.8";
+
+ version = "1.5.7";
src = fetchurl {
- url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.xz";
- sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992";
+ url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz";
+ sha256 = "sha256-MYMWss/Hp2GR0+DT+MImUUfa6gVwFiAo4kPCktgm+M4=";
};
- nativeBuildInputs = [ pkg-config cmake ];
- buildInputs = with xorg;
- [ freetype lcms libtiff libxml2 libart_lgpl qt4
- pythonEnv cups fontconfig
- libjpeg zlib libpng podofo hunspell cairo
- boost # for internal 2geom library
- libXaw libXext libX11 libXtst libXi libXinerama
- libpthreadstubs libXau libXdmcp
- imagemagick # To build the icon
+ patches = [
+ # For harfbuzz >= 2.9.0
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch";
+ sha256 = "sha256-noRCaN63ZYFfXmAluEYXdFPNOk3s5W3KBAsLU1Syxv4=";
+ })
+ # For harfbuzz >= 3.0
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch";
+ sha256 = "sha256-xhp65qVvaof0md1jb3XHZw7uFX1RtNxPfUOaVnvZV1Y=";
+ })
+ # For Poppler 22.02
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/85c0dff3422fa3c26fbc2e8d8561f597ec24bd92.patch";
+ sha256 = "YR0ii09EVU8Qazz6b8KAIWsUMTwPIwO8JuQPymAWKdw=";
+ })
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/f75c1613db67f4067643d0218a2db3235e42ec9f.patch";
+ sha256 = "vJU8HsKHE3oXlhcXQk9uCYINPYVPF5IGmrWYFQ6Py5c=";
+ })
+ # For Poppler 22.03
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/553d1fd5f76ffb3743583b88c78a7232b076a965.patch";
+ sha256 = "56JrEG3eCzyALTH04yjzurKRj2PocpjO6b4PusMRxjY=";
+ })
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/1f82e38be0782b065910f5fb4cece23f690349ae.patch";
+ sha256 = "qektUfel5KeA327D3THyqi8dznP1SQQFToUC5Kd0+W4=";
+ })
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/f19410ac3b27e33dd62105746784e61e85b90a1d.patch";
+ sha256 = "JHdgntYcioYatPeqpmym3c9dORahj0CinGOzbGtA4ds=";
+ })
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/e013e8126d2100e8e56dea5b836ad43275429389.patch";
+ sha256 = "+siPNtJq9Is9V2PgADeQJB+b4lkl5g8uk6zKBu10Jqw=";
+ })
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/48263954a7dee0be815b00f417ae365ab26cdd85.patch";
+ sha256 = "1WE9kALFw79bQH88NUafXaZ1Y/vJEKTIWxlk5c+opsQ=";
+ })
+ # For Poppler 22.04
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch";
+ sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw=";
+ })
+ ];
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ ];
+
+ buildInputs = [
+ boost
+ cairo
+ cups
+ fontconfig
+ freetype
+ harfbuzzFull
+ hunspell
+ lcms2
+ libjpeg
+ libtiff
+ libxml2
+ pixman
+ podofo
+ poppler
+ poppler_data
+ pythonEnv
+ qtbase
+ qtimageformats
+ qttools
+ ];
+
+ cmakeFlags = [
+ # poppler uses std::optional
+ "-DWANT_CPP17=ON"
+ ];
+
+ meta = with lib; {
+ maintainers = with maintainers; [
+ erictapen
+ kiwi
];
-
- postPatch = ''
- substituteInPlace scribus/util_ghostscript.cpp \
- --replace 'QString gsName("gs");' \
- 'QString gsName("${ghostscript}/bin/gs");'
- '';
-
- postInstall = ''
- for i in 16 24 48 64 96 128 256 512; do
- mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps
- convert -background none -resize ''${i}x''${i} ${icon} $out/share/icons/hicolor/''${i}x''${i}/apps/scribus.png
- done
- '';
-
- meta = {
- maintainers = [ lib.maintainers.marcweber ];
- platforms = lib.platforms.linux;
+ platforms = platforms.linux;
description = "Desktop Publishing (DTP) and Layout program for Linux";
homepage = "https://www.scribus.net";
- license = lib.licenses.gpl2;
+ # There are a lot of licenses...
+ # https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19
+ license = with licenses; [
+ bsd3
+ gpl2Plus
+ mit
+ publicDomain
+ ];
};
}
diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix
deleted file mode 100644
index d3f706bbf054..000000000000
--- a/pkgs/applications/office/scribus/unstable.nix
+++ /dev/null
@@ -1,143 +0,0 @@
-{ boost
-, cairo
-, cmake
-, cups
-, fetchurl
-, fetchpatch
-, fontconfig
-, freetype
-, harfbuzzFull
-, hunspell
-, lcms2
-, libjpeg
-, libtiff
-, libxml2
-, mkDerivation
-, pixman
-, pkg-config
-, podofo
-, poppler
-, poppler_data
-, python3
-, qtbase
-, qtimageformats
-, qttools
-, lib
-}:
-
-let
- pythonEnv = python3.withPackages (
- ps: [
- ps.pillow
- ps.tkinter
- ]
- );
-in
-mkDerivation rec {
- pname = "scribus";
-
- version = "1.5.7";
-
- src = fetchurl {
- url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz";
- sha256 = "sha256-MYMWss/Hp2GR0+DT+MImUUfa6gVwFiAo4kPCktgm+M4=";
- };
-
- patches = [
- # For harfbuzz >= 2.9.0
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/1b546978bc4ea0b2a73fbe4d7cf947887e865162.patch";
- sha256 = "sha256-noRCaN63ZYFfXmAluEYXdFPNOk3s5W3KBAsLU1Syxv4=";
- })
- # For harfbuzz >= 3.0
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch";
- sha256 = "sha256-xhp65qVvaof0md1jb3XHZw7uFX1RtNxPfUOaVnvZV1Y=";
- })
- # For Poppler 22.02
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/85c0dff3422fa3c26fbc2e8d8561f597ec24bd92.patch";
- sha256 = "YR0ii09EVU8Qazz6b8KAIWsUMTwPIwO8JuQPymAWKdw=";
- })
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/f75c1613db67f4067643d0218a2db3235e42ec9f.patch";
- sha256 = "vJU8HsKHE3oXlhcXQk9uCYINPYVPF5IGmrWYFQ6Py5c=";
- })
- # For Poppler 22.03
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/553d1fd5f76ffb3743583b88c78a7232b076a965.patch";
- sha256 = "56JrEG3eCzyALTH04yjzurKRj2PocpjO6b4PusMRxjY=";
- })
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/1f82e38be0782b065910f5fb4cece23f690349ae.patch";
- sha256 = "qektUfel5KeA327D3THyqi8dznP1SQQFToUC5Kd0+W4=";
- })
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/f19410ac3b27e33dd62105746784e61e85b90a1d.patch";
- sha256 = "JHdgntYcioYatPeqpmym3c9dORahj0CinGOzbGtA4ds=";
- })
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/e013e8126d2100e8e56dea5b836ad43275429389.patch";
- sha256 = "+siPNtJq9Is9V2PgADeQJB+b4lkl5g8uk6zKBu10Jqw=";
- })
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/48263954a7dee0be815b00f417ae365ab26cdd85.patch";
- sha256 = "1WE9kALFw79bQH88NUafXaZ1Y/vJEKTIWxlk5c+opsQ=";
- })
- # For Poppler 22.04
- (fetchpatch {
- url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch";
- sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw=";
- })
- ];
-
- nativeBuildInputs = [
- cmake
- pkg-config
- ];
-
- buildInputs = [
- boost
- cairo
- cups
- fontconfig
- freetype
- harfbuzzFull
- hunspell
- lcms2
- libjpeg
- libtiff
- libxml2
- pixman
- podofo
- poppler
- poppler_data
- pythonEnv
- qtbase
- qtimageformats
- qttools
- ];
-
- cmakeFlags = [
- # poppler uses std::optional
- "-DWANT_CPP17=ON"
- ];
-
- meta = with lib; {
- maintainers = with maintainers; [
- erictapen
- kiwi
- ];
- platforms = platforms.linux;
- description = "Desktop Publishing (DTP) and Layout program for Linux";
- homepage = "https://www.scribus.net";
- # There are a lot of licenses...
- # https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19
- license = with licenses; [
- bsd3
- gpl2Plus
- mit
- publicDomain
- ];
- };
-}
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index f8f58cdcaba2..be6085f2fb1c 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -86,6 +86,6 @@ python3.pkgs.buildPythonApplication rec {
homepage = "http://meldmerge.org/";
license = licenses.gpl2Plus;
platforms = platforms.linux ++ platforms.darwin;
- maintainers = with maintainers; [ jtojnar mimame ];
+ maintainers = with maintainers; [ mimame ];
};
}
diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix
index 6a37809bb5f5..28e8a86d5b43 100644
--- a/pkgs/applications/window-managers/phosh/default.nix
+++ b/pkgs/applications/window-managers/phosh/default.nix
@@ -121,7 +121,7 @@ stdenv.mkDerivation rec {
description = "A pure Wayland shell prototype for GNOME on mobile devices";
homepage = "https://gitlab.gnome.org/World/Phosh/phosh";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ jtojnar masipcat zhaofengli ];
+ maintainers = with maintainers; [ masipcat zhaofengli ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix
index 408448f26a0e..924e6d95f14a 100644
--- a/pkgs/build-support/emacs/melpa.nix
+++ b/pkgs/build-support/emacs/melpa.nix
@@ -38,8 +38,8 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({
packageBuild = fetchFromGitHub {
owner = "melpa";
repo = "package-build";
- rev = "047801d301a73d4932f33f768d94a8ed26b8d524";
- sha256 = "0ygzkpg7xc3mjjbxg1kcyz6fwbkb0prvca499f0ffmhfaiv28h59";
+ rev = "35017a2d87376c70c3239f48bdbac7efca85aa10";
+ sha256 = "07hdmam85452v4r2vaabj1qfyami1hgbh0jgj9dcwbkpr0y1gvqj";
};
elpa2nix = ./elpa2nix.el;
diff --git a/pkgs/build-support/emacs/melpa2nix.el b/pkgs/build-support/emacs/melpa2nix.el
index 383423af0818..72667dea652c 100644
--- a/pkgs/build-support/emacs/melpa2nix.el
+++ b/pkgs/build-support/emacs/melpa2nix.el
@@ -11,12 +11,22 @@
;; Allow installing package tarfiles larger than 10MB
(setq large-file-warning-threshold nil)
+(defun melpa2nix-build-package-1 (rcp version commit)
+ (let ((source-dir (package-recipe--working-tree rcp)))
+ (unwind-protect
+ (let ((files (package-build-expand-files-spec rcp t)))
+ (cond
+ ((= (length files) 1)
+ (package-build--build-single-file-package
+ rcp version commit files source-dir))
+ ((> (length files) 1)
+ (package-build--build-multi-file-package
+ rcp version commit files source-dir))
+ (t (error "Unable to find files matching recipe patterns")))))))
+
(defun melpa2nix-build-package ()
(if (not noninteractive)
(error "`melpa2nix-build-package' is to be used only with -batch"))
(pcase command-line-args-left
(`(,package ,version ,commit)
- ;; Monkey-patch package-build so it doesn't shell out to git/hg.
- (defun package-build--get-commit (&rest _)
- commit)
- (package-build--package (package-recipe-lookup package) version))))
+ (melpa2nix-build-package-1 (package-recipe-lookup package) version commit))))
diff --git a/pkgs/build-support/kernel/compress-firmware-xz.nix b/pkgs/build-support/kernel/compress-firmware-xz.nix
index 56595131c891..6a797226aa67 100644
--- a/pkgs/build-support/kernel/compress-firmware-xz.nix
+++ b/pkgs/build-support/kernel/compress-firmware-xz.nix
@@ -7,7 +7,7 @@ runCommand "${firmware.name}-xz" {} ''
(cd ${firmware} && find lib/firmware -type d -print0) |
(cd $out && xargs -0 mkdir -v --)
(cd ${firmware} && find lib/firmware -type f -print0) |
- (cd $out && xargs -0tP "$NIX_BUILD_CORES" -n1 \
+ (cd $out && xargs -0rtP "$NIX_BUILD_CORES" -n1 \
sh -c 'xz -9c -T1 -C crc32 --lzma2=dict=2MiB "${firmware}/$1" > "$1.xz"' --)
(cd ${firmware} && find lib/firmware -type l) | while read link; do
target="$(readlink "${firmware}/$link")"
diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix
index a5ffc2ec33a5..3e25568239d3 100644
--- a/pkgs/data/fonts/input-fonts/default.nix
+++ b/pkgs/data/fonts/input-fonts/default.nix
@@ -90,7 +90,6 @@ stdenv.mkDerivation rec {
homepage = "https://input.djr.com/";
license = licenses.unfree;
maintainers = with maintainers; [
- jtojnar
romildo
];
platforms = platforms.all;
diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix
index 593817275669..fb80bfb4445f 100644
--- a/pkgs/data/fonts/joypixels/default.nix
+++ b/pkgs/data/fonts/joypixels/default.nix
@@ -98,6 +98,6 @@ stdenv.mkDerivation rec {
appendixUrl = appendix.url;
free = false;
};
- maintainers = with maintainers; [ toonn jtojnar ];
+ maintainers = with maintainers; [ toonn ];
};
}
diff --git a/pkgs/data/fonts/tex-gyre/default.nix b/pkgs/data/fonts/tex-gyre/default.nix
index 6ce5bd207862..c0ec9ee75202 100644
--- a/pkgs/data/fonts/tex-gyre/default.nix
+++ b/pkgs/data/fonts/tex-gyre/default.nix
@@ -28,7 +28,7 @@ let
# which is a free license, legally equivalent to the LaTeX Project Public
# License (LPPL), version 1.3c or later." - GUST website
license = licenses.lppl13c;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.all;
};
};
diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix
index 92c01b427e2d..95459f5463e8 100644
--- a/pkgs/data/fonts/twitter-color-emoji/default.nix
+++ b/pkgs/data/fonts/twitter-color-emoji/default.nix
@@ -112,6 +112,6 @@ stdenv.mkDerivation rec {
# In Fedora twitter-twemoji-fonts source
## spec files are MIT: https://fedoraproject.org/wiki/Licensing:Main#License_of_Fedora_SPEC_Files
license = with licenses; [ asl20 ofl cc-by-40 mit ];
- maintainers = with maintainers; [ jtojnar emily ];
+ maintainers = with maintainers; [ emily ];
};
}
diff --git a/pkgs/desktops/gnome/apps/seahorse/default.nix b/pkgs/desktops/gnome/apps/seahorse/default.nix
index 8265636344fc..60b1e2d572ed 100644
--- a/pkgs/desktops/gnome/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome/apps/seahorse/default.nix
@@ -27,11 +27,11 @@
stdenv.mkDerivation rec {
pname = "seahorse";
- version = "41.0";
+ version = "42.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
- hash = "sha256-5u7AnoEESClfVH8YwdV3K2XD7cHZ5aJZXxC13eaJKfU=";
+ hash = "sha256-xQys6/jeen4uXx2uC5gjIRR0Epar6NVD45I9YqFT1jA=";
};
nativeBuildInputs = [
@@ -51,7 +51,6 @@ stdenv.mkDerivation rec {
gcr
gsettings-desktop-schemas
gnupg
- gnome.adwaita-icon-theme
gpgme
libsecret
avahi
@@ -78,6 +77,13 @@ stdenv.mkDerivation rec {
export HOME=$TMPDIR
'';
+ preFixup = ''
+ gappsWrapperArgs+=(
+ # Pick up icons from Gcr
+ --prefix XDG_DATA_DIRS : "${gcr}/share"
+ )
+ '';
+
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix
index cda0abaf2f75..8f5a81f0bf55 100644
--- a/pkgs/desktops/gnome/core/evince/default.nix
+++ b/pkgs/desktops/gnome/core/evince/default.nix
@@ -43,13 +43,13 @@
stdenv.mkDerivation rec {
pname = "evince";
- version = "42.2";
+ version = "42.3";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "/3+B8wjPjUlW7Zf7ckp+SUSMIUvuq5mIEu+e+7ON+K4=";
+ sha256 = "Sa7PhFyUbJbbF7qJ11yAAsWuiWP1BKmwYm0SZ1kUZF4=";
};
postPatch = ''
diff --git a/pkgs/desktops/gnome/core/gnome-keyring/default.nix b/pkgs/desktops/gnome/core/gnome-keyring/default.nix
index afbec6f8c5d1..22a94de5e84d 100644
--- a/pkgs/desktops/gnome/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-keyring/default.nix
@@ -10,6 +10,7 @@
, libxslt
, gettext
, gcr
+, autoreconfHook
, libcap_ng
, libselinux
, p11-kit
@@ -22,19 +23,21 @@
stdenv.mkDerivation rec {
pname = "gnome-keyring";
- version = "40.0";
+ version = "42.1";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "0cdrlcw814zayhvlaxqs1sm9bqlfijlp22dzzd0g5zg2isq4vlm3";
+ sha256 = "x/TQQMx2prf+Z+CO+RBpEcPIDUD8iMv8jiaEpMlG4+Y=";
};
nativeBuildInputs = [
pkg-config
gettext
libxslt
+ # Upstream uses ancient autotools to pre-generate the scripts.
+ autoreconfHook
docbook-xsl-nons
docbook_xml_dtd_43
wrapGAppsHook
diff --git a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix
index e7afab4c9ac9..f5a99afe8742 100644
--- a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix
+++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
description = "A dock for the Gnome Shell";
homepage = "https://micheleg.github.io/dash-to-dock/";
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ eperuffo jtojnar rhoriguchi ];
+ maintainers = with maintainers; [ eperuffo rhoriguchi ];
};
}
diff --git a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix
index 72b4ef744fb7..71deb73c2990 100644
--- a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix
+++ b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "GNOME Shell extension adding audio device chooser to panel";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
homepage = "https://github.com/kgshank/gse-sound-output-device-chooser";
};
}
diff --git a/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix
index ef0e22b7abed..1ac4589b355a 100644
--- a/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix
+++ b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "GNOME Shell extension showing a video preview on the corner of the screen";
license = licenses.mit;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
homepage = "https://github.com/medenagan/window-corner-preview";
broken = lib.versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34
};
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 8dc2b4c02bbf..a49648f821fd 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -84,7 +84,7 @@ let
homepage = "https://wiki.gnome.org/Projects/Vala";
license = licenses.lgpl21Plus;
platforms = platforms.unix;
- maintainers = with maintainers; [ antono jtojnar maxeaubrey ] ++ teams.pantheon.members;
+ maintainers = with maintainers; [ antono maxeaubrey ] ++ teams.pantheon.members;
};
});
diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index 3d396a0b2855..b913affec026 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
homepage = "https://gegl.org/babl/";
changelog = "https://gitlab.gnome.org/GNOME/babl/-/blob/BABL_${lib.replaceStrings [ "." ] [ "_" ] version}/NEWS";
license = licenses.lgpl3Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix
index cbe34b871656..6b2cb74c99fb 100644
--- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix
+++ b/pkgs/development/libraries/dleyna-connector-dbus/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A D-Bus API for the dLeyna services";
homepage = "https://github.com/phako/dleyna-connector-dbus";
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
license = licenses.lgpl21Only;
};
diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/development/libraries/dleyna-core/default.nix
index abb6178809f2..09f50b9c75cb 100644
--- a/pkgs/development/libraries/dleyna-core/default.nix
+++ b/pkgs/development/libraries/dleyna-core/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Library of utility functions that are used by the higher level dLeyna";
homepage = "https://github.com/phako/dleyna-core";
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
license = licenses.lgpl21Only;
};
diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/development/libraries/dleyna-renderer/default.nix
index 6daade555317..40386af20542 100644
--- a/pkgs/development/libraries/dleyna-renderer/default.nix
+++ b/pkgs/development/libraries/dleyna-renderer/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Library to discover and manipulate Digital Media Renderers";
homepage = "https://github.com/phako/dleyna-renderer";
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
license = licenses.lgpl21Only;
};
diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/development/libraries/dleyna-server/default.nix
index 484afc7c417d..c47283d23a79 100644
--- a/pkgs/development/libraries/dleyna-server/default.nix
+++ b/pkgs/development/libraries/dleyna-server/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Library to discover, browse and manipulate Digital Media Servers";
homepage = "https://github.com/phako/dleyna-server";
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
license = licenses.lgpl21Only;
};
diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix
index e70a8210df87..5a2430038559 100644
--- a/pkgs/development/libraries/enchant/2.x.nix
+++ b/pkgs/development/libraries/enchant/2.x.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
description = "Generic spell checking library";
homepage = "https://abiword.github.io/enchant/";
license = licenses.lgpl21Plus; # with extra provision for non-free checkers
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index c992a6b0dfa2..c5f6ac2b3314 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -196,7 +196,7 @@ stdenv.mkDerivation rec {
description = "Linux application sandboxing and distribution framework";
homepage = "https://flatpak.org/";
license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix
index df1b86fd1b78..e13dc6d63cda 100644
--- a/pkgs/development/libraries/gegl/default.nix
+++ b/pkgs/development/libraries/gegl/default.nix
@@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
description = "Graph-based image processing framework";
homepage = "https://www.gegl.org";
license = licenses.lgpl3Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/glib-testing/default.nix b/pkgs/development/libraries/glib-testing/default.nix
index d77a5418a13e..5c1142071ede 100644
--- a/pkgs/development/libraries/glib-testing/default.nix
+++ b/pkgs/development/libraries/glib-testing/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
description = "Test library providing test harnesses and mock classes complementing the classes provided by GLib";
homepage = "https://gitlab.gnome.org/pwithnall/libglib-testing";
license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/development/libraries/gthree/default.nix
index fa4cb404b0aa..f8e50f384590 100644
--- a/pkgs/development/libraries/gthree/default.nix
+++ b/pkgs/development/libraries/gthree/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
description = "GObject/GTK port of three.js";
homepage = "https://github.com/alexlarsson/gthree";
license = licenses.mit;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gthree.x86_64-darwin
};
diff --git a/pkgs/development/libraries/lib2geom/default.nix b/pkgs/development/libraries/lib2geom/default.nix
index 755ed6b814e6..f4798a11ce1c 100644
--- a/pkgs/development/libraries/lib2geom/default.nix
+++ b/pkgs/development/libraries/lib2geom/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
description = "Easy to use 2D geometry library in C++";
homepage = "https://gitlab.com/inkscape/lib2geom";
license = [ licenses.lgpl21Only licenses.mpl11 ];
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libabigail/default.nix b/pkgs/development/libraries/libabigail/default.nix
index d18b5e11cf90..6dc151000389 100644
--- a/pkgs/development/libraries/libabigail/default.nix
+++ b/pkgs/development/libraries/libabigail/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
description = "ABI Generic Analysis and Instrumentation Library";
homepage = "https://sourceware.org/libabigail/";
license = with licenses; [ asl20 llvm-exception ];
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/pkgs/development/libraries/libcloudproviders/default.nix
index 08601db08342..72013de5c1e9 100644
--- a/pkgs/development/libraries/libcloudproviders/default.nix
+++ b/pkgs/development/libraries/libcloudproviders/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
description = "DBus API that allows cloud storage sync clients to expose their services";
homepage = "https://gitlab.gnome.org/World/libcloudproviders";
license = licenses.lgpl3Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix
index 2c2b09b44923..61b130fe5da9 100644
--- a/pkgs/development/libraries/libhandy/0.x.nix
+++ b/pkgs/development/libraries/libhandy/0.x.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
description = "A library full of GTK widgets for mobile phones";
homepage = "https://source.puri.sm/Librem5/libhandy";
license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix
index ca4509ff3cc2..bd36bc0a4761 100644
--- a/pkgs/development/libraries/libjcat/default.nix
+++ b/pkgs/development/libraries/libjcat/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
description = "Library for reading and writing Jcat files";
homepage = "https://github.com/hughsie/libjcat";
license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix
index 893704ddb18c..a12bb1692396 100644
--- a/pkgs/development/libraries/liblouis/default.nix
+++ b/pkgs/development/libraries/liblouis/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
description = "Open-source braille translator and back-translator";
homepage = "http://liblouis.org/";
license = licenses.lgpl21;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix
index 655480f75a2f..733f77cdafef 100644
--- a/pkgs/development/libraries/libmypaint/default.nix
+++ b/pkgs/development/libraries/libmypaint/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
homepage = "http://mypaint.org/";
description = "Library for making brushstrokes which is used by MyPaint and other projects";
license = licenses.isc;
- maintainers = with maintainers; [ goibhniu jtojnar ];
+ maintainers = with maintainers; [ goibhniu ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/development/libraries/libportal/default.nix
index cb0da5c560d2..ebc6b3fd846e 100644
--- a/pkgs/development/libraries/libportal/default.nix
+++ b/pkgs/development/libraries/libportal/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
description = "Flatpak portal library";
homepage = "https://github.com/flatpak/libportal";
license = licenses.lgpl3Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index f0b4d0baf4fb..16842b628459 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -128,6 +128,6 @@ stdenv.mkDerivation rec {
description = "XML parsing library for C";
license = licenses.mit;
platforms = platforms.all;
- maintainers = with maintainers; [ eelco jtojnar ];
+ maintainers = with maintainers; [ eelco ];
};
}
diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix
index c7dbfc8889c9..d4820d6909a4 100644
--- a/pkgs/development/libraries/libxmlb/default.nix
+++ b/pkgs/development/libraries/libxmlb/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
description = "A library to help create and query binary XML blobs";
homepage = "https://github.com/hughsie/libxmlb";
license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index a8ed68b088bd..5d5d66c570a4 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
description = "A C library and tools to do XSL transformations";
license = licenses.mit;
platforms = platforms.all;
- maintainers = with maintainers; [ eelco jtojnar ];
+ maintainers = with maintainers; [ eelco ];
broken = pythonSupport && !libxml2.pythonSupport; # see #73102 for why this is not an assert
};
}
diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix
index 791fae96f0fc..5cb44b4c47aa 100644
--- a/pkgs/development/libraries/malcontent/default.nix
+++ b/pkgs/development/libraries/malcontent/default.nix
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
description = "Parental controls library";
homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent";
license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/malcontent/ui.nix b/pkgs/development/libraries/malcontent/ui.nix
index e306267154ae..6c5af80cb424 100644
--- a/pkgs/development/libraries/malcontent/ui.nix
+++ b/pkgs/development/libraries/malcontent/ui.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
description = "UI components for parental controls library";
homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent";
license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/development/libraries/mutest/default.nix
index f2d3a5595530..50da79b8f656 100644
--- a/pkgs/development/libraries/mutest/default.nix
+++ b/pkgs/development/libraries/mutest/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
homepage = "https://ebassi.github.io/mutest/mutest.md.html";
description = "A BDD testing framework for C, inspired by Mocha";
license = licenses.mit;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/mypaint-brushes/1.0.nix b/pkgs/development/libraries/mypaint-brushes/1.0.nix
index 73acfd9287f7..d77b2c9192da 100644
--- a/pkgs/development/libraries/mypaint-brushes/1.0.nix
+++ b/pkgs/development/libraries/mypaint-brushes/1.0.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
homepage = "http://mypaint.org/";
description = "Brushes used by MyPaint and other software using libmypaint";
license = licenses.cc0;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/pkgs/development/libraries/mypaint-brushes/default.nix
index acdee52b85ef..738ab677e95e 100644
--- a/pkgs/development/libraries/mypaint-brushes/default.nix
+++ b/pkgs/development/libraries/mypaint-brushes/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
homepage = "http://mypaint.org/";
description = "Brushes used by MyPaint and other software using libmypaint";
license = licenses.cc0;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/pipewire/0.2.nix b/pkgs/development/libraries/pipewire/0.2.nix
index 16c8d5d25128..422bcb3e675b 100644
--- a/pkgs/development/libraries/pipewire/0.2.nix
+++ b/pkgs/development/libraries/pipewire/0.2.nix
@@ -49,6 +49,6 @@ in stdenv.mkDerivation rec {
homepage = "https://pipewire.org/";
license = licenses.lgpl21;
platforms = platforms.linux;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 96d8c9c20529..3d6fcb9f391c 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -229,7 +229,7 @@ let
homepage = "https://pipewire.org/";
license = licenses.mit;
platforms = platforms.linux;
- maintainers = with maintainers; [ jtojnar kranzes ];
+ maintainers = with maintainers; [ kranzes ];
};
};
diff --git a/pkgs/development/libraries/pipewire/media-session.nix b/pkgs/development/libraries/pipewire/media-session.nix
index 19940d8d7477..16896d4ddd82 100644
--- a/pkgs/development/libraries/pipewire/media-session.nix
+++ b/pkgs/development/libraries/pipewire/media-session.nix
@@ -101,7 +101,7 @@ let
homepage = "https://pipewire.org";
license = licenses.mit;
platforms = platforms.linux;
- maintainers = with maintainers; [ jtojnar kranzes ];
+ maintainers = with maintainers; [ kranzes ];
};
};
diff --git a/pkgs/development/libraries/poly2tri-c/default.nix b/pkgs/development/libraries/poly2tri-c/default.nix
index cdfd376add1c..a31854e89649 100644
--- a/pkgs/development/libraries/poly2tri-c/default.nix
+++ b/pkgs/development/libraries/poly2tri-c/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
description = "Library for generating, refining and rendering 2-Dimensional Constrained Delaunay Triangulations";
homepage = "https://code.google.com/archive/p/poly2tri-c/";
license = licenses.bsd3;
- maintainers = with lib.maintainers; [ jtojnar ];
+ maintainers = with lib.maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 3e22483eb07f..f5613d493680 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -19,7 +19,7 @@
, openjpeg
, pkg-config
, python3
-, scribusUnstable
+, scribus
, texlive
, zlib
, withData ? true, poppler_data
@@ -35,7 +35,7 @@ let
in
stdenv.mkDerivation rec {
pname = "poppler-${suffix}";
- version = "22.04.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
+ version = "22.04.0"; # beware: updates often break cups-filters build, check texlive and scribus too!
outputs = [ "out" "dev" ];
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
passthru = {
tests = {
# These depend on internal poppler code that frequently changes.
- inherit inkscape cups-filters texlive scribusUnstable;
+ inherit inkscape cups-filters texlive scribus;
};
};
diff --git a/pkgs/development/libraries/robin-map/default.nix b/pkgs/development/libraries/robin-map/default.nix
index 229714723cdf..c0d2e73f94e6 100644
--- a/pkgs/development/libraries/robin-map/default.nix
+++ b/pkgs/development/libraries/robin-map/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/Tessil/robin-map";
description = "C++ implementation of a fast hash map and hash set using robin hood hashing";
license = licenses.mit;
- maintainers = with maintainers; [ goibhniu jtojnar ];
+ maintainers = with maintainers; [ goibhniu ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix
index 270894c3e554..112fc65623fc 100644
--- a/pkgs/development/libraries/speechd/default.nix
+++ b/pkgs/development/libraries/speechd/default.nix
@@ -113,7 +113,6 @@ in stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [
berce
- jtojnar
];
platforms = platforms.linux;
};
diff --git a/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/pkgs/development/libraries/xdg-dbus-proxy/default.nix
index b027c95a7e4b..fc094bd17323 100644
--- a/pkgs/development/libraries/xdg-dbus-proxy/default.nix
+++ b/pkgs/development/libraries/xdg-dbus-proxy/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
description = "DBus proxy for Flatpak and others";
homepage = "https://github.com/flatpak/xdg-dbus-proxy";
license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
index e54f764f9a50..cdeb7dfcf680 100644
--- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Desktop integration portals for sandboxed apps";
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
license = licenses.lgpl2Plus;
};
diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix
index c8706c737b12..a214307e2025 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Desktop integration portals for sandboxed apps";
license = licenses.lgpl2Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix
index 97b9bbc0f11e..05251ffb7e9d 100644
--- a/pkgs/development/php-packages/box/default.nix
+++ b/pkgs/development/php-packages/box/default.nix
@@ -28,6 +28,6 @@ mkDerivation {
description = "An application for building and managing Phars";
license = licenses.mit;
homepage = "https://github.com/box-project/box";
- maintainers = with maintainers; [ jtojnar ] ++ teams.php.members;
+ maintainers = with maintainers; [ ] ++ teams.php.members;
};
}
diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix
index 9104c0a0c8dd..9723eb3a4560 100644
--- a/pkgs/development/php-packages/php-cs-fixer/default.nix
+++ b/pkgs/development/php-packages/php-cs-fixer/default.nix
@@ -28,6 +28,6 @@ mkDerivation {
description = "A tool to automatically fix PHP coding standards issues";
license = licenses.mit;
homepage = "http://cs.sensiolabs.org/";
- maintainers = with maintainers; [ jtojnar ] ++ teams.php.members;
+ maintainers = with maintainers; [ ] ++ teams.php.members;
};
}
diff --git a/pkgs/development/php-packages/php-parallel-lint/default.nix b/pkgs/development/php-packages/php-parallel-lint/default.nix
index be1736b53910..14bdaa1be196 100644
--- a/pkgs/development/php-packages/php-parallel-lint/default.nix
+++ b/pkgs/development/php-packages/php-parallel-lint/default.nix
@@ -39,6 +39,6 @@ mkDerivation {
description = "Tool to check syntax of PHP files faster than serial check with fancier output";
license = licenses.bsd2;
homepage = "https://github.com/php-parallel-lint/PHP-Parallel-Lint";
- maintainers = with maintainers; [ jtojnar ] ++ teams.php.members;
+ maintainers = with maintainers; [ ] ++ teams.php.members;
};
}
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 660e205fb482..bca1f6002f4e 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -67,6 +67,9 @@ buildPythonPackage rec {
pytest-mock
pytestCheckHook
re-assert
+ ] ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [
+ # Optional test dependency. Depends indirectly on pyopenssl, which is
+ # broken on aarch64-darwin.
trustme
];
diff --git a/pkgs/development/python-modules/babelgladeextractor/default.nix b/pkgs/development/python-modules/babelgladeextractor/default.nix
index bd6baccbde43..60978371eb95 100644
--- a/pkgs/development/python-modules/babelgladeextractor/default.nix
+++ b/pkgs/development/python-modules/babelgladeextractor/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
homepage = "https://github.com/gnome-keysign/babel-glade";
description = "Babel Glade XML files translatable strings extractor";
license = licenses.bsd3;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/cffsubr/default.nix b/pkgs/development/python-modules/cffsubr/default.nix
index 0c7e6849b3f1..7cf50768b06d 100644
--- a/pkgs/development/python-modules/cffsubr/default.nix
+++ b/pkgs/development/python-modules/cffsubr/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
description = "Standalone CFF subroutinizer based on AFDKO tx";
homepage = "https://github.com/adobe-type-tools/cffsubr";
license = licenses.asl20;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/click-configfile/default.nix b/pkgs/development/python-modules/click-configfile/default.nix
index 62e0ed2d3b60..341918f6a2e0 100644
--- a/pkgs/development/python-modules/click-configfile/default.nix
+++ b/pkgs/development/python-modules/click-configfile/default.nix
@@ -46,6 +46,6 @@ buildPythonPackage rec {
description = "Add support for commands that use configuration files to Click";
homepage = "https://github.com/click-contrib/click-configfile";
license = licenses.bsd3;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/click-spinner/default.nix b/pkgs/development/python-modules/click-spinner/default.nix
index e0d862ab1310..531aef34f472 100644
--- a/pkgs/development/python-modules/click-spinner/default.nix
+++ b/pkgs/development/python-modules/click-spinner/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {
description = "Add support for showwing that command line app is active to Click";
homepage = "https://github.com/click-contrib/click-spinner";
license = licenses.mit;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix
index 032035506005..f65911604f44 100644
--- a/pkgs/development/python-modules/cloudsmith-api/default.nix
+++ b/pkgs/development/python-modules/cloudsmith-api/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
description = "Cloudsmith API Client";
homepage = "https://github.com/cloudsmith-io/cloudsmith-api";
license = licenses.asl20;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/compreffor/default.nix b/pkgs/development/python-modules/compreffor/default.nix
index 942773902583..b747fb6153d6 100644
--- a/pkgs/development/python-modules/compreffor/default.nix
+++ b/pkgs/development/python-modules/compreffor/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
description = "CFF table subroutinizer for FontTools";
homepage = "https://github.com/googlefonts/compreffor";
license = licenses.asl20;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix
index fb513a20c654..baf2c99b2513 100644
--- a/pkgs/development/python-modules/dogtail/default.nix
+++ b/pkgs/development/python-modules/dogtail/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage {
description = "GUI test tool and automation framework that uses Accessibility technologies to communicate with desktop applications";
homepage = "https://gitlab.com/dogtail/dogtail";
license = lib.licenses.gpl2Only;
- maintainers = with lib.maintainers; [ jtojnar ];
+ maintainers = with lib.maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix
index 98e2394d0bdb..0d016b92ec3a 100644
--- a/pkgs/development/python-modules/elastic-apm/default.nix
+++ b/pkgs/development/python-modules/elastic-apm/default.nix
@@ -6,6 +6,7 @@
, certifi
, ecs-logging
, fetchFromGitHub
+, fetchpatch
, httpx
, jinja2
, jsonschema
@@ -40,6 +41,14 @@ buildPythonPackage rec {
sha256 = "sha256-IaCl39rhsFLQwvQdPcqKruV/Mo3f7WH91UVgMG/cnOc=";
};
+ patches = [
+ (fetchpatch {
+ # fix tests with sanic>=22.3.0
+ url = "https://github.com/elastic/apm-agent-python/commit/114ee6ca998b4d6a5cb075a289af39cb963cf08a.patch";
+ hash = "sha256-M6yEHjThKDCRQOmR0L94KEt8tUun1tPRULI6PNIlE/8=";
+ })
+ ];
+
propagatedBuildInputs = [
aiohttp
blinker
diff --git a/pkgs/development/python-modules/lml/default.nix b/pkgs/development/python-modules/lml/default.nix
index f426d3dd7b4c..a51c56de2a3d 100644
--- a/pkgs/development/python-modules/lml/default.nix
+++ b/pkgs/development/python-modules/lml/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage rec {
description = "Load me later. A lazy plugin management system for Python";
homepage = "http://lml.readthedocs.io/";
license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ jtojnar ];
+ maintainers = with lib.maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/lomond/default.nix b/pkgs/development/python-modules/lomond/default.nix
index 3efe41e00797..f5bfef6a0a27 100644
--- a/pkgs/development/python-modules/lomond/default.nix
+++ b/pkgs/development/python-modules/lomond/default.nix
@@ -1,5 +1,18 @@
-{ buildPythonPackage, freezegun, fetchFromGitHub, lib, pytestCheckHook
-, pytest-mock, pytest-runner, six, tornado_4 }:
+{ buildPythonPackage
+, fetchFromGitHub
+, lib
+, pythonAtLeast
+, pythonOlder
+
+# runtime
+, six
+
+# tests
+, freezegun
+, pytest-mock
+, pytestCheckHook
+, tornado_4
+}:
buildPythonPackage rec {
pname = "lomond";
@@ -12,11 +25,33 @@ buildPythonPackage rec {
sha256 = "0lydq0imala08wxdyg2iwhqa6gcdrn24ah14h91h2zcxjhjk4gv8";
};
- nativeBuildInputs = [ pytest-runner ];
- propagatedBuildInputs = [ six ];
- checkInputs = [ pytestCheckHook freezegun pytest-mock tornado_4 ];
- # Makes HTTP requests
- disabledTests = [ "test_proxy" "test_live" ];
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace "'pytest-runner'" ""
+ '';
+
+ propagatedBuildInputs = [
+ six
+ ];
+
+ checkInputs = [
+ freezegun
+ pytest-mock
+ pytestCheckHook
+ ] ++ lib.optionals (pythonOlder "3.10") [
+ tornado_4
+ ];
+
+ disabledTests = [
+ # Makes HTTP requests
+ "test_proxy"
+ "test_live"
+ ];
+
+ disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [
+ # requires tornado_4, which is not compatible with python3.10
+ "tests/test_integration.py"
+ ];
meta = with lib; {
description = "Websocket Client Library";
diff --git a/pkgs/development/python-modules/pot/default.nix b/pkgs/development/python-modules/pot/default.nix
index f017ff5fb54f..2cc9e3368c76 100644
--- a/pkgs/development/python-modules/pot/default.nix
+++ b/pkgs/development/python-modules/pot/default.nix
@@ -61,6 +61,9 @@ buildPythonPackage rec {
--replace " --junit-xml=junit-results.xml" ""
substituteInPlace setup.py \
--replace '"oldest-supported-numpy", ' ""
+
+ # we don't need setup.py to find the macos sdk for us
+ sed -i '/sdk_path/d' setup.py
'';
# To prevent importing of an incomplete package from the build directory
diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix
index f839dc4df312..5b42b6b69a34 100644
--- a/pkgs/development/python-modules/pyatspi/default.nix
+++ b/pkgs/development/python-modules/pyatspi/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
description = "Python client bindings for D-Bus AT-SPI";
homepage = "https://wiki.linuxfoundation.org/accessibility/d-bus";
license = licenses.gpl2;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = with platforms; unix;
};
}
diff --git a/pkgs/development/python-modules/pyexcel-io/default.nix b/pkgs/development/python-modules/pyexcel-io/default.nix
index 840a74f252ef..59de82878892 100644
--- a/pkgs/development/python-modules/pyexcel-io/default.nix
+++ b/pkgs/development/python-modules/pyexcel-io/default.nix
@@ -29,6 +29,6 @@ buildPythonPackage rec {
description = "One interface to read and write the data in various excel formats, import the data into and export the data from databases";
homepage = "http://docs.pyexcel.org/";
license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ jtojnar ];
+ maintainers = with lib.maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/pyexcel-ods/default.nix b/pkgs/development/python-modules/pyexcel-ods/default.nix
index b923932ec574..0328f7f0c527 100644
--- a/pkgs/development/python-modules/pyexcel-ods/default.nix
+++ b/pkgs/development/python-modules/pyexcel-ods/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
description = "Plug-in to pyexcel providing the capbility to read, manipulate and write data in ods formats using odfpy";
homepage = "http://docs.pyexcel.org/";
license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ jtojnar ];
+ maintainers = with lib.maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/pyexcel-xls/default.nix b/pkgs/development/python-modules/pyexcel-xls/default.nix
index ea520b50c6f3..96bdc6d4b755 100644
--- a/pkgs/development/python-modules/pyexcel-xls/default.nix
+++ b/pkgs/development/python-modules/pyexcel-xls/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
description = "A wrapper library to read, manipulate and write data in xls using xlrd and xlwt";
homepage = "http://docs.pyexcel.org/";
license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ jtojnar ];
+ maintainers = with lib.maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/pyexcel/default.nix b/pkgs/development/python-modules/pyexcel/default.nix
index 83b5254d3984..1cb1d04ddbcd 100644
--- a/pkgs/development/python-modules/pyexcel/default.nix
+++ b/pkgs/development/python-modules/pyexcel/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
description = "Single API for reading, manipulating and writing data in csv, ods, xls, xlsx and xlsm files";
homepage = "http://docs.pyexcel.org/";
license = lib.licenses.bsd3;
- maintainers = with lib.maintainers; [ jtojnar ];
+ maintainers = with lib.maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/pyfronius/default.nix b/pkgs/development/python-modules/pyfronius/default.nix
index b78aeb19545e..8a27fb0bae9c 100644
--- a/pkgs/development/python-modules/pyfronius/default.nix
+++ b/pkgs/development/python-modules/pyfronius/default.nix
@@ -2,6 +2,7 @@
, aiohttp
, buildPythonPackage
, fetchFromGitHub
+, fetchpatch
, pythonOlder
, pytestCheckHook
}:
@@ -19,6 +20,14 @@ buildPythonPackage rec {
sha256 = "1xwx0c1dp2374bwigzwhvcj4577vrxyhn6i5zv73k9ydc7w1xgyz";
};
+ patches = [
+ (fetchpatch {
+ # Python3.10 compatibility; https://github.com/nielstron/pyfronius/pull/7
+ url = "https://github.com/nielstron/pyfronius/commit/9deb209d4246ff575cd3c4c5373037bf11df6719.patch";
+ hash = "sha256-srXYCvp86kGYUYZIXMcu68hEbkTspD945J+hc/AhqSw=";
+ })
+ ];
+
propagatedBuildInputs = [
aiohttp
];
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index 447d49a9442e..8e0caee44f0b 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -60,7 +60,7 @@ buildPythonPackage rec {
homepage = "https://pygobject.readthedocs.io/";
description = "Python bindings for Glib";
license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix
index 27470b66a624..7ee7b7e2c5b4 100644
--- a/pkgs/development/python-modules/pykeepass/default.nix
+++ b/pkgs/development/python-modules/pykeepass/default.nix
@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "pykeepass";
- version = "4.0.1";
+ version = "4.0.2";
src = fetchFromGitHub {
owner = "libkeepass";
repo = "pykeepass";
- rev = version;
- sha256 = "sha256-D+loaPBpKdXyiqpdth3ANDjH6IewuKYhj/DzRE2hDn4=";
+ rev = "v${version}";
+ hash = "sha256-q6cBowEki5iJh04Hp1jwbWdteEu3HXtD3tG/TsYDRNI=";
};
postPatch = ''
@@ -30,9 +30,11 @@ buildPythonPackage rec {
${python.interpreter} -m unittest tests.tests
'';
+ pythonImportsCheck = [ "pykeepass" ];
+
meta = with lib; {
homepage = "https://github.com/libkeepass/pykeepass";
- changelog = "https://github.com/libkeepass/pykeepass/blob/${version}/CHANGELOG.rst";
+ changelog = "https://github.com/libkeepass/pykeepass/blob/${src.rev}/CHANGELOG.rst";
description = "Python library to interact with keepass databases (supports KDBX3 and KDBX4)";
license = licenses.gpl3Only;
maintainers = with maintainers; [ dotlambda ];
diff --git a/pkgs/development/python-modules/sanic-auth/default.nix b/pkgs/development/python-modules/sanic-auth/default.nix
index c854017ae782..9e915dd66ed1 100644
--- a/pkgs/development/python-modules/sanic-auth/default.nix
+++ b/pkgs/development/python-modules/sanic-auth/default.nix
@@ -25,6 +25,11 @@ buildPythonPackage rec {
sanic-testing
];
+ disabledTests = [
+ # incompatible with sanic>=22.3.0
+ "test_login_required"
+ ];
+
postPatch = ''
# Support for httpx>=0.20.0
substituteInPlace tests/test_auth.py \
diff --git a/pkgs/development/python-modules/sanic-routing/default.nix b/pkgs/development/python-modules/sanic-routing/default.nix
index b0ecc5ed122c..cb06b5d1f2b3 100644
--- a/pkgs/development/python-modules/sanic-routing/default.nix
+++ b/pkgs/development/python-modules/sanic-routing/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "sanic-routing";
- version = "0.7.2";
+ version = "22.3.0";
src = fetchFromGitHub {
owner = "sanic-org";
repo = "sanic-routing";
rev = "v${version}";
- hash = "sha256-MN6A8CtDVxj34eehr3UIwCT09VOfcruVX+/iImr1MgY=";
+ hash = "sha256-dX+uxrVjtPxX0ba3WUE/JKgj0PZzvFdKr/lXQgASN6Y=";
};
checkInputs = [ pytestCheckHook pytest-asyncio ];
diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix
index 3fb60ebaa9e5..173e2b91ff79 100644
--- a/pkgs/development/python-modules/sanic-testing/default.nix
+++ b/pkgs/development/python-modules/sanic-testing/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "sanic-testing";
- version = "0.8.2";
+ version = "22.3.0";
src = fetchFromGitHub {
owner = "sanic-org";
repo = "sanic-testing";
rev = "v${version}";
- sha256 = "17fbb78gvic5s9nlcgwj817fq1f9j9d1d7z6n2ahhinmvyzl9gc8";
+ sha256 = "sha256-ZsLQA8rP4RrbVSUy5n0WZs903fnF7jtFqrIe5JVuRIg=";
};
outputs = [
@@ -23,11 +23,6 @@ buildPythonPackage rec {
"testsout"
];
- postPatch = ''
- substituteInPlace setup.py \
- --replace "httpx>=0.18,<0.22" "httpx"
- '';
-
propagatedBuildInputs = [
httpx
sanic
diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix
index ff76e2c56313..e69579c93589 100644
--- a/pkgs/development/python-modules/sanic/default.nix
+++ b/pkgs/development/python-modules/sanic/default.nix
@@ -24,32 +24,23 @@
buildPythonPackage rec {
pname = "sanic";
- version = "21.12.1";
+ version = "22.3.2";
format = "setuptools";
- disabled = pythonOlder "3.7" ||
- pythonAtLeast "3.10"; # see GHSA-7p79-6x2v-5h88
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "sanic-org";
repo = pname;
rev = "v${version}";
- sha256 = "0jyl23q7b7fyqzan97qflkqcvmfpzbxbzv0qgygxasrzh80zx67g";
+ hash = "sha256-4zdPp3X22dfZ5YlW3G5/OqeUxrt+NiFO9dk2XjEKXEg=";
};
postPatch = ''
# Loosen dependency requirements.
substituteInPlace setup.py \
--replace "pytest==6.2.5" "pytest" \
- --replace "gunicorn==20.0.4" "gunicorn" \
- --replace "multidict>=5.0,<6.0" "multidict"
-
- sed '/pytest-sanic/d' setup.py
-
- # Patch a request headers test to allow brotli encoding
- # (we build httpx with brotli support, upstream doesn't).
- substituteInPlace tests/test_headers.py \
- --replace "deflate\r\n" "deflate, br\r\n"
+ --replace "gunicorn==20.0.4" "gunicorn"
'';
propagatedBuildInputs = [
@@ -66,8 +57,6 @@ buildPythonPackage rec {
beautifulsoup4
gunicorn
pytest-asyncio
- pytest-benchmark
- pytest-sugar
pytestCheckHook
sanic-testing
uvicorn
@@ -95,49 +84,34 @@ buildPythonPackage rec {
];
disabledTests = [
- # Lack of uvloop setup through fixtures
- "test_create_asyncio_server"
- "test_listeners_triggered_async"
- "test_tls_options"
- # Tests are flaky
- "test_keep_alive_client_timeout"
- "test_check_timeouts_request_timeout"
- "test_check_timeouts_response_timeout"
- "test_reloader_live"
- "test_zero_downtime"
- # Not working from 21.9.1
- "test_create_server_main"
- "test_create_server_main_convenience"
- "test_debug"
+ # Fails to parse cmdline arguments
+ "test_dev"
"test_auto_reload"
- "test_no_exceptions_when_cancel_pending_request"
- "test_ipv6_address_is_not_wrapped"
- # Failure of the redirect tests seems to be related to httpx>0.20.0
- "test_redirect"
- "test_chained_redirect"
- "test_unix_connection"
- # These appear to be very sensitive to output of commands
- "test_access_logs"
- "test_auto_reload"
- "test_host_port"
- "test_no_exceptions_when_cancel_pending_request"
+ "test_host_port_ipv6_loopback"
"test_num_workers"
- "test_server_run"
- "test_version"
- # Sensitive comparison of raw HTTP header fails
- "test_raw_headers"
- # noisy_exceptions sometimes missing from sanic stdout
+ "test_debug"
+ "test_access_logs"
"test_noisy_exceptions"
- ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
- # test fail on aarch64
- "test_tls_wrong_options"
- "test_cookie_expires"
- "test_gunicorn_worker"
- "test_gunicorn_worker_no_logs"
- "test_gunicorn_worker_with_logs"
+ # OSError: foo
+ "test_bad_headers"
+ "test_create_server_trigger_events"
+ "test_json_body_requests"
+ "test_missing_startup_raises_exception"
+ "test_no_body_requests"
+ "test_oserror_warning"
+ "test_running_multiple_offset_warning"
+ "test_streaming_body_requests"
+ "test_trigger_before_events_create_server"
+ "test_keep_alive_connection_context"
+ # Racy tests
+ "test_keep_alive_client_timeout"
+ "test_keep_alive_server_timeout"
+ "test_zero_downtime"
];
disabledTestPaths = [
+ # We are not interested in benchmarks
+ "benchmark/"
# unable to create async loop
"test_app.py"
"test_asgi.py"
diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index 1a6c5c1418d0..542178a3cae3 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -1,43 +1,47 @@
{ lib
, stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+
+# runtime
+, certifi
+, urllib3
+
+# optionals
, aiohttp
-, asttokens
+, apache-beam
, blinker
, botocore
, bottle
-, buildPythonPackage
, celery
-, certifi
, chalice
, django
-, executing
-, fakeredis
, falcon
-, fetchFromGitHub
+, flask
, flask_login
-, gevent
, httpx
-, iana-etc
-, isPy3k
-, jsonschema
-, libredirect
, pure-eval
, pyramid
, pyspark
-, pytest-django
-, pytest-forked
-, pytest-localserver
-, pytestCheckHook
-, pythonOlder
, rq
, sanic
-, sanic-testing
, sqlalchemy
, tornado
, trytond
-, urllib3
, werkzeug
-, multidict
+
+# tests
+, asttokens
+, executing
+, gevent
+, jsonschema
+, mock
+, pyrsistent
+, pytest-forked
+, pytest-localserver
+, pytest-watch
+, pytestCheckHook
}:
buildPythonPackage rec {
@@ -59,37 +63,73 @@ buildPythonPackage rec {
urllib3
];
+ passthru.optional-dependencies = {
+ aiohttp = [
+ aiohttp
+ ];
+ beam = [
+ apache-beam
+ ];
+ bottle = [
+ bottle
+ ];
+ celery = [
+ celery
+ ];
+ chalice = [
+ chalice
+ ];
+ django = [
+ django
+ ];
+ falcon = [
+ falcon
+ ];
+ flask = [
+ flask
+ blinker
+ ];
+ httpx = [
+ httpx
+ ];
+ pyspark = [
+ pyspark
+ ];
+ pure_eval = [
+ asttokens
+ executing
+ pure-eval
+ ];
+ quart = [
+ # quart missing
+ blinker
+ ];
+ rq = [
+ rq
+ ];
+ sanic = [
+ sanic
+ ];
+ sqlalchemy = [
+ sqlalchemy
+ ];
+ tornado = [
+ tornado
+ ];
+ };
+
checkInputs = [
- aiohttp
asttokens
- blinker
- botocore
- bottle
- celery
- chalice
- django
executing
- fakeredis
- falcon
- flask_login
gevent
- httpx
jsonschema
+ mock
pure-eval
- pyramid
- pyspark
- pytest-django
+ pyrsistent
pytest-forked
pytest-localserver
+ pytest-watch
pytestCheckHook
- rq
- sanic
- sanic-testing
- sqlalchemy
- tornado
- trytond
- werkzeug
- multidict
];
doCheck = !stdenv.isDarwin;
@@ -97,53 +137,15 @@ buildPythonPackage rec {
disabledTests = [
# Issue with the asseration
"test_auto_enabling_integrations_catches_import_error"
- # Output mismatch in sqlalchemy test
- "test_too_large_event_truncated"
- # Failing falcon tests
- "test_has_context"
- "uri_template-"
- "path-"
- "test_falcon_large_json_request"
- "test_falcon_empty_json_request"
- "test_falcon_raw_data_request"
- # Failing spark tests
- "test_set_app_properties"
- "test_start_sentry_listener"
- # Failing threading test
- "test_circular_references"
- # Failing wsgi tests
- "test_session_mode_defaults_to_request_mode_in_wsgi_handler"
- "test_auto_session_tracking_with_aggregates"
- # Network requests to public web
- "test_crumb_capture"
- # TypeError: cannot unpack non-iterable TestResponse object
- "test_rpc_error_page"
];
disabledTestPaths = [
- # Some tests are failing (network access, assertion errors)
- "tests/integrations/aiohttp/"
- "tests/integrations/gcp/"
- "tests/integrations/httpx/"
- "tests/integrations/stdlib/test_httplib.py"
- # Tests are blocking
- "tests/integrations/celery/"
- # pytest-chalice is not available in nixpkgs yet
- "tests/integrations/chalice/"
- # broken since rq-1.10.1: https://github.com/getsentry/sentry-python/issues/1274
- "tests/integrations/rq/"
- # broken since pytest 7.0.1; AssertionError: previous item was not torn down properly
- "tests/utils/test_contextvars.py"
- # broken since Flask and Werkzeug update to 2.1.0 (different error messages)
- "tests/integrations/flask/test_flask.py"
- "tests/integrations/bottle/test_bottle.py"
- "tests/integrations/django/test_basic.py"
- "tests/integrations/pyramid/test_pyramid.py"
- ]
- # test crashes on aarch64
- ++ lib.optionals (stdenv.buildPlatform != "x86_64-linux") [
+ # Varius integration tests fail every once in a while when we
+ # upgrade depencies, so don't bother testing them.
+ "tests/integrations/"
+ ] ++ lib.optionals (stdenv.buildPlatform != "x86_64-linux") [
+ # test crashes on aarch64
"tests/test_transport.py"
- "tests/integrations/threading/test_threading.py"
];
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix
index 7de42d5bc945..962432bdb473 100644
--- a/pkgs/development/python-modules/statmake/default.nix
+++ b/pkgs/development/python-modules/statmake/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
description = "Applies STAT information from a Stylespace to a variable font";
homepage = "https://github.com/daltonmaag/statmake";
license = licenses.mit;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix
index b1e5ea7905a0..4024730aaa47 100644
--- a/pkgs/development/python-modules/ufo2ft/default.nix
+++ b/pkgs/development/python-modules/ufo2ft/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
description = "Bridge from UFOs to FontTools objects";
homepage = "https://github.com/googlefonts/ufo2ft";
license = licenses.mit;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/ufoLib2/default.nix b/pkgs/development/python-modules/ufoLib2/default.nix
index fab42e5169b8..3960899739d4 100644
--- a/pkgs/development/python-modules/ufoLib2/default.nix
+++ b/pkgs/development/python-modules/ufoLib2/default.nix
@@ -38,6 +38,6 @@ pythonImportsCheck = [ "ufoLib2" ];
description = "Library to deal with UFO font sources";
homepage = "https://github.com/fonttools/ufoLib2";
license = licenses.mit;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix
index a3238d4c5484..2ed3bec5a73b 100644
--- a/pkgs/development/python-modules/uvicorn/default.nix
+++ b/pkgs/development/python-modules/uvicorn/default.nix
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "uvicorn";
- version = "0.17.5";
+ version = "0.17.6";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
- sha256 = "sha256-66wPVnBLy2HK4p0m/b/DRxy12sk8AsVFZoFVcWRkL4s=";
+ hash = "sha256-iJlAU7zZl9X3FcQlJoJ7KlETZOx6WsE9FcpCK4Cm/Fo=";
};
outputs = [
@@ -68,6 +68,7 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://www.uvicorn.org/";
+ changelog = "https://github.com/encode/uvicorn/blob/${src.rev}/CHANGELOG.md";
description = "The lightning-fast ASGI server";
license = licenses.bsd3;
maintainers = with maintainers; [ wd15 ];
diff --git a/pkgs/development/tools/analysis/tartan/default.nix b/pkgs/development/tools/analysis/tartan/default.nix
index 0ac4bf325282..311171a3c339 100644
--- a/pkgs/development/tools/analysis/tartan/default.nix
+++ b/pkgs/development/tools/analysis/tartan/default.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
homepage = "https://freedesktop.org/wiki/Software/tartan";
license = licenses.gpl3Plus;
platforms = platforms.unix;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/development/tools/ashpd-demo/default.nix
index 9d873b8461f1..da979a62972d 100644
--- a/pkgs/development/tools/ashpd-demo/default.nix
+++ b/pkgs/development/tools/ashpd-demo/default.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
description = "Tool for playing with XDG desktop portals";
homepage = "https://github.com/bilelmoussaoui/ashpd/tree/master/ashpd-demo";
license = licenses.mit;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index f62bb22314de..1bc08a583432 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -114,7 +114,7 @@ python3.pkgs.buildPythonApplication rec {
code.
'';
license = licenses.asl20;
- maintainers = with maintainers; [ jtojnar mbe AndersonTorres ];
+ maintainers = with maintainers; [ mbe AndersonTorres ];
inherit (python3.meta) platforms;
};
}
diff --git a/pkgs/development/tools/cloudsmith-cli/default.nix b/pkgs/development/tools/cloudsmith-cli/default.nix
index 46e2a7801f69..5ef4dc0d122c 100644
--- a/pkgs/development/tools/cloudsmith-cli/default.nix
+++ b/pkgs/development/tools/cloudsmith-cli/default.nix
@@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec {
meta = {
homepage = "https://help.cloudsmith.io/docs/cli/";
description = "Cloudsmith Command Line Interface";
- maintainers = with lib.maintainers; [ jtojnar ];
+ maintainers = with lib.maintainers; [ ];
license = lib.licenses.asl20;
platforms = with lib.platforms; unix;
};
diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix
index 4e96294fe3e0..b533575253e8 100644
--- a/pkgs/development/tools/flatpak-builder/default.nix
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@@ -152,7 +152,7 @@ in stdenv.mkDerivation rec {
description = "Tool to build flatpaks from source";
homepage = "https://github.com/flatpak/flatpak-builder";
license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix
index 28b15172e405..b47bdcbc1543 100644
--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/pkgs/development/tools/golangci-lint/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "golangci-lint";
- version = "1.45.2";
+ version = "1.46.2";
src = fetchFromGitHub {
owner = "golangci";
repo = "golangci-lint";
rev = "v${version}";
- sha256 = "sha256-Mr45nJbpyzxo0ZPwx22JW2WrjyjI9FPpl+gZ7NIc6WQ=";
+ sha256 = "sha256-7sDAwWz+qoB/ngeH35tsJ5FZUfAQvQsU6kU9rUHIHMk=";
};
- vendorSha256 = "sha256-pcbKg1ePN8pObS9EzP3QYjtaty27L9sroKUs/qEPtJo=";
+ vendorSha256 = "sha256-w38OKN6HPoz37utG/2QSPMai55IRDXCIIymeMe6ogIU=";
doCheck = false;
diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix
index 8ccc03c6e503..28602329f732 100644
--- a/pkgs/development/tools/misc/blackfire/default.nix
+++ b/pkgs/development/tools/misc/blackfire/default.nix
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
description = "Blackfire Profiler agent and client";
homepage = "https://blackfire.io/";
license = licenses.unfree;
- maintainers = with maintainers; [ jtojnar shyim ];
+ maintainers = with maintainers; [ shyim ];
platforms = [ "x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" ];
};
}
diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix
index 7abca124920f..c35636583c6a 100644
--- a/pkgs/development/tools/misc/blackfire/php-probe.nix
+++ b/pkgs/development/tools/misc/blackfire/php-probe.nix
@@ -199,7 +199,7 @@ self = stdenv.mkDerivation rec {
description = "Blackfire Profiler PHP module";
homepage = "https://blackfire.io/";
license = licenses.unfree;
- maintainers = with maintainers; [ jtojnar shyim ];
+ maintainers = with maintainers; [ shyim ];
platforms = [ "x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" ];
};
};
diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix
index c9728f9cbbf6..03614418a32a 100644
--- a/pkgs/development/tools/ofono-phonesim/default.nix
+++ b/pkgs/development/tools/ofono-phonesim/default.nix
@@ -34,7 +34,7 @@ mkDerivation {
description = "Phone Simulator for modem testing";
homepage = "https://01.org/ofono";
license = licenses.gpl2;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix
index 84fd9c154a24..96152a1671f6 100644
--- a/pkgs/games/freedroidrpg/default.nix
+++ b/pkgs/games/freedroidrpg/default.nix
@@ -66,7 +66,7 @@ in stdenv.mkDerivation {
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
hydraPlatforms = platforms.linux; # sdl-config times out on darwin
};
diff --git a/pkgs/games/gnome-hexgl/default.nix b/pkgs/games/gnome-hexgl/default.nix
index c78bc69c26fd..54d74ffa5fa0 100644
--- a/pkgs/games/gnome-hexgl/default.nix
+++ b/pkgs/games/gnome-hexgl/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
description = "Gthree port of HexGL";
homepage = "https://github.com/alexlarsson/gnome-hexgl";
license = licenses.mit;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index 596db7511b04..4b7a92f0b7ef 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -375,7 +375,7 @@ let
meta = with lib; {
homepage = "https://fwupd.org/";
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
license = licenses.lgpl21Plus;
platforms = platforms.linux;
};
diff --git a/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/pkgs/os-specific/linux/power-profiles-daemon/default.nix
index 253c3caf6aad..f9a83ba14c1b 100644
--- a/pkgs/os-specific/linux/power-profiles-daemon/default.nix
+++ b/pkgs/os-specific/linux/power-profiles-daemon/default.nix
@@ -134,6 +134,6 @@ stdenv.mkDerivation rec {
description = "Makes user-selected power profiles handling available over D-Bus";
platforms = platforms.linux;
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ jtojnar mvnetbiz ];
+ maintainers = with maintainers; [ mvnetbiz ];
};
}
diff --git a/pkgs/servers/adminer/default.nix b/pkgs/servers/adminer/default.nix
index 8138e6de96e8..f2ba349d9c7b 100644
--- a/pkgs/servers/adminer/default.nix
+++ b/pkgs/servers/adminer/default.nix
@@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.adminer.org";
license = with licenses; [ asl20 gpl2Only ];
maintainers = with maintainers; [
- jtojnar
sstef
];
platforms = platforms.all;
diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix
index 66298866dbcf..50dc68b08d5a 100644
--- a/pkgs/servers/dns/coredns/default.nix
+++ b/pkgs/servers/dns/coredns/default.nix
@@ -1,4 +1,8 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib
+, stdenv
+, buildGoModule
+, fetchFromGitHub
+}:
buildGoModule rec {
pname = "coredns";
@@ -20,6 +24,9 @@ buildGoModule rec {
substituteInPlace test/readme_test.go \
--replace "TestReadme" "SkipReadme"
+ '' + lib.optionalString stdenv.isDarwin ''
+ # loopback interface is lo0 on macos
+ sed -E -i 's/\blo\b/lo0/' plugin/bind/setup_test.go
'';
meta = with lib; {
diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix
index d41603873e9f..ea553b63d71d 100644
--- a/pkgs/servers/neard/default.nix
+++ b/pkgs/servers/neard/default.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
description = "Near Field Communication manager";
homepage = "https://01.org/linux-nfc";
license = licenses.gpl2Only;
- maintainers = with maintainers; [ jtojnar tstrobel ];
+ maintainers = with maintainers; [ tstrobel ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix
index 383c57ee9382..9c39abadbb56 100644
--- a/pkgs/servers/web-apps/selfoss/default.nix
+++ b/pkgs/servers/web-apps/selfoss/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
description = "Web-based news feed (RSS/Atom) aggregator";
homepage = "https://selfoss.aditu.de";
license = licenses.gpl3;
- maintainers = with maintainers; [ jtojnar regnat ];
+ maintainers = with maintainers; [ regnat ];
platforms = platforms.all;
};
}
diff --git a/pkgs/tools/misc/markdown-anki-decks/default.nix b/pkgs/tools/misc/markdown-anki-decks/default.nix
index 62c8ca86e6f0..97ecb9ab5752 100644
--- a/pkgs/tools/misc/markdown-anki-decks/default.nix
+++ b/pkgs/tools/misc/markdown-anki-decks/default.nix
@@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "Simple program to convert markdown files into anki decks";
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
homepage = "https://github.com/lukesmurray/markdown-anki-decks";
license = licenses.mit;
platforms = platforms.unix;
diff --git a/pkgs/tools/misc/pandoc-lua-filters/default.nix b/pkgs/tools/misc/pandoc-lua-filters/default.nix
index 1323da5104ba..3bdb0a4ebe91 100644
--- a/pkgs/tools/misc/pandoc-lua-filters/default.nix
+++ b/pkgs/tools/misc/pandoc-lua-filters/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "A collection of lua filters for pandoc";
homepage = "https://github.com/pandoc/lua-filters";
license = licenses.mit;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix
index f1e44851dc2a..c04a7c15b7f1 100644
--- a/pkgs/tools/misc/sharedown/default.nix
+++ b/pkgs/tools/misc/sharedown/default.nix
@@ -119,7 +119,6 @@ stdenvNoCC.mkDerivation rec {
homepage = "https://github.com/kylon/Sharedown";
license = licenses.gpl3Plus;
maintainers = with maintainers; [
- jtojnar
];
platforms = platforms.unix;
};
diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix
index c29d2c501df8..967bb66256dc 100644
--- a/pkgs/tools/networking/gupnp-tools/default.nix
+++ b/pkgs/tools/networking/gupnp-tools/default.nix
@@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "gupnp-tools";
- version = "0.10.2";
+ version = "0.10.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "beSe9LN1uKFk90t2YWixGE4NKBlrawek9TQfCN/YXWw=";
+ sha256 = "RX9Nkjk1sHhBXNK6iNeNtgB5tyWSa37hBuRWXv4yBN4=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/networking/mmsd/default.nix b/pkgs/tools/networking/mmsd/default.nix
index f102995a3cc5..120d1f19be2a 100644
--- a/pkgs/tools/networking/mmsd/default.nix
+++ b/pkgs/tools/networking/mmsd/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
description = "Multimedia Messaging Service Daemon";
homepage = "https://01.org/ofono";
license = licenses.gpl2;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix
index 80e37782154c..2be716fbb5e7 100644
--- a/pkgs/tools/networking/ofono/default.nix
+++ b/pkgs/tools/networking/ofono/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
homepage = "https://git.kernel.org/pub/scm/network/ofono/ofono.git";
changelog = "https://git.kernel.org/pub/scm/network/ofono/ofono.git/plain/ChangeLog?h=${version}";
license = licenses.gpl2Only;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/security/bpb/default.nix b/pkgs/tools/security/bpb/default.nix
index 4d601aac1553..88eeb7c254d0 100644
--- a/pkgs/tools/security/bpb/default.nix
+++ b/pkgs/tools/security/bpb/default.nix
@@ -27,6 +27,6 @@ rustPlatform.buildRustPackage rec {
description = "Tool to automatically sign git commits, replacing gpg for that purpose";
homepage = "https://github.com/withoutboats/bpb";
license = licenses.mit;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix
index d65d7abc4de6..a359258f3227 100644
--- a/pkgs/tools/security/ghidra/default.nix
+++ b/pkgs/tools/security/ghidra/default.nix
@@ -24,12 +24,12 @@ let
in stdenv.mkDerivation rec {
pname = "ghidra";
- version = "10.1.1";
- versiondate = "20211221";
+ version = "10.1.4";
+ versiondate = "20220519";
src = fetchzip {
url = "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_${version}_build/ghidra_${version}_PUBLIC_${versiondate}.zip";
- sha256 = "1aib24hjfavy31vq0pasbzix9lpqrb90m3hp4n0iakg6ck8jcl5r";
+ sha256 = "sha256-cOrmM+uE2ajGaYg9CmDHT3/hje7K9cmsq6u9MjkCHWk=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/tools/text/gtranslator/default.nix
index e15941b5fc8c..d51ac05701d4 100644
--- a/pkgs/tools/text/gtranslator/default.nix
+++ b/pkgs/tools/text/gtranslator/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
description = "GNOME translation making program";
homepage = "https://wiki.gnome.org/Apps/Gtranslator";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix
index 3e348f159c17..1c457fa69d9b 100644
--- a/pkgs/tools/text/link-grammar/default.nix
+++ b/pkgs/tools/text/link-grammar/default.nix
@@ -58,7 +58,7 @@ link-grammar = stdenv.mkDerivation rec {
homepage = "https://www.abisource.com/projects/link-grammar/";
changelog = "https://github.com/opencog/link-grammar/blob/link-grammar-${version}/ChangeLog";
license = licenses.lgpl21Only;
- maintainers = with maintainers; [ jtojnar ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
};
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e3ea25708bb3..09f54bb633c1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1206,6 +1206,7 @@ mapAliases ({
scallion = throw "scallion has been removed, because it is currently unmaintained upstream"; # added 2021-12-15
scim = throw "'scim' has been renamed to/replaced by 'sc-im'"; # Converted to throw 2022-02-22
scollector = throw "'scollector' has been renamed to/replaced by 'bosun'"; # Converted to throw 2022-02-22
+ scribusUnstable = throw "'scribusUnstable' has been renamed to 'scribus'"; # Added 2022-05-13
scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # Added 2021-10-07
sdlmame = mame; # Added 2019-10-30
seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d98c149fcfcd..6098cce7a417 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29388,11 +29388,12 @@ with pkgs;
scli = callPackage ../applications/misc/scli { };
- scribus = callPackage ../applications/office/scribus {
+ scribus_1_4 = callPackage ../applications/office/scribus/1_4.nix {
inherit (gnome2) libart_lgpl;
};
- scribusUnstable = libsForQt5.callPackage ../applications/office/scribus/unstable.nix { };
+ scribus_1_5 = libsForQt5.callPackage ../applications/office/scribus/default.nix { };
+ scribus = scribus_1_5;
seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { };