diff options
Diffstat (limited to 'pkgs/development/tools/continuous-integration')
-rw-r--r-- | pkgs/development/tools/continuous-integration/github-runner/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/tools/continuous-integration/laminar/default.nix | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 239d0c3430b..1b95903c601 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -241,6 +241,11 @@ stdenv.mkDerivation rec { ln -s ${nodejs-12_x} $out/externals/node12 ln -s ${nodejs-16_x} $out/externals/node16 + # Install Nodejs scripts called from workflows + install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/hashFiles/index.js + mkdir -p $out/lib/checkScripts + install src/Misc/layoutbin/checkScripts/* $out/lib/checkScripts/ + runHook postInstall ''; diff --git a/pkgs/development/tools/continuous-integration/laminar/default.nix b/pkgs/development/tools/continuous-integration/laminar/default.nix index dc1eac59ced..05f96c0695b 100644 --- a/pkgs/development/tools/continuous-integration/laminar/default.nix +++ b/pkgs/development/tools/continuous-integration/laminar/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchFromGitHub , cmake , capnproto , sqlite @@ -25,9 +26,11 @@ let in stdenv.mkDerivation rec { pname = "laminar"; version = "1.1"; - src = fetchurl { - url = "https://github.com/ohwgiles/laminar/archive/${version}.tar.gz"; - sha256 = "1lzfmfjygmbdr2n1q49kwwffw8frz5y6iczhdz5skwmzwg0chbsf"; + src = fetchFromGitHub { + owner = "ohwgiles"; + repo = "laminar"; + rev = version; + sha256 = "sha256-9JiFO5Vi/NT/o7v/KXZw3/P5s5qQwmQXjrQq+uUXHQk="; }; patches = [ ./patches/no-network.patch ]; nativeBuildInputs = [ cmake pandoc ]; |