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: 100012e55bc2
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: 353ea7f3ebd3
Choose a head ref
  • 15 commits
  • 8 files changed
  • 5 contributors

Commits on Jan 6, 2020

  1. kdbg: 3.0.0 -> 3.0.1

    r-ryantm committed Jan 6, 2020
    Copy the full SHA
    df40eb8 View commit details
  2. libre: 0.6.0 -> 0.6.1

    r-ryantm committed Jan 6, 2020
    Copy the full SHA
    447864e View commit details

Commits on Jan 7, 2020

  1. pstoedit: 3.74 -> 3.75

    r-ryantm committed Jan 7, 2020
    Copy the full SHA
    671d868 View commit details
  2. goxel: 0.10.0 -> 0.10.5

    tilpner committed Jan 7, 2020
    Copy the full SHA
    e9f87bd View commit details
  3. qtractor: 0.9.11 -> 0.9.12

    r-ryantm committed Jan 7, 2020
    Copy the full SHA
    b3feafd View commit details

Commits on Jan 11, 2020

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    xorilog Christophe Boucharlat
    Copy the full SHA
    f99682a View commit details

Commits on Jan 12, 2020

  1. Merge pull request #77512 from minijackson/kodiPlugins.vfs-sftp-1.0.5

    kodiPlugins.vfs-sftp: 1.0.1 -> 1.0.5
    nh2 authored Jan 12, 2020
    Copy the full SHA
    1d07083 View commit details
  2. Merge pull request #77188 from tilpner/goxel-update

    goxel: 0.10.0 -> 0.10.5
    nh2 authored Jan 12, 2020
    Copy the full SHA
    9aeb966 View commit details
  3. Merge pull request #77187 from r-ryantm/auto-update/pstoedit

    pstoedit: 3.74 -> 3.75
    nh2 authored Jan 12, 2020
    Copy the full SHA
    b0649e2 View commit details
  4. Merge pull request #77232 from r-ryantm/auto-update/qtractor

    qtractor: 0.9.11 -> 0.9.12
    nh2 authored Jan 12, 2020
    Copy the full SHA
    c48562a View commit details
  5. Merge pull request #77141 from r-ryantm/auto-update/libre

    libre: 0.6.0 -> 0.6.1
    nh2 authored Jan 12, 2020
    Copy the full SHA
    fda9775 View commit details
  6. Copy the full SHA
    b0ec8d6 View commit details
  7. Merge pull request #77096 from raboof/ms-sys-reproducibility

    ms-sys: avoid leaking the build timestamp into the manpage
    nh2 authored Jan 12, 2020
    Copy the full SHA
    2ddf7c0 View commit details
  8. kdbg: Add QT pluging path wrapper.

    Fixes error
    
        qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in ""
        This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem.
    
    See #24256.
    nh2 committed Jan 12, 2020
    Copy the full SHA
    852bd1b View commit details
  9. Merge pull request #77105 from r-ryantm/auto-update/kdbg

    kdbg: 3.0.0 -> 3.0.1
    nh2 authored Jan 12, 2020
    Copy the full SHA
    353ea7f View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/audio/qtractor/default.nix
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
pname = "qtractor";
version = "0.9.11";
version = "0.9.12";

