nix: stdenv.lib => lib

+ debug output in release.nix
johannesloetzsch · Jan 25, 2022 · 07d32f8 · 07d32f8
1 parent 838b2d9
commit 07d32f8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.circleci/nix/tools/release.nix b/.circleci/nix/tools/release.nix
@@ -1,7 +1,7 @@
 { pkgs }:
 (pkgs.writeScriptBin "deploy" ''
   #!${pkgs.runtimeShell} -e
-  export PATH="${pkgs.stdenv.lib.makeBinPath (with pkgs; [github-release])}"
+  export PATH="${pkgs.lib.makeBinPath (with pkgs; [github-release])}"
 
   ## $GITHUB_TOKEN must be a `personal access token` with scope `public_repo`.
   ## The owner of the token must be projekt owner of the repo.
@@ -14,10 +14,13 @@
   export FILE="$1"
   export NAME="$2"
 
+  echo "Delete an old release in case it exists…"
   if github-release info -t $TAG ; then
      github-release delete -t $TAG
   fi
+  echo "Create a new release…"
   github-release release -t $TAG
 
+  echo "Upload Artifacts"
   github-release upload -t $TAG -f "$FILE" -n "$NAME"
 '')
diff --git a/backend/nix/swlkup-backend.nix b/backend/nix/swlkup-backend.nix
@@ -8,7 +8,7 @@ let
 
   mavenRepository = buildMavenRepositoryFromLockFile { file = ./deps/mvn2nix-lock.json; };
 
-  src = stdenv.mkDerivation {
+  src = mkDerivation {
     name = "swlkup-backend-src";
     src = lib.cleanSource ./..;
     installPhase = ''

diff --git a/frontend/nix/swlkup-frontend.nix b/frontend/nix/swlkup-frontend.nix
@@ -1,7 +1,7 @@
 {pkgs ? import <nixpkgs> {},
  nodejs ? pkgs.nodejs-12_x,
- stdenv ? pkgs.stdenv,
  lib ? pkgs.lib,
+ stdenv ? pkgs.stdenv,
  ...}:
 
 let