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: 4e8f32012384
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 67b6e5639126
Choose a head ref
  • 7 commits
  • 6 files changed
  • 1 contributor

Commits on Jul 21, 2020

  1. ios-deploy: move out of nodePackages 

    This doesn’t need nodePackages to work, so we can move it to
pkgs/os-specific/darwin. Note that it still requires xcodebuild to
work.
    @matthewbauer
    matthewbauer committed Jul 21, 2020
    Copy the full SHA
    10aa776 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2020

  1. undmg: 1.0.3 -> 1.0.5

    @matthewbauer
    matthewbauer committed Jul 28, 2020
    Copy the full SHA
    ec80ae2 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2020

  1. nixos/nix-daemon.nix: assert distributedBuilds and buildMachines!=[] 

    Without distributedBuilds, you can’t use buildMachines flag.

Fixes #56593
    @matthewbauer
    matthewbauer committed Jul 31, 2020
    Copy the full SHA
    250885d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #93541 from matthewbauer/ios-deploy-update 

    ios-deploy: move out of nodePackages
    @matthewbauer
    matthewbauer committed Jul 31, 2020
    Copy the full SHA
    5a741d1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #94106 from matthewbauer/undmg-1-0-5 

    undmg: 1.0.3 -> 1.0.5
    @matthewbauer
    matthewbauer committed Jul 31, 2020
    Copy the full SHA
    d861d3b View commit details
    Browse the repository at this point in the history

  4. Merge pull request #92415 from matthewbauer/nix-daemon-distributed-bu… 

    …ilds

Add assertion on distributedBuilds & buildMachines != []
    @matthewbauer
    matthewbauer committed Jul 31, 2020
    Copy the full SHA
    ed1423b View commit details
    Browse the repository at this point in the history

  5. nixos/nix-daemon.nix: fix nix.distributedBuilds assertion

    @matthewbauer
    matthewbauer committed Jul 31, 2020
    Copy the full SHA
    67b6e56 View commit details
    Browse the repository at this point in the history