Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 4d1129828a7c8af8e75c54175141c009e6f0651f
      
https://github.com/NixOS/nixpkgs/commit/4d1129828a7c8af8e75c54175141c009e6f0651f
  Author: Domen Kožar <[email protected]>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M pkgs/development/web/nodejs/default.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  nodejs: 4.1.2 -> 4.2.2


  Commit: 3d02d332b0633dba21888de5fabac7cd412cf468
      
https://github.com/NixOS/nixpkgs/commit/3d02d332b0633dba21888de5fabac7cd412cf468
  Author: Domen Kožar <[email protected]>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  nodejs: use openssl_1_0_2 as only supported


  Commit: 505117f3fb261713d159a36f00b7aa7fae4e9bbe
      
https://github.com/NixOS/nixpkgs/commit/505117f3fb261713d159a36f00b7aa7fae4e9bbe
  Author: Domen Kožar <[email protected]>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M lib/maintainers.nix
    M nixos/modules/config/i18n.nix
    M nixos/modules/module-list.nix
    M nixos/modules/services/hardware/tlp.nix
    M nixos/modules/services/mail/postfix.nix
    M nixos/modules/services/networking/networkmanager.nix
    M nixos/modules/services/networking/quassel.nix
    M nixos/modules/services/networking/tlsdated.nix
    M nixos/modules/services/x11/redshift.nix
    A nixos/modules/services/x11/window-managers/clfswm.nix
    M nixos/modules/services/x11/window-managers/default.nix
    A nixos/modules/system/boot/initrd-network.nix
    M nixos/modules/system/boot/luksroot.nix
    M nixos/modules/system/boot/stage-1-init.sh
    M nixos/modules/system/boot/stage-1.nix
    M nixos/modules/tasks/kbd.nix
    M nixos/modules/virtualisation/virtualbox-host.nix
    R pkgs/applications/altcoins/darkcoin.nix
    A pkgs/applications/altcoins/dashpay.nix
    M pkgs/applications/altcoins/default.nix
    A pkgs/applications/audio/audio-recorder/default.nix
    A pkgs/applications/gis/grass/default.nix
    M pkgs/applications/gis/qgis/default.nix
    M pkgs/applications/misc/dmenu/default.nix
    R pkgs/applications/misc/grass/default.nix
    M pkgs/applications/misc/mediainfo-gui/default.nix
    M pkgs/applications/misc/mediainfo/default.nix
    M pkgs/applications/networking/mumble/default.nix
    M pkgs/applications/networking/seafile-client/default.nix
    M pkgs/applications/version-management/git-and-tools/tig/default.nix
    M pkgs/applications/video/popcorntime/default.nix
    A pkgs/applications/virtualization/tini/default.nix
    A pkgs/applications/window-managers/clfswm/default.nix
    A pkgs/applications/window-managers/clfswm/require-clx.patch
    M pkgs/build-support/build-fhs-chrootenv/env.nix
    M pkgs/build-support/nuke-references/builder.sh
    M pkgs/build-support/nuke-references/default.nix
    M pkgs/development/compilers/fsharp/default.nix
    M pkgs/development/compilers/go/1.4.nix
    M pkgs/development/compilers/go/1.5.nix
    M pkgs/development/compilers/mono/default.nix
    M pkgs/development/compilers/openjdk/7.nix
    M pkgs/development/compilers/openjdk/8.nix
    M pkgs/development/compilers/uhc/default.nix
    M pkgs/development/haskell-modules/configuration-hackage2nix.yaml
    M pkgs/development/haskell-modules/configuration-lts-0.0.nix
    M pkgs/development/haskell-modules/configuration-lts-0.1.nix
    M pkgs/development/haskell-modules/configuration-lts-0.2.nix
    M pkgs/development/haskell-modules/configuration-lts-0.3.nix
    M pkgs/development/haskell-modules/configuration-lts-0.4.nix
    M pkgs/development/haskell-modules/configuration-lts-0.5.nix
    M pkgs/development/haskell-modules/configuration-lts-0.6.nix
    M pkgs/development/haskell-modules/configuration-lts-0.7.nix
    M pkgs/development/haskell-modules/configuration-lts-1.0.nix
    M pkgs/development/haskell-modules/configuration-lts-1.1.nix
    M pkgs/development/haskell-modules/configuration-lts-1.10.nix
    M pkgs/development/haskell-modules/configuration-lts-1.11.nix
    M pkgs/development/haskell-modules/configuration-lts-1.12.nix
    M pkgs/development/haskell-modules/configuration-lts-1.13.nix
    M pkgs/development/haskell-modules/configuration-lts-1.14.nix
    M pkgs/development/haskell-modules/configuration-lts-1.15.nix
    M pkgs/development/haskell-modules/configuration-lts-1.2.nix
    M pkgs/development/haskell-modules/configuration-lts-1.4.nix
    M pkgs/development/haskell-modules/configuration-lts-1.5.nix
    M pkgs/development/haskell-modules/configuration-lts-1.7.nix
    M pkgs/development/haskell-modules/configuration-lts-1.8.nix
    M pkgs/development/haskell-modules/configuration-lts-1.9.nix
    M pkgs/development/haskell-modules/configuration-lts-2.0.nix
    M pkgs/development/haskell-modules/configuration-lts-2.1.nix
    M pkgs/development/haskell-modules/configuration-lts-2.10.nix
    M pkgs/development/haskell-modules/configuration-lts-2.11.nix
    M pkgs/development/haskell-modules/configuration-lts-2.12.nix
    M pkgs/development/haskell-modules/configuration-lts-2.13.nix
    M pkgs/development/haskell-modules/configuration-lts-2.14.nix
    M pkgs/development/haskell-modules/configuration-lts-2.15.nix
    M pkgs/development/haskell-modules/configuration-lts-2.16.nix
    M pkgs/development/haskell-modules/configuration-lts-2.17.nix
    M pkgs/development/haskell-modules/configuration-lts-2.18.nix
    M pkgs/development/haskell-modules/configuration-lts-2.19.nix
    M pkgs/development/haskell-modules/configuration-lts-2.2.nix
    M pkgs/development/haskell-modules/configuration-lts-2.20.nix
    M pkgs/development/haskell-modules/configuration-lts-2.21.nix
    M pkgs/development/haskell-modules/configuration-lts-2.22.nix
    M pkgs/development/haskell-modules/configuration-lts-2.3.nix
    M pkgs/development/haskell-modules/configuration-lts-2.4.nix
    M pkgs/development/haskell-modules/configuration-lts-2.5.nix
    M pkgs/development/haskell-modules/configuration-lts-2.6.nix
    M pkgs/development/haskell-modules/configuration-lts-2.7.nix
    M pkgs/development/haskell-modules/configuration-lts-2.8.nix
    M pkgs/development/haskell-modules/configuration-lts-2.9.nix
    M pkgs/development/haskell-modules/configuration-lts-3.0.nix
    M pkgs/development/haskell-modules/configuration-lts-3.1.nix
    M pkgs/development/haskell-modules/configuration-lts-3.10.nix
    M pkgs/development/haskell-modules/configuration-lts-3.11.nix
    M pkgs/development/haskell-modules/configuration-lts-3.12.nix
    A pkgs/development/haskell-modules/configuration-lts-3.13.nix
    M pkgs/development/haskell-modules/configuration-lts-3.2.nix
    M pkgs/development/haskell-modules/configuration-lts-3.3.nix
    M pkgs/development/haskell-modules/configuration-lts-3.4.nix
    M pkgs/development/haskell-modules/configuration-lts-3.5.nix
    M pkgs/development/haskell-modules/configuration-lts-3.6.nix
    M pkgs/development/haskell-modules/configuration-lts-3.7.nix
    M pkgs/development/haskell-modules/configuration-lts-3.8.nix
    M pkgs/development/haskell-modules/configuration-lts-3.9.nix
    M pkgs/development/haskell-modules/hackage-packages.nix
    M pkgs/development/interpreters/xulrunner/default.nix
    M pkgs/development/libraries/check/default.nix
    M pkgs/development/libraries/gnutls/generic.nix
    M pkgs/development/libraries/libidn/default.nix
    M pkgs/development/libraries/libmediainfo/default.nix
    M pkgs/development/libraries/libzen/default.nix
    M pkgs/development/libraries/openssl/1.0.2.x.nix
    M pkgs/development/libraries/openssl/default.nix
    M pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix
    M pkgs/development/libraries/rabbitmq-c/default.nix
    M pkgs/development/libraries/rdkafka/default.nix
    M pkgs/development/libraries/signon/default.nix
    M pkgs/development/libraries/signon/old.nix
    M pkgs/development/libraries/subunit/default.nix
    A pkgs/development/perl-modules/dbix-class-fix-52leaks.patch
    R pkgs/development/perl-modules/dbix-class-fix-tests.patch
    M pkgs/development/python-modules/pycairo/default.nix
    M pkgs/development/qtcreator/default.nix
    M pkgs/development/tools/analysis/flow/default.nix
    M pkgs/development/tools/build-managers/apache-maven/default.nix
    M pkgs/development/tools/build-managers/gradle/default.nix
    R pkgs/development/tools/exercism/default.nix
    M pkgs/development/tools/misc/dialog/default.nix
    A pkgs/development/tools/parse-cli-bin/default.nix
    M pkgs/games/dwarf-fortress/default.nix
    A pkgs/games/dwarf-fortress/dfhack-run.in
    A pkgs/games/dwarf-fortress/dwarf-fortress-hacked.in
    A pkgs/games/dwarf-fortress/dwarf-fortress.in
    A pkgs/games/dwarf-fortress/export-libs.sh.in
    A pkgs/games/dwarf-fortress/export-workaround.sh
    A pkgs/games/dwarf-fortress/install-df-data-content-to-home.sh
    A pkgs/games/dwarf-fortress/install-df-data-to-home.sh
    A pkgs/games/dwarf-fortress/install-dfhack-data-to-home.sh
    M pkgs/games/steam/chrootenv.nix
    M pkgs/misc/seafile-shared/default.nix
    M pkgs/os-specific/linux/android-udev-rules/default.nix
    M pkgs/os-specific/linux/fatrace/default.nix
    M pkgs/os-specific/linux/kernel/linux-4.1.nix
    M pkgs/os-specific/linux/kernel/linux-4.2.nix
    M pkgs/os-specific/linux/kernel/perf.nix
    M pkgs/os-specific/linux/kexectools/default.nix
    A pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix
    M pkgs/os-specific/linux/systemd/default.nix
    M pkgs/os-specific/linux/trinity/default.nix
    A pkgs/os-specific/linux/x86_energy_perf_policy/default.nix
    A pkgs/servers/http/gatling/default.nix
    A pkgs/servers/mail/postfix/3.0.nix
    M pkgs/servers/mpd/default.nix
    M pkgs/servers/unifi/default.nix
    M pkgs/servers/x11/xorg/default.nix
    M pkgs/tools/admin/awscli/default.nix
    M pkgs/tools/backup/obnam/default.nix
    M pkgs/tools/filesystems/exfat/default.nix
    M pkgs/tools/graphics/wkhtmltopdf/default.nix
    M pkgs/tools/misc/goaccess/default.nix
    M pkgs/tools/misc/rmlint/default.nix
    M pkgs/tools/misc/tlp/default.nix
    A pkgs/tools/misc/tmux-cssh/default.nix
    M pkgs/tools/misc/youtube-dl/default.nix
    M pkgs/tools/networking/dropbear/default.nix
    M pkgs/tools/networking/dropbear/pass-path.patch
    M pkgs/tools/networking/nbd/default.nix
    M pkgs/tools/networking/netsniff-ng/default.nix
    M pkgs/tools/networking/ntp/default.nix
    M pkgs/tools/security/tor/torbrowser.nix
    M pkgs/tools/system/iops/default.nix
    M pkgs/tools/system/rsyslog/default.nix
    M pkgs/tools/text/gist/Gemfile.lock
    M pkgs/tools/text/gist/default.nix
    M pkgs/tools/text/gist/gemset.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/dotnet-packages.nix
    M pkgs/top-level/emacs-packages.nix
    M pkgs/top-level/go-packages.nix
    M pkgs/top-level/haskell-packages.nix
    M pkgs/top-level/perl-packages.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  Merge branch 'master' into staging


  Commit: 2ee7aaf46b6c986e4b1ba171900ce56e1aaf8f60
      
