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: 1d90ea919463
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 67db915a4391
Choose a head ref
  • 15 commits
  • 12 files changed
  • 8 contributors

Commits on Apr 21, 2018

  1. pysensors: init at 2017-07-13

    @guibou
    guibou committed Apr 21, 2018
    Configuration menu
    Copy the full SHA
    6392fb3 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2018

  1. graylog: 2.4.3 -> 2.4.4

    @fadenb
    fadenb committed May 10, 2018
    Configuration menu
    Copy the full SHA
    08eba84 View commit details
    Browse the repository at this point in the history

  2. graylog: wrap graylogctl 

    Wrapper ensures graylogctl script can find java
    @fadenb
    fadenb committed May 10, 2018
    Configuration menu
    Copy the full SHA
    9817b4a View commit details
    Browse the repository at this point in the history

  3. nixos/release-combined.nix: make tests consistent (#40131) 

    ... with release-small.nix
Tests for small channel should be a subset of tests for full channel.
    @xeji
    xeji committed May 10, 2018
    Configuration menu
    Copy the full SHA
    f8d047d View commit details
    Browse the repository at this point in the history

  4. nixos/tests/plotinus: fix non-deterministic failure (#40239) 

    Test failed sometimes, likely because a window didn't get focus.
    @xeji
    xeji committed May 10, 2018
    Configuration menu
    Copy the full SHA
    558f4b3 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #38957 from guibou/guibou_pysensors 

    pysensors: init at 2017-07-13
    @dotlambda
    dotlambda committed May 10, 2018
    Configuration menu
    Copy the full SHA
    71a561f View commit details
    Browse the repository at this point in the history

  6. theme-jade1: init at 3.2

    @romildo
    romildo committed May 10, 2018
    Configuration menu
    Copy the full SHA
    4619039 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #40133 from fadenb/graylog_2.4.4 

    graylog: 2.4.3 -> 2.4.4
    @xeji
    xeji committed May 10, 2018
    Configuration menu
    Copy the full SHA
    7028dcd View commit details
    Browse the repository at this point in the history

  8. gnused: Remove crossAttrs 

    Use a cleaner help2man trick from coreutils
    @Ericson2314
    Ericson2314 committed May 10, 2018
    Configuration menu
    Copy the full SHA
    8db05ad View commit details
    Browse the repository at this point in the history

  9. Merge pull request #40295 from obsidiansystems/fewer-crossAttrs 

    gnused: Remove crossAttrs
    @Ericson2314
    Ericson2314 committed May 10, 2018
    Configuration menu
    Copy the full SHA
    4ed7038 View commit details
    Browse the repository at this point in the history

  10. lib/systems: Prohibit "gnu" ABI (*-gnu) with 32-bit ARM 

    It is ambiguous, and therefore banned within GCC.
    @Ericson2314
    Ericson2314 committed May 10, 2018
    11 Configuration menu
    Copy the full SHA
    58b2e87 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #40293 from romildo/upd.theme-jade-1 

    theme-jade1: init at 3.2
    @xeji
    xeji committed May 10, 2018
    Configuration menu
    Copy the full SHA
    2d88a7b View commit details
    Browse the repository at this point in the history

  12. pytrainer: 1.12.0 -> 1.12.1

    @rycee
    rycee committed May 10, 2018
    Configuration menu
    Copy the full SHA
    cc083fa View commit details
    Browse the repository at this point in the history

  13. Merge pull request #40297 from obsidiansystems/arm-abi-disambig 

    lib/systems: Prohibit "gnu" ABI (*-gnu) with 32-bit ARM
    @Ericson2314
    Ericson2314 committed May 10, 2018
    Configuration menu
    Copy the full SHA
    5789cf4 View commit details
    Browse the repository at this point in the history

  14. Merge remote-tracking branch 'upstream/master' into staging

    @Ericson2314
    Ericson2314 committed May 10, 2018
    2 Configuration menu
    Copy the full SHA
    67db915 View commit details
    Browse the repository at this point in the history