diff options
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/arcan/arcan.nix | 6 | ||||
-rw-r--r-- | pkgs/desktops/arcan/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/arcan/durden.nix | 6 | ||||
-rw-r--r-- | pkgs/desktops/arcan/wrapper.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/gnome/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-feedback/default.nix | 8 | ||||
-rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-music/default.nix | 15 |
7 files changed, 19 insertions, 22 deletions
diff --git a/pkgs/desktops/arcan/arcan.nix b/pkgs/desktops/arcan/arcan.nix index 8a30da9e81f2..c6a57ecc3bda 100644 --- a/pkgs/desktops/arcan/arcan.nix +++ b/pkgs/desktops/arcan/arcan.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "arcan"; - version = "0.6.1pre1+unstable=2021-07-07"; + version = "0.6.1pre1+unstable=2021-07-10"; src = fetchFromGitHub { owner = "letoram"; repo = "arcan"; - rev = "f3341ab94b32d02f3d15c3b91a512b2614e950a5"; - hash = "sha256-YBtRA5uCk4tjX3Bsu5vMkaNaCLRlM6HVQ53sna3gDsY="; + rev = "25da999e6e03688c71c7df3852314c01ed610e0d"; + hash = "sha256-+ZF6mD/Z0N/5QCjXe80z4L6JOE33+Yv4ZlwKvlG/c44="; }; postUnpack = '' diff --git a/pkgs/desktops/arcan/default.nix b/pkgs/desktops/arcan/default.nix index dba284f0100d..874035c4801e 100644 --- a/pkgs/desktops/arcan/default.nix +++ b/pkgs/desktops/arcan/default.nix @@ -37,6 +37,6 @@ rec { everyone-wrapped = callPackage ./wrapper.nix { name = "everyone-wrapped"; - appls = [ durden pipeworld prio ]; + appls = [ durden pipeworld ]; }; } diff --git a/pkgs/desktops/arcan/durden.nix b/pkgs/desktops/arcan/durden.nix index cfe41cb6ec22..f6837f96fb6b 100644 --- a/pkgs/desktops/arcan/durden.nix +++ b/pkgs/desktops/arcan/durden.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "durden"; - version = "0.6.1+unstable=2021-06-25"; + version = "0.6.1+unstable=2021-07-11"; src = fetchFromGitHub { owner = "letoram"; repo = pname; - rev = "fb618fccc57a68b6ce933b4df5822acd1965d591"; - hash = "sha256-PovI837Xca4wV0g0s4tYUMFGVUDf+f8HcdvM1+0aDxk="; + rev = "8e0a5c07cade9ad9f606781615c9ebae7b28b6d5"; + hash = "sha256-4cGuCAeYmmr4ACWt2akVQu2cPqqyE6p+XFaKWcFf3t0="; }; installPhase = '' diff --git a/pkgs/desktops/arcan/wrapper.nix b/pkgs/desktops/arcan/wrapper.nix index a8b93ca1deac..4368b0ad3a59 100644 --- a/pkgs/desktops/arcan/wrapper.nix +++ b/pkgs/desktops/arcan/wrapper.nix @@ -21,7 +21,7 @@ symlinkJoin rec { --set ARCAN_LIBPATH "${placeholder "out"}/lib/" \ --set ARCAN_RESOURCEPATH "${placeholder "out"}/share/arcan/resources/" \ --set ARCAN_SCRIPTPATH "${placeholder "out"}/share/arcan/scripts/" \ - --set ARCAN_STATEBASEPATH "$HOME/.arcan/resources/savestates/" + --set ARCAN_STATEBASEPATH "\$HOME/.arcan/resources/savestates/" done ''; } diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index ae2255acb911..979ddafc10f0 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -312,7 +312,7 @@ lib.makeScope pkgs.newScope (self: with self; { # added 2019-02-08 inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 - libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 + libgtop libgudev libhttpseverywhere librsvg libsecret gdk-pixbuf gtksourceview gtksourceviewmm gtksourceview4 easytag meld orca rhythmbox shotwell gnome-usage clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 gnome-menus gdl; inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16 diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index 21aeb38530fd..2e20314d480a 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -11,15 +11,17 @@ , glib , granite , libgee +, libhandy , elementary-icon-theme , elementary-gtk-theme , gettext , wrapGAppsHook +, appstream }: stdenv.mkDerivation rec { pname = "elementary-feedback"; - version = "1.0"; + version = "6.0.0"; repoName = "feedback"; @@ -27,7 +29,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-GkVnowqGXwnEgplT34Po/BKzC2F/IQE2kIw0SLSLhGU="; + sha256 = "1fh9a0nfvbrxamki9avm9by760csj2nqy4ya7wzbnqbrrvjwd3fv"; }; passthru = { @@ -47,11 +49,13 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + appstream elementary-icon-theme granite gtk3 elementary-gtk-theme libgee + libhandy glib ]; diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index 5a5c314b3e9b..fe6c3f187fe3 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , pkg-config @@ -16,6 +15,7 @@ , json-glib , libgda , libgpod +, libhandy , libnotify , libpeas , libsoup @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { pname = "elementary-music"; - version = "5.0.5"; + version = "5.1.0"; repoName = "music"; @@ -39,17 +39,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-3GZoBCu9rF+BnNk9APBzKWO1JYg1XYWwrEvwcjWvYDE="; + sha256 = "13v7rii9ardyd661s6d4hvvs4ig44v7s3qd1bx7imaigr72gg58b"; }; - patches = [ - # Fix build with latest Vala. - (fetchpatch { - url = "https://github.com/elementary/music/commit/9ed3bbb3a0d68e289a772b4603f58e52a4973316.patch"; - sha256 = "fFO97SQzTc2fYFJFGfFPSUCdkCgZxfX1fjDQ7GH4BUs="; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -82,6 +74,7 @@ stdenv.mkDerivation rec { libgda libgee libgpod + libhandy libnotify libpeas libsignon-glib |