Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: 173a5408d2ac
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 1d9d31a0eb8e
Choose a head ref
  • 8 commits
  • 5 files changed
  • 5 contributors

Commits on Jul 19, 2019

  1. lib: allow sourceByRegex to be composed after cleanSourceWith

    `sourceByRegex src regexes` should include a source file if one of the
    regular expressions `regexes` matches the path of that file relative
    to `src`.
    
    However to compute this relative path `sourceByRegex` uses:
    
    ```
    relPath = lib.removePrefix (toString src + "/") (toString path);
    ```
    
    Note that `toString path` evaluates to an absolute file somewhere
    under `src` and not under `/nix/store`.
    
    The problem is that this doesn't work if `src` is a `cleanSourceWith`
    invocation as well because `toString src` will then evaluate to
    `src.outPath` which will evaluate to `builtins.filterSource ...` which
    evaluates to a path in `/nix/store` which is not a prefix of `path`.
    
    The solution is to replace `src` with `origSrc` where
    
    ```
    origSrc = if isFiltered then src.origSrc else src;
    isFiltered = src ? _isLibCleanSourceWith;
    ```
    
    Test this by executing the following from the nixpkgs repo:
    
    ```
    (cat << 'EOI'
    let
      pkgs = import ./. {};
    in pkgs.runCommand "test-sourceByRegex" {
      test_sourceByRegex =
        let
          src1 = pkgs.lib.sourceByRegex ./.  [ "^test-sourceByRegex.nix$" ];
          src2 = pkgs.lib.sourceByRegex src1 [ "^test-sourceByRegex.nix$" ];
        in src2 + "/test-sourceByRegex.nix";
    } ''
     cp $test_sourceByRegex $out
    ''
    EOI
    ) > test-sourceByRegex.nix
    nix-build test-sourceByRegex.nix
    ```
    basvandijk committed Jul 19, 2019
    Copy the full SHA
    58ea28e View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2019

  1. jsondiff: 1.1.2 -> 1.2.0

    kalbasit committed Jul 25, 2019
    Copy the full SHA
    c555bc3 View commit details
    Browse the repository at this point in the history
  2. jsondiff: patch setup.py to prevent creating bin/jsondiff

    pythonPackages.jsonpatch also creates bin/jsondiff, and packages
    depending on both are not usable.
    kalbasit committed Jul 25, 2019
    Copy the full SHA
    d99c6cc View commit details
    Browse the repository at this point in the history
  3. bazel-remote: mark as broken

    abbradar authored and Profpatsch committed Jul 25, 2019
    Copy the full SHA
    969aec3 View commit details
    Browse the repository at this point in the history
  4. bazel-deps: 2019-02-01 -> 2019-07-11, mark as broken

    Also drop preInstall cleanup for dependencies. The reason is while it's more
    thorough than default cleanup in buildBazelPackage if such a problem happens we
    should fix buildBazelPackage instead. Perhaps even move this (awesome!) snippet
    there but it's very slow-running so we'd rather attempt to fix it in other
    ways.
    
    Anyway after an update at least .deps build, checked with `nix-build -A --check`.
    abbradar authored and Profpatsch committed Jul 25, 2019
    Copy the full SHA
    7b82853 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #65316 from kalbasit/nixpkgs_fix-moto-collision

    moto: fix colliding dependencies
    kalbasit committed Jul 25, 2019
    Copy the full SHA
    6b89e87 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #65083 from basvandijk/fix-composability-of-source…

    …ByRegex
    
    lib: allow sourceByRegex to be composed after cleanSourceWith
    edolstra committed Jul 25, 2019
    Copy the full SHA
    4914a82 View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    1d9d31a View commit details
    Browse the repository at this point in the history