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
base: ca3231a9f33e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 593062ddc210
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 26, 2018

  1. fetchFromGitLab: Fix grouping issue for group arg

    Issue introduced by c3612b9.
    
    Example output before that commit (witch a random package using
    fetchFromGitLab):
    
    $ nix-instantiate --eval -A hiawatha.src.urls
    [ "https://gitlab.com/api/v4/projects/hsleisink%2Fhiawatha/repository/archive.tar.gz?sha=v10.8.1" ]
    
    After the commit:
    
    $ nix-instantiate --eval -A hiawatha.src.urls
    [ "https://gitlab.com/api/v4/projects/%2Fhsleisink%2Fhiawatha/repository/archive.tar.gz?sha=v10.8.1" ]
    
    And with this very commit, which fixes the issue:
    
    $ nix-instantiate --eval -A hiawatha.src.urls
    [ "https://gitlab.com/api/v4/projects/hsleisink%2Fhiawatha/repository/archive.tar.gz?sha=v10.8.1" ]
    
    The problem was that it has used optionalString in conjunction with "+",
    so the optionalString only applied to the left-hand side of the +
    operator.
    
    Thanks to @ryantm for reporting the issue at:
    
    c3612b9#r220576764
    
    Signed-off-by: aszlig <aszlig@nix.build>
    Reported-by: Ryan Mulligan <ryan@ryantm.com>
    aszlig committed Sep 26, 2018
    Copy the full SHA
    593062d View commit details
    Browse the repository at this point in the history