diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
| commit | 50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e (patch) | |
| tree | f2556b911180125ccbb7ed0e78a54e92da89adce /nixpkgs/pkgs/tools/misc/cc2538-bsl/default.nix | |
| parent | 4c16d4548a98563c9d9ad76f4e5b2202864ccd54 (diff) | |
| parent | cfc75eec4603c06503ae750f88cf397e00796ea8 (diff) | |
| download | nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.gz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.bz2 nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.lz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.xz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.zst nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.zip | |
Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/cc2538-bsl/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/cc2538-bsl/default.nix | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/tools/misc/cc2538-bsl/default.nix b/nixpkgs/pkgs/tools/misc/cc2538-bsl/default.nix index 16c858fc5817..c90fc3914d41 100644 --- a/nixpkgs/pkgs/tools/misc/cc2538-bsl/default.nix +++ b/nixpkgs/pkgs/tools/misc/cc2538-bsl/default.nix @@ -1,23 +1,26 @@ -{ lib, fetchFromGitHub, fetchpatch, python3Packages }: +{ lib +, fetchFromGitHub +, fetchpatch +, python3Packages +}: python3Packages.buildPythonPackage rec { pname = "cc2538-bsl"; - version = "unstable-2022-08-03"; - format = "setuptools"; + version = "unstable-2023-08-14"; + format = "pyproject"; src = fetchFromGitHub { owner = "JelmerT"; - repo = pname; - rev = "538ea0deb99530e28fdf1b454e9c9d79d85a3970"; + repo = "cc2538-bsl"; + rev = "641305fb5cae98415a28cbfab6e63436c1753abf"; hash = "sha256-fPY12kValxbJORi9xNyxzwkGpD9F9u3M1+aa9IlSiaE="; }; patches = [ - # https://github.com/JelmerT/cc2538-bsl/pull/138 (fetchpatch { - name = "clean-up-install-dependencies.patch"; - url = "https://github.com/JelmerT/cc2538-bsl/commit/bf842adf8e99a9eb8528579e5b85e59ee23be08d.patch"; - hash = "sha256-XKQ0kfl8yFrSF5RosHY9OvJR18Fh0dmAN1FlfZ024ME="; + # fix extras specification in setup.py; https://github.com/JelmerT/cc2538-bsl/pull/143 + url = "https://github.com/JelmerT/cc2538-bsl/commit/c70f58ec0222357db8020176711d6d45cf24da35.patch"; + hash = "sha256-Rxm/TRcm87WgRfq60cu0loyrbJmZou09XYR7uhrhhj8="; }) ]; |