diff options
author | Alexander Ried <ried@mytum.de> | 2016-09-25 15:21:34 +0200 |
---|---|---|
committer | Alexander Ried <ried@mytum.de> | 2016-09-25 17:08:49 +0200 |
commit | a536b7881539e9730d7c2620ae2018e058227234 (patch) | |
tree | d927901025069e552d7c64ddfaa3c2e0c007da5d | |
parent | 31bbc58c7a046bf49a1f635e9d81e7f10c63ad2a (diff) |
clutter{,_gtk}: remove old versions
-rw-r--r-- | pkgs/desktops/gnome-3/3.20/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/clutter-gtk/1.4.nix | 26 | ||||
-rw-r--r-- | pkgs/development/libraries/clutter-gtk/1.6.nix | 23 | ||||
-rw-r--r-- | pkgs/development/libraries/clutter-gtk/1.8.nix | 25 | ||||
-rw-r--r-- | pkgs/development/libraries/clutter-gtk/default.nix | 13 | ||||
-rw-r--r-- | pkgs/development/libraries/clutter/1.22.nix | 52 | ||||
-rw-r--r-- | pkgs/development/libraries/clutter/1.24.nix | 52 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 16 |
8 files changed, 9 insertions, 201 deletions
diff --git a/pkgs/desktops/gnome-3/3.20/default.nix b/pkgs/desktops/gnome-3/3.20/default.nix index b3f757162ebfc..b19a8823fc69e 100644 --- a/pkgs/desktops/gnome-3/3.20/default.nix +++ b/pkgs/desktops/gnome-3/3.20/default.nix @@ -46,14 +46,13 @@ let ]; inherit (pkgs) glib gtk2 webkitgtk24x webkitgtk212x gtk3 gtkmm3 libcanberra_gtk2 - clutter-gst; + clutter-gst clutter_gtk; inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; orbit = ORBit2; gnome3 = self // { recurseForDerivations = false; }; clutter = pkgs.clutter_1_26; - clutter_gtk = pkgs.clutter_gtk_1_8.override { inherit clutter gtk3; }; cogl = pkgs.cogl_1_22; gtk = gtk3; gtkmm = gtkmm3; diff --git a/pkgs/development/libraries/clutter-gtk/1.4.nix b/pkgs/development/libraries/clutter-gtk/1.4.nix deleted file mode 100644 index e493bab1bc759..0000000000000 --- a/pkgs/development/libraries/clutter-gtk/1.4.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }: - -stdenv.mkDerivation rec { - name = "clutter-gtk-1.4.4"; - - src = fetchurl { - url = "mirror://gnome/sources/clutter-gtk/1.4/${name}.tar.xz"; - sha256 = "bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e"; - }; - - propagatedBuildInputs = [ clutter gtk3 ]; - nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; - - postBuild = "rm -rf $out/share/gtk-doc"; - - meta = { - description = "Clutter-GTK"; - - homepage = http://www.clutter-project.org/; - - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - }; -} diff --git a/pkgs/development/libraries/clutter-gtk/1.6.nix b/pkgs/development/libraries/clutter-gtk/1.6.nix deleted file mode 100644 index 9c4e7ae127130..0000000000000 --- a/pkgs/development/libraries/clutter-gtk/1.6.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }: - -stdenv.mkDerivation rec { - name = "clutter-gtk-1.6.0"; - - src = fetchurl { - url = "mirror://gnome/sources/clutter-gtk/1.6/${name}.tar.xz"; - sha256 = "883550b574a036363239442edceb61cf3f6bedc8adc97d3404278556dc82234d"; - }; - - propagatedBuildInputs = [ clutter gtk3 ]; - nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; - - postBuild = "rm -rf $out/share/gtk-doc"; - - meta = { - description = "Clutter-GTK"; - homepage = http://www.clutter-project.org/; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - }; -} diff --git a/pkgs/development/libraries/clutter-gtk/1.8.nix b/pkgs/development/libraries/clutter-gtk/1.8.nix deleted file mode 100644 index a126f77094494..0000000000000 --- a/pkgs/development/libraries/clutter-gtk/1.8.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }: - -stdenv.mkDerivation rec { - major = "1.8"; - minor = "0"; - name = "clutter-gtk-${major}.${minor}"; - - src = fetchurl { - url = "mirror://gnome/sources/clutter-gtk/${major}/${name}.tar.xz"; - sha256 = "07dzvx0b3fsswxnpxgk0adjgccnrvbxsd971naqwndnfivbgjbkl"; - }; - - propagatedBuildInputs = [ clutter gtk3 ]; - nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; - - postBuild = "rm -rf $out/share/gtk-doc"; - - meta = { - description = "Clutter-GTK"; - homepage = http://www.clutter-project.org/; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - }; -} diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 1d085222341a1..a126f77094494 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -1,11 +1,13 @@ { fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }: stdenv.mkDerivation rec { - name = "clutter-gtk-1.4.4"; + major = "1.8"; + minor = "0"; + name = "clutter-gtk-${major}.${minor}"; src = fetchurl { - url = "mirror://gnome/sources/clutter-gtk/1.4/${name}.tar.xz"; - sha256 = "bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e"; + url = "mirror://gnome/sources/clutter-gtk/${major}/${name}.tar.xz"; + sha256 = "07dzvx0b3fsswxnpxgk0adjgccnrvbxsd971naqwndnfivbgjbkl"; }; propagatedBuildInputs = [ clutter gtk3 ]; @@ -15,12 +17,9 @@ stdenv.mkDerivation rec { meta = { description = "Clutter-GTK"; - homepage = http://www.clutter-project.org/; - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = with stdenv.lib.maintainers; [ urkud ]; + maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/development/libraries/clutter/1.22.nix b/pkgs/development/libraries/clutter/1.22.nix deleted file mode 100644 index e303d5f03392b..0000000000000 --- a/pkgs/development/libraries/clutter/1.22.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes -, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, -gobjectIntrospection -}: - -let - ver_maj = "1.22"; - ver_min = "0"; -in -stdenv.mkDerivation rec { - name = "clutter-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz"; - sha256 = "5225fef91f717118654a5b98e24f2018d09ca3c37d61ecff84f77069de0fbf54"; - }; - - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = - [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango - atk json_glib gobjectIntrospection - ]; - - configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK - - #doCheck = true; # no tests possible without a display - - meta = { - description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; - - longDescription = - '' Clutter is free software library for creating fast, compelling, - portable, and dynamic graphical user interfaces. It is a core part - of MeeGo, and is supported by the open source community. Its - development is sponsored by Intel. - - Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use - on mobile and embedded platforms), but wraps an easy to use, - efficient, flexible API around GL's complexity. - - Clutter enforces no particular user interface style, but provides a - rich, generic foundation for higher-level toolkits tailored to - specific needs. - ''; - - license = stdenv.lib.licenses.lgpl2Plus; - homepage = http://www.clutter-project.org/; - - maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; - platforms = stdenv.lib.platforms.mesaPlatforms; - }; -} diff --git a/pkgs/development/libraries/clutter/1.24.nix b/pkgs/development/libraries/clutter/1.24.nix deleted file mode 100644 index b9d45b6c62bb2..0000000000000 --- a/pkgs/development/libraries/clutter/1.24.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes -, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, -gobjectIntrospection -}: - -let - ver_maj = "1.24"; - ver_min = "0"; -in -stdenv.mkDerivation rec { - name = "clutter-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz"; - sha256 = "85c87d5745b97af7633776419a47421aae7cea66c1b870f88cc5e06a4c5626e6"; - }; - - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = - [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango - atk json_glib gobjectIntrospection - ]; - - configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK - - #doCheck = true; # no tests possible without a display - - meta = { - description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; - - longDescription = - '' Clutter is free software library for creating fast, compelling, - portable, and dynamic graphical user interfaces. It is a core part - of MeeGo, and is supported by the open source community. Its - development is sponsored by Intel. - - Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use - on mobile and embedded platforms), but wraps an easy to use, - efficient, flexible API around GL's complexity. - - Clutter enforces no particular user interface style, but provides a - rich, generic foundation for higher-level toolkits tailored to - specific needs. - ''; - - license = stdenv.lib.licenses.lgpl2Plus; - homepage = http://www.clutter-project.org/; - - maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; - platforms = stdenv.lib.platforms.mesaPlatforms; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9a704bade0a3..4708afa56d5d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7243,14 +7243,6 @@ in clutter = callPackage ../development/libraries/clutter { }; - clutter_1_22 = callPackage ../development/libraries/clutter/1.22.nix { - cogl = cogl_1_20; - }; - - clutter_1_24 = callPackage ../development/libraries/clutter/1.24.nix { - cogl = cogl_1_22; - }; - clutter_1_26 = callPackage ../development/libraries/clutter/1.26.nix { cogl = cogl_1_22; }; @@ -7259,12 +7251,8 @@ in inherit (gnome3) cogl clutter; }; - clutter_gtk = callPackage ../development/libraries/clutter-gtk { }; - clutter_gtk_1_6 = callPackage ../development/libraries/clutter-gtk/1.6.nix { - clutter = clutter_1_22; - }; - clutter_gtk_1_8 = callPackage ../development/libraries/clutter-gtk/1.8.nix { - clutter = clutter_1_26; + clutter_gtk = callPackage ../development/libraries/clutter-gtk { + inherit (gnome3) clutter; }; cminpack = callPackage ../development/libraries/cminpack { }; |