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: 10f9fb63f14f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2993b7e096d1
Choose a head ref
16 contributors

Commits on Jun 7, 2017

  1. zoom-us: init at 2.0.91373.0502 

    Actually, reintroduce after removal (bb99bab)
and use bundled Qt.
    @danbst
    danbst committed Jun 7, 2017
    Copy the full SHA
    e9da05e View commit details

  2. zoom-us: little fixes after review by @k0001

    @danbst
    danbst committed Jun 7, 2017
    Copy the full SHA
    7179b01 View commit details

  3. jetbrains.idea-ultimate: 2017.1.2 -> 2017.1.3

    @uskudnik
    uskudnik committed Jun 7, 2017
    Copy the full SHA
    df8837c View commit details

  4. Merge branch 'zoom-us' of git://github.com/danbst/nixpkgs

    @shlevy
    shlevy committed Jun 7, 2017
    Copy the full SHA
    5365166 View commit details

  5. tor-browser-bundle-bin: 6.5.2 -> 7.0 

    Now requires pulseaudio for audio playback.

https://blog.torproject.org/blog/tor-browser-70-released
    @joachifm
    joachifm committed Jun 7, 2017
    Copy the full SHA
    5b5f3f5 View commit details

  6. klavaro: fix meta (#26449)

    @oxij @joachifm
    oxij authored and joachifm committed Jun 7, 2017
    Copy the full SHA
    d69cdaa View commit details

  7. LTS Haskell 8.16

    @peti
    peti committed Jun 7, 2017
    Copy the full SHA
    905790c View commit details

  8. hackage-packages.nix: automatic Haskell package set update 

    This update was generated by hackage2nix v2.2.1-7-g2ed2e10 from Hackage revision
commercialhaskell/all-cabal-hashes@35d1e11.
    @peti
    peti committed Jun 7, 2017
    Copy the full SHA
    0b58fdb View commit details

  9. haskell-doctest: fix build with ghc-7.4.x

    @peti
    peti committed Jun 7, 2017
    Copy the full SHA
    f11d5c1 View commit details

  10. libretro: add parallel-n64 core

    @edwtjo
    edwtjo committed Jun 7, 2017
    Copy the full SHA
    44a9f37 View commit details

  11. slop: 4.1.16 -> 6.3.41

    @primeos
    primeos committed Jun 7, 2017
    Copy the full SHA
    02aa326 View commit details

  12. maim: 3.4.47 -> 5.4.63

    @primeos
    primeos committed Jun 7, 2017
    Copy the full SHA
    a745009 View commit details

Commits on Jun 8, 2017

  1. fzf: 0.16.7 -> 0.16.8

    @sigma
    sigma committed Jun 8, 2017
    Copy the full SHA
    3ac67c1 View commit details

  2. pythonPackages.Fabric: 1.10.2 -> 1.13.2

    @ericsagnes
    ericsagnes committed Jun 8, 2017
    Copy the full SHA
    4f4ba11 View commit details

  3. pythonPackages.Theano: 0.8.1 -> 0.9.0

    @ericsagnes
    ericsagnes committed Jun 8, 2017
    Copy the full SHA
    a8b9b9b View commit details

  4. Merge pull request #26465 from sigma/pr/fzf-0.16.8 

    fzf: 0.16.7 -> 0.16.8
    @Mic92
    Mic92 authored Jun 8, 2017
    Copy the full SHA
    0d437af View commit details

  5. vagrant: against libffi (#26440) 

    * Link vagrant against libffi

Vagrant requires libffi to run
with (vagrant-fsnotify)[https://github.com/adrienkohlbecker/vagrant-fsnotify].

* vagrant: nitpick
    @jgertm @Mic92
    jgertm authored and Mic92 committed Jun 8, 2017
    Copy the full SHA
    0576bda View commit details

  6. Merge pull request #26466 from ericsagnes/pkg-update/Fab 

    pythonPackages.Fabric: 1.10.2 -> 1.13.2
    @FRidh
    FRidh authored Jun 8, 2017
    Copy the full SHA
    a051c75 View commit details

  7. Merge pull request #26425 from uskudnik/idea-ultimate-minor-2017.1.3 

    idea.idea-ultimate: 2017.1.2 -> 2017.1.3
    @Mic92
    Mic92 authored Jun 8, 2017
    Copy the full SHA
    340b314 View commit details

  8. firefox-*-bin: updates (#26462) 

    * firefox-beta-bin: 51.0b8 -> 54.0b13

* firefox-devedition-bin: init at 54.0b14

Firefox DevEdition became a new product of Mozilla and is "repackaged"
Firefox Beta with its own release channel and six weeks release cycle as
other channels. It is no longer being built on nightly basis

* updated the update.nix script to facilitata firefox-devedition-bin

* disabling automatic updates by pointing to non existing channel

* f firefoxWrapper looks for gtk3 attribute to wrap the executable gtk3 to wrap the binary with needed ``XDG_DATA_DIRS``
    @garbas
    garbas authored Jun 8, 2017
    Copy the full SHA
    a0afc4f View commit details

  9. Merge pull request #26467 from ericsagnes/pkg-update/theano 

    pythonPackages.Theano: 0.8.1 -> 0.9.0
    @FRidh
    FRidh authored Jun 8, 2017
    Copy the full SHA
    50103e9 View commit details

  10. pkgs.python.astropy: init at 1.3.3

    @KentJames @FRidh
    KentJames authored and FRidh committed Jun 8, 2017
    Copy the full SHA
    3cb5d52 View commit details

  11. vboot_reference: fix evaluation after 1aac1fe

    @vcunat
    vcunat committed Jun 8, 2017
    Copy the full SHA
    8b49936 View commit details

  12. Merge branch 'master' into staging 

    >10k of rebuilds from master
    @vcunat
    vcunat committed Jun 8, 2017
    Copy the full SHA
    2993b7e View commit details
Showing with 2,764 additions and 1,484 deletions.
  1. +1 −0 lib/maintainers.nix
  2. +2 −2 pkgs/applications/editors/jetbrains/default.nix
  3. +389 −369 pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
  4. +11 −3 pkgs/applications/networking/browsers/firefox-bin/default.nix
  5. +945 −0 pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
  6. 0 pkgs/applications/networking/browsers/firefox-bin/{sources.nix → release_sources.nix}
  7. +12 −5 pkgs/applications/networking/browsers/firefox-bin/update.nix
  8. +7 −7 pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
  9. +92 −0 pkgs/applications/networking/instant-messengers/zoom-us/default.nix
  10. +5 −0 pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
  11. +46 −46 pkgs/development/haskell-modules/configuration-hackage2nix.yaml
  12. +1,085 −1,013 pkgs/development/haskell-modules/hackage-packages.nix
  13. +2 −2 pkgs/development/python-modules/Theano/theano-without-cuda/default.nix
  14. +32 −0 pkgs/development/python-modules/astropy/default.nix
  15. +8 −3 pkgs/development/tools/vagrant/default.nix
  16. +1 −1 pkgs/games/klavaro/default.nix
  17. +14 −0 pkgs/misc/emulators/retroarch/cores.nix
  18. +15 −8 pkgs/tools/graphics/maim/default.nix
  19. +2 −2 pkgs/tools/misc/fzf/default.nix
  20. +53 −8 pkgs/tools/misc/fzf/deps.nix
  21. +12 −8 pkgs/tools/misc/slop/default.nix
  22. +4 −5 pkgs/tools/system/vboot_reference/default.nix
  23. +22 −0 pkgs/top-level/all-packages.nix
  24. +4 −2 pkgs/top-level/python-packages.nix
1 change: 1 addition & 0 deletions lib/maintainers.nix
View file
Original file line number Diff line number Diff line change
@@ -269,6 +269,7 @@
kaiha = "Kai Harries <kai.harries@gmail.com>";
kamilchm = "Kamil Chmielewski <kamil.chm@gmail.com>";
kampfschlaefer = "Arnold Krille <arnold@arnoldarts.de>";
kentjames = "James Kent <jameschristopherkent@gmail.com";
kevincox = "Kevin Cox <kevincox@kevincox.ca>";
khumba = "Bryan Gardiner <bog@khumba.net>";
KibaFox = "Kiba Fox <kiba.fox@foxypossibilities.com>";
4 changes: 2 additions & 2 deletions pkgs/applications/editors/jetbrains/default.nix
View file
Original file line number Diff line number Diff line change
@@ -269,12 +269,12 @@ in

idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
version = "2017.1.2";
version = "2017.1.3";
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
sha256 = "03p5946j8m1v2ca21fz4cy4d90y6ksb8xcgd6ff7g15lg46hpjsm";
sha256 = "1gl62zrs3yxakgwbm29bv9z68jgy5ixc28zcagydx2h4j2b1fb19";
};
wmClass = "jetbrains-idea";
};
Loading