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: e953d314a89c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d68322504a53
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jul 19, 2018

  1. Revert "release: disallow aliases" 

    This reverts commit 25c42e7.

This commit is still causing evaluation errors (despite passing
OfBorg!)

Here is the current error:

error: undefined variable 'Log4Perl' at
/nix/store/n0gwyv3mcvm3hc9jrmkxjhmsrdjqzcqb-source/maintainers/scripts/nix-generate-from-cpan.nix:7:71

More investigation is needed

/cc @volth
    @matthewbauer
    matthewbauer committed Jul 19, 2018
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d683225 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/top-level/release.nix
2 changes: 1 addition & 1 deletion pkgs/top-level/release.nix
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
# Strip most of attributes when evaluating to spare memory usage
, scrubJobs ? true
# Attributes passed to nixpkgs. Don't build packages marked as unfree.
, nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; allowAliases = false; }; }
, nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }
}:

with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; };