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: 1ddb140d95c6
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: ea79a830dcf9
Choose a head ref

Commits on Jan 23, 2020

  1. Copy the full SHA
    5d2ea07 View commit details

Commits on Feb 17, 2020

  1. sourcehut: don't refer to rambox

    gnidorah committed Feb 17, 2020
    Copy the full SHA
    1462612 View commit details
  2. Copy the full SHA
    a539bbf View commit details

Commits on Feb 18, 2020

  1. slack: add MacOS target

    ersinakinci committed Feb 18, 2020
    Copy the full SHA
    27d44b5 View commit details
  2. slack: 4.2.0 -> 4.3.3

    ersinakinci committed Feb 18, 2020
    Copy the full SHA
    1170594 View commit details
  3. wal-g: 0.2.0 -> 0.2.14

    marsam committed Feb 18, 2020
    Copy the full SHA
    5bd7c81 View commit details

Commits on Feb 19, 2020

  1. Copy the full SHA
    1b351f8 View commit details
  2. Copy the full SHA
    db0b139 View commit details
  3. Copy the full SHA
    ee53155 View commit details
  4. Copy the full SHA
    1ba1b9a View commit details
  5. Copy the full SHA
    f90c648 View commit details
  6. Copy the full SHA
    712fba5 View commit details
  7. Copy the full SHA
    10f9b27 View commit details
  8. sundials_3: remove

    This package has only been used for python.pkgs.scikits-odes, which
    should compile with sundials 5 by now.
    flokli committed Feb 19, 2020
    Copy the full SHA
    fb17ac3 View commit details

Commits on Feb 20, 2020

  1. Copy the full SHA
    4d2a825 View commit details
  2. brave: 1.3.115 -> 1.3.118

    JeffLabonte committed Feb 20, 2020
    Copy the full SHA
    9018faa View commit details
  3. Copy the full SHA
    3dd0593 View commit details
  4. Copy the full SHA
    d1ee615 View commit details
  5. Copy the full SHA
    572a667 View commit details
  6. pax-utils: 1.2.4 -> 1.2.5

    r-ryantm committed Feb 20, 2020
    Copy the full SHA
    2c21434 View commit details
  7. cmake_2_8: fix build

    KamilaBorowska committed Feb 20, 2020
    Copy the full SHA
    4bad7d6 View commit details
  8. grafana: 6.6.1 -> 6.6.2

    Frostman committed Feb 20, 2020
    Copy the full SHA
    5b80220 View commit details
  9. Copy the full SHA
    7724ef7 View commit details

Commits on Feb 21, 2020

  1. Copy the full SHA
    de8bc79 View commit details
  2. Copy the full SHA
    7d8a331 View commit details
  3. pysam: 0.15.3 -> 0.15.4

    Also disable tests until upstream test data issues are resolved.
    See link in comment in code for more information.
    unode committed Feb 21, 2020
    Copy the full SHA
    bf88bf4 View commit details
  4. Merge pull request #80705 from basvandijk/remove-myself-from-haskell-…

    …codeowners
    
    .github/CODEOWNERS: remove myself from the Haskell code owners
    basvandijk authored Feb 21, 2020
    Copy the full SHA
    ce9b4f7 View commit details
  5. Merge pull request #80532 from r-ryantm/auto-update/shotcut

    shotcut: 19.12.31 -> 20.02.17
    peti authored Feb 21, 2020
    Copy the full SHA
    922648e View commit details
  6. shogun: 6.0.0 -> 6.1.4

    Also migrate to opencv3 to address #72739, the PR didn't build for me.
    Disable testing and ccache since they were broken.
    
    Co-authored-by: Robert Scott <code@humanleg.org.uk>
    edwtjo and risicle committed Feb 21, 2020
    Copy the full SHA
    9b6faed View commit details
  7. Merge pull request #78385 from plumelo/feature/vim-rtp-fix

    vimUtils.vimrcFile: fixes packpath order
    Mic92 authored Feb 21, 2020
    Copy the full SHA
    74ace1f View commit details
  8. Merge pull request #80526 from serokell/yorickvp/fix-bk-agent-hooks

    nixos/buildkite-agents: fix hooksDir assertion
    infinisil authored Feb 21, 2020
    Copy the full SHA
    368d84a View commit details
  9. Copy the full SHA
    01a9f0e View commit details
  10. Copy the full SHA
    0328d77 View commit details
  11. Copy the full SHA
    abacc68 View commit details
  12. Copy the full SHA
    75132e6 View commit details
  13. Copy the full SHA
    4194494 View commit details
  14. libfido2: linux build only

    mmahut committed Feb 21, 2020
    Copy the full SHA
    852d2bc View commit details
  15. Merge pull request #80715 from jtojnar/gimp-2.10.16

    gimp: 2.10.14 → 2.10.16
    jtojnar authored Feb 21, 2020
    Copy the full SHA
    0c4755b View commit details
  16. Copy the full SHA
    c4865b8 View commit details
  17. Merge pull request #80710 from mmahut/libfido2

    libfido2: build only Linux
    mmahut authored Feb 21, 2020
    Copy the full SHA
    448c671 View commit details
  18. Copy the full SHA
    1ea0a24 View commit details
  19. Copy the full SHA
    14dd104 View commit details
  20. Merge pull request #80442 from marsam/update-wal-g

    wal-g: 0.2.0 -> 0.2.14
    marsam authored Feb 21, 2020
    Copy the full SHA
    eca68bd View commit details
  21. maven: make jdk overridable

    This makes it possible to use maven with different (newer) jdks.
    
    Fixes #75630
    timokau committed Feb 21, 2020
    Copy the full SHA
    0141cfe View commit details
  22. Copy the full SHA
    99931d3 View commit details
  23. Copy the full SHA
    09c1342 View commit details
  24. Merge pull request #80530 from romildo/upd.numix-icon-theme

    numix-icon-theme-square: 19.09.20 -> 19.12.27
    romildo authored Feb 21, 2020
    Copy the full SHA
    bf34e7d View commit details
  25. Merge pull request #80446 from asymmetric/patchwork-3.17.3

    ssb-patchwork: 3.17.2 -> 3.17.4
    grahamc authored Feb 21, 2020
    Copy the full SHA
    4d66792 View commit details
  26. Merge pull request #80728 from timokau/maven-jdk-overridable

    maven: make jdk overridable
    timokau authored Feb 21, 2020
    Copy the full SHA
    ec6bf45 View commit details
  27. Merge pull request #80722 from mmahut/libfido2

    libfido2: evaluate systemd only on Linux
    mmahut authored Feb 21, 2020
    Copy the full SHA
    94fbb7b View commit details
