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: d8cb4ed910ce
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: 42a195919a10
Choose a head ref
  • 16 commits
  • 10 files changed
  • 6 contributors

Commits on Jan 22, 2020

  1. bitcoin-gold: init at 0.15.2

    mmahut committed Jan 22, 2020
    Copy the full SHA
    bce6129 View commit details

Commits on Jan 27, 2020

  1. litecoin: support qt5

    mmahut committed Jan 27, 2020
    Copy the full SHA
    3baa12f View commit details
  2. litecoin: add zmq support

    mmahut committed Jan 27, 2020
    Copy the full SHA
    910c73e View commit details

Commits on Jan 28, 2020

  1. Copy the full SHA
    5a3156c View commit details
  2. streamlink: 1.3.0 -> 1.3.1

    Enzime committed Jan 28, 2020
    Copy the full SHA
    8d25449 View commit details
  3. hugo: 0.62.2 -> 0.63.2

    Frostman committed Jan 28, 2020
    Copy the full SHA
    f419691 View commit details
  4. Copy the full SHA
    b3729ae View commit details
  5. Copy the full SHA
    e328078 View commit details
  6. citrix_workspace_19_8_0: fix url

    When a new version of the Citrix workspace app is released, there's no
    versioned URL available. This means that as soon as a new version is
    released, the homepage needs to be altered to ensure that the error
    message from `requireFile` points to the proper download URL.
    Ma27 committed Jan 28, 2020
    Copy the full SHA
    518b5ef View commit details
  7. citrix_receiver: remove

    The package is not used anymore and discontinued by upstream. The error
    was added before 19.09, so now we can remove the attributes entirely.
    Ma27 committed Jan 28, 2020
    Copy the full SHA
    0d34bd2 View commit details
  8. Merge pull request #78595 from mmahut/litecoin

    litecoin: move to qt5 and add zeromq supoort
    mmahut authored Jan 28, 2020
    Copy the full SHA
    3acc5b4 View commit details
  9. Merge pull request #78282 from mmahut/btg

    bitcoin-gold: init at 0.15.2
    mmahut authored Jan 28, 2020
    Copy the full SHA
    8d4dba0 View commit details
  10. citrix_workspace_19_3_0: mark as unsupported

    Will be unsupported within the lifespan of 20.03. Also there aren't any
    known issues that require this version as workaround, so a removal
    should be fairly safe.
    Ma27 committed Jan 28, 2020
    Copy the full SHA
    69d127c View commit details
  11. Merge pull request #78668 from Enzime/update/streamlink

    streamlink: 1.3.0 -> 1.3.1
    marsam authored Jan 28, 2020
    Copy the full SHA
    f511497 View commit details
  12. Merge pull request #78645 from r-ryantm/auto-update/python2.7-pyspotify

    python27Packages.pyspotify: 2.1.2 -> 2.1.3
    marsam authored Jan 28, 2020
    Copy the full SHA
    fdf8061 View commit details
  13. Merge pull request #78669 from Frostman/hugo-0.62.2

    hugo: 0.62.2 -> 0.63.2
    marsam authored Jan 28, 2020
    Copy the full SHA
    42a1959 View commit details
7 changes: 7 additions & 0 deletions nixos/doc/manual/release-notes/rl-2003.xml
Original file line number Diff line number Diff line change
@@ -445,6 +445,13 @@ users.users.me =
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>
The <literal>citrix_workspace_19_3_0</literal> package has been removed as
it will be EOLed within the lifespan of 20.03. For further information,
please refer to the <link xlink:href="https://www.citrix.com/de-de/support/product-lifecycle/milestones/receiver.html">support and maintenance information</link> from upstream.
</para>
</listitem>
</itemizedlist>
</section>

70 changes: 70 additions & 0 deletions pkgs/applications/blockchains/bitcoin-gold.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{ stdenv
, fetchFromGitHub
, openssl
, boost
, libevent
, autoreconfHook
, db4
, pkgconfig
, protobuf
, hexdump
, zeromq
, libsodium
, withGui
, qtbase ? null
, qttools ? null
, wrapQtAppsHook ? null
}:

with stdenv.lib;

