Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e8cea0efd660
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f3f040ca05ce
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 7, 2019

  1. hedgewars: 0.9.25 -> 1.0.0-beta1 

    - unbreak build by bumping version to latest beta as that
removes the broken `bytestring-show` dependency

- beta needs to be fetched from Mercurial repo

(cherry picked from commit 7030004)
    @schmittlauch
    schmittlauch committed Aug 7, 2019
    Copy the full SHA
    6496eb4 View commit details

Commits on Aug 8, 2019

  1. [backport] hedgewars: 0.9.25 -> 1.0.0-beta1 (#66290) 

    [backport] hedgewars: 0.9.25 -> 1.0.0-beta1
    @Mic92
    Mic92 authored Aug 8, 2019
    Copy the full SHA
    f3f040c View commit details
Showing with 7 additions and 7 deletions.
  1. +7 −7 pkgs/games/hedgewars/default.nix
14 changes: 7 additions & 7 deletions pkgs/games/hedgewars/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
{ SDL2_image, SDL2_ttf, SDL2_net, fpc, qt5, ghcWithPackages, ffmpeg, freeglut
, stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer
, stdenv, makeWrapper, fetchhg, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer
, zlib, libpng, libGLU_combined, physfs
}:

let
ghc = ghcWithPackages (pkgs: with pkgs; [
network vector utf8-string /* broken: bytestring-show */ random hslogger
network vector utf8-string bytestring random hslogger
SHA entropy pkgs.zlib sandi regex-tdfa
]);
in
stdenv.mkDerivation rec {
version = "0.9.25";
version = "1.0.0-beta1";
name = "hedgewars-${version}";
src = fetchurl {
url = "https://www.hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2";
sha256 = "08x7fqpy0hpnbfq2k06g522xayi7s53bca819zfhalvqnqs76pdk";
src = fetchhg {
url = "https://hg.hedgewars.org/hedgewars/";
rev = "7ab5cf405686";
sha256 = "1yrspi82ym5zpavka4cv0vh86g3i2mbbg8ccfcsid4f38lgbb9y4";
};

nativeBuildInputs = [ pkgconfig ];
@@ -75,6 +76,5 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ kragniz fpletz ];
platforms = ghc.meta.platforms;
hydraPlatforms = [];
broken = true; # depends on broken Haskell package bytestring-show
};
}