Unverified Commit 8a583cc8 authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

Merge pull request #290959 from adamcstephens/incus/0.6

incus.unwrapped: 0.5.1 -> 0.6.0
parents 6b834b5e d6e0a220
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -3,12 +3,13 @@

  lib,
  buildGoModule,
  fetchpatch,
  fetchFromGitHub,
  installShellFiles,
}:
let
  releaseFile = if lts then ./lts.nix else ./latest.nix;
  inherit (import releaseFile) version hash vendorHash;
  inherit (import releaseFile { inherit fetchpatch; }) version hash vendorHash;
in

buildGoModule rec {
+10 −3
Original line number Diff line number Diff line
{ fetchpatch }:
{
  hash = "sha256-3eWkQT2P69ZfN62H9B4WLnmlUOGkpzRR0rctgchP+6A=";
  version = "0.5.1";
  vendorHash = "sha256-2ZJU7WshN4UIbJv55bFeo9qiAQ/wxu182mnz7pE60xA=";
  hash = "sha256-tGuAS0lZvoYb+TvmCklQ8TADZhbm4w/lhdI0ycS4/0o=";
  version = "0.6.0";
  vendorHash = "sha256-+WmgLOEBJ/7GF596iiTgyTPxn8l+hE6RVqjLKfCi5rs=";
  patches = [
    (fetchpatch {
      url = "https://github.com/lxc/incus/pull/529.patch";
      hash = "sha256-2aaPrzW/LVJidWeom0rqYOGpT2gvuV1yHLJN/TwQ1fk=";
    })
  ];
}
+1 −1
Original line number Diff line number Diff line
# this release doesn't exist yet, but satisfay the by-name checks
# will be added as incus-lts in all-packages.nix once ready
{ }
_: { }
+9 −3
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@

  lib,
  buildGoModule,
  fetchpatch,
  fetchFromGitHub,
  writeShellScript,
  acl,
@@ -19,14 +20,19 @@

let
  releaseFile = if lts then ./lts.nix else ./latest.nix;
  inherit (import releaseFile) version hash vendorHash;
  inherit (import releaseFile { inherit fetchpatch; })
    version
    hash
    patches
    vendorHash
    ;
  name = "incus${lib.optionalString lts "-lts"}";
in

buildGoModule rec {
buildGoModule {
  pname = "${name}-unwrapped";

  inherit vendorHash version;
  inherit patches vendorHash version;

  src = fetchFromGitHub {
    owner = "lxc";