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: 9475c75895e3
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: ac7d8d22d2e4
Choose a head ref
15 contributors

Commits on Jul 12, 2018

  1. idris: Remove unneeded overrides 

    - The gmp issue has long been fixed and closed
- The preBuild thing was never used afaik, it works no problem without
it, especially since checks don't run (To get checks to work we'd have
to compile the libraries into idris, which are currently nicely
separated)
- The dependencies overrides aren't needed anymore
    @infinisil
    infinisil committed Jul 12, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    infinisil Silvan Mosberger
    GPG key ID: 9424360B4B85C9E7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d767c0c View commit details

Commits on Jul 13, 2018

  1. nixos/neo4j: Update module, make compatible with neo4j 3.4

    @patternspandemic
    patternspandemic committed Jul 13, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    patternspandemic
    GPG key ID: 3B91B0048337A5BC
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d9d9200 View commit details

Commits on Jul 15, 2018

  1. percona-toolkit: init at 3.0.11

    @Izorkin
    Izorkin committed Jul 15, 2018
    Copy the full SHA
    e21606a View commit details

Commits on Jul 16, 2018

  1. ffmpeg-full: enable libvpx on Darwin

    @thefloweringash
    thefloweringash committed Jul 16, 2018
    Copy the full SHA
    e8b2968 View commit details

  2. ffmpeg: enable libvpx on Darwin

    @thefloweringash
    thefloweringash committed Jul 16, 2018
    Copy the full SHA
    2d9cc7a View commit details

  3. bluemix-cli: 0.6.6 -> 0.8.0

    @jensbin
    jensbin committed Jul 16, 2018
    Copy the full SHA
    9a8ccb7 View commit details

  4. idrisPackages: build with hydra

    @infinisil
    infinisil committed Jul 16, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    infinisil Silvan Mosberger
    GPG key ID: 9424360B4B85C9E7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cb12f60 View commit details

  5. idris: prefix package derivation names with "idris-"

    @infinisil
    infinisil committed Jul 16, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    infinisil Silvan Mosberger
    GPG key ID: 9424360B4B85C9E7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1d94e4c View commit details

  6. cvc4: fix homepage url

    @gebner
    gebner committed Jul 16, 2018
    Copy the full SHA
    862e4e4 View commit details

  7. Merge pull request #43601 from thefloweringash/ffmpeg-libvpx 

    ffmpeg, ffmpeg-full: enable libvpx on Darwin
    @xeji
    xeji authored Jul 16, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f4fbdf0 View commit details

  8. Merge pull request #43605 from jensbin/bluemix 

    bluemix-cli: 0.6.6 -> 0.8.0
    @xeji
    xeji authored Jul 16, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    23b2b49 View commit details

  9. libcouchbase: tiny cleanup

    @oxij
    oxij committed Jul 16, 2018
    Copy the full SHA
    a2b026f View commit details

  10. clp: cleanup expression

    @oxij
    oxij committed Jul 16, 2018
    Copy the full SHA
    e80ca21 View commit details

  11. vagrant: update deps for 2.1.2 

    The version was bumped but the dependencies were not updated.
Do so and add some instructions for future package updates.
    @aneeshusa
    aneeshusa committed Jul 16, 2018
    Copy the full SHA
    982f9d8 View commit details

  12. Merge pull request #43620 from aneeshusa/update-vagrant-to-2.1.2-prop… 

    …erly

