-
-
Save delroth/e7b67c8cc514a9de62f6c53656d1c96a to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh | |
index 4a222de26bb..9bba0243aaa 100644 | |
--- a/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh | |
+++ b/pkgs/build-support/node/build-npm-package/hooks/npm-install-hook.sh | |
@@ -27,7 +27,7 @@ npmInstallHook() { | |
local -r nodeModulesPath="$packageOut/node_modules" | |
if [ ! -d "$nodeModulesPath" ]; then | |
- npm prune --omit dev | |
+ #NODE_ENV=production npm prune | |
find node_modules -maxdepth 1 -type d -empty -delete | |
cp -r node_modules "$nodeModulesPath" | |
diff --git a/pkgs/build-support/node/fetch-npm-deps/src/main.rs b/pkgs/build-support/node/fetch-npm-deps/src/main.rs | |
index 097148fef82..bb663ebd838 100644 | |
--- a/pkgs/build-support/node/fetch-npm-deps/src/main.rs | |
+++ b/pkgs/build-support/node/fetch-npm-deps/src/main.rs | |
@@ -29,6 +29,7 @@ struct OldPackage { | |
resolved: Option<String>, | |
integrity: Option<String>, | |
dependencies: Option<HashMap<String, OldPackage>>, | |
+ bundled: Option<bool>, | |
} | |
#[derive(Deserialize)] | |
@@ -43,6 +44,10 @@ fn to_new_packages( | |
let mut new = HashMap::new(); | |
for (name, package) in old_packages { | |
+ if package.bundled.unwrap_or(false) { | |
+ continue; | |
+ } | |
+ | |
new.insert( | |
format!("{name}-{}", package.version), | |
Package { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
{ lib, buildNpmPackage, fetchFromGitHub, python3 }: | |
buildNpmPackage rec { | |
pname = "etherpad-lite"; | |
version = "1.8.18"; | |
src = fetchFromGitHub { | |
owner = "ether"; | |
repo = pname; | |
rev = version; | |
hash = "sha256-FziTdHmZ7DgWlSd7AhRdZioQNEPmiGZFHjc8pwnpKIo="; | |
}; | |
npmDepsHash = "sha256-U7Yz+WBzlNx2Ch2N8tetBivQPbmuMEzsC+LofdDUZtA="; | |
nativeBuildInputs = [ python3 ]; | |
patches = [ ./sqlite3-github-url.patch ]; | |
sourceRoot = "source/src"; | |
dontNpmBuild = true; | |
meta = with lib; { | |
description = "A modern really-real-time collaborative document editor"; | |
homepage = "https://etherpad.org/"; | |
license = licenses.asl20; | |
maintainers = with maintainers; [ delroth ]; | |
}; | |
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/package-lock.json b/package-lock.json | |
index 6e70f432..d81b6ef0 100644 | |
--- a/package-lock.json | |
+++ b/package-lock.json | |
@@ -8069,8 +8069,8 @@ | |
"integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==" | |
}, | |
"sqlite3": { | |
- "version": "github:mapbox/node-sqlite3#593c9d498be2510d286349134537e3bf89401c4a", | |
- "from": "github:mapbox/node-sqlite3#593c9d498be2510d286349134537e3bf89401c4a", | |
+ "version": "https://codeload.github.com/mapbox/node-sqlite3/tar.gz/593c9d498be2510d286349134537e3bf89401c4a", | |
+ "from": "https://codeload.github.com/mapbox/node-sqlite3/tar.gz/593c9d498be2510d286349134537e3bf89401c4a", | |
"optional": true, | |
"requires": { | |
"@mapbox/node-pre-gyp": "^1.0.0", | |
@@ -8585,7 +8585,7 @@ | |
"redis": "^3.1.2", | |
"rethinkdb": "^2.4.2", | |
"simple-git": "^3.6.0", | |
- "sqlite3": "github:mapbox/node-sqlite3#593c9d498be2510d286349134537e3bf89401c4a" | |
+ "sqlite3": "https://codeload.github.com/mapbox/node-sqlite3/tar.gz/593c9d498be2510d286349134537e3bf89401c4a" | |
}, | |
"dependencies": { | |
"async": { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment