Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 99fa7616c060
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0b8799ecaaf0
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 9, 2020

  1. yarn2nix-moretea: re-add support for git:// URLs from yarn.lock 

    @lheckemann already added it to `yarn2nix` a while ago[1], but it seems
as it was forgotten to include when adding `yarn2nix` sources to
`nixpkgs` itself.

Without this patch, you cannot add dependencies to your `package.json`
with URLs like `git://github.com/.../` as building the expression would
fail like this:

```
curl: (1) Protocol "git" not supported or disabled in libcurl
error: cannot download git___github.com_sstur_nodeftpd.git from any mirror
```

Co-authored-by: Linus Heckemann <git@sphalerite.org>

[1] nix-community/yarn2nix#141

(cherry picked from commit 0c49f18)
    @Ma27
    Ma27 committed Oct 9, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0b8799e View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js
2 changes: 1 addition & 1 deletion pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/generateNix.js
View file
Original file line number Diff line number Diff line change
@@ -80,7 +80,7 @@ function fetchLockedDep(builtinFetchGit) {

const fileName = urlToName(url)

if (url.startsWith('git+')) {
if (url.startsWith('git+') || url.startsWith("git:")) {
const rev = sha1OrRev

const [_, branch] = nameWithVersion.split('#')