Unverified Commit 23cbcfad authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

Merge pull request #333489 from emilylange/forgejo 

forgejo: 8.0.0 -> 8.0.1, forgejo-lts: 7.0.6 -> 7.0.7, forgejo,forgejo-lts: fix passthru.updateScript
parents bdcd19ef d674ed6f

pkgs/by-name/fo/forgejo/generic.nix

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
, hash

, npmDepsHash

, vendorHash

, nixUpdateExtraArgs ? [ ]

}:



{ bash
@@ -154,7 +155,7 @@ buildGoModule rec { 
    '';



    tests = if lts then nixosTests.forgejo-lts else nixosTests.forgejo;

    updateScript = nix-update-script { };

    updateScript = nix-update-script { extraArgs = nixUpdateExtraArgs; };

  };



  meta = {

pkgs/by-name/fo/forgejo/lts.nix

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

  version = "7.0.6";

  hash = "sha256-Y8H85HMKnzNSXnrLOxhzOBSfedivGvcQ3MOAp31Kvno=";

  version = "7.0.7";

  hash = "sha256-Xk5ElAfTjbz77Jv5VMbSW7q8qJ5vhNd3daNilNzDsY4=";

  npmDepsHash = "sha256-OqtYRjftwGxgW1JgMxyWd+9DndpEkd3LdQHSECc40yU=";

  vendorHash = "sha256-hfbNyCQMQzDzJxFc2MPAR4+v/qNcnORiQNbwbbIA4Nw=";

  lts = true;

  nixUpdateExtraArgs = [

    "--version-regex"

    "v(7\.[0-9.]+)"

    "--override-filename"

    "pkgs/by-name/fo/forgejo/lts.nix"

  ];

}

pkgs/by-name/fo/forgejo/package.nix

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

  version = "8.0.0";

  hash = "sha256-ol/2D+zMieERVDHOKlu+wm3WKkQNjbIw0sc0KLUTwzI=";

  version = "8.0.1";

  hash = "sha256-0D2ntZVK4k5AwAMg4XnLyabnxAoHx9JjBoFAdkfrdAY=";

  npmDepsHash = "sha256-6AMaZadgcTvOBsIXJjZQB6Q1rkdn+R82pclXdVvtdWY=";

  vendorHash = "sha256-tNb0tCf+gjUmUqrjkzt7Wqqz21hW9WRh8CEdX8rv8Do=";

  lts = false;

  nixUpdateExtraArgs = [

    "--override-filename"

    "pkgs/by-name/fo/forgejo/package.nix"

  ];

}