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: 99c1276ce23e
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: 43b58960cf0b
Choose a head ref

Commits on Jul 6, 2020

  1. fish: fixup awk references

    xaverdh committed Jul 6, 2020
    Copy the full SHA
    b45a769 View commit details

Commits on Jul 7, 2020

  1. petsc: 3.13.1 -> 3.13.2

    + add fortran build argument
    wucke13 committed Jul 7, 2020
    Copy the full SHA
    dc5113f View commit details
  2. shortwave: 1.0.1 -> 1.1.1

    r-ryantm committed Jul 7, 2020
    Copy the full SHA
    863482f View commit details
  3. Copy the full SHA
    e2b498f View commit details
  4. python27Packages.sqlmap: 1.4.6 -> 1.4.7

    r-ryantm authored and Jon committed Jul 7, 2020
    Copy the full SHA
    ef88530 View commit details
  5. gitAndTools.subgit: 3.3.9 -> 3.3.10

    r-ryantm authored and Jon committed Jul 7, 2020
    Copy the full SHA
    53ae3ef View commit details
  6. spring-boot-cli: 2.3.0 -> 2.3.1

    r-ryantm authored and Jon committed Jul 7, 2020
    Copy the full SHA
    babd73a View commit details
  7. psensor: 1.2.0 -> 1.2.1

    r-ryantm authored and Jon committed Jul 7, 2020
    Copy the full SHA
    a157b7e View commit details
  8. python27Packages.transitions: 0.8.1 -> 0.8.2

    r-ryantm authored and Jon committed Jul 7, 2020
    Copy the full SHA
    b1ad1d2 View commit details
  9. python27Packages.ntlm-auth: 1.4.0 -> 1.5.0

    r-ryantm authored and Jon committed Jul 7, 2020
    Copy the full SHA
    391d1e9 View commit details
  10. python27Packages.xxhash: 1.4.3 -> 1.4.4

    r-ryantm authored and Jon committed Jul 7, 2020
    Copy the full SHA
    f848484 View commit details
  11. plantuml: 1.2020.12 -> 1.2020.15

    r-ryantm authored and Jon committed Jul 7, 2020
    Copy the full SHA
    ad8cf82 View commit details
  12. padthv1: 0.9.14 -> 0.9.15

    r-ryantm authored and Jon committed Jul 7, 2020
    Copy the full SHA
    330bd7c View commit details
  13. ocamlPackages.lwt_ssl: 1.1.2 -> 1.1.3

    r-ryantm authored and Jon committed Jul 7, 2020
    Copy the full SHA
    2d08524 View commit details
  14. mill: 0.7.3 -> 0.7.4

    r-ryantm authored and Jon committed Jul 7, 2020
    Copy the full SHA
    ed9f1b3 View commit details
  15. nx-libs: 3.5.99.23 -> 3.5.99.24

    r-ryantm authored and Jon committed Jul 7, 2020
    Copy the full SHA
    45af43f View commit details
  16. drumkv1: 0.9.14 -> 0.9.15

    r-ryantm authored and Jon committed Jul 7, 2020
    Copy the full SHA
    db00b12 View commit details
  17. flexibee: 2019.3.1.3 -> 2020.2.1.2

    r-ryantm authored and Jon committed Jul 7, 2020
    Copy the full SHA
    62d18f7 View commit details
  18. geekbench: 5.2.0 -> 5.2.1

    r-ryantm authored and Jon committed Jul 7, 2020
    Copy the full SHA
    6387252 View commit details
  19. jamulus: 3.5.6 -> 3.5.8

    r-ryantm authored and Jon committed Jul 7, 2020
    Copy the full SHA
    9ba5521 View commit details
  20. gwyddion: 2.55 -> 2.56

    r-ryantm authored and Jon committed Jul 7, 2020
    Copy the full SHA
    02fe1ec View commit details
  21. vulnix: 1.9.4 -> 1.9.6

    Christian Kauhaus authored and Jon committed Jul 7, 2020
    Copy the full SHA
    711e47a View commit details
  22. libebml: 1.3.10 -> 1.4.0

    r-ryantm authored and Jon committed Jul 7, 2020
    Copy the full SHA
    63e6866 View commit details
  23. cmake-language-server: build with pygls 0.9.x

    kira-bruneau authored and Jon committed Jul 7, 2020
    Copy the full SHA
    832a240 View commit details
  24. Copy the full SHA
    1891480 View commit details
  25. Merge pull request #89299 from wucke13/petsc

    petsc: add fotran build argument
    bhipple authored Jul 7, 2020
    Copy the full SHA
    2ec5479 View commit details
  26. Merge pull request #92480 from pacien/beamerpresenter-init

    beamerpresenter: init at 0.1.1
    danieldk authored Jul 7, 2020
    Copy the full SHA
    7c162b0 View commit details
  27. python2Packages.unittest-sml-reporting: disable py2

    ```
    builder for '/nix/store/5hqb6vylvzjj92db46wrzd3mp56vv1ms-python2.7-unittest-xml-reporting-3.0.2.drv' failed with exit code 1; last 10 log lines:
      no configure script, doing nothing
      building
      Executing setuptoolsBuildPhase
      Traceback (most recent call last):
        File "nix_run_setup", line 8, in <module>
          exec(compile(getattr(tokenize, 'open', open)(__file__).read().replace('\\r\\n', '\\n'), __file__, 'exec'))
        File "setup.py", line 21, in <module>
          raise RuntimeError('This version requires Python 3.5+')  # pragma: no cover
      RuntimeError: This version requires Python 3.5+
      builder for '/nix/store/5hqb6vylvzjj92db46wrzd3mp56vv1ms-python2.7-unittest-xml-reporting-3.0.2.drv' failed with exi
    ```
    Jonathan Ringer committed Jul 7, 2020
    Copy the full SHA
    1cb30eb View commit details
  28. Merge pull request #92229 from xaverdh/fish-awk-deps

    fish: fixup awk references
    danieldk authored Jul 7, 2020
    Copy the full SHA
    4628643 View commit details
  29. waypipe: 0.6.1 -> 0.7.0

    primeos committed Jul 7, 2020
    Copy the full SHA
    6560b60 View commit details
  30. Merge pull request #92613 from stigtsp/package/perl-yaml-syck-fix-darwin

    perlPackages.YAMLSyck: fix darwin build
    aanderse authored Jul 7, 2020
    Copy the full SHA
    4a9dac0 View commit details
  31. Copy the full SHA
    94df3d4 View commit details
  32. krita: 4.2.9 -> 4.3.0

    r-ryantm authored and Jon committed Jul 7, 2020
    Copy the full SHA
    2603a6d View commit details
  33. Merge pull request #92606 from aanderse/perl-packages/beanstalk-client

    perlPackages.BeanstalkClient: init at 1.07
    aanderse authored Jul 7, 2020
    Copy the full SHA
    3b4e26b View commit details
  34. ssh-chat: init at 1.9

    luc65r authored and ehmry committed Jul 7, 2020
    Copy the full SHA
    af0d1f9 View commit details
  35. Copy the full SHA
    976856c View commit details
  36. python.pkgs.pytest-sugar: run tests

    dotlambda authored and Jon committed Jul 7, 2020
    Copy the full SHA
    d3f434e View commit details
  37. python.pkgs.pytest-sugar: 0.9.3 -> 0.9.4

    dotlambda authored and Jon committed Jul 7, 2020
    Copy the full SHA
    484184d View commit details
  38. python.pkgs.junit-xml: simplify tests

    dotlambda authored and Jon committed Jul 7, 2020
    Copy the full SHA
    2f938b3 View commit details
  39. python.pkgs.wordcloud: simplify checkInputs

    dotlambda authored and Jon committed Jul 7, 2020
    Copy the full SHA
    e2786e8 View commit details
  40. python.pkgs.ics: simplify tests

    dotlambda authored and Jon committed Jul 7, 2020
    Copy the full SHA
    9185970 View commit details
  41. python.pkgs.sanic: simplify checkInputs

    dotlambda authored and Jon committed Jul 7, 2020
    Copy the full SHA
    f10148e View commit details
  42. python.pkgs.amqp: run tests

    dotlambda authored and Jon committed Jul 7, 2020
    Copy the full SHA
    1d80180 View commit details
  43. Merge pull request #92568 from r-ryantm/auto-update/shortwave

    shortwave: 1.0.1 -> 1.1.1
    ryantm authored Jul 7, 2020
    Copy the full SHA
    43b5896 View commit details
