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: 4b6020faf58c
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 51d88f7d20ea
Choose a head ref
  • 20 commits
  • 15 files changed
  • 12 contributors

Commits on Jan 16, 2019

  1. nixos/prometheus: make source_labels optional 

    It's possible to skip `source_labels` entirely, an example for this is
the blackbox exporter configuration:

https://github.com/prometheus/blackbox_exporter#prometheus-configuration
    @Ma27
    Ma27 committed Jan 16, 2019
    Copy the full SHA
    003132c View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2019

  1. nixos/mysql: fix option ensureDatabases 

    The database name needs to be quoted
in case it contains special characters
so the MySQL service does not fail to start.
    @dermetfan
    dermetfan committed Jan 17, 2019
    Copy the full SHA
    429c0bf View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2019

  1. installer/tools: Avoid duplicate LUKS device entries in hw config 

    There are situations where several filesystems reside on a single encrypted LUKS
device (e.g. when using BTRFS subvolumes).

Simply generating a `boot.init.luks.devices.NAME.device` entry for each mounted
filesystem will result in an error later when evaluating the nix expression in
`hardware-configuration.nix`.
    @avdv
    avdv committed Jan 19, 2019
    Copy the full SHA
    352e06d View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2019

  1. Merge pull request #54051 from Ma27/optional-prometheus-source_labels 

    nixos/prometheus: make `source_labels` optional
    @infinisil
    infinisil committed Jan 22, 2019
    Copy the full SHA
    2f9ef8c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #54339 from avdv/avoid-duplicate-luks-device 

    installer/tools: Avoid duplicate LUKS device entries in hw config
    @infinisil
    infinisil committed Jan 22, 2019
    Copy the full SHA
    115cf2e View commit details
    Browse the repository at this point in the history

  3. Merge pull request #54197 from dermetfan/fix/nixos-mysql 

    nixos/mysql: fix option `ensureDatabases`
    @infinisil
    infinisil committed Jan 22, 2019
    Copy the full SHA
    120ce2f View commit details
    Browse the repository at this point in the history

  4. flashplayer-standalone: unmark broken, works here; keep the comment

    @7c6f434c
    7c6f434c committed Jan 22, 2019
    Copy the full SHA
    b7d4a35 View commit details
    Browse the repository at this point in the history

  5. pythonPackages.pywal: fix expression

    @FRidh
    FRidh committed Jan 22, 2019
    Copy the full SHA
    a9a28e9 View commit details
    Browse the repository at this point in the history

  6. python.pkgs.python-utils: use fetchPypi

    Robert Schütz committed Jan 22, 2019
    Copy the full SHA
    e5f2cf4 View commit details
    Browse the repository at this point in the history

  7. python.pkgs.python-utils: run tests

    Robert Schütz committed Jan 22, 2019
    Copy the full SHA
    d56611b View commit details
    Browse the repository at this point in the history

  8. python.pkgs.progressbar2: 3.12.0 -> 3.39.2

    Robert Schütz committed Jan 22, 2019
    Copy the full SHA
    6672304 View commit details
    Browse the repository at this point in the history

  9. efitools: init at 1.9.2

    @grahamc
    grahamc committed Jan 22, 2019
    Copy the full SHA
    2707a6d View commit details
    Browse the repository at this point in the history

  10. Merge pull request #54471 from grahamc/efitools 

    efitools: init at 1.9.2
    @grahamc
    grahamc committed Jan 22, 2019
    Copy the full SHA
    f3e2348 View commit details
    Browse the repository at this point in the history

  11. z3-tptp: init 

    Z3 ships a TPTP-supporting wrapper as an example; allow building it
    @7c6f434c
    7c6f434c committed Jan 22, 2019
    Copy the full SHA
    ebb370f View commit details
    Browse the repository at this point in the history

  12. pythonPackages.aiohttp-socks: init at 0.2.2 

    Co-authored-by: nyanloutre <paul@nyanlout.re>
    @clefru @nyanloutre
    clefru and nyanloutre committed Jan 22, 2019
    Copy the full SHA
    6fefd37 View commit details
    Browse the repository at this point in the history

  13. pythonPackages.aiorpcx: init at 0.10.2 

    Co-authored-by: nyanloutre <paul@nyanlout.re>
    @clefru @nyanloutre
    clefru and nyanloutre committed Jan 22, 2019
    Copy the full SHA
    4b76001 View commit details
    Browse the repository at this point in the history

  14. electrum: 3.2.4 -> 3.3.2 

    Co-authored-by: nyanloutre <paul@nyanlout.re>
    @clefru @nyanloutre
    clefru and nyanloutre committed Jan 22, 2019
    Copy the full SHA
    ee0e998 View commit details
    Browse the repository at this point in the history

  15. electrum: enable tests

    @nyanloutre
    nyanloutre committed Jan 22, 2019
    Copy the full SHA
    3c38d22 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #54466 from nyanloutre/electrum-update 

    electrum: 3.2.4 -> 3.3.2 plus new dependencies
    @dotlambda
    dotlambda committed Jan 22, 2019
    Copy the full SHA
    fa8ed83 View commit details
    Browse the repository at this point in the history

  17. libglade: fix on darwin 

    Based on discussion in
Homebrew/legacy-homebrew#11961

Closes #54448
Closes #54321
    @matthewbauer
    matthewbauer committed Jan 22, 2019
    Copy the full SHA
    51d88f7 View commit details
    Browse the repository at this point in the history