https://github.com/NixOS/nixpkgs/commit/2ee7aaf46b6c986e4b1ba171900ce56e1aaf8f60
  Author: Thomas Strobel <[email protected]>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    A pkgs/os-specific/linux/miraclecast/default.nix

  Log Message:
  -----------
  miraclecast: init at 0.0-git-20151002

(cherry picked from commit 9e33e2365eeff59e9a25701dc2cf8dbcc38a9dc8)
Signed-off-by: Domen Kožar <[email protected]>


  Commit: 1616f131957b6354da3e56c3b29d185da2902864
      
https://github.com/NixOS/nixpkgs/commit/1616f131957b6354da3e56c3b29d185da2902864
  Author: Domen Kožar <[email protected]>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M pkgs/tools/security/knockknock/default.nix

  Log Message:
  -----------
  knockknock: fix build


  Commit: 0ba740d26b3e851a181034d8650ece94163d0fae
      
https://github.com/NixOS/nixpkgs/commit/0ba740d26b3e851a181034d8650ece94163d0fae
  Author: William A. Kennington III <[email protected]>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M pkgs/development/libraries/mesa/default.nix

  Log Message:
  -----------
  mesa: 11.0.4 -> 11.0.5


  Commit: 8f45d18a71fec8f2585c01b94a8b653a8894da69
      
