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

Merge master into staging-next

parents 0d074a5a 19f81576

nixos/modules/hardware/corectrl.nix

+6 −2
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ in 
      Add your user to the corectrl group to run corectrl without needing to enter your password

    '');



    package = mkPackageOption pkgs "corectrl" {

      extraDescription = "Useful for overriding the configuration options used for the package.";

    };



    gpuOverclock = {

      enable = mkEnableOption (lib.mdDoc ''

        GPU overclocking
@@ -32,9 +36,9 @@ in 


  config = mkIf cfg.enable (lib.mkMerge [

    {

      environment.systemPackages = [ pkgs.corectrl ];

      environment.systemPackages = [ cfg.package ];



      services.dbus.packages = [ pkgs.corectrl ];

      services.dbus.packages = [ cfg.package ];



      users.groups.corectrl = { };

pkgs/applications/emulators/ccemux/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ let 
    if useCCTweaked

    then fetchurl {

      url = "${baseUrl}-cct.jar";

      hash = "sha256-B9Zan6wpYnUtaNbUIrXvkchPiEquMs9R2Kiqg85/VdY=";

      hash = "sha256-nna5KRp6jVLkbWKOHGtQqaPr3Zl05mVkCf/8X9C5lRY=";

    }

    else fetchurl {

      url = "${baseUrl}-cc.jar";

pkgs/applications/misc/ablog/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -5,12 +5,12 @@ 


python3.pkgs.buildPythonApplication rec {

  pname = "ablog";

  version = "0.11.4.post1";

  version = "0.11.6";

  format = "pyproject";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-Zyvx7lVUQtjoGsSpFmH8pFrgTGgsFd4GMsL3fXKtUpU=";

    hash = "sha256-fV4W4AaiqyruIz3OQ7/lGkMPMKmyiFa+fdU2QeeQCvs=";

  };



  nativeBuildInputs = with python3.pkgs; [
@@ -36,6 +36,7 @@ python3.pkgs.buildPythonApplication rec { 
  pytestFlagsArray = [

    "-W" "ignore::sphinx.deprecation.RemovedInSphinx90Warning"

    "--rootdir" "src/ablog"

    "-W" "ignore::sphinx.deprecation.RemovedInSphinx90Warning" # Ignore ImportError

  ];



  meta = with lib; {

pkgs/applications/misc/pot/Cargo.lock

+702 −457

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/misc/pot/default.nix

+4 −5
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ 


stdenv.mkDerivation rec {

  pname = "pot";

  version = "2.7.0";

  version = "2.7.4";



  src = fetchFromGitHub {

    owner = "pot-app";

    repo = "pot-desktop";

    rev = version;

    hash = "sha256-ODqMbyL6Zda/cY5Lgijaj9Pr5aozQDgzHlS89q4rA4w=";

    hash = "sha256-c7FHkp/utvrr7qasY+XKaTnPaiZWb8M5EGiFne52osQ=";

  };



  sourceRoot = "${src.name}/src-tauri";
@@ -68,15 +68,14 @@ stdenv.mkDerivation rec { 


    dontFixup = true;

    outputHashMode = "recursive";

    outputHash = "sha256-xl1dSrJ7o0Xn4QB2tRBB6U8gUItltxTE+hyEJ1GIw1k=";

    outputHash = "sha256-BQ5M+pKEXGJzWmxMchNgxpvLpgFCRIg33GQCvO4TLz4=";

  };



  cargoDeps = rustPlatform.importCargoLock {

    lockFile = ./Cargo.lock;

    outputHashes = {

      # All other crates in the same workspace reuse this hash.

      "tauri-plugin-autostart-0.0.0" = "sha256-wgVsF3H9BT8lBew7tQ308eIQ6cLZT93hD/4eYCDEq98=";

      "tauri-plugin-sql-0.0.0" = "sha256-e9iwcHwW8MaRzkaAbewrq6b9+n3ZofMTBnvA23ZF2ro=";

      "tauri-plugin-autostart-0.0.0" = "sha256-/uxaSBp+N1VjjSiwf6NwNnSH02Vk6gQZ/CzO+AyEI7o=";

    };

  };