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

Commits on Jun 19, 2018

  1. Copy the full SHA
    e2b8796 View commit details
  2. fldigi: 4.0.16 -> 4.0.17

    Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
    
    This update was made based on information from https://repology.org/metapackage/fldigi/versions.
    
    These checks were done:
    
    - built on NixOS
    - /nix/store/87mml563vxqamznb9i9kfyi1pz9ldkxj-fldigi-4.0.17/bin/fldigi passed the binary check.
    - Warning: no invocation of /nix/store/87mml563vxqamznb9i9kfyi1pz9ldkxj-fldigi-4.0.17/bin/flarq had a zero exit code or showed the expected version
    - 1 of 2 passed binary check by having a zero exit code.
    - 0 of 2 passed binary check by having the new version present in output.
    - found 4.0.17 with grep in /nix/store/87mml563vxqamznb9i9kfyi1pz9ldkxj-fldigi-4.0.17
    - directory tree listing: https://gist.github.com/fa90913d77a29b869e48c2c455710bd7
    - du listing: https://gist.github.com/9172dd2cacb00accaffafe285aacea29
    R. RyanTM committed Jun 19, 2018
    Copy the full SHA
    cc9d1d8 View commit details

Commits on Jun 22, 2018

  1. chrony: disable the whole timesyncd module when chronyd is enabled

    Peviously only the timesyncd systemd unit was disabled. This meant
    that when you activate a system that has chronyd enabled the following
    strange startup behaviour takes place:
    
      systemd[1]: Starting chrony NTP daemon...
      systemd[1]: Stopping Network Time Synchronization...
      systemd[1]: Stopped chrony NTP daemon.
      systemd[1]: Starting Network Time Synchronization...
    basvandijk committed Jun 22, 2018
    Copy the full SHA
    56ef106 View commit details
  2. x2goclient: fix build with qt 5.11

    Averell Dalton committed Jun 22, 2018
    Copy the full SHA
    67e13d6 View commit details
  3. Copy the full SHA
    89fc0fb View commit details
  4. Copy the full SHA
    1f39644 View commit details
  5. libxml2: add enableStatic argument

    If `enableStatic` is set to true, the output `static` contains the
    static library.
    nlewo committed Jun 22, 2018
    Copy the full SHA
    5bfdf34 View commit details

