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: d5c26dd063b6
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: a74969256b0a
Choose a head ref
  • 5 commits
  • 7 files changed
  • 5 contributors

Commits on Apr 3, 2018

  1. tectonic: fix darwin build

    (cherry picked from commit 8f2102d)
    mbode authored and LnL7 committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    cbccde9 View commit details
    Browse the repository at this point in the history
  2. nixos/version: fix nixops pre 1.6 compatibility

    We should be able to deploy a NixOS 18.03 system with the current nixops
    stable release. Some options were renamed, so instead of
    `mkRenamedOptionModule` we introduce them as read-only interal options
    that won't be rendered in the manual.
    
    Only the options that are needed to make nixops evaluations succeed were
    added.
    
    This commit should probably be reverted after or before the 18.09 release,
    depending on the nixops 1.6 release.
    
    The user will not get the warning that these have been renamed but
    this change is mentioned in the release notes.
    
    Fixes #34253.
    
    (cherry picked from commit 70c6f65)
    fpletz committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    ca6b64a View commit details
    Browse the repository at this point in the history
  3. openjdk10: Use included cacerts

    (cherry picked from commit a415963ef7464d7ce8f9c73684728625e83d8d63)
    NeQuissimus committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    e4cc8c1 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2018

  1. 18.03 release notes: final edits

    (cherry picked from commit 0bee079)
    vcunat committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    120b013 View commit details
    Browse the repository at this point in the history
  2. svn-all-fast-export: update patch sha256, --prefix is now used

    also, rename to svn-all-fast-export, but keep an alias to the old name
    
    (cherry picked from commit 594130f)
    flokli authored and Mic92 committed Apr 4, 2018
    Configuration menu
    Copy the full SHA
    a749692 View commit details
    Browse the repository at this point in the history