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

Commits on Feb 28, 2020

  1. airsonic: enable nginx.recommendedProxySettings with virtualHost

    This fixes music playback when using the `services.airsonic.virtualHost`
    option.
    Florian committed Feb 28, 2020
    Copy the full SHA
    519d4f8 View commit details

Commits on Mar 10, 2020

  1. maintainers: add oxalica

    oxalica committed Mar 10, 2020
    Copy the full SHA
    5a8777a View commit details
  2. Copy the full SHA
    3ea54e6 View commit details
  3. Copy the full SHA
    b0a4ce1 View commit details

Commits on Mar 11, 2020

  1. nixos/captive-browser: set chromium's data-dir to a XDG-compliant loc…

    …ation
    
    To quote the XDG specification:
    
         There is a single base directory relative to which user-specific
         data files should be written. This directory is defined by the\
         environment variable $XDG_DATA_HOME.
    
    Rather than adding another directory to $HOME, I think that it's better
    to follow this standard to avoid a cluttered home-dir.
    Ma27 committed Mar 11, 2020
    Copy the full SHA
    f073b74 View commit details

Commits on Mar 17, 2020

  1. rust-analyzer: 2020-03-09 -> 2020-03-16

    vscode-extensions.rust-analyzer: 2020-03-09 -> 2020-03-16
    oxalica committed Mar 17, 2020
    Copy the full SHA
    4f12275 View commit details
  2. Copy the full SHA
    bde9289 View commit details

Commits on Mar 19, 2020

  1. ivan: add full iconset

    Free Potion committed Mar 19, 2020
    Copy the full SHA
    a35282f View commit details

Commits on Mar 25, 2020

  1. Copy the full SHA
    bb549ca View commit details
  2. nixos/boinc: create boinc group

    This allows users that are members of the boinc group
    to interact with the boinc service by running:
    
    boincmgr -d /var/lib/boinc
    bachp committed Mar 25, 2020
    Copy the full SHA
    2e5835c View commit details

Commits on Mar 31, 2020

  1. unifiStable: 5.12.35 -> 5.12.66

    bachp committed Mar 31, 2020
    Copy the full SHA
    05cc2b1 View commit details

Commits on Apr 1, 2020

  1. modules/virtualisation: add hyperv-image

    This module implements builder for hyper-v images.
    offlinehacker committed Apr 1, 2020
    Copy the full SHA
    54b04af View commit details
  2. Copy the full SHA
    4be2643 View commit details

Commits on Apr 2, 2020

  1. calibre: install desktop items

    These have been available for a while it seems.
    worldofpeace committed Apr 2, 2020
    Copy the full SHA
    557eb8a View commit details

Commits on Apr 3, 2020

  1. xonotic: use svg icons

    jluttine committed Apr 3, 2020
    Copy the full SHA
    02dd36c View commit details
  2. ursadb: init at v1.2.0

    msm-code committed Apr 3, 2020
    Copy the full SHA
    5160beb View commit details

Commits on Apr 4, 2020

  1. Copy the full SHA
    84b8775 View commit details
  2. Copy the full SHA
    f0619d2 View commit details
  3. nixos/systemd-nspawn: disallow multiple packages with .nspawn-units

    In contrast to `.service`-units, it's not possible to declare an
    `overrides.conf`, however this is done by `generateUnits` for `.nspawn`
    units as well. This change breaks the build if you have two derivations
    configuring one nspawn unit.
    
    This will happen in a case like this:
    
    ``` nix
    { pkgs, ... }: {
      systemd.packages = [
        (pkgs.writeTextDir "etc/systemd/nspawn/container0.nspawn" ''
          [Files]
          Bind=/tmp
        '')
      ];
      systemd.nspawn.container0 = {
        /* ... */
      };
    }
    ```
    Ma27 committed Apr 4, 2020
    Copy the full SHA
    a9e3ec1 View commit details

