diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2017-09-24 13:15:50 +0200 |
---|---|---|
committer | zimbatm <zimbatm@zimbatm.com> | 2017-09-24 12:15:50 +0100 |
commit | 69698ec11cc0619d84b14764fa9e708fe7e7223c (patch) | |
tree | 9d9f602554b497a3265caf5e2ef4821e12736686 /pkgs/desktops/gnome-3/devtools | |
parent | 23b19efdc9c8d64177cefcaa5b919db966bb8f5e (diff) |
gnome3: only maintain single GNOME 3 package set (#29397)
* gnome3: only maintain single GNOME 3 package set GNOME 3 was split into 3.10 and 3.12 in #2694. Unfortunately, we barely have the resources to update a single version of GNOME. Maintaining multiple versions just does not make sense. Additionally, it makes viewing history using most Git tools bothersome. This commit renames `pkgs/desktops/gnome-3/3.24` to `pkgs/desktops/gnome-3`, removes the config variable for choosing packageset (`environment.gnome3.packageSet`), updates the hint in maintainer script, and removes the `gnome3_24` derivation from `all-packages.nix`. Closes: #29329 * maintainers/scripts/gnome: Use fixed GNOME 3 directory Since we now allow only a single GNOME 3 package set, specifying the working directory is not necessary. This commit sets the directory to `pkgs/desktops/gnome-3`.
Diffstat (limited to 'pkgs/desktops/gnome-3/devtools')
-rw-r--r-- | pkgs/desktops/gnome-3/devtools/anjuta/default.nix | 26 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/devtools/anjuta/src.nix | 10 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/devtools/devhelp/default.nix | 19 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/devtools/devhelp/src.nix | 10 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/devtools/gdl/default.nix | 15 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/devtools/gdl/src.nix | 10 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix | 15 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix | 10 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/devtools/nemiver/bool_slot.patch | 13 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/devtools/nemiver/default.nix | 29 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/devtools/nemiver/safe_ptr.patch | 10 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/devtools/nemiver/src.nix | 11 |
12 files changed, 178 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix new file mode 100644 index 0000000000000..6a50834f105e8 --- /dev/null +++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, + itstool, python2, makeWrapper }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + enableParallelBuilding = true; + + buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl + gnome3.libgda gnome3.gtksourceview intltool itstool python2 makeWrapper + gnome3.gsettings_desktop_schemas + ]; + + preFixup = '' + wrapProgram $out/bin/anjuta \ + --prefix XDG_DATA_DIRS : \ + "$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + description = "Software development studio"; + homepage = http://anjuta.org/; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/src.nix b/pkgs/desktops/gnome-3/devtools/anjuta/src.nix new file mode 100644 index 0000000000000..bbb7696d91c90 --- /dev/null +++ b/pkgs/desktops/gnome-3/devtools/anjuta/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "anjuta-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/anjuta/3.22/anjuta-3.22.0.tar.xz; + sha256 = "4face1c063a5a6687a6cfc6f1f700ba15f13664633c05caa2fbf50317608dd03"; + }; +} diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix new file mode 100644 index 0000000000000..f6e67be8d53a7 --- /dev/null +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook +, webkitgtk, intltool, gsettings_desktop_schemas }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ + pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme + gsettings_desktop_schemas + ]; + + meta = with stdenv.lib; { + homepage = https://live.gnome.org/devhelp; + description = "API documentation browser for GNOME"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/src.nix b/pkgs/desktops/gnome-3/devtools/devhelp/src.nix new file mode 100644 index 0000000000000..b13de444c7e73 --- /dev/null +++ b/pkgs/desktops/gnome-3/devtools/devhelp/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "devhelp-3.24.0"; + + src = fetchurl { + url = mirror://gnome/sources/devhelp/3.24/devhelp-3.24.0.tar.xz; + sha256 = "4858de1c815532ad160d1bf9facd28859972e3a052908a8edf73f866c8cce430"; + }; +} diff --git a/pkgs/desktops/gnome-3/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/devtools/gdl/default.nix new file mode 100644 index 0000000000000..156d91b3eae78 --- /dev/null +++ b/pkgs/desktops/gnome-3/devtools/gdl/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ pkgconfig libxml2 gtk3 intltool ]; + + meta = with stdenv.lib; { + description = "Gnome docking library"; + homepage = https://developer.gnome.org/gdl/; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/devtools/gdl/src.nix b/pkgs/desktops/gnome-3/devtools/gdl/src.nix new file mode 100644 index 0000000000000..c8b65884e0829 --- /dev/null +++ b/pkgs/desktops/gnome-3/devtools/gdl/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gdl-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gdl/3.22/gdl-3.22.0.tar.xz; + sha256 = "cc5b360e1392292186924f0f9a8efc0f4db7e6e56dc7042037466b5cc839660c"; + }; +} diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix new file mode 100644 index 0000000000000..50960f41a3126 --- /dev/null +++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = [ intltool itstool libxml2 ]; + + meta = with stdenv.lib; { + homepage = https://github.com/GNOME/gnome-devel-docs; + description = "Developer documentation for GNOME"; + maintainers = gnome3.maintainers; + license = licenses.fdl12; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix new file mode 100644 index 0000000000000..7f39aabda0223 --- /dev/null +++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-devel-docs-3.22.0"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-devel-docs/3.22/gnome-devel-docs-3.22.0.tar.xz; + sha256 = "e0778c62670b1c19d45191ac5503568cbd09500e9e30015b48c19e95959e6d85"; + }; +} diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/bool_slot.patch b/pkgs/desktops/gnome-3/devtools/nemiver/bool_slot.patch new file mode 100644 index 0000000000000..83423122110c3 --- /dev/null +++ b/pkgs/desktops/gnome-3/devtools/nemiver/bool_slot.patch @@ -0,0 +1,13 @@ +--- a/src/dbgengine/nmv-dbg-common.h 2014-07-09 10:36:05.000000000 +0200 ++++ b/src/dbgengine/nmv-dbg-common.h 2016-08-04 22:40:28.447842746 +0200 +@@ -171,7 +171,9 @@ + + bool has_slot () const + { +- return m_slot; ++ //return m_slot; ++ // https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=822502 ++ return static_cast<bool> (m_slot); + } + + template<class T> diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix new file mode 100644 index 0000000000000..cf200cb329255 --- /dev/null +++ b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome3, gtk3, libxml2, intltool, itstool, gdb, + boost, sqlite, gconf, libgtop, glibmm, gtkmm, vte, gtksourceview, + gtksourceviewmm, wrapGAppsHook }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + + buildInputs = [ gtk3 libxml2 intltool itstool gdb boost sqlite gconf libgtop + glibmm gtkmm vte gtksourceview gtksourceviewmm ]; + + patches = [ + ./bool_slot.patch ./safe_ptr.patch + (fetchpatch { + url = "https://git.gnome.org/browse/nemiver/patch/src/persp/dbgperspective/nmv-dbg-perspective.cc?id=262cf9657f9c2727a816972b348692adcc666008"; + sha256 = "03jv6z54b8nzvplplapk4aj206zl1gvnv6iz0mad19g6yvfbw7a7"; + }) + ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Nemiver; + description = "Easy to use standalone C/C++ debugger"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.juliendehos ]; + }; +} + diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/safe_ptr.patch b/pkgs/desktops/gnome-3/devtools/nemiver/safe_ptr.patch new file mode 100644 index 0000000000000..e3413b2249776 --- /dev/null +++ b/pkgs/desktops/gnome-3/devtools/nemiver/safe_ptr.patch @@ -0,0 +1,10 @@ +--- a/src/confmgr/nmv-gconf-mgr.cc 2014-07-08 10:24:06.000000000 +0200 ++++ b/src/confmgr/nmv-gconf-mgr.cc 2016-08-04 23:50:08.143060464 +0200 +@@ -32,6 +32,7 @@ + NEMIVER_BEGIN_NAMESPACE (nemiver) + + using nemiver::common::GCharSafePtr; ++using nemiver::common::GErrorSafePtr; + + class GConfMgr : public IConfMgr { + GConfMgr (const GConfMgr &); diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/src.nix b/pkgs/desktops/gnome-3/devtools/nemiver/src.nix new file mode 100644 index 0000000000000..2fcf639fe1b4e --- /dev/null +++ b/pkgs/desktops/gnome-3/devtools/nemiver/src.nix @@ -0,0 +1,11 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "nemiver-0.9.6"; + + src = fetchurl { + url = mirror://gnome/sources/nemiver/0.9/nemiver-0.9.6.tar.xz; + sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2"; + }; +} + |