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: 804c227b83fa
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 20249caf14e3
Choose a head ref
  • 13 commits
  • 10 files changed
  • 7 contributors

Commits on Apr 27, 2018

  1. nix-optimise: do not run in container

    @peterhoeg
    peterhoeg committed Apr 27, 2018
    Configuration menu
    Copy the full SHA
    c3c6951 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2018

  1. gnupg20: set version variable to fix gnupg1compat 

    Presently, gnupg1compat only works with gnupg22. Without this change, the error

```
error: attribute 'version' missing, at .../nixpkgs/pkgs/tools/security/gnupg/1compat.nix:4:26
```

is emitted when evaluating

```
pkgs.gnupg1compat.override { gnupg = pkgs.gnupg20; }'
```
    @charles-dyfis-net
    charles-dyfis-net committed Oct 6, 2018
    Configuration menu
    Copy the full SHA
    f7cd362 View commit details
    Browse the repository at this point in the history

  2. gnupg1compat: reintroduce symlinks, only when actually needed

    @charles-dyfis-net
    charles-dyfis-net committed Oct 6, 2018
    Configuration menu
    Copy the full SHA
    1e23714 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2018

  1. gcalcli: use python3 i/o python2 so we can drop our overrides

    @peterhoeg
    peterhoeg committed Oct 8, 2018
    Configuration menu
    Copy the full SHA
    d2866f5 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2018

  1. Add @edude03 to the maintainer list

    @edude03
    edude03 committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    01108c0 View commit details
    Browse the repository at this point in the history

  2. helm: build from sources

    @edude03
    edude03 committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    c292638 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2018

  1. Merge pull request #48032 from peterhoeg/f/gcal 

    gcalcli: use python3 i/o python2 so we can drop our overrides
    @peterhoeg
    peterhoeg committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    c616d1a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #48092 from tenx-tech/feature/build-helm-from-source 

    helm: build from source
    @nlewo
    nlewo committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    bacaeb2 View commit details
    Browse the repository at this point in the history

  3. Revert "Increase Virtualbox disk image size" (#48151)

    @c0bw3b
    c0bw3b committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    d3b7996 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #48098 from peterhoeg/f/opti 

    nix-optimise: do not run in container
    @peterhoeg
    peterhoeg committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    98649ae View commit details
    Browse the repository at this point in the history

  5. codimd: update patch

    @WilliButz @globin
    WilliButz authored and globin committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    ce5e1b5 View commit details
    Browse the repository at this point in the history

  6. nixos/tests: fix non-determinism for good

    @WilliButz @globin
    WilliButz authored and globin committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    cf47423 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #47977 from charles-dyfis-net/gnupg20-1compat-fix 

    gnupg1compat: fix compatibility with gnupg20
    @lsix
    lsix committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    20249ca View commit details
    Browse the repository at this point in the history