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: 1b9888aaa036
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 35421cfdf7b9
Choose a head ref
  • 11 commits
  • 12 files changed
  • 3 contributors

Commits on Oct 18, 2018

  1. monero: 0.12.0.0 -> 0.12.3.0 

    (cherry picked from commit 90ab6c8)
    @rnhmjoj @samueldr
    rnhmjoj authored and samueldr committed Oct 18, 2018
    Configuration menu
    Copy the full SHA
    f430eaa View commit details
    Browse the repository at this point in the history

  2. monero-gui: 0.12.0.0 -> 0.12.3.0 

    (cherry picked from commit fd95d30)
    @rnhmjoj @samueldr
    rnhmjoj authored and samueldr committed Oct 18, 2018
    Configuration menu
    Copy the full SHA
    ea0853e View commit details
    Browse the repository at this point in the history

  3. monero: 0.12.3.0 -> 0.13.0.2 

    (cherry picked from commit 028164e)
    @rnhmjoj @samueldr
    rnhmjoj authored and samueldr committed Oct 18, 2018
    Configuration menu
    Copy the full SHA
    6dda50f View commit details
    Browse the repository at this point in the history

  4. xmr-stak: 2.4.7 -> 2.5.0 

    (cherry picked from commit 6dc4ae5)
    @rnhmjoj @samueldr
    rnhmjoj authored and samueldr committed Oct 18, 2018
    Configuration menu
    Copy the full SHA
    b183e85 View commit details
    Browse the repository at this point in the history

  5. monero-gui: 0.12.3.0 -> 0.13.0.2 

    (cherry picked from commit 8e15e9c)
    @rnhmjoj @samueldr
    rnhmjoj authored and samueldr committed Oct 18, 2018
    Configuration menu
    Copy the full SHA
    fae2c59 View commit details
    Browse the repository at this point in the history

  6. monero: 0.13.0.2 -> 0.13.0.3 

    (cherry picked from commit 8929e03)
    @rnhmjoj @samueldr
    rnhmjoj authored and samueldr committed Oct 18, 2018
    Configuration menu
    Copy the full SHA
    636a475 View commit details
    Browse the repository at this point in the history

  7. monero-gui: 0.13.0.2 -> 0.13.0.3 

    (cherry picked from commit e57438f)
    @rnhmjoj @samueldr
    rnhmjoj authored and samueldr committed Oct 18, 2018
    Configuration menu
    Copy the full SHA
    499f1c7 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2018

  1. treewide: fix allowAliases = false evaluation problems 

    (cherry picked from commit 856fbc8)

 Conflicts:
	pkgs/os-specific/linux/roccat-tools/default.nix

File isn't in release-18.09
    @ryantm @samueldr
    ryantm authored and samueldr committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    b02c65a View commit details
    Browse the repository at this point in the history

  2. treewide: fix config.allowAliases = false evaluation 

    (cherry picked from commit f91a79e)

 Conflicts:
	pkgs/misc/vim-plugins/default.nix

That file has NOT been touched in this cherry pick.
    @ryantm @samueldr
    ryantm authored and samueldr committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    9dc7c31 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2018

  1. Merge pull request #48636 from samueldr/backport/PR48301 

    Update Monero for upcoming hard fork (backports #48301)
    @samueldr
    samueldr committed Oct 20, 2018
    Configuration menu
    Copy the full SHA
    8713c07 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #48692 from samueldr/fix/disallow-aliases 

    Backports misc. fixes for the new ofborg eval time checks
    @samueldr
    samueldr committed Oct 20, 2018
    Configuration menu
    Copy the full SHA
    35421cf View commit details
    Browse the repository at this point in the history