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: 4b4bbce199d3
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: 489a14add9a8
Choose a head ref
  • 5 commits
  • 4 files changed
  • 3 contributors

Commits on Apr 5, 2018

  1. tome4: disable parallel build 

    ... it caused sporadic build failures

(cherry picked from commit 8a65d19)
    @xeji @Mic92
    xeji authored and Mic92 committed Apr 5, 2018
    Copy the full SHA
    f17fa49 View commit details

  2. tome4: aarch64 not supported 

    (cherry picked from commit 6a49d53)
    @xeji @Mic92
    xeji authored and Mic92 committed Apr 5, 2018
    Copy the full SHA
    c214706 View commit details

  3. remake: enable on darwin 

    (cherry picked from commit 606a945)
    @ktf @Mic92
    ktf authored and Mic92 committed Apr 5, 2018
    Copy the full SHA
    46adfec View commit details

  4. apg: Widen meta.platforms from linux to unix 

    (cherry picked from commit b206311)
    @thefloweringash @LnL7
    thefloweringash authored and LnL7 committed Apr 5, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    GPG key ID: D02435D05B810C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d8a173a View commit details

  5. apg: Fix build on case insensitive filesystems 

    (cherry picked from commit 7d55577)
    @thefloweringash @LnL7
    thefloweringash authored and LnL7 committed Apr 5, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    GPG key ID: D02435D05B810C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    489a14a View commit details
2 changes: 1 addition & 1 deletion pkgs/development/tools/build-managers/remake/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
homepage = http://bashdb.sourceforge.net/remake/;
license = stdenv.lib.licenses.gpl3;
description = "GNU Make with comprehensible tracing and a debugger";
platforms = stdenv.lib.platforms.linux;
platforms = with stdenv.lib.platforms; linux ++ darwin;
maintainers = with stdenv.lib.maintainers; [ bjornfor ];
};
}
5 changes: 3 additions & 2 deletions pkgs/games/tome4/default.nix
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,8 @@ in stdenv.mkDerivation rec {
libGLU openal libpng libvorbis SDL2 SDL2_ttf SDL2_image
];

enableParallelBuilding = true;
# disable parallel building as it caused sporadic build failures
enableParallelBuilding = false;

NIX_CFLAGS_COMPILE = [
"-I${SDL2_image}/include/SDL2"
@@ -81,6 +82,6 @@ in stdenv.mkDerivation rec {
homepage = https://te4.org/;
license = licenses.gpl3;
maintainers = with maintainers; [ chattered peterhoeg ];
platforms = platforms.linux;
platforms = subtractLists ["aarch64-linux"] platforms.linux;
};
}
7 changes: 5 additions & 2 deletions pkgs/tools/security/apg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
'';
makeFlags = stdenv.lib.optionals stdenv.isDarwin ["CC=cc"];

patches = [ ./apg.patch ];
patches = [
./apg.patch
./phony-install-target.patch
];

postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i -e 's|APG_CLIBS += -lcrypt|APG_CLIBS += -L${openssl.out}/lib -lcrypto|' Makefile
@@ -64,6 +67,6 @@ stdenv.mkDerivation rec {
homepage = http://www.adel.nursat.kz/apg/;
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ astsmtl ];
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}
11 changes: 11 additions & 0 deletions pkgs/tools/security/apg/phony-install-target.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
diff -ur a/Makefile b/Makefile
--- a/Makefile 2003-08-08 00:40:39.000000000 +0900
+++ b/Makefile 2018-04-05 22:29:39.284191020 +0900
@@ -142,6 +142,7 @@
strip ${CS_PROGNAME}
strip ${BFM_PROGNAME}

+.PHONY: install
install:
if test -x ./apg; then \
./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \