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: d7b34d60dd03
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f35d2a82e7cb
Choose a head ref
Loading
Showing with 1,494 additions and 1,700 deletions.
  1. +1 −3 nixos/modules/services/network-filesystems/ipfs.nix
  2. +1 −0 nixos/tests/all-tests.nix
  3. +14 −44 nixos/tests/ipfs.nix
  4. +2 −2 pkgs/applications/audio/mup/default.nix
  5. +2 −2 pkgs/applications/audio/picard/default.nix
  6. +2 −2 pkgs/applications/editors/kdevelop5/kdev-php.nix
  7. +2 −2 pkgs/applications/editors/kdevelop5/kdev-python.nix
  8. +2 −2 pkgs/applications/editors/kdevelop5/kdevelop.nix
  9. +2 −12 pkgs/applications/graphics/qimgv/default.nix
  10. +2 −2 pkgs/applications/misc/jgmenu/default.nix
  11. +2 −2 pkgs/applications/misc/syncthingtray/default.nix
  12. +385 −385 pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
  13. +385 −385 pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
  14. +23 −0 pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch
  15. +3 −3 pkgs/applications/networking/browsers/firefox/packages.nix
  16. +29 −0 pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix
  17. +9 −12 pkgs/applications/networking/cluster/terragrunt/default.nix
  18. +0 −525 pkgs/applications/networking/cluster/terragrunt/deps.nix
  19. +17 −6 pkgs/applications/networking/ftp/filezilla/default.nix
  20. +11 −4 pkgs/applications/networking/ipfs/default.nix
  21. +21 −6 pkgs/applications/office/grisbi/default.nix
  22. +3 −3 pkgs/applications/version-management/git-and-tools/gitui/default.nix
  23. +2 −2 pkgs/applications/video/catt/default.nix
  24. +3 −3 pkgs/applications/window-managers/i3/default.nix
  25. +2 −7 pkgs/applications/window-managers/i3/gaps.nix
  26. +2 −2 pkgs/applications/window-managers/sway/default.nix
  27. +7 −5 pkgs/applications/window-managers/sway/wrapper.nix
  28. +2 −2 pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
  29. +2 −2 pkgs/development/compilers/go/1.14.nix
  30. +2 −2 pkgs/development/compilers/mercury/default.nix
  31. +4 −4 pkgs/development/coq-modules/contribs/default.nix
  32. +2 −2 pkgs/development/libraries/cpp-utilities/default.nix
  33. +6 −2 pkgs/development/libraries/gnutls/default.nix
  34. +2 −4 pkgs/development/libraries/gstreamer/bad/default.nix
  35. +13 −0 pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch
  36. +2 −2 pkgs/development/libraries/libamqpcpp/default.nix
  37. +5 −2 pkgs/development/libraries/libfilezilla/default.nix
  38. +9 −1 pkgs/development/libraries/libjpeg-turbo/default.nix
  39. +2 −2 pkgs/development/libraries/libndctl/default.nix
  40. +8 −4 pkgs/development/libraries/nss/default.nix
  41. +2 −2 pkgs/development/libraries/openh264/default.nix
  42. +7 −4 pkgs/development/ocaml-modules/gapi-ocaml/default.nix
  43. +49 −0 pkgs/development/python-modules/heudiconv/default.nix
  44. +42 −0 pkgs/development/python-modules/ipydatawidgets/default.nix
  45. +2 −2 pkgs/development/python-modules/ipykernel/default.nix
  46. +6 −6 pkgs/development/python-modules/jc/default.nix
  47. +39 −0 pkgs/development/python-modules/jupyter_client/5.nix
  48. +2 −2 pkgs/development/python-modules/nbformat/2.nix
  49. +2 −2 pkgs/development/python-modules/notebook/2.nix
  50. +2 −2 pkgs/development/python-modules/python-miio/default.nix
  51. +47 −0 pkgs/development/python-modules/traittypes/default.nix
  52. +2 −2 pkgs/development/tools/build-managers/meson/default.nix
  53. +4 −4 pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
  54. +3 −3 pkgs/development/tools/misc/reviewdog/default.nix
  55. +28 −28 pkgs/development/tools/rust/cargo-make/Cargo.lock
  56. +3 −3 pkgs/development/tools/rust/cargo-make/default.nix
  57. +7 −1 pkgs/development/tools/wabt/default.nix
  58. +2 −2 pkgs/development/web/postman/default.nix
  59. +50 −0 pkgs/games/mari0/default.nix
  60. +12 −12 pkgs/os-specific/linux/kernel/hardened-patches.json
  61. +3 −3 pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
  62. +9 −9 ...3-Don-t-try-to-unmount-nix-or-nix-store.patch → 0002-Don-t-try-to-unmount-nix-or-nix-store.patch}
  63. +6 −6 pkgs/os-specific/linux/systemd/{0004-Fix-NixOS-containers.patch → 0003-Fix-NixOS-containers.patch}
  64. +5 −5 ...stemd/{0006-Look-for-fsck-in-the-right-place.patch → 0004-Look-for-fsck-in-the-right-place.patch}
  65. +11 −11 ...some-NixOS-specific-unit-directories.patch → 0005-Add-some-NixOS-specific-unit-directories.patch}
  66. +5 −5 ...seless-message-in-user-sessions.patch → 0006-Get-rid-of-a-useless-message-in-user-sessions.patch}
  67. +15 −15 ...disable-methods-that-cha.patch → 0007-hostnamed-localed-timedated-disable-methods-that-cha.patch}
  68. +5 −5 pkgs/os-specific/linux/systemd/{0011-Fix-hwdb-paths.patch → 0008-Fix-hwdb-paths.patch}
  69. +8 −8 ...-usr-share-zoneinfo-to-etc-zoneinfo.patch → 0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch}
  70. +5 −5 ...localectl-use-etc-X11-xkb-for-list-x11.patch → 0010-localectl-use-etc-X11-xkb-for-list-x11.patch}
  71. +5 −5 ...and-don-t-touch-prefixdi.patch → 0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch}
  72. +28 −32 ...n-into-out-share-factory.patch → 0012-Install-default-configuration-into-out-share-factory.patch}
  73. +5 −5 ...t-when-calling-generators.patch → 0013-inherit-systemd-environment-when-calling-generators.patch}
  74. +4 −4 ...d/{0021-add-rootprefix-to-lookup-dir-paths.patch → 0014-add-rootprefix-to-lookup-dir-paths.patch}
  75. +5 −5 ...ipts-in-etc-systemd-syst.patch → 0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch}
  76. +5 −5 ...s-in-etc-systemd-system-.patch → 0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch}
  77. +3 −3 ...te-ConditionFileNotEmpty.patch → 0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch}
  78. +4 −4 ...r-for-DEFAULT_PATH_NORMAL.patch → 0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch}
  79. +20 −20 pkgs/os-specific/linux/systemd/default.nix
  80. +1 −1 pkgs/servers/home-assistant/component-packages.nix
  81. +10 −3 pkgs/servers/home-assistant/default.nix
  82. +2 −2 pkgs/servers/home-assistant/frontend.nix
  83. +4 −4 pkgs/servers/web-apps/matomo/default.nix
  84. +2 −2 pkgs/tools/admin/lexicon/default.nix
  85. +2 −2 pkgs/tools/misc/clipman/default.nix
  86. +2 −2 pkgs/tools/misc/phoronix-test-suite/default.nix
  87. +3 −3 pkgs/tools/misc/topgrade/default.nix
  88. +3 −0 pkgs/top-level/all-packages.nix
  89. +10 −1 pkgs/top-level/python-packages.nix