https://github.com/NixOS/nixpkgs/commit/8f45d18a71fec8f2585c01b94a8b653a8894da69
  Author: William A. Kennington III <[email protected]>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    M lib/maintainers.nix
    M nixos/modules/module-list.nix
    M nixos/modules/services/hardware/actkbd.nix
    M nixos/modules/services/misc/autofs.nix
    M nixos/modules/services/misc/ihaskell.nix
    M nixos/modules/services/x11/display-managers/gdm.nix
    M nixos/modules/services/x11/window-managers/xmonad.nix
    A pkgs/applications/graphics/imv/default.nix
    M pkgs/applications/kde-apps-15.08/fetchsrcs.sh
    M pkgs/applications/kde-apps-15.08/srcs.nix
    M pkgs/applications/misc/calibre/default.nix
    A pkgs/applications/misc/zscroll/default.nix
    A pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
    A pkgs/applications/networking/remote/citrix-receiver/default.nix
    M pkgs/applications/video/clipgrab/default.nix
    A pkgs/applications/video/mkcast/default.nix
    M pkgs/applications/window-managers/dwm/default.nix
    M pkgs/build-support/libredirect/libredirect.c
    M pkgs/desktops/plasma-5.4/fetchsrcs.sh
    M pkgs/desktops/plasma-5.4/srcs.nix
    M pkgs/desktops/xfce/core/libxfce4ui.nix
    M pkgs/desktops/xfce/core/xfce4-panel.nix
    M pkgs/desktops/xfce/default.nix
    A pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix
    M pkgs/development/haskell-modules/configuration-common.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
    M pkgs/development/haskell-modules/configuration-ghcjs.nix
    M pkgs/development/haskell-modules/configuration-lts-0.0.nix
    M pkgs/development/haskell-modules/configuration-lts-0.1.nix
    M pkgs/development/haskell-modules/configuration-lts-0.2.nix
    M pkgs/development/haskell-modules/configuration-lts-0.3.nix
    M pkgs/development/haskell-modules/configuration-lts-0.4.nix
    M pkgs/development/haskell-modules/configuration-lts-0.5.nix
    M pkgs/development/haskell-modules/configuration-lts-0.6.nix
    M pkgs/development/haskell-modules/configuration-lts-0.7.nix
    M pkgs/development/haskell-modules/configuration-lts-1.0.nix
    M pkgs/development/haskell-modules/configuration-lts-1.1.nix
    M pkgs/development/haskell-modules/configuration-lts-1.10.nix
    M pkgs/development/haskell-modules/configuration-lts-1.11.nix
    M pkgs/development/haskell-modules/configuration-lts-1.12.nix
    M pkgs/development/haskell-modules/configuration-lts-1.13.nix
    M pkgs/development/haskell-modules/configuration-lts-1.14.nix
    M pkgs/development/haskell-modules/configuration-lts-1.15.nix
    M pkgs/development/haskell-modules/configuration-lts-1.2.nix
    M pkgs/development/haskell-modules/configuration-lts-1.4.nix
    M pkgs/development/haskell-modules/configuration-lts-1.5.nix
    M pkgs/development/haskell-modules/configuration-lts-1.7.nix
    M pkgs/development/haskell-modules/configuration-lts-1.8.nix
    M pkgs/development/haskell-modules/configuration-lts-1.9.nix
    M pkgs/development/haskell-modules/configuration-lts-2.0.nix
    M pkgs/development/haskell-modules/configuration-lts-2.1.nix
    M pkgs/development/haskell-modules/configuration-lts-2.10.nix
    M pkgs/development/haskell-modules/configuration-lts-2.11.nix
    M pkgs/development/haskell-modules/configuration-lts-2.12.nix
    M pkgs/development/haskell-modules/configuration-lts-2.13.nix
    M pkgs/development/haskell-modules/configuration-lts-2.14.nix
    M pkgs/development/haskell-modules/configuration-lts-2.15.nix
    M pkgs/development/haskell-modules/configuration-lts-2.16.nix
    M pkgs/development/haskell-modules/configuration-lts-2.17.nix
    M pkgs/development/haskell-modules/configuration-lts-2.18.nix
    M pkgs/development/haskell-modules/configuration-lts-2.19.nix
    M pkgs/development/haskell-modules/configuration-lts-2.2.nix
    M pkgs/development/haskell-modules/configuration-lts-2.20.nix
    M pkgs/development/haskell-modules/configuration-lts-2.21.nix
    M pkgs/development/haskell-modules/configuration-lts-2.22.nix
    M pkgs/development/haskell-modules/configuration-lts-2.3.nix
    M pkgs/development/haskell-modules/configuration-lts-2.4.nix
    M pkgs/development/haskell-modules/configuration-lts-2.5.nix
    M pkgs/development/haskell-modules/configuration-lts-2.6.nix
    M pkgs/development/haskell-modules/configuration-lts-2.7.nix
    M pkgs/development/haskell-modules/configuration-lts-2.8.nix
    M pkgs/development/haskell-modules/configuration-lts-2.9.nix
    M pkgs/development/haskell-modules/configuration-lts-3.0.nix
    M pkgs/development/haskell-modules/configuration-lts-3.1.nix
    M pkgs/development/haskell-modules/configuration-lts-3.10.nix
    M pkgs/development/haskell-modules/configuration-lts-3.11.nix
    M pkgs/development/haskell-modules/configuration-lts-3.12.nix
    M pkgs/development/haskell-modules/configuration-lts-3.13.nix
    M pkgs/development/haskell-modules/configuration-lts-3.2.nix
    M pkgs/development/haskell-modules/configuration-lts-3.3.nix
    M pkgs/development/haskell-modules/configuration-lts-3.4.nix
    M pkgs/development/haskell-modules/configuration-lts-3.5.nix
    M pkgs/development/haskell-modules/configuration-lts-3.6.nix
    M pkgs/development/haskell-modules/configuration-lts-3.7.nix
    M pkgs/development/haskell-modules/configuration-lts-3.8.nix
    M pkgs/development/haskell-modules/configuration-lts-3.9.nix
    M pkgs/development/haskell-modules/hackage-packages.nix
    M pkgs/development/libraries/CGAL/default.nix
    M pkgs/development/libraries/ffmpeg-full/default.nix
    M pkgs/development/libraries/libdc1394/default.nix
    M pkgs/development/libraries/libevdev/default.nix
    M pkgs/development/libraries/libgksu/default.nix
    M pkgs/development/libraries/libpsl/default.nix
    M pkgs/development/libraries/libsndfile/default.nix
    M pkgs/development/libraries/wavpack/default.nix
    M pkgs/development/ocaml-modules/menhir/default.nix
    A pkgs/development/ocaml-modules/menhir/generic.nix
    M pkgs/development/tools/continuous-integration/jenkins/default.nix
    M pkgs/development/tools/misc/strace/default.nix
    A pkgs/games/macopix/default.nix
    M pkgs/games/steam/chrootenv.nix
    M pkgs/misc/emulators/wine/versions.nix
    M pkgs/os-specific/linux/kernel/common-config.nix
    M pkgs/servers/dns/nsd/default.nix
    M pkgs/servers/nosql/hyperdex/busybee.nix
    M pkgs/servers/nosql/hyperdex/default.nix
    M pkgs/servers/nosql/hyperdex/hyperleveldb.nix
    M pkgs/servers/nosql/hyperdex/libe.nix
    M pkgs/servers/nosql/hyperdex/libmacaroons.nix
    M pkgs/servers/nosql/hyperdex/libpo6.nix
    M pkgs/servers/nosql/hyperdex/replicant.nix
    M pkgs/servers/x11/xorg/default.nix
    M pkgs/tools/archivers/innoextract/default.nix
    M pkgs/tools/filesystems/fuse-7z-ng/default.nix
    A pkgs/tools/filesystems/snapraid/default.nix
    M pkgs/tools/misc/hdf5/default.nix
    A pkgs/tools/networking/whois/default.nix
    M pkgs/tools/security/mkpasswd/default.nix
    M pkgs/tools/security/pcsclite/default.nix
    M pkgs/tools/security/pcsctools/default.nix
    M pkgs/tools/system/bootchart/default.nix
    M pkgs/tools/system/fio/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/emacs-packages.nix
    M pkgs/top-level/perl-packages.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  Merge branch 'master.upstream' into staging.upstream


  Commit: cdf65ba19e4c72933bdc3e59a35bea65da41d161
      
