Unverified Commit 5122e188 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 705277a9 095a5bbf

nixos/modules/programs/hyprland.nix

+2 −5
Original line number Diff line number Diff line
@@ -57,17 +57,14 @@ in 
  };



  config = mkIf cfg.enable {

    environment = {

      systemPackages = [ cfg.package ];



    };

    environment.systemPackages = [ cfg.package ];



    fonts.enableDefaultFonts = mkDefault true;

    hardware.opengl.enable = mkDefault true;



    programs = {

      dconf.enable = mkDefault true;

      xwayland.enable = mkDefault true;

      xwayland.enable = mkDefault cfg.xwayland.enable;

    };



    security.polkit.enable = true;

nixos/modules/services/monitoring/grafana.nix

+0 −12
Original line number Diff line number Diff line
@@ -92,17 +92,6 @@ let 
  grafanaTypes.datasourceConfig = types.submodule {

    freeformType = provisioningSettingsFormat.type;



    imports = [

      (mkRemovedOptionModule [ "password" ] ''

        `services.grafana.provision.datasources.settings.datasources.<name>.password` has been removed

        in Grafana 9. Use `secureJsonData` instead.

      '')

      (mkRemovedOptionModule [ "basicAuthPassword" ] ''

        `services.grafana.provision.datasources.settings.datasources.<name>.basicAuthPassword` has been removed

        in Grafana 9. Use `secureJsonData` instead.

      '')

    ];



    options = {

      name = mkOption {

        type = types.str;
@@ -603,7 +592,6 @@ in { 
                  description = lib.mdDoc "List of datasources to insert/update.";

                  default = [];

                  type = types.listOf grafanaTypes.datasourceConfig;

                  apply = map (flip builtins.removeAttrs [ "password" "basicAuthPassword" ]);

                };



                deleteDatasources = mkOption {

pkgs/applications/backup/pika-backup/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -19,20 +19,20 @@ 


stdenv.mkDerivation rec {

  pname = "pika-backup";

  version = "0.6.0";

  version = "0.6.1";



  src = fetchFromGitLab {

    domain = "gitlab.gnome.org";

    owner = "World";

    repo = "pika-backup";

    rev = "v${version}";

    hash = "sha256-eI2MRrW6MID4dMHR1OjDT83xd/9CgDuhAWpEHmhnMVw=";

    hash = "sha256-7sgAp9/CKKxPr8rWbOot+FPAwaC8EPLa9pjVcC4TjW8=";

  };



  cargoDeps = rustPlatform.fetchCargoTarball {

    inherit src;

    name = "${pname}-${version}";

    hash = "sha256-hbh4kfQcym0n2cCp2ebljQpizolsxyfZk7ctKOlDybA=";

    hash = "sha256-Va7qLC6WvsLmG9JVmdT1FdIlWP4W/EFmsy7JOagQ+X8=";

  };



  patches = [

pkgs/applications/graphics/drawio/default.nix

+74 −75
Original line number Diff line number Diff line 
{ stdenv, lib, fetchurl, rpmextract, autoPatchelfHook, wrapGAppsHook



# Dynamic libraries

, alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, dbus, cups, expat

, gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor

, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst

, libxcb, libuuid, libxshmfence, nspr, nss, pango, mesa



, systemd

{ lib

, stdenv

, fetchFromGitHub

, fetchYarnDeps

, makeDesktopItem

, copyDesktopItems

, desktopToDarwinBundle

, fixup_yarn_lock

, makeWrapper

, nodejs

, yarn

, electron

}:



stdenv.mkDerivation rec {

  pname = "drawio";

  version = "21.2.1";



  src = fetchurl {

    url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";

    sha256 = "sha256-269kMXKGlGig4Dt7cvCTRDGFsBZE5RBoi1ajqT3rIVc=";

  src = fetchFromGitHub {

    owner = "jgraph";

    repo = "drawio-desktop";

    rev = "v${version}";

    fetchSubmodules = true;

    hash = "sha256-sjJZwVQdFAMWdaGUyQbv1qfdJWE2tN90z7eFYyAW9ko=";

  };



  offlineCache = fetchYarnDeps {

    yarnLock = src + "/yarn.lock";

    hash = "sha256-YlJ84psoEgeDnCX+O8TvwqhTthm5voJ6dfTvTiZlkuk=";

  };



  nativeBuildInputs = [

    autoPatchelfHook

    rpmextract

    wrapGAppsHook

  ];

    copyDesktopItems

    fixup_yarn_lock

    makeWrapper

    nodejs

    yarn

  ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle;



  buildInputs = [

    alsa-lib

    atk

    at-spi2-atk

    at-spi2-core

    cairo

    cups

    dbus

    expat

    gdk-pixbuf

    glib

    gtk3

    libX11

    libXScrnSaver

    libXcomposite

    libXcursor

    libXdamage

    libXext

    libXfixes

    libXi

    libXrandr

    libXrender

    libxshmfence

    libXtst

    libxcb

    libuuid

    mesa # for libgbm

    nspr

    nss

    pango

    systemd

  ];

  ELECTRON_SKIP_BINARY_DOWNLOAD = true;



  runtimeDependencies = [

    (lib.getLib systemd)

  ];

  configurePhase = ''

    runHook preConfigure



  dontBuild = true;

  dontConfigure = true;

    export HOME="$TMPDIR"

    yarn config --offline set yarn-offline-mirror "$offlineCache"

    fixup_yarn_lock yarn.lock

    yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive

    patchShebangs node_modules/



  unpackPhase = "rpmextract ${src}";

    runHook postConfigure

  '';



  installPhase = ''

    mkdir -p $out/share

    cp -r opt/drawio $out/share/

  buildPhase = ''

    runHook preBuild



    # Application icon

    mkdir -p $out/share/icons/hicolor

    cp -r usr/share/icons/hicolor/* $out/share/icons/hicolor/

    yarn --offline run electron-builder --dir \

      --config electron-builder-linux-mac.json \

      -c.electronDist=${electron}/lib/electron \

      -c.electronVersion=${electron.version}



    # XDG desktop item

    cp -r usr/share/applications $out/share/applications

    runHook postBuild

  '';



    # Symlink wrapper

    mkdir -p $out/bin

    ln -s $out/share/drawio/drawio $out/bin/drawio

  installPhase = ''

    runHook preInstall



    # Update binary path

    substituteInPlace $out/share/applications/drawio.desktop \

      --replace /opt/drawio/drawio $out/bin/drawio

  '';

    mkdir -p "$out/share/lib/drawio"

    cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/drawio"



  doInstallCheckPhase = true;

    install -Dm644 build/icon.svg "$out/share/icons/hicolor/scalable/apps/drawio.svg"



  installCheckPhase = ''

    $out/bin/drawio --help > /dev/null

    makeWrapper '${electron}/bin/electron' "$out/bin/drawio" \

      --add-flags "$out/share/lib/drawio/resources/app.asar" \

      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \

      --inherit-argv0



    runHook postInstall

  '';



  desktopItems = [

    (makeDesktopItem {

      name = "drawio";

      exec = "drawio %U";

      icon = "drawio";

      desktopName = "drawio";

      comment = "draw.io desktop";

      mimeTypes = [ "application/vnd.jgraph.mxfile" "application/vnd.visio" ];

      categories = [ "Graphics" ];

      startupWMClass = "drawio";

    })

  ];



  meta = with lib; {

    description = "A desktop application for creating diagrams";

    homepage = "https://about.draw.io/";

    sourceProvenance = with sourceTypes; [ binaryNativeCode ];

    license = licenses.asl20;

    changelog = "https://github.com/jgraph/drawio-desktop/releases/tag/v${version}";

    maintainers = with maintainers; [ darkonion0 ];

    platforms = [ "x86_64-linux" ];

    maintainers = with maintainers; [ qyliss darkonion0 ];

    platforms = platforms.darwin ++ platforms.linux;

    broken = stdenv.isDarwin;

  };

}

pkgs/applications/misc/gpxsee/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ let 
in

stdenv.mkDerivation rec {

  pname = "gpxsee";

  version = "12.4";

  version = "13.0";



  src = fetchFromGitHub {

    owner = "tumic0";

    repo = "GPXSee";

    rev = version;

    hash = "sha256-/a6c30jv/sI0QbCXYCq9JrMpmZRk33lQBwbd0yjnxsQ=";

    hash = "sha256-3s+LPD4KcnSWrg4JHPcbUjilwztjX8lAdQpx0h4dH0Y=";

  };



  patches = (substituteAll {