diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:19:05 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:55:37 +0200 |
| commit | 2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1 (patch) | |
| tree | 36de0660dc2c9f3731bd8b60ec852ca0c452efce /pkgs/games/warsow | |
| parent | 84a91208a948be5eca97ea182c4256d9d6ecf171 (diff) | |
| parent | 8943fb5f24b9e1aa1d577be4e214d166643269fd (diff) | |
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299
Diffstat (limited to 'pkgs/games/warsow')
| -rw-r--r-- | pkgs/games/warsow/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/warsow/engine.nix | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index 3d6a03992234c..6282658fc1522 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.1.2"; src = fetchurl { - url = "http://sebastian.network/warsow/${pname}-${version}.tar.gz"; + url = "http://slice.sh/warsow/${pname}-${version}.tar.gz"; sha256 = "07y2airw5qg3s1bf1c63a6snjj22riz0mqhk62jmfm9nrarhavrc"; }; diff --git a/pkgs/games/warsow/engine.nix b/pkgs/games/warsow/engine.nix index 12832f2a43918..c42aa31982591 100644 --- a/pkgs/games/warsow/engine.nix +++ b/pkgs/games/warsow/engine.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation (libs // rec { version = "2.1.0"; src = fetchurl { - url = "http://sebastian.network/warsow/warsow_21_sdk.tar.gz"; + url = "http://slice.sh/warsow/warsow_21_sdk.tar.gz"; sha256 = "0fj5k7qpf6far8i1xhqxlpfjch10zj26xpilhp95aq2yiz08pj4r"; }; @@ -48,5 +48,6 @@ in stdenv.mkDerivation (libs // rec { license = licenses.gpl2; maintainers = with maintainers; [ astsmtl abbradar ]; platforms = platforms.linux; + broken = stdenv.isAarch64; }; }) |