https://github.com/NixOS/nixpkgs/commit/cdf65ba19e4c72933bdc3e59a35bea65da41d161
  Author: William A. Kennington III <[email protected]>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    M pkgs/development/libraries/gtk+/3.x.nix

  Log Message:
  -----------
  gtk3: 3.18.3 -> 3.18.4


  Commit: 050bebb8c47051b8d7de3dfee5807f11c9baff69
      
https://github.com/NixOS/nixpkgs/commit/050bebb8c47051b8d7de3dfee5807f11c9baff69
  Author: William A. Kennington III <[email protected]>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    M pkgs/development/tools/build-managers/cmake/default.nix

  Log Message:
  -----------
  cmake: 3.3.2 -> 3.4.0


  Commit: 15913feb97f4ddd79034cb3fd0a649ee47baa7a2
      
https://github.com/NixOS/nixpkgs/commit/15913feb97f4ddd79034cb3fd0a649ee47baa7a2
  Author: Domen Kožar <[email protected]>
  Date:   2015-11-14 (Sat, 14 Nov 2015)

  Changed paths:
    M pkgs/tools/networking/network-manager/0.9.8.nix

  Log Message:
  -----------
  networkmanager098: add libgudev


  Commit: 5e21f4e20bd1905c16488294eefeb9eb4a682953
      
