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: e01db49bfa43
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: 14ca98e51e41
Choose a head ref

Commits on Jun 11, 2018

  1. Copy the full SHA
    c0c43e9 View commit details
  2. lib: fix and simplify doRename

    Before this change `mkRenamedOptionModule` would override option defaults
    even when the old option name is left unused. For instance
    
    ```nix
    {
      optios = {
        services.name.new = mkOption {
          default = { one = {}; };
        };
      };
      imports = [
        (mkRenamedOptionModule [ "services" "name" "old" ] [ "services" "name" "new" "two" ])
      ];
      config = {};
    }
    ```
    
    would evaluate to
    
    `{ config.services.name.new = { two = {}; }; }`
    
    when you'd expect it to evaluate to
    
    `{ config.services.name.new = { one = {}; }; }`.
    oxij committed Jun 11, 2018
    Copy the full SHA
    449d43f View commit details

Commits on Jun 23, 2018

  1. llvm4: unconditionally set triples, not just on musl.

    Split off from #42454 as requested.
    dtzWill committed Jun 23, 2018
    Copy the full SHA
    0ac09be View commit details

Commits on Jun 25, 2018

  1. Copy the full SHA
    1fe63c8 View commit details

Commits on Jun 26, 2018

  1. Copy the full SHA
    06db050 View commit details
  2. ocamlPackages.ocp-build: remove spurious dependency to camlp4

    Change attribute name from “ocpBuild” to “ocp-build”.
    vbgl committed Jun 26, 2018
    Copy the full SHA
    fd018bd View commit details
  3. Copy the full SHA
    0d1b528 View commit details
  4. Copy the full SHA
    db8f874 View commit details
  5. Copy the full SHA
    0615803 View commit details
  6. Copy the full SHA
    ed1bbae View commit details
  7. Copy the full SHA
    c647ca8 View commit details