Showing with 1,549 additions and 1,001 deletions.
  1. +5 −5 .github/CODEOWNERS
  2. +32 −0 nixos/doc/manual/configuration/x-windows.xml
  3. +160 −0 nixos/modules/config/gtk/gtk.nix
  4. +259 −0 nixos/modules/config/qt.nix
  5. +0 −102 nixos/modules/config/qt5.nix
  6. +2 −1 nixos/modules/module-list.nix
  7. +1 −1 nixos/modules/services/continuous-integration/buildkite-agents.nix
  8. +1 −1 nixos/modules/services/networking/wireguard.nix
  9. +3 −3 nixos/modules/services/x11/desktop-managers/pantheon.nix
  10. +8 −0 nixos/release-combined.nix
  11. +10 −10 pkgs/applications/audio/pulseaudio-dlna/default.nix
  12. +2 −2 pkgs/applications/audio/spectmorph/default.nix
  13. +3 −2 pkgs/applications/graphics/gimp/default.nix
  14. +9 −7 pkgs/applications/graphics/gimp/remove-cc-reference.patch
  15. +1 −0 pkgs/applications/misc/electrum/default.nix
  16. +2 −2 pkgs/applications/networking/browsers/brave/default.nix
  17. +0 −56 pkgs/applications/networking/instant-messengers/rambox/bare.nix
  18. +36 −38 pkgs/applications/networking/instant-messengers/rambox/default.nix
  19. +0 −14 pkgs/applications/networking/instant-messengers/rambox/isDev.patch
  20. +0 −43 pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
  21. +0 −17 pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix
  22. +0 −13 pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile
  23. +131 −105 pkgs/applications/networking/instant-messengers/slack/default.nix
  24. +2 −0 pkgs/applications/networking/instant-messengers/turses/default.nix
  25. +2 −2 pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
  26. +2 −2 pkgs/applications/networking/p2p/tixati/default.nix
  27. +5 −5 pkgs/applications/networking/ssb/patchwork/default.nix
  28. +57 −25 pkgs/applications/science/machine-learning/shogun/default.nix
  29. +1 −1 pkgs/applications/version-management/sourcehut/default.nix
  30. 0 ...ations/{networking/instant-messengers/rambox → version-management/sourcehut}/fetchNodeModules.nix
  31. +2 −2 pkgs/applications/video/shotcut/default.nix
  32. +4 −4 pkgs/data/icons/numix-icon-theme-circle/default.nix
  33. +6 −6 pkgs/data/icons/numix-icon-theme-square/default.nix
  34. +10 −0 pkgs/development/compilers/swift/default.nix
  35. +25 −0 pkgs/development/compilers/swift/patches/swift-package-manager-glibc-2.30.patch
  36. +4 −2 pkgs/development/libraries/gegl/4.0.nix
  37. +2 −2 pkgs/development/libraries/libfido2/default.nix
  38. +2 −11 pkgs/development/libraries/mypaint-brushes/1.0.nix
  39. +1 −1 pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
  40. +0 −52 pkgs/development/libraries/sundials/3.x.nix
  41. +49 −0 pkgs/development/python-modules/cvxpy/default.nix
  42. +3 −3 pkgs/development/python-modules/face_recognition/default.nix
  43. +2 −2 pkgs/development/python-modules/pyodbc/default.nix
  44. +18 −9 pkgs/development/python-modules/pysam/default.nix
  45. +4 −1 pkgs/development/python-modules/pytest-timeout/default.nix
  46. +7 −10 pkgs/development/python-modules/scikits-odes/default.nix
  47. +1 −1 pkgs/development/tools/build-managers/apache-maven/builder.sh
  48. +12 −8 pkgs/development/tools/build-managers/bazel/buildtools/default.nix
  49. +4 −5 pkgs/development/tools/build-managers/bazel/buildtools/deps.nix
  50. +10 −2 pkgs/development/tools/build-managers/bazel/default.nix
  51. +2 −3 pkgs/development/tools/build-managers/cmake/2.8.nix
  52. +2 −2 pkgs/development/tools/ocaml/dune/2.nix
  53. +2 −2 pkgs/development/tools/uftrace/default.nix
  54. +6 −15 pkgs/development/tools/yq-go/default.nix
  55. +0 −363 pkgs/development/tools/yq-go/deps.nix
  56. +2 −3 pkgs/misc/vim-plugins/vim-utils.nix
  57. +2 −2 pkgs/os-specific/linux/pax-utils/default.nix
  58. +3 −3 pkgs/servers/monitoring/grafana/default.nix
  59. +3 −1 pkgs/tools/admin/google-cloud-sdk/default.nix
  60. +15 −5 pkgs/tools/backup/wal-g/default.nix
  61. +588 −0 pkgs/tools/backup/wal-g/deps.nix
  62. +4 −7 pkgs/tools/graphics/gifski/default.nix
  63. +2 −2 pkgs/tools/inputmethods/ibus/default.nix
  64. +3 −10 pkgs/tools/system/plan9port/builder.sh
  65. +1 −0 pkgs/top-level/aliases.nix
  66. +9 −2 pkgs/top-level/all-packages.nix
  67. +5 −3 pkgs/top-level/python-packages.nix
10 changes: 5 additions & 5 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -66,11 +66,11 @@
/doc/languages-frameworks/python.section.md @FRidh

# Haskell
/pkgs/development/compilers/ghc @basvandijk @cdepillabout
/pkgs/development/haskell-modules @basvandijk @cdepillabout @infinisil
/pkgs/development/haskell-modules/default.nix @basvandijk @cdepillabout
/pkgs/development/haskell-modules/generic-builder.nix @basvandijk @cdepillabout
/pkgs/development/haskell-modules/hoogle.nix @basvandijk @cdepillabout
/pkgs/development/compilers/ghc @cdepillabout
/pkgs/development/haskell-modules @cdepillabout @infinisil
/pkgs/development/haskell-modules/default.nix @cdepillabout
/pkgs/development/haskell-modules/generic-builder.nix @cdepillabout
/pkgs/development/haskell-modules/hoogle.nix @cdepillabout

