gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2022-10-13 08:27:55 +02:00
parent 2a3f0a650f 732ec9dcc0
commit 00a757ed3f
534 changed files with 34250 additions and 3613 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/python/rustpython/default.nix
+4 -4
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "rustpython";
version = "unstable-2021-12-09";
version = "unstable-2022-10-11";
src = fetchFromGitHub {
owner = "RustPython";
repo = "RustPython";
rev = "db3b3127df34ff5dd569301aa36ed71ae5624e4e";
sha256 = "sha256-YwGfXs3A5L/18mHnnWubPU3Y8EI9uU3keJ2HJnnTwv0=";
rev = "273ffd969ca6536df06d9f69076c2badb86f8f8c";
sha256 = "sha256-t/3++EeP7a8t2H0IEPLogBri7+6u+2+v+lNb4/Ty1/w=";
};
cargoHash = "sha256-T85kiPG80oZ4mwpb8Ag40wDHKx2Aens+gM7NGXan5lM=";
cargoHash = "sha256-Pv7SK64+eoK1VUxDh1oH0g1veWoIvBhiZE9JI/alXJ4=";
# freeze the stdlib into the rustpython binary
cargoBuildFlags = [ "--features=freeze-stdlib" ];
pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
+1 -5
View File
@@ -342,11 +342,7 @@ def _update_package(path, target):
text = _replace_value('version', new_version, text)
# hashes from pypi are 16-bit encoded sha256's, normalize it to sri to avoid merge conflicts
# sri hashes have been the default format since nix 2.4+
try:
sri_hash = subprocess.check_output(["nix", "hash", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip()
except subprocess.CalledProcessError:
# nix<2.4 compat
sri_hash = subprocess.check_output(["nix", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip()
sri_hash = subprocess.check_output(["nix", "--extra-experimental-features", "nix-command", "hash", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip()
# fetchers can specify a sha256, or a sri hash