diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-12-15 19:32:38 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-12-15 19:32:38 +0100 |
| commit | 6b8e2555ef013b579cda57025b17d662e0f1fe1f (patch) | |
| tree | 5a83c673af26c9976acd5a5dfa20e09e06898047 /nixpkgs/pkgs/development/embedded | |
| parent | 66ca7a150b5c051f0728f13134e6265cc46f370c (diff) | |
| parent | 02357adddd0889782362d999628de9d309d202dc (diff) | |
| download | nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.gz nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.bz2 nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.lz nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.xz nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.zst nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/embedded')
| -rw-r--r-- | nixpkgs/pkgs/development/embedded/svdtools/default.nix | 6 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/embedded/xc3sprog/default.nix | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/embedded/svdtools/default.nix b/nixpkgs/pkgs/development/embedded/svdtools/default.nix index 4ff90b4f85a6..4a57b0ace290 100644 --- a/nixpkgs/pkgs/development/embedded/svdtools/default.nix +++ b/nixpkgs/pkgs/development/embedded/svdtools/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.3.4"; + version = "0.3.6"; src = fetchCrate { inherit version pname; - hash = "sha256-rdBUEOyE4bHqPXZs3MxT/oivagKmJIVE/hI9mp0RY0k="; + hash = "sha256-bk6kv13HMDSRBjShWnRZJzb0YX0zKljPoEC6tebkVKI="; }; - cargoHash = "sha256-mPz8m/9VGKSqXan/R1k1JTZ9a44CwCL6JefVyeeREeE="; + cargoHash = "sha256-MdYzYmbI7ZNLeLZdnLIVo9y2rvmGevEGy7t+2FFu5yo="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; diff --git a/nixpkgs/pkgs/development/embedded/xc3sprog/default.nix b/nixpkgs/pkgs/development/embedded/xc3sprog/default.nix index 393a11f8a448..fa9ceffafbbb 100644 --- a/nixpkgs/pkgs/development/embedded/xc3sprog/default.nix +++ b/nixpkgs/pkgs/development/embedded/xc3sprog/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ # file RPATH_CHANGE could not write new RPATH "-DCMAKE_SKIP_BUILD_RPATH=ON" + # fix build with gcc 11+ + "-DCMAKE_CXX_STANDARD=14" ]; meta = with lib; { |