diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-09-16 00:02:05 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-16 00:02:05 +0000 |
commit | 6a10b23c61234a13068b98ab3fcf49fdc819ce2e (patch) | |
tree | bc41ef8361a1660eb1705f37084a16541d7abf6a /pkgs | |
parent | 3a2b245d488e9236b56183304b834615217f07b6 (diff) | |
parent | c8c8da51f8e75e6363f48ab5f6c26278cda64176 (diff) | |
download | nixpkgs-6a10b23c61234a13068b98ab3fcf49fdc819ce2e.tar nixpkgs-6a10b23c61234a13068b98ab3fcf49fdc819ce2e.tar.gz nixpkgs-6a10b23c61234a13068b98ab3fcf49fdc819ce2e.tar.bz2 nixpkgs-6a10b23c61234a13068b98ab3fcf49fdc819ce2e.tar.lz nixpkgs-6a10b23c61234a13068b98ab3fcf49fdc819ce2e.tar.xz nixpkgs-6a10b23c61234a13068b98ab3fcf49fdc819ce2e.tar.zst nixpkgs-6a10b23c61234a13068b98ab3fcf49fdc819ce2e.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs')
21 files changed, 118 insertions, 55 deletions
diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 2724f889337..c713c2ca52e 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.32"; + version = "1.33"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-U1q4xCOzV7n31WgCTGlEXvZaUT/TP797cOAHkecQaLo="; + sha256 = "sha256-XPQRFbIgSU3oCTbLe4gYkMNBvcLZdJvU/YQHtUvgt9k="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/cobalt/default.nix b/pkgs/applications/misc/cobalt/default.nix index fd5d9f20a1d..9b263e6f0d4 100644 --- a/pkgs/applications/misc/cobalt/default.nix +++ b/pkgs/applications/misc/cobalt/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cobalt"; - version = "0.17.0"; + version = "0.17.4"; src = fetchFromGitHub { owner = "cobalt-org"; repo = "cobalt.rs"; rev = "v${version}"; - sha256 = "sha256-IeO50/f+DX9ujZy1+cU1j+nnSl3lpf/nPOu5YBGcCSc="; + sha256 = "sha256-uZcs3VkmpasFwgB7m1spTHi2W86tJt2kWlRTXAotvvo="; }; - cargoSha256 = "sha256-ECgCxR5nsHCeQ3Qc7GWm/lMbmtU2fbAF42nrn2LEcyw="; + cargoSha256 = "sha256-U2TVg2/SIOxaWs4EehTpcu47uDO/EA2dJK56k3I6F+0="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index fa9f1644b50..431aac070f2 100644 --- a/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/pkgs/applications/misc/xmrig/moneroocean.nix @@ -2,13 +2,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.14.1-mo2"; + version = "6.15.0-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-bfD/zxUo4ZDLRDpFbD/FCAvBISHvhRaYXwwiYFd10No="; + sha256 = "sha256-2JT315JbjiU8gAwROZL820MYC/v3MPtJVsN+vsf4KDQ="; }; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix new file mode 100644 index 00000000000..c36159bfabd --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix @@ -0,0 +1,23 @@ +{ lib +, fetchurl +, appimageTools +}: + +let + version = "1.7.1"; +in +appimageTools.wrapType2 { + name = "session-desktop-appimage-${version}"; + src = fetchurl { + url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; + sha256 = "126dx37099pjaqgfv5gbmvn5iiwv2a8lvfbqy5i9h1w1gqnihwq6"; + }; + + meta = with lib; { + description = "Onion routing based messenger"; + homepage = "https://getsession.org/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ alexnortung ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index ff15587779e..8917784bc6c 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -31,7 +31,6 @@ let else stdenv.hostPlatform.extensions.sharedLibrary; - isILP64 = blasProvider.blas64 or false; blasImplementation = lib.getName blasProvider; in diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index e7098abb60a..c67f8d2f72f 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -62,10 +62,10 @@ stdenv.mkDerivation { runHook postInstall ''; - postFixup = - '' wrapProgram $out/bin/mit-scheme${arch} --set MITSCHEME_LIBRARY_PATH \ - $out/lib/mit-scheme${arch} - ''; + postFixup = '' + wrapProgram $out/bin/mit-scheme${arch}-${version} --set MITSCHEME_LIBRARY_PATH \ + $out/lib/mit-scheme${arch}-${version} + ''; nativeBuildInputs = [ makeWrapper gnum4 texinfo texLive automake ghostscript autoconf libtool ]; diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 522c8cfa4a1..a660008841a 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -16,13 +16,13 @@ with lib; stdenv.mkDerivation rec { pname = "opencolorio"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenColorIO"; rev = "v${version}"; - sha256 = "194j9jp5c8ws0fryiz936wyinphnpzwpqnzvw9ryx6rbiwrba487"; + sha256 = "sha256-Yr7yypXxf3ZvQVsDxVuKTN/DGPaLkIWli26RRoEDMdA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/migen/default.nix b/pkgs/development/python-modules/migen/default.nix new file mode 100644 index 00000000000..41396e1c623 --- /dev/null +++ b/pkgs/development/python-modules/migen/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, colorama +}: + +buildPythonPackage rec { + pname = "migen"; + version = "unstable-2021-09-14"; + disabled = pythonOlder "3.3"; + + src = fetchFromGitHub { + owner = "m-labs"; + repo = "migen"; + rev = "a5bc262560238f93ceaad423820eb06843326274"; + sha256 = "32UjaIam/B7Gx6XbPcR067LcXfokJH2mATG9mU38a6o="; + }; + + propagatedBuildInputs = [ + colorama + ]; + + pythonImportsCheck = [ "migen" ]; + + meta = with lib; { + description = " A Python toolbox for building complex digital hardware"; + homepage = "https://m-labs.hk/migen"; + license = licenses.bsd2; + maintainers = with maintainers; [ l-as ]; + }; +} diff --git a/pkgs/development/python-modules/pynanoleaf/default.nix b/pkgs/development/python-modules/pynanoleaf/default.nix index 9bdf4885dd4..9fab8f7b31c 100644 --- a/pkgs/development/python-modules/pynanoleaf/default.nix +++ b/pkgs/development/python-modules/pynanoleaf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pynanoleaf"; - version = "0.1.0"; + version = "0.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BiLJgsey7kIIeN5+CKKnrTB2bSKMNEbeMLwGi2LRLcg="; + sha256 = "32a083759c4f99e019e0013670487841f8edf807c7a07742a971fa18707072a7"; }; disabled = !isPy3k; diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 785331fb50b..7e5490fcc3d 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -14,9 +14,7 @@ stdenv.mkDerivation rec { # On RISC-V platforms, LLVM's libunwind implementation is unsupported by strace. # The build will silently fall back and -k will not work on RISC-V. - buildInputs = [ perl.out libunwind ]; # support -k - - postPatch = "patchShebangs --host strace-graph"; + buildInputs = [ libunwind ]; # support -k configureFlags = [ "--enable-mpers=check" ]; diff --git a/pkgs/games/multimc/0001-pick-latest-java-first.patch b/pkgs/games/multimc/0001-pick-latest-java-first.patch index 31ab0497f8d..a65dcbfd037 100644 --- a/pkgs/games/multimc/0001-pick-latest-java-first.patch +++ b/pkgs/games/multimc/0001-pick-latest-java-first.patch @@ -4,14 +4,14 @@ Date: Tue, 22 Jun 2021 21:50:11 +0300 Subject: [PATCH] pick latest java first --- - api/logic/java/JavaInstallList.cpp | 4 ++-- - api/logic/java/JavaUtils.cpp | 2 +- + launcher/java/JavaInstallList.cpp | 4 ++-- + launcher/java/JavaUtils.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/api/logic/java/JavaInstallList.cpp b/api/logic/java/JavaInstallList.cpp +diff --git a/launcher/java/JavaInstallList.cpp b/launcher/java/JavaInstallList.cpp index 0bded03c..40898e20 100644 ---- a/api/logic/java/JavaInstallList.cpp -+++ b/api/logic/java/JavaInstallList.cpp +--- a/launcher/java/JavaInstallList.cpp ++++ b/launcher/java/JavaInstallList.cpp @@ -120,8 +120,8 @@ void JavaInstallList::updateListData(QList<BaseVersionPtr> versions) bool sortJavas(BaseVersionPtr left, BaseVersionPtr right) @@ -23,10 +23,10 @@ index 0bded03c..40898e20 100644 return (*rleft) > (*rright); } -diff --git a/api/logic/java/JavaUtils.cpp b/api/logic/java/JavaUtils.cpp +diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp index 5f004a10..6d633631 100644 ---- a/api/logic/java/JavaUtils.cpp -+++ b/api/logic/java/JavaUtils.cpp +--- a/launcher/java/JavaUtils.cpp ++++ b/launcher/java/JavaUtils.cpp @@ -350,7 +350,6 @@ QList<QString> JavaUtils::FindJavaPaths() qDebug() << "Linux Java detection incomplete - defaulting to \"java\""; diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 8e72b958856..732a66ef8b4 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -1,15 +1,15 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL }: +{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL, msaClientID ? "" }: let libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ]; in mkDerivation rec { pname = "multimc"; - version = "unstable-2021-06-21"; + version = "unstable-2021-09-08"; src = fetchFromGitHub { owner = "MultiMC"; repo = "MultiMC5"; - rev = "8179a89103833805d5374399d80a4305be1b8355"; - sha256 = "lPz6ZM7TjaixfwWMPaXijKZJQKFPrCegBhvbJ8Xg4P8="; + rev = "e2355eb276bf355ca4acf526a0f3cc390aa88f8b"; + sha256 = "3G9QPoAbC+uVfUYR0Kq6hnxl9c2mvCzIEYGjwfarQJ8="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake file makeWrapper ]; @@ -19,16 +19,20 @@ in mkDerivation rec { postPatch = '' # hardcode jdk paths - substituteInPlace api/logic/java/JavaUtils.cpp \ + substituteInPlace launcher/java/JavaUtils.cpp \ --replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk}/lib/openjdk/bin/java")' \ --replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")' + + # add client ID + substituteInPlace notsecrets/Secrets.cpp \ + --replace 'QString MSAClientID = "";' 'QString MSAClientID = "${msaClientID}";' ''; cmakeFlags = [ "-DMultiMC_LAYOUT=lin-system" ]; postInstall = '' - install -Dm644 ../application/resources/multimc/scalable/multimc.svg $out/share/pixmaps/multimc.svg - install -Dm755 ../application/package/linux/multimc.desktop $out/share/applications/multimc.desktop + install -Dm644 ../launcher/resources/multimc/scalable/multimc.svg $out/share/pixmaps/multimc.svg + install -Dm755 ../launcher/package/linux/multimc.desktop $out/share/applications/multimc.desktop # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 wrapProgram $out/bin/multimc \ diff --git a/pkgs/games/rpg-cli/default.nix b/pkgs/games/rpg-cli/default.nix index 602bdb1ee31..23396ebf978 100644 --- a/pkgs/games/rpg-cli/default.nix +++ b/pkgs/games/rpg-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rpg-cli"; - version = "0.6.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "facundoolano"; repo = pname; rev = version; - sha256 = "sha256-R0Yaxe7Z1gPH0pvfytl5lOJKDZi4hN/upY/baMLc3Aw="; + sha256 = "sha256-Ih+1qO/VHkRp766WDe09xXL/pkby+sURopy7m5wRn4Y="; }; - cargoSha256 = "sha256-pvhZlj1uy5DZV+RBnqkUlVQPdQqGhh0YLE9aGFS3s1g="; + cargoSha256 = "sha256-Au7Nlpl4XOSG8rW0DaHFDqBr1kUY5Emyw6ff0htPc+I="; # tests assume the authors macbook, and thus fail doCheck = false; diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index eaddb0f56dc..3ebdc4c8e5a 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-5vBt0Q7f3ydo74cmY4WpIHqMlNYc0Tl35d0DnWUQZbU="; + sha256 = "sha256-Qdol0ohg2Oo3rC59jPvqHZJtQOQ5W+aZVxTxsxrG51E="; }; - cargoSha256 = "sha256-F3niVkZbg84cFEY0eGgmMAMEJ+eBHwDS2+3EFRR2fLY="; + cargoSha256 = "sha256-EP4DzfufQ9y0x2rI4MGBLu48VKoUY9ETKPlUt9Abum8="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]; diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 088c64d98ed..09f0a3cb137 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.40.5"; + version = "1.41.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-OKGbTkX3HNMYd5UT6l2uqExVZ0TOw0soB3dhebzm2Kg="; + sha256 = "sha256-0utKBCe65lCaamoF4uqvku1zTX2QPpV/6xBtpGteVYw="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/tools/misc/macchina/default.nix index 91f23e1bc1d..5d85a80c616 100644 --- a/pkgs/tools/misc/macchina/default.nix +++ b/pkgs/tools/misc/macchina/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "macchina"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "Macchina-CLI"; repo = pname; rev = "v${version}"; - sha256 = "sha256:0afsv8n12z98z3dxdb4nflc6z8ss6n2prfqmjzy655ly9rrhkcrw"; + sha256 = "sha256-eZeS3lS/eKGvS7CoCnwhkX7jSwAqZOKLMWvLfZPzGtA="; }; - cargoSha256 = "sha256:0jc2030217xz5v5h3ry2pb7rkakn9zmrcap55bv2r8p7hi5gvh60"; + cargoSha256 = "sha256-Ix+Zj5qj1So8Urobw+78yCdRAerFkPctIkousk266DU="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 64fdb40f52a..b6d0bc9ede2 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -11,21 +11,24 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "sha256-hcGpd23CM5r8tq7Wyf4/aJwTCVJ9POmZJHZvIdcF4Qg="; + sha256 = "sha256-DqH/6Uu4L0fWbnGX8s3jCGwBgPE2PLIkS/dZIj+BA9Q="; }; - cargoSha256 = "sha256-TnafvDbCZhIDnjGJThgYnwFs6O6/RvKFsll3gUh2mjQ="; + cargoSha256 = "sha256-LgdVO41e56DIRkky1aF0X80ixs7ZH93Qk9Yx67vkO9E="; nativeBuildInputs = [ installShellFiles pkg-config zlib ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; - checkFlags = [ "--skip=cant_navigate_up_the_root" ]; + checkFlags = [ + "--skip=bind_ipv4_ipv6::case_2" + "--skip=cant_navigate_up_the_root" + ]; postInstall = '' installShellCompletion --cmd miniserve \ diff --git a/pkgs/tools/networking/sniffglue/default.nix b/pkgs/tools/networking/sniffglue/default.nix index 5800df6950b..502ab323e8e 100644 --- a/pkgs/tools/networking/sniffglue/default.nix +++ b/pkgs/tools/networking/sniffglue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sniffglue"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UZLVkTkuJPzju9fl4N6Lgdn3gNBpKruNFxDcoTwdtYc="; + sha256 = "sha256-P8ubw523sw1O6Gpruy1Wa/Y0I3qJgvMdT53wBBoEGhE="; }; - cargoSha256 = "sha256-bHwp0U83uvhFOi9oaeVwNrqHkxK2IQs/bvxqUl/rpjI="; + cargoSha256 = "sha256-+Wh+/C9LvYppCghv11e8NKNhiMy0SV4S3nEWA6b1hQk="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 5afd8aec348..1f363ae3f9f 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.34.12"; + version = "0.34.13"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CBE0ErHIafJ9OYC8DR3KriYX1aiqKUJk2UoBkIdO1QY="; + sha256 = "sha256-z3rbDdk68PTvJ/LPnAx8kOjCGXMfxQA0LK9GLYgaiUY="; }; - vendorSha256 = "sha256-cW3YKdF1dAfeewQ/0mhoillIpIMuC2KDsW1XWc7WRoI="; + vendorSha256 = "sha256-bwDyis/dHKSqBFw5jFWSZip5YjBe1bq/ieg6Jg0P/TM="; subPackages = [ "cmd/tendermint" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03c5ae58881..e8fb8a692f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22748,6 +22748,8 @@ with pkgs; seshat = callPackage ../data/fonts/seshat { }; + session-desktop-appimage = callPackage ../applications/networking/instant-messengers/session-desktop-appimage { }; + shaderc = callPackage ../development/compilers/shaderc { }; shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e596a053cbe..52a14a3365c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4568,6 +4568,8 @@ in { mido = callPackage ../development/python-modules/mido { }; + migen = callPackage ../development/python-modules/migen { }; + milc = callPackage ../development/python-modules/milc { }; milksnake = callPackage ../development/python-modules/milksnake { }; |