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

Merge pull request #104735 from thiagokokada/flood-init-2nd-try

Browse Source 
flood: init at 4.2.0
This commit is contained in:
Sandro 2020-12-02 12:52:08 +01:00 committed by GitHub
commit ffe9244ee6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 605 additions and 475 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/node-packages/default.nix
View File

@ -59,6 +59,10 @@ let
buildInputs = [ pkgs.phantomjs2 ]; buildInputs = [ pkgs.phantomjs2 ];
}; };
flood = super.flood.override {
buildInputs = [ self.node-pre-gyp ];
};
expo-cli = super."expo-cli".override (attrs: { expo-cli = super."expo-cli".override (attrs: {
# The traveling-fastlane-darwin optional dependency aborts build on Linux. # The traveling-fastlane-darwin optional dependency aborts build on Linux.
dependencies = builtins.filter (d: d.packageName != "@expo/traveling-fastlane-${if stdenv.isLinux then "darwin" else "linux"}") attrs.dependencies; dependencies = builtins.filter (d: d.packageName != "@expo/traveling-fastlane-${if stdenv.isLinux then "darwin" else "linux"}") attrs.dependencies;

1
pkgs/development/node-packages/node-packages.json
View File

@ -80,6 +80,7 @@
, {"fast-cli": "1.x"} , {"fast-cli": "1.x"}
, "fauna-shell" , "fauna-shell"
, "fkill-cli" , "fkill-cli"
, "flood"
, "forever" , "forever"
, "fx" , "fx"
, "get-graphql-schema" , "get-graphql-schema"

1073
pkgs/development/node-packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

2
pkgs/top-level/all-packages.nix
View File

@ -1174,6 +1174,8 @@ in
fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { }; fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { };
flood = nodePackages.flood;
fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { };
genpass = callPackage ../tools/security/genpass { genpass = callPackage ../tools/security/genpass {