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: c814b0ef2419
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 7447bdc5232e
Choose a head ref
  • 13 commits
  • 13 files changed
  • 9 contributors

Commits on Sep 6, 2020

  1. airscan: 0.99.8 -> 0.99.16

    tex committed Sep 6, 2020
    Copy the full SHA
    adcaba3 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2020

  1. Copy the full SHA
    cf5a892 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2020

  1. chez-modules: Fix path to csv-site.

    It seems that the installation path for chez modules no longer includes
    the Chez version. This fixes the build for chez-mit and chez-scmutils.
    meithecatte committed Sep 13, 2020
    Copy the full SHA
    72ccc9b View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2020

  1. rgp: 1.7.0.29 -> 1.8

    Flakebi committed Sep 14, 2020
    Copy the full SHA
    26c23c0 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    9fb14d8 View commit details
    Browse the repository at this point in the history
  3. ott: 0.30 → 0.31

    vbgl committed Sep 14, 2020
    Copy the full SHA
    cc4a33d View commit details
    Browse the repository at this point in the history
  4. Merge pull request #97927 from NieDzejkob/chez-fix

    chez-modules: Fix path to csv-site.
    risicle committed Sep 14, 2020
    Copy the full SHA
    9743a38 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #97983 from Flakebi/rgp

    rgp: 1.7.0.29 -> 1.8
    danieldk committed Sep 14, 2020
    Copy the full SHA
    0023908 View commit details
    Browse the repository at this point in the history
  6. nixos/shadowsocks: add extraConfig

    hmenke authored and bennofs committed Sep 14, 2020
    Copy the full SHA
    e587b5a View commit details
    Browse the repository at this point in the history
  7. nixos/shadowsocks: add test without plugin

    hmenke authored and bennofs committed Sep 14, 2020
    Copy the full SHA
    9d60354 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #97845 from risicle/ris-holidays-fix

    pythonPackages.holidays: fix build by adding korean-lunar-calendar dependency
    risicle committed Sep 14, 2020
    Copy the full SHA
    58802be View commit details
    Browse the repository at this point in the history
  9. Merge pull request #97280 from tex/airscan

    airscan: 0.99.8 -> 0.99.16
    ryantm committed Sep 14, 2020
    Copy the full SHA
    8cdf9c9 View commit details
    Browse the repository at this point in the history
  10. nixos/plasma5: Fix eval of colord-kde/wacomtablet

    Regression introduced by 053b05d.
    
    The commit in question essentially removed the "with pkgs;" from the
    scope around the various packages added to environment.systemPackages.
    
    Since services.colord.enable and services.xserver.wacom.enable are false
    by default, the change above didn't directly result in an evaluation
    error.
    
    Tested evaluation before and after this change via:
    
      for cfg in hardware.bluetooth.enable \
                 networking.networkmanager.enable \
                 hardware.pulseaudio.enable \
                 powerManagement.enable \
                 services.colord.enable \
                 services.samba.enable \
                 services.xserver.wacom.enable; do
        nix-instantiate --eval nixos --arg configuration '{
          services.xserver.desktopManager.plasma5.enable = true;
          '"$cfg"' = true;
        }' -A config.environment.systemPackages > /dev/null
      done
    
    Signed-off-by: aszlig <aszlig@nix.build>
    Cc: @ttuegel
    aszlig committed Sep 14, 2020
    Copy the full SHA
    7447bdc View commit details
    Browse the repository at this point in the history