Commits on Jun 23, 2018

  1. Copy the full SHA
    48aa44e View commit details
  2. Copy the full SHA
    10c4d7d View commit details
  3. bazel: 0.12 -> 0.13

    mboes committed Jun 23, 2018
    Copy the full SHA
    722fcfc View commit details
  4. bazel: Set mboes as maintainer

    As per #39585
    mboes committed Jun 23, 2018
    Copy the full SHA
    6f03c34 View commit details
  5. Copy the full SHA
    e385630 View commit details
  6. pgmanage: remove deprecated postage alias

    The following has been removed:
    
    * The `services.postage` alias for the `services.pgmanage` module
    * The `postage` alias for the `pgmanage` package
    basvandijk committed Jun 23, 2018
    Copy the full SHA
    68fa306 View commit details
  7. treewide: http -> https

    ryantm committed Jun 23, 2018
    Copy the full SHA
    0d5eb90 View commit details
  8. xmlsec: 1.2.25 -> 1.2.26

    Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
    
    This update was made based on information from https://repology.org/metapackage/xmlsec/versions.
    
    These checks were done:
    
    - built on NixOS
    - /nix/store/abvl1x7fq46597zs54989mzlbfs7fq6i-xmlsec-1.2.26/bin/.xmlsec1-wrapped passed the binary check.
    - /nix/store/abvl1x7fq46597zs54989mzlbfs7fq6i-xmlsec-1.2.26/bin/xmlsec1 passed the binary check.
    - 2 of 2 passed binary check by having a zero exit code.
    - 0 of 2 passed binary check by having the new version present in output.
    - found 1.2.26 with grep in /nix/store/abvl1x7fq46597zs54989mzlbfs7fq6i-xmlsec-1.2.26
    - directory tree listing: https://gist.github.com/e9e137ae925e9687577596baffb336c3
    - du listing: https://gist.github.com/dda9ad69863fe80d1ea4126315585b0c
    R. RyanTM committed Jun 23, 2018
    Copy the full SHA
    99ed01e View commit details
  9. Merge pull request #40959 from alexvorobiev/clustershell

    pythonPackages.clustershell: init at 1.8
    FRidh authored Jun 23, 2018
    Copy the full SHA
    fc4ab42 View commit details
  10. Copy the full SHA
    ffdf819 View commit details
  11. mpage: fix urls from mesa → glu transition

    Find/replace error in 0acec7e.
    Kevin Liu authored and dezgeg committed Jun 23, 2018
    Copy the full SHA
    7997c2a View commit details
  12. boost: use default toolset option

    for 1.66 & 1.67 we were overriding the default toolset option. This
    meant that gcc-cross was not being selected properly, breaking the
    cross toolchain.
    
    /cc @dtzWill
    matthewbauer committed Jun 23, 2018
    6
    Copy the full SHA
    798ad38 View commit details
  13. Copy the full SHA
    3e49430 View commit details
  14. tbb: 2018_U4 -> 2018_U5

    Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
    
    This update was made based on information from https://repology.org/metapackage/tbb/versions.
    
    These checks were done:
    
    - built on NixOS
    
    - 0 of 0 passed binary check by having a zero exit code.
    - 0 of 0 passed binary check by having the new version present in output.
    - found 2018_U5 with grep in /nix/store/xhqkrh6rrs3ji21v1rdicm3f50j1ildx-tbb-2018_U5
    - directory tree listing: https://gist.github.com/cfe37285702751a390a4ccdcf83b000e
    - du listing: https://gist.github.com/ef220dc185b398311333a7d43930787a
    R. RyanTM authored and thoughtpolice committed Jun 23, 2018
    Copy the full SHA
    75a006c View commit details
  15. llvm-3.9: patches to fix w/musl

    Mostly same as used with LLVM 4.0
    dtzWill committed Jun 23, 2018
    Copy the full SHA
    96cfd14 View commit details
  16. llvm_39: unconditionally apply sigaltstack fix

    (as we do on other LLVM builds)
    dtzWill committed Jun 23, 2018
    Copy the full SHA
    04fb628 View commit details
  17. Copy the full SHA
    f0c154a View commit details
  18. llvm_39: set triples as well

    dtzWill committed Jun 23, 2018
    Copy the full SHA
    b39fb55 View commit details
  19. llvm_39: disable sanitizers/xray bits when using musl

    Don't have a fix for this handy and don't need it yet
    so for now just disable.
    dtzWill committed Jun 23, 2018
    Copy the full SHA
    a1bf9b6 View commit details
  20. Copy the full SHA
    182de52 View commit details
  21. Copy the full SHA
    4ef4e0f View commit details
  22. llvm_38: musl patches + options

    Same as those added to llvm_39 a few commits ago.
    dtzWill committed Jun 23, 2018
    Copy the full SHA
    6835129 View commit details
  23. Copy the full SHA
    ebcdd8b View commit details
  24. Copy the full SHA
    dd4299a View commit details
  25. Copy the full SHA
    e4fffae View commit details
  26. Copy the full SHA
    ae78847 View commit details
  27. Copy the full SHA
    0b7cc25 View commit details
  28. Copy the full SHA
    db7041a View commit details
  29. Copy the full SHA
    469cca0 View commit details
  30. Merge pull request #42452 from dtzWill/feature/llvm-38-39-musl

    llvmPackages_{38,39}: musl compat, minor cleanup
    dtzWill authored Jun 23, 2018
    Copy the full SHA
    1667a3c View commit details
  31. Copy the full SHA
    28c476d View commit details
  32. x2goclient: 4.1.1.1 -> 4.1.2.0

    Averell Dalton committed Jun 23, 2018
    Copy the full SHA
    8e81c7c View commit details
  33. Copy the full SHA
    9bfd3ad View commit details
  34. chocolate-doom: only build on linux

    darwin build times out on sdl-config
    matthewbauer authored Jun 23, 2018
    Copy the full SHA
    92f0bec View commit details
  35. gravit: fix eval

    matthewbauer authored Jun 23, 2018
    Copy the full SHA
    e09861f View commit details
  36. treewide: disable sdl-config darwin time outs

    sdl-config has an issue on hydra where it will hang when run on
    Darwin. This is probably related to the headless mode that is set up &
    the sdl-config program waiting for a graphical to finish.
    matthewbauer committed Jun 23, 2018
    Copy the full SHA
    6127ec1 View commit details
  37. Copy the full SHA
    fb1852f View commit details
  38. Copy the full SHA
    680957d View commit details
  39. Copy the full SHA
    aef5464 View commit details
  40. exult: only build on linux

    It currently times out on finding sdl-config:
    
    https://hydra.nixos.org/job/nixpkgs/staging/exult.x86_64-darwin
    matthewbauer authored Jun 23, 2018
    Copy the full SHA
    bee228d View commit details
  41. Merge pull request #42455 from dtzWill/fix/ghc-musl-usellvm

    ghc-{8.2.2,8.4.3}: "useLLVM" when target is musl as well
    dtzWill authored Jun 23, 2018
    Copy the full SHA
    2e5e26d View commit details
  42. unvanquished: remove

    Hasn’t been building or upgraded since 2015:
    #9781
    Profpatsch committed Jun 23, 2018
    Copy the full SHA
    9c1edbd View commit details

