Unverified Commit 6d4a5fdc authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

incus: 6.9.0 -> 6.10.1, ui: 0.14.7 -> 0.15.0 (#386395)

parents 9c2ee04b c3b1c33c

pkgs/by-name/in/incus-ui-canonical/package.nix

+15 −4
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
  yarn,

  nixosTests,

  git,

  nix-update-script,

}:

let

  # this rarely changes https://github.com/zabbly/incus/blob/daily/patches/ui-canonical-renames.sed
@@ -19,18 +20,19 @@ let 
in

stdenv.mkDerivation rec {

  pname = "incus-ui-canonical";

  version = "0.14.7";

  version = "0.15.0";



  src = fetchFromGitHub {

    owner = "zabbly";

    repo = "incus-ui-canonical";

    # only use tags prefixed by incus- they are the tested fork versions

    tag = "incus-${version}";

    hash = "sha256-O8dXTtpeFs2muwXHuNZsXjr15gWYlPmdjW4aQHwDBpY=";

    hash = "sha256-I0t2ShMkc/zYn7I6Vcd9A31ZAscY0D7cWAdF80NwRGg=";

  };



  offlineCache = fetchYarnDeps {

    yarnLock = "${src}/yarn.lock";

    hash = "sha256-dkATFNjAPhrPbXhcJ/R4eIpcagKEwBSnRfLwqTPIe6c=";

    hash = "sha256-O7oEAjmCEmPpsO/rdkZVhUkxhFzhHpPRbmci3yRBA7g=";

  };



  patchPhase = ''
@@ -72,7 +74,16 @@ stdenv.mkDerivation rec { 
    runHook postInstall

  '';



  passthru.tests.default = nixosTests.incus.ui;

  passthru = {

    tests.default = nixosTests.incus.ui;



    updateScript = nix-update-script {

      extraArgs = [

        "--version-regex"

        "incus-([0-9\\.]+)"

      ];

    };

  };



  meta = {

    description = "Web user interface for Incus";

pkgs/by-name/in/incus/package.nix

+3 −3
Original line number Diff line number Diff line 
import ./generic.nix {

  hash = "sha256-bi++GJLLYlX8JZwmxx4S2EGALuwVOGW4G7u2Nv6s26k=";

  version = "6.9.0";

  vendorHash = "sha256-aYQOKO5RMPqChV6hXPBfSLKdfCuS+BFVmpakJX7swKg=";

  hash = "sha256-uuaJoUrAZ1kSeO2xdXhfdI8Zy4zbA9r1pIhPMqzUios=";

  version = "6.10.1";

  vendorHash = "sha256-/8aBG8RiC03+oVI9lgPFwbi3b4juumziXL4WH0k/4PA=";

  patches = [ ];

  nixUpdateExtraArgs = [

    "--override-filename=pkgs/by-name/in/incus/package.nix"