pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #145846 from r-ryantm/auto-update/libshumate

libshumate: unstable-2021-10-06 -> 1.0.0.alpha.1

authored by

Jan Tojnar and committed by
GitHub 92c64d63 710b1d9c

+13 -20
+10 -7
pkgs/development/libraries/libshumate/default.nix
··· 13 13 , libsoup 14 14 , gtk4 15 15 , xvfb-run 16 - , unstableGitUpdater 16 + , gnome 17 17 }: 18 18 19 19 stdenv.mkDerivation rec { 20 20 pname = "libshumate"; 21 - version = "unstable-2021-10-06"; 21 + version = "1.0.0.alpha.1"; 22 22 23 23 outputs = [ "out" "dev" "devdoc" ]; 24 24 outputBin = "devdoc"; # demo app ··· 27 27 domain = "gitlab.gnome.org"; 28 28 owner = "GNOME"; 29 29 repo = "libshumate"; 30 - rev = "7a0a03f299881e8faaac7d904cc47b74795ae5dd"; 31 - sha256 = "df8ZHn/wmkzaYH0L3E6ULUtqxqU71EqL0jSgKhWqlT8="; 30 + rev = version; 31 + sha256 = "4kCXFUJRglh1aIBk03MNUV8jfx0mJzIFCUDM4g9tzlg="; 32 32 }; 33 33 34 34 nativeBuildInputs = [ ··· 68 68 69 69 postFixup = '' 70 70 # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. 71 - moveToOutput share/doc/libshumate-0.0 "$devdoc" 71 + moveToOutput share/doc/libshumate-1.0 "$devdoc" 72 72 ''; 73 73 74 - passthru.updateScript = unstableGitUpdater { 75 - url = meta.homepage; 74 + passthru = { 75 + updateScript = gnome.updateScript { 76 + packageName = pname; 77 + versionPolicy = "none"; 78 + }; 76 79 }; 77 80 78 81 meta = with lib; {
+3 -13
pkgs/development/tools/ashpd-demo/default.nix
··· 4 4 , nix-update-script 5 5 , meson 6 6 , ninja 7 - , python3 8 7 , rustPlatform 9 8 , pkg-config 10 9 , glib ··· 22 21 23 22 stdenv.mkDerivation rec { 24 23 pname = "ashpd-demo"; 25 - version = "0.0.1-alpha"; 24 + version = "0.2.2"; 26 25 27 26 src = 28 27 let ··· 30 29 owner = "bilelmoussaoui"; 31 30 repo = "ashpd"; 32 31 rev = version; 33 - sha256 = "Lf3Wj4VTDyJ5a1bJTEI6R6aaeEHZ+4hO+BsD98sKb/s="; 32 + sha256 = "9O6XqM4oys/hXgztQQ8tTobJV8U52db/VY6FlTMUvGY="; 34 33 }; 35 34 in 36 35 "${share}/ashpd-demo"; ··· 38 37 cargoDeps = rustPlatform.fetchCargoTarball { 39 38 inherit src; 40 39 name = "${pname}-${version}"; 41 - hash = "sha256-npqC8lu7acAggJyR4iDkcQZYMNNnseV2pB3+j4G/nIk="; 40 + hash = "sha256-eFq42m16zzrUBbAqv7BsAf4VxyO93WynLjvIzKbZwnQ="; 42 41 }; 43 42 44 43 nativeBuildInputs = [ 45 44 meson 46 45 ninja 47 46 pkg-config 48 - python3 49 47 rustPlatform.rust.cargo 50 48 rustPlatform.cargoSetupHook 51 49 rustPlatform.rust.rustc ··· 70 68 # <spa-0.2/spa/utils/defs.h> included by libspa-sys requires <stdbool.h> 71 69 BINDGEN_EXTRA_CLANG_ARGS = "-I${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include -I${glibc.dev}/include"; 72 70 73 - postPatch = '' 74 - patchShebangs build-aux/meson_post_install.py 75 - # https://github.com/bilelmoussaoui/ashpd/pull/32 76 - substituteInPlace build-aux/meson_post_install.py \ 77 - --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" 78 - ''; 79 - 80 71 passthru = { 81 72 updateScript = nix-update-script { 82 73 attrPath = pname; ··· 86 77 meta = with lib; { 87 78 description = "Tool for playing with XDG desktop portals"; 88 79 homepage = "https://github.com/bilelmoussaoui/ashpd/tree/master/ashpd-demo"; 89 - broken = true; # requires older libadwaita 90 80 license = licenses.mit; 91 81 maintainers = with maintainers; [ jtojnar ]; 92 82 platforms = platforms.linux;