diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3dc92ba645e6..bff3019a09d2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13817,6 +13817,12 @@
githubId = 28888242;
name = "WORLDofPEACE";
};
+ wozeparrot = {
+ email = "wozeparrot@gmail.com";
+ github = "wozeparrot";
+ githubId = 25372613;
+ name = "Woze Parrot";
+ };
wr0belj = {
name = "Jakub Wróbel";
email = "wrobel.jakub@protonmail.com";
diff --git a/nixos/doc/manual/development/activation-script.section.md b/nixos/doc/manual/development/activation-script.section.md
index df6836624040..1aee252fddea 100644
--- a/nixos/doc/manual/development/activation-script.section.md
+++ b/nixos/doc/manual/development/activation-script.section.md
@@ -54,7 +54,7 @@ possiblility into account that they have to create them first.
## NixOS snippets {#sec-activation-script-nixos-snippets}
There are some snippets NixOS enables by default because disabling them would
-most likely break you system. This section lists a few of them and what they
+most likely break your system. This section lists a few of them and what they
do:
- `binsh` creates `/bin/sh` which points to the runtime shell
diff --git a/nixos/doc/manual/from_md/development/activation-script.section.xml b/nixos/doc/manual/from_md/development/activation-script.section.xml
index 0d9e911216ef..981ebf37e60f 100644
--- a/nixos/doc/manual/from_md/development/activation-script.section.xml
+++ b/nixos/doc/manual/from_md/development/activation-script.section.xml
@@ -73,7 +73,7 @@ system.activationScripts.my-activation-script = {
NixOS snippets
There are some snippets NixOS enables by default because disabling
- them would most likely break you system. This section lists a few
+ them would most likely break your system. This section lists a few
of them and what they do:
diff --git a/pkgs/applications/window-managers/hyprland/default.nix b/pkgs/applications/window-managers/hyprland/default.nix
new file mode 100644
index 000000000000..50b52a01d604
--- /dev/null
+++ b/pkgs/applications/window-managers/hyprland/default.nix
@@ -0,0 +1,79 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, libdrm
+, libinput
+, libxcb
+, libxkbcommon
+, mesa
+, pango
+, wayland
+, wayland-protocols
+, wayland-scanner
+, wlroots
+, xcbutilwm
+}:
+
+stdenv.mkDerivation rec {
+ pname = "hyprland";
+ version = "0.6.1beta";
+
+ # When updating Hyprland, the overridden wlroots commit must be bumped to match the commit upstream uses.
+ src = fetchFromGitHub {
+ owner = "hyprwm";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-0Msqe2ErAJvnO1zHoB2k6TkDhTYnHRGkvJrfSG12dTU=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ wayland-scanner
+ ];
+
+ buildInputs = [
+ libdrm
+ libinput
+ libxcb
+ libxkbcommon
+ mesa
+ pango
+ wayland
+ wayland-protocols
+ wlroots
+ xcbutilwm
+ ];
+
+ # build with system wlroots
+ postPatch = ''
+ sed -Ei 's/"\.\.\/wlroots\/include\/([a-zA-Z0-9./_-]+)"/<\1>/g' src/includes.hpp
+ '';
+
+ preConfigure = ''
+ make protocols
+ '';
+
+ postBuild = ''
+ pushd ../hyprctl
+ $CXX -std=c++20 -w ./main.cpp -o ./hyprctl
+ popd
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ install -m755 ./Hyprland $out/bin
+ install -m755 ../hyprctl/hyprctl $out/bin
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/vaxerski/Hyprland";
+ description = "A dynamic tiling Wayland compositor that doesn't sacrifice on its looks";
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ wozeparrot ];
+ mainProgram = "Hyprland";
+ };
+}
diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix
index 01572e797612..978adbd257a6 100644
--- a/pkgs/data/icons/kora-icon-theme/default.nix
+++ b/pkgs/data/icons/kora-icon-theme/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "kora-icon-theme";
- version = "1.5.1";
+ version = "1.5.2";
src = fetchFromGitHub {
owner = "bikass";
repo = "kora";
rev = "v${version}";
- sha256 = "sha256-3TKjd2Lblb+/zFq7rkdgnD1dJU3kis7QZi7Ui74IWzA=";
+ sha256 = "sha256-OwuePPn4seHbzv81pnTEP1Q0Tp1ywZIEmw+dx3bDoXw=";
};
nativeBuildInputs = [
diff --git a/pkgs/data/icons/nordzy-icon-theme/default.nix b/pkgs/data/icons/nordzy-icon-theme/default.nix
index 11113bb6a503..f977a12a78e6 100644
--- a/pkgs/data/icons/nordzy-icon-theme/default.nix
+++ b/pkgs/data/icons/nordzy-icon-theme/default.nix
@@ -6,15 +6,15 @@
, nordzy-themes ? [ "all" ] # Override this to only install selected themes
}:
-stdenvNoCC.mkDerivation {
+stdenvNoCC.mkDerivation rec {
pname = "nordzy-icon-theme";
- version = "unstable-2022-01-23";
+ version = "1.5";
src = fetchFromGitHub {
owner = "alvatip";
repo = "Nordzy-icon";
- rev = "10b9ee80ef5c4cac1d1770d89a6d55046521ea36";
- sha256 = "1b8abhs5gzr2qy407jq818pr67vjky8zn3pa3c8n552ayybblibk";
+ rev = version;
+ sha256 = "sha256-2uMbiee7wCyDxs6kYd5sL/keDVIVjIWxoci5/t2HF8s=";
};
# In the post patch phase we should first make sure to patch shebangs.
diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index 2a5d60898bb2..d44f53125219 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "numix-icon-theme-circle";
- version = "22.03.01";
+ version = "22.06.14";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
- sha256 = "sha256-adSoFKvemirQtxoS6KrQvXxtIOKFZ73PTktVXytblbM=";
+ sha256 = "sha256-TPJKBDQXwZnYOfDqeCDvjNzwj9lWFKPrUTd9F07wTvQ=";
};
nativeBuildInputs = [ gtk3 ];
diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix
index d335911c2461..4c23f1c01be6 100644
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "numix-icon-theme-square";
- version = "22.03.01";
+ version = "22.06.14";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
- sha256 = "sha256-VCXHInaxn5BKY9Yth6DjoKa/JS2WVjvwAfRMiL2r1B0=";
+ sha256 = "sha256-2DWDoUcSjADkOr+4/JaqAHbUzpFSQGYNye9/DvioFrM=";
};
nativeBuildInputs = [ gtk3 ];
diff --git a/pkgs/development/interpreters/hashlink/default.nix b/pkgs/development/interpreters/hashlink/default.nix
new file mode 100644
index 000000000000..eb69bd4103d2
--- /dev/null
+++ b/pkgs/development/interpreters/hashlink/default.nix
@@ -0,0 +1,53 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, libGL
+, libGLU
+, libpng
+, libjpeg_turbo
+, libuv
+, libvorbis
+, mbedtls
+, openal
+, pcre
+, SDL2
+, sqlite
+}:
+
+stdenv.mkDerivation rec {
+ pname = "hashlink";
+ version = "1.12";
+
+ src = fetchFromGitHub {
+ owner = "HaxeFoundation";
+ repo = "hashlink";
+ rev = version;
+ sha256 = "AiUGhTxz4Pkrks4oE+SAuAQPMuC5T2B6jo3Jd3sNrkQ=";
+ };
+
+ patches = [ ./hashlink.patch ];
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ buildInputs = [
+ libGL
+ libGLU
+ libjpeg_turbo
+ libpng
+ libuv
+ libvorbis
+ mbedtls
+ openal
+ pcre
+ SDL2
+ sqlite
+ ];
+
+ meta = with lib; {
+ description = "A virtual machine for Haxe";
+ homepage = "https://hashlink.haxe.org/";
+ license = licenses.mit;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ iblech locallycompact ];
+ };
+}
diff --git a/pkgs/development/interpreters/hashlink/hashlink.patch b/pkgs/development/interpreters/hashlink/hashlink.patch
new file mode 100644
index 000000000000..5e699073d02d
--- /dev/null
+++ b/pkgs/development/interpreters/hashlink/hashlink.patch
@@ -0,0 +1,8 @@
+*** a/Makefile 1970-01-01 01:00:01.000000000 +0100
+--- b/Makefile 2022-06-21 23:36:10.023460654 +0200
+*************** endif
+*** 109,110 ****
+--- 109,111 ----
+ LIBOPENAL = -lopenal
++ LIBOPENGL = -lGL
+ RELEASE_NAME = linux
diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
index f95fdaacf8c1..0f07c472c307 100644
--- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
+++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
@@ -1,14 +1,20 @@
-{ ffmpeg_5, ffmpeg-full, fetchFromGitHub, lib }:
+{ ffmpeg_5-full
+, nv-codec-headers-11
+, fetchFromGitHub
+, lib
+}:
-(ffmpeg-full.override { ffmpeg = ffmpeg_5; }).overrideAttrs (old: rec {
+(ffmpeg_5-full.override {
+ nv-codec-headers = nv-codec-headers-11;
+}).overrideAttrs (old: rec {
pname = "jellyfin-ffmpeg";
- version = "5.0.1-5";
+ version = "5.0.1-7";
src = fetchFromGitHub {
owner = "jellyfin";
repo = "jellyfin-ffmpeg";
rev = "v${version}";
- sha256 = "sha256-rFzBAniw2vQGFn2GDlz6NiB/Ow2EZlE3Lu+ceYTStkM=";
+ sha256 = "sha256-jMd7tEEfiHqTp4q8c6EvbjL0KyJ6ucj4ZNrKOJLJ1Mc=";
};
postPatch = ''
@@ -19,8 +25,6 @@
${old.postPatch or ""}
'';
- doCheck = false; # https://github.com/jellyfin/jellyfin-ffmpeg/issues/79
-
meta = with lib; {
description = "${old.meta.description} (Jellyfin fork)";
homepage = "https://github.com/jellyfin/jellyfin-ffmpeg";
diff --git a/pkgs/development/python-modules/google-i18n-address/default.nix b/pkgs/development/python-modules/google-i18n-address/default.nix
index b0747a90942f..828d9ff5eb2b 100644
--- a/pkgs/development/python-modules/google-i18n-address/default.nix
+++ b/pkgs/development/python-modules/google-i18n-address/default.nix
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "google-i18n-address";
- version = "2.5.1";
+ version = "2.5.2";
src = fetchFromGitHub {
owner = "mirumee";
repo = "google-i18n-address";
- rev = version;
- sha256 = "sha256-VQEDZkGseZTKOsAMgNYyf6FcgnCjLPpWXijeUmtgyv0=";
+ rev = "refs/tags/${version}";
+ sha256 = "sha256-7t5sNpEVajdwcW8+xTNZQKZVgxhUzfbVbEVgn7JJ2MY=";
};
propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/mkdocs-macros/default.nix b/pkgs/development/python-modules/mkdocs-macros/default.nix
index 54a06d7d0bf9..e55d1b0801ae 100644
--- a/pkgs/development/python-modules/mkdocs-macros/default.nix
+++ b/pkgs/development/python-modules/mkdocs-macros/default.nix
@@ -6,7 +6,7 @@
, mkdocs-macros
, mkdocs-material
, jinja2
-, dateutil
+, python-dateutil
, termcolor
, pyyaml
, runCommand
@@ -24,8 +24,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [
jinja2
- dateutil
termcolor
+ python-dateutil
pyyaml
mkdocs
];
diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix
index 403714671008..e35abee42d38 100644
--- a/pkgs/development/python-modules/pyisy/default.nix
+++ b/pkgs/development/python-modules/pyisy/default.nix
@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "pyisy";
- version = "3.0.6";
+ version = "3.0.7";
src = fetchFromGitHub {
owner = "automicus";
repo = "PyISY";
rev = "refs/tags/v${version}";
- hash = "sha256-4thCP9Xc3dtL6IaP863sW/L4aj4+QIPFv6p0kFLGh7E=";
+ hash = "sha256-FWv5xPUQob+UlTU9eq9HYAhxCDucOZr+ddm5/a0sbgw=";
};
postPatch = ''
diff --git a/pkgs/development/tools/misc/nrf-command-line-tools/default.nix b/pkgs/development/tools/misc/nrf-command-line-tools/default.nix
new file mode 100755
index 000000000000..fec7caacce3a
--- /dev/null
+++ b/pkgs/development/tools/misc/nrf-command-line-tools/default.nix
@@ -0,0 +1,72 @@
+{ lib
+, stdenv
+, fetchurl
+, autoPatchelfHook
+, udev
+, libusb1
+, segger-jlink
+}:
+
+let
+ supported = {
+ x86_64-linux = {
+ name = "linux-amd64";
+ sha256 = "0e036afa51c83de7824ef75d34e165ed55efc486697b8ff105639644bce988e5";
+ };
+ i686-linux = {
+ name = "linux-i386";
+ sha256 = "ba208559ae1195a0d4342374a0eb79697d31d6b848d180ac906494f17f56623b";
+ };
+ aarch64-linux = {
+ name = "linux-arm64";
+ sha256 = "cffa4b8becdb5545705fd138422c648d809b520b7bc6c77b8b50aa1f79ebe845";
+ };
+ armv7l-linux = {
+ name = "linux-armhf";
+ sha256 = "c58d330152ae1ef588a5ee1d93777e18b341d4f6a2754642b0ddd41821050a3a";
+ };
+ };
+
+ platform = supported.${stdenv.system} or (throw "unsupported platform ${stdenv.system}");
+
+ version = "10.16.0";
+
+ url = "https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-command-line-tools/sw/versions-${lib.versions.major version}-x-x/${lib.versions.major version}-${lib.versions.minor version}-${lib.versions.patch version}/nrf-command-line-tools-${lib.versions.major version}.${lib.versions.minor version}.${lib.versions.patch version}_${platform.name}.tar.gz";
+
+in stdenv.mkDerivation {
+ pname = "nrf-command-line-tools";
+ inherit version;
+
+ src = fetchurl {
+ inherit url;
+ inherit (platform) sha256;
+ };
+
+ runtimeDependencies = [ segger-jlink ];
+
+ nativeBuildInputs = [ autoPatchelfHook ];
+ buildInputs = [ udev libusb1 ];
+
+ dontConfigure = true;
+ dontBuild = true;
+
+ installPhase = ''
+ runHook preInstall
+
+ rm -rf ./python
+ mkdir -p $out
+ cp -r * $out
+
+ chmod +x $out/lib/*
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Nordic Semiconductor nRF Command Line Tools";
+ homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Command-Line-Tools";
+ license = licenses.unfree;
+ platforms = attrNames supported;
+ maintainers = with maintainers; [ stargate01 ];
+ };
+}
diff --git a/pkgs/development/tools/misc/segger-jlink/default.nix b/pkgs/development/tools/misc/segger-jlink/default.nix
new file mode 100755
index 000000000000..15ddbbc88098
--- /dev/null
+++ b/pkgs/development/tools/misc/segger-jlink/default.nix
@@ -0,0 +1,120 @@
+{ lib
+, stdenv
+, fetchurl
+, autoPatchelfHook
+, qt4
+, udev
+, config
+, acceptLicense ? config.segger-jlink.acceptLicense or false
+}:
+
+let
+ supported = {
+ x86_64-linux = {
+ name = "x86_64";
+ sha256 = "90aa7e4f5eae6e60fd41978111b3ff124ba0269562d0d0ec3110d3cb4bb51fe2";
+ };
+ i686-linux = {
+ name = "i386";
+ sha256 = "18aea42cd17591cada78af7cba0f94a9d851e9d29995b6c8e1e7033d0af35d1c";
+ };
+ aarch64-linux = {
+ name = "arm64";
+ sha256 = "db410c1df80748827b4e25ff3abceee29e28305a0a7e30e4e39bb5c7e32f1aa2";
+ };
+ armv7l-linux = {
+ name = "arm";
+ sha256 = "abcdaf44aeb2ad4e769709ec4fe971e259b23d297a98f58199c7bdf26db82e84";
+ };
+ };
+
+ platform = supported.${stdenv.system} or (throw "unsupported platform ${stdenv.system}");
+
+ version = "766";
+
+ url = "https://www.segger.com/downloads/jlink/JLink_Linux_V${version}_${platform.name}.tgz";
+
+in stdenv.mkDerivation {
+ pname = "segger-jlink";
+ inherit version;
+
+ src =
+ assert !acceptLicense -> throw ''
+ Use of the "SEGGER JLink Software and Documentation pack" requires the
+ acceptance of the following licenses:
+
+ - SEGGER Downloads Terms of Use [1]
+ - SEGGER Software Licensing [2]
+
+ You can express acceptance by setting acceptLicense to true in your
+ configuration. Note that this is not a free license so it requires allowing
+ unfree licenses as well.
+
+ configuration.nix:
+ nixpkgs.config.allowUnfree = true;
+ nixpkgs.config.segger-jlink.acceptLicense = true;
+
+ config.nix:
+ allowUnfree = true;
+ segger-jlink.acceptLicense = true;
+
+ [1]: ${url}
+ [2]: https://www.segger.com/purchase/licensing/
+ '';
+ fetchurl {
+ inherit url;
+ inherit (platform) sha256;
+ curlOpts = "--data accept_license_agreement=accepted";
+ };
+
+ # Currently blocked by patchelf bug
+ # https://github.com/NixOS/patchelf/pull/275
+ #runtimeDependencies = [ udev ];
+
+ nativeBuildInputs = [ autoPatchelfHook ];
+ buildInputs = [ qt4 udev ];
+
+ dontConfigure = true;
+ dontBuild = true;
+
+ installPhase = ''
+ runHook preInstall
+
+ # Install binaries
+ mkdir -p $out/bin
+ mv J* $out/bin
+
+ # Install libraries
+ mkdir -p $out/lib
+ mv libjlinkarm.so* $out/lib
+ # This library is opened via dlopen at runtime
+ for libr in $out/lib/*; do
+ ln -s $libr $out/bin
+ done
+
+ # Install docs and examples
+ mkdir -p $out/share/docs
+ mv Doc/* $out/share/docs
+ mkdir -p $out/share/examples
+ mv Samples/* $out/share/examples
+
+ # Install udev rule
+ mkdir -p $out/lib/udev/rules.d
+ mv 99-jlink.rules $out/lib/udev/rules.d/
+
+ runHook postInstall
+ '';
+
+ preFixup = ''
+ # Workaround to setting runtime dependecy
+ patchelf --add-needed libudev.so.1 $out/lib/libjlinkarm.so
+ '';
+
+ meta = with lib; {
+ description = "J-Link Software and Documentation pack";
+ homepage = "https://www.segger.com/downloads/jlink/#J-LinkSoftwareAndDocumentationPack";
+ license = licenses.unfree;
+ platforms = attrNames supported;
+ maintainers = with maintainers; [ FlorianFranzen stargate01 ];
+ };
+}
diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
index 3c6207890e23..8e1650f4087d 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "evdi";
- version = "1.10.1";
+ version = "1.11.0";
src = fetchFromGitHub {
owner = "DisplayLink";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-XABpC2g4/e6/2HsHzrBUs6OW1lzgGBYlFAatVcA/vD8=";
+ sha256 = "12n2xbpw2901cvzw467saqqsgs4mwrzp7fs5j2vlyl7kwpcr0pj0";
};
NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare";
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
install -Dm755 library/libevdi.so $out/lib/libevdi.so
'';
+ enableParallelBuilding = true;
+
meta = with lib; {
description = "Extensible Virtual Display Interface";
maintainers = with maintainers; [ eyjhb ];
diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix
index ebeb3516f243..32b3e636ac56 100644
--- a/pkgs/os-specific/linux/open-iscsi/default.nix
+++ b/pkgs/os-specific/linux/open-iscsi/default.nix
@@ -22,8 +22,6 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-DUSE_KMOD";
preConfigure = ''
- sed -i 's|/usr|/|' Makefile
-
# Remove blanket -Werror. Fails for minor error on gcc-11.
substituteInPlace usr/Makefile --replace ' -Werror ' ' '
'';
@@ -32,11 +30,12 @@ stdenv.mkDerivation rec {
makeFlags = [
"INSTALL=install"
"SED=sed"
+ "prefix=/"
+ "manprefix=/share"
];
installFlags = [
"install"
- "install_systemd"
];
postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1cafc5e0f3e..31365fd641b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3903,6 +3903,19 @@ with pkgs;
humioctl = callPackage ../applications/logging/humioctl {};
+ hyprland = callPackage ../applications/window-managers/hyprland {
+ wlroots = wlroots.overrideAttrs (_: {
+ version = "unstable-2022-06-07";
+ src = fetchFromGitLab {
+ domain = "gitlab.freedesktop.org";
+ owner = "wlroots";
+ repo = "wlroots";
+ rev = "b89ed9015c3fbe8d339e9d65cf70fdca6e5645bc";
+ sha256 = "sha256-8y3u8CoigjoZOVbA2wCWBHlDNEakv0AVxU46/cOC00s=";
+ };
+ });
+ };
+
hyx = callPackage ../tools/text/hyx { };
icdiff = callPackage ../tools/text/icdiff {};
@@ -14496,6 +14509,8 @@ with pkgs;
hadoop3 = hadoop_3_3;
hadoop = hadoop3;
+ hashlink = callPackage ../development/interpreters/hashlink { };
+
io = callPackage ../development/interpreters/io { };
ivy = callPackage ../development/interpreters/ivy { };
@@ -16159,6 +16174,8 @@ with pkgs;
sdk = true;
};
+ nrf-command-line-tools = callPackage ../development/tools/misc/nrf-command-line-tools { };
+
nrf5-sdk = callPackage ../development/libraries/nrf5-sdk { };
nrfutil = callPackage ../development/tools/misc/nrfutil { };
@@ -16402,6 +16419,8 @@ with pkgs;
scss-lint = callPackage ../development/tools/scss-lint { };
+ segger-jlink = callPackage ../development/tools/misc/segger-jlink { };
+
segger-ozone = callPackage ../development/tools/misc/segger-ozone { };
selene = callPackage ../development/tools/selene {