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: 7e07846d99be
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: 7c21abdf4ca3
Choose a head ref

Commits on Feb 28, 2020

  1. airsonic: enable nginx.recommendedProxySettings with virtualHost

    This fixes music playback when using the `services.airsonic.virtualHost`
    option.
    Florian committed Feb 28, 2020
    Copy the full SHA
    519d4f8 View commit details

Commits on Apr 7, 2020

  1. Copy the full SHA
    ff2aa0c View commit details

Commits on Apr 14, 2020

  1. Copy the full SHA
    e1df46e View commit details
  2. openttd: 1.10.0 -> 1.10.1

    1.10.0 added SDL support
    amaxine committed Apr 14, 2020
    Copy the full SHA
    3f63396 View commit details
  3. Copy the full SHA
    a9dd29a View commit details
  4. Copy the full SHA
    8897848 View commit details
  5. sword: 1.7.4 -> 1.8.1

    AndersonTorres committed Apr 14, 2020
    Copy the full SHA
    968ccdb View commit details

Commits on Apr 15, 2020

  1. cimg: 2.8.4 -> 2.9.0

    AndersonTorres committed Apr 15, 2020
    Copy the full SHA
    b818fb1 View commit details
  2. Copy the full SHA
    ab2a835 View commit details
  3. Copy the full SHA
    3e03c1b View commit details
  4. Merge pull request #85257 from marsam/update-nodejs-13_x

    nodejs-13_x: 13.12.0 -> 13.13.0
    marsam authored Apr 15, 2020
    Copy the full SHA
    7120b88 View commit details
  5. Merge pull request #85245 from maxeaubrey/openttd_1.10.1

    openttd: 1.10.0 -> 1.10.1
    marsam authored Apr 15, 2020
    Copy the full SHA
    a584339 View commit details
  6. icewm: update URL

    AndersonTorres committed Apr 15, 2020
    Copy the full SHA
    5b95f72 View commit details
  7. Copy the full SHA
    dbc0e85 View commit details
  8. Merge pull request #84398 from AndersonTorres/update-cherrytree

    cherrytree: 0.39.0 -> 0.39.2
    AndersonTorres authored Apr 15, 2020
    Copy the full SHA
    a9359f3 View commit details
  9. Merge pull request #84345 from AndersonTorres/update-sound-of-sorting

    sound-of-sorting: 2015-07-21 -> 2017-12-23
    AndersonTorres authored Apr 15, 2020
    Copy the full SHA
    ea46c3a View commit details
  10. Merge pull request #84275 from AndersonTorres/update-cimg

    cimg: 2.8.4 -> 2.9.0
    AndersonTorres authored Apr 15, 2020
    Copy the full SHA
    ee0929b View commit details
  11. Merge pull request #84607 from AndersonTorres/update-libtap

    libtap: 1.12.0 -> 1.14.0
    AndersonTorres authored Apr 15, 2020
    Copy the full SHA
    0ee3bf4 View commit details
  12. Copy the full SHA
    3b91c3d View commit details
  13. Merge pull request #84603 from AndersonTorres/update-gp2c

    gp2c: 0.0.11pl2 -> 0.0.11pl3
    AndersonTorres authored Apr 15, 2020
    Copy the full SHA
    9910e46 View commit details
  14. ppsspp: 1.9.3 -> 1.9.4

    AndersonTorres committed Apr 15, 2020
    Copy the full SHA
    f902068 View commit details
  15. Merge pull request #84587 from AndersonTorres/update-ppsspp

    ppsspp: 1.9.3 -> 1.9.4
    AndersonTorres authored Apr 15, 2020
    Copy the full SHA
    e2d4435 View commit details
  16. mksh: 57 -> 58

    AndersonTorres committed Apr 15, 2020
    Copy the full SHA
    5afd698 View commit details
  17. Copy the full SHA
    a225186 View commit details
  18. jupp: 31 -> 39

    AndersonTorres committed Apr 15, 2020
    Copy the full SHA
    92b28ac View commit details
  19. Copy the full SHA
    8f89b0c View commit details
  20. Copy the full SHA
    35ecd63 View commit details
  21. Copy the full SHA
    36b4814 View commit details
  22. Merge pull request #85262 from peterhoeg/t/freerdp

    freerdp: re-enable tests except for one failing test
    lheckemann authored Apr 15, 2020
    Copy the full SHA
    1d8a8d0 View commit details
  23. Merge pull request #78129 from flyfloh/airsonic-vhost

    airsonic: fix virtualHost option
    rnhmjoj authored Apr 15, 2020
    Copy the full SHA
    da232ea View commit details
  24. Merge pull request #85227 from etu/update-testssl

    testssl: 3.0rc6 -> 3.0
    talyz authored Apr 15, 2020
    Copy the full SHA
    b3c2a06 View commit details
  25. Copy the full SHA
    7c21abd View commit details
