Skip to content
This repository was 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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 734cc38c75c1
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d85622d6160e
Choose a head ref
  • 8 commits
  • 4 files changed
  • 7 contributors

Commits on Nov 19, 2018

  1. monero: 0.13.0.3 -> 0.13.0.4 

    (cherry picked from commit 40d7e12)
    @fpletz
    fuwa authored and fpletz committed Nov 19, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    0x4A6F
    GPG key ID: 8DEDBA5BE07080E1
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3d50d1b View commit details

  2. monero-gui: 0.13.0.3 -> 0.13.0.4 

    (cherry picked from commit 88a86f7)
    @rnhmjoj @fpletz
    rnhmjoj authored and fpletz committed Nov 19, 2018
    Copy the full SHA
    c2f3688 View commit details

  3. zfs-unstable: 64e9696 -> c197a77 

    (cherry picked from commit 080a638)
    @phryneas @fpletz
    phryneas authored and fpletz committed Nov 19, 2018
    Copy the full SHA
    c979127 View commit details

  4. zfs-unstable: 2018-09-02 -> 0.8.0-rc1 (#46543) 

    (cherry picked from commit 218ce4d)
    @phryneas @fpletz
    phryneas authored and fpletz committed Nov 19, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2386f09 View commit details

  5. zfs{Stable,Unstable}: mark as incompatible with 4.19 

    (cherry picked from commit 8609ff1)
    @Mic92 @fpletz
    Mic92 authored and fpletz committed Nov 19, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4852b57 View commit details

  6. zfsUnstable: 0.8.0-rc1 -> 0.8.0-rc2 

    (cherry picked from commit a995a81)
    @aij @fpletz
    aij authored and fpletz committed Nov 19, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    50fb682 View commit details

  7. firefox-bin: 63.0.1 -> 63.0.3 

    (cherry picked from commit fa138b5)
    @taku0 @tokudan
    taku0 authored and tokudan committed Nov 19, 2018
    Copy the full SHA
    0133878 View commit details

  8. Merge pull request #50755 from tokudan/ff6303 

    firefox-bin: 63.0.1 -> 63.0.3
    @7c6f434c
    7c6f434c authored Nov 19, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d85622d View commit details
9 changes: 5 additions & 4 deletions pkgs/applications/altcoins/monero-gui/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,19 +6,20 @@
, qtwebengine, qtx11extras, qtxmlpatterns
, monero, unbound, readline, boost, libunwind
, libsodium, pcsclite, zeromq, cppzmq, pkgconfig
, hidapi
}:

with stdenv.lib;

stdenv.mkDerivation rec {
name = "monero-gui-${version}";
version = "0.13.0.3";
version = "0.13.0.4";

src = fetchFromGitHub {
owner = "monero-project";
repo = "monero-gui";
rev = "v${version}";
sha256 = "1rvxwz7p1yw9c817n07m60xvmv2p97s82sfzwkg2x880fpxb0gj9";
sha256 = "142yj5s15bhm300dislq3x5inw1f37shnrd5vyj78jjcvry3wymw";
};

nativeBuildInputs = [ qmake pkgconfig ];
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
qtwebchannel qtwebengine qtx11extras
qtxmlpatterns monero unbound readline
boost libunwind libsodium pcsclite zeromq
cppzmq makeWrapper
cppzmq makeWrapper hidapi
];

patches = [
@@ -86,7 +87,7 @@ stdenv.mkDerivation rec {
description = "Private, secure, untraceable currency";
homepage = https://getmonero.org/;
license = licenses.bsd3;
platforms = platforms.all;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ rnhmjoj ];
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/altcoins/monero/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,12 +11,12 @@ with stdenv.lib;

stdenv.mkDerivation rec {
name = "monero-${version}";
version = "0.13.0.3";
version = "0.13.0.4";

src = fetchgit {
url = "https://github.com/monero-project/monero.git";
rev = "v${version}";
sha256 = "03qx8y74zxnmabdi5r3a274pp8zvm3xhkdwi1xf5sb40vf4sfmwb";
sha256 = "1ambgakapijhsi1pd70vw8vvnlwa3nid944lqkbfq3wl25lmc70d";
};

nativeBuildInputs = [ cmake pkgconfig git ];
794 changes: 397 additions & 397 deletions pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions pkgs/os-specific/linux/zfs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -158,7 +158,7 @@ in {
# to be adapted
zfsStable = common {
# comment/uncomment if breaking kernel versions are known
# incompatibleKernelVersion = null;
incompatibleKernelVersion = "4.19";

# this package should point to the latest release.
version = "0.7.11";
@@ -177,13 +177,13 @@ in {

zfsUnstable = common rec {
# comment/uncomment if breaking kernel versions are known
incompatibleKernelVersion = null;
# incompatibleKernelVersion = "4.19";

# this package should point to a version / git revision compatible with the latest kernel release
version = "2018-08-13";
version = "0.8.0-rc2";

rev = "64e96969a88c21aebb2f8d982a8c345e55a2ae6c";
sha256 = "164fvsf9zqvq3vafnvjxafjl8gihmfqfsjwsmky16i90a6hs96gf";
rev = "af2e8411dacbc694b1aaf9074e68a9d12270e74c";
sha256 = "0wm7x9dwrw30jnjlnz6a224h88qd6a5794pzbjsih50lqb10g2gy";
isUnstable = true;

extraPatches = [