Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 79321fbecdf9c20c83f2275a8162455ceda2159e
      
https://github.com/NixOS/nixpkgs/commit/79321fbecdf9c20c83f2275a8162455ceda2159e
  Author: Perry Barnoy <[email protected]>
  Date:   2015-10-14 (Wed, 14 Oct 2015)

  Changed paths:
    M lib/maintainers.nix

  Log Message:
  -----------
  - Added myself as a maintainer
- Boilerplate whiskermenu expression


  Commit: 3d087ed3b1745a591bf54bbef847b9902961e625
      
https://github.com/NixOS/nixpkgs/commit/3d087ed3b1745a591bf54bbef847b9902961e625
  Author: Perry Barnoy <[email protected]>
  Date:   2015-10-14 (Wed, 14 Oct 2015)

  Changed paths:
    M lib/maintainers.nix
    M lib/modules.nix
    M nixos/modules/config/users-groups.nix
    M nixos/modules/rename.nix
    M nixos/modules/services/misc/synergy.nix
    M nixos/modules/services/networking/copy-com.nix
    M nixos/modules/system/boot/loader/grub/grub.nix
    M nixos/modules/system/boot/systemd.nix
    M nixos/modules/tasks/filesystems/nfs.nix
    M nixos/release-combined.nix
    M pkgs/applications/audio/ardour/default.nix
    A pkgs/applications/audio/meterbridge/buf_rect.patch
    A pkgs/applications/audio/meterbridge/default.nix
    M pkgs/applications/backup/crashplan/default.nix
    M pkgs/applications/editors/neovim/default.nix
    M pkgs/applications/graphics/simple-scan/default.nix
    M pkgs/applications/misc/hamster-time-tracker/default.nix
    M pkgs/applications/misc/synapse/default.nix
    A pkgs/applications/misc/wcalc/default.nix
    M pkgs/applications/networking/instant-messengers/baresip/default.nix
    M pkgs/applications/networking/instant-messengers/gajim/default.nix
    M pkgs/applications/networking/instant-messengers/teamspeak/client.nix
    M pkgs/applications/office/libreoffice/default.nix
    M pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
    A pkgs/data/fonts/culmus/default.nix
    M pkgs/data/misc/geolite-legacy/default.nix
    M pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
    M pkgs/development/haskell-modules/configuration-common.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.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/glfw/3.x.nix
    M pkgs/development/libraries/libmicrohttpd/default.nix
    M pkgs/development/libraries/libpsl/default.nix
    M pkgs/development/ocaml-modules/alcotest/default.nix
    M pkgs/development/ocaml-modules/cmdliner/default.nix
    M pkgs/development/ocaml-modules/gg/default.nix
    M pkgs/development/tools/build-managers/sbt/default.nix
    A pkgs/development/tools/literate-programming/nuweb/default.nix
    M pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
    M pkgs/development/tools/ocaml/ocp-indent/default.nix
    M pkgs/development/tools/ocaml/ocp-index/default.nix
    M pkgs/development/tools/profiling/oprofile/default.nix
    M pkgs/development/tools/slimerjs/default.nix
    M pkgs/games/scrolls/default.nix
    A pkgs/os-specific/linux/alsa-tools/default.nix
    M pkgs/os-specific/linux/eudev/default.nix
    M pkgs/os-specific/linux/kernel/linux-testing.nix
    M pkgs/os-specific/linux/syslinux/default.nix
    M pkgs/tools/backup/borg/default.nix
    A pkgs/tools/filesystems/djmount/default.nix
    M pkgs/tools/filesystems/yandex-disk/default.nix
    M pkgs/tools/misc/goaccess/default.nix
    M pkgs/tools/misc/less/default.nix
    M pkgs/tools/networking/netsniff-ng/default.nix
    M pkgs/tools/networking/reaver-wps/default.nix
    M pkgs/tools/security/john/default.nix
    M pkgs/tools/system/dd_rescue/default.nix
    M pkgs/top-level/all-packages.nix
    M pkgs/top-level/go-packages.nix
    M pkgs/top-level/make-tarball.nix
    M pkgs/top-level/perl-packages.nix

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into xfce4-whiskermenu-plugin

Merge upstream.


  Commit: a60b53088d3f4304b66b38f67410b412cb5b3c4e
      
https://github.com/NixOS/nixpkgs/commit/a60b53088d3f4304b66b38f67410b412cb5b3c4e
  Author: Perry Barnoy <[email protected]>
  Date:   2015-10-19 (Mon, 19 Oct 2015)

  Changed paths:
    M pkgs/desktops/xfce/default.nix

  Log Message:
  -----------
  Added the xfce4-whiskermenu-plugin


  Commit: 3d1797160fa67aa9ecbb9f0cb0c3ee5c96f7ac0d
      
https://github.com/NixOS/nixpkgs/commit/3d1797160fa67aa9ecbb9f0cb0c3ee5c96f7ac0d
  Author: Perry Barnoy <[email protected]>
  Date:   2015-10-19 (Mon, 19 Oct 2015)

  Changed paths:
    A pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix

  Log Message:
  -----------
  Created the xfce4-whiskermenu-plugin expression.


  Commit: 7df323125ff7cc8421f552374ff3ab1b0c6ccc89
      
https://github.com/NixOS/nixpkgs/commit/7df323125ff7cc8421f552374ff3ab1b0c6ccc89
  Author: Perry Barnoy <[email protected]>
  Date:   2015-10-19 (Mon, 19 Oct 2015)

  Changed paths:
    M default.nix
    M lib/maintainers.nix
    M nixos/modules/installer/tools/nixos-generate-config.pl
    M nixos/modules/services/networking/asterisk.nix
    M pkgs/applications/audio/ardour/default.nix
    M pkgs/applications/audio/kid3/default.nix
    M pkgs/applications/audio/musescore/default.nix
    M pkgs/applications/editors/eclipse/plugins.nix
    A pkgs/applications/editors/emacs-modes/markdown-mode/default.nix
    M pkgs/applications/editors/neovim/default.nix
    M pkgs/applications/graphics/pencil/default.nix
    M pkgs/applications/graphics/yed/default.nix
    M pkgs/applications/misc/calibre/default.nix
    M pkgs/applications/misc/electrum/default.nix
    M pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
    M pkgs/applications/misc/rxvt_unicode/default.nix
    M pkgs/applications/misc/vue/default.nix
    M pkgs/applications/networking/browsers/chromium/source/sources.nix
    M pkgs/applications/networking/browsers/firefox-bin/sources.nix
    M pkgs/applications/networking/browsers/firefox/default.nix
    M 
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
    M pkgs/applications/networking/feedreaders/rsstail/default.nix
    M pkgs/applications/networking/yafc/default.nix
    M pkgs/applications/version-management/git-and-tools/git/default.nix
    M pkgs/applications/video/kodi/default.nix
    M pkgs/applications/virtualization/virt-manager/default.nix
    M pkgs/applications/window-managers/i3/default.nix
    M pkgs/build-support/build-fhs-chrootenv/env.nix
    M pkgs/build-support/grsecurity/default.nix
    A pkgs/data/fonts/gdouros/default.nix
    A pkgs/data/fonts/hanazono/default.nix
    A pkgs/data/fonts/kawkab-mono/default.nix
    M pkgs/data/fonts/lohit-fonts/default.nix
    A pkgs/data/fonts/marathi-cursive/default.nix
    A pkgs/data/fonts/mro-unicode/default.nix
    A pkgs/data/fonts/oldsindhi/default.nix
    A pkgs/data/fonts/paratype-pt/mono.nix
    A pkgs/data/fonts/paratype-pt/sans.nix
    A pkgs/data/fonts/paratype-pt/serif.nix
    A pkgs/data/fonts/sampradaya/default.nix
    A pkgs/data/fonts/signwriting/default.nix
    R pkgs/data/fonts/symbola/default.nix
    A pkgs/data/fonts/tai-languages/default.nix
    A pkgs/data/fonts/unifont_upper/default.nix
    M pkgs/data/misc/geolite-legacy/default.nix
    M pkgs/development/compilers/ghcjs/default.nix
    A pkgs/development/compilers/ghcjs/ghcjs-boot.nix
    A pkgs/development/compilers/ghcjs/shims.nix
    M pkgs/development/compilers/llvm/3.3/llvm.nix
    M pkgs/development/compilers/llvm/3.4/llvm.nix
    M pkgs/development/compilers/llvm/3.5/llvm.nix
    M pkgs/development/compilers/llvm/3.6/llvm.nix
    M pkgs/development/compilers/llvm/3.7/llvm.nix
    M pkgs/development/compilers/rustc/generic.nix
    M pkgs/development/compilers/rustc/head.nix
    M pkgs/development/compilers/uhc/default.nix
    M pkgs/development/haskell-modules/configuration-common.nix
    M pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
    M pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
    M pkgs/development/haskell-modules/configuration-ghcjs.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
    A pkgs/development/haskell-modules/configuration-lts-3.10.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/ruby/default.nix
    M pkgs/development/libraries/cppzmq/default.nix
    M pkgs/development/libraries/folly/default.nix
    M pkgs/development/libraries/gdk-pixbuf/default.nix
    M pkgs/development/libraries/libbluray/default.nix
    M pkgs/development/libraries/libressl/default.nix
    M pkgs/development/libraries/libtermkey/default.nix
    M pkgs/development/libraries/mbedtls/default.nix
    M pkgs/development/libraries/science/math/ipopt/default.nix
    M pkgs/development/libraries/spice-protocol/default.nix
    M pkgs/development/libraries/spice/default.nix
    M pkgs/development/mobile/androidenv/addon.xml
    M pkgs/development/mobile/androidenv/addons.nix
    M pkgs/development/mobile/androidenv/androidndk.nix
    M pkgs/development/mobile/androidenv/androidsdk.nix
    M pkgs/development/mobile/androidenv/build-tools.nix
    M pkgs/development/mobile/androidenv/default.nix
    M pkgs/development/mobile/androidenv/platform-tools.nix
    M pkgs/development/mobile/androidenv/support-repository.nix
    M pkgs/development/mobile/androidenv/support.nix
    M pkgs/development/ocaml-modules/ctypes/default.nix
    M pkgs/development/ocaml-modules/eliom/default.nix
    A pkgs/development/ocaml-modules/llvm/default.nix
    A pkgs/development/ocaml-modules/x509/default.nix
    M pkgs/development/tools/analysis/flow/default.nix
    M pkgs/development/tools/continuous-integration/jenkins/default.nix
    M pkgs/development/tools/heroku/default.nix
    M pkgs/development/tools/rust/rustfmt/default.nix
    M pkgs/development/web/nodejs/v0_10.nix
    M pkgs/games/crawl/default.nix
    M pkgs/games/gnuchess/default.nix
    M pkgs/games/onscripter-en/default.nix
    M pkgs/games/xonotic/default.nix
    M pkgs/misc/apulse/default.nix
    M pkgs/misc/emulators/wine/versions.nix
    M pkgs/misc/vim-plugins/default.nix
    M pkgs/os-specific/darwin/apple-sdk/default.nix
    M 
pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix
    M 
pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix
    M 
pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix
    M 
pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix
    M 
pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix
    M pkgs/os-specific/darwin/security-tool/default.nix
    M pkgs/os-specific/linux/android-udev-rules/default.nix
    M pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
    M pkgs/os-specific/linux/kernel/linux-3.12.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/patches.nix
    A pkgs/os-specific/linux/pam_pgsql/default.nix
    A pkgs/os-specific/linux/powertop/auto-tune.patch
    M pkgs/os-specific/linux/powertop/default.nix
    M pkgs/servers/asterisk/default.nix
    M pkgs/servers/http/apache-httpd/2.4.nix
    M pkgs/servers/nosql/cassandra/2.1.nix
    M pkgs/servers/nosql/mongodb/default.nix
    M pkgs/servers/uwsgi/default.nix
    M pkgs/servers/x11/xorg/default.nix
    M pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
    M pkgs/servers/x11/xorg/overrides.nix
    M pkgs/servers/x11/xorg/tarballs-7.7.list
    M pkgs/stdenv/default.nix
    M pkgs/stdenv/pure-darwin/default.nix
    A pkgs/tools/X11/dex/default.nix
    A pkgs/tools/X11/numlockx/default.nix
    M pkgs/tools/bootloaders/refind/default.nix
    M pkgs/tools/filesystems/btrfsprogs/default.nix
    M pkgs/tools/filesystems/ceph/0.94.nix
    M pkgs/tools/filesystems/ceph/dev.nix
    M pkgs/tools/filesystems/ceph/generic.nix
    M pkgs/tools/filesystems/ceph/git.nix
    A pkgs/tools/filesystems/fuse-7z-ng/default.nix
    A pkgs/tools/graphics/leela/default.nix
    M pkgs/tools/misc/grub/2.0x.nix
    A pkgs/tools/misc/grub4dos/default.nix
    M pkgs/tools/misc/picocom/default.nix
    M pkgs/tools/misc/sdl-jstest/default.nix
    M pkgs/tools/misc/svtplay-dl/default.nix
    M pkgs/tools/misc/tlp/default.nix
    M pkgs/tools/networking/netsniff-ng/default.nix
    M pkgs/tools/networking/openvpn/update-resolv-conf.nix
    M pkgs/tools/networking/ripmime/default.nix
    M pkgs/tools/networking/zerotierone/default.nix
    M pkgs/tools/security/chkrootkit/default.nix
    M pkgs/tools/security/eid-mw/default.nix
    M pkgs/tools/security/gnupg/21.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/python-packages.nix
    M pkgs/top-level/rust-packages.nix

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/NixOS/nixpkgs into 
xfce4-whiskermenu-plugin

Pull from nixpkgs/master to resolve Travis CI build conflicts.


  Commit: 5fa113faa8d0cefc9b250b687044678af9f7d1d2
      
https://github.com/NixOS/nixpkgs/commit/5fa113faa8d0cefc9b250b687044678af9f7d1d2
  Author: Domen Kožar <[email protected]>
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
    M lib/maintainers.nix
    M pkgs/desktops/xfce/default.nix
    A pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix

  Log Message:
  -----------
  Merge pull request #10483 from pjbarnoy/xfce4-whiskermenu-plugin

xfce4-whiskermenu-plugin


Compare: https://github.com/NixOS/nixpkgs/compare/f608644c23cf...5fa113faa8d0
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to