diff options
-rw-r--r-- | pkgs/applications/blockchains/dero/default.nix | 25 | ||||
-rw-r--r-- | pkgs/applications/science/misc/root/5.nix | 22 | ||||
-rw-r--r-- | pkgs/applications/video/mkvtoolnix/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/flux-led/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/dns/pdns-recursor/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
6 files changed, 28 insertions, 33 deletions
diff --git a/pkgs/applications/blockchains/dero/default.nix b/pkgs/applications/blockchains/dero/default.nix deleted file mode 100644 index 6b15cbd0a1684..0000000000000 --- a/pkgs/applications/blockchains/dero/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unbound, openssl, boost -, lmdb, miniupnpc, readline }: - -stdenv.mkDerivation rec { - pname = "dero"; - version = "0.11.7"; - - src = fetchFromGitHub { - owner = "deroproject"; - repo = "dero"; - rev = "v${version}"; - sha256 = "1v8b9wbmqbpyf4jpc0v276qzk3hc5fpddcmwvv5k5yfi30nmbh5c"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ boost miniupnpc openssl lmdb unbound readline ]; - - meta = with lib; { - description = "Secure, private blockchain with smart contracts based on Monero"; - homepage = "https://dero.io/"; - license = licenses.bsd3; - maintainers = with maintainers; [ fpletz ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 715c5c90cbcdb..de85043f127e0 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -61,6 +61,28 @@ stdenv.mkDerivation rec { ]; preConfigure = '' + # binutils 2.37 fixes + fixupList=( + cint/demo/gl/make0 + cint/demo/exception/Makefile + cint/demo/makecint/KRcc/Makefile + cint/demo/makecint/Stub2/Make2 + cint/demo/makecint/Array/Makefile + cint/demo/makecint/DArray/Makefile + cint/demo/makecint/ReadFile/Makefile + cint/demo/makecint/stl/Makefile + cint/demo/makecint/Stub2/Make1 + cint/cint/include/makemat + cint/cint/lib/WildCard/Makefile + cint/cint/include/make.arc + cint/cint/lib/qt/Makefile + cint/cint/lib/pthread/Makefile + graf2d/asimage/src/libAfterImage/Makefile.in + ) + for toFix in "''${fixupList[@]}"; do + substituteInPlace "$toFix" --replace "clq" "cq" + done + patchShebangs build/unix/ ln -s ${lib.getDev stdenv.cc.libc}/include/AvailabilityMacros.h cint/cint/include/ '' diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 257d21ecc03b4..c6628dde0590b 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "62.0.0"; + version = "63.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0pjf1lkpjirqanazm7a28b8bsyin4i1kd1s4y169zsilzb28kpiz"; + sha256 = "0jniy2kkg4fkrgyw2k8jcpq872qzkrxkbpbc7ksadm2rdygsa3xh"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index be3dab8bdfd86..455234edcaa7e 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.24.25"; + version = "0.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-HhoqsdaqNKdKH63glYEl5mRBFImu6Nxw5gwF7JAJABk="; + sha256 = "sha256-FLea34jhjGnCr02stCkszLgKdemufzmqYBIGegKXAL0="; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 881fef7f32f19..a26d6a6131cf4 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.5.6"; + version = "4.5.7"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "004jwyg64ww6sfwlfpyfvh6vymildygwkjhkin2fsrq4h79wv2dv"; + sha256 = "1avvs1wpck0rahx80xnnaw94hdrfbhi1jdvgg1zpac26mzab4kdd"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 808c8493d4906..fe4f46258ae77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29689,8 +29689,6 @@ with pkgs; dcrd = callPackage ../applications/blockchains/dcrd { }; dcrwallet = callPackage ../applications/blockchains/dcrwallet { }; - dero = callPackage ../applications/blockchains/dero { boost = boost165; }; - digibyte = libsForQt514.callPackage ../applications/blockchains/digibyte { withGui = true; }; digibyted = callPackage ../applications/blockchains/digibyte { withGui = false; }; |