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

Merge pull request #137262 from prusnak/micropython

Browse Source 
micropython: 1.15 -> 1.17
This commit is contained in:
Jörg Thalheim 2021-09-10 14:14:44 +01:00 committed by GitHub
commit ded7b6cb1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/development/interpreters/micropython/default.nix
View File

@ -1,44 +1,24 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, pkg-config
, libffi
, python3
, libffi
, readline
}:
stdenv.mkDerivation rec {
pname = "micropython";
version = "1.15";
version = "1.17";
src = fetchFromGitHub {
owner = "micropython";
repo = "micropython";
rev = "v${version}";
sha256 = "11bf1lq4kgfs1nzg5cnshh2dqxyk5w2k816i04innri6fj0g7y6p";
sha256 = "0aqij36iykmfdsv5dqrifvghmjx7qid8hmbxcpx3xpk3nizh7w84";
fetchSubmodules = true;
};
# drop the following patches when upgrading to 1.16
patches = [
# fix build with modern clang https://github.com/micropython/micropython/pull/7254
(fetchpatch {
url = "https://github.com/micropython/micropython/commit/126b1c727118352923703719a2a3d45b9fad3c97.patch";
sha256 = "13a2bmz24syhd1qsqbx39dcjkjdhf05ln7lanh816m94lkfib21j";
})
# fix build with modern clang https://github.com/micropython/micropython/pull/7254
(fetchpatch {
url = "https://github.com/micropython/micropython/commit/7ceccad4e2f1e9d073f5781c32e5b377e8391a25.patch";
sha256 = "04mbxmb5yr6pbhhf9villq8km4wy579r46v9p4n0ysivrxij7i6f";
})
# fix build on aarch64-darwin https://github.com/micropython/micropython/pull/7393
(fetchpatch {
url = "https://github.com/micropython/micropython/commit/95048129b1d93854c25f501c02801929aeeb23f0.patch";
sha256 = "1cngcwq4jviyhdnfcrrkdadfikhffzbj0d634j0344cp247jb41n";
})
];
nativeBuildInputs = [ pkg-config python3 ];
buildInputs = [ libffi readline ];
@ -78,6 +58,6 @@ stdenv.mkDerivation rec {
homepage = "https://micropython.org";
platforms = platforms.unix;
license = licenses.mit;
maintainers = with maintainers; [ sgo ];
maintainers = with maintainers; [ prusnak sgo ];
};
}