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: 647be9d0ddd0
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: 6bbdbaabaecb
Choose a head ref
  • 13 commits
  • 10 files changed
  • 7 contributors

Commits on Sep 15, 2020

  1. chatterino2: 2.1.7 -> 2.2.2

    Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
    bbigras and cole-h committed Sep 15, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    d8bc3fa View commit details

Commits on Sep 17, 2020

  1. openmpt123: 0.5.1 -> 0.5.2

    gnidorah committed Sep 17, 2020
    Copy the full SHA
    445f5aa View commit details
  2. mame: 0.223 -> 0.224

    gnidorah committed Sep 17, 2020
    Copy the full SHA
    34e8ce3 View commit details
  3. phodav: 2.4 -> 2.5

    gnidorah committed Sep 17, 2020
    Copy the full SHA
    0366a7f View commit details
  4. rambox: 0.7.5 -> 0.7.6

    gnidorah committed Sep 17, 2020
    Copy the full SHA
    cac4080 View commit details

Commits on Sep 21, 2020

  1. mruby: 2.1.1 -> 2.1.2

    marsam committed Sep 21, 2020
    Copy the full SHA
    c743f4e View commit details

Commits on Sep 22, 2020

  1. luakit: 2.1 -> 2.2

    Also, adding myself to maintainers list.
    AndersonTorres committed Sep 22, 2020
    Copy the full SHA
    b950a85 View commit details
  2. Merge pull request #97914 from bbigras/chatterino

    chatterino2: 2.1.7 -> 2.2.2
    marsam authored Sep 22, 2020
    Copy the full SHA
    fc7dbbd View commit details
  3. Merge pull request #98168 from gnidorah/updates

    update some packages I maintain
    mweinelt authored Sep 22, 2020
    Copy the full SHA
    aeab683 View commit details
  4. Copy the full SHA
    1a3b6cc View commit details
  5. Copy the full SHA
    b531e65 View commit details
  6. Copy the full SHA
    1399f78 View commit details
  7. Merge pull request #98388 from marsam/update-mruby

    mruby: 2.1.1 -> 2.1.2
    marsam authored Sep 22, 2020
    Copy the full SHA
    6bbdbaa View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/audio/openmpt123/default.nix
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@
, usePulseAudio ? config.pulseaudio or false, libpulseaudio }:

