public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

yarn2nix-moretea: v1.0.0-36-g3f2dbb0 -> v1.0.0-39-g9e7279e (#73911)

Browse Source 
Includes the following upstream commits:

- Fix for package.json without a version (moretea/yarn2nix#113)
- Don't access package.json via filtered src (moretea/yarn2nix#115)
- remove redundant rec (moretea/yarn2nix#119)
This commit is contained in:
Milan 2019-11-22 15:27:11 +01:00 committed by zimbatm
parent 0ed2e5eba6
commit ed90e59fc2
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/yarn2nix-moretea/fetch-source.nix
View File

@ -5,6 +5,6 @@
fetchFromGitHub { fetchFromGitHub {
owner = "moretea"; owner = "moretea";
repo = "yarn2nix"; repo = "yarn2nix";
rev = "3f2dbb08724bf8841609f932bfe1d61a78277232"; rev = "9e7279edde2a4e0f5ec04c53f5cd64440a27a1ae";
sha256 = "142av7dwviapsnahgj8r6779gs2zr17achzhr8b97s0hsl08dcl2"; sha256 = "0zz2lrwn3y3rb8gzaiwxgz02dvy3s552zc70zvfqc0zh5dhydgn7";
} }

7
pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
View File

@ -238,7 +238,7 @@ in rec {
package = lib.importJSON packageJSON; package = lib.importJSON packageJSON;
pname = package.name; pname = package.name;
safeName = reformatPackageName pname; safeName = reformatPackageName pname;
version = package.version; version = package.version or attrs.version;
baseName = unlessNull name "${safeName}-${version}"; baseName = unlessNull name "${safeName}-${version}";
workspaceDependenciesTransitive = lib.unique ( workspaceDependenciesTransitive = lib.unique (
@ -389,6 +389,11 @@ in rec {
# yarn2nix is the only package that requires the yarnNix option. # yarn2nix is the only package that requires the yarnNix option.
# All the other projects can auto-generate that file. # All the other projects can auto-generate that file.
yarnNix = ./yarn.nix; yarnNix = ./yarn.nix;
# Using the filter above and importing package.json from the filtered
# source results in an error in restricted mode. To circumvent this,
# we import package.json from the unfiltered source
packageJSON = ./package.json;
yarnFlags = defaultYarnFlags ++ ["--production=true"]; yarnFlags = defaultYarnFlags ++ ["--production=true"];