diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8a827855d7e1..d0a90fa4cfef 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2303,6 +2303,13 @@
githubId = 5561189;
name = "Cody Opel";
};
+ Cogitri = {
+ email = "oss@cogitri.dev";
+ github = "Cogitri";
+ githubId = 8766773;
+ matrix = "@cogitri:cogitri.dev";
+ name = "Rasmus Thomsen";
+ };
cohei = {
email = "a.d.xvii.kal.mai@gmail.com";
github = "cohei";
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 0954017c98f7..42db2d060be6 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
@@ -421,6 +421,11 @@
unmaintained
+
+
+ tilp2 was removed together with its module
+
+
The options
@@ -793,6 +798,14 @@
0042 configuration.
+
+
+ The default value for
+ programs.spacefm.settings.graphical_su got
+ unset. It previously pointed to gksu which
+ has been removed.
+
+
A new module was added for the
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index b47d4ef470b1..7bb7b1c33b16 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -138,6 +138,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- `pkgs.docbookrx` was removed since it's unmaintained
+- `tilp2` was removed together with its module
+
- The options `networking.interfaces..ipv4.routes` and `networking.interfaces..ipv6.routes` are no longer ignored when using networkd instead of the default scripted network backend by setting `networking.useNetworkd` to `true`.
- MultiMC has been replaced with the fork PolyMC due to upstream developers being hostile to 3rd party package maintainers. PolyMC removes all MultiMC branding and is aimed at providing proper 3rd party packages like the one contained in Nixpkgs. This change affects the data folder where game instances and other save and configuration files are stored. Users with existing installations should rename `~/.local/share/multimc` to `~/.local/share/polymc`. The main config file's path has also moved from `~/.local/share/multimc/multimc.cfg` to `~/.local/share/polymc/polymc.cfg`.
@@ -269,6 +271,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The `services.mbpfan` module was converted to a [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration.
+- The default value for `programs.spacefm.settings.graphical_su` got unset. It previously pointed to `gksu` which has been removed.
+
- A new module was added for the [Starship](https://starship.rs/) shell prompt,
providing the options `programs.starship.enable` and `programs.starship.settings`.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index a66832688394..1e3b8f3099b6 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -203,7 +203,6 @@
./programs/sway.nix
./programs/system-config-printer.nix
./programs/thefuck.nix
- ./programs/tilp2.nix
./programs/tmux.nix
./programs/traceroute.nix
./programs/tsm-client.nix
diff --git a/nixos/modules/programs/spacefm.nix b/nixos/modules/programs/spacefm.nix
index 822fca3ecec7..f71abcaa3325 100644
--- a/nixos/modules/programs/spacefm.nix
+++ b/nixos/modules/programs/spacefm.nix
@@ -27,13 +27,11 @@ in
default = {
tmp_dir = "/tmp";
terminal_su = "${pkgs.sudo}/bin/sudo";
- graphical_su = "${pkgs.gksu}/bin/gksu";
};
defaultText = literalExpression ''
{
tmp_dir = "/tmp";
terminal_su = "''${pkgs.sudo}/bin/sudo";
- graphical_su = "''${pkgs.gksu}/bin/gksu";
}
'';
description = ''
diff --git a/nixos/modules/programs/tilp2.nix b/nixos/modules/programs/tilp2.nix
deleted file mode 100644
index da9e32e3e6c6..000000000000
--- a/nixos/modules/programs/tilp2.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
- cfg = config.programs.tilp2;
-
-in {
- options.programs.tilp2 = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Enable tilp2 and udev rules for supported calculators.
- '';
- };
- };
-
- config = mkIf cfg.enable {
- services.udev.packages = [
- pkgs.libticables2
- ];
-
- environment.systemPackages = [
- pkgs.tilp2
- ];
- };
-}
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 81843dc0f90a..31538c422192 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -32,6 +32,7 @@ with lib;
'')
(mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.")
(mkRemovedOptionModule [ "networking" "wicd" ] "The corresponding package was removed from nixpkgs.")
+ (mkRemovedOptionModule [ "programs" "tilp2" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " +
"https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"))
(mkRemovedOptionModule [ "security" "hideProcessInformation" ] ''
diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
deleted file mode 100644
index 12b66370d506..000000000000
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{ lib, stdenv, fetchurl
-, autoconf, automake, pkg-config, shared-mime-info, intltool
-, glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip
-, dotnetPackages
-}:
-
-stdenv.mkDerivation rec {
- version = "5.9.4.5";
- revision = "8010a90f6e246b32364e3fb46ef2c9d1be9c9a2b";
- pname = "monodevelop";
-
- src = fetchurl {
- url = "https://download.mono-project.com/sources/monodevelop/${pname}-${version}.tar.bz2";
- sha256 = "0bim4bfv3zwijafl9g0cx3159zq43dlcv74mnyrda41j4p52w5ji";
- };
-
- nunit2510 = fetchurl {
- url = "https://launchpad.net/nunitv2/2.5/2.5.10/+download/NUnit-2.5.10.11092.zip";
- sha256 = "0k5h5bz1p2v3d0w0hpkpbpvdkcszgp8sr9ik498r1bs72w5qlwnc";
- };
-
- postPatch = ''
- # From https://bugzilla.xamarin.com/show_bug.cgi?id=23696#c19
-
- # cecil needs NUnit 2.5.10 - this is also missing from the tar
- unzip -j ${nunit2510} -d external/cecil/Test/libs/nunit-2.5.10 NUnit-2.5.10.11092/bin/net-2.0/framework/\*
-
- # the tar doesn't include the nuget binary, so grab it from github and copy it
- # into the right place
- cp -vfR "$(dirname $(pkg-config NuGet.Core --variable=Libraries))"/* external/nuget-binary/
- '';
-
- # Revert this commit which broke the ability to use pkg-config to locate dlls
- patchFlags = [ "-p2" ];
- patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ];
-
- nativeBuildInputs = [ pkg-config unzip ];
- buildInputs = [
- autoconf automake shared-mime-info intltool
- mono gtk-sharp-2_0 gnome-sharp
- dotnetPackages.NUnit
- dotnetPackages.NUnitRunners
- dotnetPackages.Nuget
- ];
-
- preConfigure = "patchShebangs ./configure";
-
- preBuild = ''
- cat > ./buildinfo < export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp-2_0}:\$MONO_GAC_PREFIX
- > export PATH=${mono}/bin:\$PATH
- > export LD_LIBRARY_PATH=${lib.makeLibraryPath [ glib gnome2.libgnomeui gnome2.gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk ]}:\$LD_LIBRARY_PATH
- >
- EOF
- done
-
- # Without this, you get a missing DLL error any time you install an addin..
- ln -sv `pkg-config nunit.core --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit
- ln -sv `pkg-config nunit.core.interfaces --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit
- ln -sv `pkg-config nunit.framework --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit
- ln -sv `pkg-config nunit.util --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit
- '';
-
- dontStrip = true;
-
- meta = with lib; {
- platforms = platforms.linux;
- maintainers = with maintainers; [ obadz ];
- broken = true; # 2018-09-21, build has failed since 2018-03-08
- };
-}
diff --git a/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch b/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch
deleted file mode 100644
index 969aad33ec0b..000000000000
--- a/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj
-index 02d3a01..c6daaad 100644
---- a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj
-+++ b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj
-@@ -452,34 +452,6 @@
-
- PreserveNewest
-
--
-- System.Web.Mvc.dll
-- PreserveNewest
--
--
-- System.Web.Razor.dll
-- PreserveNewest
--
--
-- System.Web.Helpers.dll
-- PreserveNewest
--
--
-- System.Web.WebPages.Deployment.dll
-- PreserveNewest
--
--
-- System.Web.WebPages.dll
-- PreserveNewest
--
--
-- System.Web.WebPages.Razor.dll
-- PreserveNewest
--
--
-- Microsoft.Web.Infrastructure.dll
-- PreserveNewest
--
-
-
-
-diff --git a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml
-index eab7c32..4a75311 100644
---- a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml
-+++ b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml
-@@ -1,13 +1,6 @@
-
-
-
--
--
--
--
--
--
--
-
-
-
diff --git a/pkgs/applications/misc/fslint/default.nix b/pkgs/applications/misc/fslint/default.nix
deleted file mode 100644
index 1f2ec2805490..000000000000
--- a/pkgs/applications/misc/fslint/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }:
-
-let pythonEnv = python2.withPackages(ps: [ ps.pyGtkGlade]);
-in stdenv.mkDerivation rec {
- pname = "fslint";
- version = "2.46";
-
- src = fetchFromGitHub {
- owner = "pixelb";
- repo = "fslint";
- rev = version;
- sha256 = "048pc1rsslbsrfchl2wmdd4hpa2gycglib7kdx8vqs947zcm0sfv";
- };
-
- buildInputs = [
- pythonEnv makeWrapper
- ];
-
- prePatch = ''
- substituteInPlace fslint-gui --replace "liblocation=os.path.dirname(os.path.abspath(sys.argv[0]))" "liblocation='$out'"
- '';
-
- installPhase = ''
- runHook preInstall
- mkdir -p $out/bin
- cp * -R $out/
- cp fslint-gui $out/bin/fslint
-
- wrapProgram "$out/bin/fslint" \
- --prefix PYTHONPATH : "${pythonEnv.interpreter}"
- runHook postInstall
- '';
-
- meta = with lib; {
- description = "A utility to find and clean various forms of lint on a filesystem";
- homepage = "https://www.pixelbeat.org/fslint/";
- license = licenses.gpl2Plus;
- maintainers = [ maintainers.dasj19 ];
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix
deleted file mode 100644
index c1a4ea2b6789..000000000000
--- a/pkgs/applications/misc/gksu/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, gtk2, gnome2, gnome, libgksu,
- intltool, libstartup_notification, gtk-doc, wrapGAppsHook
-}:
-
-stdenv.mkDerivation rec {
- version = "2.0.2";
- pname = "gksu";
-
- src = fetchurl {
- url = "http://people.debian.org/~kov/gksu/${pname}-${version}.tar.gz";
- sha256 = "0npfanlh28daapkg25q4fncxd89rjhvid5fwzjaw324x0g53vpm1";
- };
-
- nativeBuildInputs = [
- pkg-config intltool gtk-doc wrapGAppsHook
- ];
-
- buildInputs = [
- gtk2 gnome2.GConf libstartup_notification gnome.libgnome-keyring
- ];
-
- propagatedBuildInputs = [
- libgksu
- ];
-
- hardeningDisable = [ "format" ];
-
- patches = [
- # https://savannah.nongnu.org/bugs/index.php?36127
- ./gksu-2.0.2-glib-2.31.patch
- ];
-
- postPatch = ''
- sed -i -e 's|/usr/bin/x-terminal-emulator|-l gnome-terminal|g' gksu.desktop
- '';
-
- configureFlags = [ "--disable-nautilus-extension" ];
-
- meta = {
- description = "A graphical frontend for libgksu";
- longDescription = ''
- GKSu is a library that provides a GTK frontend to su and sudo.
- It supports login shells and preserving environment when acting as
- a su frontend. It is useful to menu items or other graphical
- programs that need to ask a user's password to run another program
- as another user.
- '';
- homepage = "https://www.nongnu.org/gksu/";
- license = lib.licenses.gpl2;
- maintainers = [ lib.maintainers.romildo ];
- platforms = lib.platforms.linux;
- };
-}
diff --git a/pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch b/pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch
deleted file mode 100644
index fd711a321acf..000000000000
--- a/pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 10c7e67e11a56e2fe1acf9b085772bc995d35bc0 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev
-Date: Sat, 7 Apr 2012 17:57:36 -0400
-Subject: [PATCH] Fix glib includes for building with >=glib-2.31
-
-glib-2.31 and newer no longer allow most glib subheaders to be included
-directly.
-
-https://savannah.nongnu.org/bugs/index.php?36127
----
- nautilus-gksu/libnautilus-gksu.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/nautilus-gksu/libnautilus-gksu.c b/nautilus-gksu/libnautilus-gksu.c
-index 8e44d29..4acf3f8 100644
---- a/nautilus-gksu/libnautilus-gksu.c
-+++ b/nautilus-gksu/libnautilus-gksu.c
-@@ -5,7 +5,7 @@
- #include
- #include
-
--#include
-+#include
- #include
- #include
- #include
---
-1.7.8.5
-
diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
index 05d5f93162c0..54ed6c10f42a 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@@ -1,6 +1,7 @@
{ lib
, boost
, fetchFromGitHub
+, fetchpatch
, installShellFiles
, mkDerivation
, muparser
@@ -23,6 +24,14 @@ mkDerivation rec {
sha256 = "sha256-RNg7ioMriH4A7V65+4mh8NhsUHs/8IbTt38nVkYilCE=";
};
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/LibreCAD/LibreCAD/pull/1465/commits/4edcbe72679f95cb60979c77a348c1522a20b0f4.patch";
+ sha256 = "sha256-P0G2O5sL7Ip860ByxFQ87TfV/lq06wCQnzPxADGqFPs=";
+ name = "CVE-2021-45342.patch";
+ })
+ ];
+
postPatch = ''
substituteInPlace scripts/postprocess-unix.sh \
--replace /bin/sh ${runtimeShell}
diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix
deleted file mode 100644
index da9340f30759..000000000000
--- a/pkgs/applications/misc/pdfmod/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv, fetchurl, fetchpatch, pkg-config, gnome-doc-utils, intltool, lib
-, mono, gtk-sharp-2_0, gnome-sharp, hyena
-, which, makeWrapper, glib, gnome2, poppler, wrapGAppsHook
-}:
-
-stdenv.mkDerivation rec {
- pname = "pdfmod";
- version = "0.9.1";
-
- src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
- sha256 = "eb7c987514a053106ddf03f26544766c751c801d87762909b36415d46bc425c9";
- };
-
- patches = [ (fetchpatch {
- url = "https://raw.githubusercontent.com/City-busz/Arch-Linux-Repository"
- + "/master/gnome/pdfmod/pdfmod/pdfmod-mono-2.10.patch";
- sha256 = "0fpz9ifr6476lqhd5rkb94dm68vlrwdq5w1aaxzgyjgdax9hxx81";
- }) ];
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [
- gnome-doc-utils intltool mono gtk-sharp-2_0 gnome-sharp
- hyena which makeWrapper wrapGAppsHook
- ];
-
- preConfigure = ''
- substituteInPlace lib/poppler-sharp/poppler-sharp/poppler-sharp.dll.config \
- --replace libpoppler-glib.so.4 libpoppler-glib.so
- '';
-
- postInstall = ''
- makeWrapper "${mono}/bin/mono" "$out/bin/pdfmod" \
- --add-flags "$out/lib/pdfmod/PdfMod.exe" \
- --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \
- --prefix MONO_GAC_PREFIX : ${gnome-sharp} \
- --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome2.GConf gtk-sharp-2_0 gtk-sharp-2_0.gtk poppler ]}
- '';
-
- dontStrip = true;
-
- meta = with lib; {
- homepage = "https://wiki.gnome.org/Attic/PdfMod";
- description = "A simple application for modifying PDF documents";
- platforms = platforms.all;
- maintainers = with maintainers; [ obadz ];
- license = licenses.gpl2Plus;
- };
-}
diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix
index 3f964824e6dd..0914d2599c22 100644
--- a/pkgs/applications/misc/pure-maps/default.nix
+++ b/pkgs/applications/misc/pure-maps/default.nix
@@ -1,23 +1,23 @@
{ lib, mkDerivation, fetchFromGitHub
-, qmake, qttools, kirigami2, qtquickcontrols2, qtlocation, qtsensors
+, cmake, qttools, kirigami2, qtquickcontrols2, qtlocation, qtsensors
, nemo-qml-plugin-dbus, mapbox-gl-qml, s2geometry
, python3, pyotherside
}:
mkDerivation rec {
pname = "pure-maps";
- version = "2.6.5";
+ version = "2.9.2";
src = fetchFromGitHub {
owner = "rinigus";
repo = "pure-maps";
rev = version;
- sha256 = "17gfb7rdaadmcdba4mhish0jrz9lmiban6fpzwhyvn8z1rc43zx9";
+ hash = "sha256-pMPjY6OXR6THiSQZ4mw9Kz+tAXJaOwzJEcpPOyZ+YKI=";
fetchSubmodules = true;
};
nativeBuildInputs = [
- qmake python3 qttools python3.pkgs.wrapPython
+ cmake python3 qttools python3.pkgs.wrapPython
];
buildInputs = [
@@ -25,12 +25,7 @@ mkDerivation rec {
nemo-qml-plugin-dbus pyotherside mapbox-gl-qml s2geometry
];
- postPatch = ''
- substituteInPlace pure-maps.pro \
- --replace '$$[QT_HOST_BINS]/lconvert' 'lconvert'
- '';
-
- qmakeFlags = [ "FLAVOR=kirigami" ];
+ cmakeFlags = [ "-DFLAVOR=kirigami" ];
pythonPath = with python3.pkgs; [ gpxpy ];
diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix
index 10dc4edc489b..2e75977d68a2 100644
--- a/pkgs/applications/misc/qcad/default.nix
+++ b/pkgs/applications/misc/qcad/default.nix
@@ -18,13 +18,13 @@
mkDerivation rec {
pname = "qcad";
- version = "3.27.1.3";
+ version = "3.27.1.6";
src = fetchFromGitHub {
owner = "qcad";
repo = "qcad";
rev = "v${version}";
- sha256 = "sha256-DHDfDwGrYMRd5gxFaPL06B/wssQho9420MxUg8fI2r0=";
+ sha256 = "sha256-ouvWE1fa4DfPLqFYuMsUPWDx/NUaoCc7TfR6Ed0uuF4=";
};
patches = [
diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index bce4b297cda6..1d7c183ea7af 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -23,14 +23,14 @@
stdenv.mkDerivation rec {
pname = "rofi-unwrapped";
- version = "1.7.2";
+ version = "1.7.3";
src = fetchFromGitHub {
owner = "davatorium";
repo = "rofi";
rev = version;
fetchSubmodules = true;
- sha256 = "vre8kFou01P7S6KBBtfzvfFP554mhV+d6rjvY+GfWXk=";
+ sha256 = "sha256-bUedRRmrfdmzNW+2PzJvLbCTIWta2rbQ3CTLRSdJqbs=";
};
preConfigure = ''
diff --git a/pkgs/applications/misc/rofi/wayland.nix b/pkgs/applications/misc/rofi/wayland.nix
index c2c2da37b4e7..ac0d1c216a4b 100644
--- a/pkgs/applications/misc/rofi/wayland.nix
+++ b/pkgs/applications/misc/rofi/wayland.nix
@@ -8,14 +8,14 @@
rofi-unwrapped.overrideAttrs (oldAttrs: rec {
pname = "rofi-wayland-unwrapped";
- version = "1.7.2+wayland1";
+ version = "1.7.3+wayland1";
src = fetchFromGitHub {
owner = "lbonn";
repo = "rofi";
rev = version;
fetchSubmodules = true;
- sha256 = "sha256-INFYHOVjBNj8ks4UjKnxLW8mL7h1c8ySFPS/rUxOWwo=";
+ sha256 = "sha256-qvIxWxiQj42VgScSsrF1Yf6ifgEbZes0flNbbwc3O8I=";
};
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-protocols ];
diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix
deleted file mode 100644
index d031f63a097a..000000000000
--- a/pkgs/applications/misc/yarssr/default.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{ fetchFromGitHub, stdenv, lib, gettext, gtk2, makeWrapper, perlPackages, gnome2 }:
-
-let
- perlDeps = with perlPackages; [
- Glib
- Gtk2
- Gnome2
- Pango
- Cairo
- Gnome2Canvas
- Gnome2VFS
- Gtk2GladeXML
- Gtk2TrayIcon
- XMLLibXML
- XMLSAXBase
- XMLParser
- XMLRSS
- HTMLParser
- DateTime
- DateTimeFormatMail
- DateTimeFormatW3CDTF
- DateTimeLocale
- DateTimeTimeZone
- ParamsValidate
- ModuleImplementation
- ModuleRuntime
- TryTiny
- ClassSingleton
- URI
- AnyEvent
- AnyEventHTTP
- commonsense
- FileSlurp
- JSON
- Guard
- LocaleGettext
- ];
- libs = [
- stdenv.cc.cc.lib
- gtk2
- ];
-in
-stdenv.mkDerivation {
- version = "unstable-2017-12-01";
- pname = "yarssr";
-
- src = fetchFromGitHub {
- owner = "JGRennison";
- repo = "yarssr";
- rev = "e70eb9fc6563599bfb91c6de6a79654de531c18d";
- sha256 = "0x7hz8x8qyp3i1vb22zhcnvwxm3jhmmmlr22jqc5b09vpmbw1l45";
- };
-
- nativeBuildInputs = [ perlPackages.perl gettext makeWrapper ];
- buildInputs = perlDeps ++ [ gnome2.libglade ];
- propagatedBuildInputs = libs ++ perlDeps;
-
- installPhase = ''
- DESTDIR=$out make install
- mv $out/usr/* $out/
- rm -R $out/usr
- sed -i -r "s!use lib [^;]+;!use lib '$out/share/yarssr';!" $out/bin/yarssr
- sed -i -r "s!$Yarssr::PREFIX = [^;]+;!$Yarssr::PREFIX = '$out';!" $out/bin/yarssr
- sed -i -r "s!use Yarssr::Browser;!!" $out/share/yarssr/Yarssr/GUI.pm
- chmod a+x $out/bin/yarssr
- '';
-
- postFixup = ''
- wrapProgram $out/bin/yarssr \
- --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath libs} \
- --set PERL5LIB "${perlPackages.makePerlPath perlDeps}"
- '';
-
- meta = with lib; {
- homepage = "https://github.com/tsyrogit/zxcvbn-c";
- description = "A fork of Yarssr (a RSS reader for the GNOME Tray) from http://yarssr.sf.net with various fixes";
- license = licenses.gpl1;
- platforms = platforms.linux;
- maintainers = with maintainers; [ xurei ];
- };
-}
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index b0fc87a18014..f1da103157b9 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -142,7 +142,7 @@ in stdenv.mkDerivation {
makeWrapper "$out/share/google/$appname/google-$appname" "$exe" \
--prefix LD_LIBRARY_PATH : "$rpath" \
--prefix PATH : "$binpath" \
- --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addOpenGLRunpath.driverLink}/share" \
--add-flags ${escapeShellArg commandLineArgs} \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
diff --git a/pkgs/applications/office/timekeeper/default.nix b/pkgs/applications/office/timekeeper/default.nix
deleted file mode 100644
index ba9390251fc5..000000000000
--- a/pkgs/applications/office/timekeeper/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv
-, fetchFromGitHub
-, poco
-, pkg-config
-, gnome2
-, gtkmm2
-, lib
-}:
-
-stdenv.mkDerivation rec {
- pname = "timekeeper";
- version = "1.0";
-
- src = fetchFromGitHub {
- owner = "bburdette";
- repo = "TimeKeeper";
- rev = "v${version}";
- fetchSubmodules = true;
- sha256 = "03rvzkygnn7igcindbb5bcmfy0l83n0awkzprsnhlb6ndxax3k9w";
- };
-
- nativeBuildInputs = [
- poco
- pkg-config
- ];
-
- buildInputs = [
- gtkmm2
- gnome2.libglademm
- gnome2.libglade
- ];
-
- installPhase = ''
- install -Dm755 TimeKeeper/TimeKeeper $out/bin/timekeeper
- '';
-
- meta = with lib; {
- description = "Log hours worked and make reports";
- homepage = "https://github.com/bburdette/TimeKeeper";
- maintainers = with maintainers; [ bburdette ];
- platforms = [ "x86_64-linux" ];
- license = licenses.bsd3;
- };
-}
diff --git a/pkgs/applications/science/math/gfm/default.nix b/pkgs/applications/science/math/gfm/default.nix
deleted file mode 100644
index 1078be99c3a9..000000000000
--- a/pkgs/applications/science/math/gfm/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, fetchpatch
-, pkg-config
-, autoreconfHook
-, gnome2
-, gtk2
-, glib
-, libtifiles2
-, libticables2
-, libticalcs2
-, libticonv
-}:
-
-stdenv.mkDerivation rec {
- pname = "gfm";
- version = "1.08";
- src = fetchurl {
- url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
- sha256 = "0zq1a9mm54zr18dz2mqh79w1a126xwqz6dcrpjlbd1pnmg01l0q9";
- };
-
- patches = fetchpatch {
- name = "remove-broken-kde-support.patch";
- url = "https://aur.archlinux.org/cgit/aur.git/plain/remove-broken-kde-support.patch?h=gfm";
- sha256 = "03yc8s2avicmv04f2ygg3r3q8l7kpsc94mhp6clp584kmjpjqag5";
- };
-
- nativeBuildInputs = [
- autoreconfHook
- pkg-config
- ];
-
- buildInputs = [
- gtk2
- gnome2.libglade
- glib
- libtifiles2
- libticables2
- libticalcs2
- libticonv
- ];
-
- NIX_CFLAGS_COMPILE = "-I${libticables2}/include/tilp2";
-
- meta = with lib; {
- changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
- description = "Group File Manager (GFM) allows manipulation of single/group/tigroup files";
- homepage = "http://lpg.ticalc.org/prj_gfm/index.html";
- license = licenses.gpl2Plus;
- maintainers = with maintainers; [ siraben luc65r ];
- platforms = with platforms; linux ++ darwin;
- };
-}
diff --git a/pkgs/applications/science/math/tilp2/default.nix b/pkgs/applications/science/math/tilp2/default.nix
deleted file mode 100644
index ebcca69f0940..000000000000
--- a/pkgs/applications/science/math/tilp2/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv
-, lib
-, fetchurl
-, fetchpatch
-, autoreconfHook
-, pkg-config
-, intltool
-, glib
-, gnome2
-, gtk2
-, gfm
-, libticables2
-, libticalcs2
-, libticonv
-, libtifiles2
-}:
-
-stdenv.mkDerivation rec {
- pname = "tilp2";
- version = "1.18";
- src = fetchurl {
- url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2";
- sha256 = "0isf73bjwk06baz2gm3vpdh600gqck9ca4aqxzb089dmxriv6fkv";
- };
-
- patches = fetchpatch {
- name = "remove-broken-kde-support.patch";
- url = "https://aur.archlinux.org/cgit/aur.git/plain/remove-broken-kde-support.patch?h=tilp";
- sha256 = "1fn6vh7r45spkwpmkvffkbn7zrcsdrs5mjmspd5rwi3jc12cy3ny";
- };
-
- nativeBuildInputs = [
- autoreconfHook
- pkg-config
- intltool
- ];
-
- buildInputs = [
- glib
- gtk2
- gnome2.libglade
- gfm
- libticables2
- libticalcs2
- libticonv
- libtifiles2
- ];
-
- meta = with lib; {
- changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
- description = "Transfer data between Texas Instruments graphing calculators and a computer";
- homepage = "http://lpg.ticalc.org/prj_tilp/";
- license = licenses.gpl2Plus;
- maintainers = with maintainers; [ luc65r ];
- platforms = with platforms; linux ++ darwin;
- };
-}
diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix
new file mode 100644
index 000000000000..e57a01fb17e8
--- /dev/null
+++ b/pkgs/applications/science/misc/bada-bib/default.nix
@@ -0,0 +1,78 @@
+{ lib
+, meson
+, ninja
+, fetchFromGitHub
+, appstream-glib
+, desktop-file-utils
+, gdk-pixbuf
+, gettext
+, glib
+, gnome
+, gobject-introspection
+, gtk3
+, libxml2
+, pkg-config
+, python3Packages
+, wrapGAppsHook }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "bada-bib";
+ version = "0.3.0";
+ format = "other";
+ strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
+
+ src = fetchFromGitHub {
+ owner = "RogerCrocker";
+ repo = "BadaBib";
+ rev = "v${version}";
+ sha256 = "0rclkkf5kd9ab049lizliiqawx5c5y2qmq40lkxnx09sa0283vg8";
+ };
+
+ nativeBuildInputs = [
+ gettext
+ gobject-introspection
+ libxml2
+ meson
+ ninja
+ pkg-config
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gdk-pixbuf
+ glib
+ gtk3
+ ];
+
+ checkInputs = [
+ appstream-glib
+ desktop-file-utils
+ ];
+
+ pythonPath = with python3Packages; [
+ bibtexparser
+ pygobject3
+ watchgod
+ ];
+
+ postPatch = ''
+ patchShebangs build-aux/meson/postinstall.py
+ '';
+
+ dontWrapGApps = true; # Needs python wrapper
+
+ preFixup = ''
+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+ '';
+
+ postFixup = ''
+ wrapPythonProgramsIn "$out/libexec" "$out $pythonPath"
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/RogerCrocker/BadaBib";
+ description = "A simple BibTeX Viewer and Editor";
+ maintainers = [ maintainers.Cogitri ];
+ license = licenses.gpl3Plus;
+ };
+}
diff --git a/pkgs/applications/video/sub-batch/default.nix b/pkgs/applications/video/sub-batch/default.nix
index fd5b2888d63d..1603bdcbb940 100644
--- a/pkgs/applications/video/sub-batch/default.nix
+++ b/pkgs/applications/video/sub-batch/default.nix
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "sub-batch";
- version = "0.4.1";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "kl";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-WUW+lOGbZ82NJxmW+Ogxslf3COOp62aZ/08Yn26l4T0=";
+ sha256 = "sha256-N+3KyBlLG90C3D5ivgj6qedtKsUBoBHr89gmxyAIfVI=";
};
- cargoSha256 = "sha256-m9nBubmuuOcJyegmYGJizY/2b7oamBHKFNIaxOtikcA=";
+ cargoSha256 = "sha256-rjhSosiLIgcSw6OHpFmGNHXGUdf2QsiIXFVgtO9qNY0=";
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index 4168a7f3411d..803d5154bce5 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -8,24 +8,25 @@
, notmuch
, openssl
, ethtool
+, lm_sensors
}:
rustPlatform.buildRustPackage rec {
pname = "i3status-rust";
- version = "0.21.2";
+ version = "0.21.4";
src = fetchFromGitHub {
owner = "greshake";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-m0Yq6uxo4FAmwvUK/b3zTb79AT9h/fgdm4Q9sf1DYe0=";
+ sha256 = "sha256-D/+SDKkrYfdzFw+cNBJrCshpDuFSLbr70jvFMbX3B0w=";
};
- cargoSha256 = "sha256-J+829GzZ4lKrn3MSip/weaI8pExBt3uex86bKZOofg4=";
+ cargoSha256 = "sha256-tNwf2ShnzoSrb1R/g0hOGwQMulWYXyVCILU3Jb+Sfpg=";
nativeBuildInputs = [ pkg-config makeWrapper ];
- buildInputs = [ dbus libpulseaudio notmuch openssl ];
+ buildInputs = [ dbus libpulseaudio notmuch openssl lm_sensors ];
buildFeatures = [
"notmuch"
diff --git a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
deleted file mode 100644
index b997a9ddd1a3..000000000000
--- a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchurl, pkg-config, intltool, gtkmm2, libglade }:
-
-stdenv.mkDerivation rec {
- name = "libglademm-2.6.7";
-
- src = fetchurl {
- url = "mirror://gnome/sources/libglademm/2.6/${name}.tar.bz2";
- sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q";
- };
-
- outputs = [ "out" "devdoc" ];
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ intltool ];
-
- propagatedBuildInputs = [ gtkmm2 libglade ];
-}
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index 90d6fd0b7aa5..a8ff7b58ed30 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -62,10 +62,6 @@ lib.makeScope pkgs.newScope (self: with self; {
autoreconfHook = pkgs.autoreconfHook269;
};
-#### BINDINGS
-
- libglademm = callPackage ./bindings/libglademm { };
-
} // lib.optionalAttrs (config.allowAliases or true) {
inherit (pkgs)
# GTK Libs
@@ -89,4 +85,5 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome_icon_theme = self.gnome-icon-theme;
gnomeicontheme = self.gnome-icon-theme;
gnome_common = gnome-common;
+ libglademm = throw "libglademm has been removed"; # 2022-01-15
})
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 4b057bea7946..2340a57c22d8 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -214,7 +214,7 @@ lib.makeScope pkgs.newScope (self: with self; {
gtk = pkgs.gtk2;
libxfcegui4 = throw "libxfcegui4 is the deprecated Xfce GUI library. It has been superseded by the libxfce4ui library";
xinitrc = xfce4-session.xinitrc;
- inherit (pkgs.gnome2) libglade;
+ libglade = throw "libglade has been removed";
inherit (pkgs.gnome) gtksourceview;
xfce4-mixer-pulse = xfce4-mixer;
thunar-bare = thunar.override {
diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix
index 1d829450a1ed..009802b29234 100644
--- a/pkgs/development/compilers/openjdk/darwin/8.nix
+++ b/pkgs/development/compilers/openjdk/darwin/8.nix
@@ -23,7 +23,7 @@ let
zuluVersion = "8.54.0.21";
jdkVersion = "8.0.292";
sha256 =
- if enableJavaFX then "1b05b2e40f707a151b063ebba821270fa930ebfc05712bc1f5a8a112395731a6"
+ if enableJavaFX then "8e901075cde2c31f531a34e8321ea4201970936abf54240a232e9389952afe84"
else "05w89wfjlfbpqfjnv6wisxmaf13qb28b2223f9264jyx30qszw1c";
};
}."${stdenv.hostPlatform.system}";
diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix
deleted file mode 100644
index ead08ce0231b..000000000000
--- a/pkgs/development/guile-modules/guile-gnome/default.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, gconf
-, glib
-, gnome_vfs
-, gtk2
-, guile
-, guile-cairo
-, guile-lib
-, gwrap
-, libglade
-, libgnome
-, libgnomecanvas
-, libgnomeui
-, pango
-, pkg-config
-, texinfo
-}:
-
-stdenv.mkDerivation rec {
- pname = "guile-gnome-platform";
- version = "2.16.4";
-
- src = fetchurl {
- url = "mirror://gnu/guile-gnome/${pname}/${pname}-${version}.tar.gz";
- hash = "sha256-ravUjtWZPYUo/WBOCqDZatgaYdBtps3WgyNXKtbCFsM=";
- };
-
- nativeBuildInputs = [
- pkg-config
- texinfo
- ];
- buildInputs = [
- gconf
- glib
- gnome_vfs
- gtk2
- guile
- guile-cairo
- gwrap
- libglade
- libgnome
- libgnomecanvas
- libgnomeui
- pango
- ] ++ lib.optional doCheck guile-lib;
-
- # The test suite tries to open an X display, which fails.
- doCheck = false;
-
- makeFlags = [
- "GUILE_AUTO_COMPILE=0"
- ];
-
- meta = with lib; {
- homepage = "https://www.gnu.org/software/guile-gnome/";
- description = "GNOME bindings for GNU Guile";
- longDescription = ''
- GNU guile-gnome brings the power of Scheme to your graphical application.
- guile-gnome modules support the entire Gnome library stack: from Pango to
- GnomeCanvas, GTK to GStreamer, Glade to GtkSourceView, you will find in
- guile-gnome a comprehensive environment for developing modern
- applications.
- '';
- license = licenses.gpl2Plus;
- maintainers = with maintainers; [ vyp ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/development/interpreters/trealla/default.nix b/pkgs/development/interpreters/trealla/default.nix
index 6c6268011a73..d6dc01348a1d 100644
--- a/pkgs/development/interpreters/trealla/default.nix
+++ b/pkgs/development/interpreters/trealla/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "trealla";
- version = "1.12.0";
+ version = "1.20.31";
src = fetchFromGitHub {
owner = "infradig";
repo = "trealla";
rev = "v${version}";
- sha256 = "sha256-5gMf62WSGf46Bg8CaI9weSMRjrdGiuxtaDV9FrS2xO8=";
+ sha256 = "sha256-Yol+bbxC5cCtCIZxP5Sa8R3ev1LAopc/oQa6Zd1nS8A=";
};
postPatch = ''
diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix
deleted file mode 100644
index 4aa510f36068..000000000000
--- a/pkgs/development/libraries/gnome-sharp/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, pkg-config
-, gtk2
-, mono
-, gtk-sharp-2_0
-, gnome2
-, autoconf
-, automake
-, libtool
-, which
-}:
-
-stdenv.mkDerivation rec {
- pname = "gnome-sharp";
- version = "2.24.4";
-
- src = fetchFromGitHub {
- owner = "mono";
- repo = "gnome-sharp";
- rev = version;
- sha256 = "15jsm6n0sih0nf3w8vmvik97q7l3imz4vkdzmp9k7bssiz4glj1z";
- };
-
- nativeBuildInputs = [ pkg-config autoconf automake libtool which ];
- buildInputs = [ gtk2 mono gtk-sharp-2_0 ]
- ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui ]);
-
- patches = [ ./fix-mono-path.patch ];
-
- preConfigure = ''
- ./bootstrap-${lib.versions.majorMinor version}
- '';
-
- dontStrip = true;
-
- meta = with lib; {
- homepage = "https://www.mono-project.com/docs/gui/gtksharp/";
- description = "A .NET language binding for assorted GNOME libraries";
- license = licenses.lgpl21;
- platforms = platforms.linux;
- maintainers = with maintainers; [ vbgl ];
- };
-}
diff --git a/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch b/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch
deleted file mode 100644
index 706f119c8baa..000000000000
--- a/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sample/gconf/Makefile.am b/sample/gconf/Makefile.am
-index a0ee802..8260694 100644
---- a/sample/gconf/Makefile.am
-+++ b/sample/gconf/Makefile.am
-@@ -22,7 +22,7 @@ sample.exe: $(SCHEMA) $(srcdir)/sample.glade $(FILES) $(ASSEMBLIES)
- $(CSC) /out:sample.exe $(FILES) $(REFERENCES) $(RESOURCES)
-
- Settings.cs: $(SCHEMA)
-- MONO_PATH=$(top_builddir)/gconf/GConf/gconf-sharp.dll:${MONO_PATH} $(RUNTIME) $(GCONFDIR)/tools/gconfsharp-schemagen.exe Sample $(SCHEMA) > Settings.cs
-+ MONO_PATH=$(top_builddir)/gconf/GConf/:${MONO_PATH} $(RUNTIME) $(GCONFDIR)/tools/gconfsharp-schemagen.exe Sample $(SCHEMA) > Settings.cs
-
- CLEANFILES = sample.exe Settings.cs
-
diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix
index f35f5e0552c4..b083ca02cf2c 100644
--- a/pkgs/development/libraries/gtk-sharp/2.0.nix
+++ b/pkgs/development/libraries/gtk-sharp/2.0.nix
@@ -6,14 +6,6 @@
, glib
, pango
, gtk2
-, GConf ? null
-, libglade ? null
-, libgtkhtml ? null
-, gtkhtml ? null
-, libgnomecanvas ? null
-, libgnomeui ? null
-, libgnomeprint ? null
-, libgnomeprintui ? null
, libxml2
, monoDLLFixer
, autoconf
@@ -54,8 +46,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoconf automake libtool which ];
buildInputs = [
- mono glib pango gtk2 GConf libglade libgnomecanvas
- libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2
+ mono glib pango gtk2
+ libxml2
];
preConfigure = ''
diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix
index 6b996244a9f3..8b594a00a7e5 100644
--- a/pkgs/development/libraries/gtk-sharp/3.0.nix
+++ b/pkgs/development/libraries/gtk-sharp/3.0.nix
@@ -6,14 +6,6 @@
, glib
, pango
, gtk3
-, GConf ? null
-, libglade ? null
-, libgtkhtml ? null
-, gtkhtml ? null
-, libgnomecanvas ? null
-, libgnomeui ? null
-, libgnomeprint ? null
-, libgnomeprintui ? null
, libxml2
, monoDLLFixer
}:
@@ -30,8 +22,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
- mono glib pango gtk3 GConf libglade libgnomecanvas
- libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2
+ mono glib pango gtk3
+ libxml2
];
patches = [
diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix
index 644975ca66c1..8581ab729a63 100644
--- a/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "intel-gmmlib";
- version = "22.0.1";
+ version = "22.0.2";
src = fetchFromGitHub {
owner = "intel";
repo = "gmmlib";
rev = "intel-gmmlib-${version}";
- sha256 = "1s46vwcs26hdlsa8h51gq4fyi9i8k5hrcx5ffbv9g7v3x706nplf";
+ sha256 = "001kkm1l4s9i7ikaqpf78l5h0a5dy1m9w5r5g0yrlqpi54h6ph28";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix
deleted file mode 100644
index b00e7b324518..000000000000
--- a/pkgs/development/libraries/libgksu/default.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, gtk2, gnome2, gnome,
- libstartup_notification, libgtop, perlPackages,
- autoreconfHook, intltool, docbook_xsl, xauth
-}:
-
-stdenv.mkDerivation rec {
- version = "2.0.12";
- pname = "libgksu";
-
- src = fetchurl {
- url = "http://people.debian.org/~kov/gksu/${pname}-${version}.tar.gz";
- sha256 = "1brz9j3nf7l2gd3a5grbp0s3nksmlrp6rxmgp5s6gjvxcb1wzy92";
- };
-
- nativeBuildInputs = [
- pkg-config autoreconfHook intltool docbook_xsl wrapGAppsHook
- ];
-
- buildInputs = [
- gtk2 gnome2.GConf libstartup_notification
- gnome.libgnome-keyring libgtop gnome2.libglade
- ] ++ (with perlPackages; [ perl XMLParser ]);
-
- enableParallelBuilding = true;
-
- hardeningDisable = [ "format" ];
-
- patches = [
- # Patches from the gentoo ebuild
-
- # Fix compilation on bsdc
- ./libgksu-2.0.0-fbsd.patch
-
- # Fix wrong usage of LDFLAGS, gentoo bug #226837
- ./libgksu-2.0.7-libs.patch
-
- # Use po/LINGUAS
- ./libgksu-2.0.7-polinguas.patch
-
- # Don't forkpty; gentoo bug #298289
- ./libgksu-2.0.12-revert-forkpty.patch
-
- # Make this gmake-3.82 compliant, gentoo bug #333961
- ./libgksu-2.0.12-fix-make-3.82.patch
-
- # Do not build test programs that are never executed; also fixes gentoo bug #367397 (underlinking issues).
- ./libgksu-2.0.12-notests.patch
-
- # Fix automake-1.11.2 compatibility, gentoo bug #397411
- ./libgksu-2.0.12-automake-1.11.2.patch
- ];
-
- postPatch = ''
- # gentoo bug #467026
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac
-
- # Fix some binary paths
- sed -i -e 's|/usr/bin/xauth|${xauth}/bin/xauth|g' libgksu/gksu-run-helper.c libgksu/libgksu.c
- sed -i -e 's|/usr/bin/sudo|/run/wrappers/bin/sudo|g' libgksu/libgksu.c
- sed -i -e 's|/bin/su\([^d]\)|/run/wrappers/bin/su\1|g' libgksu/libgksu.c
-
- touch NEWS README
- '';
-
- preConfigure = ''
- intltoolize --force --copy --automake
- '';
-
- configureFlags = [
- "--disable-gtk-doc"
- ];
-
- meta = {
- description = "A library for integration of su into applications";
- longDescription = ''
- This library comes from the gksu program. It provides a simple API
- to use su and sudo in programs that need to execute tasks as other
- user. It provides X authentication facilities for running
- programs in an X session.
- '';
- homepage = "https://www.nongnu.org/gksu/";
- license = lib.licenses.lgpl2;
- maintainers = [ lib.maintainers.romildo ];
- platforms = lib.platforms.linux;
- };
-}
diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch
deleted file mode 100644
index 5c007be5b4b4..000000000000
--- a/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/libgksu.c libgksu-2.0.0/libgksu/libgksu.c
---- libgksu-2.0.0.orig/libgksu/libgksu.c 2006-09-14 22:35:51.000000000 -0400
-+++ libgksu-2.0.0/libgksu/libgksu.c 2006-12-12 11:28:01.000000000 -0500
-@@ -23,7 +23,12 @@
- #include
- #include
- #include
-+#ifdef __FreeBSD__
-+#include
-+#include
-+#else
- #include
-+#endif
- #include
- #include
- #include
-diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.am libgksu-2.0.0/libgksu/Makefile.am
---- libgksu-2.0.0.orig/libgksu/Makefile.am 2006-09-14 22:35:52.000000000 -0400
-+++ libgksu-2.0.0/libgksu/Makefile.am 2006-12-12 11:28:01.000000000 -0500
-@@ -30,6 +30,6 @@ gksu_run_helper_SOURCES = gksu-run-helpe
- noinst_PROGRAMS = test-gksu
- test_gksu_SOURCES = test-gksu.c
- test_gksu_LDADD = libgksu2.la
--test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
-+test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
-
- EXTRA_DIST = libgksu.ver
-diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.in libgksu-2.0.0/libgksu/Makefile.in
---- libgksu-2.0.0.orig/libgksu/Makefile.in 2006-09-23 15:37:44.000000000 -0400
-+++ libgksu-2.0.0/libgksu/Makefile.in 2006-12-12 11:30:09.000000000 -0500
-@@ -283,7 +283,7 @@ gksu_run_helper_LDFLAGS = `pkg-config --
- gksu_run_helper_SOURCES = gksu-run-helper.c
- test_gksu_SOURCES = test-gksu.c
- test_gksu_LDADD = libgksu2.la
--test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
-+test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
- EXTRA_DIST = libgksu.ver
- all: all-am
-
-diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.am libgksu-2.0.0/libgksuui/Makefile.am
---- libgksu-2.0.0.orig/libgksuui/Makefile.am 2006-09-14 22:35:31.000000000 -0400
-+++ libgksu-2.0.0/libgksuui/Makefile.am 2006-12-12 11:28:01.000000000 -0500
-@@ -12,4 +12,4 @@ includedir = ${prefix}/include/$(PACKAGE
- noinst_PROGRAMS = test-gksuui
- test_gksuui_SOURCES = test-gksuui.c
- test_gksuui_LDADD = libgksuui1.0.la
--test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
-+test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
-diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.in libgksu-2.0.0/libgksuui/Makefile.in
---- libgksu-2.0.0.orig/libgksuui/Makefile.in 2006-09-23 15:37:44.000000000 -0400
-+++ libgksu-2.0.0/libgksuui/Makefile.in 2006-12-12 11:30:22.000000000 -0500
-@@ -250,7 +250,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c
- noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
- test_gksuui_SOURCES = test-gksuui.c
- test_gksuui_LDADD = libgksuui1.0.la
--test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
-+test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
- all: all-am
-
- .SUFFIXES:
diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch
deleted file mode 100644
index 0f22166fb8b7..000000000000
--- a/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Due to the following change, pkglib_PROGRAMS is invalid:
- http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
-
-https://savannah.nongnu.org/bugs/index.php?35241
-https://bugs.gentoo.org/show_bug.cgi?id=397411
-
----
- libgksu/Makefile.am | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am
-index 49362f9..3cb1090 100644
---- a/libgksu/Makefile.am
-+++ b/libgksu/Makefile.am
-@@ -22,8 +22,8 @@ includedir = ${prefix}/include/${PACKAGE}
- pkgconfigdir = ${libdir}/pkgconfig
- pkgconfig_DATA = libgksu2.pc
-
--pkglibdir = ${libdir}/${PACKAGE}
--pkglib_PROGRAMS = gksu-run-helper
-+gksulibdir = ${libdir}/${PACKAGE}
-+gksulib_PROGRAMS = gksu-run-helper
- gksu_run_helper_LDADD = ${GLIB_LIBS}
- gksu_run_helper_SOURCES = gksu-run-helper.c
-
diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch
deleted file mode 100644
index dd52b8247fa4..000000000000
--- a/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- libgksu/Makefile.am-orig 2010-08-22 16:11:19.872577459 -0500
-+++ libgksu/Makefile.am 2010-08-22 16:11:55.289599110 -0500
-@@ -17,11 +17,11 @@
-
- if GCONF_SCHEMAS_INSTALL
- install-data-local:
-- if test -z "$(DESTDIR)" ; then \
-- for p in $(schemas_DATA) ; do \
-- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
-- done \
-- fi
-+ if test -z "$(DESTDIR)" ; then \
-+ for p in $(schemas_DATA) ; do \
-+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
-+ done \
-+ fi
- else
- install-data-local:
- endif
diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch
deleted file mode 100644
index 3787ef6bfc13..000000000000
--- a/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: libgksu-2.0.12/libgksu/Makefile.am
-===================================================================
---- libgksu-2.0.12.orig/libgksu/Makefile.am
-+++ libgksu-2.0.12/libgksu/Makefile.am
-@@ -27,7 +27,7 @@ pkglib_PROGRAMS = gksu-run-helper
- gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
- gksu_run_helper_SOURCES = gksu-run-helper.c
-
--noinst_PROGRAMS = test-gksu
-+EXTRA_PROGRAMS = test-gksu
- test_gksu_SOURCES = test-gksu.c
- test_gksu_LDADD = libgksu2.la
- test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
-Index: libgksu-2.0.12/libgksuui/Makefile.am
-===================================================================
---- libgksu-2.0.12.orig/libgksuui/Makefile.am
-+++ libgksu-2.0.12/libgksuui/Makefile.am
-@@ -9,7 +9,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c
- noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
- includedir = ${prefix}/include/$(PACKAGE)
-
--noinst_PROGRAMS = test-gksuui
-+EXTRA_PROGRAMS = test-gksuui
- test_gksuui_SOURCES = test-gksuui.c
- test_gksuui_LDADD = libgksuui1.0.la
- test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch
deleted file mode 100644
index 2c3a8cc786bb..000000000000
--- a/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch
+++ /dev/null
@@ -1,359 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libgksu-2.0.12.orig/libgksu/libgksu.c libgksu-2.0.12/libgksu/libgksu.c
---- libgksu-2.0.12.orig/libgksu/libgksu.c 2009-06-29 13:48:24.000000000 -0400
-+++ libgksu-2.0.12/libgksu/libgksu.c 2010-01-12 07:32:10.450657456 -0500
-@@ -1,7 +1,6 @@
- /*
- * Gksu -- a library providing access to su functionality
- * Copyright (C) 2004-2009 Gustavo Noronha Silva
-- * Portions Copyright (C) 2009 VMware, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
-@@ -56,9 +55,6 @@
- static void
- gksu_context_launch_complete (GksuContext *context);
-
--static void
--read_line (int fd, gchar *buffer, int n);
--
- GType
- gksu_error_get_type (void)
- {
-@@ -2009,8 +2005,6 @@ gksu_su_fuller (GksuContext *context,
- for (i = 0 ; cmd[i] != NULL ; i++)
- g_free (cmd[i]);
- g_free(cmd);
--
-- _exit(1);
- }
- else if (pid == -1)
- {
-@@ -2125,10 +2119,10 @@ gksu_su_fuller (GksuContext *context,
- /* drop the \n echoed on password entry if su did request
- a password */
- if (password_needed)
-- read_line (fdpty, buf, 255);
-+ read (fdpty, buf, 255);
- if (context->debug)
- fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf);
-- read_line (fdpty, buf, 255);
-+ read (fdpty, buf, 255);
- if (context->debug)
- fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf);
- }
-@@ -2142,9 +2136,7 @@ gksu_su_fuller (GksuContext *context,
- {
- int retval = 0;
-
-- /* Red Hat's su shows the full path to su in its error messages. */
-- if (!strncmp (buf, "su:", 3) ||
-- !strncmp (buf, "/bin/su:", 7))
-+ if (!strncmp (buf, "su", 2))
- {
- gchar **strings;
-
-@@ -2155,11 +2147,7 @@ gksu_su_fuller (GksuContext *context,
- }
-
- strings = g_strsplit (buf, ":", 2);
--
-- /* Red Hat and Fedora use 'incorrect password'. */
-- if (strings[1] &&
-- (g_str_has_prefix(strings[1], " Authentication failure") ||
-- g_str_has_prefix(strings[1], " incorrect password")))
-+ if (strings[1] && !strncmp (strings[1], " Authentication failure", 23))
- {
- if (used_gnome_keyring)
- g_set_error (error, gksu_quark,
-@@ -2473,12 +2461,6 @@ gksu_sudo_fuller (GksuContext *context,
- {
- char **cmd;
- char buffer[256] = {0};
-- char *child_stderr = NULL;
-- /* This command is used to gain a token */
-- char *const verifycmd[] =
-- {
-- "/usr/bin/sudo", "-p", "GNOME_SUDO_PASS", "-v", NULL
-- };
- int argcount = 8;
- int i, j;
-
-@@ -2489,8 +2471,9 @@ gksu_sudo_fuller (GksuContext *context,
-
- pid_t pid;
- int status;
-- FILE *fdfile = NULL;
-- int fdpty = -1;
-+ FILE *infile, *outfile;
-+ int parent_pipe[2]; /* For talking to the parent */
-+ int child_pipe[2]; /* For talking to the child */
-
- context->sudo_mode = TRUE;
-
-@@ -2565,10 +2548,6 @@ gksu_sudo_fuller (GksuContext *context,
- cmd[argcount] = g_strdup("-S");
- argcount++;
-
-- /* Make sudo noninteractive (we should already have a token) */
-- cmd[argcount] = g_strdup("-n");
-- argcount++;
--
- /* Make sudo use next arg as prompt */
- cmd[argcount] = g_strdup("-p");
- argcount++;
-@@ -2647,21 +2626,26 @@ gksu_sudo_fuller (GksuContext *context,
- fprintf (stderr, "cmd[%d]: %s\n", i, cmd[i]);
- }
-
-- pid = forkpty(&fdpty, NULL, NULL, NULL);
-- if (pid == 0)
-+ if ((pipe(parent_pipe)) == -1)
- {
-- // Child
-- setsid(); // make us session leader
--
-- execv(verifycmd[0], verifycmd);
-+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
-+ _("Error creating pipe: %s"),
-+ strerror(errno));
-+ sudo_reset_xauth (context, xauth, xauth_env);
-+ return FALSE;
-+ }
-
-- g_set_error (error, gksu_quark, GKSU_ERROR_EXEC,
-- _("Failed to exec new process: %s"),
-+ if ((pipe(child_pipe)) == -1)
-+ {
-+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
-+ _("Error creating pipe: %s"),
- strerror(errno));
- sudo_reset_xauth (context, xauth, xauth_env);
- return FALSE;
- }
-- else if (pid == -1)
-+
-+ pid = fork();
-+ if (pid == -1)
- {
- g_set_error (error, gksu_quark, GKSU_ERROR_FORK,
- _("Failed to fork new process: %s"),
-@@ -2669,26 +2653,56 @@ gksu_sudo_fuller (GksuContext *context,
- sudo_reset_xauth (context, xauth, xauth_env);
- return FALSE;
- }
-+ else if (pid == 0)
-+ {
-+ // Child
-+ setsid(); // make us session leader
-+ close(child_pipe[1]);
-+ dup2(child_pipe[0], STDIN_FILENO);
-+ dup2(parent_pipe[1], STDERR_FILENO);
-
-+ execv(cmd[0], cmd);
-+
-+ g_set_error (error, gksu_quark, GKSU_ERROR_EXEC,
-+ _("Failed to exec new process: %s"),
-+ strerror(errno));
-+ sudo_reset_xauth (context, xauth, xauth_env);
-+ return FALSE;
-+ }
- else
- {
- gint counter = 0;
- gchar *cmdline = NULL;
-- struct termios tio;
-
- // Parent
-- fdfile = fdopen(fdpty, "w+");
-+ close(parent_pipe[1]);
-
-- /* make sure we notice that ECHO is turned off, if it gets
-- turned off */
-- tcgetattr (fdpty, &tio);
-- for (counter = 0; (tio.c_lflag & ECHO) && counter < 15; counter++)
-- {
-- usleep (1000);
-- tcgetattr (fdpty, &tio);
-- }
-+ infile = fdopen(parent_pipe[0], "r");
-+ if (!infile)
-+ {
-+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
-+ _("Error opening pipe: %s"),
-+ strerror(errno));
-+ sudo_reset_xauth (context, xauth, xauth_env);
-+ return FALSE;
-+ }
-
-- fcntl (fdpty, F_SETFL, O_NONBLOCK);
-+ outfile = fdopen(child_pipe[1], "w");
-+ if (!outfile)
-+ {
-+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
-+ _("Error opening pipe: %s"),
-+ strerror(errno));
-+ sudo_reset_xauth (context, xauth, xauth_env);
-+ return FALSE;
-+ }
-+
-+ /*
-+ we are expecting to receive a GNOME_SUDO_PASS
-+ if we don't there are two possibilities: an error
-+ or a password is not needed
-+ */
-+ fcntl (parent_pipe[0], F_SETFL, O_NONBLOCK);
-
- { /* no matter if we can read, since we're using
- O_NONBLOCK; this is just to avoid the prompt
-@@ -2697,11 +2711,11 @@ gksu_sudo_fuller (GksuContext *context,
- struct timeval tv;
-
- FD_ZERO(&rfds);
-- FD_SET(fdpty, &rfds);
-+ FD_SET(parent_pipe[0], &rfds);
- tv.tv_sec = 1;
- tv.tv_usec = 0;
-
-- select (fdpty + 1, &rfds, NULL, NULL, &tv);
-+ select (parent_pipe[0] + 1, &rfds, NULL, NULL, &tv);
- }
-
- /* Try hard to find the prompt; it may happen that we're
-@@ -2713,7 +2727,7 @@ gksu_sudo_fuller (GksuContext *context,
- if (strncmp (buffer, "GNOME_SUDO_PASS", 15) == 0)
- break;
-
-- read_line (fdpty, buffer, 256);
-+ read_line (parent_pipe[0], buffer, 256);
-
- if (context->debug)
- fprintf (stderr, "buffer: -%s-\n", buffer);
-@@ -2747,17 +2761,18 @@ gksu_sudo_fuller (GksuContext *context,
-
- usleep (1000);
-
-- write (fdpty, password, strlen(password) + 1);
-- write (fdpty, "\n", 1);
-+ fprintf (outfile, "%s\n", password);
-+ fclose (outfile);
-
- nullify_password (password);
-
-- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK);
-+ /* turn NONBLOCK off */
-+ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK);
- /* ignore the first newline that comes right after sudo receives
- the password */
-- fgets (buffer, 255, fdfile);
-- /* this is the status we are interested in */
-- fgets (buffer, 255, fdfile);
-+ fgets (buffer, 255, infile);
-+ /* this is the status we are interessted in */
-+ fgets (buffer, 255, infile);
- }
- else
- {
-@@ -2766,7 +2781,7 @@ gksu_sudo_fuller (GksuContext *context,
- fprintf (stderr, "No password prompt found; we'll assume we don't need a password.\n");
-
- /* turn NONBLOCK off, also if have no prompt */
-- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK);
-+ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK);
-
- should_display = gconf_client_get_bool (context->gconf_client,
- BASE_PATH "display-no-pass-info", NULL);
-@@ -2785,9 +2800,14 @@ gksu_sudo_fuller (GksuContext *context,
- fprintf (stderr, "%s", buffer);
- }
-
-- if (g_str_has_prefix (buffer, "Sorry, try again."))
-+ if (!strcmp (buffer, "Sorry, try again.\n"))
- g_set_error (error, gksu_quark, GKSU_ERROR_WRONGPASS,
- _("Wrong password."));
-+ else if (!strncmp (buffer, "Sorry, user ", 12))
-+ g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED,
-+ _("The underlying authorization mechanism (sudo) "
-+ "does not allow you to run this program. Contact "
-+ "the system administrator."));
- else
- {
- gchar *haystack = buffer;
-@@ -2805,10 +2825,6 @@ gksu_sudo_fuller (GksuContext *context,
- }
- }
-
-- /* If we have an error, let's just stop sudo right there. */
-- if (error)
-- close(fdpty);
--
- cmdline = g_strdup("sudo");
- /* wait for the child process to end or become something other
- than sudo */
-@@ -2825,23 +2841,17 @@ gksu_sudo_fuller (GksuContext *context,
- if (context->sn_context)
- gksu_context_launch_complete (context);
-
-+ while (read (parent_pipe[0], buffer, 255) > 0)
-+ {
-+ fprintf (stderr, "%s", buffer);
-+ bzero(buffer, 256);
-+ }
-+
- /* if the process is still active waitpid() on it */
- if (pid_exited != pid)
- waitpid(pid, &status, 0);
- sudo_reset_xauth (context, xauth, xauth_env);
-
-- /*
-- * Did token acquisition succeed? If so, spawn sudo in
-- * non-interactive mode. It should either succeed or die
-- * immediately if you're not allowed to run the command.
-- */
-- if (WEXITSTATUS(status) == 0)
-- {
-- g_spawn_sync(NULL, cmd, NULL, 0, NULL, NULL,
-- NULL, &child_stderr, &status,
-- error);
-- }
--
- if (exit_status)
- {
- if (WIFEXITED(status)) {
-@@ -2853,13 +2863,6 @@ gksu_sudo_fuller (GksuContext *context,
-
- if (WEXITSTATUS(status))
- {
-- if (g_str_has_prefix(child_stderr, "Sorry, user "))
-- {
-- g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED,
-- _("The underlying authorization mechanism (sudo) "
-- "does not allow you to run this program. Contact "
-- "the system administrator."));
-- }
- if(cmdline)
- {
- /* sudo already exec()ed something else, don't report
-@@ -2868,7 +2871,6 @@ gksu_sudo_fuller (GksuContext *context,
- if (!g_str_has_suffix (cmdline, "sudo"))
- {
- g_free (cmdline);
-- g_free (child_stderr);
- return FALSE;
- }
- g_free (cmdline);
-@@ -2881,11 +2883,11 @@ gksu_sudo_fuller (GksuContext *context,
- }
- }
-
-- fprintf(stderr, child_stderr);
-- g_free(child_stderr);
--
- /* if error is set we have found an error condition */
-- return (error == NULL);
-+ if (error)
-+ return FALSE;
-+
-+ return TRUE;
- }
-
- /**
diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch
deleted file mode 100644
index b9fb77f27147..000000000000
--- a/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-# https://savannah.nongnu.org/bugs/?25362
-# https://bugs.gentoo.org/show_bug.cgi?id=226837
-diff -Nura a/configure.ac b/configure.ac
---- a/configure.ac 2009-01-19 22:15:30.000000000 +0100
-+++ b/configure.ac 2009-01-19 22:18:10.000000000 +0100
-@@ -43,6 +43,9 @@
- PKG_CHECK_MODULES(LIBGKSU, [gtk+-2.0 >= 2.4.0, gconf-2.0, libstartup-notification-1.0, gnome-keyring-1, libgtop-2.0])
- PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.4.0, gconf-2.0, libglade-2.0])
-
-+PKG_CHECK_MODULES(GLIB, [glib-2.0 gthread-2.0])
-+PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0])
-+
- # Checks for library functions.
- ALL_LINGUAS="ca cs da de es eu fr hu it ko lt pl pt_BR ro ru sk sv nb nl zh_CN"
-
-diff -Nura a/gksu-properties/Makefile.am b/gksu-properties/Makefile.am
---- a/gksu-properties/Makefile.am 2009-01-19 22:15:59.000000000 +0100
-+++ b/gksu-properties/Makefile.am 2009-01-19 22:19:13.000000000 +0100
-@@ -3,7 +3,7 @@
- AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
-
- bin_PROGRAMS = gksu-properties
--gksu_properties_LDFLAGS = ${GKSU_PROPERTIES_LIBS}
-+gksu_properties_LDADD = ${GKSU_PROPERTIES_LIBS}
- gksu_properties_SOURCES = gksu-properties.c
-
- gladedir = ${prefix}/share/${PACKAGE}
-diff -Nura a/libgksu/Makefile.am b/libgksu/Makefile.am
---- a/libgksu/Makefile.am 2009-01-19 22:15:59.000000000 +0100
-+++ b/libgksu/Makefile.am 2009-01-19 22:18:25.000000000 +0100
-@@ -8,8 +8,8 @@
- # major -> breaks backward compatibility (changes to existing ABI)
- # minor -> keeps compatibility (additions to the API)
- # micro -> no change to the API/ABI
--libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la
--libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 -lutil ${LIBGKSU_LIBS}
-+libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la -lutil ${LIBGKSU_LIBS}
-+libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1
- if USE_VERSION_SCRIPT
- libgksu2_la_LDFLAGS += -Wl,--version-script=libgksu.ver
- endif
-@@ -24,12 +24,11 @@
-
- pkglibdir = ${libdir}/${PACKAGE}
- pkglib_PROGRAMS = gksu-run-helper
--gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
-+gksu_run_helper_LDADD = ${GLIB_LIBS}
- gksu_run_helper_SOURCES = gksu-run-helper.c
-
- noinst_PROGRAMS = test-gksu
- test_gksu_SOURCES = test-gksu.c
--test_gksu_LDADD = libgksu2.la
--test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
-+test_gksu_LDADD = libgksu2.la ${GLIB_LIBS}
-
- EXTRA_DIST = libgksu.ver
-diff -Nura a/libgksuui/Makefile.am b/libgksuui/Makefile.am
---- a/libgksuui/Makefile.am 2009-01-19 22:15:59.000000000 +0100
-+++ b/libgksuui/Makefile.am 2009-01-19 22:18:54.000000000 +0100
-@@ -4,12 +4,13 @@
-
- noinst_LTLIBRARIES = libgksuui1.0.la
- libgksuui1_0_la_SOURCES = gksuui-dialog.c
--libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-config --libs gtk+-2.0 gconf-2.0`
-+libgksuui1_0_la_LDFLAGS = -Wl,-O1
-+libgksuui1_0_la_LIBADD = ${GTK_LIBS}
-
- noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
- includedir = ${prefix}/include/$(PACKAGE)
-
- noinst_PROGRAMS = test-gksuui
- test_gksuui_SOURCES = test-gksuui.c
--test_gksuui_LDADD = libgksuui1.0.la
--test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
-+test_gksuui_LDADD = libgksuui1.0.la ${GLIB_LIBS}
-+
diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch
deleted file mode 100644
index e423af16b44c..000000000000
--- a/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-# https://savannah.nongnu.org/bugs/?25360
-diff -Nura a/configure.ac b/configure.ac
---- a/configure.ac 2009-01-19 21:50:57.000000000 +0100
-+++ b/configure.ac 2009-01-19 21:53:21.000000000 +0100
-@@ -50,7 +50,7 @@
- GETTEXT_PACKAGE=AC_PACKAGE_NAME
- AC_SUBST(GETTEXT_PACKAGE)
-
--IT_PROG_INTLTOOL
-+IT_PROG_INTLTOOL([0.35.5])
- AM_GLIB_GNU_GETTEXT
-
- ##################################################
-diff -Nura a/po/LINGUAS b/po/LINGUAS
---- a/po/LINGUAS 1970-01-01 01:00:00.000000000 +0100
-+++ b/po/LINGUAS 2009-01-19 21:54:24.000000000 +0100
-@@ -0,0 +1,23 @@
-+# please keep this list sorted alphabetically
-+# http://live.gnome.org/GnomeGoals/PoLinguas
-+#
-+ca
-+cs
-+da
-+de
-+es
-+eu
-+fr
-+hu
-+it
-+ko
-+lt
-+pl
-+pt_BR
-+ro
-+ru
-+sk
-+sv
-+nb
-+nl
-+zh_CN
diff --git a/pkgs/development/libraries/mapbox-gl-qml/default.nix b/pkgs/development/libraries/mapbox-gl-qml/default.nix
index 87e765766227..49a7f26220dd 100644
--- a/pkgs/development/libraries/mapbox-gl-qml/default.nix
+++ b/pkgs/development/libraries/mapbox-gl-qml/default.nix
@@ -11,13 +11,13 @@
mkDerivation rec {
pname = "mapbox-gl-qml";
- version = "1.7.6";
+ version = "1.7.7.1";
src = fetchFromGitHub {
owner = "rinigus";
repo = "mapbox-gl-qml";
rev = version;
- sha256 = "sha256-E6Pkr8khzDbhmJxzK943+H6cDREgwAqMnJQ3hQWU7fw=";
+ hash = "sha256-lmL9nawMY8rNNBV4zNF4N1gn9XZzIZ9Cw2ZRs9bjBaI=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index 9210f18ed962..8bba8f0efe0e 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -15,13 +15,13 @@ stdenv.mkDerivation rec {
# versions. See
# * https://github.com/NixOS/nixpkgs/pull/119838#issuecomment-822100428
# * https://github.com/NixOS/nixpkgs/commit/0ee02a9d42b5fe1825b0f7cee7a9986bb4ba975d
- version = "2.26.0"; # nixpkgs-update: no auto update
+ version = "2.28.0"; # nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "ARMmbed";
repo = "mbedtls";
rev = "${pname}-${version}";
- sha256 = "0scwpmrgvg6q7rvqkc352d2fqlsx0aylcbyibcp1f1rsn8iiif2m";
+ sha256 = "sha256-VDoIUBaK2e0E5nkwU1u3Wvxc+s6OzBSdIeHsJKJuZ2g=";
};
nativeBuildInputs = [ cmake ninja perl python3 ];
diff --git a/pkgs/development/python-modules/gigalixir/default.nix b/pkgs/development/python-modules/gigalixir/default.nix
index aa5512d99131..99a878700d7f 100644
--- a/pkgs/development/python-modules/gigalixir/default.nix
+++ b/pkgs/development/python-modules/gigalixir/default.nix
@@ -16,11 +16,11 @@
buildPythonApplication rec {
pname = "gigalixir";
- version = "1.2.4";
+ version = "1.2.5";
src = fetchPypi {
inherit pname version;
- sha256 = "894b7e5bef30abc2c003e6df47f7758de5649b6f593e33926fcd398cc88d9ce2";
+ sha256 = "sha256-P70xsI/zwsoSgK1XCPzJSI5NQ58M431kmgo5gHXbaNw=";
};
postPatch = ''
diff --git a/pkgs/development/python2-modules/pygtk/default.nix b/pkgs/development/python2-modules/pygtk/default.nix
index 938b55630c06..465d711ec6ff 100644
--- a/pkgs/development/python2-modules/pygtk/default.nix
+++ b/pkgs/development/python2-modules/pygtk/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchpatch, python, pkg-config, gtk2, pygobject2, pycairo, pango
-, buildPythonPackage, libglade ? null, isPy3k }:
+, buildPythonPackage, isPy3k }:
buildPythonPackage rec {
pname = "pygtk";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
pango
- ] ++ lib.optional (libglade != null) libglade;
+ ];
propagatedBuildInputs = [ gtk2 pygobject2 pycairo ];
@@ -39,7 +39,7 @@ buildPythonPackage rec {
installPhase = "installPhase";
- checkPhase = lib.optionalString (libglade == null)
+ checkPhase =
''
sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \
tests/common.py
diff --git a/pkgs/development/tools/convco/default.nix b/pkgs/development/tools/convco/default.nix
index 44445f86752a..f137cbd078bc 100644
--- a/pkgs/development/tools/convco/default.nix
+++ b/pkgs/development/tools/convco/default.nix
@@ -1,21 +1,30 @@
-{ lib, rustPlatform, fetchFromGitHub, stdenv, openssl, perl, pkg-config, libiconv, Security }:
+{ stdenv
+, lib
+, rustPlatform
+, fetchFromGitHub
+, cmake
+, libiconv
+, openssl
+, pkg-config
+, Security
+}:
rustPlatform.buildRustPackage rec {
pname = "convco";
- version = "0.3.3";
+ version = "0.3.8";
src = fetchFromGitHub {
owner = "convco";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-eWe7oTWl7QfIqq3GfMILi5S8zUi03ER1Mzfr8hqUvgw=";
+ sha256 = "sha256-sNVl+bbCj3vPYz4wKOaAHeaPCCubG4XvXZ+AZijhFJE=";
};
- cargoSha256 = "sha256-RuClZ+ChP7d40e9nr1Lg8R0F7rbFbBse79V9Y1AQn3o=";
+ cargoSha256 = "sha256-FHiX9XpNjBFfs9fwi3Wzq7bAwRi7e/sqtji5WWPA5Qo=";
- nativeBuildInputs = [ openssl perl pkg-config ];
+ nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
+ buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ];
meta = with lib; {
description = "A Conventional commit cli";
diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix
index 7bf32a13ce68..4841c48d0ee2 100644
--- a/pkgs/development/tools/misc/clojure-lsp/default.nix
+++ b/pkgs/development/tools/misc/clojure-lsp/default.nix
@@ -2,28 +2,20 @@
buildGraalvmNativeImage rec {
pname = "clojure-lsp";
- version = "2022.01.22-01.31.09";
+ version = "2022.02.01-16.53.14";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "sha256-xQSOJRKKjX3AfQsYe4UNhFlLgWPkoY8NOPXCO1oc3BI=";
+ sha256 = "sha256-VyDnDlK40Sj/0cethclnRlKc5tOentAEUzjDOqbItpo=";
};
jar = fetchurl {
url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";
- sha256 = "sha256-le0+ZmGyhM/UfGUV05FHyx5PlARxL/T2aC8UhiPYjxw";
+ sha256 = "sha256-gIG8sjf55aRo4xI/RFrxhzLSD6RHzn/YGG9+gWrXcgE=";
};
- # https://github.com/clojure-lsp/clojure-lsp/blob/2022.01.22-01.31.09/cli/graalvm/native-unix-compile.sh#L18-L27
- # Needs to be inject on `nativeImageBuildArgs` inside shell environment,
- # otherwise we can't expand to the value set in `mktemp -d` call
- preBuild = ''
- export DTLV_LIB_EXTRACT_DIR="$(mktemp -d)"
- nativeImageBuildArgs+=("-H:CLibraryPath=$DTLV_LIB_EXTRACT_DIR")
- '';
-
extraNativeImageBuildArgs = [
"--no-fallback"
"--native-image-info"
@@ -68,8 +60,5 @@ buildGraalvmNativeImage rec {
homepage = "https://github.com/clojure-lsp/clojure-lsp";
license = licenses.mit;
maintainers = with maintainers; [ ericdallo babariviere ];
- # Depends on datalevin that is x86_64 only
- # https://github.com/juji-io/datalevin/blob/bb7d9328f4739cddea5d272b5cd6d6dcb5345da6/native/src/java/datalevin/ni/Lib.java#L86-L102
- broken = !stdenv.isx86_64;
};
}
diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index e81e5e48bdf6..dfed3c91bc5e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -58,7 +58,7 @@ let
let
change = name: grammar:
callPackage ./grammar.nix { } {
- language = name;
+ language = if grammar ? language then grammar.language else name;
inherit version;
source = fetchGrammar grammar;
location = if grammar ? location then grammar.location else null;
@@ -67,6 +67,7 @@ let
grammars = grammars' //
{ tree-sitter-ocaml = grammars'.tree-sitter-ocaml // { location = "ocaml"; }; } //
{ tree-sitter-ocaml-interface = grammars'.tree-sitter-ocaml // { location = "interface"; }; } //
+ { tree-sitter-org-nvim = grammars'.tree-sitter-org-nvim // { language = "org"; }; } //
{ tree-sitter-typescript = grammars'.tree-sitter-typescript // { location = "typescript"; }; } //
{ tree-sitter-tsx = grammars'.tree-sitter-typescript // { location = "tsx"; }; };
in
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
index a001573b4827..eb2275d2724c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
@@ -54,7 +54,7 @@
tree-sitter-nix = lib.importJSON ./tree-sitter-nix.json;
tree-sitter-norg = lib.importJSON ./tree-sitter-norg.json;
tree-sitter-ocaml = lib.importJSON ./tree-sitter-ocaml.json;
- tree-sitter-org = lib.importJSON ./tree-sitter-org.json;
+ tree-sitter-org-nvim = lib.importJSON ./tree-sitter-org-nvim.json;
tree-sitter-perl = lib.importJSON ./tree-sitter-perl.json;
tree-sitter-php = lib.importJSON ./tree-sitter-php.json;
tree-sitter-pioasm = lib.importJSON ./tree-sitter-pioasm.json;
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json
similarity index 100%
rename from pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json
rename to pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json
diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix
index eae6dd081355..166154f7481a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/update.nix
@@ -304,7 +304,7 @@ let
orga = "victorhqc";
repo = "tree-sitter-prisma";
};
- "tree-sitter-org" = {
+ "tree-sitter-org-nvim" = {
orga = "milisims";
repo = "tree-sitter-org";
};
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 830ddf49810a..34e1b10b32a8 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -452,7 +452,7 @@ let
};
security = {
- FORTIFY_SOURCE = whenAtLeast "4.13" yes;
+ FORTIFY_SOURCE = whenAtLeast "4.13" (option yes);
# https://googleprojectzero.blogspot.com/2019/11/bad-binder-android-in-wild-exploit.html
DEBUG_LIST = yes;
diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix
index 2bec7f6912e7..17e648e59ab1 100644
--- a/pkgs/servers/misc/navidrome/default.nix
+++ b/pkgs/servers/misc/navidrome/default.nix
@@ -4,17 +4,17 @@ with lib;
stdenv.mkDerivation rec {
pname = "navidrome";
- version = "0.47.0";
+ version = "0.47.5";
src = fetchurl (if stdenv.hostPlatform.system == "x86_64-linux"
then {
url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz";
- sha256 = "sha256-MoBv2dTCotLnGaZOUWLScYd1+gKSjPXTSkHAR6UircA=";
+ sha256 = "sha256-AkSjtln53HDdIcQgnA8Wj010RXnOlOsFm2wfVgbvwtc=";
}
else {
url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_arm64.tar.gz";
- sha256 = "sha256-FIjrw+BBJXOjh1AoVdfPZIdcDyk5yS/zKD1O+u31YlE=";
+ sha256 = "sha256-+VBRiV2zKa6PwamWj/jmE4iuoohAD6oeGnlFi4/01HM=";
});
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 2001ae005271..d32a545069de 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -45,11 +45,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "samba";
- version = "4.15.2";
+ version = "4.15.5";
src = fetchurl {
url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
- sha256 = "sha256-YoHXxqjEn3mQqfJJpmeEs1GA/iSVV+8RR82KbRZqIRM=";
+ sha256 = "sha256-aRFeM4MZN7pRUb4CR5QxR3Za7OZYunQ/RHQWcq1o0X8=";
};
outputs = [ "out" "dev" "man" ];
diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix
index df2e9fe03ab0..bed8da0488b4 100644
--- a/pkgs/servers/sickbeard/sickgear.nix
+++ b/pkgs/servers/sickbeard/sickgear.nix
@@ -4,13 +4,13 @@ let
pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 ]);
in stdenv.mkDerivation rec {
pname = "sickgear";
- version = "0.25.24";
+ version = "0.25.26";
src = fetchFromGitHub {
owner = "SickGear";
repo = "SickGear";
rev = "release_${version}";
- sha256 = "sha256-x6v7CKJkN6gt9askpp/W0CVCKvRaHLBXbagtC+rVNVc=";
+ sha256 = "153zd0yq39vmh00ydw42yw8dx18cy3as36xml228hq244cxypkwp";
};
dontBuild = true;
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 7a70accb723f..44caa6838e8d 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -119,13 +119,20 @@ let
}
'';
+ # flakeNote will be printed in the remediation messages below.
+ flakeNote = "
+ Note: For `nix shell`, `nix build`, `nix develop` or any other Nix 2.4+
+ (Flake) command, `--impure` must be passed in order to read this
+ environment variable.
+ ";
+
remediate_allowlist = allow_attr: rebuild_amendment: attrs:
''
a) To temporarily allow ${remediation_phrase allow_attr}, you can use an environment variable
for a single invocation of the nix tools.
$ export ${remediation_env_var allow_attr}=1
-
+ ${flakeNote}
b) For `nixos-rebuild` you can set
{ nixpkgs.config.allow${allow_attr} = true; }
in configuration.nix to override this.
@@ -148,7 +155,7 @@ let
variable for a single invocation of the nix tools:
$ export NIXPKGS_ALLOW_INSECURE=1
-
+ ${flakeNote}
b) for `nixos-rebuild` you can add ‘${getName attrs}’ to
`nixpkgs.config.permittedInsecurePackages` in the configuration.nix,
like so:
diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix
deleted file mode 100644
index 5cbcec63c59d..000000000000
--- a/pkgs/tools/X11/obconf/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, gtk2, libglade, openbox,
- imlib2, libstartup_notification, makeWrapper, libSM }:
-
-stdenv.mkDerivation rec {
- pname = "obconf";
- version = "2.0.4";
-
- src = fetchurl {
- url = "http://openbox.org/dist/obconf/obconf-${version}.tar.gz";
- sha256 = "1fanjdmd8727kk74x5404vi8v7s4kpq48l583d12fsi4xvsfb8vi";
- };
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [
- gtk2 libglade libSM openbox imlib2 libstartup_notification
- makeWrapper
- ];
-
- postInstall = ''
- wrapProgram $out/bin/obconf --prefix XDG_DATA_DIRS : ${openbox}/share/
- '';
-
- meta = {
- description = "GUI configuration tool for openbox";
- homepage = "http://openbox.org/wiki/ObConf";
- license = lib.licenses.gpl2;
- maintainers = [ lib.maintainers.lhvwb ];
- platforms = lib.platforms.linux;
- };
-}
diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index ffb7b76cd48a..5e038b70d543 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
- version = "0.76.0";
+ version = "0.82.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
- sha256 = "sha256-KhAS8JUM6dobcSJ/QaRhxv2jNpn6AFqiDRCdxeKHwZE=";
+ sha256 = "sha256-nem090YUHi80P2akWRVuswJxhQ5mIP9fHWVAY4k2LFE=";
};
- vendorSha256 = "sha256-bUbStgIJeqzBkoSffJ8ZvqVtOMJ/mqxIIB/Fq9GhoXc=";
+ vendorSha256 = "sha256-+G3utnWjAilHx9u9P0DtaDf09UT/VqTe7yO/k5o/zMc=";
doCheck = false;
diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix
index 957ad7f51efc..47320eff7798 100644
--- a/pkgs/tools/admin/trivy/default.nix
+++ b/pkgs/tools/admin/trivy/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "trivy";
- version = "0.22.0";
+ version = "0.23.0";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-DH4vr6WiGwzT9zTMs/UqVoCHhpOSoT5t8P9plTPt8ZQ=";
+ sha256 = "sha256-6eOoFZ2ms1upnbO4brKYKBSPw/9cnQT1Cz/0A4dwoxc=";
};
- vendorSha256 = "sha256-1m3izHfxMUvUiz21NRjqdNS95sXf8Rwlu5TuQ411190=";
+ vendorSha256 = "sha256-ZHVcLmjz7cfL5CjUwCEoWr5fgWZmNsCzHL83Mr+p7kA=";
excludedPackages = "misc";
diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix
index b94d514e8ece..0a62020b3ba0 100644
--- a/pkgs/tools/audio/abcm2ps/default.nix
+++ b/pkgs/tools/audio/abcm2ps/default.nix
@@ -1,25 +1,28 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, which, docutils, freetype, pango }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, docutils
+, pkg-config
+, freetype
+, pango
+}:
stdenv.mkDerivation rec {
pname = "abcm2ps";
- version = "8.14.12";
+ version = "8.14.13";
src = fetchFromGitHub {
owner = "leesavide";
repo = "abcm2ps";
rev = "v${version}";
- sha256 = "sha256-RELWtI+S2cbG7cXCehXymvWRdair28UaDZRVr5xt9Tk=";
+ hash = "sha256-31cEBtVn7GlNIsPkRiW0DyKA/giLeJ86EUZr8zjYy3s=";
};
configureFlags = [
"--INSTALL=install"
];
- buildFlags = [
- "CC=${stdenv.cc}/bin/cc"
- ];
-
- nativeBuildInputs = [ which pkg-config docutils ];
+ nativeBuildInputs = [ docutils pkg-config ];
buildInputs = [ freetype pango ];
diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix
index 69f745ecc1bd..969ea26e362b 100644
--- a/pkgs/tools/backup/btrbk/default.nix
+++ b/pkgs/tools/backup/btrbk/default.nix
@@ -7,7 +7,6 @@
, perl
, perlPackages
, util-linux
-, asciidoc
, asciidoctor
, mbuffer
, makeWrapper
@@ -26,7 +25,7 @@ stdenv.mkDerivation rec {
sha256 = "1lx7vnf386nsik8mxrrfyx1h7mkqk5zs26sy0s0lynfxcm4lkxb2";
};
- nativeBuildInputs = [ asciidoc asciidoctor makeWrapper ];
+ nativeBuildInputs = [ asciidoctor makeWrapper ];
buildInputs = with perlPackages; [ perl DateCalc ];
diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix
index 5c1ef4b9f42e..3f480a0ec5e4 100644
--- a/pkgs/tools/misc/goreleaser/default.nix
+++ b/pkgs/tools/misc/goreleaser/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "goreleaser";
- version = "1.3.1";
+ version = "1.4.1";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-QFb702/v+fSzPWJ+hIGAXqVYfLpecA4sOFM+r8QvdYE=";
+ sha256 = "sha256-pEZ7H7WOPpzCGMLPgyfVJudamSWynoB5qnZSbVXj5uk=";
};
- vendorSha256 = "sha256-EPm+QNGCY3miuhdMETl98c9SQhcqvHbYeLUQQeI/IsM=";
+ vendorSha256 = "sha256-7c5bd5pEulcr1mpdEUr2tDZNwjRkjqXOLiu+2x5/uFs=";
ldflags = [
"-s"
diff --git a/pkgs/tools/networking/chisel/default.nix b/pkgs/tools/networking/chisel/default.nix
index 9df5625c2355..d7dac44b2802 100644
--- a/pkgs/tools/networking/chisel/default.nix
+++ b/pkgs/tools/networking/chisel/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "chisel";
- version = "1.7.6";
+ version = "1.7.7";
src = fetchFromGitHub {
owner = "jpillora";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-hUurgwbSUcNZiSi+eVTG/Ija/yxPeWuvEE5pUiG7Dls=";
+ sha256 = "sha256-3EaVUGcwkJWX0FxIaHddUehJIdbxAPfBm8esXKCUuhM=";
};
- vendorSha256 = "sha256-GzsQ6LXxe9UQc13XbsYFOWPe0EzlyHechchKc6xDkAc=";
+ vendorSha256 = "sha256-Oko9nduKW76NIUCVyF0lPzEH+TFT1el9VGIbm5lQXtM=";
ldflags = [ "-s" "-w" "-X github.com/jpillora/chisel/share.BuildVersion=${version}" ];
diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix
index a75c669f89f1..9adf63ea160f 100644
--- a/pkgs/tools/security/kubescape/default.nix
+++ b/pkgs/tools/security/kubescape/default.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "kubescape";
- version = "2.0.143";
+ version = "2.0.144";
src = fetchFromGitHub {
owner = "armosec";
repo = pname;
rev = "v${version}";
- hash = "sha256-ylmH3vQTWT9I57J+Q771PG/r6t8t3P6zNC+sGIx3C1A=";
+ hash = "sha256-X/r39lvNSLZ4SG/x5Woj7c0fEOp8USyeTWYihaY0faU=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/security/pbis/default.nix b/pkgs/tools/security/pbis/default.nix
index 7561b1fae98f..acd1fc5607bc 100644
--- a/pkgs/tools/security/pbis/default.nix
+++ b/pkgs/tools/security/pbis/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
# curl must be placed after openssl_1_0_2, because it pulls openssl 1.1 dependency.
buildInputs = [
pam popt libiconv libuuid openssl_1_0_2 cyrus_sasl
- curl sqlite popt tdb libxml2 /*libglade2 for gtk*/
+ curl sqlite popt tdb libxml2
];
postPatch = ''
diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix
index 5757db1e8719..8fc299fa6c00 100644
--- a/pkgs/tools/text/ugrep/default.nix
+++ b/pkgs/tools/text/ugrep/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "ugrep";
- version = "3.6.0";
+ version = "3.7.1";
src = fetchFromGitHub {
owner = "Genivia";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-hEP7Oe1CNLEvSfUIXoXwRJUG4kIkb2f1549cZRXK+NY=";
+ hash = "sha256-5ZlZ/nCUOiyOWagF1Vla945d7zKbMsHp56ZE4HwdEP4=";
};
buildInputs = [
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ab07fd2c9267..d5dd54b48f11 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -302,6 +302,7 @@ mapAliases ({
foomatic_filters = foomatic-filters; # 2016-08
fscryptctl-experimental = throw "The package fscryptctl-experimental has been removed. Please switch to fscryptctl."; # 2021-11-07
fsharp41 = throw "fsharp41 has been removed, please use dotnet-sdk_5 or later";
+ fslint = throw "fslint has been removed: end of life. Upstream recommends using czkawka (https://qarmin.github.io/czkawka/) instead"; # 2022-01-15
fuse_exfat = exfat; # 2015-09-11
fuseki = apache-jena-fuseki; # added 2018-04-25
fwupdate = throw "fwupdate was merged into fwupd"; # added 2020-05-19
@@ -312,6 +313,7 @@ mapAliases ({
gdk_pixbuf = gdk-pixbuf; # added 2019-05-22
gettextWithExpat = gettext; # 2016-02-19
getmail = throw "getmail has been removed from nixpkgs, migrate to getmail6."; # added 2022-01-12
+ gfm = throw "gfm has been removed"; # 2021-01-15
giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # 2020-02-12
git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2."; # added 2022-01-01
gitAndTools = self // { # added 2021-01-14
@@ -325,12 +327,14 @@ mapAliases ({
};
gitin = throw "gitin has been remove because it was unmaintained and depended on an insecure version of libgit2"; # added 2021-12-07
gitinspector = throw "gitinspector has been removed because it doesn't work with python3."; # added 2022-01-12
+ gksu = throw "gksu has been removed"; # added 2022-01-16
glib_networking = glib-networking; # added 2018-02-25
gmailieer = lieer; # added 2020-04-19
gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # added 2021-03-08
gnome-mpv = celluloid; # added 2019-08-22
gnome15 = throw "gnome15 has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2019-12-10
gmic_krita_qt = gmic-qt-krita; # added 2019-09-07
+ gnome-sharp = throw "gnome-sharp has been removed from nixpkgs"; # added 2022-01-15
gnome-themes-standard = gnome-themes-extra; # added 2018-03-14
gnome_doc_utils = gnome-doc-utils; # added 2018-02-25
gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
@@ -377,7 +381,8 @@ mapAliases ({
gtk_doc = gtk-doc; # added 2018-02-25
gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # added 2022-01-01
guileCairo = guile-cairo; # added 2017-09-24
- guileGnome = guile-gnome; # added 2017-09-24
+ guileGnome = throw "guile-gnome has been removed"; # 2022-01-16
+ guile-gnome = throw "guile-gnome has been removed"; # 2022-01-16
gnome3 = gnome; # added 2021-05-07
guileLint = guile-lint; # added 2017-09-27
guile_lib = guile-lib; # added 2017-09-24
@@ -478,6 +483,7 @@ mapAliases ({
liberation_ttf_v1_from_source = liberation_ttf_v1; # added 2018-12-12
liberation_ttf_v2_from_source = liberation_ttf_v2; # added 2018-12-12
liberationsansnarrow = liberation-sans-narrow; # added 2018-12-12
+ libgksu = throw "libgksu has been removed"; # added 2022-01-16
libgnome_keyring = libgnome-keyring; # added 2018-02-25
libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25
libgpgerror = libgpg-error; # added 2021-09-04
@@ -610,6 +616,7 @@ mapAliases ({
minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13
minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # added 2021-10-14
monero = monero-cli; # added 2021-11-28
+ monodevelop = throw "monodevelop has been removed from nixpgks"; # added 2022-01-15
mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # added 2021-03-07
mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18
mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18
@@ -680,6 +687,7 @@ mapAliases ({
nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream";
oauth2_proxy = oauth2-proxy; # added 2021-04-18
opencascade_oce = opencascade; # added 2018-04-25
+ obconf = throw "obconf has been removed"; # added 2022-01-16
oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10
octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; # added 2021-01-24
ofp = throw "ofp is not compatible with odp-dpdk";
@@ -712,6 +720,7 @@ mapAliases ({
parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # added 2022-01-10
parquet-cpp = arrow-cpp; # added 2018-09-08
pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04
+ pdfmod = throw "pdfmod has been removed"; # added 2022-01-15
pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # added 2021-07-22
pdf-redact-tools = throw "pdf-redact-tools has been removed from nixpkgs because the upstream has abandoned the project."; # added 2022-01-01
pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # added 2020-11-03
@@ -800,6 +809,8 @@ mapAliases ({
pg_similarity = postgresqlPackages.pg_similarity;
pgtap = postgresqlPackages.pgtap;
plv8 = postgresqlPackages.plv8;
+ tilp2 = throw "tilp2 has been removed"; # added 2022-01-15
+ timekeeper = throw "timekeeper has been removed"; # added 2022-01-16
timescaledb = postgresqlPackages.timescaledb;
tlauncher = throw "tlauncher has been removed because there questionable practices and legality concerns";
tsearch_extras = postgresqlPackages.tsearch_extras;
@@ -1127,6 +1138,7 @@ mapAliases ({
xv = xxv; # added 2020-02-22
xvfb_run = xvfb-run; # added 2021-05-07
yacc = bison; # moved from top-level 2021-03-14
+ yarssr = throw "yarssr has been removed as part of the python2 deprecation"; # added 2022-01-15
youtubeDL = youtube-dl; # added 2014-10-26
ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead";
yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead."; # added 2021-03-08
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96fee403acbb..24c4a152f82e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -208,6 +208,8 @@ with pkgs;
bacnet-stack = callPackage ../tools/networking/bacnet-stack {};
+ bada-bib = callPackage ../applications/science/misc/bada-bib {};
+
bakelite = callPackage ../tools/backup/bakelite { };
beyond-identity = callPackage ../tools/security/beyond-identity {};
@@ -2376,9 +2378,7 @@ with pkgs;
btlejack = python3Packages.callPackage ../applications/radio/btlejack { };
- btrbk = callPackage ../tools/backup/btrbk {
- asciidoc = asciidoc-full;
- };
+ btrbk = callPackage ../tools/backup/btrbk { };
buildpack = callPackage ../development/tools/buildpack {
buildGoModule = buildGo117Module;
@@ -8801,8 +8801,6 @@ with pkgs;
pdfminer = with python3Packages; toPythonApplication pdfminer;
- pdfmod = callPackage ../applications/misc/pdfmod { };
-
pdf-quench = callPackage ../applications/misc/pdf-quench { };
jbig2enc = callPackage ../tools/graphics/jbig2enc { };
@@ -10357,8 +10355,6 @@ with pkgs;
tilem = callPackage ../misc/emulators/tilem { };
- tilp2 = callPackage ../applications/science/math/tilp2 { };
-
timemachine = callPackage ../applications/audio/timemachine { };
timelapse-deflicker = callPackage ../applications/graphics/timelapse-deflicker { };
@@ -10367,8 +10363,6 @@ with pkgs;
timetagger = callPackage ../servers/timetagger { };
- timekeeper = callPackage ../applications/office/timekeeper { };
-
timezonemap = callPackage ../development/libraries/timezonemap { };
tzupdate = callPackage ../applications/misc/tzupdate { };
@@ -14102,12 +14096,6 @@ with pkgs;
guile-git = callPackage ../development/guile-modules/guile-git { };
- guile-gnome = callPackage ../development/guile-modules/guile-gnome {
- gconf = gnome2.GConf;
- guile = guile_2_0;
- inherit (gnome2) gnome_vfs libglade libgnome libgnomecanvas libgnomeui;
- };
-
guile-json = callPackage ../development/guile-modules/guile-json { };
guile-lib = callPackage ../development/guile-modules/guile-lib { };
@@ -17025,8 +17013,6 @@ with pkgs;
gflags = callPackage ../development/libraries/gflags { };
- gfm = callPackage ../applications/science/math/gfm { };
-
gperftools = callPackage ../development/libraries/gperftools { };
grab-site = callPackage ../tools/backup/grab-site { };
@@ -17173,8 +17159,6 @@ with pkgs;
gdk-pixbuf-xlib = callPackage ../development/libraries/gdk-pixbuf/xlib.nix { };
- gnome-sharp = callPackage ../development/libraries/gnome-sharp { };
-
gnome-menus = callPackage ../development/libraries/gnome-menus { };
elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { };
@@ -17217,17 +17201,9 @@ with pkgs;
gtk-engine-murrine = callPackage ../development/libraries/gtk-engine-murrine { };
- gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix {
- inherit (gnome2) libglade libgtkhtml gtkhtml
- libgnomecanvas libgnomeui libgnomeprint
- libgnomeprintui GConf;
- };
+ gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { };
- gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix {
- inherit (gnome2) libglade libgtkhtml gtkhtml
- libgnomecanvas libgnomeui libgnomeprint
- libgnomeprintui GConf;
- };
+ gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { };
gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { };
@@ -18134,8 +18110,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Carbon;
};
- libgksu = callPackage ../development/libraries/libgksu { };
-
libgnt = callPackage ../development/libraries/libgnt { };
libgpg-error = callPackage ../development/libraries/libgpg-error { };
@@ -25653,8 +25627,6 @@ with pkgs;
gitweb = callPackage ../applications/version-management/git-and-tools/gitweb { };
- gksu = callPackage ../applications/misc/gksu { };
-
gnss-sdr = callPackage ../applications/radio/gnss-sdr { };
gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix {
@@ -27511,8 +27483,6 @@ with pkgs;
monkeysphere = callPackage ../tools/security/monkeysphere { };
- monodevelop = callPackage ../applications/editors/monodevelop {};
-
monotone = callPackage ../applications/version-management/monotone {
lua = lua5;
boost = boost170;
@@ -28037,10 +28007,6 @@ with pkgs;
nvpy = callPackage ../applications/editors/nvpy { };
- obconf = callPackage ../tools/X11/obconf {
- inherit (gnome2) libglade;
- };
-
oberon-risc-emu = callPackage ../misc/emulators/oberon-risc-emu { };
obs-studio = libsForQt5.callPackage ../applications/video/obs-studio {};
@@ -30225,8 +30191,6 @@ with pkgs;
yarp = callPackage ../applications/science/robotics/yarp {};
- yarssr = callPackage ../applications/misc/yarssr { };
-
yate = callPackage ../applications/misc/yate { };
ydiff = with python3.pkgs; toPythonApplication ydiff;
@@ -30641,8 +30605,6 @@ with pkgs;
tts = callPackage ../tools/audio/tts { };
- fslint = callPackage ../applications/misc/fslint { };
-
### GAMES
_1oom = callPackage ../games/1oom { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0550d0a2deb0..3fcf3717353b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9685,21 +9685,6 @@ let
propagatedBuildInputs = [ Pango ];
};
- Gtk2GladeXML = buildPerlPackage {
- pname = "Gtk2-GladeXML";
- version = "1.007";
- src = fetchurl {
- url = "mirror://cpan/authors/id/T/TS/TSCH/Gtk2-GladeXML-1.007.tar.gz";
- sha256 = "50240a2bddbda807c8f8070de941823b7bf3d288a13be6d0d6563320b42c445a";
- };
- propagatedBuildInputs = [ pkgs.gnome2.libglade pkgs.gtk2 Gtk2 ];
- meta = {
- description = "Create user interfaces directly from Glade XML files";
- license = lib.licenses.lgpl2Plus;
- broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2GladeXML.x86_64-darwin
- };
- };
-
Gtk2TrayIcon = buildPerlPackage {
pname = "Gtk2-TrayIcon";
version = "0.06";
@@ -25456,4 +25441,5 @@ let
SubExporterUtil = self.SubExporter;
version = self.Version;
+ Gtk2GladeXML = throw "Gtk2GladeXML has been removed"; # 2022-01-15
}; in self
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index e8416f911097..a221e083fa31 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -72,6 +72,7 @@ mapAliases ({
prometheus_client = prometheus-client; # added 2021-06-10
prompt_toolkit = prompt-toolkit; # added 2021-07-22
pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08
+ pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15
pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04
pysmart-smartx = pysmart; # added 2021-10-22
diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix
index 4a15b64da09f..22f72a33d2c9 100644
--- a/pkgs/top-level/python2-packages.nix
+++ b/pkgs/top-level/python2-packages.nix
@@ -108,10 +108,6 @@ with self; with super; {
pygtk = callPackage ../development/python2-modules/pygtk { };
- pyGtkGlade = self.pygtk.override {
- inherit (pkgs.gnome2) libglade;
- };
-
pyjwt = callPackage ../development/python2-modules/pyjwt { };
pyroma = callPackage ../development/python2-modules/pyroma { };