Commits on Jun 24, 2018

  1. dmraid: patch to fix users of dmraid

    I hoped that setting -D_GNU_SOURCE in the build would avoid
    the need for this patch -- but that only fixes the build itself,
    this patch adds the define so headers work elsewhere.
    
    Particularly, this fixes libblockdev w/musl -- before this change
    it fails to "detect" headers for dmraid.h since it doesn't compile.
    dtzWill committed Jun 24, 2018
    Copy the full SHA
    db7d403 View commit details
Showing with 1,405 additions and 524 deletions.
  1. +4 −1 default.nix
  2. +2 −1 doc/languages-frameworks/python.section.md
  3. +6 −0 lib/licenses.nix
  4. +3 −1 nixos/modules/programs/npm.nix
  5. +26 −42 nixos/modules/services/databases/pgmanage.nix
  6. +1 −1 nixos/modules/services/networking/chrony.nix
  7. +1 −0 nixos/release.nix
  8. +21 −0 nixos/tests/ostree.nix
  9. +2 −0 pkgs/applications/audio/amarok/kf5.nix
  10. +11 −0 pkgs/applications/audio/amarok/qt5_11.patch
  11. +2 −2 pkgs/applications/audio/fldigi/default.nix
  12. +2 −3 pkgs/applications/audio/gpodder/default.nix
  13. +54 −0 pkgs/applications/audio/snapcast/default.nix
  14. +2 −2 pkgs/applications/graphics/ImageMagick/7.0.nix
  15. +1 −1 pkgs/applications/graphics/kipi-plugins/default.nix
  16. +1 −1 pkgs/applications/misc/gnss-sdr/default.nix
  17. +5 −1 pkgs/applications/misc/keepassx/community.nix
  18. +15 −0 pkgs/applications/misc/keepassx/qt511.patch
  19. +1 −1 pkgs/applications/misc/librecad/default.nix
  20. +1 −1 pkgs/applications/misc/mupdf/default.nix
  21. +1 −1 pkgs/applications/misc/pcmanx-gtk2/default.nix
  22. +2 −2 pkgs/applications/misc/pgmanage/default.nix
  23. +2 −2 pkgs/applications/networking/cluster/kubernetes/default.nix
  24. +11 −3 pkgs/applications/networking/cluster/minikube/default.nix
  25. +2 −2 pkgs/applications/networking/gmailieer/default.nix
  26. +1 −1 pkgs/applications/networking/ids/daq/default.nix
  27. +2 −0 pkgs/applications/networking/irc/quassel/default.nix
  28. +72 −0 pkgs/applications/networking/irc/quassel/qt5_11.patch
  29. +1 −1 pkgs/applications/networking/mailreaders/claws-mail/default.nix
  30. +1 −1 pkgs/applications/networking/ostinato/default.nix
  31. +5 −3 pkgs/applications/networking/remote/x2goclient/default.nix
  32. +15 −0 pkgs/applications/networking/remote/x2goclient/qt511.patch
  33. +38 −0 pkgs/applications/office/autokey/default.nix
  34. +11 −0 pkgs/applications/office/autokey/remove-requires-dbus-python.patch
  35. +2 −0 pkgs/applications/office/calligra/default.nix
  36. +98 −0 pkgs/applications/office/calligra/qt5_11.patch
  37. +2 −2 pkgs/applications/office/libreoffice/default-primary-src.nix
  38. +3 −4 pkgs/applications/office/libreoffice/default.nix
  39. +5 −5 pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
  40. +12 −12 pkgs/applications/office/libreoffice/libreoffice-srcs.nix
  41. +2 −2 pkgs/applications/office/libreoffice/still-primary-src.nix
  42. +6 −6 pkgs/applications/office/libreoffice/still.nix
  43. +2 −1 pkgs/applications/science/astronomy/gravit/default.nix
  44. +14 −7 pkgs/applications/science/astronomy/stellarium/default.nix
  45. +1 −1 pkgs/applications/science/logic/celf/default.nix
  46. +1 −1 pkgs/applications/science/logic/mcrl2/default.nix
  47. +3 −13 pkgs/applications/version-management/git-and-tools/git/default.nix
  48. +13 −0 pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch
  49. +2 −2 pkgs/applications/version-management/gitkraken/default.nix
  50. +10 −4 pkgs/applications/video/streamlink/default.nix
  51. +2 −2 pkgs/applications/virtualization/spice-vdagent/default.nix
  52. +1 −1 pkgs/applications/window-managers/i3/lock-color.nix
  53. +4 −4 pkgs/applications/window-managers/i3/status-rust.nix
  54. +4 −0 pkgs/build-support/cc-wrapper/default.nix
  55. +1 −1 pkgs/data/misc/brise/default.nix
  56. +2 −2 pkgs/desktops/mate/mate-desktop/default.nix
  57. +2 −2 pkgs/desktops/mate/mate-icon-theme/default.nix
  58. +2 −2 pkgs/desktops/mate/mate-terminal/default.nix
  59. +1 −1 pkgs/development/compilers/fsharp/default.nix
  60. +1 −1 pkgs/development/compilers/fsharp41/default.nix
  61. +3 −0 pkgs/development/compilers/gcc/7/default.nix
  62. +1 −1 pkgs/development/compilers/ghc/8.2.2.nix
  63. +1 −1 pkgs/development/compilers/ghc/8.4.3.nix
  64. +2 −2 pkgs/development/compilers/kotlin/default.nix
  65. +4 −1 pkgs/development/compilers/llvm/3.8/clang/default.nix
  66. +10 −3 pkgs/development/compilers/llvm/3.8/libc++/default.nix
  67. +3 −0 pkgs/development/compilers/llvm/3.8/libc++abi.nix
  68. +15 −3 pkgs/development/compilers/llvm/3.8/llvm.nix
  69. +2 −0 pkgs/development/compilers/llvm/3.9/clang/default.nix
  70. +12 −6 pkgs/development/compilers/llvm/3.9/libc++/default.nix
  71. +3 −0 pkgs/development/compilers/llvm/3.9/libc++abi.nix
  72. +13 −2 pkgs/development/compilers/llvm/3.9/llvm.nix
  73. +1 −1 pkgs/development/compilers/llvm/4/libc++/default.nix
  74. +1 −1 pkgs/development/compilers/llvm/4/libc++abi.nix
  75. +1 −1 pkgs/development/compilers/llvm/4/llvm.nix
  76. 0 pkgs/development/compilers/llvm/{4 → }/dynamiclibrary-musl.patch
  77. 0 pkgs/development/compilers/llvm/{4/libc++/max_align_t.patch → libcxx-max_align_t.patch}
  78. +1 −1 pkgs/development/compilers/nasm/default.nix
  79. +1 −1 pkgs/development/compilers/neko/default.nix
  80. +1 −1 pkgs/development/compilers/nim/default.nix
  81. +2 −2 pkgs/development/compilers/ocaml/4.07.nix
  82. +1 −1 pkgs/development/compilers/opendylan/bin.nix
  83. +1 −1 pkgs/development/compilers/opendylan/default.nix
  84. +2 −2 pkgs/development/interpreters/php/default.nix
  85. +1 −0 pkgs/development/interpreters/picolisp/default.nix
  86. +178 −0 pkgs/development/interpreters/python/cpython/3.7/default.nix
  87. +100 −0 pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch
  88. +3 −3 pkgs/development/libraries/Xaw3d/default.nix
  89. +1 −0 pkgs/development/libraries/agda/agda-stdlib/default.nix
  90. +1 −1 pkgs/development/libraries/allegro/5.nix
  91. +1 −1 pkgs/development/libraries/allegro/default.nix
  92. +2 −2 pkgs/development/libraries/aws-sdk-cpp/default.nix
  93. +0 −2 pkgs/development/libraries/boost/1.66.nix
  94. +0 −2 pkgs/development/libraries/boost/1.67.nix
  95. +15 −6 pkgs/development/libraries/boost/generic.nix
  96. +1 −1 pkgs/development/libraries/cpp-netlib/default.nix
  97. +1 −1 pkgs/development/libraries/dleyna-connector-dbus/default.nix
  98. +1 −1 pkgs/development/libraries/dleyna-core/default.nix
  99. +1 −1 pkgs/development/libraries/dleyna-renderer/default.nix
  100. +1 −1 pkgs/development/libraries/dleyna-server/default.nix
  101. +2 −2 pkgs/development/libraries/flatpak/default.nix
  102. +1 −1 pkgs/development/libraries/ldb/default.nix
  103. +0 −31 pkgs/development/libraries/libgsystem/default.nix
  104. +1 −1 pkgs/development/libraries/librime/default.nix
  105. +10 −3 pkgs/development/libraries/libsolv/default.nix
  106. +1 −1 pkgs/development/libraries/libtomcrypt/default.nix
  107. +1 −1 pkgs/development/libraries/libtommath/default.nix
  108. +24 −21 pkgs/development/libraries/libtorrent-rasterbar/default.nix
  109. +7 −2 pkgs/development/libraries/libxml2/default.nix
  110. +1 −1 pkgs/development/libraries/minixml/default.nix
  111. +1 −1 pkgs/development/libraries/mpfr/default.nix
  112. +1 −1 pkgs/development/libraries/nanomsg/default.nix
  113. +1 −1 pkgs/development/libraries/pango/default.nix
  114. +1 −1 pkgs/development/libraries/pangomm/default.nix
  115. +1 −1 pkgs/development/libraries/pangox-compat/default.nix
  116. +2 −2 pkgs/development/libraries/tbb/default.nix
  117. +1 −1 pkgs/development/libraries/uri/default.nix
  118. +2 −2 pkgs/development/libraries/xmlsec/default.nix
  119. +2 −2 pkgs/development/python-modules/click-log/default.nix
  120. +89 −0 pkgs/development/python-modules/clustershell/default.nix
  121. +8 −1 pkgs/development/python-modules/hbmqtt/default.nix
  122. +2 −2 pkgs/development/python-modules/netdisco/default.nix
  123. +2 −1 pkgs/development/python-modules/pyserial/default.nix
  124. +2 −0 pkgs/development/python-modules/user-agents/default.nix
  125. +10 −7 pkgs/development/tools/build-managers/bazel/default.nix
  126. +2 −2 pkgs/development/tools/build-managers/conan/default.nix
  127. +2 −2 pkgs/development/tools/build-managers/shards/default.nix
  128. +4 −4 pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
  129. +4 −2 pkgs/development/tools/flatpak-builder/default.nix
  130. +2 −2 pkgs/development/tools/godot/default.nix
  131. +3 −3 pkgs/development/tools/hcloud/default.nix
  132. +2 −2 pkgs/development/tools/java/cfr/default.nix
  133. +1 −1 pkgs/development/tools/jira_cli/default.nix
  134. +1 −1 pkgs/development/tools/misc/editorconfig-core-c/default.nix
  135. +1 −1 pkgs/development/tools/node-webkit/nw12.nix
  136. +1 −1 pkgs/development/tools/nwjs/default.nix
  137. +29 −16 pkgs/development/tools/ocaml/cppo/default.nix
  138. +2 −2 pkgs/development/tools/ocaml/merlin/default.nix
  139. +2 −2 pkgs/development/web/kcgi/default.nix
  140. +1 −1 pkgs/games/astromenace/default.nix
  141. +2 −0 pkgs/games/ball-and-paddle/default.nix
  142. +1 −0 pkgs/games/chocolate-doom/default.nix
  143. +1 −0 pkgs/games/exult/default.nix
  144. +1 −0 pkgs/games/freeciv/default.nix
  145. +1 −0 pkgs/games/freedink/default.nix
  146. +2 −2 pkgs/games/ivan/default.nix
  147. +1 −0 pkgs/games/lbreakout2/default.nix
  148. +1 −1 pkgs/games/openxcom/default.nix
  149. +0 −69 pkgs/games/unvanquished/default.nix
  150. +1 −1 pkgs/misc/emulators/fs-uae/default.nix
  151. +1 −1 pkgs/misc/emulators/pcsx2/default.nix
  152. +1 −1 pkgs/misc/screensavers/electricsheep/default.nix
  153. +6 −0 pkgs/os-specific/linux/dmraid/default.nix
  154. +1 −1 pkgs/os-specific/linux/odp-dpdk/default.nix
  155. +49 −5 pkgs/servers/home-assistant/component-packages.nix
  156. +16 −16 pkgs/servers/home-assistant/default.nix
  157. +2 −2 pkgs/servers/home-assistant/frontend.nix
  158. +1 −1 pkgs/servers/irc/ngircd/default.nix
  159. +5 −2 pkgs/servers/sql/mariadb/default.nix
  160. +1 −1 pkgs/tools/X11/keynav/default.nix
  161. +1 −1 pkgs/tools/backup/partclone/default.nix
  162. +2 −2 pkgs/tools/backup/restic/default.nix
  163. +2 −2 pkgs/tools/misc/debootstrap/default.nix
  164. +47 −23 pkgs/tools/misc/ostree/default.nix
  165. +43 −29 pkgs/tools/misc/rpm-ostree/default.nix
  166. +2 −2 pkgs/tools/misc/tmuxinator/default.nix
  167. +1 −1 pkgs/tools/networking/hans/default.nix
  168. +3 −0 pkgs/tools/security/gopass/default.nix
  169. +1 −1 pkgs/tools/security/libacr38u/default.nix
  170. +1 −1 pkgs/tools/security/pcsc-cyberjack/default.nix
  171. +2 −2 pkgs/tools/system/efivar/default.nix
  172. +2 −2 pkgs/tools/text/mpage/default.nix
  173. +1 −1 pkgs/tools/virtualization/aws/default.nix
  174. +0 −1 pkgs/top-level/aliases.nix
  175. +23 −9 pkgs/top-level/all-packages.nix
  176. +32 −6 pkgs/top-level/php-packages.nix
  177. +9 −6 pkgs/top-level/python-packages.nix
