diff options
| author | Lana Black <lana@illuminati.industries> | 2023-04-29 08:48:29 +0000 |
|---|---|---|
| committer | Emery Hemingway <ehmry@posteo.net> | 2023-04-29 11:18:44 +0000 |
| commit | 1314174d3a1d5c7787acdf9259873f275bcfec5b (patch) | |
| tree | 78c44f5bd419348f8957ab5b8ccef111b1b3d6e6 | |
| parent | 0c97d307e68209414977ae270db9d9afafde21b6 (diff) | |
| download | nixpkgs-1314174d3a1d5c7787acdf9259873f275bcfec5b.tar nixpkgs-1314174d3a1d5c7787acdf9259873f275bcfec5b.tar.gz nixpkgs-1314174d3a1d5c7787acdf9259873f275bcfec5b.tar.bz2 nixpkgs-1314174d3a1d5c7787acdf9259873f275bcfec5b.tar.lz nixpkgs-1314174d3a1d5c7787acdf9259873f275bcfec5b.tar.xz nixpkgs-1314174d3a1d5c7787acdf9259873f275bcfec5b.tar.zst nixpkgs-1314174d3a1d5c7787acdf9259873f275bcfec5b.zip | |
solo5: 0.7.5 -> 0.8.0
| -rw-r--r-- | pkgs/os-specific/solo5/0001-Fix-test.patch | 25 | ||||
| -rw-r--r-- | pkgs/os-specific/solo5/default.nix | 6 |
2 files changed, 2 insertions, 29 deletions
diff --git a/pkgs/os-specific/solo5/0001-Fix-test.patch b/pkgs/os-specific/solo5/0001-Fix-test.patch deleted file mode 100644 index bd01c129bec..00000000000 --- a/pkgs/os-specific/solo5/0001-Fix-test.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bf1f143455d1c8283d90964e0121b50c14a67bda Mon Sep 17 00:00:00 2001 -From: Lana Black <lana@illuminati.industries> -Date: Sat, 11 Feb 2023 11:53:21 +0000 -Subject: [PATCH] Fix test. - ---- - tests/tests.bats | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/tests.bats b/tests/tests.bats -index c542b7a..98520ee 100644 ---- a/tests/tests.bats -+++ b/tests/tests.bats -@@ -196,7 +196,7 @@ xen_expect_abort() { - run test_hello/test_hello.hvt - case "${CONFIG_HOST}" in - Linux) -- [ "$status" -eq 127 ] && [[ "$output" == *"No such file or directory"* ]] -+ [ "$status" -eq 127 ] && ([[ "$output" == *"No such file or directory"* ]] || [[ "$output" == *"required file not found"* ]]) - ;; - FreeBSD) - # XXX: imgact_elf.c:load_interp() outputs the "ELF interpreter ... not --- -2.39.0 - diff --git a/pkgs/os-specific/solo5/default.nix b/pkgs/os-specific/solo5/default.nix index c436f247866..f235902a91c 100644 --- a/pkgs/os-specific/solo5/default.nix +++ b/pkgs/os-specific/solo5/default.nix @@ -2,7 +2,7 @@ , pkg-config, qemu, syslinux, util-linux }: let - version = "0.7.5"; + version = "0.8.0"; # list of all theoretically available targets targets = [ "genode" @@ -21,11 +21,9 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz"; - sha256 = "sha256-viwrS9lnaU8sTGuzK/+L/PlMM/xRRtgVuK5pixVeDEw="; + sha256 = "sha256-t80VOZ8Tr1Dq+mJfRPVLGqYprCaqegcQtDqdoHaSXW0="; }; - patches = [ ./0001-Fix-test.patch ]; - hardeningEnable = [ "pie" ]; configurePhase = '' |