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: fd2b2b5cd56a
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 7a8563664411
Choose a head ref
  • 10 commits
  • 4 files changed
  • 6 contributors

Commits on Jul 25, 2019

  1. nixos/zfs: add trim service 

    Introduces a trim timer similar to the fstrim service.
According to zpool(8) for consumer hardware periodic manual TRIM
is preferred over automatic TRIM that ZFS implements.
The period of one week is based on recommendations of fstrim.
    @Mic92
    Mic92 committed Jul 25, 2019
    Copy the full SHA
    1d86714 View commit details
    Browse the repository at this point in the history

  2. Revert "unzip: CVE-2019-13232" 

    This reverts commit 0238946.

This patch broke a number of legitimate zips in the wild, including but
not limited to most luarocks and a number of gradle-produced JARs.
    @adisbladis
    adisbladis committed Jul 25, 2019
    Copy the full SHA
    eaafd84 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into staging-next

    @vcunat
    vcunat committed Jul 25, 2019
    Copy the full SHA
    773f034 View commit details
    Browse the repository at this point in the history

  4. Merge #65393: Revert "unzip: CVE-2019-13232" 

    ...into staging-next
    @vcunat
    vcunat committed Jul 25, 2019
    Copy the full SHA
    c9793b8 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2019

  1. linuxkit: 2017-07-08 -> 0.7

    @nicknovitski
    nicknovitski committed Jul 26, 2019
    Copy the full SHA
    e65244e View commit details
    Browse the repository at this point in the history

  2. termdown: 1.15.0 -> 1.16.0

    @dtzWill
    dtzWill committed Jul 26, 2019
    Copy the full SHA
    82ee9c5 View commit details
    Browse the repository at this point in the history

  3. linuxkit: 2017-07-08 -> 0.7 (#65359) 

    linuxkit: 2017-07-08 -> 0.7
    @Mic92
    Mic92 committed Jul 26, 2019
    Copy the full SHA
    d07fb6b View commit details
    Browse the repository at this point in the history

  4. Merge pull request #65408 from dtzWill/update/termdown-1.16.0 

    termdown: 1.15.0 -> 1.16.0
    @Mic92
    Mic92 committed Jul 26, 2019
    Copy the full SHA
    732163d View commit details
    Browse the repository at this point in the history

  5. Merge pull request #65331 from Mic92/zfs-trim 

    nixos/zfs: add trim service
    @Mic92
    Mic92 committed Jul 26, 2019
    Copy the full SHA
    741046a View commit details
    Browse the repository at this point in the history

  6. Merge branch 'staging-next' 

    This reverts the *incomplete* unzip CVE fix that caused many
false positives.
    @vcunat
    vcunat committed Jul 26, 2019
    Copy the full SHA
    7a85636 View commit details
    Browse the repository at this point in the history