stdenv.mkDerivation rec {

pname = "bitcoin" + toString (optional (!withGui) "d") + "-gold";
version = "0.15.2";

src = fetchFromGitHub {
owner = "BTCGPU";
repo = "BTCGPU";
rev = "v${version}";
sha256 = "0grd1cd8d2nsrxl27la85kcan09z73fn70ncr9km4iccaj5pg12h";
};

nativeBuildInputs = [
autoreconfHook
pkgconfig
hexdump
] ++ optionals withGui [
wrapQtAppsHook
];

buildInputs = [
openssl
boost
libevent
db4
zeromq
libsodium
] ++ optionals withGui [
qtbase
qttools
protobuf
];

enableParallelBuilding = true;

configureFlags = [
"--with-boost-libdir=${boost.out}/lib"
] ++ optionals withGui [
"--with-gui=qt5"
"--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
];

meta = {
description = "BTG is a cryptocurrency with Bitcoin fundamentals, mined on common GPUs instead of specialty ASICs";
homepage = "https://bitcoingold.org/";
license = licenses.mit;
maintainers = [ maintainers.mmahut ];
platforms = platforms.linux;
};
}
16 changes: 10 additions & 6 deletions pkgs/applications/blockchains/litecoin.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
{ stdenv, fetchFromGitHub
{ stdenv, mkDerivation, fetchFromGitHub
, pkgconfig, autoreconfHook
, openssl, db48, boost, zlib, miniupnpc
, glib, protobuf, utillinux, qt4, qrencode
, glib, protobuf, utillinux, qrencode
, AppKit
, withGui ? true, libevent
, qtbase, qttools
, zeromq
}:

with stdenv.lib;

stdenv.mkDerivation rec {
mkDerivation rec {

name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version;
version = "0.17.1";
@@ -21,13 +23,15 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ openssl db48 boost zlib
buildInputs = [ openssl db48 boost zlib zeromq
miniupnpc glib protobuf utillinux libevent ]
++ optionals stdenv.isDarwin [ AppKit ]
++ optionals withGui [ qt4 qrencode ];
++ optionals withGui [ qtbase qttools qrencode ];

configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
++ optionals withGui [ "--with-gui=qt4" ];
++ optionals withGui [
"--with-gui=qt5"
"--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ];

enableParallelBuilding = true;

6 changes: 3 additions & 3 deletions pkgs/applications/misc/hugo/default.nix
Original file line number Diff line number Diff line change
@@ -2,18 +2,18 @@

buildGoModule rec {
pname = "hugo";
version = "0.62.2";
version = "0.63.2";

goPackagePath = "github.com/gohugoio/hugo";

src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
sha256 = "1rdfx5gv0q64ivyg0ilb96p5nksip9cj75fmvw0bjky9w6i07yd9";
sha256 = "1fylsx2isvims0xwcj831b1zcwsmd3igrnxjad44rhl2k3anq8vm";
};

modSha256 = "0dwv5qnglv00jj7vlps76zlfpkzsplf93401j2l03xfvmvadifrs";
modSha256 = "0h95r3m6ca60dn1bllnw127nbfnkdjld94c3nyrzlwdczl2iaiyf";

buildFlags = [ "-tags" "extended" ];

4 changes: 2 additions & 2 deletions pkgs/applications/misc/kitty/default.nix
Original file line number Diff line number Diff line change
@@ -21,14 +21,14 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
version = "0.15.1";
version = "0.16.0";
format = "other";

src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
sha256 = "0y25w8123rjd6f5875mk8yv7mdr75mgswl3sh6zixm7b9r771s9p";
sha256 = "1bszyddar0g1gdz67h8rd3gbrdhi6ahjg7j14cjiqxm1938z9ajf";
};

buildInputs = [
15 changes: 2 additions & 13 deletions pkgs/applications/networking/remote/citrix-workspace/default.nix
Original file line number Diff line number Diff line change
@@ -30,17 +30,6 @@
let
versionInfo = let
supportedVersions = {
"19.3.0" = {
major = "19";
minor = "3";
patch = "0";
x64hash = "0mhpp29ca3dw9hx72i0qawdq35wcc7qzgxwzlx4aicwnm1gbil5c";
x86hash = "1hxgj5lk5ghbpssbqjd404qr84gls967vwrh8ww5hg3pn86kyf8w";
x64suffix = "5";
x86suffix = "5";
homepage = https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1903.html;
};

"19.6.0" = {
major = "19";
minor = "6";
@@ -60,7 +49,7 @@ let
x86hash = "0afcqirb4q349r3izy88vqkszg6y2wg14iwypk6nrmvwgvcl6jdn";
x64suffix = "20";
x86suffix = "20";
homepage = https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest1.html;
homepage = https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1908.html;
};

"19.10.0" = {
@@ -93,7 +82,7 @@ let
# The lifespans of Citrix products can be found here:
# https://www.citrix.com/support/product-lifecycle/milestones/receiver.html
deprecatedVersions = let
versions = [ ];
versions = [ "19.3.0" ];
in
lib.listToAttrs
(lib.forEach versions
4 changes: 2 additions & 2 deletions pkgs/applications/video/streamlink/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }:

pythonPackages.buildPythonApplication rec {
version = "1.3.0";
version = "1.3.1";
pname = "streamlink";

src = fetchFromGitHub {
owner = "streamlink";
repo = "streamlink";
rev = version;
sha256 = "0f4qwwa5pxd4igvxq1qadqpphazlbs3c3cr29ybks2x5wajrvwah";
sha256 = "0scc0mzvy56b1l6iyvrzb28l8vzrxpfkn4lcwr8nnyjb7ams2xms";
};

checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pyspotify/default.nix
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@

buildPythonPackage rec {
pname = "pyspotify";
version = "2.1.2";
version = "2.1.3";

src = fetchurl {
url = "https://github.com/mopidy/pyspotify/archive/v${version}.tar.gz";
sha256 = "0g3dvwpaz7pqrdx53kyzkh31arlmdzz1hb7jp8m488lbsf47w6nd";
sha256 = "1y1zqkqi9jz5m9bb2z7wmax7g40c1snm3c6di6b63726qrf26rb7";
};

propagatedBuildInputs = [ cffi ];
6 changes: 3 additions & 3 deletions pkgs/games/minecraft-server/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, jre }:
stdenv.mkDerivation {
pname = "minecraft-server";
version = "1.14.4";
version = "1.15.2";

src = fetchurl {
url = "https://launcher.mojang.com/v1/objects/3dc3d84a581f14691199cf6831b71ed1296a9fdf/server.jar";
sha256 = "0aapiwgx9bmnwgmrra9459qfl9bw8q50sja4lhhr64kf7amyvkay";
url = "https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar";
sha256 = "12kynrpxgcdg8x12wcvwkxka0fxgm5siqg8qq0nnmv0443f8dkw0";
};

preferLocalBuild = true;
12 changes: 4 additions & 8 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -2387,13 +2387,6 @@ in

circus = callPackage ../tools/networking/circus { };

# Cleanup before 20.03:
citrix_receiver = throw "citrix_receiver has been discontinued by Citrix (https://docs.citrix.com/en-us/citrix-workspace-app.html). Please use citrix_workspace.";
citrix_receiver_13_10_0 = citrix_receiver;
citrix_receiver_13_9_1 = citrix_receiver;
citrix_receiver_13_9_0 = citrix_receiver;
citrix_receiver_13_8_0 = citrix_receiver;

citrix_workspace_unwrapped = callPackage ../applications/networking/remote/citrix-workspace { };
citrix_workspace_unwrapped_19_12_0 = citrix_workspace_unwrapped.override { version = "19.12.0"; };
citrix_workspace_unwrapped_19_10_0 = citrix_workspace_unwrapped.override { version = "19.10.0"; };
@@ -22686,6 +22679,9 @@ in
bitcoin-classic = libsForQt5.callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = true; };
bitcoind-classic = callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = false; };

bitcoin-gold = libsForQt5.callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = true; };
bitcoind-gold = callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = false; };

btc1 = callPackage ../applications/blockchains/btc1.nix {
inherit (darwin.apple_sdk.frameworks) AppKit;
boost = boost165;
@@ -22719,7 +22715,7 @@ in

ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { };

litecoin = callPackage ../applications/blockchains/litecoin.nix {
litecoin = libsForQt5.callPackage ../applications/blockchains/litecoin.nix {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
litecoind = litecoin.override { withGui = false; };