diff options
22 files changed, 218 insertions, 97 deletions
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 13779a9b0cff3..9c0013c397788 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -250,8 +250,7 @@ rec { # BSDs - # Deprecate - amd64-netbsd = x86_64-netbsd; + amd64-netbsd = lib.warn "The amd64-netbsd system example is deprecated. Use x86_64-netbsd instead." x86_64-netbsd; x86_64-netbsd = { config = "x86_64-unknown-netbsd"; diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 40fb0cfda596d..a9c0ffdfb6416 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null; stdenv.mkDerivation rec { pname = "carla"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "falkTX"; repo = pname; rev = "v${version}"; - sha256 = "B4xoRuNEW4Lz9haP8fqxOTcysGTNEXFOq9UXqUJLSFw="; + sha256 = "sha256-724EFBpbmPMuU1m3T0XMaeohURJA5JcxHfUPYbZ/2LE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 61cd10df3d5b2..48ab02d0b9655 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,20 +1,20 @@ { "stable": { - "version": "89.0.4389.128", - "sha256": "0nysvsck91yxcb3wf6v3nzar77k7j9bby7xfzsvd7wlqxdmflx8s", - "sha256bin64": "07m43yqq6j7mfhdnm127p29b2611l8lmbq87iszlgg6dgkqxa0qr", + "version": "90.0.4430.72", + "sha256": "0hw916j55lm3qnidfp92i8w6zywdd47rhihn9pn23b7ziz58ik55", + "sha256bin64": "0k1m786b94kh7r2c58qj8b9a39yr4m30kkrxk5d9q7dn1abl3wa3", "deps": { "gn": { - "version": "2021-01-07", + "version": "2021-02-09", "url": "https://gn.googlesource.com/gn", - "rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140", - "sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d" + "rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3", + "sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn" } }, "chromedriver": { - "version": "89.0.4389.23", - "sha256_linux": "169inx1xl7750mdd1g7yji72m33kvpk7h1dy4hyj0qignrifdm0r", - "sha256_darwin": "1a84nn4rnd215h4sjghmw03mdr49wyab8j4vlnv3xp516yn07gr3" + "version": "90.0.4430.24", + "sha256_linux": "0byibxrs4ggid8qn5h72mmnw8l4y8xya2q1jbc6z74pmw8r9hkj7", + "sha256_darwin": "0psll7vahj43jkj1wqq7mygf18l7ivp56ckc8wv4w5bnfmqv660k" } }, "beta": { diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix index 2fe57eaf29687..2df7c3829c85a 100644 --- a/pkgs/applications/radio/rtl-sdr/default.nix +++ b/pkgs/applications/radio/rtl-sdr/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchgit, fetchpatch, cmake, pkg-config, libusb1 }: +{ lib +, stdenv +, fetchgit +, cmake +, pkg-config +, libusb1 +}: stdenv.mkDerivation rec { pname = "rtl-sdr"; @@ -10,34 +16,25 @@ stdenv.mkDerivation rec { sha256 = "0lmvsnb4xw4hmz6zs0z5ilsah5hjz29g1s0050n59fllskqr3b8k"; }; - patches = [ (fetchpatch { - name = "hardened-udev-rules.patch"; - url = "https://osmocom.org/projects/rtl-sdr/repository/revisions/b2814731563be4d5a0a68554ece6454a2c63af12/diff?format=diff"; - sha256 = "0ns740s2rys4glq4la4bh0sxfv1mn61yfjns2yllhx70rsb2fqrn"; - }) ]; + 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 ]; - # TODO: get these fixes upstream: - # * 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" - ''; + cmakeFlags = lib.optional stdenv.isLinux "-DINSTALL_UDEV_RULES=ON"; meta = with lib; { 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; + maintainers = with maintainers; [ bjornfor ]; platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 6f723971c8e6b..ff3ca497c7fcf 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -1,54 +1,78 @@ -{ -airspy, -boost, -cm256cc, -cmake, -codec2, -fetchFromGitHub, -fftwFloat, -glew, -hackrf, -lib, -ffmpeg, -libiio, -libopus, -libpulseaudio, -libusb1, -limesuite, -libbladeRF, -mkDerivation, -ocl-icd, -opencv3, -pkg-config, -qtbase, -qtmultimedia, -qtserialport, -qtwebsockets, -rtl-sdr, -serialdv, -soapysdr-with-plugins, -uhd +{ airspy +, boost +, cm256cc +, cmake +, codec2 +, fetchFromGitHub +, fftwFloat +, glew +, hackrf +, lib +, ffmpeg +, libiio +, libopus +, libpulseaudio +, libusb1 +, limesuite +, libbladeRF +, mkDerivation +, ocl-icd +, opencv3 +, pkg-config +, qtcharts +, qtlocation +, qtmultimedia +, qtserialport +, qtspeech +, qtwebsockets +, rtl-sdr +, serialdv +, soapysdr-with-plugins +, uhd }: mkDerivation rec { pname = "sdrangel"; - version = "6.4.0"; + version = "6.8.0"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - sha256 = "4iJoKs0BHmBR6JRFuTIqs0GW3SjhPRMPRlqdyTI38T4="; + sha256 = "sha256-dFWwEs2nvcaCWpM4tA3/w8PbmNXn/R7JvxP3XEHasSQ="; fetchSubmodules = false; }; nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ - glew opencv3 libusb1 boost libopus limesuite ffmpeg libiio libpulseaudio - qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf - fftwFloat codec2 cm256cc serialdv qtserialport - libbladeRF uhd soapysdr-with-plugins + airspy + boost + cm256cc + 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 = [ "-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv" "-DLIMESUITE_INCLUDE_DIR:PATH=${limesuite}/include" @@ -61,11 +85,11 @@ mkDerivation rec { meta = with lib; { description = "Software defined radio (SDR) software"; longDescription = '' - SDRangel is an Open Source Qt5 / OpenGL 3.0+ SDR and signal analyzer frontend to various hardware. + SDRangel is an Open Source Qt5 / OpenGL 3.0+ SDR and signal analyzer frontend to various hardware. ''; homepage = "https://github.com/f4exb/sdrangel"; license = licenses.gpl3Plus; - platforms = platforms.linux; maintainers = with maintainers; [ alkeryn ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 6b79d152380af..d8b4e414f1c83 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,25 +2,33 @@ buildGoModule rec { pname = "gh"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "1q0vc9wr4n813mxkf7jjj3prw1n7xv4l985qd57pg4a2js1dqa1y"; + sha256 = "03i1x1j07vpq81c9dmpvpya21hwz9q54zm4przvc12jadgb31y1i"; }; - vendorSha256 = "1wv30z0jg195nkpz3rwvhixyw81lg2wzwwajq9g6s3rfjj8gs9v2"; + vendorSha256 = "0j2jy7n7hca5ybwwgh7cvm77j96ngaq1a1l5bl70vjpd8hz2qapc"; nativeBuildInputs = [ installShellFiles ]; + # upstream unsets these to handle cross but it breaks our build + postPatch = '' + substituteInPlace Makefile \ + --replace "GOOS= GOARCH= GOARM= GOFLAGS= CGO_ENABLED=" "" + ''; + buildPhase = '' - export GO_LDFLAGS="-s -w" - make GH_VERSION=${version} bin/gh manpages + runHook preBuild + make GO_LDFLAGS="-s -w" GH_VERSION=${version} bin/gh manpages + runHook postBuild ''; installPhase = '' + runHook preInstall install -Dm755 bin/gh -t $out/bin installManPage share/man/*/*.[1-9] @@ -28,6 +36,7 @@ buildGoModule rec { $out/bin/gh completion -s $shell > gh.$shell installShellCompletion gh.$shell done + runHook postInstall ''; # fails with `unable to find git executable in PATH` diff --git a/pkgs/development/compilers/llvm/10/libc++abi/default.nix b/pkgs/development/compilers/llvm/10/libc++abi/default.nix index 7541cee1a54b1..1909996614dc3 100644 --- a/pkgs/development/compilers/llvm/10/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/10/libc++abi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin '' + 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 '' patch -p1 -d $(ls -d llvm-*) -i ${./wasm.patch} ''; diff --git a/pkgs/development/compilers/llvm/11/libc++abi/default.nix b/pkgs/development/compilers/llvm/11/libc++abi/default.nix index a95a30514152c..c35ec706a0235 100644 --- a/pkgs/development/compilers/llvm/11/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/11/libc++abi/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin '' + 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 '' patch -p1 -d llvm -i ${./wasm.patch} ''; diff --git a/pkgs/development/compilers/llvm/5/libc++abi/default.nix b/pkgs/development/compilers/llvm/5/libc++abi/default.nix index 8fc9ef9fded8d..dd148a8917f98 100644 --- a/pkgs/development/compilers/llvm/5/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++abi/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin '' + 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 diff --git a/pkgs/development/compilers/llvm/6/libc++abi/default.nix b/pkgs/development/compilers/llvm/6/libc++abi/default.nix index 6e99f2d287a69..c0d90f6c8e48e 100644 --- a/pkgs/development/compilers/llvm/6/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++abi/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin '' + 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 diff --git a/pkgs/development/compilers/llvm/7/libc++abi/default.nix b/pkgs/development/compilers/llvm/7/libc++abi/default.nix index 61879be91dad2..84c4786514168 100644 --- a/pkgs/development/compilers/llvm/7/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++abi/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin '' + 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 = diff --git a/pkgs/development/compilers/llvm/8/libc++abi/default.nix b/pkgs/development/compilers/llvm/8/libc++abi/default.nix index 411b94e62755f..bde67f86640d5 100644 --- a/pkgs/development/compilers/llvm/8/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/8/libc++abi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin '' + 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 '' patch -p1 -d $(ls -d llvm-*) -i ${./wasm.patch} ''; diff --git a/pkgs/development/compilers/llvm/9/libc++abi/default.nix b/pkgs/development/compilers/llvm/9/libc++abi/default.nix index ceb83d252a895..99d3918b89dac 100644 --- a/pkgs/development/compilers/llvm/9/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/9/libc++abi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin '' + 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 '' patch -p1 -d $(ls -d llvm-*) -i ${./wasm.patch} ''; diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix index 8efc9c05ca34b..34a4f93bb860e 100644 --- a/pkgs/development/libraries/entt/default.nix +++ b/pkgs/development/libraries/entt/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "entt"; - version = "3.7.0"; + version = "3.7.1"; src = fetchFromGitHub { owner = "skypjack"; repo = "entt"; rev = "v${version}"; - sha256 = "sha256-qDjt74nijZhXW7F7GW0CSv6JWOc/kXN7ndbkwSO0+1s="; + sha256 = "sha256-t1QRqasb82W277XEV2FG5JrsQWIWZ0G5V7wLI+p4MpQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/librtlsdr/default.nix b/pkgs/development/libraries/librtlsdr/default.nix new file mode 100644 index 0000000000000..d0bb379a70d24 --- /dev/null +++ b/pkgs/development/libraries/librtlsdr/default.nix @@ -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; + }; +} diff --git a/pkgs/development/ocaml-modules/wayland/default.nix b/pkgs/development/ocaml-modules/wayland/default.nix new file mode 100644 index 0000000000000..82764af64f53e --- /dev/null +++ b/pkgs/development/ocaml-modules/wayland/default.nix @@ -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"; + }; +} diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 895d12ecb4d7e..76f0d86ae5c4c 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "7.1.0"; + version = "7.2.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-M0Jo4DyvPghhVLK3eFdew10lGUJJODxKoL+v16y9CW8="; + sha256 = "sha256-uKzN5h2gJqsD25ETgfYqu4ijC2b0ZLGdMGTiliFOatA="; }; - vendorSha256 = "sha256-W6m+nDNcZBVfa1OTkOHWf4E9LmEUewsTLT/56Iyp6+Y="; + vendorSha256 = "sha256-2PvXylOPVA0/mIQhhKv8o65bfAxkvKP6FPunzTWwVtI="; doCheck = false; diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index 5aadfd81a20f5..9a890532b790f 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -238,7 +238,7 @@ in buildPlatform hostPlatform targetPlatform initialPath shell fetchurlBoot; - cc = import ../../build-support/cc-wrapper { + cc = lib.makeOverridable (import ../../build-support/cc-wrapper) { inherit lib; nativeTools = true; nativePrefix = "/usr"; diff --git a/pkgs/tools/misc/grit/default.nix b/pkgs/tools/misc/grit/default.nix index f1b4b43280bc6..a793ed7ebedda 100644 --- a/pkgs/tools/misc/grit/default.nix +++ b/pkgs/tools/misc/grit/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grit"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "climech"; repo = "grit"; rev = "v${version}"; - sha256 = "0v4i8xdf1pgkmwad5jb6n6s4rx48zk57wij0ppzg6zb725wy7r8a"; + sha256 = "sha256-c8wBwmXFjpst6UxL5zmTxMR4bhzpHYljQHiJFKiNDms="; }; - vendorSha256 = "0a1lqfn710fgvrvbimd92102fhjs1wa7r8i0l7s5m7jxks629hw8"; + vendorSha256 = "sha256-iMMkjJ5dnlr0oSCifBQPWkInQBCp1bh23s+BcKzDNCg="; meta = with lib; { description = "A multitree-based personal task manager"; diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 7ec9d0d407a48..0d684b16be580 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lf"; - version = "21"; + version = "22"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "0j7c21lsgcc39ng9ni94y3zfcqwyf9jc52fi8mcpkp0lpcx5ava9"; + sha256 = "10zmac9xza2v7l13zkavmc34ppcpmb82v8dxvrv4ggm261ns1abr"; }; - vendorSha256 = "15fl9v69wkzwzpq6x4xhcd5g6xyck3mlpbz1bbb61l75jjzg913m"; + vendorSha256 = "1yjsig2x6zrxdjnds6nqqq3r3g5lq8g9dvmz60nbifqhcx112bcw"; nativeBuildInputs = [ installShellFiles ]; @@ -35,6 +35,6 @@ buildGoModule rec { changelog = "https://github.com/gokcehan/lf/releases/tag/r${version}"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index debfb711d89ef..909cd99e7ebbf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25587,7 +25587,9 @@ in rtl-ais = callPackage ../applications/radio/rtl-ais { }; + # librtlsdr is a friendly fork with additional features rtl-sdr = callPackage ../applications/radio/rtl-sdr { }; + librtlsdr = callPackage ../development/libraries/librtlsdr { }; rtv = callPackage ../applications/misc/rtv { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5aa7482fdc6e8..b8c8b0a9d93cb 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1195,6 +1195,8 @@ let wasm = callPackage ../development/ocaml-modules/wasm { }; + wayland = callPackage ../development/ocaml-modules/wayland { }; + webbrowser = callPackage ../development/ocaml-modules/webbrowser { }; webmachine = callPackage ../development/ocaml-modules/webmachine { }; |