Skip to content
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
base: 7953a6526938
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: da3ec20a7211
Choose a head ref
  • 18 commits
  • 13 files changed
  • 11 contributors

Commits on Jun 6, 2019

  1. php: fix zts options

    @Izorkin
    Izorkin committed Jun 6, 2019
    Copy the full SHA
    f93d637 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2019

  1. nixos-generate-config: add support for bcache 

    Add "bcache" to boot.initrd.availableKernelModules if a bcache device is
detected.

This fixes a problem I've had one too many times: I install NixOS and
forget to add "bcache", resulting in an unbootable machine (until fixed
with Live CD). Now NixOS will do it for me.
    @bjornfor
    bjornfor committed Jun 10, 2019
    Copy the full SHA
    4755811 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2019

  1. octopus: 8.4 -> 9.0

    @markuskowa
    markuskowa committed Jun 11, 2019
    Copy the full SHA
    4df1e91 View commit details
    Browse the repository at this point in the history

  2. phpPackages: build phpPackages with re2c

    @Izorkin
    Izorkin committed Jun 11, 2019
    Copy the full SHA
    925f803 View commit details
    Browse the repository at this point in the history

  3. php: update build config

    @Izorkin
    Izorkin committed Jun 11, 2019
    Copy the full SHA
    a6a26c1 View commit details
    Browse the repository at this point in the history

  4. phpPackages.event: 2.5.1 -> 2.5.2

    @Izorkin
    Izorkin committed Jun 11, 2019
    Copy the full SHA
    59c4b84 View commit details
    Browse the repository at this point in the history

  5. phpPackages.composer: 1.8.5 -> 1.8.6

    @Izorkin
    Izorkin committed Jun 11, 2019
    Copy the full SHA
    d613239 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2019

  1. xorg.xcalc: 1.0.7 -> 1.1.0 

    xcalc: ensure "app-defaults" resources are installed+found, works now
    @dtzWill
    dtzWill committed Jun 12, 2019
    Copy the full SHA
    813799a View commit details
    Browse the repository at this point in the history

  2. browsh: 1.5.0 -> 1.5.2 

    * update/regen deps.nix
    @dtzWill
    dtzWill authored and Matthieu Coudron committed Jun 12, 2019
    Copy the full SHA
    b647471 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #63018 from dtzWill/update/xclock-1.1.0 

    xorg.xcalc: 1.0.7 -> 1.1.0
    @teto
    teto committed Jun 12, 2019
    Copy the full SHA
    3f00ca9 View commit details
    Browse the repository at this point in the history

  4. bitlbee-discord: set BITLBEE_DATADIR 

    Build fails otherwise

Signed-off-by: William Casarin <jb55@jb55.com>
    @jb55 @Lassulus
    jb55 authored and Lassulus committed Jun 12, 2019
    Copy the full SHA
    6845a83 View commit details
    Browse the repository at this point in the history

  5. bitlebee-discord: add myself as maintainer 

    Signed-off-by: William Casarin <jb55@jb55.com>
    @jb55 @Lassulus
    jb55 authored and Lassulus committed Jun 12, 2019
    Copy the full SHA
    14ebdbb View commit details
    Browse the repository at this point in the history

  6. Merge pull request #62976 from markuskowa/upd-octopus 

    octopus: 8.4 -> 9.0
    @markuskowa
    markuskowa committed Jun 12, 2019
    Copy the full SHA
    ca09991 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #62966 from bjornfor/nixos-generate-config-bcache 

    nixos-generate-config: add support for bcache
    @edolstra
    edolstra committed Jun 12, 2019
    Copy the full SHA
    734b3e7 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #62783 from Izorkin/php-packages 

    php: update build config and php package
    @etu
    etu committed Jun 12, 2019
    Copy the full SHA
    039983b View commit details
    Browse the repository at this point in the history

  9. go: 1.12.5 -> 1.12.6

    Roman Volosatovs committed Jun 12, 2019
    Copy the full SHA
    c14e018 View commit details
    Browse the repository at this point in the history

  10. go: 1.11.10 -> 1.11.11

    Roman Volosatovs committed Jun 12, 2019
    Copy the full SHA
    fb657d7 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #63035 from rvolosatovs/update/go 

    go: 1.12.5->1.12.6, 1.11.10->1.11.11
    @kalbasit
    kalbasit committed Jun 12, 2019
    Copy the full SHA
    da3ec20 View commit details
    Browse the repository at this point in the history