https://github.com/NixOS/nixpkgs/commit/5e21f4e20bd1905c16488294eefeb9eb4a682953
  Author: Domen Kožar <[email protected]>
  Date:   2015-11-14 (Sat, 14 Nov 2015)

  Changed paths:
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  fix cython build


  Commit: b87dad2839341c90e3f8fd21c5449f5ce78ba441
      
https://github.com/NixOS/nixpkgs/commit/b87dad2839341c90e3f8fd21c5449f5ce78ba441
  Author: Domen Kožar <[email protected]>
  Date:   2015-11-14 (Sat, 14 Nov 2015)

  Changed paths:
    M pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix

  Log Message:
  -----------
  cheese: libgudev


  Commit: fc8562c78590f269d9bf35f64ec21bdc5b3612c5
      
https://github.com/NixOS/nixpkgs/commit/fc8562c78590f269d9bf35f64ec21bdc5b3612c5
  Author: Domen Kožar <[email protected]>
  Date:   2015-11-14 (Sat, 14 Nov 2015)

  Changed paths:
    M pkgs/os-specific/linux/udisks/1-default.nix

  Log Message:
  -----------
  udisks: add missing libgudev


  Commit: 453f7c7218dfb5788f91f9cecae4a4d3cf650af6
      
https://github.com/NixOS/nixpkgs/commit/453f7c7218dfb5788f91f9cecae4a4d3cf650af6
  Author: William A. Kennington III <[email protected]>
  Date:   2015-11-14 (Sat, 14 Nov 2015)

  Changed paths:
    M doc/haskell-users-guide.md
    M lib/maintainers.nix
    M nixos/modules/services/mail/opensmtpd.nix
    M nixos/modules/services/networking/networkmanager.nix
    M nixos/modules/services/web-servers/lighttpd/default.nix
    M nixos/modules/tasks/network-interfaces.nix
    M pkgs/applications/audio/audacity/default.nix
    A pkgs/applications/audio/jackmix/default.nix
    M pkgs/applications/display-managers/lightdm/default.nix
    M pkgs/applications/graphics/gimp/plugins/default.nix
    M pkgs/applications/graphics/hugin/default.nix
    M pkgs/applications/networking/ids/daq/default.nix
    A pkgs/applications/networking/iptraf-ng/default.nix
    M pkgs/applications/version-management/git-and-tools/git-hub/default.nix
    M pkgs/applications/version-management/subversion/default.nix
    M pkgs/applications/video/smplayer/default.nix
    M pkgs/build-support/build-fhs-chrootenv/env.nix
    M pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
    M pkgs/development/libraries/glpk/default.nix
    M pkgs/development/libraries/libdnet/default.nix
    R pkgs/development/libraries/libunwind/native.nix
    M pkgs/development/libraries/neon/default.nix
    A pkgs/development/web/nodejs/default-arch.patch
    M pkgs/development/web/nodejs/default.nix
    M pkgs/development/web/nodejs/no-xcode.patch
    A pkgs/development/web/nodejs/pkg-libpath.patch
    M pkgs/development/web/nodejs/v0_10.nix
    M pkgs/misc/jackaudio/jack1.nix
    A pkgs/misc/urbit/default.nix
    M pkgs/os-specific/linux/nvidiabl/default.nix
    A pkgs/os-specific/linux/nvidiabl/linux4compat.patch
    M pkgs/os-specific/linux/pommed/default.nix
    M pkgs/os-specific/linux/syslinux/default.nix
    R pkgs/os-specific/linux/syslinux/gcc5-fix.patch
    M pkgs/servers/mail/opensmtpd/default.nix
    A pkgs/servers/mail/opensmtpd/extras.nix
    A pkgs/servers/mail/opensmtpd/proc_path.diff
    M pkgs/tools/filesystems/duff/default.nix
    M pkgs/tools/graphics/enblend-enfuse/default.nix
    A pkgs/tools/misc/heatseeker/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/emacs-packages.nix
    M pkgs/top-level/go-packages.nix
    M pkgs/top-level/perl-packages.nix

  Log Message:
  -----------
  Merge branch 'master.upstream' into staging.upstream


  Commit: 5a16c0e6e4a547c7bdc99f8534b2e643744e0281
      
https://github.com/NixOS/nixpkgs/commit/5a16c0e6e4a547c7bdc99f8534b2e643744e0281
  Author: Domen Kožar <[email protected]>
  Date:   2015-11-15 (Sun, 15 Nov 2015)

  Changed paths:
    M pkgs/development/python-modules/generic/default.nix

  Log Message:
  -----------
  buildPythonPackage: clean up shellHook


  Commit: b666ac3e9ff3f08b120d068770768be580e67f76
      
https://github.com/NixOS/nixpkgs/commit/b666ac3e9ff3f08b120d068770768be580e67f76
  Author: Domen Kožar <[email protected]>
  Date:   2015-11-15 (Sun, 15 Nov 2015)

  Changed paths:
    M pkgs/development/python-modules/generic/default.nix

  Log Message:
  -----------
  Revert "python: skip build at install phase"

This reverts commit d34f5b657051e268e41084e9751996d16f7f0a1a.

PIL and NumPy don't like this change and I'd rather spend time on
bringing wheels to Nix than fixing old infrastructure.


  Commit: 4755afc3857d9e57cd0544038313c75af0c80b22
      
https://github.com/NixOS/nixpkgs/commit/4755afc3857d9e57cd0544038313c75af0c80b22
  Author: Domen Kožar <[email protected]>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix
    M pkgs/development/libraries/gtk+/3.x.nix
    M pkgs/development/libraries/mesa/default.nix
    M pkgs/development/python-modules/generic/default.nix
    M pkgs/development/tools/build-managers/cmake/default.nix
    M pkgs/development/web/nodejs/default.nix
    M pkgs/os-specific/linux/udisks/1-default.nix
    M pkgs/tools/networking/network-manager/0.9.8.nix
    M pkgs/tools/security/knockknock/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/python-packages.nix

  Log Message:
  -----------
  Merge commit 'b666ac3e9ff3f08b120d068770768be580e67f76' (staging)

Merge rest of the fixes from staging


Compare: https://github.com/NixOS/nixpkgs/compare/2cb80f7fbca3...4755afc3857d
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to