src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "02cpjlf3j4sm74hz88r1frnlycs52rs11mzplr2q8plji3ic5w50";
sha256 = "06493sf4hr178jkvric3rmc2phh1ph2jlyh8kl9z248amq3zfnhy";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/goxel/default.nix
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation rec {
pname = "goxel";
version = "0.10.0";
version = "0.10.5";

src = fetchFromGitHub {
owner = "guillaumechereau";
repo = "goxel";
rev = "v${version}";
sha256 = "1mdw4bs7hvfn0yngd9ial5wzlfkcbhr3wzldb1w7s3s48agixkdr";
sha256 = "1b63jqryq19qa81g1ml6d85f27wj1ci3h56r02cl9xn8di5p674f";
};

patches = [ ./disable-imgui_ini.patch ];
4 changes: 2 additions & 2 deletions pkgs/applications/video/kodi/plugins.nix
Original file line number Diff line number Diff line change
@@ -509,14 +509,14 @@ let self = rec {

vfs-sftp = mkKodiABIPlugin rec {
namespace = "vfs.sftp";
version = "1.0.1";
version = "1.0.5";
plugin = namespace;

src = fetchFromGitHub {
owner = "xbmc";
repo = namespace;
rev = "${version}-${rel}";
sha256 = "1l9igrl168s91c15v9klyaaz226ik3xlbzjk2f1346fvzmp87g9v";
sha256 = "10l2rwim574012vzjrkr0b153gk5q81fq48p47mijk294l7g100d";
};

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libre/default.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{stdenv, fetchurl, zlib, openssl}:
stdenv.mkDerivation rec {
version = "0.6.0";
version = "0.6.1";
pname = "libre";
src = fetchurl {
url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
sha256 = "0cc1x6pm1nz09046bfzgvp2p3wjbgm6f53d71a9dd14grjsvr5qf";
sha256 = "0hzyc0hdlw795nyx6ik7h2ihs8wapbj32x8c40xq0484ciwzqnyd";
};
buildInputs = [ zlib openssl ];
makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ]
12 changes: 9 additions & 3 deletions pkgs/development/tools/misc/kdbg/default.nix
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
{ stdenv, fetchurl, cmake, extra-cmake-modules, qt5,
ki18n, kconfig, kiconthemes, kxmlgui, kwindowsystem,
qtbase, makeWrapper,
}:

stdenv.mkDerivation rec {
pname = "kdbg";
version = "3.0.0";
version = "3.0.1";
src = fetchurl {
url = "mirror://sourceforge/kdbg/${version}/${pname}-${version}.tar.gz";
sha256 = "0lxfal6jijdcrf0hc81gmapfmz0kq4569d5qzfm4p72rq9s4r5in";
sha256 = "1gax6xll8svmngw0z1rzhd77xysv01zp0i68x4n5pq0xgh7gi7a4";
};

nativeBuildInputs = [ cmake extra-cmake-modules ];
nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ];
buildInputs = [ qt5.qtbase ki18n kconfig kiconthemes kxmlgui kwindowsystem ];

enableParallelBuilding = true;


postInstall = ''
wrapProgram $out/bin/kdbg --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix}
'';

meta = with stdenv.lib; {
homepage = http://www.kdbg.org/;
description = ''
4 changes: 2 additions & 2 deletions pkgs/tools/graphics/pstoedit/default.nix
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@
}:

stdenv.mkDerivation rec {
name = "pstoedit-3.74";
name = "pstoedit-3.75";

src = fetchurl {
url = "mirror://sourceforge/pstoedit/${name}.tar.gz";
sha256 = "034rcrsi69vyh01rcqh7jy3bw4la4m6jl4niav4c6wrs9bx44cim";
sha256 = "1kv46g2wsvsvcngkavxl5gnw3l6g5xqnh4kmyx4b39a01d8xiddp";
};

#
2 changes: 2 additions & 0 deletions pkgs/tools/misc/ms-sys/default.nix
Original file line number Diff line number Diff line change
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/ms-sys/${pname}-${version}.tar.gz";
sha256 = "06xqpm2s9cg8fj7a1822wmh3p4arii0sifssazg1gr6i7xg7kbjz";
};
# TODO: Remove with next release, see https://sourceforge.net/p/ms-sys/patches/8/
patches = [ ./manpages-without-build-timestamps.patch ];

nativeBuildInputs = [ gettext ];

12 changes: 12 additions & 0 deletions pkgs/tools/misc/ms-sys/manpages-without-build-timestamps.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff -u ms-sys-2.6.0/Makefile ms-sys-2.6.0-fixed/Makefile
--- ms-sys-2.6.0/Makefile 2015-09-27 20:39:45.000000000 +0200
+++ ms-sys-2.6.0-fixed/Makefile2020-01-06 16:43:55.181477511 +0100
@@ -121,7 +121,7 @@

$(DESTDIR)$(MANDIR)/%: $(MAN)/$(dir $(*D))/$(*F)
install -D -m 644 $(MAN)/$(dir $(*D))$(*F) $@
- gzip -f $@
+ gzip -n -f $@

#$(DESTDIR)$(MANDIR)/%: $(MAN)/$(*F)
# echo t: $<