Merge https://github.com/NixOS/nixpkgs

4 files changed, 3 insertions, 93 deletions

diff --git a/nixpkgs/pkgs/development/embedded/blackmagic/default.nix b/nixpkgs/pkgs/development/embedded/blackmagic/default.nix
index cef7ba5f89ca..a422cdc54fc3 100644
--- a/nixpkgs/pkgs/development/embedded/blackmagic/default.nix
+++ b/nixpkgs/pkgs/development/embedded/blackmagic/default.nix
@@ -73,8 +73,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/blacksphere/blackmagic";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ pjones emily sorki ];
-    # fails on darwin with
-    # arm-none-eabi-gcc: error: unrecognized command line option '-iframework'
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/nixpkgs/pkgs/development/embedded/blackmagic/helper.sh b/nixpkgs/pkgs/development/embedded/blackmagic/helper.sh
index 9185253b39d4..77f84ef890d4 100755
--- a/nixpkgs/pkgs/development/embedded/blackmagic/helper.sh
+++ b/nixpkgs/pkgs/development/embedded/blackmagic/helper.sh
@@ -9,7 +9,6 @@ set -u
 out=${out:-/tmp}
 
 ################################################################################
-export CFLAGS=$NIX_CFLAGS_COMPILE
 export MAKEFLAGS="\
   ${enableParallelBuilding:+-j${NIX_BUILD_CORES}}"
 
diff --git a/nixpkgs/pkgs/development/embedded/openocd-rp2040/default.nix b/nixpkgs/pkgs/development/embedded/openocd-rp2040/default.nix
deleted file mode 100644
index a7e2bb65953c..000000000000
--- a/nixpkgs/pkgs/development/embedded/openocd-rp2040/default.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{ lib
-, stdenv
-, fetchgit
-, fetchurl
-, pkg-config
-, hidapi
-, libftdi1
-, libusb1
-, which
-, libtool
-, autoconf
-, automake
-, texinfo
-, git
-, libgpiod
-}:
-
-stdenv.mkDerivation {
-  pname = "openocd-rp2040";
-  version = "0.12.0";
-  src = fetchgit {
-    url = "https://github.com/raspberrypi/openocd";
-    rev = "4d87f6dcae77d3cbcd8ac3f7dc887adf46ffa504";
-    sha256 = "sha256-SYC0qqNx09yO/qeKDDN8dF/9d/dofJ5B1h/PofhG8Jw=";
-    fetchSubmodules = true;
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-  ];
-
-  buildInputs = [
-    hidapi
-    libftdi1
-    libusb1
-    which
-    libtool
-    autoconf
-    automake
-    texinfo
-    git
-  ]
-    ++
-    # tracking issue for v2 api changes https://sourceforge.net/p/openocd/tickets/306/
-    lib.optional stdenv.isLinux (libgpiod.overrideAttrs (old: rec {
-      version = "1.6.4";
-      src = fetchurl {
-        url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
-        sha256 = "sha256-gp1KwmjfB4U2CdZ8/H9HbpqnNssqaKYwvpno+tGXvgo=";
-      };
-    }));
-
-  configurePhase = ''
-    SKIP_SUBMODULE=1 ./bootstrap
-    ./configure --prefix=$out
-  '';
-
-  enableParallelBuilding = true;
-
-  postInstall = lib.optionalString stdenv.isLinux ''
-    mkdir -p "$out/etc/udev/rules.d"
-    rules="$out/share/openocd/contrib/60-openocd.rules"
-    if [ ! -f "$rules" ]; then
-        echo "$rules is missing, must update the Nix file."
-        exit 1
-    fi
-    ln -s "$rules" "$out/etc/udev/rules.d/"
-  '';
-
-  meta = with lib; {
-    description = "OpenOCD fork for rp2040 microcontroller";
-    longDescription = ''
-      This is a fork of OpenOCD by Raspberry Pi,
-      which brings support to the rp2040 microcontroller.
-    '';
-    homepage = "https://github.com/raspberrypi/openocd";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ lu15w1r7h ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/nixpkgs/pkgs/development/embedded/openocd/default.nix b/nixpkgs/pkgs/development/embedded/openocd/default.nix
index 954f043a2ade..39e9edc67722 100644
--- a/nixpkgs/pkgs/development/embedded/openocd/default.nix
+++ b/nixpkgs/pkgs/development/embedded/openocd/default.nix
@@ -6,7 +6,7 @@
 , jimtcl
 , libjaylink
 , libusb1
-, libgpiod
+, libgpiod_1
 
 , enableFtdi ? true, libftdi1
 
@@ -27,13 +27,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ hidapi jimtcl libftdi1 libjaylink libusb1 ]
     ++
     # tracking issue for v2 api changes https://sourceforge.net/p/openocd/tickets/306/
-    lib.optional stdenv.isLinux (libgpiod.overrideAttrs (old: rec {
-      version = "1.6.4";
-      src = fetchurl {
-        url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
-        sha256 = "sha256-gp1KwmjfB4U2CdZ8/H9HbpqnNssqaKYwvpno+tGXvgo=";
-      };
-    }));
+    lib.optional stdenv.isLinux libgpiod_1;
 
   configureFlags = [
     "--disable-werror"