Commits on Jun 27, 2018

  1. linux: 4.9.109 -> 4.9.110

    NeQuissimus committed Jun 27, 2018
    Copy the full SHA
    81769a4 View commit details
  2. linux: 4.14.51 -> 4.14.52

    NeQuissimus committed Jun 27, 2018
    Copy the full SHA
    60a541b View commit details
  3. linux: 4.16.17 -> 4.16.18

    NeQuissimus committed Jun 27, 2018
    Copy the full SHA
    a25eb5d View commit details
  4. linux: 4.17.2 -> 4.17.3

    NeQuissimus committed Jun 27, 2018
    Copy the full SHA
    7dc31f5 View commit details
  5. nano: 2.9.7 -> 2.9.8

    NeQuissimus committed Jun 27, 2018
    Copy the full SHA
    978397d View commit details
  6. nexus: 3.11.0 -> 3.12.1

    aespinosa committed Jun 27, 2018
    Copy the full SHA
    df313f6 View commit details
  7. trivial-builders: disallow sub in requireFile

    The requireFile call was being substituted from the binary cache. We
    do not want this to happen as the user needs to download the file
    themselves.
    matthewbauer committed Jun 27, 2018
    Copy the full SHA
    f194659 View commit details
  8. Merge pull request #42636 from aespinosa/nexus

    nexus: 3.11.0 -> 3.12.1
    adisbladis authored Jun 27, 2018
    Copy the full SHA
    f9cb1a9 View commit details
  9. palp: fix runtime error introduced by #28029 (#42633)

    After #28029 it is necessary to add "strictoverflow" to the disabled
    hardening flags. That probably has something to do with the `-O3` option
    in palps makefile.
    
    This commit also adds a test to check for this regression (as it only
    occured at runtime).
    timokau authored and xeji committed Jun 27, 2018
    Copy the full SHA
    08a59bb View commit details
  10. trezord: 2.0.12 -> 2.0.14 (#42627)

    Tested-by: William Casarin <jb55@jb55.com>
    Signed-off-by: William Casarin <jb55@jb55.com>
    jb55 authored and xeji committed Jun 27, 2018
    Copy the full SHA
    70212bb View commit details
  11. Copy the full SHA
    b018171 View commit details
  12. hackage-packages.nix: automatic Haskell package set update

    This update was generated by hackage2nix v2.9.2-23-g7ccbd66 from Hackage revision
    commercialhaskell/all-cabal-hashes@dc8aa30.
    peti committed Jun 27, 2018
    Copy the full SHA
    f380b66 View commit details
  13. git-annex: update to version 6.20180626

    This update fixes CVE-2018-10857 and CVE-2018-10859.
    peti committed Jun 27, 2018
    Copy the full SHA
    8d0d41d View commit details
  14. Merge pull request #40418 from oxij/lib/fix-module-aliases

    lib, nixos: fix module aliases in presence of defaults
    7c6f434c authored Jun 27, 2018
    Copy the full SHA
    b8ffd24 View commit details
  15. Copy the full SHA
    ca131ea View commit details
  16. Copy the full SHA
    4d7f235 View commit details
  17. Copy the full SHA
    b97b030 View commit details
  18. haskell-filecache: disable test suite on Darwin

    See bartavelle/filecache#4 for details.
    Closes NixOS/nixpkgs#42629.
    
    Update configuration-common.nix
    PierreR authored and peti committed Jun 27, 2018
    Copy the full SHA
    75ce141 View commit details
  19. palp: restrict platforms to linux (#42651)

    timokau authored and xeji committed Jun 27, 2018
    Copy the full SHA
    2b22ecf View commit details
  20. Merge pull request #42637 from obsidiansystems/disallow-substitutes-r…

    …equirefile
    
    trivial-builders: disallow sub in requireFile
    xeji authored Jun 27, 2018
    Copy the full SHA
    4e9b191 View commit details
  21. pynac: 0.7.21 -> 0.7.22 (#42650)

    timokau authored and xeji committed Jun 27, 2018
    Copy the full SHA
    9ce041a View commit details
  22. esptool: 2.3.1 -> 2.4.1 (#42632)

    dotlambda authored and xeji committed Jun 27, 2018
    Copy the full SHA
    63d82f3 View commit details
  23. Copy the full SHA
    3eac18b View commit details
  24. Merge pull request #42588 from laMudri/ibus-troubleshoot

    nixos/ibus: detail workaround for issue #11558
    Mic92 authored Jun 27, 2018
    Copy the full SHA
    9ae531e View commit details
  25. Merge pull request #42630 from vbgl/ocaml-ocp-index-1.1.6

    ocamlPackages.ocp-index: 1.1.5 -> 1.1.6
    xeji authored Jun 27, 2018
    Copy the full SHA
    2a2088a View commit details
  26. snes9x-gtk: 1.56.1 -> 1.56.2 (#42446)

    Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
    
    This update was made based on information from https://repology.org/metapackage/snes9x-gtk/versions.
    
    These checks were done:
    
    - built on NixOS
    - Warning: no invocation of /nix/store/dwkaz8igww0j8mvlvbmmia9dqn1zfi4r-snes9x-gtk-1.56.2/bin/snes9x-gtk had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/dwkaz8igww0j8mvlvbmmia9dqn1zfi4r-snes9x-gtk-1.56.2/bin/.snes9x-gtk-wrapped had a zero exit code or showed the expected version
    - 0 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.56.2 with grep in /nix/store/dwkaz8igww0j8mvlvbmmia9dqn1zfi4r-snes9x-gtk-1.56.2
    - directory tree listing: https://gist.github.com/9099159d34f80ca08f46e16de03222b7
    - du listing: https://gist.github.com/089002406d67da563ace4b09e11494ab
    r-ryantm authored and xeji committed Jun 27, 2018
    Copy the full SHA
    953ab8f View commit details
  27. openfst: 1.6.7 -> 1.6.8 (#42472)

    Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
    
    This update was made based on information from https://repology.org/metapackage/openfst/versions.
    
    These checks were done:
    
    - built on NixOS
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstarcsort had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstclosure had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstcompile had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstcompose had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstconcat had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstconnect had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstconvert had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstdeterminize had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstdifference had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstdisambiguate had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstdraw had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstencode had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstepsnormalize had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstequal had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstequivalent had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstinfo had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstintersect had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstinvert had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstisomorphic had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstmap had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstminimize had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstprint had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstproject had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstprune had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstpush had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstrandgen had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstrelabel had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstreplace had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstreverse had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstreweight had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstrmepsilon had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstshortestdistance had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstshortestpath had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstsymbols had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstsynchronize had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fsttopsort had a zero exit code or showed the expected version
    - Warning: no invocation of /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8/bin/fstunion had a zero exit code or showed the expected version
    - 0 of 37 passed binary check by having a zero exit code.
    - 0 of 37 passed binary check by having the new version present in output.
    - found 1.6.8 with grep in /nix/store/wsx1ziwkccvj1mk0b647cc0syfkzpinf-openfst-1.6.8
    - directory tree listing: https://gist.github.com/12e73cab8efbc1c63a2ba5e087454914
    - du listing: https://gist.github.com/0fad2edab1e90571b66bb61e3fe3b01e
    r-ryantm authored and xeji committed Jun 27, 2018
    Copy the full SHA
    4ba965b View commit details
  28. mate.mate-user-guide: 1.20.0 -> 1.20.1 (#42480)

    Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
    
    This update was made based on information from https://repology.org/metapackage/mate-user-guide/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.
    - directory tree listing: https://gist.github.com/69230e142f75a0bf18525c97d28a5fae
    - du listing: https://gist.github.com/82fdc8e01e8e7a7c1fc4250a582e480a
    r-ryantm authored and xeji committed Jun 27, 2018
    Copy the full SHA
    6343302 View commit details
  29. Merge pull request #42456 from dtzWill/fix/llvm4-triples-unconditional

    llvm4: unconditionally set triples, not just on musl.
    dtzWill authored Jun 27, 2018
    Copy the full SHA
    8575fd5 View commit details
  30. mopidy-iris: 3.21.1 -> 3.21.3 (#42474)

    Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
    
    This update was made based on information from https://repology.org/metapackage/Mopidy-Iris/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 3.21.3 with grep in /nix/store/qb6067h8y8p8y7kqkmdk308a494milyw-Mopidy-Iris-3.21.3
    - directory tree listing: https://gist.github.com/e0c3564e49b2cec4b30d98ec42723bff
    - du listing: https://gist.github.com/a127f023f22f9a2abd69c2dd0ff0c71b
    r-ryantm authored and xeji committed Jun 27, 2018
    Copy the full SHA
    03b1e67 View commit details
  31. mate.mate-session-manager: 1.20.0 -> 1.20.1 (#42481)

    Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
    
    This update was made based on information from https://repology.org/metapackage/mate-session-manager/versions.
    
    These checks were done:
    
    - built on NixOS
    - /nix/store/wbgh5848w72f7cvsh7ks2vj7f9i0ylnz-mate-session-manager-1.20.1/bin/mate-session passed the binary check.
    - /nix/store/wbgh5848w72f7cvsh7ks2vj7f9i0ylnz-mate-session-manager-1.20.1/bin/mate-session-properties passed the binary check.
    - /nix/store/wbgh5848w72f7cvsh7ks2vj7f9i0ylnz-mate-session-manager-1.20.1/bin/mate-session-save passed the binary check.
    - /nix/store/wbgh5848w72f7cvsh7ks2vj7f9i0ylnz-mate-session-manager-1.20.1/bin/mate-session-inhibit passed the binary check.
    - Warning: no invocation of /nix/store/wbgh5848w72f7cvsh7ks2vj7f9i0ylnz-mate-session-manager-1.20.1/bin/mate-wm had a zero exit code or showed the expected version
    - /nix/store/wbgh5848w72f7cvsh7ks2vj7f9i0ylnz-mate-session-manager-1.20.1/bin/.mate-session-wrapped passed the binary check.
    - /nix/store/wbgh5848w72f7cvsh7ks2vj7f9i0ylnz-mate-session-manager-1.20.1/bin/.mate-session-properties-wrapped passed the binary check.
    - /nix/store/wbgh5848w72f7cvsh7ks2vj7f9i0ylnz-mate-session-manager-1.20.1/bin/.mate-session-save-wrapped passed the binary check.
    - /nix/store/wbgh5848w72f7cvsh7ks2vj7f9i0ylnz-mate-session-manager-1.20.1/bin/.mate-session-inhibit-wrapped passed the binary check.
    - Warning: no invocation of /nix/store/wbgh5848w72f7cvsh7ks2vj7f9i0ylnz-mate-session-manager-1.20.1/bin/.mate-wm-wrapped had a zero exit code or showed the expected version
    - 8 of 10 passed binary check by having a zero exit code.
    - 1 of 10 passed binary check by having the new version present in output.
    - found 1.20.1 with grep in /nix/store/wbgh5848w72f7cvsh7ks2vj7f9i0ylnz-mate-session-manager-1.20.1
    - directory tree listing: https://gist.github.com/f036604f75bea4aed0093a9ca8eb6f0a
    - du listing: https://gist.github.com/1083d12fd4033f9091a0ce334f09c1e4
    r-ryantm authored and xeji committed Jun 27, 2018
    Copy the full SHA
    8584918 View commit details
  32. mate.mate-screensaver: 1.20.0 -> 1.20.1 (#42483)

    Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
    
    This update was made based on information from https://repology.org/metapackage/mate-screensaver/versions.
    
    These checks were done:
    
    - built on NixOS
    - /nix/store/yl7p098lzcb2vs4hl4sxwgb0d37agvyd-mate-screensaver-1.20.1/bin/mate-screensaver passed the binary check.
    - /nix/store/yl7p098lzcb2vs4hl4sxwgb0d37agvyd-mate-screensaver-1.20.1/bin/mate-screensaver-command passed the binary check.
    - Warning: no invocation of /nix/store/yl7p098lzcb2vs4hl4sxwgb0d37agvyd-mate-screensaver-1.20.1/bin/mate-screensaver-preferences had a zero exit code or showed the expected version
    - /nix/store/yl7p098lzcb2vs4hl4sxwgb0d37agvyd-mate-screensaver-1.20.1/bin/.mate-screensaver-wrapped passed the binary check.
    - /nix/store/yl7p098lzcb2vs4hl4sxwgb0d37agvyd-mate-screensaver-1.20.1/bin/.mate-screensaver-command-wrapped passed the binary check.
    - Warning: no invocation of /nix/store/yl7p098lzcb2vs4hl4sxwgb0d37agvyd-mate-screensaver-1.20.1/bin/.mate-screensaver-preferences-wrapped had a zero exit code or showed the expected version
    - 4 of 6 passed binary check by having a zero exit code.
    - 0 of 6 passed binary check by having the new version present in output.
    - found 1.20.1 with grep in /nix/store/yl7p098lzcb2vs4hl4sxwgb0d37agvyd-mate-screensaver-1.20.1
    - directory tree listing: https://gist.github.com/b700040ccf6edd3df78a2613f8827d45
    - du listing: https://gist.github.com/cb5e756e8dc86af9c065a3b8545355f6
    r-ryantm authored and xeji committed Jun 27, 2018
    Copy the full SHA
    66350c0 View commit details
  33. grafana: 5.1.4 -> 5.2.0, replace hard coded version (#42653)

    Replaced the hard coded version with the packaged version
    and updated the source URL which changed with the latest release.
    WilliButz authored and xeji committed Jun 27, 2018
    Copy the full SHA
    14ca98e View commit details
Showing with 1,175 additions and 1,067 deletions.
  1. +18 −16 lib/modules.nix
  2. +12 −0 nixos/modules/i18n/input-method/default.xml
  3. +2 −2 pkgs/applications/audio/mopidy/iris.nix
  4. +2 −2 pkgs/applications/editors/nano/default.nix
  5. +403 −393 pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
  6. +397 −397 pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
  7. +17 −2 pkgs/applications/science/math/palp/default.nix
  8. +2 −2 pkgs/applications/science/math/pynac/default.nix
  9. +1 −0 pkgs/build-support/trivial-builders.nix
  10. +2 −2 pkgs/desktops/mate/mate-screensaver/default.nix
  11. +2 −2 pkgs/desktops/mate/mate-session-manager/default.nix
  12. +2 −2 pkgs/desktops/mate/mate-user-guide/default.nix
  13. +4 −5 pkgs/development/compilers/llvm/4/llvm.nix
  14. +2 −1 pkgs/development/haskell-modules/configuration-common.nix
  15. +233 −97 pkgs/development/haskell-modules/hackage-packages.nix
  16. +2 −2 pkgs/development/libraries/openfst/default.nix
  17. +0 −34 pkgs/development/ocaml-modules/cmdliner/0.9.nix
  18. +9 −2 pkgs/development/python-modules/rpy2/default.nix
  19. +4 −0 pkgs/development/ruby-modules/gem-config/default.nix
  20. +1 −1 pkgs/development/tools/ocaml/ocaml-top/default.nix
  21. +4 −5 pkgs/development/tools/ocaml/ocp-build/default.nix
  22. +0 −37 pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix
  23. +5 −11 pkgs/development/tools/ocaml/ocp-indent/default.nix
  24. +9 −25 pkgs/development/tools/ocaml/ocp-index/default.nix
  25. +3 −3 pkgs/development/tools/repository-managers/nexus/default.nix
  26. +2 −2 pkgs/misc/emulators/snes9x-gtk/default.nix
  27. +11 −0 pkgs/misc/vim-plugins/default.nix
  28. +1 −0 pkgs/misc/vim-plugins/vim-plugin-names
  29. +2 −2 pkgs/os-specific/linux/kernel/linux-4.14.nix
  30. +2 −2 pkgs/os-specific/linux/kernel/linux-4.16.nix
  31. +2 −2 pkgs/os-specific/linux/kernel/linux-4.17.nix
  32. +2 −2 pkgs/os-specific/linux/kernel/linux-4.9.nix
  33. +10 −4 pkgs/servers/monitoring/grafana/default.nix
  34. +2 −2 pkgs/servers/trezord/default.nix
  35. +2 −2 pkgs/tools/misc/esptool/default.nix
  36. +3 −6 pkgs/top-level/ocaml-packages.nix
34 changes: 18 additions & 16 deletions lib/modules.nix
Original file line number Diff line number Diff line change
@@ -532,9 +532,7 @@ rec {
#
mkAliasDefinitions = mkAliasAndWrapDefinitions id;
mkAliasAndWrapDefinitions = wrap: option:
mkMerge
(optional (isOption option && option.isDefined)
(wrap (mkMerge option.definitions)));
mkIf (isOption option && option.isDefined) (wrap (mkMerge option.definitions));


/* Compatibility. */
@@ -669,22 +667,26 @@ rec {
};

doRename = { from, to, visible, warn, use }:
{ config, options, ... }:
let
fromOpt = getAttrFromPath from options;
toOpt = getAttrFromPath to options;
toOf = attrByPath to
(abort "Renaming error: option `${showOption to}' does not exist.");
in
{ config, options, ... }:
{ options = setAttrByPath from (mkOption {
inherit visible;
description = "Alias of <option>${showOption to}</option>.";
apply = x: use (toOf config);
});
config = {
warnings =
let opt = getAttrFromPath from options; in
optional (warn && opt.isDefined)
"The option `${showOption from}' defined in ${showFiles opt.files} has been renamed to `${showOption to}'.";
} // setAttrByPath to (mkAliasDefinitions (getAttrFromPath from options));
};
{
options = setAttrByPath from (mkOption {
inherit visible;
description = "Alias of <option>${showOption to}</option>.";
apply = x: use (toOf config);
});
config = mkMerge [
{
warnings = optional (warn && fromOpt.isDefined)
"The option `${showOption from}' defined in ${showFiles fromOpt.files} has been renamed to `${showOption to}'.";
}
(mkAliasAndWrapDefinitions (setAttrByPath to) fromOpt)
];
};

}
12 changes: 12 additions & 0 deletions nixos/modules/i18n/input-method/default.xml
Original file line number Diff line number Diff line change
@@ -68,6 +68,18 @@ ibus.engines = with pkgs.ibus-engines; [ table table-others ];
<para>To use any input method, the package must be added in the configuration,
as shown above, and also (after running <literal>nixos-rebuild</literal>) the
input method must be added from IBus' preference dialog.</para>

<simplesect>
<title>Troubleshooting</title>
<para>If IBus works in some applications but not others, a likely cause of
this is that IBus is depending on a different version of
<literal>glib</literal> to what the applications are depending on. This can
be checked by running <literal>nix-store -q --requisites &lt;path&gt; | grep
glib</literal>, where <literal>&lt;path&gt;</literal> is the path of either
IBus or an application in the Nix store. The <literal>glib</literal>
packages must match exactly. If they do not, uninstalling and reinstalling
the application is a likely fix.</para>
</simplesect>
</section>

<section><title>Fcitx</title>
4 changes: 2 additions & 2 deletions pkgs/applications/audio/mopidy/iris.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

pythonPackages.buildPythonApplication rec {
pname = "Mopidy-Iris";
version = "3.21.1";
version = "3.21.3";

src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "10d97rkqk5qbrninrahn0gr90yd47ivw2zafb24sp7a2g0mm07md";
sha256 = "0gp51zz5qr93w0h14m1blmjnlgmilyb15lw2m75varslw1ar7vlg";
};

propagatedBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/applications/editors/nano/default.nix
Original file line number Diff line number Diff line change
@@ -20,11 +20,11 @@ let

in stdenv.mkDerivation rec {
name = "nano-${version}";
version = "2.9.7";
version = "2.9.8";

src = fetchurl {
url = "mirror://gnu/nano/${name}.tar.xz";
sha256 = "1ga4sdk3ikx1ilggc6c77vyfpbmq3nrhg6svgglpf5sv60bv0jmn";
sha256 = "122lm0z97wk3mgnbn8m4d769d4j9rxyc9z7s89xd4gsdp8qsrpn2";
};

nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
Loading