diff options
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 83 |
3 files changed, 84 insertions, 17 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72355e8a7e42..d5f1791f355e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1099,6 +1099,8 @@ in mdf2iso = callPackage ../tools/cd-dvd/mdf2iso { }; + nrg2iso = callPackage ../tools/cd-dvd/nrg2iso { }; + libceph = ceph.lib; ceph = callPackage ../tools/filesystems/ceph { boost = boost159; }; ceph-dev = ceph; @@ -1880,6 +1882,10 @@ in stdenv = overrideCC stdenv gcc49; }; + gnome15 = callPackage ../applications/misc/gnome15 { + inherit (gnome2) gnome_python gnome_python_desktop; + }; + gnokii = callPackage ../tools/misc/gnokii { }; gnuapl = callPackage ../development/interpreters/gnu-apl { }; @@ -14809,6 +14815,8 @@ in ssr = callPackage ../applications/audio/soundscape-renderer {}; + ssrc = callPackage ../applications/audio/ssrc { }; + stalonetray = callPackage ../applications/window-managers/stalonetray {}; stp = callPackage ../applications/science/logic/stp {}; @@ -17656,11 +17664,7 @@ in xcftools = callPackage ../tools/graphics/xcftools { }; - xhyve = callPackage ../applications/virtualization/xhyve { - inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet; - inherit (darwin.apple_sdk.libs) xpc; - inherit (darwin) libobjc; - }; + xhyve = callPackage ../applications/virtualization/xhyve { }; xinput_calibrator = callPackage ../tools/X11/xinput_calibrator { }; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 658f149908c7..db3abb531f19 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -49,8 +49,8 @@ in let # reasonable default. platform = args.platform - or (config.platform - or (import ./platforms.nix).selectPlatformBySystem system); + or ( config.platform + or ((import ./platforms.nix).selectPlatformBySystem system) ); # A few packages make a new package set to draw their dependencies from. # (Currently to get a cross tool chain, or forced-i686 package.) Rather than diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a03b5a8168ae..53d27af0dd26 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -729,6 +729,27 @@ in { }; }; + python-uinput = buildPythonPackage rec { + name = "python-uinput-${version}"; + version = "0.11.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/python-uinput/${name}.tar.gz"; + sha256 = "033zqiypjz0nigav6vz0s57pbzikvds55mxphrdpkdbpdikjnfcr"; + }; + + buildInputs = [ pkgs.udev ]; + + NIX_CFLAGS_LINK = [ "-ludev" ]; + + meta = with stdenv.lib; { + description = "Pythonic API to Linux uinput kernel module"; + homepage = "http://tjjr.fi/sw/python-uinput/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ abbradar ]; + }; + }; + almir = buildPythonPackage rec { name = "almir-0.1.8"; @@ -3059,12 +3080,12 @@ in { }; bottle = buildPythonPackage rec { - version = "0.12.9"; + version = "0.12.11"; name = "bottle-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/b/bottle/${name}.tar.gz"; - sha256 = "0l80a1qkg7zbi8s077brfgm5w4ypwxgq9rvsvw16snc5jfsj82py"; + sha256 = "0cd787lzggs933qfav6xicx5c78dz6npwgg3xc4rhah44nbqz5d1"; }; propagatedBuildInputs = with self; [ setuptools ]; @@ -8870,12 +8891,9 @@ in { sha256 = "1rwmajsy9qhl3qhhy5mw0xmr3n8abxcq8baidpn0sxv6yjg2369z"; }; - # Disable certain tests. Reported upstream at: - # https://github.com/jflesch/libpillowfight/issues/2 - postPatch = '' - sed -i -e '/test_\(all_2\|ace\)/i \ @unittest.expectedFailure' \ - tests/tests_ace.py tests/tests_all.py - ''; + # Disable tests because they're designed to only work on Debian: + # https://github.com/jflesch/libpillowfight/issues/2#issuecomment-268259174 + doCheck = false; # Python 2.x is not supported, see: # https://github.com/jflesch/libpillowfight/issues/1 @@ -20132,6 +20150,7 @@ in { buildInputs = with self; [ unittest2 ]; doCheck = !isPyPy; + force-rebuild = 1; # fix transient test suite error at http://hydra.nixos.org/build/45083762 meta = { homepage = https://launchpad.net/pyflakes; @@ -20471,12 +20490,30 @@ in { }; }; + pyinputevent = buildPythonPackage rec { + name = "pyinputevent-2016-10-18"; + + src = pkgs.fetchFromGitHub { + owner = "ntzrmtthihu777"; + repo = "pyinputevent"; + rev = "d2075fa5db5d8a402735fe788bb33cf9fe272a5b"; + sha256 = "0rkis0xp8f9jc00x7jb9kbvhdla24z1vl30djqa6wy6fx0cr6sib"; + }; + + meta = { + homepage = "https://github.com/ntzrmtthihu777/pyinputevent"; + description = "Python interface to the Input Subsystem's input_event and uinput"; + license = licenses.bsd3; + platforms = platforms.linux; + }; + }; + pyinotify = buildPythonPackage rec { - name = "pyinotify"; + name = "pyinotify-${version}"; version = "0.9.6"; src = pkgs.fetchurl { - url = "mirror://pypi/p/${name}/${name}-${version}.tar.gz"; + url = "mirror://pypi/p/${name}/${name}.tar.gz"; sha256 = "1x3i9wmzw33fpkis203alygfnrkcmq9w1aydcm887jh6frfqm6cw"; }; @@ -26182,6 +26219,32 @@ in { }; }; + virtkey = buildPythonPackage rec { + name = "virtkey-${version}"; + majorVersion = "0.63"; + version = "${majorVersion}.0"; + + src = pkgs.fetchurl { + url = "https://launchpad.net/virtkey/${majorVersion}/${version}/+download/virtkey-${version}.tar.gz"; + sha256 = "0hd99hrxn6bh3rxcrdnad5cqjsphrn1s6fzx91q07d44k6cg6qcr"; + }; + + nativeBuildInputs = [ pkgs.pkgconfig ]; + + buildInputs = + [ pkgs.gtk2 ] + ++ (with pkgs.xorg; [ libX11 libXtst libXi libxkbfile xextproto xproto ]); + + meta = { + description = "Extension to emulate keypresses and to get the layout information from the X server"; + homepage = "https://launchpad.net/virtkey"; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; + }; + + + virtual-display = buildPythonPackage rec { name = "PyVirtualDisplay-0.1.5"; |