diff options
| author | Ada Avery <2561504+SquircleSpace@users.noreply.github.com> | 2020-06-06 02:46:57 -0700 |
|---|---|---|
| committer | Michael Bishop <cleverca22@gmail.com> | 2020-06-16 14:19:00 -0300 |
| commit | cd0cfb2ed1355bcb14a2a733a55bc12b22de516c (patch) | |
| tree | 6ddb8d4826a0e83abbc232f37d84d62911126857 /pkgs/os-specific/linux/firmware/raspberrypi | |
| parent | 4612927ad27c6316655ac3fa1b98f8f28a15c77b (diff) | |
| download | nixpkgs-cd0cfb2ed1355bcb14a2a733a55bc12b22de516c.tar nixpkgs-cd0cfb2ed1355bcb14a2a733a55bc12b22de516c.tar.gz nixpkgs-cd0cfb2ed1355bcb14a2a733a55bc12b22de516c.tar.bz2 nixpkgs-cd0cfb2ed1355bcb14a2a733a55bc12b22de516c.tar.lz nixpkgs-cd0cfb2ed1355bcb14a2a733a55bc12b22de516c.tar.xz nixpkgs-cd0cfb2ed1355bcb14a2a733a55bc12b22de516c.tar.zst nixpkgs-cd0cfb2ed1355bcb14a2a733a55bc12b22de516c.zip | |
raspberrypi-tools: 2018-10-03 -> 2020-5-28
Diffstat (limited to 'pkgs/os-specific/linux/firmware/raspberrypi')
| -rw-r--r-- | pkgs/os-specific/linux/firmware/raspberrypi/tools-dont-install-sysv-init-scripts.patch | 20 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/firmware/raspberrypi/tools.nix | 8 |
2 files changed, 3 insertions, 25 deletions
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools-dont-install-sysv-init-scripts.patch b/pkgs/os-specific/linux/firmware/raspberrypi/tools-dont-install-sysv-init-scripts.patch deleted file mode 100644 index e12aeeb0cdb..00000000000 --- a/pkgs/os-specific/linux/firmware/raspberrypi/tools-dont-install-sysv-init-scripts.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/interface/vmcs_host/linux/vcfiled/CMakeLists.txt b/interface/vmcs_host/linux/vcfiled/CMakeLists.txt -index aed0e83..b325676 100644 ---- a/interface/vmcs_host/linux/vcfiled/CMakeLists.txt -+++ b/interface/vmcs_host/linux/vcfiled/CMakeLists.txt -@@ -17,15 +17,6 @@ target_link_libraries(vcfiled - install(TARGETS vcfiled - RUNTIME DESTINATION sbin) - --configure_file (etc/init.d/vcfiled ${PROJECT_BINARY_DIR}/etc/init.d/vcfiled) -- --# script to start up vcfiled at start of day --install(PROGRAMS ${PROJECT_BINARY_DIR}/etc/init.d/vcfiled -- DESTINATION /etc/init.d) --# install locally to the installation directory too --install(PROGRAMS ${PROJECT_BINARY_DIR}/etc/init.d/vcfiled -- DESTINATION ${VMCS_INSTALL_PREFIX}/share/install) -- - # test program for vcfiled_check library - add_executable(vcfiled_lock_test vcfiled_lock_test.c) - target_link_libraries(vcfiled_lock_test vcfiled_check) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix index e3fa90ac388..6c4d49e4e24 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix @@ -2,17 +2,15 @@ stdenv.mkDerivation { pname = "raspberrypi-tools"; - version = "2018-10-03"; + version = "2020-05-28"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "userland"; - rev = "de4a7f2e3c391e2d3bc76af31864270e7802d9ac"; - sha256 = "0w96xa98ngdk9m6wv185w8waa7wm2hkn2bhxz52zd477hchzrxlg"; + rev = "f97b1af1b3e653f9da2c1a3643479bfd469e3b74"; + sha256 = "1r7n05rv96hqjq0rn0qzchmfqs0j7vh3p8jalgh66s6l0vms5mwy"; }; - patches = [ ./tools-dont-install-sysv-init-scripts.patch ]; - nativeBuildInputs = [ cmake pkgconfig ]; preConfigure = '' |