let
version = "0.5.1";
version = "0.5.2";
in stdenv.mkDerivation {
pname = "openmpt123";
inherit version;

src = fetchurl {
url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
sha256 = "1vpalfsrkbx4vyrh1qy564lr91jwdxlbjivv5gzf8zcywxasf0xa";
sha256 = "1cwpc4j90dpxa2siia68rg9qwwm2xk6bhxnslfjj364507jy6s4l";
};

enableParallelBuilding = true;
18 changes: 13 additions & 5 deletions pkgs/applications/networking/browsers/luakit/default.nix
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@

stdenv.mkDerivation rec {
pname = "luakit";
version = "2.1";
version = "2.2";

src = fetchFromGitHub {
owner = "luakit";
repo = "luakit";
rev = version;
sha256 = "05mm76g72fs48410pbij4mw0s3nqji3r7f3mnr2fvhv02xqj05aa";
sha256 = "sha256-rpHW5VyntmmtekdNcZMIw8Xdv4cfiqJaaHj4ZFFGjYc=";
};

nativeBuildInputs = [
@@ -54,9 +54,17 @@ stdenv.mkDerivation rec {
'';

meta = with stdenv.lib; {
description = "Fast, small, webkit based browser framework extensible in Lua";
description = "Fast, small, webkit-based browser framework extensible in Lua";
longDescription = ''
Luakit is a highly configurable browser framework based on the WebKit web
content engine and the GTK+ toolkit. It is very fast, extensible with Lua,
and licensed under the GNU GPLv3 license. It is primarily targeted at
power users, developers and anyone who wants to have fine-grained control
over their web browser’s behaviour and interface.
'';
homepage = "https://luakit.github.io/";
license = licenses.gpl3;
platforms = platforms.linux; # Only tested linux
license = licenses.gpl3Only;
platforms = platforms.unix;
maintainers = [ maintainers.AndersonTorres ];
};
}
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

mkDerivation rec {
pname = "chatterino2";
version = "2.1.7";
version = "2.2.2";
src = fetchFromGitHub {
owner = "fourtf";
owner = "Chatterino";
repo = pname;
rev = "v${version}";
sha256 = "0bbdzainfa7hlz5p0jfq4y04i3wix7z3i6w193906bi4gr9wilpg";
sha256 = "026cs48hmqkv7k4akbm205avj2pn3x1g7q46chwa707k9km325dz";
fetchSubmodules = true;
};
nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ];
@@ -26,8 +26,9 @@ mkDerivation rec {
improved/extended version of the Twitch web chat. Chatterino 2 is
the second installment of the Twitch chat client series
"Chatterino".
'';
homepage = "https://github.com/fourtf/chatterino2";
'';
homepage = "https://github.com/Chatterino/chatterino2";
changelog = "https://github.com/Chatterino/chatterino2/blob/master/CHANGELOG.md";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ rexim ];
Original file line number Diff line number Diff line change
@@ -3,18 +3,18 @@
}:

let
version = "0.7.5";
version = "0.7.6";
in stdenv.mkDerivation rec {
pname = "rambox";
inherit version;
src = {
x86_64-linux = fetchurl {
url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-amd64.deb";
sha256 = "108yd5djnap37yh0nbjyqkp5ci1zmydfzqcsbapin40a4f36zm31";
sha256 = "1v9l5nfd25mq448457hg0mj5bzylh0krk411kbr73s7lbaaww1jl";
};
i686-linux = fetchurl {
url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.deb";
sha256 = "1pvh048h6m19rmbscsy69ih0jkyhazmq2pcagmf3kk8gmbi7y6p6";
sha256 = "0zhn5hnpl6fpgshp1vwghq6f1hz3f7gds7rjnhky1352cb6cr89i";
};
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");

59 changes: 0 additions & 59 deletions pkgs/development/compilers/mruby/bison-36-compat.patch

This file was deleted.

8 changes: 3 additions & 5 deletions pkgs/development/compilers/mruby/default.nix
Original file line number Diff line number Diff line change
@@ -2,26 +2,24 @@

stdenv.mkDerivation rec {
pname = "mruby";
version = "2.1.1";
version = "2.1.2";

src = fetchFromGitHub {
owner = "mruby";
repo = "mruby";
rev = version;
sha256 = "gEEb0Vn/G+dNgeY6r0VP8bMSPrEOf5s+0GoOcnIPtEU=";
sha256 = "0fhfv8pi7i8jn2vgk2n2rjnbnfa12nhj514v8i4k353n7q4pmkh3";
};

nativeBuildInputs = [ ruby bison rake ];

patches = [ ./bison-36-compat.patch ];

# Necessary so it uses `gcc` instead of `ld` for linking.
# https://github.com/mruby/mruby/blob/35be8b252495d92ca811d76996f03c470ee33380/tasks/toolchains/gcc.rake#L25
preBuild = if stdenv.isLinux then "unset LD" else null;

installPhase = ''
mkdir $out
cp -R build/host/{bin,lib} $out
cp -R include build/host/{bin,lib} $out
'';

doCheck = true;
4 changes: 2 additions & 2 deletions pkgs/misc/emulators/mame/default.nix
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ with stdenv;

let
majorVersion = "0";
minorVersion = "223";
minorVersion = "224";

desktopItem = makeDesktopItem {
name = "MAME";
@@ -26,7 +26,7 @@ in mkDerivation {
owner = "mamedev";
repo = "mame";
rev = "mame${majorVersion}${minorVersion}";
sha256 = "1lh5cmz4f6km2d8fn3m9ns7fc4wzbdp71v0s6vjcynycpyhy3yl1";
sha256 = "1z012fk7nlvxxixxcavmzc9443xli6i7xzz7fdf755g7v1cys7im";
};

hardeningDisable = [ "fortify" ];
2 changes: 1 addition & 1 deletion pkgs/tools/misc/fd/default.nix
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ installShellFiles ];

preFixup = ''
installManPage "$src/doc/fd.1"
installManPage doc/fd.1
installShellCompletion $releaseDir/build/fd-find-*/out/fd.{bash,fish}
installShellCompletion --zsh $releaseDir/build/fd-find-*/out/_fd
4 changes: 2 additions & 2 deletions pkgs/tools/networking/phodav/default.nix
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@
, pkgconfig, libsoup, meson, ninja }:

let
version = "2.4";
version = "2.5";
in stdenv.mkDerivation rec {
pname = "phodav";
inherit version;

src = fetchurl {
url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${pname}-${version}.tar.xz";
sha256 = "1hxq8c5qfah3w7mxcyy3yhzdgswplll31a69p5mqdl04bsvw5pbx";
sha256 = "045rdzf8isqmzix12lkz6z073b5qvcqq6ad028advm5gf36skw3i";
};

mesonFlags = [
2 changes: 1 addition & 1 deletion pkgs/tools/text/ripgrep/default.nix
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
installManPage $releaseDir/build/ripgrep-*/out/rg.1
installShellCompletion $releaseDir/build/ripgrep-*/out/rg.{bash,fish}
installShellCompletion --zsh "$src/complete/_rg"
installShellCompletion --zsh complete/_rg
'';

meta = with stdenv.lib; {