Showing with 284 additions and 92 deletions.
  1. +2 −2 pkgs/applications/audio/drumkv1/default.nix
  2. +2 −2 pkgs/applications/audio/jamulus/default.nix
  3. +2 −2 pkgs/applications/audio/padthv1/default.nix
  4. +3 −3 pkgs/applications/audio/shortwave/default.nix
  5. +2 −2 pkgs/applications/graphics/krita/default.nix
  6. +25 −0 pkgs/applications/networking/instant-messengers/ssh-chat/default.nix
  7. +84 −0 pkgs/applications/networking/instant-messengers/ssh-chat/deps.nix
  8. +5 −8 pkgs/applications/networking/remote/waypipe/default.nix
  9. +53 −0 pkgs/applications/office/beamerpresenter/default.nix
  10. +2 −2 pkgs/applications/office/flexibee/default.nix
  11. +2 −2 pkgs/applications/science/chemistry/gwyddion/default.nix
  12. +2 −2 pkgs/applications/version-management/git-and-tools/subgit/default.nix
  13. +2 −2 pkgs/development/libraries/libebml/default.nix
  14. +15 −5 pkgs/development/libraries/science/math/petsc/default.nix
  15. +2 −2 pkgs/development/ocaml-modules/lwt_ssl/default.nix
  16. +5 −4 pkgs/development/python-modules/amqp/default.nix
  17. +2 −5 pkgs/development/python-modules/ics/default.nix
  18. +2 −7 pkgs/development/python-modules/junit-xml/default.nix
  19. +2 −2 pkgs/development/python-modules/ntlm-auth/default.nix
  20. +7 −2 pkgs/development/python-modules/pytest-sugar/default.nix
  21. +0 −4 pkgs/development/python-modules/sanic/default.nix
  22. +2 −2 pkgs/development/python-modules/sqlmap/default.nix
  23. +2 −2 pkgs/development/python-modules/transitions/default.nix
  24. +2 −1 pkgs/development/python-modules/unittest-xml-reporting/default.nix
  25. +3 −9 pkgs/development/python-modules/wordcloud/default.nix
  26. +2 −2 pkgs/development/python-modules/xxhash/default.nix
  27. +2 −2 pkgs/development/tools/build-managers/mill/default.nix
  28. +5 −0 pkgs/development/tools/cmake-language-server/default.nix
  29. +2 −2 pkgs/development/tools/spring-boot-cli/default.nix
  30. +4 −0 pkgs/shells/fish/default.nix
  31. +2 −2 pkgs/tools/X11/nx-libs/default.nix
  32. +2 −2 pkgs/tools/misc/geekbench/default.nix
  33. +2 −2 pkgs/tools/misc/plantuml/default.nix
  34. +7 −3 pkgs/tools/security/vulnix/default.nix
  35. +2 −2 pkgs/tools/system/monit/default.nix
  36. +2 −2 pkgs/tools/system/psensor/default.nix
  37. +7 −1 pkgs/top-level/all-packages.nix
  38. +15 −0 pkgs/top-level/perl-packages.nix
4 changes: 2 additions & 2 deletions pkgs/applications/audio/drumkv1/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

mkDerivation rec {
pname = "drumkv1";
version = "0.9.14";
version = "0.9.15";

src = fetchurl {
url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz";
sha256 = "0fr7pkp55zvjxf7p22drs93fsjgvqhbd55vxi0srhp2s2wzz5qak";
sha256 = "108jk8p1sbm99plipf98ssij6dxaip1lmznibg8y2c4x0v2la6ab";
};

buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];
4 changes: 2 additions & 2 deletions pkgs/applications/audio/jamulus/default.nix
Original file line number Diff line number Diff line change
@@ -3,12 +3,12 @@

mkDerivation rec {
pname = "jamulus";
version = "3.5.6";
version = "3.5.8";
src = fetchFromGitHub {
owner = "corrados";
repo = "jamulus";
rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}";
sha256 = "00vd6kffsf3vqfwaxjvln63x3n0q32f385qc51fn5iyj54410x0f";
sha256 = "0mkrlfaw85pxlacrxfhb45731i4jnn67v411lzx5kb42ncar1586";
};

nativeBuildInputs = [ pkg-config qmake ];
4 changes: 2 additions & 2 deletions pkgs/applications/audio/padthv1/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

mkDerivation rec {
pname = "padthv1";
version = "0.9.14";
version = "0.9.15";

src = fetchurl {
url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz";
sha256 = "079iwwlkl1gscyv70v9ambad8shxbs0ixdfp0vsl6dbh87b09qzh";
sha256 = "18ma429kamifcvjmsv0hysxk7qn2r9br4fia929bvfccapck98y1";
};

buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];
6 changes: 3 additions & 3 deletions pkgs/applications/audio/shortwave/default.nix
Original file line number Diff line number Diff line change
@@ -23,17 +23,17 @@