Commits on Apr 7, 2020

  1. treewide: Fix up stripDebugList attrs to be lists.

    The documentation says this should be a list, and it already is in
    about half the expressions that set it.
    
    The difference doesn't matter at present, because these values are all
    space-free literals.  But it will in a future with __structuredAttrs .
    
    (The similar attr stripAllList has no users in the nixpkgs tree, so
    there's nothing to do to fix any of those up.)
    gnprice committed Apr 7, 2020
    Copy the full SHA
    7547cf9 View commit details
  2. doc/stdenv: Update default for stripDebugList.

    This has changed a few times from 2008 to 2012: cdc74e1, d9213df,
    and 095db9f.
    gnprice committed Apr 7, 2020
    Copy the full SHA
    53d61f9 View commit details
  3. Copy the full SHA
    ff2aa0c View commit details
  4. Copy the full SHA
    b233a19 View commit details

Commits on Apr 8, 2020

  1. Copy the full SHA
    e33256e View commit details

Commits on Apr 10, 2020

  1. Copy the full SHA
    fc8d2f4 View commit details
  2. Copy the full SHA
    f76a495 View commit details
  3. Copy the full SHA
    e8d04d3 View commit details
  4. ethminer: mark as broken

    Doesn't build with gcc9, and if overlayed to use gcc8 stdenv fails on CUDA issues.
    bhipple committed Apr 10, 2020
    Copy the full SHA
    7f453f1 View commit details

Commits on Apr 11, 2020

  1. Copy the full SHA
    8318c36 View commit details
  2. nodePackages: update

    oxalica committed Apr 11, 2020
    Copy the full SHA
    3104237 View commit details
  3. subsurface: 4.8.2 -> 4.9.3

    This bumps subsurface to 4.9.3.
    
    As the subsurface-specific libdivecomputer source is shipped as a git
    submodule these days, we can avoid having to fetch a separate tarball
    that needs to be kept in sync (and is only uploaded for each release).
    
    This also applies a patch on top of 4.9.3 to properly handle libgit2
    versions 1.0 and later - conditional code for older libgit versions has
    been removed upstream, but that's a nontrivial backport, which is why
    this patch was added.
    flokli committed Apr 11, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    435ff31 View commit details

Commits on Apr 12, 2020

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a94fedc View commit details

Commits on Apr 13, 2020

  1. offlineimap: 7.3.2 -> 7.3.3

    r-ryantm committed Apr 13, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    Copy the full SHA
    e443f9f View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f379e74 View commit details
  3. advancecomp: version number correctly embedded in binaries

    without this fix, binaries report their version number as "vnone"
    which for example stops `image_optim` from using `advpng` (refuses
    to use it not being able to tell what version number it has)
    snicket2100 committed Apr 13, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    jwiegley John Wiegley
    Copy the full SHA
    b1c14fb View commit details
  4. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    vdemeester Vincent Demeester
    Copy the full SHA
    dff99df View commit details
  5. ocamlPackages.index: 1.0.1 -> 1.2.0

    Note: tests are available, should be added in the future (crowbar is required)
    sternenseemann committed Apr 13, 2020
    Copy the full SHA
    d7c3958 View commit details
  6. nixos/build-vms: propagate file location

    When trying to build a VM using `nixos-build-vms` with a configuration
    that doesn't evaluate, an error "at `<unknown-file>`" is usually shown.
    
    This happens since the `build-vms.nix` creates a VM-network of
    NixOS-configurations that are attr-sets or functions and don't contain
    any file information. This patch manually adds the `_file`-attribute to
    tell the module-system which file contained broken configuration:
    
    ```
    $ cat vm.nix
    { vm.invalid-option = 1; }
    
    $ nixos-build-vms vm.nix
    error: The option `invalid-option' defined in `/home/ma27/Projects/nixpkgs/vm.nix@node-vm' does not exist.
    (use '--show-trace' to show detailed location information)
    ```
    Ma27 committed Apr 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ec6bac9 View commit details
  7. Copy the full SHA
    cdad44e View commit details
  8. ocamlPackages.irmin*: 2.0.0 -> 2.1.0

    updated:
    
    * irmin
    * irmin-fs
    * irmin-git
    * irmin-graphql
    * irmin-http
    * irmin-mem
    * irmin-pack (also added new dependecy ocaml_lwt)
    * irmin-test
    * irmin-unix
    * irmin-watcher
    sternenseemann committed Apr 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    5ed10dc View commit details
  9. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4ef5c64 View commit details
  10. 1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e484ca3 View commit details
  11. zenith: 0.8.1 -> 0.8.2

    bbigras committed Apr 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    71198e5 View commit details
  12. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f6be629 View commit details
  13. nixos/networking: fix setting .macAddress and .mtu with networkd

    This needs to be set in the .linkConfig of a .network
    flokli committed Apr 13, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    Copy the full SHA
    cddc7a2 View commit details
  14. nixos/networking: add assertion catching setting mac addresses on tun…

    … devices
    
    Setting a MAC Address on a tun interface isn't supported, and invoking
    the corresponding command fails.
    flokli committed Apr 13, 2020
    Copy the full SHA
    ca391c8 View commit details
  15. nixos/networking: move network-link-${i.name} to scripted networking

    The unit sets MTU and MAC Address even with networkd enabled, which
    isn't necessary anymore, as networkd handles this by itself.
    flokli committed Apr 13, 2020
    Copy the full SHA
    5325281 View commit details
  16. nixosTests.networking: make routing table comparison more reliable

    This was whitespace-sensitive, kept fighting with my editor and broke
    the tests easily. To fix this, let python convert the output to
    individual lines, and strip whitespace from them before comparing.
    flokli committed Apr 13, 2020
    Copy the full SHA
    1e19453 View commit details
  17. nixosTests.networking.virtual: fix with networkd

    We only need to wait for network.target to get up, and the
    network-addresses-${interfaceName} units are scripted networking only.
    flokli committed Apr 13, 2020
    Copy the full SHA
    5150378 View commit details
  18. nixosTests.networking: test setting MTU and MAC Address

    Both the scripted and networkd backend now support setting MTU and MAC
    Address, so do this in a test to ensure it doesn't break.
    flokli committed Apr 13, 2020
    Copy the full SHA
    d1edd8b View commit details
Showing with 7,006 additions and 4,389 deletions.
  1. +3 −0 .gitignore
  2. +1 −1 doc/stdenv/stdenv.xml
  3. +16 −2 lib/options.nix
  4. +16 −0 maintainers/maintainer-list.nix
  5. +6 −1 nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
  6. +1 −1 nixos/modules/programs/captive-browser.nix
  7. +2 −1 nixos/modules/security/acme.nix
  8. +4 −2 nixos/modules/services/computing/boinc/client.nix
  9. +1 −0 nixos/modules/services/misc/airsonic.nix
  10. +1 −1 nixos/modules/services/misc/dysnomia.nix
  11. +11 −0 nixos/modules/services/monitoring/prometheus/alertmanager.nix
  12. +6 −0 nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
  13. +5 −1 nixos/modules/services/x11/hardware/libinput.nix
  14. +10 −3 nixos/modules/system/boot/systemd-lib.nix
  15. +1 −1 nixos/modules/system/boot/systemd-nspawn.nix
  16. +33 −0 nixos/modules/tasks/network-interfaces-scripted.nix
  17. +6 −1 nixos/modules/tasks/network-interfaces-systemd.nix
  18. +6 −32 nixos/modules/tasks/network-interfaces.nix
  19. +69 −0 nixos/modules/virtualisation/hyperv-image.nix
  20. +19 −18 nixos/tests/flannel.nix
  21. +3 −2 nixos/tests/iodine.nix
  22. +31 −19 nixos/tests/networking.nix
  23. +2 −2 pkgs/applications/audio/carla/default.nix
  24. +3 −2 pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
  25. +5 −7 pkgs/applications/editors/jupp/default.nix
  26. +90 −53 pkgs/applications/graphics/inkscape/default.nix
  27. +3 −2 pkgs/applications/graphics/luminance-hdr/default.nix
  28. +2 −0 pkgs/applications/kde/default.nix
  29. +22 −0 pkgs/applications/kde/kbreakout.nix
  30. +22 −0 pkgs/applications/kde/kspaceduel.nix
  31. +2 −2 pkgs/applications/misc/blugon/default.nix
  32. +10 −81 pkgs/applications/misc/calibre/default.nix
  33. +16 −14 pkgs/applications/misc/cherrytree/default.nix
  34. +1 −1 pkgs/applications/misc/far2l/default.nix
  35. +2 −2 pkgs/applications/misc/notejot/default.nix
  36. +2 −2 pkgs/applications/misc/sequeler/default.nix
  37. +41 −0 pkgs/applications/misc/subsurface/0001-core-fix-libgit-ifdef-to-handle-libgit2-v1.0-and-onw.patch
  38. +15 −9 pkgs/applications/misc/subsurface/default.nix
  39. +2 −2 pkgs/applications/networking/Sylk/default.nix
  40. +2 −2 pkgs/applications/networking/browsers/ephemeral/default.nix
  41. +385 −385 pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
  42. +385 −385 pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
  43. +2 −2 pkgs/applications/networking/cluster/kubernetes/default.nix
  44. +2 −2 pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
  45. +57 −0 pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix
  46. +2 −2 pkgs/applications/networking/instant-messengers/zoom-us/default.nix
  47. +4 −2 pkgs/applications/networking/ping/default.nix
  48. +75 −46 pkgs/applications/networking/remote/freerdp/default.nix
  49. +2 −2 pkgs/applications/networking/testssl/default.nix
  50. +17 −5 pkgs/applications/office/agenda/default.nix
  51. +2 −2 pkgs/applications/office/atlassian-cli/default.nix
  52. +120 −41 pkgs/applications/office/wpsoffice/default.nix
  53. +2 −2 pkgs/applications/radio/chirp/default.nix
  54. +9 −0 pkgs/applications/science/math/nasc/default.nix
  55. +2 −3 pkgs/applications/science/math/pari/gp2c.nix
  56. +8 −2 pkgs/applications/system/monitor/default.nix
  57. +4 −4 pkgs/applications/version-management/git-and-tools/git-trim/default.nix
  58. +4 −3 pkgs/applications/version-management/git-and-tools/git/update.sh
  59. +5 −2 pkgs/applications/version-management/git-and-tools/tig/default.nix
  60. +1 −1 pkgs/applications/video/mpv/default.nix
  61. +2 −2 pkgs/applications/video/wf-recorder/default.nix
  62. +2 −2 pkgs/applications/virtualization/cri-o/default.nix
  63. +16 −8 pkgs/applications/virtualization/podman/default.nix
  64. +3 −2 pkgs/applications/window-managers/icewm/default.nix
  65. +2 −2 pkgs/common-updater/scripts.nix
  66. +35 −0 pkgs/common-updater/scripts/list-archive-two-level-versions
  67. +32 −0 pkgs/common-updater/scripts/list-git-tags
  68. +98 −0 pkgs/common-updater/update-script.nix
  69. +2 −2 pkgs/data/fonts/fira-code/default.nix
  70. +36 −0 pkgs/data/fonts/line-awesome/default.nix
  71. +44 −0 pkgs/data/icons/humanity-icon-theme/default.nix
  72. +2 −2 pkgs/data/icons/zafiro-icons/default.nix
  73. +2 −2 pkgs/desktops/pantheon/apps/elementary-videos/default.nix
  74. +2 −2 pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
  75. +1 −0 pkgs/desktops/xfce/applications/gigolo/default.nix
  76. +1 −1 pkgs/desktops/xfce/applications/orage/default.nix
  77. +1 −0 pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
  78. +12 −6 pkgs/desktops/xfce/applications/xfce4-volumed/default.nix
  79. +2 −1 pkgs/desktops/xfce/applications/xfdashboard/default.nix
  80. +17 −9 pkgs/desktops/xfce/art/xfce4-icon-theme.nix
  81. +14 −6 pkgs/desktops/xfce/art/xfwm4-themes.nix
  82. +2 −0 pkgs/desktops/xfce/core/thunar-volman/default.nix
  83. +8 −0 pkgs/desktops/xfce/default.nix
  84. +21 −4 pkgs/desktops/xfce/mkXfceDerivation.nix
  85. +3 −2 pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix
  86. +1 −2 pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix
  87. +16 −9 pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
  88. +2 −3 pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix
  89. +16 −9 pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
  90. +2 −1 pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
  91. +15 −7 pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix
  92. +16 −9 pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
  93. +16 −9 pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
  94. +16 −9 pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
  95. +5 −5 pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
  96. +16 −9 pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
  97. +16 −9 pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
  98. +2 −2 pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix
  99. +16 −9 pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
  100. +17 −9 pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
  101. +16 −9 pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
  102. +16 −9 pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
  103. +6 −0 pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
  104. +2 −2 pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix
  105. +19 −11 pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
  106. +2 −2 pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
  107. +11 −5 pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
  108. +2 −2 pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
  109. +1 −2 pkgs/desktops/xfce/thunar-plugins/archive/default.nix
  110. +7 −0 pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
  111. +2 −2 pkgs/development/interpreters/wasmtime/default.nix
  112. +18 −18 pkgs/development/libraries/biblesync/default.nix
  113. +13 −7 pkgs/development/libraries/cimg/default.nix
  114. +15 −17 pkgs/development/libraries/g2o/default.nix
  115. +2 −14 pkgs/development/libraries/globalarrays/default.nix
  116. +11 −12 pkgs/development/libraries/gtk-mac-integration/default.nix
  117. +1 −1 pkgs/development/libraries/ldb/default.nix
  118. +3 −3 pkgs/development/libraries/libtap/default.nix
  119. +2 −1 pkgs/development/libraries/openssl/default.nix
  120. +2 −2 pkgs/development/libraries/smarty3/default.nix
  121. +14 −12 pkgs/development/libraries/sword/default.nix
  122. +1 −1 pkgs/development/misc/avr/libc/default.nix
  123. +1 −0 pkgs/development/node-packages/node-packages-v10.json
  124. +3,366 −1,998 pkgs/development/node-packages/node-packages-v10.nix
  125. +30 −30 pkgs/development/node-packages/node-packages-v12.nix
  126. +20 −20 pkgs/development/node-packages/node-packages-v13.nix
  127. +14 −32 pkgs/development/ocaml-modules/asn1-combinators/default.nix
  128. +12 −0 pkgs/development/ocaml-modules/dns/client.nix
  129. +28 −0 pkgs/development/ocaml-modules/dns/default.nix
  130. +22 −0 pkgs/development/ocaml-modules/duration/default.nix
  131. +5 −3 pkgs/development/ocaml-modules/eqaf/default.nix
  132. +3 −3 pkgs/development/ocaml-modules/fmt/default.nix
  133. +4 −3 pkgs/development/ocaml-modules/index/default.nix
  134. +3 −3 pkgs/development/ocaml-modules/irmin/default.nix
  135. +3 −2 pkgs/development/ocaml-modules/irmin/pack.nix
  136. +14 −0 pkgs/development/ocaml-modules/irmin/ppx.nix
  137. +20 −0 pkgs/development/ocaml-modules/mirage-clock/default.nix
  138. +13 −0 pkgs/development/ocaml-modules/mirage-clock/unix.nix
  139. +33 −0 pkgs/development/ocaml-modules/mirage-crypto/default.nix
  140. +19 −0 pkgs/development/ocaml-modules/mirage-crypto/pk.nix
  141. +16 −0 pkgs/development/ocaml-modules/mirage-crypto/rng.nix
  142. +22 −0 pkgs/development/ocaml-modules/mirage-device/default.nix
  143. +13 −0 pkgs/development/ocaml-modules/mirage-flow/combinators.nix
  144. +24 −0 pkgs/development/ocaml-modules/mirage-flow/default.nix
  145. +17 −0 pkgs/development/ocaml-modules/mirage-flow/unix.nix
  146. +22 −0 pkgs/development/ocaml-modules/mirage-protocols/default.nix
  147. +20 −0 pkgs/development/ocaml-modules/mirage-random/default.nix
  148. +21 −0 pkgs/development/ocaml-modules/mirage-stack/default.nix
  149. +3 −3 pkgs/development/ocaml-modules/notty/default.nix
  150. +24 −0 pkgs/development/ocaml-modules/ocaml-syntax-shims/default.nix
  151. +7 −29 pkgs/development/ocaml-modules/ounit/default.nix
  152. +22 −0 pkgs/development/ocaml-modules/ounit2/default.nix
  153. +21 −0 pkgs/development/ocaml-modules/randomconv/default.nix
  154. +2 −2 pkgs/development/python-modules/autopep8/default.nix
  155. +13 −13 pkgs/development/python-modules/ibis-framework/default.nix
  156. +46 −0 pkgs/development/python-modules/py-multibase/default.nix
  157. +2 −2 pkgs/development/python-modules/sphinxcontrib-katex/default.nix
  158. +2 −2 pkgs/development/python-modules/swagger-ui-bundle/default.nix
  159. +3 −3 pkgs/development/tools/misc/tokei/default.nix
  160. +62 −12 pkgs/development/tools/rust/cargo-make/Cargo.lock
  161. +3 −3 pkgs/development/tools/rust/cargo-make/default.nix
  162. +14 −0 pkgs/development/tools/rust/rust-analyzer/default.nix
  163. +45 −0 pkgs/development/tools/rust/rust-analyzer/generic.nix
  164. +61 −0 pkgs/development/tools/rust/rust-analyzer/update.sh
  165. +16 −0 pkgs/development/tools/rust/rust-analyzer/wrapper.nix
  166. +3 −3 pkgs/development/tools/selenium/chromedriver/default.nix
  167. +2 −2 pkgs/development/web/nodejs/v13.nix
  168. +5 −1 pkgs/games/crack-attack/default.nix
  169. +12 −5 pkgs/games/ivan/default.nix
  170. +2 −2 pkgs/games/multimc/default.nix
  171. +4 −4 pkgs/games/openttd/default.nix
  172. +2 −1 pkgs/games/pokerth/default.nix
  173. +1 −1 pkgs/games/system-syzygy/default.nix
  174. +6 −1 pkgs/games/xmoto/default.nix
  175. +6 −3 pkgs/games/xonotic/default.nix
  176. +4 −5 pkgs/misc/emulators/atari++/default.nix
  177. +24 −25 pkgs/misc/emulators/higan/0001-change-flags.diff
  178. +80 −53 pkgs/misc/emulators/higan/default.nix
  179. +2 −2 pkgs/misc/emulators/ppsspp/default.nix
  180. +10 −11 pkgs/misc/sound-of-sorting/default.nix
  181. +2 −0 pkgs/misc/vscode-extensions/default.nix
  182. +22 −0 pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
  183. +50 −0 pkgs/misc/vscode-extensions/rust-analyzer/default.nix
  184. +2 −2 pkgs/os-specific/linux/rdma-core/default.nix
  185. +1 −1 pkgs/os-specific/linux/syslinux/default.nix
  186. +3 −1 pkgs/servers/documize-community/default.nix
  187. +3 −1 pkgs/servers/grocy/default.nix
  188. +1 −1 pkgs/servers/http/apache-httpd/2.4.nix
  189. +7 −3 pkgs/servers/jellyfin/default.nix
  190. +3 −1 pkgs/servers/nextcloud/default.nix
  191. +6 −5 pkgs/servers/nosql/victoriametrics/default.nix
  192. +2 −2 pkgs/servers/unifi/default.nix
  193. +35 −0 pkgs/servers/ursadb/default.nix
  194. +5 −3 pkgs/shells/mksh/default.nix
  195. +2 −2 pkgs/shells/zsh/nix-zsh-completions/default.nix
  196. +3 −3 pkgs/tools/admin/eksctl/default.nix
  197. +7 −0 pkgs/tools/compression/advancecomp/default.nix
  198. +2 −2 pkgs/tools/graphics/cfdg/default.nix
  199. +2 −0 pkgs/tools/misc/ethminer/default.nix
  200. +5 −2 pkgs/tools/misc/lf/default.nix
  201. +16 −9 pkgs/tools/misc/miniserve/default.nix
  202. +2 −2 pkgs/tools/misc/otfcc/default.nix
  203. +3 −3 pkgs/tools/misc/pgmetrics/default.nix
  204. +3 −3 pkgs/tools/misc/starship/default.nix
  205. +2 −2 pkgs/tools/networking/cjdns/default.nix
  206. +4 −4 pkgs/tools/networking/corerad/default.nix
  207. +3 −1 pkgs/tools/networking/iftop/default.nix
  208. +2 −2 pkgs/tools/networking/offlineimap/default.nix
  209. +23 −7 pkgs/tools/networking/wifite2/default.nix
  210. +3 −3 pkgs/tools/package-management/disnix/dysnomia/default.nix
  211. +25 −0 pkgs/tools/security/hcxdumptool/default.nix
  212. +2 −2 pkgs/tools/system/acpica-tools/default.nix
  213. +4 −4 pkgs/tools/system/netdata/default.nix
  214. +0 −534 pkgs/tools/system/netdata/deps.nix
  215. +9 −10 pkgs/tools/system/netdata/go.d.plugin.nix
  216. +2 −2 pkgs/tools/system/zenith/cargo-lock.patch
  217. +3 −3 pkgs/tools/system/zenith/default.nix
  218. +52 −0 pkgs/tools/text/rs/default.nix
  219. +2 −2 pkgs/tools/typesetting/bibclean/default.nix
  220. +55 −27 pkgs/tools/virtualization/linode-cli/default.nix
  221. +24 −5 pkgs/top-level/all-packages.nix
  222. +40 −0 pkgs/top-level/ocaml-packages.nix
  223. +9 −9 pkgs/top-level/php-packages.nix
  224. +2 −0 pkgs/top-level/python-packages.nix
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -16,3 +16,6 @@ result-*
/pkgs/development/libraries/qt-5/*/tmp/
/pkgs/desktops/kde-5/*/tmp/
/pkgs/development/mobile/androidenv/xml/*

# generated by pkgs/common-updater/update-script.nix
update-git-commits.txt
2 changes: 1 addition & 1 deletion doc/stdenv/stdenv.xml
Original file line number Diff line number Diff line change
@@ -1305,7 +1305,7 @@ installTargets = "install-bin install-doc";</programlisting>
</term>
<listitem>
<para>
List of directories to search for libraries and executables from which only debugging-related symbols should be stripped. It defaults to <literal>lib bin sbin</literal>.
List of directories to search for libraries and executables from which only debugging-related symbols should be stripped. It defaults to <literal>lib lib32 lib64 libexec bin sbin</literal>.
</para>
</listitem>
</varlistentry>
18 changes: 16 additions & 2 deletions lib/options.nix
Original file line number Diff line number Diff line change
@@ -191,9 +191,23 @@ rec {
Example:
(showOption ["foo" "bar" "baz"]) == "foo.bar.baz"
(showOption ["foo" "bar.baz" "tux"]) == "foo.\"bar.baz\".tux"
(showOption ["foo" "bar.baz" "tux"]) == "foo.bar.baz.tux"
Placeholders will not be quoted as they are not actual values:
(showOption ["foo" "*" "bar"]) == "foo.*.bar"
(showOption ["foo" "<name>" "bar"]) == "foo.<name>.bar"
Unlike attributes, options can also start with numbers:
(showOption ["windowManager" "2bwm" "enable"]) == "windowManager.2bwm.enable"
*/
showOption = parts: concatMapStringsSep "." escapeNixIdentifier parts;
showOption = parts: let
escapeOptionPart = part:
let
escaped = lib.strings.escapeNixString part;
in if escaped == "\"${part}\""
then part
else escaped;
in (concatStringsSep ".") (map escapeOptionPart parts);
showFiles = files: concatStringsSep " and " (map (f: "`${f}'") files);
unknownModule = "<unknown-file>";

16 changes: 16 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -5302,6 +5302,12 @@
githubId = 133448;
name = "Mikołaj Siedlarek";
};
msm = {
email = "msm@tailcall.net";
github = "msm-code";
githubId = 7026881;
name = "Jarosław Jedynak";
};
mstarzyk = {
email = "mstarzyk@gmail.com";
github = "mstarzyk";
@@ -5714,6 +5720,16 @@
githubId = 108072;
name = "Slawomir Gonet";
};
oxalica = {
email = "oxalicc@pm.me";
github = "oxalica";
githubId = 14816024;
name = "oxalica";
keys = [{
longkeyid = "rsa4096/0xCED392DE0C483D00";
fingerprint = "5CB0 E9E5 D5D5 71F5 7F54 0FEA CED3 92DE 0C48 3D00";
}];
};
oxij = {
email = "oxij@oxij.org";
github = "oxij";
7 changes: 6 additions & 1 deletion nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,12 @@
, networkExpr
}:

let nodes = import networkExpr; in
let
nodes = builtins.mapAttrs (vm: module: {
_file = "${networkExpr}@node-${vm}";
imports = [ module ];
}) (import networkExpr);
in

with import ../../../../lib/testing-python.nix {
inherit system;
2 changes: 1 addition & 1 deletion nixos/modules/programs/captive-browser.nix
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ in
browser = mkOption {
type = types.str;
default = concatStringsSep " " [ ''${pkgs.chromium}/bin/chromium''
''--user-data-dir=$HOME/.chromium-captive''
''--user-data-dir=''${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive''
''--proxy-server="socks5://$PROXY"''
''--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost"''
''--no-first-run''
3 changes: 2 additions & 1 deletion nixos/modules/security/acme.nix
Original file line number Diff line number Diff line change
@@ -330,13 +330,14 @@ in
User = data.user;
Group = data.group;
PrivateTmp = true;
StateDirectory = "acme/.lego/${cert} ${lpath}";
StateDirectory = "acme/.lego/${cert} acme/.lego/accounts ${lpath}";
StateDirectoryMode = if data.allowKeysForGroup then "750" else "700";
WorkingDirectory = spath;
# Only try loading the credentialsFile if the dns challenge is enabled
EnvironmentFile = if data.dnsProvider != null then data.credentialsFile else null;
ExecStart = pkgs.writeScript "acme-start" ''
#!${pkgs.runtimeShell} -e
test -L ${spath}/accounts -o -d ${spath}/accounts || ln -s ../accounts ${spath}/accounts
${pkgs.lego}/bin/lego ${renewOpts} || ${pkgs.lego}/bin/lego ${runOpts}
'';
ExecStartPost =
6 changes: 4 additions & 2 deletions nixos/modules/services/computing/boinc/client.nix
Original file line number Diff line number Diff line change
@@ -99,22 +99,24 @@ in
environment.systemPackages = [cfg.package];

users.users.boinc = {
group = "boinc";
createHome = false;
description = "BOINC Client";
home = cfg.dataDir;
isSystemUser = true;
};
users.groups.boinc = {};

systemd.tmpfiles.rules = [
"d '${cfg.dataDir}' - boinc - - -"
"d '${cfg.dataDir}' - boinc boinc - -"
];

systemd.services.boinc = {
description = "BOINC Client";
after = ["network.target"];
wantedBy = ["multi-user.target"];
script = ''
${fhsEnvExecutable} --dir ${cfg.dataDir} --redirectio ${allowRemoteGuiRpcFlag}
${fhsEnvExecutable} --dir ${cfg.dataDir} ${allowRemoteGuiRpcFlag}
'';
serviceConfig = {
User = "boinc";
1 change: 1 addition & 0 deletions nixos/modules/services/misc/airsonic.nix
Original file line number Diff line number Diff line change
@@ -138,6 +138,7 @@ in {

services.nginx = mkIf (cfg.virtualHost != null) {
enable = true;
recommendedProxySettings = true;
virtualHosts.${cfg.virtualHost} = {
locations.${cfg.contextPath}.proxyPass = "http://${cfg.listenAddress}:${toString cfg.port}";
};
2 changes: 1 addition & 1 deletion nixos/modules/services/misc/dysnomia.nix
Original file line number Diff line number Diff line change
@@ -177,7 +177,7 @@ in
wrapper = {};
}
// lib.optionalAttrs (config.services.httpd.enable) { apache-webapplication = {
documentRoot = config.services.httpd.documentRoot;
documentRoot = config.services.httpd.virtualHosts.localhost.documentRoot;
}; }
// lib.optionalAttrs (config.services.tomcat.axis2.enable) { axis2-webservice = {}; }
// lib.optionalAttrs (config.services.ejabberd.enable) { ejabberd-dump = {
11 changes: 11 additions & 0 deletions nixos/modules/services/monitoring/prometheus/alertmanager.nix
Original file line number Diff line number Diff line change
@@ -21,6 +21,8 @@ let
"--config.file /tmp/alert-manager-substituted.yaml"
"--web.listen-address ${cfg.listenAddress}:${toString cfg.port}"
"--log.level ${cfg.logLevel}"
"--storage.path /var/lib/alertmanager"
(toString (map (peer: "--cluster.peer ${peer}:9094") cfg.clusterPeers))
] ++ (optional (cfg.webExternalUrl != null)
"--web.external-url ${cfg.webExternalUrl}"
) ++ (optional (cfg.logFormat != null)
@@ -120,6 +122,14 @@ in {
'';
};

clusterPeers = mkOption {
type = types.listOf types.str;
default = [];
description = ''
Initial peers for HA cluster.
'';
};

extraFlags = mkOption {
type = types.listOf types.str;
default = [];
@@ -162,6 +172,7 @@ in {
'';
serviceConfig = {
Restart = "always";
StateDirectory = "alertmanager";
DynamicUser = true; # implies PrivateTmp
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
WorkingDirectory = "/tmp";
Original file line number Diff line number Diff line change
@@ -14,7 +14,9 @@ let
user = ${cfg.user}
show-password-label = true
password-label-text = Password:
invalid-password-text = Invalid Password
show-input-cursor = true
password-alignment = right
[greeter-hotkeys]
mod-key = meta
@@ -26,6 +28,8 @@ let
[greeter-theme]
font = Sans
font-size = 1em
font-weight = bold
font-style = normal
text-color = "#080800"
error-color = "#F8F8F0"
background-image = "${ldmcfg.background}"
@@ -36,6 +40,8 @@ let
layout-space = 15
password-color = "#F8F8F0"
password-background-color = "#1B1D1E"
password-border-color = "#080800"
password-border-width = 2px
${cfg.extraConfig}
'';
6 changes: 5 additions & 1 deletion nixos/modules/services/x11/hardware/libinput.nix
Original file line number Diff line number Diff line change
@@ -184,7 +184,11 @@ in {
''
Option "DragLockButtons" "L1 B1 L2 B2"
'';
description = "Additional options for libinput touchpad driver.";
description = ''
Additional options for libinput touchpad driver. See
<citerefentry><refentrytitle>libinput</refentrytitle><manvolnum>4</manvolnum></citerefentry>
for available options.";
'';
};

};
13 changes: 10 additions & 3 deletions nixos/modules/system/boot/systemd-lib.nix
Original file line number Diff line number Diff line change
@@ -114,7 +114,9 @@ in rec {
(if isList value then value else [value]))
as));

generateUnits = type: units: upstreamUnits: upstreamWants:
generateUnits = generateUnits' true;

generateUnits' = allowCollisions: type: units: upstreamUnits: upstreamWants:
pkgs.runCommand "${type}-units"
{ preferLocalBuild = true;
allowSubstitutes = false;
@@ -182,8 +184,13 @@ in rec {
if [ "$(readlink -f $i/$fn)" = /dev/null ]; then
ln -sfn /dev/null $out/$fn
else
mkdir -p $out/$fn.d
ln -s $i/$fn $out/$fn.d/overrides.conf
${if allowCollisions then ''
mkdir -p $out/$fn.d
ln -s $i/$fn $out/$fn.d/overrides.conf
'' else ''
echo "Found multiple derivations configuring $fn!"
exit 1
''}
fi
else
ln -fs $i/$fn $out/
2 changes: 1 addition & 1 deletion nixos/modules/system/boot/systemd-nspawn.nix
Original file line number Diff line number Diff line change
@@ -116,7 +116,7 @@ in {
in
mkMerge [
(mkIf (cfg != {}) {
environment.etc."systemd/nspawn".source = mkIf (cfg != {}) (generateUnits "nspawn" units [] []);
environment.etc."systemd/nspawn".source = mkIf (cfg != {}) (generateUnits' false "nspawn" units [] []);
})
{
systemd.targets.multi-user.wants = [ "machines.target" ];
33 changes: 33 additions & 0 deletions nixos/modules/tasks/network-interfaces-scripted.nix
Original file line number Diff line number Diff line change
@@ -237,6 +237,38 @@ let
'';
};

createNetworkLink = i:
let
deviceDependency = if (config.boot.isContainer || i.name == "lo")
then []
else [ (subsystemDevice i.name) ];
in
nameValuePair "network-link-${i.name}"
{ description = "Link configuration of ${i.name}";
wantedBy = [ "network-interfaces.target" ];
before = [ "network-interfaces.target" ];
bindsTo = deviceDependency;
after = [ "network-pre.target" ] ++ deviceDependency;
path = [ pkgs.iproute ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
};
script =
''
echo "Configuring link..."
'' + optionalString (i.macAddress != null) ''
echo "setting MAC address to ${i.macAddress}..."
ip link set "${i.name}" address "${i.macAddress}"
'' + optionalString (i.mtu != null) ''
echo "setting MTU to ${toString i.mtu}..."
ip link set "${i.name}" mtu "${toString i.mtu}"
'' + ''
echo -n "bringing up interface... "
ip link set "${i.name}" up && echo "done" || (echo "failed"; exit 1)
'';
};

createTunDevice = i: nameValuePair "${i.name}-netdev"
{ description = "Virtual Network Interface ${i.name}";
bindsTo = [ "dev-net-tun.device" ];
@@ -508,6 +540,7 @@ let
});

in listToAttrs (
map createNetworkLink interfaces ++
map configureAddrs interfaces ++
map createTunDevice (filter (i: i.virtual) interfaces))
// mapAttrs' createBridgeDevice cfg.bridges
7 changes: 6 additions & 1 deletion nixos/modules/tasks/network-interfaces-systemd.nix
Original file line number Diff line number Diff line change
@@ -94,7 +94,12 @@ in
address = forEach (interfaceIps i)
(ip: "${ip.address}/${toString ip.prefixLength}");
networkConfig.IPv6PrivacyExtensions = "kernel";
} ];
linkConfig = optionalAttrs (i.macAddress != null) {
MACAddress = i.macAddress;
} // optionalAttrs (i.mtu != null) {
MTUBytes = toString i.mtu;
};
}];
})))
(mkMerge (flip mapAttrsToList cfg.bridges (name: bridge: {
netdevs."40-${name}" = {
38 changes: 6 additions & 32 deletions nixos/modules/tasks/network-interfaces.nix
Original file line number Diff line number Diff line change
@@ -1031,6 +1031,11 @@ in
message = ''
Temporary addresses are only needed when IPv6 is enabled.
'';
})) ++ (forEach interfaces (i: {
assertion = (i.virtual && i.virtualType == "tun") -> i.macAddress == null;
message = ''
Setting a MAC Address for tun device ${i.name} isn't supported.
'';
})) ++ [
{
assertion = cfg.hostId == null || (stringLength cfg.hostId == 8 && isHexString cfg.hostId);
@@ -1140,38 +1145,7 @@ in
${cfg.localCommands}
'';
};
} // (listToAttrs (forEach interfaces (i:
let
deviceDependency = if (config.boot.isContainer || i.name == "lo")
then []
else [ (subsystemDevice i.name) ];
in
nameValuePair "network-link-${i.name}"
{ description = "Link configuration of ${i.name}";
wantedBy = [ "network-interfaces.target" ];
before = [ "network-interfaces.target" ];
bindsTo = deviceDependency;
after = [ "network-pre.target" ] ++ deviceDependency;
path = [ pkgs.iproute ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
};
script =
''
echo "Configuring link..."
'' + optionalString (i.macAddress != null) ''
echo "setting MAC address to ${i.macAddress}..."
ip link set "${i.name}" address "${i.macAddress}"
'' + optionalString (i.mtu != null) ''
echo "setting MTU to ${toString i.mtu}..."
ip link set "${i.name}" mtu "${toString i.mtu}"
'' + ''
echo -n "bringing up interface... "
ip link set "${i.name}" up && echo "done" || (echo "failed"; exit 1)
'';
})));

};
services.mstpd = mkIf needsMstpd { enable = true; };

virtualisation.vswitch = mkIf (cfg.vswitches != { }) { enable = true; };
Loading