From ffba654405cb799f7db941eaa14446c9c31ae670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 29 Aug 2018 09:49:29 +0100 Subject: [PATCH 1/4] vala_0_26: remove --- pkgs/development/compilers/vala/default.nix | 7 ------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 8 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 510688ef416..85d3e579ff7 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -43,13 +43,6 @@ let }; in rec { - - vala_0_26 = generic { - major = "0.26"; - minor = "2"; - sha256 = "1i03ds1z5hivqh4nhf3x80fg7n0zd22908w5minkpaan1i1kzw9p"; - }; - vala_0_28 = generic { major = "0.28"; minor = "1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62bf6d2c607..aa8b21abea8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7260,7 +7260,6 @@ with pkgs; urweb = callPackage ../development/compilers/urweb { }; inherit (callPackage ../development/compilers/vala { }) - vala_0_26 vala_0_28 vala_0_32 vala_0_34 From 3a56156866bc5dc94e9a455aff791ddbfaa88122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 29 Aug 2018 09:51:42 +0100 Subject: [PATCH 2/4] vala_0_32: remove --- pkgs/desktops/gnome-3/misc/california/default.nix | 4 ++-- pkgs/development/compilers/vala/default.nix | 6 ------ pkgs/top-level/all-packages.nix | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/california/default.nix b/pkgs/desktops/gnome-3/misc/california/default.nix index 91aeb7ca00a..7c90d8fa4e4 100644 --- a/pkgs/desktops/gnome-3/misc/california/default.nix +++ b/pkgs/desktops/gnome-3/misc/california/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32, libgee, wrapGAppsHook, itstool, gobjectIntrospection +{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_34, libgee, wrapGAppsHook, itstool, gobjectIntrospection , gnome-online-accounts, evolution-data-server, gnome3, glib, libsoup, libgdata, sqlite, xdg_utils }: let @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj"; }; - nativeBuildInputs = [ intltool itstool vala_0_32 pkgconfig wrapGAppsHook gobjectIntrospection ]; + nativeBuildInputs = [ intltool itstool vala_0_34 pkgconfig wrapGAppsHook gobjectIntrospection ]; buildInputs = [ glib gtk3 libgee libsoup libgdata gnome-online-accounts evolution-data-server sqlite xdg_utils gnome3.gsettings-desktop-schemas ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 85d3e579ff7..02d724cb2af 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -49,12 +49,6 @@ in rec { sha256 = "0isg327w6rfqqdjja6a8pc3xcdkj7pqrkdhw48bsyxab2fkaw3hw"; }; - vala_0_32 = generic { - major = "0.32"; - minor = "1"; - sha256 = "1ab1l44abf9fj1wznzq5956431ia136rl5049cggnk5393jlf3fx"; - }; - vala_0_34 = generic { major = "0.34"; minor = "17"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa8b21abea8..168c4a61c99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7261,7 +7261,6 @@ with pkgs; inherit (callPackage ../development/compilers/vala { }) vala_0_28 - vala_0_32 vala_0_34 vala_0_36 vala_0_38 From cbdcf6b4db2e94438fcb54a7394fa31e31502faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 29 Aug 2018 10:57:08 +0100 Subject: [PATCH 3/4] vanubi: remove --- pkgs/applications/editors/vanubi/default.nix | 29 -------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 31 deletions(-) delete mode 100644 pkgs/applications/editors/vanubi/default.nix diff --git a/pkgs/applications/editors/vanubi/default.nix b/pkgs/applications/editors/vanubi/default.nix deleted file mode 100644 index 98f45f6be02..00000000000 --- a/pkgs/applications/editors/vanubi/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, vala_0_28, which, autoconf, automake -, libtool, glib, gtk3, gnome3, libwnck3, asciidoc, python3Packages }: - -stdenv.mkDerivation rec { - name = "vanubi-${version}"; - version = "0.0.16"; - - src = fetchurl { - url = "https://github.com/vanubi/vanubi/archive/v${version}.tar.gz"; - sha256 = "145zxgaky5bcq5bxm4z7h0pvviq7k1nrgnf40q6nax6ik616ybjq"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ vala_0_28 which autoconf automake - libtool glib gtk3 libwnck3 asciidoc - gnome3.gtksourceview gnome3.vte_290 python3Packages.pygments ]; - - configureScript = "./autogen.sh"; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = http://vanubi.github.io/vanubi; - description = "Programming editor for GTK+ inspired by Emacs"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 168c4a61c99..a62df36eba3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18921,8 +18921,6 @@ with pkgs; valentina = libsForQt5.callPackage ../applications/misc/valentina { }; - vanubi = callPackage ../applications/editors/vanubi { }; - vbindiff = callPackage ../applications/editors/vbindiff { }; vcprompt = callPackage ../applications/version-management/vcprompt { }; From d314c4d3ce18172313225467047b13f5ebcef1a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 29 Aug 2018 10:56:29 +0100 Subject: [PATCH 4/4] vala_0_28: remove --- pkgs/development/compilers/vala/default.nix | 6 ------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 7 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 02d724cb2af..a4a8aa980b6 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -43,12 +43,6 @@ let }; in rec { - vala_0_28 = generic { - major = "0.28"; - minor = "1"; - sha256 = "0isg327w6rfqqdjja6a8pc3xcdkj7pqrkdhw48bsyxab2fkaw3hw"; - }; - vala_0_34 = generic { major = "0.34"; minor = "17"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a62df36eba3..da150ae19ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7260,7 +7260,6 @@ with pkgs; urweb = callPackage ../development/compilers/urweb { }; inherit (callPackage ../development/compilers/vala { }) - vala_0_28 vala_0_34 vala_0_36 vala_0_38