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: b22f274ddc0a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 474c78a3e543
Choose a head ref

Commits on Apr 27, 2018

  1. Copy the full SHA
    c3c6951 View commit details

Commits on Jun 25, 2018

  1. Use a NixOS module for generating the gdk-pixbuf loaders cache.

    Fixes issue #33231 and makes it possible to enable Plasma and KDE at the same time.
    
    Previously, this worked like this:
    - The gdk-pixbuf package comes with a cache file covering the modules bundled
      with gdk-pixbuf.
    - The librsvg package comes with a cache covering modules from gdk-pixbuf as
      well as librsvg.
    - plasma5 and xfce modules set the environment variable GDK_PIXBUF_MODULE_FILE
      to the one from librsvg, so that SVG was supported in addition to the
      formats supported by gdk-pixbuf. However if both were enabled a configuration
      conflict would result (despite setting to the same value).
    
    While this sort of worked (ignoring the conflict which perhaps could be hacked
    around), it is unscalable and a hack, as there would be a real problem when one
    wanted to add a third package that supports additional image formats.
    
    A new NixOS module (gdk-pixbuf) is added with a configuration option
    (modulePackages) that other modules use to request specific packages to be
    included in the loaders cache. When any package is present in the list, the
    module generates a system-wide loaders cache which includes the requested
    packages (and always gdk-pixbuf itself), and sets the environment variable
    GDK_PIXBUF_MODULE_FILE to point to the generated cache file.
    
    The plasma5 and xfce modules are updated to add librsvg to modulePackages
    instead of setting GDK_PIXBUF_MODULE_FILE.
    
    Note that many packages create wrappers that set GDK_PIXBUF_MODULE_FILE,
    some directly to the one from librsvg. Therefore this change does not
    change the existing hack in the librsvg package which ensures that
    file is generated. This change aims only to solve the conflict in the
    global environent variable configuration.
    ambrop72 committed Jun 25, 2018
    Copy the full SHA
    d9fa88d View commit details

Commits on Sep 4, 2018

  1. nix-daemon service: Ensure ssh is on PATH. Fixes #46038.

    This fixes a regression introduced in commit
      700e21d
    
    nix needs ssh on path for the SSH substituter functionality,
    not only the distributed builds functionality.
    
    Signed-off-by: Niklas Hambüchen <mail@nh2.me>
    nh2 committed Sep 4, 2018
    Copy the full SHA
    31919bc View commit details

Commits on Sep 7, 2018

  1. linuxPackages.evdi: 1.5.0 -> 1.5.0.2

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/evdi/versions
    R. RyanTM committed Sep 7, 2018
    Copy the full SHA
    ef043c7 View commit details

Commits on Sep 19, 2018

  1. Copy the full SHA
    aaa3e3f View commit details

Commits on Sep 23, 2018

  1. nixos/network-interfaces-scripted: fix container networking bug

    When a bridge interface was reconfigured, running containers using
    this bridge lost connectivity: restarting network-addresses-brN.service
    triggered a restart of network-setup.service via a "partOf" relationship
    introduced in 07e0c0e.
    This in turn restarted brN-netdev.service.
    The bridge was thus destroyed and recreated with the same name but a new
    interface id, causing attached veth interfaces to lose their connection.
    
    This change removes the "partOf" relationship between
    network-setup.service and network-addresses-brN.service for all bridges.
    xeji committed Sep 23, 2018
    Copy the full SHA
    2742063 View commit details

Commits on Sep 26, 2018

  1. ejson: init at 1.2.0

    manveru committed Sep 26, 2018
    Copy the full SHA
    3a275ac View commit details

Commits on Oct 2, 2018

  1. Copy the full SHA
    2125e07 View commit details

Commits on Oct 3, 2018

  1. boohu: init at 0.10.0

    Free Potion committed Oct 3, 2018
    Copy the full SHA
    af08956 View commit details
  2. opensm: 3.3.20 -> 3.3.21

    Old git source repository was dead. Switched to GitHub
    markuskowa committed Oct 3, 2018
    Copy the full SHA
    ced5563 View commit details
  3. obs-studio: 22.0.2 -> 22.0.3

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/obs-studio/versions
    r-ryantm committed Oct 3, 2018
    Copy the full SHA
    ecd4fc5 View commit details
  4. Copy the full SHA
    0dd86a3 View commit details
  5. audacity: 2.2.2 -> 2.3.0

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/audacity/versions
    r-ryantm committed Oct 3, 2018
    Copy the full SHA
    c9c9f18 View commit details

Commits on Oct 4, 2018

  1. WIP liquidsoap update

    magnetophon committed Oct 4, 2018
    Copy the full SHA
    3b32eff View commit details

Commits on Oct 5, 2018

  1. nixos: correct improper uses of mkEnableOption, clarify service descr…

    …iptions
    
    Several service definitions used `mkEnableOption` with text starting
    with "Whether to", which produced funny option descriptions like
    "Whether to enable Whether to run the rspamd daemon..".
    
    This commit corrects this, and adds short descriptions of services
    to affected service definitions.
    pvgoran committed Oct 5, 2018
    1
    Copy the full SHA
    858b263 View commit details
  2. slurm: add lz4 dependency

    Slurm looks for lz4 by default, and if it finds it can improve its compression techniques
    bhipple committed Oct 5, 2018
    Copy the full SHA
    2ed17db View commit details

