Merge master into staging-next
This commit is contained in:
commit
9c190d28df
|
@ -250,8 +250,7 @@ rec {
|
||||||
|
|
||||||
# BSDs
|
# BSDs
|
||||||
|
|
||||||
# Deprecate
|
amd64-netbsd = lib.warn "The amd64-netbsd system example is deprecated. Use x86_64-netbsd instead." x86_64-netbsd;
|
||||||
amd64-netbsd = x86_64-netbsd;
|
|
||||||
|
|
||||||
x86_64-netbsd = {
|
x86_64-netbsd = {
|
||||||
config = "x86_64-unknown-netbsd";
|
config = "x86_64-unknown-netbsd";
|
||||||
|
|
|
@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "carla";
|
pname = "carla";
|
||||||
version = "2.2.0";
|
version = "2.3.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "falkTX";
|
owner = "falkTX";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "B4xoRuNEW4Lz9haP8fqxOTcysGTNEXFOq9UXqUJLSFw=";
|
sha256 = "sha256-724EFBpbmPMuU1m3T0XMaeohURJA5JcxHfUPYbZ/2LE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -1,20 +1,20 @@
|
||||||
{
|
{
|
||||||
"stable": {
|
"stable": {
|
||||||
"version": "89.0.4389.128",
|
"version": "90.0.4430.72",
|
||||||
"sha256": "0nysvsck91yxcb3wf6v3nzar77k7j9bby7xfzsvd7wlqxdmflx8s",
|
"sha256": "0hw916j55lm3qnidfp92i8w6zywdd47rhihn9pn23b7ziz58ik55",
|
||||||
"sha256bin64": "07m43yqq6j7mfhdnm127p29b2611l8lmbq87iszlgg6dgkqxa0qr",
|
"sha256bin64": "0k1m786b94kh7r2c58qj8b9a39yr4m30kkrxk5d9q7dn1abl3wa3",
|
||||||
"deps": {
|
"deps": {
|
||||||
"gn": {
|
"gn": {
|
||||||
"version": "2021-01-07",
|
"version": "2021-02-09",
|
||||||
"url": "https://gn.googlesource.com/gn",
|
"url": "https://gn.googlesource.com/gn",
|
||||||
"rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140",
|
"rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3",
|
||||||
"sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d"
|
"sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"chromedriver": {
|
"chromedriver": {
|
||||||
"version": "89.0.4389.23",
|
"version": "90.0.4430.24",
|
||||||
"sha256_linux": "169inx1xl7750mdd1g7yji72m33kvpk7h1dy4hyj0qignrifdm0r",
|
"sha256_linux": "0byibxrs4ggid8qn5h72mmnw8l4y8xya2q1jbc6z74pmw8r9hkj7",
|
||||||
"sha256_darwin": "1a84nn4rnd215h4sjghmw03mdr49wyab8j4vlnv3xp516yn07gr3"
|
"sha256_darwin": "0psll7vahj43jkj1wqq7mygf18l7ivp56ckc8wv4w5bnfmqv660k"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"beta": {
|
"beta": {
|
||||||
|
|
|
@ -1,4 +1,10 @@
|
||||||
{ lib, stdenv, fetchgit, fetchpatch, cmake, pkg-config, libusb1 }:
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchgit
|
||||||
|
, cmake
|
||||||
|
, pkg-config
|
||||||
|
, libusb1
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "rtl-sdr";
|
pname = "rtl-sdr";
|
||||||
|
@ -10,34 +16,25 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "0lmvsnb4xw4hmz6zs0z5ilsah5hjz29g1s0050n59fllskqr3b8k";
|
sha256 = "0lmvsnb4xw4hmz6zs0z5ilsah5hjz29g1s0050n59fllskqr3b8k";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ (fetchpatch {
|
postPatch = ''
|
||||||
name = "hardened-udev-rules.patch";
|
substituteInPlace CMakeLists.txt \
|
||||||
url = "https://osmocom.org/projects/rtl-sdr/repository/revisions/b2814731563be4d5a0a68554ece6454a2c63af12/diff?format=diff";
|
--replace '/etc/udev/rules.d' "$out/etc/udev/rules.d"
|
||||||
sha256 = "0ns740s2rys4glq4la4bh0sxfv1mn61yfjns2yllhx70rsb2fqrn";
|
|
||||||
}) ];
|
substituteInPlace rtl-sdr.rules \
|
||||||
|
--replace 'MODE:="0666"' 'ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev"'
|
||||||
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config cmake ];
|
nativeBuildInputs = [ pkg-config cmake ];
|
||||||
|
|
||||||
buildInputs = [ libusb1 ];
|
buildInputs = [ libusb1 ];
|
||||||
|
|
||||||
# TODO: get these fixes upstream:
|
cmakeFlags = lib.optional stdenv.isLinux "-DINSTALL_UDEV_RULES=ON";
|
||||||
# * Building with -DINSTALL_UDEV_RULES=ON tries to install udev rules to
|
|
||||||
# /etc/udev/rules.d/, and there is no option to install elsewhere. So install
|
|
||||||
# rules manually.
|
|
||||||
# * Propagate libusb-1.0 dependency in pkg-config file.
|
|
||||||
postInstall = lib.optionalString stdenv.isLinux ''
|
|
||||||
mkdir -p "$out/etc/udev/rules.d/"
|
|
||||||
cp ../rtl-sdr.rules "$out/etc/udev/rules.d/99-rtl-sdr.rules"
|
|
||||||
|
|
||||||
pcfile="$out"/lib/pkgconfig/librtlsdr.pc
|
|
||||||
grep -q "Requires:" "$pcfile" && { echo "Upstream has added 'Requires:' in $(basename "$pcfile"); update nix expression."; exit 1; }
|
|
||||||
echo "Requires: libusb-1.0" >> "$pcfile"
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver";
|
description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver";
|
||||||
homepage = "http://sdr.osmocom.org/trac/wiki/rtl-sdr";
|
homepage = "http://github.com/librtlsdr/librtlsdr";
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
|
maintainers = with maintainers; [ bjornfor ];
|
||||||
platforms = platforms.linux ++ platforms.darwin;
|
platforms = platforms.linux ++ platforms.darwin;
|
||||||
maintainers = [ maintainers.bjornfor ];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,54 +1,78 @@
|
||||||
{
|
{ airspy
|
||||||
airspy,
|
, boost
|
||||||
boost,
|
, cm256cc
|
||||||
cm256cc,
|
, cmake
|
||||||
cmake,
|
, codec2
|
||||||
codec2,
|
, fetchFromGitHub
|
||||||
fetchFromGitHub,
|
, fftwFloat
|
||||||
fftwFloat,
|
, glew
|
||||||
glew,
|
, hackrf
|
||||||
hackrf,
|
, lib
|
||||||
lib,
|
, ffmpeg
|
||||||
ffmpeg,
|
, libiio
|
||||||
libiio,
|
, libopus
|
||||||
libopus,
|
, libpulseaudio
|
||||||
libpulseaudio,
|
, libusb1
|
||||||
libusb1,
|
, limesuite
|
||||||
limesuite,
|
, libbladeRF
|
||||||
libbladeRF,
|
, mkDerivation
|
||||||
mkDerivation,
|
, ocl-icd
|
||||||
ocl-icd,
|
, opencv3
|
||||||
opencv3,
|
, pkg-config
|
||||||
pkg-config,
|
, qtcharts
|
||||||
qtbase,
|
, qtlocation
|
||||||
qtmultimedia,
|
, qtmultimedia
|
||||||
qtserialport,
|
, qtserialport
|
||||||
qtwebsockets,
|
, qtspeech
|
||||||
rtl-sdr,
|
, qtwebsockets
|
||||||
serialdv,
|
, rtl-sdr
|
||||||
soapysdr-with-plugins,
|
, serialdv
|
||||||
uhd
|
, soapysdr-with-plugins
|
||||||
|
, uhd
|
||||||
}:
|
}:
|
||||||
|
|
||||||
mkDerivation rec {
|
mkDerivation rec {
|
||||||
pname = "sdrangel";
|
pname = "sdrangel";
|
||||||
version = "6.4.0";
|
version = "6.8.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "f4exb";
|
owner = "f4exb";
|
||||||
repo = "sdrangel";
|
repo = "sdrangel";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "4iJoKs0BHmBR6JRFuTIqs0GW3SjhPRMPRlqdyTI38T4=";
|
sha256 = "sha256-dFWwEs2nvcaCWpM4tA3/w8PbmNXn/R7JvxP3XEHasSQ=";
|
||||||
fetchSubmodules = false;
|
fetchSubmodules = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config ];
|
nativeBuildInputs = [ cmake pkg-config ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
glew opencv3 libusb1 boost libopus limesuite ffmpeg libiio libpulseaudio
|
airspy
|
||||||
qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf
|
boost
|
||||||
fftwFloat codec2 cm256cc serialdv qtserialport
|
cm256cc
|
||||||
libbladeRF uhd soapysdr-with-plugins
|
codec2
|
||||||
|
ffmpeg
|
||||||
|
fftwFloat
|
||||||
|
glew
|
||||||
|
hackrf
|
||||||
|
libbladeRF
|
||||||
|
libiio
|
||||||
|
libopus
|
||||||
|
libpulseaudio
|
||||||
|
libusb1
|
||||||
|
limesuite
|
||||||
|
opencv3
|
||||||
|
qtcharts
|
||||||
|
qtlocation
|
||||||
|
qtmultimedia
|
||||||
|
qtserialport
|
||||||
|
qtspeech
|
||||||
|
qtwebsockets
|
||||||
|
rtl-sdr
|
||||||
|
serialdv
|
||||||
|
soapysdr-with-plugins
|
||||||
|
uhd
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv"
|
"-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv"
|
||||||
"-DLIMESUITE_INCLUDE_DIR:PATH=${limesuite}/include"
|
"-DLIMESUITE_INCLUDE_DIR:PATH=${limesuite}/include"
|
||||||
|
@ -65,7 +89,7 @@ mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
homepage = "https://github.com/f4exb/sdrangel";
|
homepage = "https://github.com/f4exb/sdrangel";
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = with maintainers; [ alkeryn ];
|
maintainers = with maintainers; [ alkeryn ];
|
||||||
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,25 +2,33 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gh";
|
pname = "gh";
|
||||||
version = "1.8.1";
|
version = "1.9.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cli";
|
owner = "cli";
|
||||||
repo = "cli";
|
repo = "cli";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1q0vc9wr4n813mxkf7jjj3prw1n7xv4l985qd57pg4a2js1dqa1y";
|
sha256 = "03i1x1j07vpq81c9dmpvpya21hwz9q54zm4przvc12jadgb31y1i";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "1wv30z0jg195nkpz3rwvhixyw81lg2wzwwajq9g6s3rfjj8gs9v2";
|
vendorSha256 = "0j2jy7n7hca5ybwwgh7cvm77j96ngaq1a1l5bl70vjpd8hz2qapc";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
# upstream unsets these to handle cross but it breaks our build
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace Makefile \
|
||||||
|
--replace "GOOS= GOARCH= GOARM= GOFLAGS= CGO_ENABLED=" ""
|
||||||
|
'';
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
export GO_LDFLAGS="-s -w"
|
runHook preBuild
|
||||||
make GH_VERSION=${version} bin/gh manpages
|
make GO_LDFLAGS="-s -w" GH_VERSION=${version} bin/gh manpages
|
||||||
|
runHook postBuild
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
install -Dm755 bin/gh -t $out/bin
|
install -Dm755 bin/gh -t $out/bin
|
||||||
installManPage share/man/*/*.[1-9]
|
installManPage share/man/*/*.[1-9]
|
||||||
|
|
||||||
|
@ -28,6 +36,7 @@ buildGoModule rec {
|
||||||
$out/bin/gh completion -s $shell > gh.$shell
|
$out/bin/gh completion -s $shell > gh.$shell
|
||||||
installShellCompletion gh.$shell
|
installShellCompletion gh.$shell
|
||||||
done
|
done
|
||||||
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# fails with `unable to find git executable in PATH`
|
# fails with `unable to find git executable in PATH`
|
||||||
|
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation {
|
||||||
'' + lib.optionalString stdenv.isDarwin ''
|
'' + lib.optionalString stdenv.isDarwin ''
|
||||||
export TRIPLE=x86_64-apple-darwin
|
export TRIPLE=x86_64-apple-darwin
|
||||||
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||||
patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
|
patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch}
|
||||||
'' + lib.optionalString stdenv.hostPlatform.isWasm ''
|
'' + lib.optionalString stdenv.hostPlatform.isWasm ''
|
||||||
patch -p1 -d $(ls -d llvm-*) -i ${./wasm.patch}
|
patch -p1 -d $(ls -d llvm-*) -i ${./wasm.patch}
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation {
|
||||||
'' + lib.optionalString stdenv.isDarwin ''
|
'' + lib.optionalString stdenv.isDarwin ''
|
||||||
export TRIPLE=x86_64-apple-darwin
|
export TRIPLE=x86_64-apple-darwin
|
||||||
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||||
patch -p1 -d libcxx -i ${../libcxx-0001-musl-hacks.patch}
|
patch -p1 -d libcxx -i ${../../libcxx-0001-musl-hacks.patch}
|
||||||
'' + lib.optionalString stdenv.hostPlatform.isWasm ''
|
'' + lib.optionalString stdenv.hostPlatform.isWasm ''
|
||||||
patch -p1 -d llvm -i ${./wasm.patch}
|
patch -p1 -d llvm -i ${./wasm.patch}
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation {
|
||||||
'' + lib.optionalString stdenv.isDarwin ''
|
'' + lib.optionalString stdenv.isDarwin ''
|
||||||
export TRIPLE=x86_64-apple-darwin
|
export TRIPLE=x86_64-apple-darwin
|
||||||
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||||
patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
|
patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = if stdenv.isDarwin
|
installPhase = if stdenv.isDarwin
|
||||||
|
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation {
|
||||||
'' + lib.optionalString stdenv.isDarwin ''
|
'' + lib.optionalString stdenv.isDarwin ''
|
||||||
export TRIPLE=x86_64-apple-darwin
|
export TRIPLE=x86_64-apple-darwin
|
||||||
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||||
patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
|
patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = if stdenv.isDarwin
|
installPhase = if stdenv.isDarwin
|
||||||
|
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
||||||
'' + lib.optionalString stdenv.isDarwin ''
|
'' + lib.optionalString stdenv.isDarwin ''
|
||||||
export TRIPLE=x86_64-apple-darwin
|
export TRIPLE=x86_64-apple-darwin
|
||||||
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||||
patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
|
patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
cmakeFlags =
|
cmakeFlags =
|
||||||
|
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation {
|
||||||
'' + lib.optionalString stdenv.isDarwin ''
|
'' + lib.optionalString stdenv.isDarwin ''
|
||||||
export TRIPLE=x86_64-apple-darwin
|
export TRIPLE=x86_64-apple-darwin
|
||||||
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||||
patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
|
patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch}
|
||||||
'' + lib.optionalString stdenv.hostPlatform.isWasm ''
|
'' + lib.optionalString stdenv.hostPlatform.isWasm ''
|
||||||
patch -p1 -d $(ls -d llvm-*) -i ${./wasm.patch}
|
patch -p1 -d $(ls -d llvm-*) -i ${./wasm.patch}
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation {
|
||||||
'' + lib.optionalString stdenv.isDarwin ''
|
'' + lib.optionalString stdenv.isDarwin ''
|
||||||
export TRIPLE=x86_64-apple-darwin
|
export TRIPLE=x86_64-apple-darwin
|
||||||
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||||
patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
|
patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch}
|
||||||
'' + lib.optionalString stdenv.hostPlatform.isWasm ''
|
'' + lib.optionalString stdenv.hostPlatform.isWasm ''
|
||||||
patch -p1 -d $(ls -d llvm-*) -i ${./wasm.patch}
|
patch -p1 -d $(ls -d llvm-*) -i ${./wasm.patch}
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "entt";
|
pname = "entt";
|
||||||
version = "3.7.0";
|
version = "3.7.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "skypjack";
|
owner = "skypjack";
|
||||||
repo = "entt";
|
repo = "entt";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-qDjt74nijZhXW7F7GW0CSv6JWOc/kXN7ndbkwSO0+1s=";
|
sha256 = "sha256-t1QRqasb82W277XEV2FG5JrsQWIWZ0G5V7wLI+p4MpQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
39
pkgs/development/libraries/librtlsdr/default.nix
Normal file
39
pkgs/development/libraries/librtlsdr/default.nix
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, cmake
|
||||||
|
, pkg-config
|
||||||
|
, libusb1
|
||||||
|
}:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "librtlsdr";
|
||||||
|
version = "0.8.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "librtlsdr";
|
||||||
|
repo = "librtlsdr";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "sha256-s03h+3EfC5c7yRYBM6aCRWtmstwRJWuBywuyVt+k/bk=";
|
||||||
|
};
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace CMakeLists.txt \
|
||||||
|
--replace '/etc/udev/rules.d' "$out/etc/udev/rules.d"
|
||||||
|
|
||||||
|
substituteInPlace rtl-sdr.rules \
|
||||||
|
--replace 'MODE:="0666"' 'ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev"'
|
||||||
|
'';
|
||||||
|
|
||||||
|
nativeBuildInputs = [ pkg-config cmake ];
|
||||||
|
|
||||||
|
buildInputs = [ libusb1 ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver";
|
||||||
|
homepage = "http://github.com/librtlsdr/librtlsdr";
|
||||||
|
license = licenses.gpl2Plus;
|
||||||
|
maintainers = with maintainers; [ bjornfor ];
|
||||||
|
platforms = platforms.linux ++ platforms.darwin;
|
||||||
|
};
|
||||||
|
}
|
49
pkgs/development/ocaml-modules/wayland/default.nix
Normal file
49
pkgs/development/ocaml-modules/wayland/default.nix
Normal file
|
@ -0,0 +1,49 @@
|
||||||
|
{ lib
|
||||||
|
, buildDunePackage
|
||||||
|
, fetchurl
|
||||||
|
, xmlm
|
||||||
|
, lwt
|
||||||
|
, logs
|
||||||
|
, fmt
|
||||||
|
, cstruct
|
||||||
|
, cmdliner
|
||||||
|
, alcotest-lwt
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildDunePackage rec {
|
||||||
|
pname = "wayland";
|
||||||
|
version = "0.2";
|
||||||
|
|
||||||
|
minimumOCamlVersion = "4.08";
|
||||||
|
|
||||||
|
useDune2 = true;
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://github.com/talex5/ocaml-wayland/releases/download/v${version}/wayland-v${version}.tbz";
|
||||||
|
sha256 = "4eb323e42a8c64e9e49b15a588342bfcc1e99640305cb261d128c75612d9458c";
|
||||||
|
};
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
lwt
|
||||||
|
logs
|
||||||
|
fmt
|
||||||
|
cstruct
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
cmdliner
|
||||||
|
xmlm
|
||||||
|
];
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
alcotest-lwt
|
||||||
|
];
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Pure OCaml Wayland protocol library";
|
||||||
|
license = lib.licenses.asl20;
|
||||||
|
maintainers = [ lib.maintainers.sternenseemann ];
|
||||||
|
homepage = "https://github.com/talex5/ocaml-wayland";
|
||||||
|
};
|
||||||
|
}
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "fly";
|
pname = "fly";
|
||||||
version = "7.1.0";
|
version = "7.2.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "concourse";
|
owner = "concourse";
|
||||||
repo = "concourse";
|
repo = "concourse";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-M0Jo4DyvPghhVLK3eFdew10lGUJJODxKoL+v16y9CW8=";
|
sha256 = "sha256-uKzN5h2gJqsD25ETgfYqu4ijC2b0ZLGdMGTiliFOatA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-W6m+nDNcZBVfa1OTkOHWf4E9LmEUewsTLT/56Iyp6+Y=";
|
vendorSha256 = "sha256-2PvXylOPVA0/mIQhhKv8o65bfAxkvKP6FPunzTWwVtI=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
|
@ -238,7 +238,7 @@ in
|
||||||
buildPlatform hostPlatform targetPlatform
|
buildPlatform hostPlatform targetPlatform
|
||||||
initialPath shell fetchurlBoot;
|
initialPath shell fetchurlBoot;
|
||||||
|
|
||||||
cc = import ../../build-support/cc-wrapper {
|
cc = lib.makeOverridable (import ../../build-support/cc-wrapper) {
|
||||||
inherit lib;
|
inherit lib;
|
||||||
nativeTools = true;
|
nativeTools = true;
|
||||||
nativePrefix = "/usr";
|
nativePrefix = "/usr";
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "grit";
|
pname = "grit";
|
||||||
version = "0.2.0";
|
version = "0.3.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "climech";
|
owner = "climech";
|
||||||
repo = "grit";
|
repo = "grit";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0v4i8xdf1pgkmwad5jb6n6s4rx48zk57wij0ppzg6zb725wy7r8a";
|
sha256 = "sha256-c8wBwmXFjpst6UxL5zmTxMR4bhzpHYljQHiJFKiNDms=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "0a1lqfn710fgvrvbimd92102fhjs1wa7r8i0l7s5m7jxks629hw8";
|
vendorSha256 = "sha256-iMMkjJ5dnlr0oSCifBQPWkInQBCp1bh23s+BcKzDNCg=";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A multitree-based personal task manager";
|
description = "A multitree-based personal task manager";
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "lf";
|
pname = "lf";
|
||||||
version = "21";
|
version = "22";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gokcehan";
|
owner = "gokcehan";
|
||||||
repo = "lf";
|
repo = "lf";
|
||||||
rev = "r${version}";
|
rev = "r${version}";
|
||||||
sha256 = "0j7c21lsgcc39ng9ni94y3zfcqwyf9jc52fi8mcpkp0lpcx5ava9";
|
sha256 = "10zmac9xza2v7l13zkavmc34ppcpmb82v8dxvrv4ggm261ns1abr";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "15fl9v69wkzwzpq6x4xhcd5g6xyck3mlpbz1bbb61l75jjzg913m";
|
vendorSha256 = "1yjsig2x6zrxdjnds6nqqq3r3g5lq8g9dvmz60nbifqhcx112bcw";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
@ -35,6 +35,6 @@ buildGoModule rec {
|
||||||
changelog = "https://github.com/gokcehan/lf/releases/tag/r${version}";
|
changelog = "https://github.com/gokcehan/lf/releases/tag/r${version}";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = with maintainers; [ primeos ];
|
maintainers = with maintainers; [ ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -25587,7 +25587,9 @@ in
|
||||||
|
|
||||||
rtl-ais = callPackage ../applications/radio/rtl-ais { };
|
rtl-ais = callPackage ../applications/radio/rtl-ais { };
|
||||||
|
|
||||||
|
# librtlsdr is a friendly fork with additional features
|
||||||
rtl-sdr = callPackage ../applications/radio/rtl-sdr { };
|
rtl-sdr = callPackage ../applications/radio/rtl-sdr { };
|
||||||
|
librtlsdr = callPackage ../development/libraries/librtlsdr { };
|
||||||
|
|
||||||
rtv = callPackage ../applications/misc/rtv { };
|
rtv = callPackage ../applications/misc/rtv { };
|
||||||
|
|
||||||
|
|
|
@ -1195,6 +1195,8 @@ let
|
||||||
|
|
||||||
wasm = callPackage ../development/ocaml-modules/wasm { };
|
wasm = callPackage ../development/ocaml-modules/wasm { };
|
||||||
|
|
||||||
|
wayland = callPackage ../development/ocaml-modules/wayland { };
|
||||||
|
|
||||||
webbrowser = callPackage ../development/ocaml-modules/webbrowser { };
|
webbrowser = callPackage ../development/ocaml-modules/webbrowser { };
|
||||||
|
|
||||||
webmachine = callPackage ../development/ocaml-modules/webmachine { };
|
webmachine = callPackage ../development/ocaml-modules/webmachine { };
|
||||||
|
|
Loading…
Reference in a new issue