Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
da11317d1c
19 changed files with 106 additions and 71 deletions
|
|
@ -6834,12 +6834,6 @@
|
|||
githubId = 99639;
|
||||
name = "Pawel Kruszewski";
|
||||
};
|
||||
ktosiek = {
|
||||
email = "tomasz.kontusz@gmail.com";
|
||||
github = "ktosiek";
|
||||
githubId = 278013;
|
||||
name = "Tomasz Kontusz";
|
||||
};
|
||||
kubukoz = {
|
||||
email = "kubukoz@gmail.com";
|
||||
github = "kubukoz";
|
||||
|
|
|
|||
|
|
@ -39,6 +39,12 @@
|
|||
# Supported in newer board revisions
|
||||
arm_boost=1
|
||||
|
||||
[cm4]
|
||||
# Enable host mode on the 2711 built-in XHCI USB controller.
|
||||
# This line should be removed if the legacy DWC2 controller is required
|
||||
# (e.g. for USB device mode) or if USB support is not required.
|
||||
otg_mode=1
|
||||
|
||||
[all]
|
||||
# Boot in 64-bit mode.
|
||||
arm_64bit=1
|
||||
|
|
@ -65,6 +71,9 @@
|
|||
cp ${pkgs.ubootRaspberryPi4_64bit}/u-boot.bin firmware/u-boot-rpi4.bin
|
||||
cp ${pkgs.raspberrypi-armstubs}/armstub8-gic.bin firmware/armstub8-gic.bin
|
||||
cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-4-b.dtb firmware/
|
||||
cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-400.dtb firmware/
|
||||
cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-cm4.dtb firmware/
|
||||
cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-cm4s.dtb firmware/
|
||||
'';
|
||||
populateRootCommands = ''
|
||||
mkdir -p ./files/boot
|
||||
|
|
|
|||
|
|
@ -40,6 +40,9 @@ in
|
|||
# SD cards.
|
||||
"sdhci_pci"
|
||||
|
||||
# NVMe drives
|
||||
"nvme"
|
||||
|
||||
# Firewire support. Not tested.
|
||||
"ohci1394" "sbp2"
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-cliff";
|
||||
version = "0.6.1";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = "git-cliff";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CJ/2Cv/XoLq9U7u5mexH8iCCHbGtV6xohP3FapqO3+g=";
|
||||
sha256 = "sha256-wVHL2+didmiN7UlEeIuSr+8LhkFKCOD3of4rKVg1i1o=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-pYStKDgvvV/Z96TAonpDW7DIs1YSO6gAoiUCieVa9QY=";
|
||||
cargoSha256 = "sha256-5jhloUnaGXXDu2LCO86SMJo8ETIxLAivv3hx9gEqtJ4=";
|
||||
|
||||
# attempts to run the program on .git in src which is not deterministic
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ghex";
|
||||
version = "42.1";
|
||||
version = "42.2";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "8QMj08MvvRqDFU+/0qJ+yj7pDZwbJSNfGxX+3l+xE6M=";
|
||||
sha256 = "Rd6Oa4ofMd5amRC+GMB/CaMo2HU434BAOuxa+IF8ljE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-calendar";
|
||||
version = "42.0";
|
||||
version = "42.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "tj9z9VAy/BOQRC+UzfazyrnJHHdN3S5cYez+ydLF6ao=";
|
||||
sha256 = "0SKBy78a+GxyN1/mrZNG7Q4sLziKHq6FjOzmQGCm66g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -28,11 +28,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-remote-desktop";
|
||||
version = "42.1";
|
||||
version = "42.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-ATHuOY32n2tOZ9YU1pElatZJgihCRXQU64iaI7/rmfo=";
|
||||
hash = "sha256-pEZqYsL+7GLn9XLwkpxY24iyXWCVuv5LFZHpnPqaDuY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -42,11 +42,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-software";
|
||||
version = "42.0";
|
||||
version = "42.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "QsaF4u95li6zCo6VjHA8mh899zFQQiOgYos7Yk733B4=";
|
||||
sha256 = "MtAFaYoAuK5er5Hk5/hlnvQwCnmPyuaiK3TC1/z2pIY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zenity";
|
||||
version = "3.42.0";
|
||||
version = "3.42.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "wkx/5rtDFjztit8jLVg7LgE9O6bCjetfz4B5hePete8=";
|
||||
sha256 = "oI4MjmJmFe4sI/90Yo66b4tIaHXdVDccp+LXYFtyqHw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, certifi
|
||||
, fetchPypi
|
||||
, flaky
|
||||
, httpx
|
||||
, importlib-metadata
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylast";
|
||||
version = "4.5.0";
|
||||
version = "5.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-YoALculx2trEDD1vU4xhiCGdb1OFPdxI1p2fwlZZAY8=";
|
||||
hash = "sha256-UBi2bCtGMtcavYEDtz5m5N0UxmCaj3un5aomxzbfLfg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
certifi
|
||||
httpx
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
|
|
|||
|
|
@ -89,6 +89,6 @@ python3.pkgs.buildPythonApplication rec {
|
|||
homepage = "https://wiki.gnome.org/Apps/DFeet";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ ktosiek ];
|
||||
maintainers = teams.gnome.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
39
pkgs/development/tools/protolint/default.nix
Normal file
39
pkgs/development/tools/protolint/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
buildGoModule rec {
|
||||
pname = "protolint";
|
||||
version = "0.37.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yoheimuta";
|
||||
repo = pname;
|
||||
rev = "6aa30515838cc0adf7c76a9461f52bdc713f2e9f";
|
||||
sha256 = "sha256-oKGA5FZpT3E5G7oREGAojdu4Xn8JPd7IYwfueK9QA34=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-iLQwx3B5n21ZXefWiGBBL9roa9LIFByzB8KXLywhvKs=";
|
||||
|
||||
# Something about the way we run tests causes issues. It doesn't happen
|
||||
# when using "go test" directly:
|
||||
# === RUN TestEnumFieldNamesPrefixRule_Apply_fix/no_fix_for_a_correct_proto
|
||||
# util_test.go:35: open : no such file or directory
|
||||
# === RUN TestEnumFieldNamesPrefixRule_Apply_fix/fix_for_an_incorrect_proto
|
||||
# util_test.go:35: open : no such file or directory
|
||||
excludedPackages = [ "internal" ];
|
||||
|
||||
ldflags = let
|
||||
rev = builtins.substring 0 7 src.rev;
|
||||
in [
|
||||
"-X github.com/yoheimuta/protolint/internal/cmd.version=${version}"
|
||||
"-X github.com/yoheimuta/protolint/internal/cmd.revision=${rev}"
|
||||
"-X github.com/yoheimuta/protolint/internal/cmd/protocgenprotolint.version=${version}"
|
||||
"-X github.com/yoheimuta/protolint/internal/cmd/protocgenprotolint.revision=${rev}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A pluggable linter and fixer to enforce Protocol Buffer style and conventions";
|
||||
homepage = "https://github.com/yoheimuta/protolint";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.zane ];
|
||||
};
|
||||
}
|
||||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-make";
|
||||
version = "0.35.10";
|
||||
version = "0.35.11";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-l34sThvzhAW8VfxVuv+UGVil7yOvsOiWSqr/N91V8C8=";
|
||||
sha256 = "sha256-NzhEXt0z+0/6F3pgGmQwjnexBA2icWV3dCifZ8BxnOQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ];
|
||||
|
||||
cargoSha256 = "sha256-974Gqtv+g32iHrIqIzqwBsE8frzmjF0Ma/hSMGzMaGs=";
|
||||
cargoSha256 = "sha256-+FGl0JhaRu+KLQJGAcMXv9vP6pmRzdTDtNA3h6A1jcY=";
|
||||
|
||||
# Some tests fail because they need network access.
|
||||
# However, Travis ensures a proper build.
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
, openssl
|
||||
, swig
|
||||
, meson-tools
|
||||
, which
|
||||
, armTrustedFirmwareAllwinner
|
||||
, armTrustedFirmwareAllwinnerH616
|
||||
, armTrustedFirmwareRK3328
|
||||
|
|
@ -19,10 +20,10 @@
|
|||
}:
|
||||
|
||||
let
|
||||
defaultVersion = "2021.10";
|
||||
defaultVersion = "2022.01";
|
||||
defaultSrc = fetchurl {
|
||||
url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";
|
||||
sha256 = "1m0bvwv8r62s4wk4w3cmvs888dhv9gnfa98dczr4drk2jbhj7ryd";
|
||||
hash = "sha256-gbRUMifbIowD+KG/XdvIE7C7j2VVzkYGTvchpvxoBBM=";
|
||||
};
|
||||
buildUBoot = {
|
||||
version ? null
|
||||
|
|
@ -66,11 +67,14 @@ let
|
|||
p.setuptools # for pkg_resources
|
||||
]))
|
||||
swig
|
||||
which # for scripts/dtc-version.sh
|
||||
];
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
hardeningDisable = [ "all" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
makeFlags = [
|
||||
"DTC=dtc"
|
||||
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
|
||||
|
|
@ -102,9 +106,6 @@ let
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
# make[2]: *** No rule to make target 'lib/efi_loader/helloworld.efi', needed by '__build'. Stop.
|
||||
enableParallelBuilding = false;
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -373,14 +374,6 @@ in {
|
|||
CONFIG_USB_EHCI_GENERIC=y
|
||||
CONFIG_USB_XHCI_HCD=y
|
||||
'';
|
||||
extraPatches = [
|
||||
# https://patchwork.ozlabs.org/project/uboot/list/?series=268007&state=%2A&archive=both
|
||||
# Remove when upgrading to 2022.01
|
||||
(fetchpatch {
|
||||
url = "https://patchwork.ozlabs.org/series/268007/mbox/";
|
||||
sha256 = "sha256-xn4Q959dgoB63zlmJepI41AXAf1kCycIGcmu4IIVjmE=";
|
||||
})
|
||||
];
|
||||
extraMeta.platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
filesToInstall = [ "u-boot.rom" ];
|
||||
};
|
||||
|
|
@ -401,28 +394,12 @@ in {
|
|||
defconfig = "rpi_3_32b_defconfig";
|
||||
extraMeta.platforms = ["armv7l-linux"];
|
||||
filesToInstall = ["u-boot.bin"];
|
||||
extraPatches = [
|
||||
# Remove when updating to 2022.01
|
||||
# https://patchwork.ozlabs.org/project/uboot/list/?series=273129&archive=both&state=*
|
||||
(fetchpatch {
|
||||
url = "https://patchwork.ozlabs.org/series/273129/mbox/";
|
||||
sha256 = "sha256-/Gu7RNvBNYCGqdFRzQ11qPDDxgGVpwKYYw1CpumIGfU=";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
ubootRaspberryPi3_64bit = buildUBoot {
|
||||
defconfig = "rpi_3_defconfig";
|
||||
extraMeta.platforms = ["aarch64-linux"];
|
||||
filesToInstall = ["u-boot.bin"];
|
||||
extraPatches = [
|
||||
# Remove when updating to 2022.01
|
||||
# https://patchwork.ozlabs.org/project/uboot/list/?series=273129&archive=both&state=*
|
||||
(fetchpatch {
|
||||
url = "https://patchwork.ozlabs.org/series/273129/mbox/";
|
||||
sha256 = "sha256-/Gu7RNvBNYCGqdFRzQ11qPDDxgGVpwKYYw1CpumIGfU=";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
ubootRaspberryPi4_32bit = buildUBoot {
|
||||
|
|
|
|||
|
|
@ -32,20 +32,19 @@ stdenv.mkDerivation {
|
|||
mkdir -p "$out/lib/firmware/brcm"
|
||||
|
||||
# Wifi firmware
|
||||
shopt -s extglob
|
||||
for filename in firmware-nonfree/brcm/brcmfmac434??{,s}-sdio.*; do
|
||||
cp "$filename" "$out/lib/firmware/brcm"
|
||||
done
|
||||
cp -rv "$NIX_BUILD_TOP/firmware-nonfree/debian/config/brcm80211/." "$out/lib/firmware/"
|
||||
|
||||
# Bluetooth firmware
|
||||
cp bluez-firmware/broadcom/*.hcd "$out/lib/firmware/brcm"
|
||||
cp -rv "$NIX_BUILD_TOP/bluez-firmware/broadcom/." "$out/lib/firmware/brcm"
|
||||
|
||||
# CM4 symlink must be added since it's missing from upstream
|
||||
pushd $out/lib/firmware/brcm &>/dev/null
|
||||
ln -s "./brcmfmac43455-sdio.txt" "$out/lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.txt"
|
||||
popd &>/dev/null
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "sha256-Fw8EC1jzszWg9rNH01oaOIHnSYDuF6ov6ulmIAPuNz4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3+ and Zero W";
|
||||
homepage = "https://github.com/RPi-Distro/firmware-nonfree";
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@ rec {
|
|||
# Policy: use the highest stable version as the default (on our master).
|
||||
stable = if stdenv.hostPlatform.system == "x86_64-linux"
|
||||
then generic {
|
||||
version = "510.60.02";
|
||||
sha256_64bit = "sha256-qADfwFSQeP2Mbo5ngO+47uh4cuYFXH9fOGpHaM4H4AM=";
|
||||
settingsSha256 = "sha256-Voa1JZ2qqJ1t+bfwKh/mssEi/hjzLTPwef2XG/gAC+0=";
|
||||
persistencedSha256 = "sha256-THgK2GpRcttqSN2WxcuJu5My++Q+Y34jG8hm7daxhAQ=";
|
||||
version = "510.68.02";
|
||||
sha256_64bit = "sha256-vSw0SskrL8ErBgQ1kKT+jU6wzLdNDEk1LwBM8tKZ9MU=";
|
||||
settingsSha256 = "sha256-4TBA/ITpaaBiVDkpj7/Iydei1knRPpruPL4fRrqFAmU=";
|
||||
persistencedSha256 = "sha256-Q1Rk6dAK4pnm6yDK4kmj5Vg4GRbi034C96ypywHYB2I=";
|
||||
}
|
||||
else legacy_390;
|
||||
|
||||
|
|
|
|||
|
|
@ -666,6 +666,18 @@ stdenv.mkDerivation {
|
|||
rm -rf $out/share/doc
|
||||
'';
|
||||
|
||||
# Avoid *.EFI binary stripping. At least on aarch64-linux strip
|
||||
# removes too much from PE32+ files:
|
||||
# https://github.com/NixOS/nixpkgs/issues/169693
|
||||
# The hack is to move EFI file out of lib/ before doStrip
|
||||
# run and return it after doStrip run.
|
||||
preFixup = lib.optionalString withEfi ''
|
||||
mv $out/lib/systemd/boot/efi $out/dont-strip-me
|
||||
'';
|
||||
postFixup = lib.optionalString withEfi ''
|
||||
mv $out/dont-strip-me $out/lib/systemd/boot/efi
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
# The interface version prevents NixOS from switching to an
|
||||
# incompatible systemd at runtime. (Switching across reboots is
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||
description = "SSTP client for Linux";
|
||||
homepage = "http://sstp-client.sourceforge.net/";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ ktosiek ];
|
||||
maintainers = with maintainers; [ ];
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -409,6 +409,8 @@ with pkgs;
|
|||
|
||||
protoc-gen-validate = callPackage ../development/tools/protoc-gen-validate { };
|
||||
|
||||
protolint = callPackage ../development/tools/protolint { };
|
||||
|
||||
ptags = callPackage ../development/tools/misc/ptags { };
|
||||
|
||||
ptouch-print = callPackage ../misc/ptouch-print { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue