Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 710c339b4d0f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 190080c121ae
Choose a head ref
Loading
Showing with 410 additions and 267 deletions.
  1. +1 −1 lib/trivial.nix
  2. +1 −1 nixos/modules/services/networking/monero.nix
  3. +0 −2 pkgs/applications/editors/vscode/generic.nix
  4. +3 −3 pkgs/applications/editors/vscode/vscode.nix
  5. +4 −4 pkgs/applications/editors/vscode/vscodium.nix
  6. +4 −4 pkgs/applications/graphics/sane/backends/airscan/default.nix
  7. +9 −1 pkgs/applications/kde/kdegraphics-thumbnailers.nix
  8. +28 −55 pkgs/applications/misc/megasync/default.nix
  9. +1 −0 pkgs/applications/misc/pytrainer/default.nix
  10. +28 −7 pkgs/applications/misc/visidata/default.nix
  11. +1 −1 pkgs/applications/misc/xterm/default.nix
  12. +8 −3 pkgs/applications/networking/browsers/firefox/packages.nix
  13. +58 −40 pkgs/applications/networking/browsers/palemoon/default.nix
  14. +2 −2 pkgs/applications/networking/browsers/qutebrowser/default.nix
  15. +2 −2 pkgs/applications/networking/cluster/kubernetes/default.nix
  16. +6 −3 pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
  17. +79 −47 pkgs/applications/networking/remote/freerdp/default.nix
  18. +4 −4 pkgs/applications/version-management/git-and-tools/gh/default.nix
  19. +10 −3 pkgs/applications/version-management/gitea/default.nix
  20. +3 −4 pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
  21. +2 −2 pkgs/development/interpreters/php/default.nix
  22. +9 −2 pkgs/development/libraries/ffmpeg-full/default.nix
  23. +1 −1 pkgs/development/libraries/gamin/default.nix
  24. +3 −3 pkgs/development/libraries/libexecinfo/default.nix
  25. +5 −0 pkgs/development/libraries/libfm/default.nix
  26. +19 −1 pkgs/development/libraries/science/math/mkl/default.nix
  27. +4 −4 pkgs/development/libraries/vapoursynth/default.nix
  28. +3 −3 pkgs/development/libraries/zimg/default.nix
  29. +2 −2 pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix
  30. +2 −3 pkgs/misc/vim-plugins/vim-utils.nix
  31. +2 −2 pkgs/os-specific/linux/apparmor/default.nix
  32. +2 −2 pkgs/os-specific/linux/kernel/linux-4.14.nix
  33. +2 −2 pkgs/os-specific/linux/kernel/linux-4.19.nix
  34. +2 −2 pkgs/os-specific/linux/kernel/linux-4.4.nix
  35. +2 −2 pkgs/os-specific/linux/kernel/linux-4.9.nix
  36. +2 −2 pkgs/os-specific/linux/kernel/linux-5.4.nix
  37. +2 −2 pkgs/os-specific/linux/kernel/linux-5.6.nix
  38. +3 −3 pkgs/os-specific/linux/lvm2/default.nix
  39. +2 −2 pkgs/os-specific/linux/musl/default.nix
  40. +2 −2 pkgs/os-specific/linux/pam/default.nix
  41. +1 −1 pkgs/os-specific/linux/powertop/default.nix
  42. +2 −2 pkgs/os-specific/linux/wireguard/default.nix
  43. +1 −1 pkgs/servers/monitoring/net-snmp/default.nix
  44. +1 −1 pkgs/shells/tcsh/default.nix
  45. +19 −13 pkgs/tools/admin/nomachine-client/default.nix
  46. +6 −5 pkgs/tools/graphics/wdisplays/default.nix
  47. +2 −2 pkgs/tools/misc/clipman/default.nix
  48. +1 −1 pkgs/tools/misc/figlet/default.nix
  49. +36 −0 pkgs/tools/misc/nix-direnv/default.nix
  50. +5 −5 pkgs/tools/networking/slirp4netns/default.nix
  51. +1 −1 pkgs/tools/networking/vde2/default.nix
  52. +2 −2 pkgs/tools/networking/wireguard-tools/default.nix
  53. +4 −0 pkgs/tools/security/tor/default.nix
  54. +2 −0 pkgs/top-level/all-packages.nix
  55. +4 −4 pkgs/top-level/php-packages.nix
