nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-18 01:54:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
libshumate: unstable-2021-10-06 -> 1.0.0.alpha.1
This commit is contained in:
Jan Tojnar 2022-01-28 17:56:07 +01:00 committed by GitHub
commit 92c64d63f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/libshumate/default.nix
View File

@ -13,12 +13,12 @@
, libsoup , libsoup
, gtk4 , gtk4
, xvfb-run , xvfb-run
, unstableGitUpdater , gnome
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libshumate"; pname = "libshumate";
version = "unstable-2021-10-06"; version = "1.0.0.alpha.1";
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
outputBin = "devdoc"; # demo app outputBin = "devdoc"; # demo app
@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
owner = "GNOME"; owner = "GNOME";
repo = "libshumate"; repo = "libshumate";
rev = "7a0a03f299881e8faaac7d904cc47b74795ae5dd"; rev = version;
sha256 = "df8ZHn/wmkzaYH0L3E6ULUtqxqU71EqL0jSgKhWqlT8="; sha256 = "4kCXFUJRglh1aIBk03MNUV8jfx0mJzIFCUDM4g9tzlg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -68,11 +68,14 @@ stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
moveToOutput share/doc/libshumate-0.0 "$devdoc" moveToOutput share/doc/libshumate-1.0 "$devdoc"
''; '';
passthru.updateScript = unstableGitUpdater { passthru = {
url = meta.homepage; updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "none";
};
}; };
meta = with lib; { meta = with lib; {

16
pkgs/development/tools/ashpd-demo/default.nix
View File

@ -4,7 +4,6 @@
, nix-update-script , nix-update-script
, meson , meson
, ninja , ninja
, python3
, rustPlatform , rustPlatform
, pkg-config , pkg-config
, glib , glib
@ -22,7 +21,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ashpd-demo"; pname = "ashpd-demo";
version = "0.0.1-alpha"; version = "0.2.2";
src = src =
let let
@ -30,7 +29,7 @@ stdenv.mkDerivation rec {
owner = "bilelmoussaoui"; owner = "bilelmoussaoui";
repo = "ashpd"; repo = "ashpd";
rev = version; rev = version;
sha256 = "Lf3Wj4VTDyJ5a1bJTEI6R6aaeEHZ+4hO+BsD98sKb/s="; sha256 = "9O6XqM4oys/hXgztQQ8tTobJV8U52db/VY6FlTMUvGY=";
}; };
in in
"${share}/ashpd-demo"; "${share}/ashpd-demo";
@ -38,14 +37,13 @@ stdenv.mkDerivation rec {
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit src;
name = "${pname}-${version}"; name = "${pname}-${version}";
hash = "sha256-npqC8lu7acAggJyR4iDkcQZYMNNnseV2pB3+j4G/nIk="; hash = "sha256-eFq42m16zzrUBbAqv7BsAf4VxyO93WynLjvIzKbZwnQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
ninja ninja
pkg-config pkg-config
python3
rustPlatform.rust.cargo rustPlatform.rust.cargo
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
rustPlatform.rust.rustc rustPlatform.rust.rustc
@ -70,13 +68,6 @@ stdenv.mkDerivation rec {
# <spa-0.2/spa/utils/defs.h> included by libspa-sys requires <stdbool.h> # <spa-0.2/spa/utils/defs.h> included by libspa-sys requires <stdbool.h>
BINDGEN_EXTRA_CLANG_ARGS = "-I${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include -I${glibc.dev}/include"; BINDGEN_EXTRA_CLANG_ARGS = "-I${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include -I${glibc.dev}/include";
postPatch = ''
patchShebangs build-aux/meson_post_install.py
# https://github.com/bilelmoussaoui/ashpd/pull/32
substituteInPlace build-aux/meson_post_install.py \
--replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
'';
passthru = { passthru = {
updateScript = nix-update-script { updateScript = nix-update-script {
attrPath = pname; attrPath = pname;
@ -86,7 +77,6 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Tool for playing with XDG desktop portals"; description = "Tool for playing with XDG desktop portals";
homepage = "https://github.com/bilelmoussaoui/ashpd/tree/master/ashpd-demo"; homepage = "https://github.com/bilelmoussaoui/ashpd/tree/master/ashpd-demo";
broken = true; # requires older libadwaita
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ jtojnar ]; maintainers = with maintainers; [ jtojnar ];
platforms = platforms.linux; platforms = platforms.linux;