# Perl
/pkgs/development/interpreters/perl @volth
32 changes: 32 additions & 0 deletions nixos/doc/manual/configuration/x-windows.xml
Original file line number Diff line number Diff line change
@@ -160,6 +160,38 @@
package into your system environment. It should work for all Qt 5 library
versions.
</para>
<para>
With help of
<option>
<link linkend="opt-gtk.enable">
gtk
</link>
</option>
and
<option>
<link linkend="opt-qt.enable">
qt
</link>
</option>
modules you can declaratively set system-wide themes settings.
<programlisting>
gtk.enable = true;
gtk.theme = {
name = "Adwaita-dark";
package = pkgs.gnome-themes-extra;
};
gtk.iconTheme = {
name = "Adwaita";
package = pkgs.gnome3.adwaita-icon-theme;
};
qt.enable = true;
qt.platformTheme = "gtk3";
qt.style = {
name = "adwaita-dark";
package = pkgs.adwaita-qt;
};
</programlisting>
</para>
</simplesect>
<simplesect xml:id="custom-xkb-layouts">
<title>Custom XKB layouts</title>
160 changes: 160 additions & 0 deletions nixos/modules/config/gtk/gtk.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
{ config, lib, pkgs, ... }:

with lib;

let
cfg = config.gtk;
gtk2 = cfg.enable && cfg.gtk2;

toGtk2File = key: value:
let
value' =
if isBool value then (if value then "true" else "false")
else if isString value then "\"${value}\""
else toString value;
in
"${key} = ${value'}";
toGtk3File = generators.toINI {
mkKeyValue = key: value:
let
value' =
if isBool value then (if value then "true" else "false")
else toString value;
in
"${key}=${value'}";
};

settings =
optionalAttrs (cfg.font != null)
{ gtk-font-name = cfg.font.name; }
//
optionalAttrs (cfg.theme != null)
{ gtk-theme-name = cfg.theme.name; }
//
optionalAttrs (cfg.iconTheme != null)
{ gtk-icon-theme-name = cfg.iconTheme.name; }
//
optionalAttrs (cfg.cursorTheme != null)
{ gtk-cursor-theme-name = cfg.cursorTheme.name; };

fontType = types.submodule {
options = {
package = mkOption {
internal = true;
type = types.nullOr types.package;
default = null;
};
name = mkOption {
internal = true;
type = types.str;
};
};
};
themeType = types.submodule {
options = {
package = mkOption {
internal = true;
type = types.nullOr types.package;
default = null;
};
name = mkOption {
internal = true;
type = types.str;
};
};
};

optionalPackage = opt:
optional (opt != null && opt.package != null) opt.package;
in
{
options = {
gtk = {
enable = mkEnableOption "Gtk theming configuration";

gtk2 = mkOption {
type = types.bool;
default = true;
description = ''
Whether to enable theming for obsolete GTK2 engine.
'';
};

font = mkOption {
type = types.nullOr fontType;
default = null;
example = literalExample ''
{
name = "Cantarell 11";
package = pkgs.cantarell-fonts;
};
'';
description = ''
The font to use in GTK+ applications.
'';
};

iconTheme = mkOption {
type = types.nullOr themeType;
default = null;
example = literalExample ''
{
name = "Adwaita";
package = pkgs.gnome3.adwaita-icon-theme;
};
'';
description = "The icon theme to use.";
};

cursorTheme = mkOption {
type = types.nullOr themeType;
default = null;
example = literalExample ''
{
name = "Adwaita";
package = pkgs.gnome3.adwaita-icon-theme;
};
'';
description = "The cursor theme to use.";
};

theme = mkOption {
type = types.nullOr themeType;
default = null;
example = literalExample ''
{
name = "Adwaita";
package = pkgs.gnome-themes-extra;
};
'';
description = "The GTK+ theme to use.";
};
};
};

config = mkMerge [

(mkIf gtk2 {
environment.etc."xdg/gtk-2.0/gtkrc".text =
concatStringsSep "\n" (
mapAttrsToList toGtk2File settings
);
})

(mkIf cfg.enable {
environment.systemPackages =
optionalPackage cfg.font
++ optionalPackage cfg.theme
++ optionalPackage cfg.iconTheme
++ optionalPackage cfg.cursorTheme;

environment.etc."xdg/gtk-3.0/settings.ini".text =
toGtk3File { Settings = settings; };

# TODO: support Wayland/XSettings
# once https://github.com/NixOS/nixpkgs/issues/54150 is fixed
})
];

meta.maintainers = [ maintainers.gnidorah ];
}
Loading