2 changes: 1 addition & 1 deletion lib/trivial.nix
Original file line number Diff line number Diff line change
@@ -178,7 +178,7 @@ rec {
let suffixFile = ../.version-suffix;
in if pathExists suffixFile
then lib.strings.fileContents suffixFile
else "pre-git";
else "post-git";

/* Attempts to return the the current revision of nixpkgs and
returns the supplied default value otherwise.
2 changes: 1 addition & 1 deletion nixos/modules/services/networking/monero.nix
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ let
rpc-login=${rpc.user}:${rpc.password}
''}
${optionalString rpc.restricted ''
restrict-rpc=1
restricted-rpc=1
''}
limit-rate-up=${toString limits.upload}
2 changes: 0 additions & 2 deletions pkgs/applications/editors/vscode/generic.nix
Original file line number Diff line number Diff line change
@@ -78,8 +78,6 @@ in
mkdir -p $out/lib/vscode $out/bin
cp -r ./* $out/lib/vscode
substituteInPlace $out/lib/vscode/bin/${executableName} --replace '"$CLI" "$@"' '"$CLI" "--skip-getting-started" "$@"'
ln -s $out/lib/vscode/bin/${executableName} $out/bin
mkdir -p $out/share/applications
6 changes: 3 additions & 3 deletions pkgs/applications/editors/vscode/vscode.nix
Original file line number Diff line number Diff line change
@@ -11,8 +11,8 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";

sha256 = {
x86_64-linux = "15jg39hmlnicq0zrz77yar1bmn5y6gp2670dya2qm5klhva9hd0f";
x86_64-darwin = "1ghqhn46jpbj3is8q5zcj0biyc7gwinhiz3qdpcnf88ga2blcsz8";
x86_64-linux = "16zchjp72m6n6za4ak5kn2ax1s5pjfn7l082d6gfbb2y62isvs7q";
x86_64-darwin = "0w35s6nxagcnd6xcm6bp0m63agkqxffig61cr3nnmpbcgj9zc969";
}.${system};
in
callPackage ./generic.nix rec {
@@ -21,7 +21,7 @@ in

# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.44.1";
version = "1.45.0";
pname = "vscode";

executableName = "code" + lib.optionalString isInsiders "-insiders";
8 changes: 4 additions & 4 deletions pkgs/applications/editors/vscode/vscodium.nix
Original file line number Diff line number Diff line change
@@ -11,8 +11,8 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";

sha256 = {
x86_64-linux = "16qwhnxpwarnwvlxwvy13g687g1cnfzysq16qkykkhqig0cnalmb";
x86_64-darwin = "1p9qkbj59bfc0kn9fzg99gqxbzwxq297qxivxcjflsapd712s4vm";
x86_64-linux = "1wb4s2jw90irlawgl6539gwl0xwaxglaksmbcddbvnr6rq3ypn8n";
x86_64-darwin = "16c1r7knfd5pfqhnk77nanh82azkc28pwkqfcyasbdgm70k17d3p";
}.${system};

sourceRoot = {
@@ -27,12 +27,12 @@ in

# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.44.1";
version = "1.45.0";
pname = "vscodium";

executableName = "codium";
longName = "VSCodium";
shortName = "Codium";
shortName = "vscodium";

src = fetchurl {
url = "https://github.com/VSCodium/vscodium/releases/download/${version}/VSCodium-${plat}-${version}.${archive_fmt}";
8 changes: 4 additions & 4 deletions pkgs/applications/graphics/sane/backends/airscan/default.nix
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, avahi, libsoup, libjpeg
{ lib, stdenv, fetchFromGitHub, pkg-config, avahi, libsoup, libjpeg, libpng
, sane-backends, meson, ninja }:
stdenv.mkDerivation rec {
pname = "sane-airscan";
version = "0.9.17";
version = "0.99.0";

nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [ avahi libsoup libjpeg sane-backends ];
buildInputs = [ avahi libsoup libjpeg libpng sane-backends ];

src = fetchFromGitHub {
owner = "alexpevzner";
repo = pname;
rev = version;
sha256 = "03y0c1z5s3wbvxa9nvji62w42cmvcgm2sw72j7wm831995q3abmx";
sha256 = "0bbw3s95v5fmkpmmd26v9cf1c40dm85bgxlhs06ski5my803ck0a";
};

meta = with lib; {
10 changes: 9 additions & 1 deletion pkgs/applications/kde/kdegraphics-thumbnailers.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation, lib, fetchpatch,
extra-cmake-modules, karchive, kio, libkexiv2, libkdcraw
}:

@@ -9,6 +9,14 @@ mkDerivation {
license = [ lib.licenses.lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
patches = [
# Fix a bug with thumbnail.so processes hanging:
# https://bugs.kde.org/show_bug.cgi?id=404652
(fetchpatch {
url = "https://github.com/KDE/kdegraphics-thumbnailers/commit/3e2ea6e924d0e2a2cdd9bb435b06965117d6d34c.patch";
sha256 = "0fq85zhymmrq8vl0y6vgh87qf4c6fhcq704p4kpkaq7y0isxj4h1";
})
];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ karchive kio libkexiv2 libkdcraw ];
}
83 changes: 28 additions & 55 deletions pkgs/applications/misc/megasync/default.nix
Original file line number Diff line number Diff line change
@@ -1,50 +1,22 @@
{ stdenv
, autoconf
, automake
, c-ares
, cryptopp
, curl
, doxygen
, fetchFromGitHub
, ffmpeg
, libmediainfo
, libraw
, libsodium
, libtool
, libuv
, libzen
, lsb-release
, mkDerivation
, pkgconfig
, qtbase
, qttools
, sqlite
, swig
, unzip
, wget
}:
{ stdenv, autoconf, automake, c-ares, cryptopp, curl, doxygen, fetchFromGitHub
, fetchpatch, ffmpeg, libmediainfo, libraw, libsodium, libtool, libuv, libzen
, lsb-release, mkDerivation, pkgconfig, qtbase, qttools, sqlite, swig, unzip
, wget }:

mkDerivation rec {
pname = "megasync";
version = "4.2.3.0";
version = "4.3.0.8";

src = fetchFromGitHub {
owner = "meganz";
repo = "MEGAsync";
rev = "v${version}_Linux";
sha256 = "0l4yfrxjb62vc9dnlzy8rjqi68ga1bys5x5rfzs40daw13yf1adv";
sha256 = "1rhxkc6j3039rcsi8cxy3n00g6w7acir82ymnksbpsnp4yxqv5r3";
fetchSubmodules = true;
};

nativeBuildInputs = [
autoconf
automake
doxygen
lsb-release
pkgconfig
qttools
swig
];
nativeBuildInputs =
[ autoconf automake doxygen lsb-release pkgconfig qttools swig ];
buildInputs = [
c-ares
cryptopp
@@ -85,21 +57,21 @@ mkDerivation rec {
'';

configureFlags = [
"--disable-examples"
"--disable-java"
"--disable-php"
"--enable-chat"
"--with-cares"
"--with-cryptopp"
"--with-curl"
"--with-ffmpeg"
"--without-freeimage" # unreferenced even when found
"--without-readline"
"--without-termcap"
"--with-sodium"
"--with-sqlite"
"--with-zlib"
];
"--disable-examples"
"--disable-java"
"--disable-php"
"--enable-chat"
"--with-cares"
"--with-cryptopp"
"--with-curl"
"--with-ffmpeg"
"--without-freeimage" # unreferenced even when found
"--without-readline"
"--without-termcap"
"--with-sodium"
"--with-sqlite"
"--with-zlib"
];

postConfigure = ''
cd ../..
@@ -114,10 +86,11 @@ mkDerivation rec {
'';

meta = with stdenv.lib; {
description = "Easy automated syncing between your computers and your MEGA Cloud Drive";
homepage = https://mega.nz/;
license = licenses.unfree;
platforms = [ "i686-linux" "x86_64-linux" ];
description =
"Easy automated syncing between your computers and your MEGA Cloud Drive";
homepage = "https://mega.nz/";
license = licenses.unfree;
platforms = [ "i686-linux" "x86_64-linux" ];
maintainers = [ maintainers.michojel ];
};
}
1 change: 1 addition & 0 deletions pkgs/applications/misc/pytrainer/default.nix
Original file line number Diff line number Diff line change
@@ -57,6 +57,7 @@ python3.pkgs.buildPythonApplication rec {
psycopg2
requests
certifi
setuptools
];

nativeBuildInputs = [
35 changes: 28 additions & 7 deletions pkgs/applications/misc/visidata/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
{ buildPythonApplication, lib, fetchFromGitHub
, dateutil, pyyaml, openpyxl, xlrd, h5py, fonttools, lxml, pandas, pyshp
{ buildPythonApplication
, lib
, fetchFromGitHub
, dateutil
, pyyaml
, openpyxl
, xlrd
, h5py
, fonttools
, lxml
, pandas
, pyshp
, setuptools
}:
buildPythonApplication rec {
pname = "visidata";
@@ -12,17 +23,27 @@ buildPythonApplication rec {
sha256 = "19gs8i6chrrwibz706gib5sixx1cjgfzh7v011kp3izcrn524mc0";
};

propagatedBuildInputs = [dateutil pyyaml openpyxl xlrd h5py fonttools
lxml pandas pyshp ];
propagatedBuildInputs = [
dateutil
pyyaml
openpyxl
xlrd
h5py
fonttools
lxml
pandas
pyshp
setuptools
];

doCheck = false;

meta = {
inherit version;
description = "Interactive terminal multitool for tabular data";
license = lib.licenses.gpl3 ;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
license = lib.licenses.gpl3;
maintainers = [ lib.maintainers.raskin ];
platforms = with lib.platforms; linux ++ darwin;
homepage = "http://visidata.org/";
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/misc/xterm/default.nix
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl
(fetchpatch {
name = "posix-ptys.patch";
url = "https://git.alpinelinux.org/cgit/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1";
url = "https://git.alpinelinux.org/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1";
sha256 = "0czgnsxkkmkrk1idw69qxbprh0jb4sw3c24zpnqq2v76jkl7zvlr";
});

11 changes: 8 additions & 3 deletions pkgs/applications/networking/browsers/firefox/packages.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ config, stdenv, lib, callPackage, fetchurl }:
{ config, stdenv, lib, callPackage, fetchurl, fetchpatch }:

let
common = opts: callPackage (import ./common.nix opts) {};
@@ -7,14 +7,19 @@ in
rec {
firefox = common rec {
pname = "firefox";
ffversion = "76.0";
ffversion = "76.0.1";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "3dq9h84w1qqidabbrl34jgyjr8bbmbf5wddjazpr7znfm49fn2xyg8fmm5lx9dakghk3wp8yhfi36gmk08fzlrm47v6h17dm9hkh0hz";
sha512 = "0gnhfcgrz6022xf3vqia3s3639xa5pjp13h343d3c09mn8r919cmm6s38vzj1v3734fm25zb68acyarsp72xqq8z1420rh02b2pv38q";
};

patches = [
./no-buildconfig-ffx76.patch
# Fix for NSS 3.52 (add missing CK_GCM_PARMS field)
(fetchpatch {
url = "https://hg.mozilla.org/mozilla-central/raw-rev/463069687b3d";
sha256 = "00yhz67flnkww3rbry0kqn6z6bm7vxfb2sgf7qikgbjcm3ysvpsm";
})
];

meta = {
Loading