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: 2ef110ae64a9
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 2d55f9c01a20
Choose a head ref
  • 19 commits
  • 16 files changed
  • 9 contributors

Commits on Mar 11, 2020

  1. nixos/captive-browser: set chromium's data-dir to a XDG-compliant loc…

    …ation
    
    To quote the XDG specification:
    
         There is a single base directory relative to which user-specific
         data files should be written. This directory is defined by the\
         environment variable $XDG_DATA_HOME.
    
    Rather than adding another directory to $HOME, I think that it's better
    to follow this standard to avoid a cluttered home-dir.
    Ma27 committed Mar 11, 2020
    Copy the full SHA
    f073b74 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2020

  1. unifiStable: 5.12.35 -> 5.12.66

    bachp committed Mar 31, 2020
    Copy the full SHA
    05cc2b1 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2020

  1. nixos/systemd-nspawn: disallow multiple packages with .nspawn-units

    In contrast to `.service`-units, it's not possible to declare an
    `overrides.conf`, however this is done by `generateUnits` for `.nspawn`
    units as well. This change breaks the build if you have two derivations
    configuring one nspawn unit.
    
    This will happen in a case like this:
    
    ``` nix
    { pkgs, ... }: {
      systemd.packages = [
        (pkgs.writeTextDir "etc/systemd/nspawn/container0.nspawn" ''
          [Files]
          Bind=/tmp
        '')
      ];
      systemd.nspawn.container0 = {
        /* ... */
      };
    }
    ```
    Ma27 committed Apr 4, 2020
    Copy the full SHA
    a9e3ec1 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2020

  1. offlineimap: 7.3.2 -> 7.3.3

    r-ryantm committed Apr 13, 2020
    Copy the full SHA
    e443f9f View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2020

  1. Copy the full SHA
    da9feeb View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    4e60f30 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2020

  1. Copy the full SHA
    2a19a03 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #83872 from bachp/unifi-5.12.66

    unifiStable: 5.12.35 -> 5.12.66
    elseym committed Apr 15, 2020
    Copy the full SHA
    55e3272 View commit details
    Browse the repository at this point in the history
  3. tig: fix tig-completion's dependency on __git_complete

    tig recently updated it's bash-completion making it depend on __git-complete from git.
    Becase __git-complete is not automatically sourced tig bash completion fails.
    Also this PR makes tig completion load on-demand.
    basilgood authored and bjornfor committed Apr 15, 2020
    Copy the full SHA
    f57da8e View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    e3553f1 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    37fe88e View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    b7c3c3f View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    2da253a View commit details
    Browse the repository at this point in the history
  8. Merge pull request #85233 from romildo/upd.humanity-icon-theme

    humanity-icon-theme: init at 0.6.15
    romildo committed Apr 15, 2020
    Copy the full SHA
    cfa1718 View commit details
    Browse the repository at this point in the history
  9. ping: use vala_0_40

    fails to build otherwise.
    worldofpeace committed Apr 15, 2020
    Copy the full SHA
    10c0352 View commit details
    Browse the repository at this point in the history
  10. nasc: fix build

    worldofpeace committed Apr 15, 2020
    Copy the full SHA
    433ea74 View commit details
    Browse the repository at this point in the history
  11. Merge pull request #85114 from r-ryantm/auto-update/offlineimap

    offlineimap: 7.3.2 -> 7.3.3
    Ma27 committed Apr 15, 2020
    Copy the full SHA
    8c50c43 View commit details
    Browse the repository at this point in the history
  12. Merge pull request #82339 from Ma27/captive-browser-xdg

    nixos/captive-browser: set chromium's data-dir to a XDG-compliant location
    Ma27 committed Apr 15, 2020
    Copy the full SHA
    70ecf83 View commit details
    Browse the repository at this point in the history
  13. Merge pull request #84266 from Ma27/nspawn-overrides

    nixos/systemd-nspawn: disallow multiple packages with `.nspawn`-units
    Ma27 committed Apr 15, 2020
    Copy the full SHA
    2d55f9c View commit details
    Browse the repository at this point in the history