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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a89f245f3b65
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a75971078b8b
Choose a head ref
  • 11 commits
  • 17 files changed
  • 2 contributors

Commits on Aug 20, 2019

  1. aacskeys: remove 

    Unmaintained, ancient and doesn't build with openssl 1.1
    @globin
    globin committed Aug 20, 2019
    Copy the full SHA
    ff3211e View commit details

  2. bitcoin-xt: remove 

    Dead project and doesn't build with openssl 1.1
    @globin
    globin committed Aug 20, 2019
    Copy the full SHA
    df42fdd View commit details

  3. hadoop_2_*: build with openssl 1.0.2

    @globin
    globin committed Aug 20, 2019
    Copy the full SHA
    50c1ba5 View commit details

  4. altcoins.memorycoin: remove 

    dead project, doesn't build with openssl 1.1
    @globin
    globin committed Aug 20, 2019
    Copy the full SHA
    806c2c4 View commit details

  5. altcoins.pivx: mark as broken 

    Upstream doesn't support newer openssl versions
PIVX-Project/PIVX#748
"Your system is most probably using openssl 1.1 which is not the
officialy supported version. Either use 1.0.1 or run again configure
with the given option."
    @globin
    globin committed Aug 20, 2019
    Copy the full SHA
    2542928 View commit details

  6. python2.pkgs.sipsimple: 3.1.1 -> 3.4.2

    @globin
    globin committed Aug 20, 2019
    Copy the full SHA
    ea5b86c View commit details

  7. altcoins.freicoin: mark as broken 

    doesn't build with openssl 1.1 and they use openssl 1.0.1 for testing
    @globin
    globin committed Aug 20, 2019
    Copy the full SHA
    45769db View commit details

  8. cri-tools: 1.14.0 -> 1.15.0 

    - Fix go build process to include critest as well.
- Fix GitHub repo location to be `kubernetes-sigs`
- Add me as maintainer

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
    @saschagrunert @globin
    saschagrunert authored and globin committed Aug 20, 2019
    Copy the full SHA
    6fa2134 View commit details

  9. cargo-download: 0.1.1 -> 0.1.2

    @globin
    globin committed Aug 20, 2019
    Copy the full SHA
    52ce7f4 View commit details

  10. dogecoin: 1.10.0 -> 1.14.1 

    fixes openssl 1.1 compat
    @globin
    globin committed Aug 20, 2019
    Copy the full SHA
    284e529 View commit details

  11. cutegram: remove 

    dead project, no openssl 1.1 and qt >= 5.9 compat
    @globin
    globin committed Aug 20, 2019
    Copy the full SHA
    a759710 View commit details
51 changes: 0 additions & 51 deletions pkgs/applications/altcoins/bitcoin-xt.nix
View file

This file was deleted.

