Frederik Rietdijk
4 years ago
committed by
GitHub
commit
b27a19d5bf
@ -0,0 +1,42 @@ |
||||
# New rust versions should first go to staging. |
||||
# Things to check after updating: |
||||
# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: |
||||
# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github |
||||
# This testing can be also done by other volunteers as part of the pull |
||||
# request review, in case platforms cannot be covered. |
||||
# 2. The LLVM version used for building should match with rust upstream. |
||||
# 3. Firefox and Thunderbird should still build on x86_64-linux. |
||||
|
||||
{ stdenv, lib |
||||
, buildPackages |
||||
, newScope, callPackage |
||||
, CoreFoundation, Security |
||||
, llvmPackages_5 |
||||
, pkgsBuildTarget, pkgsBuildBuild |
||||
} @ args: |
||||
|
||||
import ./default.nix { |
||||
rustcVersion = "1.43.0"; |
||||
rustcSha256 = "18akhk0wz1my6y9vhardriy2ysc482z0fnjdcgs9gy59kmnarxkm"; |
||||
|
||||
# Note: the version MUST be one version prior to the version we're |
||||
# building |
||||
bootstrapVersion = "1.42.0"; |
||||
|
||||
# fetch hashes by running `print-hashes.sh 1.43.0` |
||||
bootstrapHashes = { |
||||
i686-unknown-linux-gnu = "1c89c12c8fc1a45dcbcb9ee2e21cc634b8453f1d4cdd658269263de686aab4e4"; |
||||
x86_64-unknown-linux-gnu = "7d1e07ad9c8a33d8d039def7c0a131c5917aa3ea0af3d0cc399c6faf7b789052"; |
||||
arm-unknown-linux-gnueabihf = "6cf776b910d08fb0d1f88be94464e7b20a50f9d8b2ec6372c3c385aec0b70e7a"; |
||||
armv7-unknown-linux-gnueabihf = "a36e7f2bd148e325a7b8e7131b4226266cf522b1a2b12d585dad9c38ef68f4d9"; |
||||
aarch64-unknown-linux-gnu = "fdd39f856a062af265012861949ff6654e2b7103be034d046bec84ebe46e8d2d"; |
||||
x86_64-apple-darwin = "db1055c46e0d54b99da05e88c71fea21b3897e74a4f5ff9390e934f3f050c0a8"; |
||||
}; |
||||
|
||||
selectRustPackage = pkgs: pkgs.rust_1_43; |
||||
|
||||
rustcPatches = [ |
||||
]; |
||||
} |
||||
|
||||
(builtins.removeAttrs args [ "fetchpatch" ]) |
||||
@ -0,0 +1,30 @@ |
||||
From a612c481f6116955d420db5ae1fe4c1eb93eb2f2 Mon Sep 17 00:00:00 2001
|
||||
From: Marcin Niemira <marcin.niemira@gmail.com>
|
||||
Date: Sun, 9 Jun 2019 07:05:06 +1000
|
||||
Subject: [PATCH] bpo-11122: fix hardcoded path checking for rpmbuild in
|
||||
bdist_rpm.py (GH-10594) (cherry picked from commit
|
||||
45a14942c969ed508b35abd5e116cb18f84ce5b4)
|
||||
|
||||
Co-authored-by: Marcin Niemira <marcin.niemira@gmail.com>
|
||||
---
|
||||
Lib/distutils/command/bdist_rpm.py | 5 +----
|
||||
.../next/Library/2018-11-12-19-08-50.bpo-11122.Gj7BQn.rst | 1 +
|
||||
2 files changed, 2 insertions(+), 4 deletions(-)
|
||||
create mode 100644 Misc/NEWS.d/next/Library/2018-11-12-19-08-50.bpo-11122.Gj7BQn.rst
|
||||
|
||||
diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py
|
||||
index 20ca7ac6dcffa..74381cc69a6ce 100644
|
||||
--- a/Lib/distutils/command/bdist_rpm.py
|
||||
+++ b/Lib/distutils/command/bdist_rpm.py
|
||||
@@ -309,10 +309,7 @@ def run(self):
|
||||
|
||||
# build package
|
||||
log.info("building RPMs")
|
||||
- rpm_cmd = ['rpm']
|
||||
- if os.path.exists('/usr/bin/rpmbuild') or \
|
||||
- os.path.exists('/bin/rpmbuild'):
|
||||
- rpm_cmd = ['rpmbuild']
|
||||
+ rpm_cmd = ['rpmbuild']
|
||||
|
||||
if self.source_only: # what kind of RPMs?
|
||||
rpm_cmd.append('-bs')
|
||||
@ -0,0 +1,36 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, fetchPypi |
||||
, flit |
||||
, isPy3k |
||||
, pytoml |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "flit-core"; |
||||
version = "2.3.0"; |
||||
disabled = !isPy3k; |
||||
|
||||
format = "pyproject"; |
||||
|
||||
src = fetchPypi { |
||||
inherit version; |
||||
pname = "flit_core"; |
||||
hash = "sha256:a50bcd8bf5785e3a7d95434244f30ba693e794c5204ac1ee908fc07c4acdbf80"; |
||||
}; |
||||
|
||||
propagatedBuildInputs = [ |
||||
pytoml |
||||
]; |
||||
|
||||
passthru.tests = { |
||||
inherit flit; |
||||
}; |
||||
|
||||
meta = { |
||||
description = "Distribution-building parts of Flit. See flit package for more information"; |
||||
homepage = "https://github.com/takluyver/flit"; |
||||
license = lib.licenses.bsd3; |
||||
maintainers = [ lib.maintainers.fridh ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,45 @@ |
||||
{ lib, buildPythonPackage, fetchFromGitHub |
||||
, isPy3k, attrs, coverage, enum34, pexpect |
||||
, doCheck ? true, pytest, pytest_xdist, flaky, mock |
||||
, sortedcontainers |
||||
}: |
||||
buildPythonPackage rec { |
||||
# https://hypothesis.readthedocs.org/en/latest/packaging.html |
||||
|
||||
# Hypothesis has optional dependencies on the following libraries |
||||
# pytz fake_factory django numpy pytest |
||||
# If you need these, you can just add them to your environment. |
||||
|
||||
version = "4.57.1"; |
||||
pname = "hypothesis"; |
||||
|
||||
# Use github tarballs that includes tests |
||||
src = fetchFromGitHub { |
||||
owner = "HypothesisWorks"; |
||||
repo = "hypothesis-python"; |
||||
rev = "hypothesis-python-${version}"; |
||||
hash = "sha256:1qcpcrk6892hzyjsdr581pw6i4fj9035nv89mcjrcrzcmycdlfds"; |
||||
}; |
||||
|
||||
postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; |
||||
|
||||
propagatedBuildInputs = [ |
||||
attrs |
||||
coverage |
||||
sortedcontainers |
||||
] ++ lib.optional (!isPy3k) enum34; |
||||
|
||||
checkInputs = [ pytest pytest_xdist flaky mock pexpect ]; |
||||
inherit doCheck; |
||||
|
||||
checkPhase = '' |
||||
rm tox.ini # This file changes how py.test runs and breaks it |
||||
py.test tests/cover |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
description = "A Python library for property based testing"; |
||||
homepage = "https://github.com/HypothesisWorks/hypothesis"; |
||||
license = licenses.mpl20; |
||||
}; |
||||
} |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue