diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-30 13:30:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-31 10:13:20 +0000 |
| commit | f2e61678de300336b3666afd19af7565efb0c4cf (patch) | |
| tree | 49f6906c9d557f7fdd58257ff85ec17fc4495f31 /nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix | |
| parent | f920d5e07c29a9aa1b77d9b88bd604cf1a1f3664 (diff) | |
| parent | 00e27c78d3d2de6964096ceee8d70e5b487365e3 (diff) | |
| download | nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.gz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.bz2 nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.lz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.xz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.zst nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.zip | |
Merge commit '00e27c78d3d2de6964096ceee8d70e5b487365e3'
Conflicts: nixpkgs/nixos/modules/system/boot/systemd.nix nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/pink.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix index aa192a6a3b65..b7921322d994 100644 --- a/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -3,8 +3,8 @@ , fetchurl , pkg-config , gnome -, gtk3 -, libhandy +, gtk4 +, libadwaita , wrapGAppsHook , gjs , gobject-introspection @@ -12,18 +12,17 @@ , meson , ninja , geoclue2 -, gnome-desktop , python3 , gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "41.0"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1vidwq768xnrnr24jcfbpwjczz7vm5zmaiv41nb75q4p8avlwqg5"; + sha256 = "V57mkdhT5bs/9Q6Me0P4Wundfls6ZJ4CwlSi2bgHtGU="; }; nativeBuildInputs = [ @@ -35,11 +34,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 - libhandy + gtk4 + libadwaita gjs gobject-introspection - gnome-desktop libgweather gnome.adwaita-icon-theme geoclue2 @@ -70,7 +68,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Weather"; description = "Access current weather conditions and forecasts"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } |