diff options
author | Robert Schütz <nix@dotlambda.de> | 2023-09-03 21:22:27 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-03 21:22:27 +0000 |
commit | c021404209bb175a2101d8d0683004a173dde6cf (patch) | |
tree | 4ac5308bcbddf88ccb4ece9d9277981743bff970 | |
parent | a14805afa3d0c7565dc84c5e4feffef5942d7b56 (diff) | |
parent | fbe9753456c935aea340bed1fe1f893d1658f953 (diff) |
Merge pull request #250056 from dotlambda/degit-buildNpmPackage
degit: use buildNpmPackage
-rw-r--r-- | pkgs/applications/version-management/degit/default.nix | 26 | ||||
-rw-r--r-- | pkgs/development/node-packages/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/development/node-packages/node-packages.json | 1 | ||||
-rw-r--r-- | pkgs/development/node-packages/node-packages.nix | 18 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
5 files changed, 29 insertions, 19 deletions
diff --git a/pkgs/applications/version-management/degit/default.nix b/pkgs/applications/version-management/degit/default.nix new file mode 100644 index 0000000000000..af586da3496ae --- /dev/null +++ b/pkgs/applications/version-management/degit/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "degit"; + version = "2.8.4"; + + src = fetchFromGitHub { + owner = "Rich-Harris"; + repo = "degit"; + rev = "v${version}"; + hash = "sha256-Vw/gtmKywi5faSCs7Wek80nmnqcPHXlQarD5qMwlsQE="; + }; + + npmDepsHash = "sha256-42cM31C2c1Gr7HWOowMUTEUEyL0mGnyl5fyQECcz1Sw="; + + meta = { + changelog = "https://github.com/Rich-Harris/degit/blob/${src.rev}/CHANGELOG.md"; + description = "Make copies of git repositories"; + homepage = "https://github.com/Rich-Harris/degit"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kidonng ]; + }; +} diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 40036cc622bb7..21252011ad809 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -60,6 +60,7 @@ mapAliases { inherit (pkgs) configurable-http-proxy; # added 2023-08-19 inherit (pkgs) cordova; # added 2023-08-18 dat = throw "dat was removed because it was broken"; # added 2023-08-21 + inherit (pkgs) degit; # added 2023-08-18 inherit (pkgs) dockerfile-language-server-nodejs; # added 2023-08-18 eask = pkgs.eask; # added 2023-08-17 inherit (pkgs.elmPackages) elm-test; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c1715443b9ffc..c6f44444b3872 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -100,7 +100,6 @@ , "create-react-native-app" , "cspell" , "csslint" -, "degit" , "dhcp" , "diagnostic-languageserver" , "diff2html-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 503cfdfdd3186..60911c9759ede 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -81161,24 +81161,6 @@ in bypassCache = true; reconstructLock = true; }; - degit = nodeEnv.buildNodePackage { - name = "degit"; - packageName = "degit"; - version = "2.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/degit/-/degit-2.8.4.tgz"; - sha512 = "vqYuzmSA5I50J882jd+AbAhQtgK6bdKUJIex1JNfEUPENCgYsxugzKVZlFyMwV4i06MmnV47/Iqi5Io86zf3Ng=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Straightforward project scaffolding"; - homepage = "https://github.com/Rich-Harris/degit#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; dhcp = nodeEnv.buildNodePackage { name = "dhcp"; packageName = "dhcp"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3cd7b7f086ad..052e144032dc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2160,6 +2160,8 @@ with pkgs; darcs-to-git = callPackage ../applications/version-management/darcs-to-git { }; + degit = callPackage ../applications/version-management/degit { }; + delta = darwin.apple_sdk_11_0.callPackage ../applications/version-management/delta { }; diff-so-fancy = callPackage ../applications/version-management/diff-so-fancy { }; |