summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2023-03-17 18:38:16 +0000
committerJan Tojnar <jtojnar@gmail.com>2023-04-06 01:35:23 +0200
commit40df9774dcbeb91f5b287ac462a23df4ee5e3dca (patch)
tree57fce8366a7ff7bd06adebb967c61750238a69a9
parentfbec7d146c8bea034f9bcc827e8efb54f7de7842 (diff)
downloadnixpkgs-40df9774dcbeb91f5b287ac462a23df4ee5e3dca.tar
nixpkgs-40df9774dcbeb91f5b287ac462a23df4ee5e3dca.tar.gz
nixpkgs-40df9774dcbeb91f5b287ac462a23df4ee5e3dca.tar.bz2
nixpkgs-40df9774dcbeb91f5b287ac462a23df4ee5e3dca.tar.lz
nixpkgs-40df9774dcbeb91f5b287ac462a23df4ee5e3dca.tar.xz
nixpkgs-40df9774dcbeb91f5b287ac462a23df4ee5e3dca.tar.zst
nixpkgs-40df9774dcbeb91f5b287ac462a23df4ee5e3dca.zip
libadwaita: 1.3.rc → 1.3.1
https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.3.rc...1.3.1

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
-rw-r--r--pkgs/development/libraries/libadwaita/default.nix19
1 files changed, 2 insertions, 17 deletions
diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix
index b03c4c3535f..daf02487d08 100644
--- a/pkgs/development/libraries/libadwaita/default.nix
+++ b/pkgs/development/libraries/libadwaita/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitLab
-, fetchpatch
 , gi-docgen
 , meson
 , ninja
@@ -21,7 +20,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libadwaita";
-  version = "1.3.rc";
+  version = "1.3.1";
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "devdoc"; # demo app
@@ -31,23 +30,9 @@ stdenv.mkDerivation rec {
     owner = "GNOME";
     repo = "libadwaita";
     rev = version;
-    hash = "sha256-Xb1sNT1KpWspRkjuPBcAaRMXtVpXnjhm+V2FkNthEKk=";
+    hash = "sha256-RIJtlSBZX4+rMOGQaFn31CCEKkWtPjtzO4fcX+iApvs=";
   };
 
-  patches = [
-    # Fixes for the broken carousel test
-    # https://github.com/NixOS/nixpkgs/pull/218143#issuecomment-1456610692
-    # https://gitlab.gnome.org/GNOME/libadwaita/-/merge_requests/786
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/libadwaita/-/commit/cbfd8e57d5ba684c8744f6955e0435e7a09b993e.patch";
-      hash = "sha256-nVJD5Eu4gjyfIJf4/6e/ah10/dSxjLk5weWKxSP8byE=";
-    })
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/libadwaita/-/commit/78dc3b1dc8527b29c8610a1ad3dee82c8b2b3771.patch";
-      hash = "sha256-Nthf5crWjNlAPI+8SQ7YfUBCcmCJrHcfkpankqSm+Ic=";
-    })
-  ];
-
   depsBuildBuild = [
     pkg-config
   ];