diff options
24 files changed, 265 insertions, 200 deletions
diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index 50b1bcde58f3..4bd57e15fe5f 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libtool, intltool, pkgconfig, glib -, gtk2, curl, mpd_clientlib, libsoup, gob2, vala_0_23, libunique +, gtk2, curl, mpd_clientlib, libsoup, gob2, vala, libunique , libSM, libICE, sqlite, hicolor_icon_theme, wrapGAppsHook }: @@ -24,11 +24,10 @@ stdenv.mkDerivation rec { sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig libtool intltool gob2 vala wrapGAppsHook ]; buildInputs = [ - libtool intltool glib gtk2 curl mpd_clientlib libsoup - libunique libmpd gob2 vala_0_23 libSM libICE sqlite hicolor_icon_theme - wrapGAppsHook + glib gtk2 curl mpd_clientlib libsoup + libunique libmpd libSM libICE sqlite hicolor_icon_theme ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/vanubi/default.nix b/pkgs/applications/editors/vanubi/default.nix index 273ef33250fc..98f45f6be02d 100644 --- a/pkgs/applications/editors/vanubi/default.nix +++ b/pkgs/applications/editors/vanubi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, vala_0_26, which, autoconf, automake +{ stdenv, fetchurl, pkgconfig, vala_0_28, which, autoconf, automake , libtool, glib, gtk3, gnome3, libwnck3, asciidoc, python3Packages }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ vala_0_26 which autoconf automake + buildInputs = [ vala_0_28 which autoconf automake libtool glib gtk3 libwnck3 asciidoc gnome3.gtksourceview gnome3.vte_290 python3Packages.pygments ]; diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index 92e6084ce673..d01286e15a64 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib, - pcre, cfitsio, perl, gob2, vala_0_23, libtiff, json_glib }: + pcre, cfitsio, perl, gob2, vala, libtiff, json_glib }: stdenv.mkDerivation rec { name = "giv-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { prePatch = '' sed -i s,/usr/bin/perl,${perl}/bin/perl, doc/eperl - sed -i s,/usr/local,$out, SConstruct + sed -i s,/usr/local,$out, SConstruct ''; patches = [ ./build.patch ]; @@ -25,15 +25,14 @@ stdenv.mkDerivation rec { installPhase = "scons install"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gdk_pixbuf gtk2 glib scons pcre cfitsio perl gob2 vala_0_23 libtiff - json_glib ]; + nativeBuildInputs = [ scons pkgconfig vala perl gob2 ]; + buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json_glib ]; - meta = { + meta = with stdenv.lib; { description = "Cross platform image and hierarchical vector viewer based"; homepage = http://giv.sourceforge.net/giv/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index b0a6f7caf885..b23ddbf9d78b 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,38 +1,37 @@ -{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala_0_28, sqlite -, webkitgtk, pkgconfig, gnome3, gst_all_1, which, udev, libgudev, libraw, glib, json_glib -, gettext, desktop_file_utils, lcms2, gdk_pixbuf, librsvg, wrapGAppsHook -, gnome_doc_utils, hicolor_icon_theme, itstool, libgdata }: +{ fetchurl, stdenv, meson, ninja, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite +, webkitgtk, pkgconfig, gnome3, gst_all_1, libgudev, libraw, glib, json_glib +, gettext, desktop_file_utils, gdk_pixbuf, librsvg, wrapGAppsHook +, itstool, libgdata }: -# for dependencies see http://www.yorba.org/projects/shotwell/install/ +# for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling stdenv.mkDerivation rec { version = "${major}.${minor}"; major = "0.27"; - minor = "1"; + minor = "2"; name = "shotwell-${version}"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz"; - sha256 = "1jav7qv0s1v6wvd7x2ri85hjqnbswq883pnd228qhd6bhjbryp89"; + sha256 = "0bxc15gk2306fvxg6bg1s6c706yd89i66ldng0z102mcfi98warb"; }; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; + nativeBuildInputs = [ + meson ninja pkgconfig itstool gettext desktop_file_utils wrapGAppsHook + ]; - configureFlags = [ "--disable-gsettings-convert-install" ]; + buildInputs = [ + gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk + gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee + libgudev gnome3.gexiv2 gnome3.gsettings_desktop_schemas + libraw json_glib glib gdk_pixbuf librsvg gnome3.rest + gnome3.gcr gnome3.defaultIconTheme libgdata + ]; - preConfigure = '' - patchShebangs . + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas ''; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala_0_28 sqlite webkitgtk - gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee - which udev libgudev gnome3.gexiv2 hicolor_icon_theme - libraw json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg - gnome_doc_utils gnome3.rest gnome3.gcr - gnome3.defaultIconTheme itstool libgdata ]; - meta = with stdenv.lib; { description = "Popular photo organizer for the GNOME desktop"; homepage = https://wiki.gnome.org/Apps/Shotwell; diff --git a/pkgs/applications/misc/deepin-terminal/default.nix b/pkgs/applications/misc/deepin-terminal/default.nix index 7f38e801c4cb..e08a2827b83a 100644 --- a/pkgs/applications/misc/deepin-terminal/default.nix +++ b/pkgs/applications/misc/deepin-terminal/default.nix @@ -1,31 +1,42 @@ -{ stdenv, unzip, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, gettext, libsecret, json_glib }: +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, zssh, gettext, librsvg, libsecret, json_glib }: stdenv.mkDerivation rec { name = "deepin-terminal-${version}"; - version = "2.6.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-terminal"; rev = version; - sha256 = "11lylkrv69k2jvwparnxymr7z3x9cs82q9p0lr2wrfr48hnfwp8b"; + sha256 = "1pmg1acs44c30hz9rpr6x1l6lyvlylc2pz5lv4ai0rhv37n51yn2"; }; - patchPhase = '' - substituteInPlace project_path.c --replace __FILE__ \"$out/share/deepin-terminal/\" + patches = [ + # Do not build vendored zssh and vte + (fetchurl { + name = "remove-vendor.patch"; + url = https://git.archlinux.org/svntogit/community.git/plain/trunk/remove-vendor.patch?h=packages/deepin-terminal&id=5baa756e8e6ac8ce43fb122fce270756cc55086c; + sha256 = "0zrq004malphpy7xv5z502bpq30ybyj1rr4hlq4k5m4fpk29dlw6"; + }) + ]; + + postPatch = '' + substituteInPlace project_path.c --replace __FILE__ \"$out/share/deepin-terminal/\" + substituteInPlace ssh_login.sh --replace /usr/lib/deepin-terminal/zssh "${zssh}/bin/zssh" ''; - nativeBuildInputs = [ pkgconfig vala cmake gettext unzip ]; - buildInputs = [ gtk3 vte libgee wnck libsecret json_glib ]; + nativeBuildInputs = [ pkgconfig vala cmake gettext ]; + buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json_glib ]; - meta = { + meta = with stdenv.lib; { description = "The default terminal emulation for Deepin"; longDescription = '' - Deepin terminal, it sharpens your focus in the world of command line! - It is an advanced terminal emulator with workspace, multiple windows, remote management, quake mode and other features. + Deepin terminal, it sharpens your focus in the world of command line! + It is an advanced terminal emulator with workspace, multiple windows, remote management, quake mode and other features. ''; homepage = https://github.com/linuxdeepin/deepin-terminal/; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index add46f8871d5..ee16ba24ed46 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, pkgconfig, cmake, libxml2, vala_0_23, intltool, libmx, gnome3, gtk3, gtk_doc +, pkgconfig, cmake, libxml2, vala_0_26, intltool, libmx, gnome3, gtk3, gtk_doc , keybinder3, clutter_gtk, libnotify , libxkbcommon, xorg, udev , bashInteractive @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig cmake intltool makeWrapper ]; buildInputs = [ - vala_0_23 gtk3 gnome3.gnome_common gnome3.libgee + vala_0_26 gtk3 gnome3.gnome_common gnome3.libgee gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence libxkbcommon diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index 2533014c5607..04f38968142a 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -1,35 +1,33 @@ { stdenv, fetchurl, intltool, pkgconfig, glib, libnotify, gtk3, libgee -, keybinder3, json_glib, zeitgeist, vala_0_23, hicolor_icon_theme +, keybinder3, json_glib, zeitgeist, vala_0_34, hicolor_icon_theme }: -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "synapse-0.2.99.1"; +let + version = "0.2.99.2"; +in stdenv.mkDerivation rec { + name = "synapse-${version}"; src = fetchurl { - url = "https://launchpad.net/synapse-project/0.3/0.2.99.1/+download/${name}.tar.xz"; - sha256 = "846d8a5130580bb47c754bb7f20dc76311e589c00a18b02370a5d78b52409220"; + url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${name}.tar.xz"; + sha256 = "04cnsmwf9xa52dh7rpb4ia715c0ls8jg1p7llc9yf3lbg1m0bvzv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig intltool vala_0_34 ]; buildInputs = [ - intltool glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist - vala_0_23 hicolor_icon_theme + glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist + hicolor_icon_theme ]; - meta = { - longDescription = '' - Semantic launcher written in Vala that you can use to start applications - as well as find and access relevant documents and files by making use of - the Zeitgeist engine - ''; - description = '' - Semantic launcher to start applications and find relevant files - ''; - homepage = https://launchpad.net/synapse-project; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ mahe ]; - platforms = with stdenv.lib.platforms; all; + meta = with stdenv.lib; { + longDescription = '' + Semantic launcher written in Vala that you can use to start applications + as well as find and access relevant documents and files by making use of + the Zeitgeist engine + ''; + description = "Semantic launcher to start applications and find relevant files"; + homepage = https://launchpad.net/synapse-project; + license = licenses.gpl3; + maintainers = with maintainers; [ mahe ]; + platforms = with platforms; all; }; } diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index ce9ac961c92a..cea6d5dbeea4 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala_0_23, wrapGAppsHook +{ stdenv, fetchurl, cmake, pkgconfig, intltool, vala_0_34, wrapGAppsHook , gtk3, webkitgtk, librsvg, libnotify, sqlite , glib_networking, gsettings_desktop_schemas, libsoup, pcre, gnome3 , libxcb, libpthreadstubs, libXdmcp, libxkbcommon, epoxy, at_spi2_core @@ -29,11 +29,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig wrapGAppsHook cmake intltool + pkgconfig wrapGAppsHook cmake intltool vala_0_34 ]; buildInputs = [ - vala_0_23 gtk3 webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas pcre gnome3.gcr libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at_spi2_core (libsoup.override {gnomeSupport = true; valaSupport = true;}) diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix new file mode 100644 index 000000000000..c38097abde97 --- /dev/null +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: + +stdenv.mkDerivation rec { + name = "osinfo-db-20170813"; + + src = fetchurl { + url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; + sha256 = "0v9i325aaflzj2y5780mj9b0jv5ysb1bn90bm3s4f2ck5n124ffw"; + }; + + nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; + + phases = [ "installPhase" ]; + + installPhase = '' + osinfo-db-import --dir "$out/share/osinfo" "${src}" + ''; + + meta = with stdenv.lib; { + description = "Osinfo database of information about operating systems for virtualization provisioning tools"; + homepage = https://libosinfo.org/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 57c22f08550f..40af4c312cf0 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -29,12 +29,6 @@ let in rec { - vala_0_23 = generic { - major = "0.23"; - minor = "2"; - sha256 = "0g22ss9qbm3fqhx4fxhsyfmdc5g1hgdw4dz9d37f4489kl0qf8pl"; - }; - vala_0_26 = generic { major = "0.26"; minor = "2"; diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 3a26dd407e4e..7ebd14b51f52 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -5,7 +5,7 @@ , glib, dbus_glib, gtkVersion , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null -, python2Packages, gobjectIntrospection, vala_0_23 +, python2Packages, gobjectIntrospection, vala , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null }: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glib dbus_glib - python pygobject2 pygtk gobjectIntrospection vala_0_23 + python pygobject2 pygtk gobjectIntrospection vala ] ++ (if gtkVersion == "2" then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] else [ libindicator-gtk3 ]); diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix index 9f75f17caeed..9c7e48f8f6a8 100644 --- a/pkgs/development/libraries/libindicate/default.nix +++ b/pkgs/development/libraries/libindicate/default.nix @@ -4,7 +4,7 @@ , pkgconfig, autoconf , glib, dbus_glib, libdbusmenu-glib , gtkVersion, gtk2 ? null, gtk3 ? null -, pythonPackages, gobjectIntrospection, vala_0_23, gnome_doc_utils +, pythonPackages, gobjectIntrospection, vala, gnome_doc_utils , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null }: @@ -24,11 +24,11 @@ in stdenv.mkDerivation rec { sha256 = "10am0ymajx633b33anf6b79j37k61z30v9vaf5f9fwk1x5cw1q21"; }; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkgconfig autoconf gobjectIntrospection vala gnome_doc_utils ]; buildInputs = [ glib dbus_glib libdbusmenu-glib - python pygobject2 pygtk gobjectIntrospection vala_0_23 gnome_doc_utils + python pygobject2 pygtk ] ++ (if gtkVersion == "2" then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] else [ gtk3 ]); diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index db534d20c89c..a0924e791e3b 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -1,23 +1,43 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, libsoup -, libxslt, check, vala_0_23 ? null +{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, gtk_doc, docbook_xsl +, glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null }: stdenv.mkDerivation rec { - name = "libosinfo-0.2.12"; + name = "libosinfo-1.1.0"; src = fetchurl { - url = "https://fedorahosted.org/releases/l/i/libosinfo/${name}.tar.gz"; - sha256 = "1vcg8ylh7q69s9y6hj94dqfffwfbann3i28yqgfc01navf6yl07s"; + url = "https://releases.pagure.org/libosinfo/${name}.tar.gz"; + sha256 = "0diigllgni6m0sc2h8aid6hmyaq9qb54pm5305m0irfsm2j463v0"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - intltool gobjectIntrospection libsoup libxslt check vala_0_23 + outputs = [ "out" "dev" "devdoc" ]; + + nativeBuildInputs = [ + pkgconfig vala intltool gobjectIntrospection gtk_doc docbook_xsl + ] ++ stdenv.lib.optionals doCheck checkInputs; + checkInputs = [ check curl perl ]; + buildInputs = [ glib libsoup libxml2 libxslt ]; + + patches = [ + ./osinfo-db-data-dir.patch + ]; + + postPatch = '' + patchShebangs . + substituteInPlace osinfo/osinfo_loader.c --subst-var-by OSINFO_DB_DATA_DIR "${osinfo-db}/share" + ''; + + configureFlags = [ + "--with-usb-ids-path=${hwdata}/data/hwdata/usb.ids" + "--with-pci-ids-path=${hwdata}/data/hwdata/pci.ids" + "--enable-gtk-doc" ]; + doCheck = true; + meta = with stdenv.lib; { - description = "Info about OSs, hypervisors and (virtual) hardware devices"; - homepage = http://libosinfo.org/; + description = "GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support"; + homepage = https://libosinfo.org/; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch b/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch new file mode 100644 index 000000000000..8d202a92d095 --- /dev/null +++ b/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch @@ -0,0 +1,11 @@ +--- a/osinfo/osinfo_loader.c ++++ b/osinfo/osinfo_loader.c +@@ -2304,7 +2304,7 @@ + } else { + path = g_getenv("OSINFO_SYSTEM_DIR"); + if (!path) +- path = DATA_DIR "/osinfo"; ++ path = "@OSINFO_DB_DATA_DIR@/osinfo"; + + file = g_file_new_for_path(path); + } diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix index fc5b41ac607f..5e36d0688694 100644 --- a/pkgs/development/libraries/libskk/default.nix +++ b/pkgs/development/libraries/libskk/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, fetchFromGitHub, - libtool, intltool, pkgconfig, + libtool, gettext, pkgconfig, vala, gnome_common, gobjectIntrospection, - libgee_0_8, json_glib, skk-dicts }: + libgee, json_glib, skk-dicts }: stdenv.mkDerivation rec { name = "libskk-${version}"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "ueno"; repo = "libskk"; - rev = "6a232e75de6d5dbe543ab17c9b85dc7560093509"; - sha256 = "1xa9akf95jyi4laiw1llnjdpfq5skhidm7dnkd0i0ds6npzzqnxc"; + rev = version; + sha256 = "092bjir866f350s4prq9q0yg34s91vmr8wbgf2vh3kcax1yj1axm"; }; buildInputs = [ skk-dicts ]; - nativeBuildInputs = [ vala gnome_common gobjectIntrospection libtool intltool pkgconfig ]; - propagatedBuildInputs = [ libgee_0_8 json_glib ]; + nativeBuildInputs = [ vala gnome_common gobjectIntrospection libtool gettext pkgconfig ]; + propagatedBuildInputs = [ libgee json_glib ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix deleted file mode 100644 index 66890f08ff3e..000000000000 --- a/pkgs/development/libraries/libunity/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, vala_0_23, python, intltool, pkgconfig -, glib, libgee_0_6, gtk3, dee, libdbusmenu-glib -}: - -stdenv.mkDerivation rec { - name = "libunity-${version}"; - version = "6.12.0"; - - src = fetchurl { - url = "https://launchpad.net/libunity/6.0/${version}/+download/${name}.tar.gz"; - sha256 = "1nadapl3390x98q1wv2yarh60hzi7ck0d1s8zz9xsiq3zz6msbjd"; - }; - - buildInputs = [ glib libgee_0_6 gtk3 ]; - propagatedBuildInputs = [ dee libdbusmenu-glib ]; - nativeBuildInputs = [ vala_0_23 python intltool pkgconfig ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "A library for instrumenting- and integrating with all aspects of the Unity shell"; - homepage = https://launchpad.net/libunity; - license = licenses.lgpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index ca8d0c6f7173..73c9021c5e9f 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, glib, bison, flex }: stdenv.mkDerivation rec { - name = "gob2-${minVer}.18"; + name = "gob2-${minVer}.20"; minVer = "2.0"; src = fetchurl { - url = "mirror://gnome/sources/gob2/${minVer}/${name}.tar.gz"; - sha256 = "1r242s3rsxyqiw2ic2gdpvvrx903jgjd1aa4mkl26in5k9zk76fa"; + url = "mirror://gnome/sources/gob2/${minVer}/${name}.tar.xz"; + sha256 = "5fe5d7990fd65b0d4b617ba894408ebaa6df453f2781c15a1cfdf2956c0c5428"; }; # configure script looks for d-bus but it is only needed for tests diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix index ad11542f04b0..90f2a8dcfed4 100644 --- a/pkgs/development/web/valum/default.nix +++ b/pkgs/development/web/valum/default.nix @@ -1,29 +1,24 @@ -{ stdenv, pkgconfig, fetchFromGitHub, python, glib, vala_0_28, ctpl +{ stdenv, meson, ninja, pkgconfig, fetchFromGitHub, glib, vala, ctpl , libgee, libsoup, fcgi }: stdenv.mkDerivation rec { name = "valum-${version}"; - version = "0.2.16"; + version = "0.3.14"; src = fetchFromGitHub { owner = "valum-framework"; repo = "valum"; rev = "v${version}"; - sha256 = "0ca067gg5z1798bazwzgg2yd2mbysvk8i2q2v3i8d0d188y2hj84"; + sha256 = "1w1mipczcfmrrxg369wvrj3wvf76rqn8rrkxbq88aial1bi23kd3"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python glib vala_0_28 ctpl libgee libsoup fcgi ]; - - configurePhase = ''python waf configure --prefix=$out''; - - buildPhase = ''python waf build''; - - installPhase = ''python waf install''; + nativeBuildInputs = [ meson ninja pkgconfig ]; + buildInputs = [ glib vala ctpl libgee libsoup fcgi ]; meta = with stdenv.lib; { homepage = https://github.com/valum-framework/valum; description = "Web micro-framework written in Vala"; + license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.lethalman ]; }; diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index d302fbe6d4b6..537576ca63b6 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -1,42 +1,35 @@ -{stdenv, fetchurl, which, automake, autoconf, pkgconfig, curl, libtool, vala_0_23, python, intltool, fuse, ccnet}: +{stdenv, fetchurl, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation rec { version = "6.1.0"; name = "seafile-shared-${version}"; - src = fetchurl - { + src = fetchurl { url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz"; sha256 = "03zvxk25311xgn383k54qvvpr8xbnl1vxd99fg4ca9yg5rmir1q6"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which automake autoconf libtool vala_0_23 python intltool fuse ]; + nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ]; + buildInputs = [ python fuse ]; propagatedBuildInputs = [ ccnet curl ]; - preConfigure = '' - sed -ie 's|/bin/bash|${stdenv.shell}|g' ./autogen.sh - ./autogen.sh - ''; - - configureFlags = "--disable-server --disable-console"; - - buildPhase = "make -j1"; + configureFlags = [ + "--disable-server" + "--disable-console" + ]; postInstall = '' - # Remove seafile binary - rm -rf "$out/bin/seafile" - # Remove cli client binary - rm -rf "$out/bin/seaf-cli" + # Remove seafile binary + rm -rf "$out/bin/seafile" + # Remove cli client binary + rm -rf "$out/bin/seaf-cli" ''; - meta = - { + meta = with stdenv.lib; { homepage = https://github.com/haiwen/seafile; description = "Shared components of Seafile: seafile-daemon, libseafile, libseafile python bindings, manuals, and icons"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.calrama ]; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.calrama ]; }; } diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix new file mode 100644 index 000000000000..3464a92fa110 --- /dev/null +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2 +, libxslt, libarchive, bzip2, lzma +}: + +stdenv.mkDerivation rec { + name = "osinfo-db-tools-1.1.0"; + + src = fetchurl { + url = "https://releases.pagure.org/libosinfo/${name}.tar.gz"; + sha256 = "0sslzrbhpb2js1vn48c11s5p0bic3yqzdnxm054dhc3wq0pwshd1"; + }; + + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ glib libxml2 libxslt libarchive bzip2 lzma ]; + + meta = with stdenv.lib; { + description = "Tools for managing the osinfo database"; + homepage = https://libosinfo.org/; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index 24c86f4fa9a6..036819ea76e1 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -1,36 +1,25 @@ -{stdenv, fetchurl, which, automake, autoconf, pkgconfig, libtool, vala_0_23, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}: +{stdenv, fetchurl, which, autoreconfHook, pkgconfig, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation rec { version = "6.1.0"; seafileVersion = "6.1.0"; name = "ccnet-${version}"; - src = fetchurl - { + src = fetchurl { url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz"; sha256 = "0q4a102xlcsxlr53h4jr4w8qzkbzvm2f3nk9fsha48h6l2hw34bb"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which automake autoconf libtool vala_0_23 python ]; + nativeBuildInputs = [ pkgconfig which autoreconfHook vala python ]; propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ]; - preConfigure = '' - sed -ie 's|/bin/bash|${stdenv.shell}|g' ./autogen.sh - ./autogen.sh - ''; + configureFlags = [ "--enable-server" ]; - configureFlags = "--enable-server"; - - buildPhase = "make -j1"; - - meta = - { + meta = with stdenv.lib; { homepage = https://github.com/haiwen/ccnet; description = "A framework for writing networked applications in C"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.calrama ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.calrama ]; }; } diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/tools/networking/zssh/default.nix new file mode 100644 index 000000000000..16c0034e46fc --- /dev/null +++ b/pkgs/tools/networking/zssh/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, readline, deepin-terminal }: + +let + version = "1.5c"; +in stdenv.mkDerivation rec { + name = "zssh-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/zssh/${name}.tgz"; + sha256 = "06z73iq59lz8ibjrgs7d3xl39vh9yld1988yx8khssch4pw41s52"; + }; + + buildInputs = [ readline ]; + + patches = [ + # Cargo-culted from Arch, returns “out of pty's” without it + (fetchurl { + name = "fix_use_ptmx_on_arch.patch"; + url = https://git.archlinux.org/svntogit/community.git/plain/trunk/fix_use_ptmx_on_arch.patch?h=packages/zssh&id=0a7c92543f9309856d02e31196f06d7c3eaa8b67; + sha256 = "12daw9wpy58ql882zww945wk9cg2adwp8qsr5rvazx0xq0qawgbr"; + }) + ]; + + patchFlags = [ "-p0" ]; + + # The makefile does not create the directories + postBuild = '' + install -dm755 "$out"/{bin,man/man1} + ''; + + meta = { + description = "SSH and Telnet client with ZMODEM file transfer capability"; + homepage = http://zssh.sourceforge.net/; + license = stdenv.lib.licenses.gpl2; + maintainers = deepin-terminal.meta.maintainers; # required by deepin-terminal + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index aade96ed3899..51fff4c59ec1 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "1.8.18"; + version = "1.8.19"; name = "gnome-encfs-manager-${version}"; src = fetchurl { url = "https://launchpad.net/gencfsm/trunk/1.8/+download/gnome-encfs-manager_${version}.tar.xz"; - sha256 = "1rpf683lxa78fmxxb0hnq7vdh3yn7qid2gqq67q9mk65sp9vdhdj"; + sha256 = "1h6x8dyp1fvxvr8fwki98ppf4sa20qf7g59jc9797b2vrgm60h1i"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fdbe539db0c5..e932b267aa25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1128,9 +1128,7 @@ with pkgs; geekbench = callPackage ../tools/misc/geekbench { }; - gencfsm = callPackage ../tools/security/gencfsm { - vala = vala_0_34; - }; + gencfsm = callPackage ../tools/security/gencfsm { }; genromfs = callPackage ../tools/filesystems/genromfs { }; @@ -1533,8 +1531,7 @@ with pkgs; libpinyin = callPackage ../development/libraries/libpinyin { }; libskk = callPackage ../development/libraries/libskk { - gnome_common = gnome3.gnome_common; - vala = vala_0_34; + inherit (gnome3) gnome_common libgee; }; m17n_db = callPackage ../tools/inputmethods/m17n-db { }; @@ -5398,6 +5395,8 @@ with pkgs; zsh-command-time = callPackage ../shells/zsh-command-time { }; + zssh = callPackage ../tools/networking/zssh { }; + zstd = callPackage ../tools/compression/zstd { }; zstdmt = callPackage ../tools/compression/zstdmt { }; @@ -6457,7 +6456,6 @@ with pkgs; urweb = callPackage ../development/compilers/urweb { }; inherit (callPackage ../development/compilers/vala { }) - vala_0_23 vala_0_26 vala_0_28 vala_0_32 @@ -9803,8 +9801,6 @@ with pkgs; libui = callPackage ../development/libraries/libui { }; - libunity = callPackage ../development/libraries/libunity { }; - libunistring = callPackage ../development/libraries/libunistring { }; libupnp = callPackage ../development/libraries/pupnp { }; @@ -10321,6 +10317,9 @@ with pkgs; osm-gps-map = callPackage ../development/libraries/osm-gps-map { }; + osinfo-db = callPackage ../data/misc/osinfo-db { }; + osinfo-db-tools = callPackage ../tools/misc/osinfo-db-tools { }; + p11_kit = callPackage ../development/libraries/p11-kit { }; paperkey = callPackage ../tools/security/paperkey { }; @@ -17055,7 +17054,6 @@ with pkgs; deepin-terminal = callPackage ../applications/misc/deepin-terminal { inherit (gnome3) libgee vte; wnck = libwnck3; - vala = vala_0_34; }; termite = callPackage ../applications/misc/termite { |