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: eb639a82e018
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: 92d970c7667e
Choose a head ref
12 contributors

Commits on Mar 9, 2020

  1. nixos/nvidia : added nvidia-persistenced

    Rakesh Gupta committed Mar 9, 2020
    Copy the full SHA
    89a8a31 View commit details

Commits on May 9, 2020

  1. php.buildPecl: Allow PECLs to depend on other PECLs 

    Some PECLs depend on other PECLs and, like internal PHP extension
dependencies, need to be loaded in the correct order. This makes this
possible by adding the argument "peclDeps" to buildPecl, which adds
the extension to buildInputs and is treated the same way as
internalDeps when the extension config is generated.
    @talyz
    talyz committed May 9, 2020
    Copy the full SHA
    9f09253 View commit details

  2. php.extensions.apcu_bc: Fix runtime loading 

    Fix an issue brought up in #86463, where the apcu_bc extension isn't
loaded correctly since it produces a .so with a different name than
the extension name. Also, the apcu extension has to be loaded and
loaded prior to loading this extension.
    @talyz
    talyz committed May 9, 2020
    Copy the full SHA
    295fc29 View commit details

  3. php.extensions.pcs: Mark broken in 7.3, add tokenizer dependency 

    The pcs extension fails to load at runtime with PHP 7.3, so let's mark
it broken from 7.3 onwards. It also depends on the tokenizer internal
extension.
    @talyz
    talyz committed May 9, 2020
    Copy the full SHA
    2f1f359 View commit details

  4. php.extensions.couchbase: Fix build and runtime loading 

    The couchbase extension depends on the igbinary PECL which needs to be
loaded and loaded prior to it. It also seems like the pcs extension
isn't actually needed - it at least builds and loads without it. Since
the pcs extension dependency was the reason couchbase didn't build on
PHP 7.4 it now does, so let's unmark it broken.
    @talyz
    talyz committed May 9, 2020
    Copy the full SHA
    fa4c995 View commit details

  5. dino: allow newer versions of libsignal-protocol-c 

    The exact version of libsignal-protocol-c used by dino is hard-coded to 2.3.2 because "libsignal-protocol-c has a history of breaking compatibility on the patch level". This prevents libsignal-protocol-c from being updated in NixOS/nixpkgs#83736. Upstream already allows newer versions in the latest git master, so patch the source with this commit. Unfortunately patching doesn't work with git submodules but since the submodule is not used anyways, simply ignore this part of the patch.
    @Luflosi
    Luflosi committed May 9, 2020
    Copy the full SHA
    099bc11 View commit details

Commits on May 10, 2020

  1. qbittorrent: 4.2.2 -> 4.2.5

    @r-ryantm
    r-ryantm committed May 10, 2020
    Copy the full SHA
    3572963 View commit details

  2. qbs: 1.15.0 -> 1.16.0

    @r-ryantm
    r-ryantm committed May 10, 2020
    Copy the full SHA
    254aeb5 View commit details

  3. Merge pull request #86614 from talyz/php-buildpecl-pecldeps 

    php.buildPecl: Make it possible for PECLs to depend on other PECLs, fix apcu_bc and couchbase
    @talyz
    talyz authored May 10, 2020
    Copy the full SHA
    e4efa8b View commit details

  4. Merge pull request #77054 from formbay/nvidia-persistenced 

    nixos/nvidia : added nvidia-persistenced
    @romildo
    romildo authored May 10, 2020
    Copy the full SHA
    be03474 View commit details

  5. qmmp: 1.3.7 -> 1.4.0

    @r-ryantm @bjornfor
    r-ryantm authored and bjornfor committed May 10, 2020
    Copy the full SHA
    ef53fe2 View commit details

  6. isync: Add myself (@primeos) as maintainer 

    Since 887295f we need a new maintainer and I depend on this
software. The rest of the changes is just a refactoring (apart from
meta attributes).
    @primeos
    primeos committed May 10, 2020
    Copy the full SHA
    6c1b066 View commit details

  7. gnomeExtensions.clipboard-indicator: 30 -> 34

    @r-ryantm @bjornfor
    r-ryantm authored and bjornfor committed May 10, 2020
    Copy the full SHA
    024a6dc View commit details

  8. rsyslog: 8.2002.0 -> 8.2004.0

    @r-ryantm
    r-ryantm committed May 10, 2020
    Copy the full SHA
    8da0ce4 View commit details

  9. gns3-{gui,server}: 2.2.7 -> 2.2.8

    @primeos
    primeos committed May 10, 2020
    Copy the full SHA
    1104de3 View commit details

  10. tdesktop: 2.1.2 -> 2.1.4

    @primeos
    primeos committed May 10, 2020
    Copy the full SHA
    22fef8e View commit details

  11. Merge pull request #87283 from Luflosi/patch-dino

    @Mic92
    Mic92 authored May 10, 2020
    Copy the full SHA
    2405542 View commit details

  12. jekyll: 4.0.0 -> 4.0.1

    @primeos
    primeos committed May 10, 2020
    Copy the full SHA
    ec285b8 View commit details

  13. Merge pull request #87467 from r-ryantm/auto-update/qbs 

    qbs: 1.15.0 -> 1.16.0
    @ryantm
    ryantm authored May 10, 2020
    Copy the full SHA
    58d3628 View commit details

  14. Merge pull request #87460 from r-ryantm/auto-update/qbittorrent 

    qbittorrent: 4.2.2 -> 4.2.5
    @ryantm
    ryantm authored May 10, 2020
    Copy the full SHA
    f88bdf3 View commit details

  15. Merge pull request #87485 from r-ryantm/auto-update/rsyslog 

    rsyslog: 8.2002.0 -> 8.2004.0
    @marsam
    marsam authored May 10, 2020
    Copy the full SHA
    88fd82d View commit details

  16. nixos/tests/gitdaemon: fix spurious test failures due to flaky network 

    This test is sometimes flaky on hydra as at the time of the `git clone`
the network isn't really configured yet[1]. That problem doesn't seem to
occur locally but if you run it on a machine with high enough load (such
as hydra build machines). Hopefully this will make the test not flaky
anymore.

[1] https://hydra.nixos.org/build/118710378/nixlog/21/raw
    @andir @bjornfor
    andir authored and bjornfor committed May 10, 2020
    Copy the full SHA
    a432f83 View commit details

  17. resilio-sync: 2.6.4 -> 2.7.0 

    Changelog:

https://help.resilio.com/hc/en-us/articles/206216855-Sync-2-x-change-log
    @danieldk @bjornfor
    danieldk authored and bjornfor committed May 10, 2020
    Copy the full SHA
    b1792c4 View commit details

  18. nixos/uboot-builder: fix cross using buildPackages

    @sorki @bjornfor
    sorki authored and bjornfor committed May 10, 2020
    Copy the full SHA
    03ae0c0 View commit details

  19. nixos/raspberrypi-builder: fix cross using buildPackages

    @sorki @bjornfor
    sorki authored and bjornfor committed May 10, 2020
    Copy the full SHA
    a6ac6d0 View commit details

  20. snakemake: 5.15.0 -> 5.16.0 (#87496)

    @r-ryantm
    r-ryantm authored May 10, 2020
    Copy the full SHA
    92d970c View commit details
23 changes: 23 additions & 0 deletions nixos/modules/hardware/video/nvidia.nix
View file
Original file line number Diff line number Diff line change
@@ -34,10 +34,12 @@ let
enabled = nvidia_x11 != null;

cfg = config.hardware.nvidia;

pCfg = cfg.prime;
syncCfg = pCfg.sync;
offloadCfg = pCfg.offload;
primeEnabled = syncCfg.enable || offloadCfg.enable;
nvidiaPersistencedEnabled = cfg.nvidiaPersistenced;
in

{
@@ -129,6 +131,15 @@ in
<option>hardware.nvidia.prime.intelBusId</option>).
'';
};

hardware.nvidia.nvidiaPersistenced = mkOption {
default = false;
type = types.bool;
description = ''
Update for NVIDA GPU headless mode, i.e. nvidia-persistenced. It ensures all
GPUs stay awake even during headless mode.
'';
};
};

config = mkIf enabled {
@@ -220,6 +231,18 @@ in
++ optional (nvidia_x11.persistenced != null && config.virtualisation.docker.enableNvidia)
"L+ /run/nvidia-docker/extras/bin/nvidia-persistenced - - - - ${nvidia_x11.persistenced}/origBin/nvidia-persistenced";

systemd.services."nvidia-persistenced" = mkIf nvidiaPersistencedEnabled {
description = "NVIDIA Persistence Daemon";
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "forking";
Restart = "always";
PIDFile = "/var/run/nvidia-persistenced/nvidia-persistenced.pid";
ExecStart = "${nvidia_x11.persistenced}/bin/nvidia-persistenced --verbose";
ExecStopPost = "${pkgs.coreutils}/bin/rm -rf /var/run/nvidia-persistenced";
};
};

