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

Merge pull request #155061 from piegamesde/gnome

Browse Source
This commit is contained in:
Martin Weinelt 2022-02-01 20:53:10 +01:00 committed by GitHub
commit 778d148959
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
40 changed files with 45 additions and 1533 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View File

@ -421,6 +421,11 @@
unmaintained
</para>
</listitem>
<listitem>
<para>
<literal>tilp2</literal> was removed together with its module
</para>
</listitem>
<listitem>
<para>
The options
@ -793,6 +798,14 @@
0042</link> configuration.
</para>
</listitem>
<listitem>
<para>
The default value for
<literal>programs.spacefm.settings.graphical_su</literal> got
unset. It previously pointed to <literal>gksu</literal> which
has been removed.
</para>
</listitem>
<listitem>
<para>
A new module was added for the

4
nixos/doc/manual/release-notes/rl-2205.section.md
View File

@ -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.<name>.ipv4.routes` and `networking.interfaces.<name>.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`.

1
nixos/modules/module-list.nix
View File

@ -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

2
nixos/modules/programs/spacefm.nix
View File

@ -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 = ''

28
nixos/modules/programs/tilp2.nix
View File

@ -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
];
};
}

1
nixos/modules/rename.nix
View File

@ -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" ] ''

81
pkgs/applications/editors/monodevelop/default.nix
View File

@ -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 <<EOF
Release ID: ${version}
Git revision: ${revision}
Build date: 1970-01-01 00:00:01
EOF
'';
postInstall = ''
for prog in monodevelop mdtool; do
patch -p 0 $out/bin/$prog <<EOF
2a3,5
> 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
};
}

57
pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch
View File

@ -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 @@
<None Include="Templates\Projects\WebApplication.xpt.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <None Include="..\..\..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll">
- <Link>System.Web.Mvc.dll</Link>
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Include="..\..\..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll">
- <Link>System.Web.Razor.dll</Link>
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll">
- <Link>System.Web.Helpers.dll</Link>
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll">
- <Link>System.Web.WebPages.Deployment.dll</Link>
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll">
- <Link>System.Web.WebPages.dll</Link>
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll">
- <Link>System.Web.WebPages.Razor.dll</Link>
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Include="..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll">
- <Link>Microsoft.Web.Infrastructure.dll</Link>
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
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 @@
<ExtensionModel>
<Runtime>
- <Import assembly = "System.Web.Helpers.dll" />
- <Import assembly = "System.Web.Mvc.dll" />
- <Import assembly = "System.Web.Razor.dll" />
- <Import assembly = "System.Web.WebPages.Deployment.dll" />
- <Import assembly = "System.Web.WebPages.dll" />
- <Import assembly = "System.Web.WebPages.Razor.dll" />
-
<Import file = "Html/Schemas/xhtml1-strict.xsd" />
<Import file = "Html/Schemas/xhtml1-transitional.xsd" />
<Import file = "Html/Schemas/xhtml1-frameset.xsd" />

41
pkgs/applications/misc/fslint/default.nix
View File

@ -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;
};
}

53
pkgs/applications/misc/gksu/default.nix
View File

@ -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;
};
}

29
pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch
View File

@ -1,29 +0,0 @@
From 10c7e67e11a56e2fe1acf9b085772bc995d35bc0 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
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 <string.h>
#include <pthread.h>
-#include <glib/gkeyfile.h>
+#include <glib.h>
#include <gtk/gtk.h>
#include <gio/gio.h>
#include <libnautilus-extension/nautilus-extension-types.h>
--
1.7.8.5

49
pkgs/applications/misc/pdfmod/default.nix
View File

@ -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;
};
}

81
pkgs/applications/misc/yarssr/default.nix
View File

@ -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 ];
};
}

44
pkgs/applications/office/timekeeper/default.nix
View File

@ -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;
};
}

55
pkgs/applications/science/math/gfm/default.nix
View File

@ -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;
};
}

57
pkgs/applications/science/math/tilp2/default.nix
View File

@ -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;
};
}

17
pkgs/desktops/gnome-2/bindings/libglademm/default.nix
View File

@ -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 ];
}

5
pkgs/desktops/gnome-2/default.nix
View File

@ -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
})

2
pkgs/desktops/xfce/default.nix
View File

@ -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 {

70
pkgs/development/guile-modules/guile-gnome/default.nix
View File

@ -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;
};
}

45
pkgs/development/libraries/gnome-sharp/default.nix
View File

@ -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 ];
};
}

13
pkgs/development/libraries/gnome-sharp/fix-mono-path.patch
View File

@ -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

12
pkgs/development/libraries/gtk-sharp/2.0.nix
View File

@ -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 = ''

12
pkgs/development/libraries/gtk-sharp/3.0.nix
View File

@ -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 = [

86
pkgs/development/libraries/libgksu/default.nix
View File

@ -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;
};
}

60
pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch
View File

@ -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 <unistd.h>
#include <string.h>
#include <fcntl.h>
+#ifdef __FreeBSD__
+#include <libutil.h>
+#include <termios.h>
+#else
#include <pty.h>
+#endif
#include <pwd.h>
#include <sys/types.h>
#include <sys/wait.h>
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:

25
pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch
View File

@ -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

19
pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch
View File

@ -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

26
pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch
View File

@ -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`

359
pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch
View File

@ -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;
}
/**

76
pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch
View File

@ -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}
+

40
pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch
View File

@ -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

6
pkgs/development/python2-modules/pygtk/default.nix
View File

@ -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

30
pkgs/tools/X11/obconf/default.nix
View File

@ -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;
};
}

2
pkgs/tools/security/pbis/default.nix
View File

@ -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 = ''

14
pkgs/top-level/aliases.nix
View File

@ -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

42
pkgs/top-level/all-packages.nix
View File

@ -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 { };

16
pkgs/top-level/perl-packages.nix
View File

@ -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

1
pkgs/top-level/python-aliases.nix
View File

@ -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

4
pkgs/top-level/python2-packages.nix
View File

@ -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 { };