diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-19 12:01:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-19 12:01:35 +0000 |
| commit | 782f18b6fedc29813ea94cea51c12600af108e4c (patch) | |
| tree | de5bf7a18a67dcd0d12ccb254c2a012663a614ff /pkgs/desktops | |
| parent | 1ee9f3c87c12262520c9aa6a1b4ff5f056dad652 (diff) | |
| parent | 7467ab39493e17abc28c7f66179feb0a69a3dbd4 (diff) | |
| download | nixlib-782f18b6fedc29813ea94cea51c12600af108e4c.tar nixlib-782f18b6fedc29813ea94cea51c12600af108e4c.tar.gz nixlib-782f18b6fedc29813ea94cea51c12600af108e4c.tar.bz2 nixlib-782f18b6fedc29813ea94cea51c12600af108e4c.tar.lz nixlib-782f18b6fedc29813ea94cea51c12600af108e4c.tar.xz nixlib-782f18b6fedc29813ea94cea51c12600af108e4c.tar.zst nixlib-782f18b6fedc29813ea94cea51c12600af108e4c.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/cinnamon/xreader/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/desktops/gnome/extensions/argos/default.nix | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix index 828a9afbdb60..fbf8fbdf64d4 100644 --- a/pkgs/desktops/cinnamon/xreader/default.nix +++ b/pkgs/desktops/cinnamon/xreader/default.nix @@ -7,6 +7,7 @@ , shared-mime-info , gtk3 , wrapGAppsHook +, libarchive , libxml2 , xapp , meson @@ -26,13 +27,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "3.8.4"; + version = "4.0.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-eSMPXBJ+VIMrIy86mMbRtZ28DvX7aCzLAAQ+RWqlCpc="; + sha256 = "sha256-TL8LlNQLGUevXlNcnS9HcdGh1TzC/0I/6reJpe6rahM="; }; nativeBuildInputs = [ @@ -54,6 +55,7 @@ stdenv.mkDerivation rec { gtk3 xapp cairo + libarchive libxml2 libsecret poppler diff --git a/pkgs/desktops/gnome/extensions/argos/default.nix b/pkgs/desktops/gnome/extensions/argos/default.nix index 83828b99b16d..cc12c5dc2015 100644 --- a/pkgs/desktops/gnome/extensions/argos/default.nix +++ b/pkgs/desktops/gnome/extensions/argos/default.nix @@ -1,14 +1,14 @@ { fetchFromGitHub, lib, stdenv }: stdenv.mkDerivation rec { - pname = "argos-unstable"; - version = "20230404"; + pname = "argos"; + version = "unstable-2023-09-26"; src = fetchFromGitHub { owner = "p-e-w"; repo = "argos"; - rev = "e2d68ea23eed081fccaec06c384e2c5d2acb5b6b"; - hash = "sha256-OJ/bUQkBQdlfEIqmneyUeIJoytTxyfibdyUDf3SJc0Q="; + rev = "adfaa31e8c08f7b59e9492891a7e6f753c29b35e"; # https://github.com/p-e-w/argos/pull/150 + hash = "sha256-st8AeMRtkvM4M/Z70qopjw9Yx0t9l0DsUke4ClQtcBU="; }; installPhase = '' |