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: 715dd567c8c6
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 6d452e839b70
Choose a head ref
  • 9 commits
  • 9 files changed
  • 8 contributors

Commits on Jan 26, 2021

  1. emacs.pkgs.trivialBuild: add missing stdenv argument 

    Fix fallout of #110687 (generic.nix requires stdenv).
    @danieldk
    danieldk committed Jan 26, 2021
    Copy the full SHA
    f46bfb9 View commit details
    Browse the repository at this point in the history

  2. crypto++: Fix static build and also do multiple outputs

    @Ericson2314
    Ericson2314 committed Jan 26, 2021
    Copy the full SHA
    60dea25 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2021

  1. Merge pull request #110901 from obsidiansystems/cryptopp-static 

    crypto++: Fix static build and also do multiple outputs
    @Ericson2314
    Ericson2314 committed Jan 27, 2021
    Copy the full SHA
    652b2d6 View commit details
    Browse the repository at this point in the history

  2. xkcdpass: py2 -> py3, add manpage and run tests

    @peterhoeg
    peterhoeg committed Jan 27, 2021
    Copy the full SHA
    6d489a3 View commit details
    Browse the repository at this point in the history

  3. ghcjs: fix eval 

    This was causing release-cross to fail hydra eval, so it hasn't been
building for the last few days. So note that although ghcjs still
does not build, this fixes eval so the jobset can proceed.

Verified with `hydra-eval-jobs pkgs/top-level/release-cross.nix -I nixpkgs=.`
    @r-burns @cole-h
    r-burns authored and cole-h committed Jan 27, 2021
    Copy the full SHA
    89850d1 View commit details
    Browse the repository at this point in the history

  4. nixos/babeld: add type extraConfig

    @Scriptkiddi @cole-h
    Scriptkiddi authored and cole-h committed Jan 27, 2021
    Copy the full SHA
    26c4dcf View commit details
    Browse the repository at this point in the history

  5. Merge pull request #110861 from danieldk/fix-emacs-trivial-build 

    emacs.pkgs.trivialBuild: add missing stdenv argument
    @danieldk
    danieldk committed Jan 27, 2021
    Copy the full SHA
    a49d810 View commit details
    Browse the repository at this point in the history

  6. rust-analyzer: 2021-01-18 -> 2021-01-25

    @badmutex
    badmutex authored and Jonathan Ringer committed Jan 27, 2021
    Copy the full SHA
    9afe352 View commit details
    Browse the repository at this point in the history

  7. Merge master into staging-next

    @github-actions
    github-actions[bot] committed Jan 27, 2021
    Copy the full SHA
    6d452e8 View commit details
    Browse the repository at this point in the history