Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0a7d20ece5f0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 888d01da4811
Choose a head ref
  • 5 commits
  • 6 files changed
  • 1 contributor

Commits on Nov 11, 2018

  1. i2pd: 2.21.1 -> 2.22.0

    edwtjo committed Nov 11, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Mic92 Jörg Thalheim
    Copy the full SHA
    ba35b59 View commit details
  2. zangband: 2.7.3 -> 2.7.4b

    With minor fixups but marking as broken since the game doesn't progress
    after character generation.
    edwtjo committed Nov 11, 2018
    Copy the full SHA
    3ba7d2a View commit details
  3. minetest: 0.4.16 -> 0.4.17

    edwtjo committed Nov 11, 2018
    Copy the full SHA
    8ff9e78 View commit details
  4. Copy the full SHA
    d598672 View commit details
  5. Copy the full SHA
    888d01d View commit details
2 changes: 2 additions & 0 deletions nixos/modules/misc/ids.nix
Original file line number Diff line number Diff line change
@@ -335,6 +335,7 @@
kapacitor = 308;
solr = 309;
alerta = 310;
minetest = 311;

# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!

@@ -630,6 +631,7 @@
kapacitor = 308;
solr = 309;
alerta = 310;
minetest = 311;

# When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal
3 changes: 3 additions & 0 deletions nixos/modules/services/games/minetest-server.nix
Original file line number Diff line number Diff line change
@@ -84,7 +84,9 @@ in
home = "/var/lib/minetest";
createHome = true;
uid = config.ids.uids.minetest;
group = "minetest";
};
users.groups.minetest.gid = config.ids.gids.minetest;

systemd.services.minetest-server = {
description = "Minetest Server Service";
@@ -93,6 +95,7 @@ in

serviceConfig.Restart = "always";
serviceConfig.User = "minetest";
serviceConfig.Group = "minetest";

script = ''
cd /var/lib/minetest
8 changes: 5 additions & 3 deletions pkgs/games/minecraft-server/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,13 @@

stdenv.mkDerivation rec {
name = "minecraft-server-${version}";
version = "1.12.2";
version = "1.13.2";

src = fetchurl {
url = "https://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar";
sha256 = "0zhnac6yvkdgdaag0gb0fgrkgizbwrpf7s76yqdiknfswrs947zy";
# Old url
# https://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar
url = "https://launcher.mojang.com/v1/objects/3737db93722a9e39eeada7c27e7aca28b144ffa7/server.jar";
sha256 = "13h8dxrrgqa1g6sd7aaw26779hcsqsyjm7xm0sknifn54lnamlzz";
};

preferLocalBuild = true;
6 changes: 3 additions & 3 deletions pkgs/games/minetest/default.nix
Original file line number Diff line number Diff line change
@@ -4,19 +4,19 @@
}:

let
version = "0.4.16";
version = "0.4.17";
sources = {
src = fetchFromGitHub {
owner = "minetest";
repo = "minetest";
rev = "${version}";
sha256 = "048m8as01bw4pnwfxx04wfnyljxq7ivk88l214zi18prrrkfamj3";
sha256 = "0ri9hyhvcnyyy2k83qvv543s10476g9fn3vcbjwvxjfqap9mkc5m";
};
data = fetchFromGitHub {
owner = "minetest";
repo = "minetest_game";
rev = "${version}";
sha256 = "0alikzyjvj9hd8s3dd6ghpz0y982w2j0yd2zgd7a047mxw21hrcn";
sha256 = "1g8iw2pya32ifljbdx6z6rpcinmzm81i9minhi2bi1d500ailn7s";
};
};
in stdenv.mkDerivation {
22 changes: 9 additions & 13 deletions pkgs/games/zangband/default.nix
Original file line number Diff line number Diff line change
@@ -1,28 +1,23 @@
{ stdenv, fetchurl, ncurses, flex, bison, autoconf, automake, m4, coreutils }:

stdenv.mkDerivation rec {
name = "zangband-${version}";
version = "2.7.3";
name = pname + "-" + version;
pname = "zangband";
version = "2.7.4b";

src = fetchurl {
url = "ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/zangband-${version}.tar.gz";
sha256 = "0654m8fzklsc8565sqdad76mxjsm1z9c280srq8863sd10af0bdq";
url = "mirror://sourceforge/project/${pname}/${pname}-src/${version}/${name}.tar.gz";
sha256 = "0kkz6f9myhjnr3308sdab8q186rd55lapvcp38w8qmakdbhc828j";
};

buildInputs = [
ncurses flex bison autoconf automake m4
];

# fails during chmod due to broken permissions
dontMakeSourcesWritable = true;
postUnpack = ''
chmod a+rwX -R .
'';

preConfigure = ''
sed -re 's/ch(own|grp|mod)/true/' -i lib/*/makefile.zb makefile.in
sed -e '/FIXED_PATHS/d' -i src/z-config.h
./bootstrap
autoconf
'';

preInstall = ''
@@ -42,8 +37,8 @@ stdenv.mkDerivation rec {
cd "$ZANGBAND_PATH"
for i in $(find "$ORIG_PATH" -type f); do
REL_PATH="''${i#$ORIG_PATH/}"
mkdir -p "$(dirname "$REL_PATH")"
ln -s "$i" "$REL_PATH" &>/dev/null
mkdir -p "$(dirname "$REL_PATH")"
ln -s "$i" "$REL_PATH" &>/dev/null
done
mkdir -p lib/user lib/save
for i in lib/*/*.raw; do
@@ -59,5 +54,6 @@ stdenv.mkDerivation rec {
meta = {
description = "Rogue-like game";
license = stdenv.lib.licenses.unfree;
broken = true; # broken in runtime, will not get pass character generation
};
}
4 changes: 2 additions & 2 deletions pkgs/tools/networking/i2pd/default.nix
Original file line number Diff line number Diff line change
@@ -11,13 +11,13 @@ stdenv.mkDerivation rec {

name = pname + "-" + version;
pname = "i2pd";
version = "2.21.1";
version = "2.22.0";

src = fetchFromGitHub {
owner = "PurpleI2P";
repo = pname;
rev = version;
sha256 = "0j892s9ga9fjc2q1rw3hp5il4mw1jc0aiw60y1rfaiflyv0wd696";
sha256 = "1c4y5y6a9kssi9qmsyqz5hw29ya1s0i21fklnz48n08b7f4f9vlz";
};

buildInputs = with stdenv.lib; [ boost zlib openssl ]