Unverified Commit f7b91d92 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #288337 from Janik-Haag/alicelg

birdwatcher: 2.2.4 -> 2.2.5 and alice-lg: 6.0.0 -> 6.1.0
parents 1ed4fc5d ba97d1fb
Loading
Loading
Loading
Loading
+5 −6
Original line number Diff line number Diff line
@@ -6,22 +6,21 @@
, yarn
, nodejs
, nixosTests
, git
, prefetch-yarn-deps
}:

buildGoModule rec {
  pname = "alice-lg";
  version = "6.0.0";
  version = "6.1.0";

  src = fetchFromGitHub {
    owner = "alice-lg";
    repo = "alice-lg";
    rev = version;
    hash = "sha256-BdhbHAFqyQc8UbVm6eakbVmLS5QgXhr06oxoc6vYtsM=";
    hash = "sha256-BbwTLHDtpa8HCECIiy+UxyQiLf9iAD2GzE0azXk7QGU=";
  };

  vendorHash = "sha256-SNF46uUTRCaa9qeGCfkHBjyo4BWOlpRaTDq+Uha08y8=";
  vendorHash = "sha256-8N5E1CW5Z7HujwXRsZLv7y4uNOJkjj155kmX9PCjajQ=";

  passthru.ui = stdenv.mkDerivation {
    pname = "alice-lg-ui";
@@ -30,10 +29,10 @@ buildGoModule rec {

    yarnOfflineCache = fetchYarnDeps {
      yarnLock = src + "/ui/yarn.lock";
      hash = "sha256-NeK9IM8E2IH09SVH9lMlV3taCmqwlroo4xzmv4Q01jI=";
      hash = "sha256-PwByNIegKYTOT8Yg3nDMDFZiLRVkbX07z99YaDiBsIY=";
    };

    nativeBuildInputs = [ nodejs yarn git prefetch-yarn-deps ];
    nativeBuildInputs = [ nodejs yarn prefetch-yarn-deps ];
    configurePhase = ''
      runHook preConfigure

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@

buildGoModule rec {
  pname = "birdwatcher";
  version = "2.2.4";
  version = "2.2.5";

  vendorHash = "sha256-NTD2pnA/GeTn4tXtIFJ227qjRtvBFCjWYZv59Rumc74=";

@@ -13,7 +13,7 @@ buildGoModule rec {
    owner = "alice-lg";
    repo = "birdwatcher";
    rev = version;
    hash = "sha256-nsmwq7aUcozpp3av38S9wTKv0kiGfmyglQgse9MWSl4=";
    hash = "sha256-TTU5TYWD/KSh/orDdQnNrQJ/G7z5suBu7psF9V6AAIw=";
  };

  deleteVendor = true;