Commit 40dd5a10 authored by K900's avatar K900
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents fec804bf 513edfea

nixos/modules/services/wayland/hypridle.nix

+4 −1
Original line number Diff line number Diff line
@@ -17,7 +17,10 @@ in 
  config = lib.mkIf cfg.enable {

    environment.systemPackages = [ cfg.package ];



    systemd.packages = [ cfg.package ];

    systemd = {

      packages = [ cfg.package ];

      user.services.hypridle.wantedBy = [ "graphical-session.target" ];

    };

  };



  meta.maintainers = with lib.maintainers; [ johnrtitor ];

nixos/modules/tasks/bcache.nix

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ in { 


      Whether to enable bcache support in the initrd.

    '';

    default = config.boot.initrd.systemd.enable && config.boot.bcache.enable;

    defaultText = lib.literalExpression "config.boot.initrd.systemd.enable && config.boot.bcache.enable";

  };



  config = lib.mkIf cfg.enable {

nixos/modules/tasks/lvm.nix

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ in { 


      Whether to enable booting from LVM2 in the initrd.

    '';

    default = config.boot.initrd.systemd.enable && config.services.lvm.enable;

    defaultText = lib.literalExpression "config.boot.initrd.systemd.enable && config.services.lvm.enable";

  };



  config = mkMerge [

pkgs/applications/editors/android-studio/common.nix

+8 −1
Original line number Diff line number Diff line
@@ -60,12 +60,15 @@ 
, usbutils

, which

, runCommand

, wayland

, xkeyboard_config

, xorg

, zlib

, makeDesktopItem

, tiling_wm # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper

, androidenv



, forceWayland ? false

}:



let
@@ -176,7 +179,11 @@ let 
          # For GTKLookAndFeel

          gtk2

          glib

        ]}"



          # For wayland support

          wayland

        ]}" \

        ${lib.optionalString forceWayland "--add-flags -Dawt.toolkit.name=WLToolkit"}



      # AS launches LLDBFrontend with a custom LD_LIBRARY_PATH

      wrapProgram $(find $out -name LLDBFrontend) --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [

pkgs/by-name/do/double-entry-generator/package.nix

0 → 100644
+49 −0
Original line number Diff line number Diff line 
{

  lib,

  buildGoModule,

  fetchFromGitHub,

  nix-update-script,

}:

buildGoModule rec {

  pname = "double-entry-generator";

  version = "2.7.1";

  src = fetchFromGitHub {

    owner = "deb-sig";

    repo = "double-entry-generator";

    hash = "sha256-2Y8Spj1LAVZsUgChDYDCZ63pTH+nqs2ff9xcmC+gr0c=";

    rev = "v${version}";

  };



  vendorHash = "sha256-Xedva9oGteOnv3rP4Wo3sOHIPyuy2TYwkZV2BAuxY4M=";



  excludedPackages = [ "hack" ];



  ldflags = [

    "-s"

    "-w"

    "-X=github.com/deb-sig/double-entry-generator/pkg/version.VERSION=${version}"

    "-X=github.com/deb-sig/double-entry-generator/pkg/version.REPOROOT=github.com/deb-sig/double-entry-generator"

    "-X=github.com/deb-sig/double-entry-generator/pkg/version.COMMIT=${src.rev}"

  ];



  doInstallCheck = true;

  installCheckPhase = ''

    runHook preInstallCheck



    touch build-local

    ln -s $out/bin ./

    make SHELL=bash GIT_COMMIT= VERSION= DOCKER_LABELS= -o test-go test



    runHook postInstallCheck

  '';



  passthru.updateScript = nix-update-script { };



  meta = with lib; {

    description = "Rule-based double-entry bookkeeping importer (from Alipay/WeChat/Huobi etc. to Beancount/Ledger)";

    homepage = "https://github.com/deb-sig/double-entry-generator";

    license = licenses.asl20;

    maintainers = with maintainers; [ rennsax ];

    mainProgram = "double-entry-generator";

  };

}