diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-18 00:01:24 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-18 00:01:24 +0000 |
commit | 382fdc7ad3184c7d47f54feb535a970fe64a0f35 (patch) | |
tree | e6488db2914676e85250ee12633c8ddf45b7f67b /pkgs/development/misc | |
parent | c2d4ce2808616d558b6cef8a6d270c4930b06c18 (diff) | |
parent | 688b4cb03efd8bd6bd0796297a8738f8f91a5ff6 (diff) | |
download | nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.gz nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.bz2 nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.lz nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.xz nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.zst nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/misc')
-rw-r--r-- | pkgs/development/misc/avr/libc/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/misc/stm32/betaflight/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/misc/stm32/inav/default.nix | 8 |
3 files changed, 6 insertions, 17 deletions
diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index 83054b46a94..b1d8eb4332e 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchurl, automake, autoconf }: -let - version = "2.0.0"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "avr-libc"; - inherit version; + version = "2.0.0"; src = fetchurl { url = "https://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2"; diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix index 486ca04d36a..1ecf9be5d8d 100644 --- a/pkgs/development/misc/stm32/betaflight/default.nix +++ b/pkgs/development/misc/stm32/betaflight/default.nix @@ -9,14 +9,10 @@ "OMNINXT" # 3.4.0-rc4: has not specified a valid STM group, must be one of F1, F3, F405, F411 or F7x5. Have you prepared a valid target.mk? ]}: -let - - version = "3.4.0-rc4"; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "betaflight"; - inherit version; + version = "3.4.0-rc4"; src = fetchFromGitHub { owner = "betaflight"; diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix index c7e59a5d27e..c1f762e47d8 100644 --- a/pkgs/development/misc/stm32/inav/default.nix +++ b/pkgs/development/misc/stm32/inav/default.nix @@ -2,14 +2,10 @@ , gcc-arm-embedded, binutils-arm-embedded, ruby }: -let - - version = "2.0.0-rc2"; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "inav"; - inherit version; + version = "2.0.0-rc2"; src = fetchFromGitHub { owner = "iNavFlight"; |