5 changes: 4 additions & 1 deletion default.nix
Original file line number Diff line number Diff line change
@@ -6,7 +6,10 @@ if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.
This version of Nixpkgs requires Nix >= ${requiredVersion}, please upgrade:
- If you are running NixOS, use `nixos-rebuild' to upgrade your system.
- If you are running NixOS, `nixos-rebuild' can be used to upgrade your system.
- Alternatively, with Nix > 2.0 `nix upgrade-nix' can be used to imperatively
upgrade Nix. You may use `nix-env --version' to check which version you have.
- If you installed Nix using the install script (https://nixos.org/nix/install),
it is safe to upgrade by running it again:
3 changes: 2 additions & 1 deletion doc/languages-frameworks/python.section.md
Original file line number Diff line number Diff line change
@@ -484,7 +484,7 @@ and in this case the `python35` interpreter is automatically used.

### Interpreters

Versions 2.7, 3.3, 3.4, 3.5 and 3.6 of the CPython interpreter are available as
Versions 2.7, 3.4, 3.5, 3.6 and 3.7 of the CPython interpreter are available as
respectively `python27`, `python34`, `python35` and `python36`. The PyPy interpreter
is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and
`python35`. The default interpreter, `python`, maps to `python2`.
@@ -533,6 +533,7 @@ sets are
* `pkgs.python34Packages`
* `pkgs.python35Packages`
* `pkgs.python36Packages`
* `pkgs.python37Packages`
* `pkgs.pypyPackages`

and the aliases
6 changes: 6 additions & 0 deletions lib/licenses.nix
Original file line number Diff line number Diff line change
@@ -122,26 +122,31 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
cc-by-nc-sa-20 = spdx {
spdxId = "CC-BY-NC-SA-2.0";
fullName = "Creative Commons Attribution Non Commercial Share Alike 2.0";
free = false;
};

cc-by-nc-sa-25 = spdx {
spdxId = "CC-BY-NC-SA-2.5";
fullName = "Creative Commons Attribution Non Commercial Share Alike 2.5";
free = false;
};

cc-by-nc-sa-30 = spdx {
spdxId = "CC-BY-NC-SA-3.0";
fullName = "Creative Commons Attribution Non Commercial Share Alike 3.0";
free = false;
};

cc-by-nc-sa-40 = spdx {
spdxId = "CC-BY-NC-SA-4.0";
fullName = "Creative Commons Attribution Non Commercial Share Alike 4.0";
free = false;
};

cc-by-nd-30 = spdx {
spdxId = "CC-BY-ND-3.0";
fullName = "Creative Commons Attribution-No Derivative Works v3.00";
free = false;
};

cc-by-sa-25 = spdx {
@@ -455,6 +460,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
msrla = {
fullName = "Microsoft Research License Agreement";
url = "http://research.microsoft.com/en-us/projects/pex/msr-la.txt";
free = false;
};

ncsa = spdx {
4 changes: 3 additions & 1 deletion nixos/modules/programs/npm.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ config, lib, ... }:
{ config, lib, pkgs, ... }:

with lib;

@@ -39,6 +39,8 @@ in
environment.etc."npmrc".text = cfg.npmrc;

environment.variables.NPM_CONFIG_GLOBALCONFIG = "/etc/npmrc";

environment.systemPackages = [ pkgs.nodePackages.npm ];
};

}
68 changes: 26 additions & 42 deletions nixos/modules/services/databases/pgmanage.nix
Original file line number Diff line number Diff line change
@@ -41,7 +41,9 @@ let

