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: 1f6e46ff968a
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 9e693a074d0c
Choose a head ref
  • 11 commits
  • 8 files changed
  • 11 contributors

Commits on Mar 24, 2019

  1. ghcjs-ng: unbreak

    vaibhavsagar committed Mar 24, 2019
    Copy the full SHA
    e4975aa View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2019

  1. Copy the full SHA
    ee2beac View commit details
    Browse the repository at this point in the history
  2. pkgsMusl, pkgsi686Linux, pkgsStatic: fix infinite recursion with over…

    …lays
    
    Consider example:
    
    $ nix-instantiate ./nixos -A system --arg configuration '
        {
          boot.isContainer = true;
          nixpkgs.overlays = [ (self: super: {
            nix = self.pkgsStatic.nix;
          }) ];
        }'
    
    When resolving package through overlays, we figure out that
    
      nix == self.pkgsStatic.nix
      =>
      nix == (import <nixpkgs> { inherit overlays; }).nix
      =>
      nix == (import <nixpkgs> { overlays = [(self: super: { nix = self.pkgsStatic.nix; })];}).nix
    
    and we enter infinite recursion of nixpkgs evaluations.
    
    The proper fix should terminate recursion by assigning self fixpoint
    to inner custom package set. But I get infinite recursion somehow, so
    I use `super`. It is less correct modulo deep custom overrides, but behaves
    correctly for simple cases and doesn't OOM evaluator.
    
    Fixes NixOS/nixpkgs#57984
    danbst committed Mar 25, 2019
    Copy the full SHA
    f729038 View commit details
    Browse the repository at this point in the history
  3. lazygit: 0.5 -> 0.7.2

    basilgood committed Mar 25, 2019
    Copy the full SHA
    6272132 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    725b549 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #58246 from danbst/infinite-recursion-otherPackage…

    …Sets
    
    pkgsMusl, pkgsi686Linux, pkgsStatic: fix infinite recursion with overlays
    matthewbauer committed Mar 25, 2019
    Copy the full SHA
    5f32434 View commit details
    Browse the repository at this point in the history
  6. tdesktop: 1.6.2 -> 1.6.3

    tdesktopPackages.preview: 1.6.2 -> 1.6.3
    primeos committed Mar 25, 2019
    Copy the full SHA
    698a3f7 View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    fa35597 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #58235 from dtzWill/update/ponyc-0.28.0

    ponyc: 0.27.0 -> 0.28.0
    dtzWill committed Mar 25, 2019
    Copy the full SHA
    5eb3edc View commit details
    Browse the repository at this point in the history
  9. citrix_receiver: remove old versions

    The versions 13.8.0 and 13.9.{0,1} will be EOLed before the end of 19.03
    and should be dropped.
    
    To provide an easy upgrade path, all unsupported versions will throw an
    evaluation error. All versions that are about the be EOLed can be added
    there as well.
    
    For now, all of those deprecated versions are still referenced in
    `all-packages.nix`, but should be removed before the next release.
    
    See also https://www.citrix.co.uk/support/product-lifecycle/milestones/receiver.html
    Ma27 authored and obadz committed Mar 25, 2019
    Copy the full SHA
    d4a570a View commit details
    Browse the repository at this point in the history
  10. Merge pull request #58253 from plumelo/feature/lazygit-0.7.2

    lazygit: 0.5 -> 0.7.2
    etu committed Mar 25, 2019
    Copy the full SHA
    9e693a0 View commit details
    Browse the repository at this point in the history