Skip to content
This repository was 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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2f06e04b74e0
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 56fad146a12a
Choose a head ref
  • 18 commits
  • 23 files changed
  • 12 contributors

Commits on Jun 8, 2018

  1. nixos: Add option networking.networkmanager.dynamicHosts 

    This allows non-privileged users to configure local DNS
entries by editing hosts files read by NetworkManager's dnsmasq
instance.
    @rickynils
    rickynils committed Jun 8, 2018
    Copy the full SHA
    e6c3d5a View commit details

Commits on Jun 30, 2018

  1. llvm6: 6.0.0 -> 6.0.1 

    (cherry picked from commit 4a8104a)

Pick wasn't entirely clean, required touchup because on master
compiler-rt is split into separate expression (and file),
which just meant the hash to update was in default.nix instead :).
    @dtzWill
    dtzWill committed Jun 30, 2018

    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
    2817cf2 View commit details

  2. llvm_6: refresh sanitizers-non-gnu patch 

    (cherry picked from commit 8cd268a)
    @dtzWill
    dtzWill committed Jun 30, 2018
    Copy the full SHA
    73ef59e View commit details

  3. tor-browser-bundle-bin: 7.5.5 -> 7.5.6 

    (cherry picked from commit 3e6eb94)
    @dtzWill @joachifm
    dtzWill authored and joachifm committed Jun 30, 2018
    Copy the full SHA
    2c22f9b View commit details

Commits on Jul 1, 2018

  1. multimc: 0.6.1 -> 0.6.2 

    (cherry picked from commit c52beb1)
    @Madouura @worldofpeace
    Madouura authored and worldofpeace committed Jul 1, 2018
    Copy the full SHA
    5bae582 View commit details

  2. multimc: create compatibility symlink to fix desktop icon 

    (cherry picked from commit be47f95)
    @worldofpeace
    Kevin Liu authored and worldofpeace committed Jul 1, 2018
    Copy the full SHA
    7749573 View commit details

Commits on Jul 2, 2018

  1. dbeaver: 5.1.1 -> 5.1.2 

    (cherry picked from commit 964fde7)
    @samueldr
    samueldr committed Jul 2, 2018
    Copy the full SHA
    24ebe96 View commit details

  2. Merge pull request #42853 from samueldr/auto/dbeaver/nixos-18.03/5.1.2 

    dbeaver: 5.1.1 -> 5.1.2 (18.03)
    @srhb
    srhb authored Jul 2, 2018
    Copy the full SHA
    cf204a7 View commit details

  3. buildRustCrate: Set target_os to "macos" on darwin 

    The rust compiler uses "macos" as "target_os" conditional on Mac OS[1]

[1] https://github.com/rust-lang/rust/blob/8e7a609e635b728eba65d471c985ab462dc4cfc7/src/librustc_back/target/x86_64_apple_darwin.rs#L29

(cherry picked from commit bdf031d)
    @marsam @shlevy
    marsam authored and shlevy committed Jul 2, 2018
    Copy the full SHA
    c688452 View commit details

  4. ghc: add version 8.4.3 

    (cherry picked from commit deeeb50)
Signed-off-by: Domen Kožar <domen@dev.si>
    @peti @domenkozar
    peti authored and domenkozar committed Jul 2, 2018
    Copy the full SHA
    949bddf View commit details

Commits on Jul 3, 2018

  1. Merge pull request #41715 from rickynils/networkmanager-dynamichosts 

    nixos: Add option networking.networkmanager.dynamicHosts
    @rickynils
    rickynils authored Jul 3, 2018
    Copy the full SHA
    dad6f73 View commit details

  2. nixos: Fix error in assertion (introduced by #41715)

    @rickynils
    rickynils committed Jul 3, 2018
    Copy the full SHA
    5a56600 View commit details

  3. linux: 4.4.138 -> 4.4.139 

    (cherry picked from commit e7270cbf16caa61b6bb51c9b7e8dc228a6f6b8ab)
    @NeQuissimus
    NeQuissimus committed Jul 3, 2018
    Copy the full SHA
    923fd70 View commit details

  4. linux: 4.9.110 -> 4.9.111 

    (cherry picked from commit 389d8b28ec3221d49f74448957a12242018ff8d2)
    @NeQuissimus
    NeQuissimus committed Jul 3, 2018
    Copy the full SHA
    20c0898 View commit details

  5. linux: 4.14.52 -> 4.14.53 

    (cherry picked from commit d5b62b1575744b1b67339cafbea6df3d076a76fa)
    @NeQuissimus
    NeQuissimus committed Jul 3, 2018
    Copy the full SHA
    c8bdf68 View commit details

  6. Merge pull request #42825 from dtzWill/update/llvm-6.0.1-staging-18.03 

    llvm6: 6.0.0 -> 6.0.1 (18.03 edition)
    @dtzWill
    dtzWill authored Jul 3, 2018
    Copy the full SHA
    330ba50 View commit details

  7. Merge pull request #42847 from worldofpeace/multimc-picked 

     multimc: create compatibility symlink to fix desktop icon (18.03)
    @infinisil
    infinisil authored Jul 3, 2018
    Copy the full SHA
    244c2db View commit details

Commits on Jul 4, 2018

  1. ghc: fix dylib load command limits in compiler version 8.x 

    See https://phabricator.haskell.org/D4714 for the full details.
This will be part of ghc 8.6.

Closes NixOS/nixpkgs#40877.

(cherry picked from commit 4b2ecea)
Signed-off-by: Domen Kožar <domen@dev.si>
    @angerman @domenkozar
    angerman authored and domenkozar committed Jul 4, 2018
    Copy the full SHA
    56fad14 View commit details
Loading