pgmanage = "pgmanage";

pgmanageOptions = {
in {

options.services.pgmanage = {
enable = mkEnableOption "PostgreSQL Administration for the web";

package = mkOption {
@@ -176,47 +178,29 @@ let
};
};


in {

options.services.pgmanage = pgmanageOptions;

# This is deprecated and should be removed for NixOS-18.03.
options.services.postage = pgmanageOptions;

config = mkMerge [
{ assertions = [
{ assertion = !config.services.postage.enable;
message =
"services.postage is deprecated in favour of pgmanage. " +
"They have the same options so just substitute postage for pgmanage." ;
}
];
}
(mkIf cfg.enable {
systemd.services.pgmanage = {
description = "pgmanage - PostgreSQL Administration for the web";
wants = [ "postgresql.service" ];
after = [ "postgresql.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
User = pgmanage;
Group = pgmanage;
ExecStart = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" +
optionalString cfg.localOnly " --local-only=true";
};
config = mkIf cfg.enable {
systemd.services.pgmanage = {
description = "pgmanage - PostgreSQL Administration for the web";
wants = [ "postgresql.service" ];
after = [ "postgresql.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
User = pgmanage;
Group = pgmanage;
ExecStart = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" +
optionalString cfg.localOnly " --local-only=true";
};
users = {
users."${pgmanage}" = {
name = pgmanage;
group = pgmanage;
home = cfg.sqlRoot;
createHome = true;
};
groups."${pgmanage}" = {
name = pgmanage;
};
};
users = {
users."${pgmanage}" = {
name = pgmanage;
group = pgmanage;
home = cfg.sqlRoot;
createHome = true;
};
})
];
groups."${pgmanage}" = {
name = pgmanage;
};
};
};
}
2 changes: 1 addition & 1 deletion nixos/modules/services/networking/chrony.nix
Original file line number Diff line number Diff line change
@@ -109,7 +109,7 @@ in
home = stateDir;
};

systemd.services.timesyncd.enable = mkForce false;
services.timesyncd.enable = mkForce false;

systemd.services.chronyd =
{ description = "chrony NTP daemon";
1 change: 1 addition & 0 deletions nixos/release.nix
Original file line number Diff line number Diff line change
@@ -314,6 +314,7 @@ in rec {
tests.influxdb = callTest tests/influxdb.nix {};
tests.ipv6 = callTest tests/ipv6.nix {};
tests.jenkins = callTest tests/jenkins.nix {};
tests.ostree = callTest tests/ostree.nix {};
tests.osquery = callTest tests/osquery.nix {};
tests.plasma5 = callTest tests/plasma5.nix {};
tests.plotinus = callTest tests/plotinus.nix {};
21 changes: 21 additions & 0 deletions nixos/tests/ostree.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# run installed tests
import ./make-test.nix ({ pkgs, lib, ... }: {
name = "ostree";

meta = {
maintainers = pkgs.ostree.meta.maintainers;
};

# TODO: Wrap/patch the tests directly in the package
machine = { pkgs, ... }: {
environment.systemPackages = with pkgs; [
gnome-desktop-testing ostree gnupg (python3.withPackages (p: with p; [ pyyaml ]))
];

environment.variables.GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" (with pkgs; [ gtk3 pango.out ostree gdk_pixbuf atk ]); # for GJS tests
};

testScript = ''
$machine->succeed("gnome-desktop-testing-runner -d ${pkgs.ostree.installedTests}/share");
'';
})
2 changes: 2 additions & 0 deletions pkgs/applications/audio/amarok/kf5.nix
Original file line number Diff line number Diff line change
@@ -21,6 +21,8 @@ in mkDerivation {
sha256 = "05w7kl6qfmkjz0y1bhgkkbmsqdll30bkjd6npkzvivrvp7dplmbh";
};

patches = [ ./qt5_11.patch ];

nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
qca-qt5 qjson qtscript qtwebkit
11 changes: 11 additions & 0 deletions pkgs/applications/audio/amarok/qt5_11.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/src/aboutdialog/ExtendedAboutDialog.cpp
+++ b/src/aboutdialog/ExtendedAboutDialog.cpp
@@ -30,6 +30,7 @@
#include <QLayout>
#include <QPushButton>
#include <QScrollBar>
+#include <QStyle>
#include <QTabWidget>

#include <qapplication.h>

4 changes: 2 additions & 2 deletions pkgs/applications/audio/fldigi/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@
libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:

stdenv.mkDerivation rec {
version = "4.0.16";
version = "4.0.17";
pname = "fldigi";
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://sourceforge/${pname}/${name}.tar.gz";
sha256 = "1gcahm1lv3yfscaxanrx6q7dydxjznw98vdc0f8zgdb15na3f0g7";
sha256 = "1z8w0dxfc2nm1iy1vv18s5s88ys9vvbqawjvhsymxj56jqjzzp4q";
};

buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio
5 changes: 2 additions & 3 deletions pkgs/applications/audio/gpodder/default.nix
Original file line number Diff line number Diff line change
@@ -5,15 +5,14 @@

python3Packages.buildPythonApplication rec {
pname = "gpodder";
version = "3.10.2";

version = "3.10.3";
format = "other";

src = fetchFromGitHub {
owner = "gpodder";
repo = "gpodder";
rev = version;
sha256 = "0nbhyh44cympslcf4miwc2n1gccm5ghjf9slg0r8xnpvg921jv04";
sha256 = "0j0amjq1wvr5p10vckg900a8xfnxw6z028qw72ayh58216m5jb5l";
};

postPatch = with stdenv.lib; ''
54 changes: 54 additions & 0 deletions pkgs/applications/audio/snapcast/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
, asio, alsaLib, avahi, libogg, libvorbis, flac }:

let

popl = stdenv.mkDerivation rec {
name = "popl-${version}";
version = "1.1.0";

src = fetchFromGitHub {
owner = "badaix";
repo = "popl";
rev = "v${version}";
sha256 = "1zgjgcingyi1xw61azxxasaidbgqidncml5c2y2cj90mz23yam1i";
};
nativeBuildInputs = [ cmake ];
};

aixlog = stdenv.mkDerivation rec {
name = "aixlog-${version}";
version = "1.2.1";

src = fetchFromGitHub {
owner = "badaix";
repo = "aixlog";
rev = "v${version}";
sha256 = "1rh4jib5g41b85bqrxkl5g74hk5ryf187y9fw0am76g59xlymfpr";
};
nativeBuildInputs = [ cmake ];
};

in

stdenv.mkDerivation rec {
name = "snapcast-${version}";
version = "0.14.0";

src = fetchFromGitHub {
owner = "badaix";
repo = "snapcast";
rev = "v${version}";
sha256 = "14f5jrsarjdk2mixmznmighrh22j6flp7y47r9j3qzxycmm1mcf6";
};

nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ asio popl aixlog alsaLib avahi libogg libvorbis flac ];

meta = with lib; {
description = "Synchronous multi-room audio player";
homepage = https://github.com/badaix/snapcast;
maintainers = with maintainers; [ fpletz ];
license = licenses.gpl3;
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/ImageMagick/7.0.nix
Original file line number Diff line number Diff line change
@@ -14,8 +14,8 @@ let
else throw "ImageMagick is not supported on this platform.";

cfg = {
version = "7.0.7-35";
sha256 = "1gn4frzxa1v712pcwwkmi0m2a6gbrg2564dbxxr7130zc66licpz";
version = "7.0.8-2";
sha256 = "06cpvvv8xikw5jm1pa2xxxlnsy743ham67yshpndn2x3fyf48267";
patches = [];
};
in
2 changes: 1 addition & 1 deletion pkgs/applications/graphics/kipi-plugins/default.nix
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Plugins for KDE-based image applications";
license = stdenv.lib.licenses.gpl2;
homepage = http://www.digikam.org;
homepage = https://www.digikam.org;
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
platforms = stdenv.lib.platforms.linux;
};
2 changes: 1 addition & 1 deletion pkgs/applications/misc/gnss-sdr/default.nix
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "An open source Global Navigation Satellite Systems software-defined receiver";
homepage = http://gnss-sdr.org/;
homepage = https://gnss-sdr.org/;
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
6 changes: 5 additions & 1 deletion pkgs/applications/misc/keepassx/community.nix
Original file line number Diff line number Diff line change
@@ -47,7 +47,11 @@ stdenv.mkDerivation rec {
--replace "/usr/local/share/man" "../share/man"
'';
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib";
patches = [ ./darwin.patch ];

patches = [
./darwin.patch
./qt511.patch
];

cmakeFlags = [
"-DKEEPASSXC_BUILD_TYPE=Release"
15 changes: 15 additions & 0 deletions pkgs/applications/misc/keepassx/qt511.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
index 6fd65c1a..e99275b0 100644
--- a/src/gui/entry/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@@ -29,6 +29,7 @@
#include <QMenu>
#include <QSortFilterProxyModel>
#include <QTemporaryFile>
+#include <QButtonGroup>
#include <QMimeData>
#include <QEvent>
#include <QColorDialog>
--
2.17.1

2 changes: 1 addition & 1 deletion pkgs/applications/misc/librecad/default.nix
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {

meta = {
description = "A 2D CAD package based upon Qt";
homepage = http://librecad.org;
homepage = https://librecad.org;
repositories.git = git://github.com/LibreCAD/LibreCAD.git;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [viric];
2 changes: 1 addition & 1 deletion pkgs/applications/misc/mupdf/default.nix
Original file line number Diff line number Diff line change
@@ -86,7 +86,7 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;

meta = with stdenv.lib; {
homepage = http://mupdf.com;
homepage = https://mupdf.com;
repositories.git = git://git.ghostscript.com/mupdf.git;
description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C";
license = licenses.agpl3Plus;
2 changes: 1 addition & 1 deletion pkgs/applications/misc/pcmanx-gtk2/default.nix
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
'';

meta = with stdenv.lib; {
homepage = http://pcman.ptt.cc;
homepage = https://pcman.ptt.cc;
license = licenses.gpl2;
description = "Telnet BBS browser with GTK+ interface";
maintainers = [ maintainers.sifmelcara ];
Loading