vagrant: update deps for 2.1.2
    @xeji
    xeji authored Jul 16, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8b0fea2 View commit details

  13. maintainers: add @aepsil0n

    @milibopp
    milibopp committed Jul 16, 2018
    Copy the full SHA
    5a73564 View commit details

  14. Merge pull request #43444 from Infinisil/idris-cleanup 

    idris: Recurse into attrs, fix build and remove unneeded overrides
    @peti
    peti authored Jul 16, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9a32daf View commit details

  15. Merge pull request #43623 from oxij/tree/cleanups 

    trivial: cleanups
    @FRidh
    FRidh authored Jul 16, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2527218 View commit details

  16. Merge pull request #43568 from Izorkin/percona-toolkit 

    percona-toolkit: init at 3.0.11
    @pSub
    pSub authored Jul 16, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    235bd2b View commit details

  17. gnome3.gnome-sound-recorder: init at 3.28.1

    @jtojnar
    jtojnar committed Jul 16, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e2d9a9d View commit details

  18. aha: add myself (pSub) as maintainer

    @pSub
    pSub committed Jul 16, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    pSub Pascal Wittmann
    GPG key ID: C899ACE7E2322852
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    66f99ec View commit details

  19. toilet: add myself (pSub) as maintainer

    @pSub
    pSub committed Jul 16, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    pSub Pascal Wittmann
    GPG key ID: C899ACE7E2322852
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f3d9353 View commit details

  20. mmake: fix description

    @pSub
    pSub committed Jul 16, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    pSub Pascal Wittmann
    GPG key ID: C899ACE7E2322852
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e72ef57 View commit details

  21. doit: add myself (pSub) as maintainer

    @pSub
    pSub committed Jul 16, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    pSub Pascal Wittmann
    GPG key ID: C899ACE7E2322852
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2d9a602 View commit details

  22. Merge pull request #42748 from patternspandemic/neo4j-service 

    nixos/neo4j: Update module, make compatible with neo4j 3.4
    @infinisil
    infinisil authored Jul 16, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f2632f5 View commit details

  23. pythonPackages.parsy: init at 1.2.0

    @milibopp
    milibopp committed Jul 16, 2018
    Copy the full SHA
    2977fb1 View commit details

  24. Merge pull request #43631 from aepsil0n/parsy/init 

    pythonPackages.parsy: init at 1.2.0
    @dotlambda
    dotlambda authored Jul 16, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ac7d8d2 View commit details
5 changes: 5 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -93,6 +93,11 @@
github = "adolfogc";
name = "Adolfo E. García Castro";
};
aepsil0n = {
email = "eduard.bopp@aepsil0n.de";
github = "aepsil0n";
name = "Eduard Bopp";
};
aespinosa = {
email = "allan.espinosa@outlook.com";
github = "aespinosa";
10 changes: 9 additions & 1 deletion nixos/modules/rename.nix
View file
Original file line number Diff line number Diff line change
@@ -37,7 +37,15 @@ with lib;
(mkRenamedOptionModule [ "services" "kubernetes" "addons" "dashboard" "enableRBAC" ] [ "services" "kubernetes" "addons" "dashboard" "rbac" "enable" ])
(mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ])
(mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
(mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])
(mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "defaultListenAddress" ])
(mkRenamedOptionModule [ "services" "neo4j" "listenAddress" ] [ "services" "neo4j" "defaultListenAddress" ])
(mkRenamedOptionModule [ "services" "neo4j" "enableBolt" ] [ "services" "neo4j" "bolt" "enable" ])
(mkRenamedOptionModule [ "services" "neo4j" "enableHttps" ] [ "services" "neo4j" "https" "enable" ])
(mkRenamedOptionModule [ "services" "neo4j" "certDir" ] [ "services" "neo4j" "directories" "certificates" ])
(mkRenamedOptionModule [ "services" "neo4j" "dataDir" ] [ "services" "neo4j" "directories" "home" ])
(mkRemovedOptionModule [ "services" "neo4j" "port" ] "Use services.neo4j.http.listenAddress instead.")
(mkRemovedOptionModule [ "services" "neo4j" "boltPort" ] "Use services.neo4j.bolt.listenAddress instead.")
(mkRemovedOptionModule [ "services" "neo4j" "httpsPort" ] "Use services.neo4j.https.listenAddress instead.")
(mkRenamedOptionModule [ "services" "shout" "host" ] [ "services" "shout" "listenAddress" ])
(mkRenamedOptionModule [ "services" "sslh" "host" ] [ "services" "sslh" "listenAddress" ])
(mkRenamedOptionModule [ "services" "statsd" "host" ] [ "services" "statsd" "listenAddress" ])
Loading