diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index ee098d2f9f29f..a7e5af3370c3e 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , nix-update-script , appstream , appstream-glib @@ -30,13 +31,13 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "3.8.1"; + version = "3.8.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-d7DGyAC8itBxTfuabDPN16W4S4d42s5UPp8AusZfy5k="; + sha256 = "sha256-NHKP1vzb8qu+EkUWDvLWLl4U4pW9ZxbE7YFI6Vwesfg="; }; passthru = { diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index c2e99fc6bfe64..bddc9d5acff6d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , pantheon @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.0.3"; + version = "6.0.4"; repoName = "files"; @@ -42,7 +43,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "10hgj5rrqxzk4q8jlhkwwrs4hgyavlhz3z1pqf36y663bq3h0izv"; + sha256 = "sha256-FH6EYtgKADp8jjBoCwsdRdknlKS9v3iOtPiT3CyEc/8="; }; passthru = { diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index d9d6decb96c8a..eb8563bc50d74 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , pkg-config @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "elementary-shortcut-overlay"; - version = "1.2.0"; + version = "1.2.1"; repoName = "shortcut-overlay"; @@ -28,22 +28,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1zs2fpx4agr00rsfmpi00nhiw92mlypzm4p9x3g851p24m62fn79"; - }; - - patches = [ - # Upstream code not respecting our localedir - # https://github.com/elementary/shortcut-overlay/pull/100 - (fetchpatch { - url = "https://github.com/elementary/shortcut-overlay/commit/f26e3684568e30cb6e151438e2d86c4d392626bf.patch"; - sha256 = "0zxyqpk9xbxdm8lmgdwbb4yzzwbjlhypsca3xs34a2pl0b9pcdwd"; - }) - ]; - - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + sha256 = "sha256-qmqzGCM3cVM6y80pzjm5CCyG6BO6XlKZiODAAEnwVrM="; }; nativeBuildInputs = [ @@ -65,6 +50,12 @@ stdenv.mkDerivation rec { libhandy ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "A native OS-wide shortcut overlay to be launched by Gala"; homepage = "https://github.com/elementary/shortcut-overlay"; diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index bc9bedcd7c028..c687b281a2a76 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "elementary-capnet-assist"; - version = "2.3.0"; + version = "2.4.0"; repoName = "capnet-assist"; @@ -27,13 +27,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1gma8a04ndivx1fd3ha9f45r642qq2li80wrd6dsrp4v3vqix9bn"; - }; - - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + sha256 = "sha256-UdkS+w61c8z2TCJyG7YsDb0n0b2LOpFyaHzMbdCJsZI="; }; nativeBuildInputs = [ @@ -55,16 +49,17 @@ stdenv.mkDerivation rec { webkitgtk ]; - # Not useful here or in elementary - See: https://github.com/elementary/capnet-assist/issues/3 - patches = [ - ./remove-capnet-test.patch - ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "A small WebKit app that assists a user with login when a captive portal is detected"; homepage = "https://github.com/elementary/capnet-assist"; diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/remove-capnet-test.patch b/pkgs/desktops/pantheon/services/elementary-capnet-assist/remove-capnet-test.patch deleted file mode 100644 index a59c74f22b3bf..0000000000000 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/remove-capnet-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index 46c594b..ba0ea10 100644 ---- a/meson.build -+++ b/meson.build -@@ -33,8 +33,3 @@ meson.add_install_script('meson/post_install.py') - - subdir('data') - subdir('po') -- --install_data( -- '90captive_portal_test', -- install_dir: join_paths(get_option('sysconfdir'), 'NetworkManager', 'dispatcher.d') --)