-
-
Notifications
You must be signed in to change notification settings - Fork 104
Comparing changes
Open a pull request
base repository: NixOS/nixpkgs-channels
base: 173a5408d2ac
head repository: NixOS/nixpkgs-channels
compare: 1d9d31a0eb8e
- 8 commits
- 5 files changed
- 5 contributors
Commits on Jul 19, 2019
-
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 ```
Configuration menu - View commit details
-
Copy full SHA for 58ea28e - Browse repository at this point
Copy the full SHA 58ea28eView commit details
Commits on Jul 25, 2019
-
Configuration menu - View commit details
-
Copy full SHA for c555bc3 - Browse repository at this point
Copy the full SHA c555bc3View commit details -
jsondiff: patch setup.py to prevent creating bin/jsondiff
pythonPackages.jsonpatch also creates bin/jsondiff, and packages depending on both are not usable.
Configuration menu - View commit details
-
Copy full SHA for d99c6cc - Browse repository at this point
Copy the full SHA d99c6ccView commit details -
Configuration menu - View commit details
-
Copy full SHA for 969aec3 - Browse repository at this point
Copy the full SHA 969aec3View commit details -
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`.
Configuration menu - View commit details
-
Copy full SHA for 7b82853 - Browse repository at this point
Copy the full SHA 7b82853View commit details -
Merge pull request #65316 from kalbasit/nixpkgs_fix-moto-collision
moto: fix colliding dependencies
Configuration menu - View commit details
-
Copy full SHA for 6b89e87 - Browse repository at this point
Copy the full SHA 6b89e87View commit details -
Merge pull request #65083 from basvandijk/fix-composability-of-source…
…ByRegex lib: allow sourceByRegex to be composed after cleanSourceWith
Configuration menu - View commit details
-
Copy full SHA for 4914a82 - Browse repository at this point
Copy the full SHA 4914a82View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1d9d31a - Browse repository at this point
Copy the full SHA 1d9d31aView commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff 173a5408d2ac...1d9d31a0eb8e