diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-21 17:24:16 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-21 17:24:16 +0000 |
| commit | 83b8726e5f6f85a28405c7772f75093fd9a399a3 (patch) | |
| tree | 5864b8d15f92f596e4750302c13c3b50f0d6aaf4 /pkgs/games | |
| parent | 538bce249c736adf495d4b9ed87883a570c7962b (diff) | |
| parent | 95e6dfd5d9065feaa527eecb04f2fd49048bbca0 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/python-modules/velbus-aio/default.nix
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/openra/build-engine.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/starsector/default.nix | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/games/openra/build-engine.nix b/pkgs/games/openra/build-engine.nix index 664a4c0735b3a..10e8b49392155 100644 --- a/pkgs/games/openra/build-engine.nix +++ b/pkgs/games/openra/build-engine.nix @@ -36,7 +36,7 @@ buildDotnetModule rec { dontDotnetFixup = true; preBuild = '' - make VERSION=${version} version + make VERSION=${engine.build}-${version} version ''; postInstall = '' diff --git a/pkgs/games/starsector/default.nix b/pkgs/games/starsector/default.nix index 3951f36f83bf7..e1bc4a8dbbcfe 100644 --- a/pkgs/games/starsector/default.nix +++ b/pkgs/games/starsector/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "starsector"; - version = "0.96a-RC8"; + version = "0.96a-RC10"; src = fetchzip { - url = "https://s3.amazonaws.com/fractalsoftworks/starsector/starsector_linux-${version}.zip"; - sha256 = "sha256-RDXqFqiWpBG3kasofzbOl7Zp0a9LiMpJKsHcFaJtm2Y="; + url = "https://f005.backblazeb2.com/file/fractalsoftworks/release/starsector_linux-${version}.zip"; + sha256 = "sha256-RBSnms+QlKgTOhm3t2hDfv7OcMrQCk1rfkz9GaM74WM="; }; nativeBuildInputs = [ copyDesktopItems makeWrapper ]; @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep common-updater-scripts set -eou pipefail; - version=$(curl -s https://fractalsoftworks.com/preorder/ | grep -oP "https://s3.amazonaws.com/fractalsoftworks/starsector/starsector_linux-\K.*?(?=\.zip)" | head -1) + version=$(curl -s https://fractalsoftworks.com/preorder/ | grep -oP "https://f005.backblazeb2.com/file/fractalsoftworks/release/starsector_linux-\K.*?(?=\.zip)" | head -1) update-source-version ${pname} "$version" --file=./pkgs/games/starsector/default.nix ''; } |