Commits on Oct 6, 2018

  1. webkitgtk222x: init at 2.22.2

    yrashk committed Oct 6, 2018
    Copy the full SHA
    9289920 View commit details
  2. Copy the full SHA
    50e947f View commit details
  3. Copy the full SHA
    0bcbb97 View commit details
  4. astroid: 0.13 -> 0.14

    yrashk committed Oct 6, 2018
    Copy the full SHA
    f0e5a51 View commit details
  5. gnupg20: set version variable to fix gnupg1compat

    Presently, gnupg1compat only works with gnupg22. Without this change, the error
    
    ```
    error: attribute 'version' missing, at .../nixpkgs/pkgs/tools/security/gnupg/1compat.nix:4:26
    ```
    
    is emitted when evaluating
    
    ```
    pkgs.gnupg1compat.override { gnupg = pkgs.gnupg20; }'
    ```
    charles-dyfis-net committed Oct 6, 2018
    Copy the full SHA
    f7cd362 View commit details
  6. Copy the full SHA
    1e23714 View commit details
  7. Add zlib; swap to lz4.dev

    bhipple committed Oct 6, 2018
    Copy the full SHA
    2a1fa9a View commit details

Commits on Oct 7, 2018

  1. Copy the full SHA
    a9a88b0 View commit details
  2. Copy the full SHA
    226f31b View commit details
  3. aeolus: 0.9.5 -> 0.9.7

    magnetophon committed Oct 7, 2018
    Copy the full SHA
    250485c View commit details
  4. Copy the full SHA
    d6860f4 View commit details
  5. Copy the full SHA
    4fd0f59 View commit details
  6. Copy the full SHA
    395b5f6 View commit details
  7. Copy the full SHA
    123cb97 View commit details
  8. Copy the full SHA
    c1949a3 View commit details
  9. Copy the full SHA
    9affe6c View commit details
  10. buildRustPackage: fix regex for separating lib and bin

    E.g. exa was wrongly put into /lib, as it matches
    
      .*.a
    
    but not
    
      .*\.a
    erictapen committed Oct 7, 2018
    Copy the full SHA
    64d0676 View commit details

Commits on Oct 8, 2018

  1. Copy the full SHA
    fb0b3ac View commit details
  2. nheko: 0.6.1 -> 0.6.2

    dtzWill committed Oct 8, 2018
    Copy the full SHA
    9a904b3 View commit details
  3. Copy the full SHA
    d2866f5 View commit details
  4. liquidsoap: 1.1.1 -> 1.3.4

    tg-x committed Oct 8, 2018
    Copy the full SHA
    d2ce22c View commit details
  5. gitaly: 0.117.2 -> 0.120.0

    Kristoffer Thømt Ravneberg committed Oct 8, 2018
    Copy the full SHA
    908a75a View commit details
  6. gitlab-workhorse: 6.1.0 -> 6.1.1, make build deterministic

    Kristoffer Thømt Ravneberg committed Oct 8, 2018
    Copy the full SHA
    998d4e4 View commit details
  7. gitlab: 11.2.3 -> 11.3.4

    Kristoffer Thømt Ravneberg committed Oct 8, 2018
    Copy the full SHA
    d837338 View commit details
  8. gitlab-ee: Add ee rubyEnv, fixes regression introduced by 11.3.0 in #…

    Kristoffer Thømt Ravneberg committed Oct 8, 2018
    Copy the full SHA
    0083ca1 View commit details
  9. Copy the full SHA
    24320f4 View commit details
  10. nixos/prometheus-exporters: fix unapplied service config

    Prior to this commit, the default values for `Restart`, `PrivateTmp` and
    `WorkingDirectory` were falsely ignored.
    
    I also added myself as maintainer.
    WilliButz committed Oct 8, 2018
    Copy the full SHA
    fbb7e0c View commit details
  11. Copy the full SHA
    0febc64 View commit details
  12. nixos/doc: Actually fix partitioning instructions.

    The previous tentative to the fix got the order mixed up a bit. This
    new fix has been re-verified to get them in the good order as per the
    instructions in the following chapters.
    samueldr committed Oct 8, 2018
    Copy the full SHA
    467bec3 View commit details
  13. Copy the full SHA
    df63fd1 View commit details
  14. Copy the full SHA
    cf1f8b2 View commit details
  15. ocamlPackages_3_08_0: remove

    Zimmi48 committed Oct 8, 2018
    Copy the full SHA
    3d683f3 View commit details
  16. ocamlPackages_3_10_0: remove

    Zimmi48 committed Oct 8, 2018
    Copy the full SHA
    62cf284 View commit details
  17. ocamlPackages_3_11_2: remove

    This requires removing also the Coq 8.3 and Matita 0.5.8 packages.
    
    Coq 8.3 was released 8 years ago (2010) and there is no trace left
    of users of this version (contrary to Coq 8.4, released 2012).
    It is well over time to remove it.
    
    Matita 0.5.8 was released in 2010 and because this version was still
    used for teaching according to the official website, a legacy release
    (0.5.9) was released in 5 years later to compile with more recent
    OCaml libraries.
    Updating to 0.5.9 (or a more recent version like 0.99.3) should allow
    getting rid of the dependency on older OCaml but it is hard to test
    given that the package is already broken before this update.
    Zimmi48 committed Oct 8, 2018
    Copy the full SHA
    34394a3 View commit details
Showing 408 changed files with 11,432 additions and 3,561 deletions.
8 changes: 0 additions & 8 deletions .dir-locals.el

This file was deleted.

2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
(Motivation for change. Additional information.)
```

For consistency, there should not be a period at the end of the commit message.
For consistency, there should not be a period at the end of the commit message's summary line (the first line of the commit message).

Examples:

Loading