1 change: 1 addition & 0 deletions nixos/modules/services/misc/airsonic.nix
Original file line number Diff line number Diff line change
@@ -138,6 +138,7 @@ in {

services.nginx = mkIf (cfg.virtualHost != null) {
enable = true;
recommendedProxySettings = true;
virtualHosts.${cfg.virtualHost} = {
locations.${cfg.contextPath}.proxyPass = "http://${cfg.listenAddress}:${toString cfg.port}";
};
12 changes: 5 additions & 7 deletions pkgs/applications/editors/jupp/default.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
{ stdenv, fetchurl
, ncurses, gpm
}:
{ stdenv, fetchurl, ncurses, gpm }:

stdenv.mkDerivation rec {

pname = "jupp";
version = "3.1";
srcName = "joe-3.1jupp31";
version = "39";
srcName = "joe-3.1${pname}${version}";

src = fetchurl {
urls = [
"https://www.mirbsd.org/MirOS/dist/jupp/${srcName}.tgz"
"https://pub.allbsd.org/MirOS/dist/jupp/${srcName}.tgz" ];
sha256 = "1fnf9jsd6p4jyybkhjjs328qx38ywy8w029ngc7j7kqp0ixn0l0s";
sha256 = "14gys92dy3kq9ikigry7q2x4w5v2z76d97vp212bddrxiqy5np8d";
};

preConfigure = "chmod +x ./configure";
@@ -37,7 +35,7 @@ stdenv.mkDerivation rec {
and has a lot of bugs fixed. It is based upon an older version of joe
because these behave better overall.
'';
homepage = "http://mirbsd.de/jupp";
homepage = "http://www.mirbsd.org/jupp.htm";
license = licenses.gpl1;
maintainers = with maintainers; [ AndersonTorres ];
};
30 changes: 16 additions & 14 deletions pkgs/applications/misc/cherrytree/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
{ lib, fetchurl, pythonPackages, gettext }:
{ lib, fetchFromGitHub, pythonPackages, gettext }:

pythonPackages.buildPythonApplication rec {
pname = "cherrytree";
version = "0.39.1";
version = "0.39.2";

src = fetchFromGitHub {
owner = "giuspen";
repo = "cherrytree";
rev = version;
sha256 = "1l6wh24bhp4yhmsfmc0r4n2n10nlilkv4cmv5sfl80i250fiw7xa";

src = fetchurl {
url = "https://www.giuspen.com/software/${pname}-${version}.tar.xz";
sha256 = "0qhycblnixvbybzr8psgmgcpfs6jc9m0p2h9lmd5zmiaggqlcsv7";
};

nativeBuildInputs = [ gettext ];
@@ -20,17 +23,16 @@ pythonPackages.buildPythonApplication rec {
meta = with lib; {
description = "An hierarchical note taking application";
longDescription = ''
Cherrytree is an hierarchical note taking application,
featuring rich text, syntax highlighting and powerful search
capabilities. It organizes all information in units called
"nodes", as in a tree, and can be very useful to store any piece
of information, from tables and links to pictures and even entire
documents. All those little bits of information you have scattered
around your hard drive can be conveniently placed into a
Cherrytree document where you can easily find it.
Cherrytree is an hierarchical note taking application, featuring rich
text, syntax highlighting and powerful search capabilities. It organizes
all information in units called "nodes", as in a tree, and can be very
useful to store any piece of information, from tables and links to
pictures and even entire documents. All those little bits of information
you have scattered around your hard drive can be conveniently placed into
a Cherrytree document where you can easily find it.
'';
homepage = "http://www.giuspen.com/cherrytree";
license = licenses.gpl3;
maintainers = with maintainers; [ AndersonTorres ];
maintainers = with maintainers; [ ];
};
}
121 changes: 75 additions & 46 deletions pkgs/applications/networking/remote/freerdp/default.nix
Original file line number Diff line number Diff line change
@@ -1,34 +1,41 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
, alsaLib, ffmpeg, glib, openssl, pcre, zlib
, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama, libXrandr, libXrender, libXv, libXtst
, libxkbcommon, libxkbfile
, wayland
, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc
, libxslt
, libusb1
, libpulseaudio ? null
, cups ? null
, pcsclite ? null
, systemd ? null
, buildServer ? true
, nocaps ? false
}:
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, alsaLib, ffmpeg, glib, openssl
, pcre, zlib, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama
, libXrandr, libXrender, libXv, libXtst, libxkbcommon, libxkbfile, wayland
, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt
, libusb1, libpulseaudio ? null, cups ? null, pcsclite ? null, systemd ? null
, buildServer ? true, nocaps ? false }:

stdenv.mkDerivation rec {
let
cmFlag = flag: if flag then "ON" else "OFF";
disabledTests = [
# this one is probably due to our sandbox
{
dir = "libfreerdp/crypto/test";
file = "Test_x509_cert_info.c";
}
];

in stdenv.mkDerivation rec {
pname = "freerdp";
version = "2.0.0";

src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
rev = version;
owner = "FreeRDP";
repo = "FreeRDP";
rev = version;
sha256 = "0d2559v0z1jnq6jlrvsgdf8p6gd27m8kwdnxckl1x0ygaxs50bqc";
};

# outputs = [ "bin" "out" "dev" ];

prePatch = ''
postPatch = ''
export HOME=$TMP
# failing test(s)
${lib.concatMapStringsSep "\n" (e: ''
substituteInPlace ${e.dir}/CMakeLists.txt \
--replace ${e.file} ""
rm ${e.dir}/${e.file}
'') disabledTests}
substituteInPlace "libfreerdp/freerdp.pc.in" \
--replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@"
'' + lib.optionalString (pcsclite != null) ''
@@ -39,40 +46,62 @@ stdenv.mkDerivation rec {
--replace "RDP_SCANCODE_CAPSLOCK" "RDP_SCANCODE_LCONTROL"
'';

buildInputs = with lib; [
alsaLib cups ffmpeg glib openssl pcre pcsclite libpulseaudio zlib
gstreamer gst-plugins-base gst-plugins-good libunwind orc
libX11 libXcursor libXdamage libXext libXi libXinerama libXrandr libXrender libXv libXtst
libxkbcommon libxkbfile
wayland libusb1
libxslt
] ++ optional stdenv.isLinux systemd;

nativeBuildInputs = [
cmake pkgconfig
];
buildInputs = with lib;
[
alsaLib
cups
ffmpeg
glib
gst-plugins-base
gst-plugins-good
gstreamer
libX11
libXcursor
libXdamage
libXext
libXi
libXinerama
libXrandr
libXrender
libXtst
libXv
libpulseaudio
libunwind
libusb1
libxkbcommon
libxkbfile
libxslt
openssl
orc
pcre
pcsclite
wayland
zlib
] ++ optional stdenv.isLinux systemd;

enableParallelBuilding = true;
nativeBuildInputs = [ cmake pkgconfig ];

doCheck = false;
doCheck = true;

cmakeFlags = with lib; [
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DWITH_CUNIT=OFF"
"-DWITH_OSS=OFF"
] ++ optional (libpulseaudio != null) "-DWITH_PULSE=ON"
++ optional (cups != null) "-DWITH_CUPS=ON"
++ optional (pcsclite != null) "-DWITH_PCSC=ON"
++ optional buildServer "-DWITH_SERVER=ON"
++ optional (stdenv.isx86_64) "-DWITH_SSE2=ON";
cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]
++ lib.mapAttrsToList (k: v: "-D${k}=${if v then "ON" else "OFF"}") {
BUILD_TESTING = doCheck;
WITH_CUNIT = doCheck;
WITH_CUPS = (cups != null);
WITH_OSS = false;
WITH_PCSC = (pcsclite != null);
WITH_PULSE = (libpulseaudio != null);
WITH_SERVER = buildServer;
WITH_SSE2 = stdenv.isx86_64;
};

meta = with lib; {
description = "A Remote Desktop Protocol Client";
longDescription = ''
FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP)
following the Microsoft Open Specifications.
'';
homepage = "http://www.freerdp.com/";
homepage = "https://www.freerdp.com/";
license = licenses.asl20;
maintainers = with maintainers; [ peterhoeg lheckemann ];
platforms = platforms.unix;
4 changes: 2 additions & 2 deletions pkgs/applications/networking/testssl/default.nix
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation rec {
pname = "testssl.sh";
version = "3.0rc6";
version = "3.0";

src = fetchFromGitHub {
owner = "drwetter";
repo = pname;
rev = version;
sha256 = "1ks7pqgrg382ry0a0jf1dwgcwv81snhkrhkjdbcpym6w5flmpjsv";
sha256 = "08i1l835zlzb3qmsnsd5vhsrr82li6fnp5jqxiybbqr5wjz67ssd";
};

nativeBuildInputs = [ makeWrapper ];
5 changes: 2 additions & 3 deletions pkgs/applications/science/math/pari/gp2c.nix
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {

pname = "gp2c";
version = "0.0.11pl2";
version = "0.0.11pl3";

src = fetchurl {
url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${pname}-${version}.tar.gz";
sha256 = "0wqsf05wgkqvmmsx7jinvzdqav6rl56sr8haibgs31nzz4x9xz9g";
sha256 = "0yymbrgyjw500hqgmkj5m4nmscd7c9rs9w2c96lxgrcyab8krhrm";
};

buildInputs = [ pari perl ];
@@ -25,4 +25,3 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ AndersonTorres ];
};
}
# TODO: add it as "source file" for default package
5 changes: 3 additions & 2 deletions pkgs/applications/window-managers/icewm/default.nix
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
, libpthreadstubs, pcre, libXdamage, libXcomposite, libXfixes
, libsndfile, fribidi }:

with stdenv.lib;
stdenv.mkDerivation rec {
pname = "icewm";
version = "1.6.5";
@@ -34,13 +35,13 @@ stdenv.mkDerivation rec {
cp -r ../lib/themes/{gtk2,Natural,nice,nice2,warp3,warp4,yellowmotif} $out/share/icewm/themes/
'';

meta = with stdenv.lib; {
meta = {
description = "A simple, lightweight X window manager";
longDescription = ''
IceWM is a window manager for the X Window System. The goal of
IceWM is speed, simplicity, and not getting in the user's way.
'';
homepage = "http://www.icewm.org/";
homepage = "https://www.ice-wm.org/";
license = licenses.lgpl2;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux;
36 changes: 18 additions & 18 deletions pkgs/development/libraries/biblesync/default.nix
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
{ stdenv, fetchurl, pkgconfig, cmake, libuuid }:
{ stdenv, fetchFromGitHub, pkgconfig, cmake, libuuid }:

with stdenv.lib;
stdenv.mkDerivation rec{
stdenv.mkDerivation rec {

pname = "biblesync";
version = "1.1.2";
version = "2.0.1";

src = fetchurl{
url = "mirror://sourceforge/project/gnomesword/BibleSync/1.1.2/${pname}-${version}.tar.gz";
sha256 = "0190q2da0ppif2242lahl8xfz01n9sijy60aq1a0545qcp0ilvl8";
src = fetchFromGitHub {
owner = "karlkleinpaste";
repo = "biblesync";
rev = version;
sha256 = "1baq2fwf6132i514xrvq05p2gy98mkg1rn5whf9q5k475q81nrlr";
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake libuuid ];
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ libuuid ];

meta = {
homepage = "http://www.crosswire.org/wiki/BibleSync";
meta = with stdenv.lib; {
homepage = http://www.crosswire.org/wiki/BibleSync;
description = "A multicast protocol to Bible software shared conavigation";
longDescription = ''
BibleSync is a multicast protocol to support Bible software
shared co-navigation. It uses LAN multicast in either a
personal/small team mutual navigation motif or in a classroom
environment where there are Speakers plus the Audience. The
library implementing the protocol is a single C++ class
providing a complete yet minimal public interface to support
mode setting, setup for packet reception, transmit on local
BibleSync is a multicast protocol to support Bible software shared
co-navigation. It uses LAN multicast in either a personal/small team
mutual navigation motif or in a classroom environment where there are
Speakers plus the Audience. The library implementing the protocol is a
single C++ class providing a complete yet minimal public interface to
support mode setting, setup for packet reception, transmit on local
navigation, and handling of incoming packets.
'';
license = licenses.publicDomain;
20 changes: 13 additions & 7 deletions pkgs/development/libraries/cimg/default.nix
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, unzip }:
{ stdenv, fetchFromGitHub }:

stdenv.mkDerivation rec {
pname = "cimg";
version = "2.8.4";
version = "2.9.0";

src = fetchurl {
url = "http://cimg.eu/files/CImg_${version}.zip";
sha256 = "1y4j2dmk4nnc5rx65c2px7r0nfq5117pmqpvi7klp9wmgcjs29gf";
src = fetchFromGitHub {
owner = "dtschump";
repo = "CImg";
rev = "v.${version}";
sha256 = "1x43c1w2kzr6h3j7y3kwiwb7nba0iymck6bq9psvp53mh9xxrfd1";
};

nativeBuildInputs = [ unzip ];

installPhase = ''
install -dm 755 $out/include/CImg/plugins $doc/share/doc/cimg/examples
@@ -24,6 +24,12 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "A small, open source, C++ toolkit for image processing";
longDescription = ''
CImg stands for Cool Image. It is easy to use, efficient and is intended
to be a very pleasant toolbox to design image processing algorithms in
C++. Due to its generic conception, it can cover a wide range of image
processing applications.
'';
homepage = "http://cimg.eu/";
license = licenses.cecill-c;
maintainers = [ maintainers.AndersonTorres ];
6 changes: 3 additions & 3 deletions pkgs/development/libraries/libtap/default.nix
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@ with stdenv.lib;
stdenv.mkDerivation rec{

pname = "libtap";
version = "1.12.0";
version = "1.14.0";

src = fetchurl {
url = "https://web-cpan.shlomifish.org/downloads/${pname}-${version}.tar.bz2";
sha256 = "1ms1770cx8c6q3lhn1chkzy12vzmjgvlms7cqhd2d3260j2wwv5s";
url = "https://web-cpan.shlomifish.org/downloads/${pname}-${version}.tar.xz";
sha256 = "1ga7rqmppa8ady665736cx443icscqlgflkqmxd4xbkzypmdj9bk";
};

nativeBuildInputs = [ pkgconfig ];
26 changes: 14 additions & 12 deletions pkgs/development/libraries/sword/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {

pname = "sword";
version = "1.7.4";
version = "1.8.1";

src = fetchurl {
url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${pname}-${version}.tar.gz";
sha256 = "0g91kpfkwccvdikddffdbzd6glnp1gdvkx4vh04iyz10bb7shpcr";
url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.8/${pname}-${version}.tar.gz";
sha256 = "14syphc47g6svkbg018nrsgq4z6hid1zydax243g8dx747vsi6nf";
};

nativeBuildInputs = [ pkgconfig ];
@@ -17,13 +17,6 @@ stdenv.mkDerivation rec {
patchShebangs .;
'';

patches = [
(fetchurl {
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/sword/files/sword-1.7.4-gcc6.patch";
sha256 = "0cvnya5swc7dxabir6bz6la2h1qxd32g3xi06m9b5l5ahb6g10y7";
})
];

configureFlags = [ "--without-conf" "--enable-tests=no" ];
CXXFLAGS = [
"-Wno-unused-but-set-variable"
@@ -34,9 +27,18 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A software framework that allows research manipulation of Biblical texts";
homepage = "http://www.crosswire.org/sword/";
platforms = platforms.linux;
longDescription = ''
The SWORD Project is the CrossWire Bible Society's free Bible software
project. Its purpose is to create cross-platform open-source tools --
covered by the GNU General Public License -- that allow programmers and
Bible societies to write new Bible software more quickly and easily. We
also create Bible study software for all readers, students, scholars, and
translators of the Bible, and have a growing collection of many hundred
texts in around 100 languages.
'';
license = licenses.gpl2;
maintainers = [ maintainers.piotr maintainers.AndersonTorres ];
maintainers = with maintainers; [ piotr AndersonTorres ];
platforms = platforms.unix;
};

}
4 changes: 2 additions & 2 deletions pkgs/development/web/nodejs/v13.nix
Original file line number Diff line number Diff line change
@@ -8,6 +8,6 @@ let
in
buildNodejs {
inherit enableNpm;
version = "13.12.0";
sha256 = "199qcvzikdzw0h25v9dws77fff6hbvr8dj50lyzlnkya1dd6fzhd";
version = "13.13.0";
sha256 = "0wy7d2alli59gwl73hpaf3bz1wxkkcw5yjsgyz42695fz86p64b7";
}
8 changes: 4 additions & 4 deletions pkgs/games/openttd/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchzip, pkgconfig, SDL, libpng, zlib, xz, freetype, fontconfig
{ stdenv, fetchurl, fetchzip, pkgconfig, SDL2, libpng, zlib, xz, freetype, fontconfig
, withOpenGFX ? true, withOpenSFX ? true, withOpenMSX ? true
, withFluidSynth ? true, audioDriver ? "alsa", fluidsynth, soundfont-fluid, procps
, writeScriptBin, makeWrapper, runtimeShell
@@ -29,15 +29,15 @@ let
in
stdenv.mkDerivation rec {
pname = "openttd";
version = "1.10.0";
version = "1.10.1";

src = fetchurl {
url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz";
sha256 = "0lz2y2rjc23k0d97y65cqhy2splw9cmrbvhgz0iqps8xkan1m8hv";
sha256 = "0d22a3c50f7a321f4f211594f4987ac16c381e8e3e40f116848e63e91e7fbb9b";
};

nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ SDL libpng xz zlib freetype fontconfig ]
buildInputs = [ SDL2 libpng xz zlib freetype fontconfig ]
++ stdenv.lib.optionals withFluidSynth [ fluidsynth soundfont-fluid ];

prefixKey = "--prefix-dir=";
4 changes: 2 additions & 2 deletions pkgs/misc/emulators/ppsspp/default.nix
Original file line number Diff line number Diff line change
@@ -16,14 +16,14 @@

mkDerivation rec {
pname = "ppsspp";
version = "1.9.3";
version = "1.9.4";

src = fetchFromGitHub {
owner = "hrydgard";
repo = "ppsspp";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "17sym0vk72lzbh9a1501mhw98c78x1gq7k1fpy69nvvb119j37wa";
sha256 = "0ivi0dcfxwa4nz19amki80qacnjhqr42f0ihyby1scxafl3nq55c";
};

postPatch = ''
21 changes: 10 additions & 11 deletions pkgs/misc/sound-of-sorting/default.nix
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
{ stdenv, fetchgit
, SDL2, wxGTK }:
{ stdenv, fetchFromGitHub, SDL2, wxGTK } :

stdenv.mkDerivation {
stdenv.mkDerivation rec {

pname = "sound-of-sorting";
version = "unstable-2015-07-21";
version = "2017-12-23";

src = fetchgit {
url = "https://github.com/bingmann/sound-of-sorting.git";
rev = "05db428c796a7006d63efdbe314f976e0aa881d6";
sha256 = "0m2f1dym3hcar7784sjzkbf940b28r02ajhkjgyyw7715psifb8l";
fetchSubmodules = true;
src = fetchFromGitHub {
owner = "bingmann";
repo = "sound-of-sorting";
rev = "5884a357af5775fb57d89eb028d4bf150760db75";
sha256 = "01bpzn38cwn9zlydzvnfz9k7mxdnjnvgnbcpx7i4al8fha7x9lw8";
};

buildInputs = with stdenv.lib;
buildInputs =
[ wxGTK SDL2 ];

preConfigure = ''
export SDL_CONFIG=${SDL2.dev}/bin/sdl2-config
'';

meta = with stdenv.lib;{
meta = with stdenv.lib; {
description = "Audibilization and Visualization of Sorting Algorithms";
homepage = "http://panthema.net/2013/sound-of-sorting/";
license = with licenses; gpl3;
8 changes: 5 additions & 3 deletions pkgs/shells/mksh/default.nix
Original file line number Diff line number Diff line change
@@ -2,17 +2,19 @@

stdenv.mkDerivation rec {
pname = "mksh";
version = "57";
version = "58";

src = fetchurl {
urls = [
"https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz"
"http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz"
];
sha256 = "0xdykm1z710wriwd6nc8s8lwk2dwjl63dq96xxaawlid31a1241x";
sha256 = "1337zjvzh14yncg9igdry904a3ns52l8rnm1kcq262w7f5xyp2v0";
};

buildPhase = ''sh ./Build.sh -r -c lto'';
dontConfigure = true;

buildPhase = ''sh ./Build.sh -r'';

installPhase = ''
install -D -m 755 mksh $out/bin/mksh
4 changes: 2 additions & 2 deletions pkgs/shells/zsh/nix-zsh-completions/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:

let
version = "0.4.3";
version = "0.4.4";
in

stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
owner = "spwhitt";
repo = "nix-zsh-completions";
rev = version;
sha256 = "0fq1zlnsj1bb7byli7mwlz7nm2yszwmyx43ccczcv51mjjfivyp3";
sha256 = "1n9whlys95k4wc57cnz3n07p7zpkv796qkmn68a50ygkx6h3afqf";
};

installPhase = ''