dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-08-24 06:02:52 +00:00 committed by GitHub
commit e3e0f29a9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/blockchains/chia/default.nix
View File

@ -6,14 +6,14 @@
let chia = python3Packages.buildPythonApplication rec { let chia = python3Packages.buildPythonApplication rec {
pname = "chia"; pname = "chia";
version = "1.5.0"; version = "1.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Chia-Network"; owner = "Chia-Network";
repo = "chia-blockchain"; repo = "chia-blockchain";
rev = version; rev = version;
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-OlaAnUy16QBff81XMoYQaZA0wKnsr+/3XEQLBP8IMug="; hash = "sha256-FzKdb6Z/ykKYjpjCr7QR5fxXPNnQbW3bBY97t7DxS90=";
}; };
patches = [ patches = [
@ -55,7 +55,7 @@ let chia = python3Packages.buildPythonApplication rec {
concurrent-log-handler concurrent-log-handler
cryptography cryptography
dnslib dnslib
dnspythonchia dnspython
fasteners fasteners
filelock filelock
keyrings-cryptfile keyrings-cryptfile

5
pkgs/applications/misc/keepass/default.nix
View File

@ -1,7 +1,8 @@
{ lib, fetchurl, buildDotnetPackage, substituteAll, makeWrapper, makeDesktopItem, { lib, fetchurl, buildDotnetPackage, substituteAll, makeWrapper, makeDesktopItem,
unzip, icoutils, gtk2, xorg, xdotool, xsel, coreutils, unixtools, glib, plugins ? [] }: unzip, icoutils, gtk2, xorg, xdotool, xsel, coreutils, unixtools, glib, plugins ? [] }:
let
with builtins; buildDotnetPackage rec { inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map;
in buildDotnetPackage rec {
pname = "keepass"; pname = "keepass";
version = "2.49"; version = "2.49";

2
pkgs/development/compilers/dotnet/combine-packages.nix
View File

@ -7,7 +7,7 @@ packages:
# 3. Something else? # 3. Something else?
let cli = builtins.head packages; let cli = builtins.head packages;
in in
assert lib.assertMsg ((builtins.length packages) < 1) assert lib.assertMsg ((builtins.length packages) > 0)
''You must include at least one package, e.g ''You must include at least one package, e.g
`with dotnetCorePackages; combinePackages [ `with dotnetCorePackages; combinePackages [
sdk_3_1 aspnetcore_5_0 sdk_3_1 aspnetcore_5_0

6
pkgs/development/python-modules/clvm-tools/default.nix
View File

@ -3,20 +3,21 @@
, fetchFromGitHub , fetchFromGitHub
, pythonOlder , pythonOlder
, clvm , clvm
, clvm-tools-rs
, setuptools-scm , setuptools-scm
, pytestCheckHook , pytestCheckHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "clvm_tools"; pname = "clvm_tools";
version = "0.4.4"; version = "0.4.5";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Chia-Network"; owner = "Chia-Network";
repo = "clvm_tools"; repo = "clvm_tools";
rev = version; rev = version;
sha256 = "sha256-Fv7NTUEjbEDALyc+WLDQ7yJOdODZCwLobN+vUvaBWMY="; sha256 = "sha256-7FUZh9w6AM+7l7Br9V/ovS/1H62BLoas5gCrbeMvBAc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -25,6 +26,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
clvm clvm
clvm-tools-rs
]; ];
checkInputs = [ checkInputs = [

4
pkgs/tools/misc/plantuml/default.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.2022.6"; version = "1.2022.7";
pname = "plantuml"; pname = "plantuml";
src = fetchurl { src = fetchurl {
url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar"; url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar";
sha256 = "sha256-J3EfNwDYQ2CO5qWH37wMKtdLStGjHu75wfEMX5Y2NeE="; sha256 = "sha256-GnFueIK4RDGViHmyBtfQqNpId+4ufCsci7c1YCcZjAQ=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];