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: 73debdc298ae
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: 9b1706eb0601
Choose a head ref

Commits on Apr 21, 2019

  1. jellyfin: 10.2.2 -> 10.3.0

    nyanloutre committed Apr 21, 2019
    Copy the full SHA
    3fa3a74 View commit details
  2. vimPlugins: update

    malob committed Apr 21, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9bc3eb7 View commit details
  3. Copy the full SHA
    0a43d78 View commit details
  4. Copy the full SHA
    8e3eccc View commit details
  5. Copy the full SHA
    2aa505b View commit details
  6. Copy the full SHA
    1b972aa View commit details

Commits on Apr 22, 2019

  1. ffsend: 0.2.42 -> 0.2.45

    lilyball committed Apr 22, 2019
    Copy the full SHA
    5457c04 View commit details
  2. Copy the full SHA
    fe691b1 View commit details
  3. brogue: add .desktop file and icon

    Add XDG .desktop file and icon. Note that the .desktop file included in
    the source archive is not used because it uses unsuitable paths and
    refers to an old version of the game.
    lightbulbjim committed Apr 22, 2019
    Copy the full SHA
    f588157 View commit details
  4. hyperrogue: add .desktop file and icon

    Add XDG .desktop file and icons.
    lightbulbjim committed Apr 22, 2019
    Copy the full SHA
    328b1d3 View commit details
  5. Merge pull request #59952 from nyanloutre/jellyfin-update

    jellyfin: 10.2.2 -> 10.3.0
    aanderse authored Apr 22, 2019
    Copy the full SHA
    b23f87e View commit details
  6. linux: 5.1-rc5 -> 5.1-rc6

    NeQuissimus committed Apr 22, 2019
    Copy the full SHA
    527dfd3 View commit details
  7. Merge pull request #59954 from lightbulbjim/brogue-desktop

    brogue: add .desktop file and icon
    c0bw3b authored Apr 22, 2019
    Copy the full SHA
    c4af7e9 View commit details
  8. gifsicle: 1.91 -> 1.92 (#59961)

    xrelkd authored and zimbatm committed Apr 22, 2019
    Copy the full SHA
    c4f7d4c View commit details
  9. Merge pull request #59946 from lightbulbjim/hyperrogue-desktop

    hyperrogue: add .desktop file and icon
    c0bw3b authored Apr 22, 2019
    Copy the full SHA
    63d0a1b View commit details
  10. Merge pull request #60014 from etu/update-gitea-180

    gitea: 1.7.6 -> 1.8.0
    srhb authored Apr 22, 2019
    Copy the full SHA
    a115006 View commit details
  11. Merge pull request #59918 from lilyball/ffsend

    ffsend: 0.2.42 -> 0.2.45
    c0bw3b authored Apr 22, 2019
    Copy the full SHA
    78f3e9f View commit details
  12. liburing: init at 1.0.0pre821_39e0ebd

    Signed-off-by: Austin Seipp <aseipp@pobox.com>
    thoughtpolice committed Apr 22, 2019
    Copy the full SHA
    52714f4 View commit details
  13. profanity: 0.5.1 -> 0.6.0 (#59931)

    * profanity: 0.5.1 -> 0.6.0
    
    * profanity: recreate darwin patch
    for v0.6.0 sources
    eri451 authored and c0bw3b committed Apr 22, 2019
    Copy the full SHA
    caa4e9a View commit details
  14. firecracker: 0.15.0 -> 0.15.2

    Signed-off-by: Austin Seipp <aseipp@pobox.com>
    thoughtpolice committed Apr 22, 2019
    Copy the full SHA
    d3fad88 View commit details
  15. Merge pull request #58846 from malob/new-vim-plugins

    vimPlugins: add plugins deoplete-fish, NeoSolarized, vim-choosewin, and vim-fish
    timokau authored Apr 22, 2019
    Copy the full SHA
    154f36d View commit details
  16. Merge pull request #60027 from thoughtpolice/nixpkgs/liburing

    liburing: init at 1.0.0pre821_39e0ebd
    thoughtpolice authored Apr 22, 2019
    Copy the full SHA
    9b1706e View commit details
Original file line number Diff line number Diff line change
@@ -20,13 +20,13 @@ with stdenv.lib;

stdenv.mkDerivation rec {
name = "profanity-${version}";
version = "0.5.1";
version = "0.6.0";

src = fetchFromGitHub {
owner = "boothj5";
repo = "profanity";
rev = "${version}";
sha256 = "1ppr02wivhlrqr62r901clnycna8zpn6kr7n5rw8y3zfw21ny17z";
sha256 = "0f5kfzy22wzyj7rnd2nbj93q96ga87b53wlg8lfg83qdphx1ymz9";
};

patches = [ ./patches/packages-osx.patch ./patches/undefined-macros.patch ];
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
Profanity is a console based XMPP client written in C using ncurses and
libstrophe, inspired by Irssi.
'';
homepage = http://profanity.im/;
homepage = http://www.profanity.im/;
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = [ maintainers.devhell ];
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
diff --git a/configure.ac b/configure.ac
index 1e55b1cc..0832a387 100644
index 5c00aca..eb78060 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,6 @@ AC_CANONICAL_HOST
PLATFORM="unknown"
@@ -23,7 +23,6 @@ PLATFORM="unknown"
AS_CASE([$host_os],
[freebsd*], [PLATFORM="freebsd"],
[openbsd*], [PLATFORM="openbsd"],
- [darwin*], [PLATFORM="osx"],
[cygwin], [PLATFORM="cygwin"],
[PLATFORM="nix"])


4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitea/default.nix
Original file line number Diff line number Diff line change
@@ -8,13 +8,13 @@ with stdenv.lib;

buildGoPackage rec {
pname = "gitea";
version = "1.7.6";
version = "1.8.0";

src = fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
rev = "v${version}";
sha256 = "155lnp98dx80aqds91kw2kf6lss6jzk5nljaqmmzsvn701fh922q";
sha256 = "1x5r732rh1g23smgvvk10nlqbv14m7cf3y6zgwwl2bwkvax4z49b";
# Required to generate the same checksum on MacOS due to unicode encoding differences
# More information: https://github.com/NixOS/nixpkgs/pull/48128
extraPostFetch = ''
6 changes: 3 additions & 3 deletions pkgs/applications/virtualization/firecracker/default.nix
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{ fetchurl, stdenv }:

let
version = "0.15.0";
version = "0.15.2";
baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download";

fetchbin = name: sha256: fetchurl {
url = "${baseurl}/v${version}/${name}-v${version}";
inherit sha256;
};

firecracker-bin = fetchbin "firecracker" "06b9pj9s4i0wqbh24frsza2j28n7qflp623vwvar5k18jq6jixd0";
jailer-bin = fetchbin "jailer" "17nbsg3yi9rif9qxgp483b2qx0jn2sn1hlvk63gl8m54mnxzmcr3";
firecracker-bin = fetchbin "firecracker" "11g0iz1krsm6gzhvf0fb4101c6qyk6bl8j3kjidbb52x9i4aqsxk";
jailer-bin = fetchbin "jailer" "0j1gc1cdsfsi82fkvvxla25791lcvk6vmp46i82f0ms9xm7xhswz";
in
stdenv.mkDerivation {
name = "firecracker-${version}";
40 changes: 40 additions & 0 deletions pkgs/development/libraries/liburing/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{ stdenv, fetchgit
}:

stdenv.mkDerivation rec {
name = "liburing-${version}";
version = "1.0.0pre821_${builtins.substring 0 7 src.rev}";

src = fetchgit {
url = "http://git.kernel.dk/liburing";
rev = "39e0ebd4fc66046bf733a47aaa899a556093ebc6";
sha256 = "00c72fizxmwxd2jzmlzi4l82cw7h75lfpkkwzwcjpw9zdg9w0ci7";
};

enableParallelBuilding = true;

outputs = [ "out" "lib" "dev" "man" ];

installFlags =
[ "prefix=$(out)"
"includedir=$(dev)/include"
"libdir=$(lib)/lib"
];

# Copy the examples into $out and man pages into $man. This should be handled
# by the build system in the future and submitted upstream.
postInstall = ''
mkdir -p $out/bin $man/share/man/man2/
cp -R ./man/* $man/share/man/man2
cp ./examples/io_uring-cp examples/io_uring-test $out/bin
'';

meta = with stdenv.lib; {
description = "Userspace library for the Linux io_uring API";
homepage = http://git.kernel.dk/cgit/liburing/;
license = licenses.lgpl21;
platforms = platforms.linux;
maintainers = with maintainers; [ thoughtpolice ];
badPlatforms = [ "aarch64-linux" ];
};
}
15 changes: 14 additions & 1 deletion pkgs/games/brogue/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL, ncurses, libtcod }:
{ stdenv, fetchurl, SDL, ncurses, libtcod, makeDesktopItem }:

stdenv.mkDerivation rec {
name = "brogue-${version}";
@@ -19,8 +19,21 @@ stdenv.mkDerivation rec {

buildInputs = [ SDL ncurses libtcod ];

desktopItem = makeDesktopItem {
name = "brogue";
desktopName = "Brogue";
genericName = "Roguelike";
comment = "Brave the Dungeons of Doom!";
icon = "brogue";
exec = "brogue";
categories = "Game;AdventureGame;";
terminal = "false";
};

installPhase = ''
install -m 555 -D bin/brogue $out/bin/brogue
install -m 444 -D ${desktopItem}/share/applications/brogue.desktop $out/share/applications/brogue.desktop
install -m 444 -D bin/brogue-icon.png $out/share/icons/hicolor/256x256/apps/brogue.png
mkdir -p $out/share/brogue
cp -r bin/fonts $out/share/brogue/
'';
29 changes: 28 additions & 1 deletion pkgs/games/hyperrogue/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, SDL, SDL_ttf, SDL_gfx, SDL_mixer, autoreconfHook,
libpng, glew }:
libpng, glew, makeDesktopItem }:

stdenv.mkDerivation rec {
name = "hyperrogue-${version}";
@@ -16,6 +16,33 @@ stdenv.mkDerivation rec {

buildInputs = [ autoreconfHook SDL SDL_ttf SDL_gfx SDL_mixer libpng glew ];

desktopItem = makeDesktopItem {
name = "hyperrogue";
desktopName = "HyperRogue";
genericName = "HyperRogue";
comment = meta.description;
icon = "hyperrogue";
exec = "hyperrogue";
categories = "Game;AdventureGame;";
};

postInstall = ''
install -m 444 -D ${desktopItem}/share/applications/hyperrogue.desktop \
$out/share/applications/hyperrogue.desktop
install -m 444 -D hyperroid/app/src/main/res/drawable-ldpi/icon.png \
$out/share/icons/hicolor/36x36/apps/hyperrogue.png
install -m 444 -D hyperroid/app/src/main/res/drawable-mdpi/icon.png \
$out/share/icons/hicolor/48x48/apps/hyperrogue.png
install -m 444 -D hyperroid/app/src/main/res/drawable-hdpi/icon.png \
$out/share/icons/hicolor/72x72/apps/hyperrogue.png
install -m 444 -D hyperroid/app/src/main/res/drawable-xhdpi/icon.png \
$out/share/icons/hicolor/96x96/apps/hyperrogue.png
install -m 444 -D hyperroid/app/src/main/res/drawable-xxhdpi/icon.png \
$out/share/icons/hicolor/144x144/apps/hyperrogue.png
install -m 444 -D hyperroid/app/src/main/res/drawable-xxxhdpi/icon.png \
$out/share/icons/hicolor/192x192/apps/hyperrogue.png
'';

enableParallelBuilding = true;

meta = with stdenv.lib; {
Loading