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: 2eacb6035357
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: 02a264922088
Choose a head ref
  • 8 commits
  • 8 files changed
  • 5 contributors

Commits on Jun 7, 2020

  1. nixos/krb5: refactor indentation generation 

    mkVal is no longer aware of the indentation depth. Indentation is
added to each line of the result when it is included in nested
entries.
    @heinic
    heinic committed Jun 7, 2020
    Copy the full SHA
    5ed0924 View commit details

  2. nixos/krb5: output lists as multiple config entries 

    Fixes #89626
    @heinic
    heinic committed Jun 7, 2020
    Copy the full SHA
    2b694b1 View commit details

Commits on Aug 25, 2020

  1. nixos/krb5: add list to example configuration 

    Updated the relevant nixos test to match the example configuration.
    @heinic
    heinic committed Aug 25, 2020
    Copy the full SHA
    0bee87c View commit details

Commits on Aug 27, 2020

  1. libreoffice-fresh: 6.4.3.2 -> 7.0.0.3

    @dguibert
    dguibert committed Aug 27, 2020
    Copy the full SHA
    aa91966 View commit details

  2. j: j901e -> j901f

    @jitwit
    jitwit committed Aug 27, 2020
    Copy the full SHA
    422ef5e View commit details

Commits on Sep 3, 2020

  1. Merge pull request #96474 from dguibert/dg/libreoffice-7 

    libreoffice-fresh: 6.4.3.2 -> 7.0.0.3
    @7c6f434c
    7c6f434c authored Sep 3, 2020
    Copy the full SHA
    d46e488 View commit details

  2. Merge pull request #96494 from jitwit/j 

    j: j901e -> j901f
    @7c6f434c
    7c6f434c authored Sep 3, 2020
    Copy the full SHA
    742c734 View commit details

  3. Merge pull request #89748 from heinic/krb5-lists

    @Mic92
    Mic92 authored Sep 3, 2020
    Copy the full SHA
    02a2649 View commit details
34 changes: 18 additions & 16 deletions nixos/modules/config/krb5/default.nix
View file
Original file line number Diff line number Diff line change
@@ -41,31 +41,30 @@ let
value)
else value;

mkIndent = depth: concatStrings (builtins.genList (_: " ") (2 * depth));
indent = " ";

mkRelation = name: value: "${name} = ${mkVal { inherit value; }}";
mkRelation = name: value:
if (isList value) then
concatMapStringsSep "\n" (mkRelation name) value
else "${name} = ${mkVal value}";

mkVal = { value, depth ? 0 }:
mkVal = value:
if (value == true) then "true"
else if (value == false) then "false"
else if (isInt value) then (toString value)
else if (isList value) then
concatMapStringsSep " " mkVal { inherit value depth; }
else if (isAttrs value) then
(concatStringsSep "\n${mkIndent (depth + 1)}"
([ "{" ] ++ (mapAttrsToList
(attrName: attrValue: let
mappedAttrValue = mkVal {
value = attrValue;
depth = depth + 1;
};
in "${attrName} = ${mappedAttrValue}")
value))) + "\n${mkIndent depth}}"
let configLines = concatLists
(map (splitString "\n")
(mapAttrsToList mkRelation value));
in
(concatStringsSep "\n${indent}"
([ "{" ] ++ configLines))
+ "\n}"
else value;

mkMappedAttrsOrString = value: concatMapStringsSep "\n"
(line: if builtins.stringLength line > 0
then "${mkIndent 1}${line}"
then "${indent}${line}"
else line)
(splitString "\n"
(if isAttrs value then
@@ -114,7 +113,10 @@ in {
{
"ATHENA.MIT.EDU" = {
admin_server = "athena.mit.edu";
kdc = "athena.mit.edu";
kdc = [
"athena01.mit.edu"
"athena02.mit.edu"
];
};
};
'';
8 changes: 6 additions & 2 deletions nixos/tests/krb5/example-config.nix
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,10 @@ import ../make-test-python.nix ({ pkgs, ...} : {
realms = {
"ATHENA.MIT.EDU" = {
admin_server = "athena.mit.edu";
kdc = "athena.mit.edu";
kdc = [
"athena01.mit.edu"
"athena02.mit.edu"
];
};
};
domain_realm = {
@@ -65,7 +68,8 @@ import ../make-test-python.nix ({ pkgs, ...} : {
[realms]
ATHENA.MIT.EDU = {
admin_server = athena.mit.edu
kdc = athena.mit.edu
kdc = athena01.mit.edu
kdc = athena02.mit.edu
}
[domain_realm]
9 changes: 3 additions & 6 deletions pkgs/applications/office/libreoffice/default.nix
View file
Original file line number Diff line number Diff line change
@@ -61,15 +61,12 @@ in (mkDrv rec {
# of rasqal/rasqal.h
NIX_CFLAGS_COMPILE = [
"-I${librdf_rasqal}/include/rasqal"
] ++ lib.optional stdenv.isx86_64 "-mno-fma";
] ++ lib.optionals stdenv.isx86_64 [ "-mno-fma" "-mno-avx" ]
# https://bugs.documentfoundation.org/show_bug.cgi?id=78174#c10
++ [ "-fno-visibility-inlines-hidden" ];

patches = [
./xdg-open-brief.patch
(fetchpatch {
url = "https://git.pld-linux.org/gitweb.cgi?p=packages/libreoffice.git;a=blob_plain;f=poppler-0.86.patch;h=76b8356d5f22ef537a83b0f9b0debab591f152fe;hb=a2737a61353e305a9ee69640fb20d4582c218008";
name = "poppler-0.86.patch";
sha256 = "0q6k4l8imgp8ailcv0qx5l83afyw44hah24fi7gjrm9xgv5sbb8j";
})
];

tarballPath = "external/tarballs";
Loading