boot.extraModulePackages = [ nvidia_x11.bin ];

# nvidia-uvm is required by CUDA applications.
4 changes: 2 additions & 2 deletions nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix
View file
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@
pkgs.substituteAll {
src = ./raspberrypi-builder.sh;
isExecutable = true;
inherit (pkgs) bash;
path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
inherit (pkgs.buildPackages) bash;
path = with pkgs.buildPackages; [coreutils gnused gnugrep];
firmware = pkgs.raspberrypifw;
inherit configTxt;
}
2 changes: 1 addition & 1 deletion nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ let

extlinuxConfBuilder =
import ../generic-extlinux-compatible/extlinux-conf-builder.nix {
inherit pkgs;
pkgs = pkgs.buildPackages;
};
in
pkgs.substituteAll {
3 changes: 3 additions & 0 deletions nixos/tests/gitdaemon.nix
View file
Original file line number Diff line number Diff line change
@@ -55,6 +55,9 @@ in {
with subtest("git daemon starts"):
server.wait_for_unit("git-daemon.service")
server.wait_for_unit("network-online.target")
client.wait_for_unit("network-online.target")
with subtest("client can clone project.git"):
client.succeed(
"git clone git://server/project.git /project",
4 changes: 2 additions & 2 deletions pkgs/applications/audio/qmmp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -29,11 +29,11 @@
# handle that.

mkDerivation rec {
name = "qmmp-1.3.7";
name = "qmmp-1.4.0";

src = fetchurl {
url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
sha256 = "13mk8p7bfl3fkavpqyhpcxkxb8a4f5d4qc1lasyf7wls3ghrdag7";
sha256 = "13rhnk55d44svksl13w23w2qkfpkq4mc0jy5mi89nzqkzshwvfd8";
};

nativeBuildInputs = [ cmake pkgconfig ];
30 changes: 16 additions & 14 deletions pkgs/applications/misc/jekyll/basic/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (6.0.2.1)
activesupport (6.0.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2)
zeitwerk (~> 2.2, >= 2.2.2)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
colorator (1.1.0)
@@ -24,7 +24,7 @@ GEM
http_parser.rb (0.6.0)
i18n (1.8.2)
concurrent-ruby (~> 1.0)
jekyll (4.0.0)
jekyll (4.0.1)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
@@ -41,7 +41,7 @@ GEM
terminal-table (~> 1.8)
jekyll-avatar (0.7.0)
jekyll (>= 3.0, < 5.0)
jekyll-mentions (1.5.1)
jekyll-mentions (1.6.0)
html-pipeline (~> 2.3)
jekyll (>= 3.7, < 5.0)
jekyll-sass-converter (2.1.0)
@@ -52,11 +52,12 @@ GEM
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
jemoji (0.11.1)
jemoji (0.12.0)
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (>= 3.0, < 5.0)
kramdown (2.1.0)
kramdown (2.2.1)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
@@ -66,25 +67,26 @@ GEM
mercenary (0.3.6)
mini_portile2 (2.4.0)
minitest (5.14.0)
nokogiri (1.10.8)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.3)
rb-fsevent (0.10.3)
public_suffix (4.0.5)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
rouge (3.16.0)
rexml (3.2.4)
rouge (3.18.0)
safe_yaml (1.0.5)
sassc (2.2.1)
sassc (2.3.0)
ffi (~> 1.9)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thread_safe (0.3.6)
tzinfo (1.2.6)
tzinfo (1.2.7)
thread_safe (~> 0.1)
unicode-display_width (1.6.1)
zeitwerk (2.2.2)
unicode-display_width (1.7.0)
zeitwerk (2.3.0)

PLATFORMS
ruby
63 changes: 37 additions & 26 deletions pkgs/applications/misc/jekyll/basic/gemset.nix
View file
Original file line number Diff line number Diff line change
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1dd6gh66ffdbhsxv33rxxsiciqyhhkm69l1yqspwdj2brvh1jzl1";
sha256 = "0shh34xx9ygxb57s8mag8l22klvjfnk1c4jbjvchk16r6z0ps326";
type = "gem";
};
version = "6.0.2.1";
version = "6.0.3";
};
addressable = {
dependencies = ["public_suffix"];
@@ -130,10 +130,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fpckw5nf4hfr5vhhdlmaxxp5lkdmc1vyqnmijwvy9fmjn4c87aa";
sha256 = "1gw05bh9iidnx2lxw0h5aiknbly818cmndc4a9nhq28fiafizi82";
type = "gem";
};
version = "4.0.0";
version = "4.0.1";
};
jekyll-avatar = {
dependencies = ["jekyll"];
@@ -152,10 +152,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1r81nbw598s485jsppbpy9kwa471w1rdkpdn3a1mq0swg87cp67v";
sha256 = "1n8y67plydfmay3jn865igvgb3h6s2crk8kq7ydk3wmn9h103s1r";
type = "gem";
};
version = "1.5.1";
version = "1.6.0";
};
jekyll-sass-converter = {
dependencies = ["sassc"];
@@ -207,20 +207,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yd77r5jvh9chf5qcp6z63gg40yp5n1sr7nv1hlmbq3xjzlhs6h6";
sha256 = "09sxbnrqz5vf6rxmh6lzism31gz2g3hw86ymg37r1ccknclv3cp9";
type = "gem";
};
version = "0.11.1";
version = "0.12.0";
};
kramdown = {
dependencies = ["rexml"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1dl840bvx8d9nq6lg3mxqyvbiqnr6lk3jfsm6r8zhz7p5srmd688";
sha256 = "059mk8lmddp2a2aa6s4pp7x2yyqbqg5crx5jkn32dzlnqi2j5cn6";
type = "gem";
};
version = "2.1.0";
version = "2.2.1";
};
kramdown-parser-gfm = {
dependencies = ["kramdown"];
@@ -290,10 +291,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8";
sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm";
type = "gem";
};
version = "1.10.8";
version = "1.10.9";
};
pathutil = {
dependencies = ["forwardable-extended"];
@@ -311,20 +312,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1c6kq6s13idl2036b5lch8r7390f8w82cal8hcp4ml76fm2vdac7";
sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g";
type = "gem";
};
version = "4.0.3";
version = "4.0.5";
};
rb-fsevent = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
sha256 = "1k9bsj7ni0g2fd7scyyy1sk9dy2pg9akniahab0iznvjmhn54h87";
type = "gem";
};
version = "0.10.3";
version = "0.10.4";
};
rb-inotify = {
dependencies = ["ffi"];
@@ -337,15 +338,25 @@
};
version = "0.10.1";
};
rexml = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3";
type = "gem";
};
version = "3.2.4";
};
rouge = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ivsvkwdxl44q4xl8bnf6kqmvy47n98akcvlfmhaz0614zlf4bxi";
sha256 = "1n9h0ls2a2zq0bcsw31wxci1wdxb8s3vglfadxpcs6b04vkf6nqq";
type = "gem";
};
version = "3.16.0";
version = "3.18.0";
};
safe_yaml = {
groups = ["default"];
@@ -363,10 +374,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09bnid7r5z5hcin5hykvpvv8xig27wbbckxwis60z2aaxq4j9siz";
sha256 = "1qzfnvb8khvc6w2sn3k91mndc2w50xxx5c84jkr6xdxlmaq1a3kg";
type = "gem";
};
version = "2.2.1";
version = "2.3.0";
};
terminal-table = {
dependencies = ["unicode-display_width"];
@@ -395,29 +406,29 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp";
sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
type = "gem";
};
version = "1.2.6";
version = "1.2.7";
};
unicode-display_width = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pppclzq4qb26g321553nm9xqca3zgllvpwb2kqxsdadwj51s09x";
sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
type = "gem";
};
version = "1.6.1";
version = "1.7.0";
};
zeitwerk = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jywi63w1m2b2w9fj9rjb9n3imf6p5bfijfmml1xzdnsrdrjz0x1";
sha256 = "1akpm3pwvyiack2zk6giv9yn3cqb8pw6g40p4394pdc3xmy3s4k0";
type = "gem";
};
version = "2.2.2";
version = "2.3.0";
};
}
1 change: 1 addition & 0 deletions pkgs/applications/misc/jekyll/default.nix
View file
Original file line number Diff line number Diff line change
@@ -47,6 +47,7 @@ in bundlerApp {
host sites right from your GitHub repositories.
'';
homepage = "https://jekyllrb.com/";
#changelog = "https://raw.githubusercontent.com/jekyll/jekyll/v${version}/History.markdown";
license = licenses.mit;
maintainers = with maintainers; [ primeos pesterhazy ];
platforms = platforms.unix;
Loading