rustPlatform.buildRustPackage rec {
pname = "shortwave";
version = "1.0.1";
version = "1.1.1";

src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "Shortwave";
rev = version;
sha256 = "13lhlh75vw02vkcknl4nvy0yvpdf0qx811mmyja8bzs4rj1j9kr8";
sha256 = "1vlhp2ss06j41simjrrjg38alp85jddhqyvccy6bhfzm0gzynwld";
};

cargoSha256 = "0aph5z54a6i5p8ga5ghhx1c9hjc8zdw5pkv9inmanca0bq3hkdlh";
cargoSha256 = "181699rlpr5dszc18wg0kbss3gfskxaz9lpxpgsc4yfb6ip89qnk";

nativeBuildInputs = [
cargo
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/krita/default.nix
Original file line number Diff line number Diff line change
@@ -10,11 +10,11 @@

mkDerivation rec {
pname = "krita";
version = "4.2.9";
version = "4.3.0";

src = fetchurl {
url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz";
sha256 = "0rvm9mpaq66lxyq4f09x9w6xxhgys0phza223hm5zv6kgn413xsf";
sha256 = "19qlpp9ds60bab73pwi64dq1zn4zn2hcdkrxhjr1j438mc4pflsd";
};

# *somtimes* fails with can't find ui_manager.h, also see https://github.com/NixOS/nixpkgs/issues/35359
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{ lib, buildGoPackage, fetchFromGitHub }:

buildGoPackage rec {
pname = "ssh-chat";
version = "1.9";

goPackagePath = "github.com/shazow/ssh-chat";

src = fetchFromGitHub {
owner = "shazow";
repo = "ssh-chat";
rev = "v${version}";
sha256 = "04yszan6a7x9498s80xymf7wd10530yjrxcdw4czbplyhjdigxlg";
};

goDeps = ./deps.nix;

meta = with lib; {
description = "Chat over SSH";
homepage = "https://github.com/shazow/ssh-chat";
license = licenses.mit;
maintainers = with maintainers; [ luc65r ];
platforms = platforms.all;
};
}
84 changes: 84 additions & 0 deletions pkgs/applications/networking/instant-messengers/ssh-chat/deps.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 5 additions & 8 deletions pkgs/applications/networking/remote/waypipe/default.nix
Original file line number Diff line number Diff line change
@@ -1,38 +1,34 @@
{ stdenv, fetchFromGitLab
, meson, ninja, pkgconfig, scdoc
, meson, ninja, pkg-config, scdoc
, wayland, wayland-protocols, openssh
, mesa, lz4, zstd, ffmpeg, libva
}:

stdenv.mkDerivation rec {
pname = "waypipe-unstable";
version = "0.6.1";
version = "0.7.0";

src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "mstoeckl";
repo = "waypipe";
rev = "v${version}";
sha256 = "13kp5snkksli0sj5ldkgybcs1s865f0qdak2w8796xvy8dg9jda8";
sha256 = "0bkmibask7gfnwkn3fg3l6zaabp95n1zsdnz3dwng8j80a0kakyy";
};

postPatch = ''
substituteInPlace src/waypipe.c \
--replace "/usr/bin/ssh" "${openssh}/bin/ssh"
'';

nativeBuildInputs = [ meson ninja pkgconfig scdoc ];
nativeBuildInputs = [ meson ninja pkg-config scdoc ];

buildInputs = [
wayland wayland-protocols
# Optional dependencies:
mesa lz4 zstd ffmpeg libva
];

enableParallelBuilding = true;

mesonFlags = [ "-Dwerror=false" ]; # TODO: Report warnings upstream

meta = with stdenv.lib; {
description = "A network proxy for Wayland clients (applications)";
longDescription = ''
@@ -41,6 +37,7 @@ stdenv.mkDerivation rec {
makes application forwarding similar to ssh -X feasible.
'';
homepage = "https://mstoeckl.com/notes/gsoc/blog.html";
changelog = "https://gitlab.freedesktop.org/mstoeckl/waypipe/-/releases#v${version}";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ primeos ];
53 changes: 53 additions & 0 deletions pkgs/applications/office/beamerpresenter/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{ stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, installShellFiles,
qmake, qtbase, poppler, qtmultimedia }:

mkDerivation rec {
pname = "beamerpresenter";
version = "0.1.1";

src = fetchFromGitHub {
owner = "stiglers-eponym";
repo = "BeamerPresenter";
rev = "v${version}";
sha256 = "0j7wx3qqwhda33ig2464bi0j0a473y5p7ndy5f7f8x9cqdal1d01";
};

nativeBuildInputs = [ qmake installShellFiles ];
buildInputs = [ qtbase qtmultimedia poppler ];

postPatch = ''
# Fix location of poppler-*.h
shopt -s globstar
for f in **/*.{h,cpp}; do
substituteInPlace $f --replace '#include <poppler-' '#include <poppler/qt5/poppler-'
done
'';

installPhase = ''
install -m755 beamerpresenter -Dt $out/bin/
install -m644 src/icons/beamerpresenter.svg -Dt $out/share/icons/hicolor/scalable/apps/
install -m644 $desktopItem/share/applications/*.desktop -Dt $out/share/applications/
installManPage man/*.{1,5}
'';

# TODO: replace with upstream's .desktop file once available.
# https://github.com/stiglers-eponym/BeamerPresenter/pull/4
desktopItem = makeDesktopItem {
name = pname;
desktopName = "BeamerPresenter";
genericName = "Beamer presentation viewer";
comment = "Simple dual screen pdf presentation software";
icon = "beamerpresenter";
categories = "Office;";
exec = "beamerpresenter %F";
mimeType = "application/pdf;application/x-pdf;";
};

meta = with stdenv.lib; {
description = "Simple dual screen pdf presentation software";
homepage = "https://github.com/stiglers-eponym/BeamerPresenter";
license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = with maintainers; [ pacien ];
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/office/flexibee/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, jre }:

let
version = "2019.3.1.3";
version = "2020.2.1.2";
majorVersion = builtins.substring 0 6 version;
in

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "http://download.flexibee.eu/download/${majorVersion}/${version}/${pname}-${version}.tar.gz";
sha256 = "0jfj0vmrwa05ga4rhqn0sapad06mq0pampmkr75vail2289zkga2";
sha256 = "1a382lwyscvl5gdax5vs0shzmbnhjgggrv0hcwid8kf2s98diw5n";
};

nativeBuildInputs = [ makeWrapper ];
4 changes: 2 additions & 2 deletions pkgs/applications/science/chemistry/gwyddion/default.nix
Original file line number Diff line number Diff line change
@@ -35,10 +35,10 @@ in

stdenv.mkDerivation rec {
pname = "gwyddion";
version = "2.55";
version = "2.56";
src = fetchurl {
url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz";
sha256 = "0l00zszvginpriv12idc0y1x28qmicdmrwkqa007srkxvrdgxwdi";
sha256 = "0z83p3ifdkv5dds8s6fqqbycql1zmgppdc7ygqmm12z5zlrl9p12";
};

nativeBuildInputs = [ pkg-config file ];
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip, makeWrapper, jre }:

stdenv.mkDerivation rec {
name = "subgit-3.3.9";
name = "subgit-3.3.10";

meta = {
description = "A tool for a smooth, stress-free SVN to Git migration";
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "https://subgit.com/download/${name}.zip";
sha256 = "0dwd2kymmprci3b61ayr6axzlkc8zgbc40jqxvvyzschfxw9y0v5";
sha256 = "1z7cmaghfy5yjs50b3y6av9h2d6xmpamyxql7vvr3dy6kflvv8fk";
};
}
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libebml/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "libebml";
version = "1.3.10";
version = "1.4.0";

src = fetchFromGitHub {
owner = "Matroska-Org";
repo = "libebml";
rev = "release-${version}";
sha256 = "1vn0g4hsygrm29qvnzhrblpwjcy2x6swf799ibxv3bzpi1j0gris";
sha256 = "052v4mjynndj9xgfl4lmlsnx9ai0pah0kjyr5fm34l7gj8vhc5s7";
};

nativeBuildInputs = [ cmake pkgconfig ];
Loading