diff options
| author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-06-14 13:15:32 +0200 |
|---|---|---|
| committer | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-06-14 13:15:32 +0200 |
| commit | 36de2caebf0c15ecd499419e880ab2b09d26e58d (patch) | |
| tree | a67da845f5ff9f1e437f78292b369366037a2e6e | |
| parent | 151c530b65228892cf7d76d1edfc5796b9e225a7 (diff) | |
chore: deal with stdenv.lib removal
| -rw-r--r-- | likely-music-backend.nix | 6 | ||||
| -rw-r--r-- | web/default.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/likely-music-backend.nix b/likely-music-backend.nix index b5101bf..4716193 100644 --- a/likely-music-backend.nix +++ b/likely-music-backend.nix @@ -1,6 +1,6 @@ { mkDerivation, aeson, base, bytestring, containers, directory -, Euterpea, filepath, HCodecs, PortMidi, process, random, servant -, servant-server, stdenv, text, wai, wai-app-static, warp +, Euterpea, filepath, HCodecs, lib, PortMidi, process, random +, servant, servant-server, text, wai, wai-app-static, warp }: mkDerivation { pname = "likely-music"; @@ -16,5 +16,5 @@ mkDerivation { HCodecs process random servant servant-server text wai wai-app-static warp ]; - license = stdenv.lib.licenses.agpl3; + license = lib.licenses.agpl3Only; } diff --git a/web/default.nix b/web/default.nix index f55703d..5f73366 100644 --- a/web/default.nix +++ b/web/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, callPackage, yarn +{ stdenv, lib, fetchFromGitHub, callPackage, yarn , production ? true }: let target = if production then "prod" else "dev"; - pkgInfo = stdenv.lib.importJSON ./package.json; + pkgInfo = lib.importJSON ./package.json; src = yarn2nix-lib.removePrefixes [ "node_modules" "dist" ] ./.; # yarn2nixSrc = /home/lukas/src/nix/yarn2nix; yarn2nixSrc = fetchFromGitHub { @@ -21,7 +21,7 @@ let inherit (pkgInfo) name; dependencies = calledTemplate.nodeBuildInputs; }; - yarnFlags = stdenv.lib.escapeShellArgs [ "--offline" "--frozen-lockfile" ]; + yarnFlags = lib.escapeShellArgs [ "--offline" "--frozen-lockfile" ]; in |