···2828 testScript = ''2929 start_all()3030 ${backend}.wait_for_unit("${backend}-nginx.service")3131- result = ${backend}.wait_until_succeeds(3232- "cntr attach -t ${backend} nginx sh -- -c 'curl localhost | grep Hello'"3131+ ${backend}.wait_for_open_port(8181)3232+ # For some reason, the cntr command hangs when run without the &.3333+ # As such, we have to do some messy things to ensure we check the exitcode and output in a race-condition-safe manner3434+ ${backend}.execute(3535+ "(cntr attach -t ${backend} nginx sh -- -c 'curl localhost | grep Hello' > /tmp/result; echo $? > /tmp/exitcode; touch /tmp/done) &"3336 )3434- assert "Hello" in result3737+3838+ ${backend}.wait_for_file("/tmp/done")3939+ assert "0" == ${backend}.succeed("cat /tmp/exitcode").strip(), "non-zero exit code"4040+ assert "Hello" in ${backend}.succeed("cat /tmp/result"), "no greeting in output"3541 '';3642 };3743···6054 testScript = ''6155 machine.start()6256 machine.wait_for_unit("container@test.service")6363- machine.succeed("cntr attach test sh -- -c 'ping -c5 172.16.0.1'")5757+ # I haven't observed the same hanging behaviour in this version as in the OCI version which necessetates this messy invocation, but it's probably better to be safe than sorry and use it here as well5858+ machine.execute(5959+ "(cntr attach test sh -- -c 'ping -c5 172.16.0.1'; echo $? > /tmp/exitcode; touch /tmp/done) &"6060+ )6161+6262+ machine.wait_for_file("/tmp/done")6363+ assert "0" == machine.succeed("cat /tmp/exitcode").strip(), "non-zero exit code"6464 '';6565 };6666in {
···11-{ lib, buildGoPackage, fetchFromGitHub }:11+{ lib, buildGoModule, fetchFromGitHub }:2233-# Upstream has a `./vendor` directory with all deps which we rely upon.44-buildGoPackage rec {33+buildGoModule rec {54 pname = "tty-share";65 version = "2.2.1";76···1112 sha256 = "sha256-aAqKfi0ZX0UB07yGY6x0HcMspvq4rcJXKHSONxAwMlc=";1213 };13141414- goPackagePath = "github.com/elisescu/tty-share";1515+ # Upstream has a `./vendor` directory with all deps which we rely upon.1616+ vendorSha256 = null;1717+1818+ ldflags = [ "-s" "-w" "-X main.version=${version}" ];15191620 meta = with lib; {1721 homepage = "https://tty-share.com";
+3-3
pkgs/applications/misc/xplr/default.nix
···2233rustPlatform.buildRustPackage rec {44 pname = "xplr";55- version = "0.17.2";55+ version = "0.17.3";6677 src = fetchFromGitHub {88 owner = "sayanarijit";99 repo = pname;1010 rev = "v${version}";1111- sha256 = "sha256-iy03ucPFbFL/rRILt9P+NtfdGoIpjutbUDrykpZkAtk=";1111+ sha256 = "sha256-BbD0Z/WGNaqpPowZqc4kmFLbL9/+JotKm7dWIgS3NjM=";1212 };13131414 buildInputs = lib.optional stdenv.isDarwin libiconv;15151616- cargoSha256 = "sha256-VeV/vsM2XCg9h8KoYmniCmo/MJHjwcfn/tUCoZ1rKzM=";1616+ cargoSha256 = "sha256-qsicWf15U5b4xMqkXDOrhGNrQmiZkoxBQwV58asQa8k=";17171818 meta = with lib; {1919 description = "A hackable, minimal, fast TUI file explorer";
+2-2
pkgs/applications/networking/flexget/default.nix
···5566python3Packages.buildPythonApplication rec {77 pname = "flexget";88- version = "3.2.18";88+ version = "3.3.2";991010 # Fetch from GitHub in order to use `requirements.in`1111 src = fetchFromGitHub {1212 owner = "flexget";1313 repo = "flexget";1414 rev = "v${version}";1515- hash = "sha256-68tD7I7MI/Cp94tp6c4lQx+8xwRnJTKTF/3SWz4Ddgg=";1515+ hash = "sha256-Z2JYFnE9g2bWaR+Ghxg3zJUD0Ja8/od52jkOVWEqeVE=";1616 };17171818 postPatch = ''