12 changes: 0 additions & 12 deletions pkgs/applications/altcoins/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,15 +23,6 @@ rec {
bitcoin-classic = libsForQt5.callPackage ./bitcoin-classic.nix { boost = boost165; withGui = true; };
bitcoind-classic = callPackage ./bitcoin-classic.nix { boost = boost165; withGui = false; };

bitcoin-xt = callPackage ./bitcoin-xt.nix {
inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit;
boost = boost165; withGui = true;
};
bitcoind-xt = callPackage ./bitcoin-xt.nix {
inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit;
boost = boost165; withGui = false;
};

btc1 = callPackage ./btc1.nix {
inherit (darwin.apple_sdk.frameworks) AppKit;
boost = boost165;
@@ -69,9 +60,6 @@ rec {

masari = callPackage ./masari.nix { boost = boost165; };

memorycoin = callPackage ./memorycoin.nix { boost = boost165; withGui = true; };
memorycoind = callPackage ./memorycoin.nix { boost = boost165; withGui = false; };

mist = callPackage ./mist.nix { };

namecoin = callPackage ./namecoin.nix { withGui = true; };
8 changes: 4 additions & 4 deletions pkgs/applications/altcoins/dogecoin.nix
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{ stdenv , fetchFromGitHub
, pkgconfig, autoreconfHook
, db5, openssl, boost, zlib, miniupnpc
, db5, openssl, boost, zlib, miniupnpc, libevent
, protobuf, utillinux, qt4, qrencode
, withGui }:

with stdenv.lib;
stdenv.mkDerivation rec {
name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version;
version = "1.10.0";
version = "1.14.1";

src = fetchFromGitHub {
owner = "dogecoin";
repo = "dogecoin";
rev = "v${version}";
sha256 = "04rddx20d4fps2w3h1jxa2j8iyqpjv2fh897z0z3r06qjvjzf7rr";
sha256 = "0nmbi5gmms16baqs3fmdp2xm0yf8wawnyz80gcmca4j5ph2zka1v";
};

nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ openssl db5 openssl utillinux
buildInputs = [ openssl db5 openssl utillinux libevent
protobuf boost zlib miniupnpc ]
++ optionals withGui [ qt4 qrencode ];

3 changes: 3 additions & 0 deletions pkgs/applications/altcoins/freicoin.nix
View file
Original file line number Diff line number Diff line change
@@ -34,5 +34,8 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = [ maintainers.viric ];
platforms = platforms.linux;

# upstream doesn't support newer openssl versions, use 1.0.1 for testing
broken = true;
};
}
56 changes: 0 additions & 56 deletions pkgs/applications/altcoins/memorycoin.nix
View file

This file was deleted.

7 changes: 7 additions & 0 deletions pkgs/applications/altcoins/pivx.nix
View file
Original file line number Diff line number Diff line change
@@ -50,5 +50,12 @@ stdenv.mkDerivation rec {
homepage = https://www.dash.org;
maintainers = with maintainers; [ wucke13 ];
platforms = platforms.unix;

# upstream doesn't support newer openssl versions
# https://github.com/PIVX-Project/PIVX/issues/748
# "Your system is most probably using openssl 1.1 which is not the
# officialy supported version. Either use 1.0.1 or run again configure
# with the given option."
broken = true;
};
}
9 changes: 7 additions & 2 deletions pkgs/applications/networking/cluster/hadoop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, which, maven, cmake, jre, bash, coreutils, glibc, protobuf2_5, fuse, snappy, zlib, bzip2, openssl }:
{ stdenv, fetchurl, makeWrapper, pkgconfig, which, maven, cmake, jre, bash
, coreutils, glibc, protobuf2_5, fuse, snappy, zlib, bzip2, openssl, openssl_1_0_2
}:

let
common = { version, sha256, dependencies-sha256, tomcat }:
common = { version, sha256, dependencies-sha256, tomcat, openssl ? openssl }:
let
# compile the hadoop tarball from sources, it requires some patches
binary-distributon = stdenv.mkDerivation rec {
@@ -127,18 +129,21 @@ in {
sha256 = "1ahv67f3lwak3kbjvnk1gncq56z6dksbajj872iqd0awdsj3p5rf";
dependencies-sha256 = "1lsr9nvrynzspxqcamb10d596zlnmnfpxhkd884gdiva0frm0b1r";
tomcat = tomcat_6_0_48;
openssl = openssl_1_0_2;
};
hadoop_2_8 = common {
version = "2.8.4";
sha256 = "16c3ljhrzibkjn3y1bmjxdgf0kn60l23ay5hqpp7vpbnqx52x68w";
dependencies-sha256 = "1j4f461487fydgr5978nnm245ksv4xbvskfr8pbmfhcyss6b7w03";
tomcat = tomcat_6_0_48;
openssl = openssl_1_0_2;
};
hadoop_2_9 = common {
version = "2.9.1";
sha256 = "0qgmpfbpv7f521fkjy5ldzdb4lwiblhs0hyl8qy041ws17y5x7d7";
dependencies-sha256 = "1d5i8jj5y746rrqb9lscycnd7acmxlkz64ydsiyqsh5cdqgy2x7x";
tomcat = tomcat_6_0_48;
openssl = openssl_1_0_2;
};
hadoop_3_0 = common {
version = "3.0.3";
41 changes: 0 additions & 41 deletions pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
View file

This file was deleted.

32 changes: 0 additions & 32 deletions ...plications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
View file

This file was deleted.

35 changes: 0 additions & 35 deletions pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
View file

This file was deleted.

47 changes: 0 additions & 47 deletions pkgs/development/libraries/aacskeys/default.nix
View file

This file was deleted.

Loading