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: 145a620802ca
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 4589a04299c8
Choose a head ref
  • 18 commits
  • 14 files changed
  • 12 contributors

Commits on Jun 18, 2019

  1. nixos/cassandra: use cassandra's default cluster name "Test Cluster" 

    The change to "NixOS Test Cluster" in #59179 broke startup of existing clusters
that used the previously-default cluster name "Test Cluster":

ERROR 23:00:47 Fatal exception during initialization
org.apache.cassandra.exceptions.ConfigurationException: Saved cluster name Test Cluster != configured name NixOS Test Cluster

Fixes #63388.
    @ivan
    ivan committed Jun 18, 2019
    Copy the full SHA
    a476b9b View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2019

  1. acpilight: 1.1 -> 1.2

    @JohnAZoidberg
    JohnAZoidberg committed Jun 24, 2019
    Copy the full SHA
    73847df View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2019

  1. vale: 1.4.2 -> 1.4.3

    @marsam
    marsam committed Jun 25, 2019
    Copy the full SHA
    7eb22cd View commit details
    Browse the repository at this point in the history

  2. freeciv_qt: init at 2.6.0

    @peterhoeg
    peterhoeg committed Jun 25, 2019
    Copy the full SHA
    31c33e3 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #63760 from peterhoeg/f/freeciv 

    freeciv_qt: init at 2.6.0
    @peterhoeg
    peterhoeg committed Jun 25, 2019
    Copy the full SHA
    a2075a2 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #63758 from marsam/update-vale 

    vale: 1.4.2 -> 1.4.3
    @marsam
    marsam committed Jun 25, 2019
    Copy the full SHA
    16a51ae View commit details
    Browse the repository at this point in the history

  5. Merge pull request #63392 from ivan/cassandra-default-cluster-name 

    nixos/cassandra: use cassandra's default cluster name "Test Cluster"
    @aanderse
    aanderse committed Jun 25, 2019
    Copy the full SHA
    9319216 View commit details
    Browse the repository at this point in the history

  6. couchpotato: remove the /usr/bin/env dependency 

    leave the fixupPhase intact so it can patch script interpreter paths
    @zimbatm
    zimbatm committed Jun 25, 2019
    Copy the full SHA
    53ac12b View commit details
    Browse the repository at this point in the history

  7. duplicati: allow changing the user

    @domenkozar
    domenkozar committed Jun 25, 2019
    5
    Copy the full SHA
    e8916cc View commit details
    Browse the repository at this point in the history

  8. Typo

    @edolstra
    edolstra committed Jun 25, 2019
    Copy the full SHA
    aef7f1b View commit details
    Browse the repository at this point in the history

  9. cargo-license: add meta.homepage

    @basvandijk
    basvandijk committed Jun 25, 2019
    Copy the full SHA
    b95c4ce View commit details
    Browse the repository at this point in the history

  10. Merge pull request #63772 from basvandijk/cargo-license-homepage 

    cargo-license: add meta.homepage
    @basvandijk
    basvandijk committed Jun 25, 2019
    Copy the full SHA
    6ecce71 View commit details
    Browse the repository at this point in the history

  11. pythonPackages.pycategories: init at 1.2.0

    @dmvianna @worldofpeace
    dmvianna authored and worldofpeace committed Jun 25, 2019
    Copy the full SHA
    e37eddc View commit details
    Browse the repository at this point in the history

  12. Merge pull request #63503 from dmvianna/pycategories-1.1.0 

    pythonPackages.pycategories: init at 1.2.0
    @worldofpeace
    worldofpeace committed Jun 25, 2019
    Copy the full SHA
    2aaf191 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #63747 from JohnAZoidberg/acpilight-12 

    acpilight: 1.1 -> 1.2
    @worldofpeace
    worldofpeace committed Jun 25, 2019
    Copy the full SHA
    22034df View commit details
    Browse the repository at this point in the history

  14. elm: don't import <nixpkgs>, fixes tarball job 

    Don't import <nixpkgs>, because that is not allowed.
Broken by #63477

cc @turboMaCk
    @FRidh
    FRidh committed Jun 25, 2019
    Copy the full SHA
    26335f3 View commit details
    Browse the repository at this point in the history

  15. wxwidgets: fix passthru, fixes tarball job 

    cc @romildo
    @FRidh
    FRidh committed Jun 25, 2019
    Copy the full SHA
    32a7e35 View commit details
    Browse the repository at this point in the history

  16. Merge master into staging-next

    @FRidh
    FRidh committed Jun 25, 2019
    Copy the full SHA
    4589a04 View commit details
    Browse the repository at this point in the history