4 changes: 1 addition & 3 deletions nixos/modules/services/network-filesystems/ipfs.nix
Original file line number Diff line number Diff line change
@@ -37,9 +37,7 @@ let
baseService = recursiveUpdate commonEnv {
wants = [ "ipfs-init.service" ];
# NB: migration must be performed prior to pre-start, else we get the failure message!
preStart = ''
ipfs repo fsck # workaround for BUG #4212 (https://github.com/ipfs/go-ipfs/issues/4214)
'' + optionalString cfg.autoMount ''
preStart = optionalString cfg.autoMount ''
ipfs --local config Mounts.FuseAllowOther --json true
ipfs --local config Mounts.IPFS ${cfg.ipfsMountDir}
ipfs --local config Mounts.IPNS ${cfg.ipnsMountDir}
1 change: 1 addition & 0 deletions nixos/tests/all-tests.nix
Original file line number Diff line number Diff line change
@@ -143,6 +143,7 @@ in
initrdNetwork = handleTest ./initrd-network.nix {};
installer = handleTest ./installer.nix {};
iodine = handleTest ./iodine.nix {};
ipfs = handleTest ./ipfs.nix {};
ipv6 = handleTest ./ipv6.nix {};
jackett = handleTest ./jackett.nix {};
jellyfin = handleTest ./jellyfin.nix {};
58 changes: 14 additions & 44 deletions nixos/tests/ipfs.nix
Original file line number Diff line number Diff line change
@@ -1,55 +1,25 @@

import ./make-test.nix ({ pkgs, ...} : {
import ./make-test-python.nix ({ pkgs, ...} : {
name = "ipfs";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ mguentner ];
};

nodes = {
adder =
{ ... }:
{
services.ipfs = {
enable = true;
defaultMode = "norouting";
gatewayAddress = "/ip4/127.0.0.1/tcp/2323";
apiAddress = "/ip4/127.0.0.1/tcp/2324";
};
networking.firewall.allowedTCPPorts = [ 4001 ];
};
getter =
{ ... }:
{
services.ipfs = {
enable = true;
defaultMode = "norouting";
autoMount = true;
};
networking.firewall.allowedTCPPorts = [ 4001 ];
};
nodes.machine = { ... }: {
services.ipfs = {
enable = true;
apiAddress = "/ip4/127.0.0.1/tcp/2324";
};
};

testScript = ''
startAll;
$adder->waitForUnit("ipfs-norouting");
$getter->waitForUnit("ipfs-norouting");
# wait until api is available
$adder->waitUntilSucceeds("ipfs --api /ip4/127.0.0.1/tcp/2324 id");
my $addrId = $adder->succeed("ipfs --api /ip4/127.0.0.1/tcp/2324 id -f=\"<id>\"");
my $addrIp = (split /[ \/]+/, $adder->succeed("ip -o -4 addr show dev eth1"))[3];
$adder->mustSucceed("[ -n \"\$(ipfs --api /ip4/127.0.0.1/tcp/2324 config Addresses.Gateway | grep /ip4/127.0.0.1/tcp/2323)\" ]");
# wait until api is available
$getter->waitUntilSucceeds("ipfs --api /ip4/127.0.0.1/tcp/5001 id");
my $ipfsHash = $adder->mustSucceed("echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | cut -d' ' -f2");
chomp($ipfsHash);
start_all()
machine.wait_for_unit("ipfs")
$adder->mustSucceed("[ -n \"\$(echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | grep added)\" ]");
machine.wait_until_succeeds("ipfs --api /ip4/127.0.0.1/tcp/2324 id")
ipfs_hash = machine.succeed(
"echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | awk '{ print $2 }'"
)
$getter->mustSucceed("ipfs --api /ip4/127.0.0.1/tcp/5001 swarm connect /ip4/$addrIp/tcp/4001/ipfs/$addrId");
$getter->mustSucceed("[ -n \"\$(ipfs --api /ip4/127.0.0.1/tcp/5001 cat /ipfs/$ipfsHash | grep fnord)\" ]");
$getter->mustSucceed("[ -n \"$(cat /ipfs/$ipfsHash | grep fnord)\" ]");
'';
machine.succeed(f"ipfs cat /ipfs/{ipfs_hash.strip()} | grep fnord")
'';
})
4 changes: 2 additions & 2 deletions pkgs/applications/audio/mup/default.nix
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@

stdenv.mkDerivation rec {
pname = "mup";
version = "6.7";
version = "6.8";

src = fetchurl {
url = "http://www.arkkra.com/ftp/pub/unix/mup${builtins.replaceStrings ["."] [""] version}src.tar.gz";
sha256 = "1y1qknhib1isdjsbv833w3nxzyfljkfgp1gmjwly60l55q60frpk";
sha256 = "06bv5nyl8rcibyb83zzrfdq6x6f93g3rgnv47i5gsjcaw5w6l31y";
};

nativeBuildInputs = [ autoreconfHook bison flex ghostscript groff netpbm ];
4 changes: 2 additions & 2 deletions pkgs/applications/audio/picard/default.nix
Original file line number Diff line number Diff line change
@@ -12,13 +12,13 @@ let
;
in pythonPackages.buildPythonApplication rec {
pname = "picard";
version = "2.3.1";
version = "2.3.2";

src = fetchFromGitHub {
owner = "metabrainz";
repo = pname;
rev = "release-${version}";
sha256 = "0xalg4dvaqb396h4s6gzxnplgv1lcvsczmmrlhyrj0kfj10amhsj";
sha256 = "sha256-rJbpoPjNMlw4diWjwNQ/DPo3rltvISU4kuRqBbvlBZ0=";
};

nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]
4 changes: 2 additions & 2 deletions pkgs/applications/editors/kdevelop5/kdev-php.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "kdev-php";
version = "5.5.0";
version = "5.5.1";

src = fetchurl {
url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
sha256 = "1hd3ckayrwszda517zfvhihrfmzq4m3kcsrz4sqkbvib0giwsfkp";
sha256 = "1z3mmlg5srzff0y1pjd4wfdf9k4rzk7gfdvbvzizkiy395qw1phv";
};

nativeBuildInputs = [ cmake extra-cmake-modules ];
4 changes: 2 additions & 2 deletions pkgs/applications/editors/kdevelop5/kdev-python.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "kdev-python";
version = "5.5.0";
version = "5.5.1";

src = fetchurl {
url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
sha256 = "0kna6vkxc6lrfzb3gzn11qvw8jpa86gi1k996hdk83gn0lhmkvx5";
sha256 = "0k4j2kp77sz2p8s77wmcawia81bx7vfb2nnh9lqxzdk2mmlg387c";
};

cmakeFlags = [
4 changes: 2 additions & 2 deletions pkgs/applications/editors/kdevelop5/kdevelop.nix
Original file line number Diff line number Diff line change
@@ -10,11 +10,11 @@

mkDerivation rec {
pname = "kdevelop";
version = "5.5.0";
version = "5.5.1";

src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
sha256 = "0438721v24pim5q0q54ivsws9a679fm7ymrm1nn9g1fv06qsm4d8";
sha256 = "18hxwkdbfw0qs3p19jv6d8wwwdzb9m087891i8w2bzkn21fd5pmy";
};

nativeBuildInputs = [
14 changes: 2 additions & 12 deletions pkgs/applications/graphics/qimgv/default.nix
Original file line number Diff line number Diff line change
@@ -16,25 +16,15 @@

mkDerivation rec {
pname = "qimgv";
version = "0.9";
version = "0.9.1";

src = fetchFromGitHub {
owner = "easymodo";
repo = pname;
rev = "v${version}";
sha256 = "1yynjk47gjf2kjfb0ak4blxpb5irgqc1k59z726lwjd6gvg689fl";
sha256 = "0b2hddps969gjim2r9a22zaxmnzp600av2zz6icq66ksfrx1rpac";
};

patches = [
# QtAtomicInt's `storeRelaxed` was introduced in Qt 5.14, while nixpkgs only
# has Qt 5.12. This appears to be the only instance of Qt 5.12
# incompatibility, and will be fixed in the next release.
(fetchpatch {
url = "https://github.com/easymodo/qimgv/commit/a39d6086ceb9445d2c16943e0719096a99920bf8.patch";
sha256 = "1z3ngv6i316hrdcdzig4jg6bcdbgfxjaxvm2jcfcw2dnfbfiq47s";
})
];

nativeBuildInputs = [
cmake
pkgconfig
4 changes: 2 additions & 2 deletions pkgs/applications/misc/jgmenu/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "jgmenu";
version = "4.1.0";
version = "4.2.0";

src = fetchFromGitHub {
owner = "johanmalm";
repo = pname;
rev = "v${version}";
sha256 = "1wsh37rapb1bszlq36hvwxqvfds39hbvbl152m8as4zlh93wfvvk";
sha256 = "1wcmx2yhm6n54w6nymgb8pgfjv411i3zj1vk79q9vr052y1622z0";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/applications/misc/syncthingtray/default.nix
Original file line number Diff line number Diff line change
@@ -20,14 +20,14 @@
}:

mkDerivation rec {
version = "0.10.8";
version = "0.10.9";
pname = "syncthingtray";

src = fetchFromGitHub {
owner = "Martchus";
repo = "syncthingtray";
rev = "v${version}";
sha256 = "1g27v109m0ar090b340x6lsrzfp85hskcr3kapc2rgdhaa0mygpd";
sha256 = "19kni5v9g0p4751bw2xb8dawg5yjkyk39vdy0m93448lsl8cqq04";
};

buildInputs = [ qtbase cpp-utilities qtutilities ]
Loading