diff options
| author | annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2024-03-17 07:18:11 +0000 |
|---|---|---|
| committer | annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2024-03-17 07:18:11 +0000 |
| commit | 8ead81a60f410dd4db6df106254c087b6b333967 (patch) | |
| tree | 94256dd40acd6d0846bd108d726ca0a5867ebee9 /pkgs/desktops/pantheon | |
| parent | 2178d8d8574be160b52888ddd02cc3b9225ac920 (diff) | |
| parent | a3d99d0bd385f4cdc4c77d2704c7aced3d9ea669 (diff) | |
| download | nixlib-8ead81a60f410dd4db6df106254c087b6b333967.tar nixlib-8ead81a60f410dd4db6df106254c087b6b333967.tar.gz nixlib-8ead81a60f410dd4db6df106254c087b6b333967.tar.bz2 nixlib-8ead81a60f410dd4db6df106254c087b6b333967.tar.lz nixlib-8ead81a60f410dd4db6df106254c087b6b333967.tar.xz nixlib-8ead81a60f410dd4db6df106254c087b6b333967.tar.zst nixlib-8ead81a60f410dd4db6df106254c087b6b333967.zip | |
Merge remote-tracking branch 'upstream/master' into staging-next
Diffstat (limited to 'pkgs/desktops/pantheon')
| -rw-r--r-- | pkgs/desktops/pantheon/apps/appcenter/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index e1e0db005d65..7ee81df4b462 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -24,15 +24,15 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "7.4.0-unstable-2023-12-04"; + version = "7.4.0-unstable-2024-02-07"; src = fetchFromGitHub { owner = "elementary"; repo = pname; # Add support for AppStream 1.0. # https://github.com/elementary/appcenter/pull/2099 - rev = "d93e135a0b0c9a6e0fbad18fe90d46425823a42c"; - hash = "sha256-b7xux6MuvYZFxufQ5T7DoDNBlsJ/fDR0aUY2Hk/xJoY="; + rev = "fce55d9373bfb82953191b32e276a2129ffcb8c1"; + hash = "sha256-7VYiE1RkaqN1Yg4pFUBs6k8QjoljYFDgQ9jCTLG3uyk="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index 620c64f11d80..d1d2b6533e93 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -13,6 +13,7 @@ , elementary-default-settings , gnome-settings-daemon , runtimeShell +, systemd , writeText , meson , ninja @@ -90,13 +91,13 @@ in stdenv.mkDerivation rec { pname = "elementary-session-settings"; - version = "6.0.0"; + version = "6.0.0-unstable-2023-09-05"; src = fetchFromGitHub { owner = "elementary"; repo = "session-settings"; - rev = version; - sha256 = "1faglpa7q3a4335gnd074a3lnsdspyjdnskgy4bfnf6xmwjx7kjx"; + rev = "3476c89bbb66564a72c6495ac0c61f8f9ed7a3ec"; + sha256 = "sha256-Z1qW6m0XDkB92ZZVKx98JOMXiBDbGpQ0cAXgWdqK27c="; }; nativeBuildInputs = [ @@ -111,6 +112,7 @@ stdenv.mkDerivation rec { gnome-settings-daemon onboard orca + systemd ]; mesonFlags = [ |