public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2021-01-09 18:41:31 +00:00 committed by GitHub
parent 379ca4ddcf fcbe48c797
commit 34f5c8db0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
41 changed files with 316 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/hardware/opentabletdriver.nix
View File

@ -5,6 +5,8 @@ let
cfg = config.hardware.opentabletdriver;
in
{
meta.maintainers = with lib.maintainers; [ thiagokokada ];
options = {
hardware.opentabletdriver = {
enable = mkOption {

1
nixos/tests/all-tests.nix
View File

@ -281,6 +281,7 @@ in
openssh = handleTest ./openssh.nix {};
openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {};
openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {};
opentabletdriver = handleTest ./opentabletdriver.nix {};
image-contents = handleTest ./image-contents.nix {};
orangefs = handleTest ./orangefs.nix {};
os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {};

27
nixos/tests/opentabletdriver.nix Normal file
View File

@ -0,0 +1,27 @@
import ./make-test-python.nix ( { pkgs, ... }: {
name = "opentabletdriver";
meta = {
maintainers = with pkgs.stdenv.lib.maintainers; [ thiagokokada ];
};
machine = { pkgs, ... }:
{
imports = [
./common/user-account.nix
./common/x11.nix
];
test-support.displayManager.auto.user = "alice";
hardware.opentabletdriver.enable = true;
};
testScript =
''
machine.start()
machine.wait_for_x()
machine.wait_for_unit("opentabletdriver.service", "alice")
machine.succeed("cat /etc/udev/rules.d/30-opentabletdriver.rules")
# Will fail if service is not running
machine.succeed("otd detect")
'';
})

37
pkgs/applications/graphics/monado/default.nix
View File

@ -1,23 +1,29 @@
{ stdenv
, fetchFromGitLab
, fetchpatch
, writeText
, cmake
, doxygen
, glslang
, pkg-config
, python3
, SDL2
, dbus
, eigen
, ffmpeg
, glslang
, gst-plugins-base
, gstreamer
, hidapi
, libGL
, libXau
, libXdmcp
, libXrandr
, libffi
, libjpeg
# , librealsense
, libsurvive
, libusb1
, libuv
, libuvc
, libv4l
, libxcb
@ -29,6 +35,11 @@
, wayland
, wayland-protocols
, zlib
# Set as 'false' to build monado without service support, i.e. allow VR
# applications linking against libopenxr_monado.so to use OpenXR standalone
# instead of via the monado-service program. For more information see:
# https://gitlab.freedesktop.org/monado/monado/-/blob/master/doc/targets.md#xrt_feature_service-disabled
, serviceSupport ? true
}:
stdenv.mkDerivation rec {
@ -51,23 +62,36 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ cmake pkg-config python3 ];
nativeBuildInputs = [
cmake
doxygen
glslang
pkg-config
python3
];
cmakeFlags = [
"-DXRT_FEATURE_SERVICE=${if serviceSupport then "ON" else "OFF"}"
];
buildInputs = [
SDL2
dbus
eigen
ffmpeg
glslang
gst-plugins-base
gstreamer
hidapi
libGL
libXau
libXdmcp
libXrandr
libjpeg
libffi
# librealsense.dev - see below
libsurvive
libusb1
libuv
libuvc
libv4l
libxcb
@ -91,11 +115,16 @@ stdenv.mkDerivation rec {
# for some reason cmake is trying to use ${librealsense}/include
# instead of ${librealsense.dev}/include as an include directory
# Help openxr-loader find this runtime
setupHook = writeText "setup-hook" ''
export XDG_CONFIG_DIRS=@out@/etc/xdg''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}}
'';
meta = with stdenv.lib; {
description = "Open source XR runtime";
homepage = "https://monado.freedesktop.org/";
license = licenses.boost;
maintainers = with maintainers; [ prusnak ];
maintainers = with maintainers; [ expipiplus1 prusnak ];
platforms = platforms.linux;
};
}

48
pkgs/applications/graphics/xrgears/default.nix Normal file
View File

@ -0,0 +1,48 @@
{ stdenv
, fetchFromGitLab
, glm
, glslang
, meson
, ninja
, openxr-loader
, pkg-config
, vulkan-headers
, vulkan-loader
, xxd
}:
stdenv.mkDerivation rec {
pname = "xrgears";
version = "unstable-2020-04-15";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "monado";
repo = "demos/xrgears";
rev = "d0bee35fbf8f181e8313f1ead13d88c4fb85c154";
sha256 = "1k0k8dkclyiav99kf0933kyd2ymz3hs1p0ap2wbciq9s62jgz29i";
};
nativeBuildInputs = [
glslang
meson
ninja
pkg-config
xxd
];
buildInputs = [
glm
openxr-loader
vulkan-headers
vulkan-loader
];
meta = with stdenv.lib; {
homepage = "https://gitlab.freedesktop.org/monado/demos/xrgears";
description = "An OpenXR example using Vulkan for rendering";
platforms = platforms.linux;
license = licenses.mit;
maintainers = with maintainers; [ expipiplus1 ];
};
}

8
pkgs/applications/misc/osmium-tool/default.nix
View File

@ -7,19 +7,20 @@
, bzip2
, expat
, libosmium
, lz4
, protozero
, zlib
}:
stdenv.mkDerivation rec {
pname = "osmium-tool";
version = "1.12.1";
version = "1.13.0";
src = fetchFromGitHub {
owner = "osmcode";
repo = "osmium-tool";
rev = "v${version}";
sha256 = "13142hj8gfgj6w51a62hjzfmzic90xgrnnlnb70hpdqjy86bxv7j";
sha256 = "0rn67g4xf01i7pkxrdh87jdj2rzkw5pfkx5wkg9245z5yxjxhqj2";
};
nativeBuildInputs = [
@ -33,6 +34,7 @@ stdenv.mkDerivation rec {
bzip2
expat
libosmium
lz4
protozero
zlib
];
@ -46,7 +48,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Multipurpose command line tool for working with OpenStreetMap data based on the Osmium library";
homepage = "https://osmcode.org/osmium-tool/";
license = with licenses; [ gpl3 mit bsd3 ];
license = with licenses; [ gpl3Plus mit bsd3 ];
maintainers = with maintainers; [ das-g ];
};
}

12
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -31,15 +31,15 @@
}
},
"dev": {
"version": "89.0.4356.6",
"sha256": "1jq0wbaaz07kz2190rq3vl2b5spx3qfda4al9ygkm8man817d2nr",
"sha256bin64": "0dgvp2my328s4ah0hmp1hg1c3x21gkrz9mjvbfs54r2pjb7y5sbl",
"version": "89.0.4381.6",
"sha256": "031w24qf5cn9y30pgh736g67p6c10kwpflhvxa24h0v99gqnah2i",
"sha256bin64": "1fssdxllq2ncpy8s7ykbq33456hfjlgj1m5147wbg2c5k36rj78s",
"deps": {
"gn": {
"version": "2020-11-05",
"version": "2020-12-22",
"url": "https://gn.googlesource.com/gn",
"rev": "53d92014bf94c3893886470a1c7c1289f8818db0",
"sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9"
"rev": "0d67e272bdb8145f87d238bc0b2cb8bf80ccec90",
"sha256": "07mrfl9hbjldbgidwwhr482a0s0ppqzwa5j7v5nbqxj18j55iril"
}
}
},

6
pkgs/applications/terminal-emulators/alacritty/default.nix
View File

@ -52,16 +52,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "alacritty";
version = "0.6.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "alacritty";
repo = pname;
rev = "v${version}";
sha256 = "vQdNwNiUvoJWRT1foPRadirI2zWjnzU3sGnIxeHKlj8=";
sha256 = "8alCFtr+3aJsqQ2Ra8u5/SRHfDvMq2kRvRCKo/zwMK0=";
};
cargoSha256 = "1PQSg6EmwVMZj2ALw6qsbtPMCtALVHx5TR05FjGD/QE=";
cargoSha256 = "kqRlxieChnhWtYYf67gi+2bncIzO56xpnv2uLjcINVM=";
nativeBuildInputs = [
cmake

4
pkgs/applications/version-management/git-repo/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "git-repo";
version = "2.11";
version = "2.11.1";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
sha256 = "sha256-eb35yNsE0F+xPA1j7Czag1aOZO4cr6OeRsBlCrQwCRk=";
sha256 = "sha256-6XsjxTYmjr/3smwwS7c+Mq1sqfgKAhWzHOY8TWlIKHU=";
};
patches = [ ./import-ssl-module.patch ];

2
pkgs/applications/version-management/sparkleshare/default.nix
View File

@ -1,5 +1,6 @@
{
appindicator-sharp,
bash,
coreutils,
fetchFromGitHub,
git,
@ -57,6 +58,7 @@ stdenv.mkDerivation rec {
--set PATH ${symlinkJoin {
name = "mono-path";
paths = [
bash
coreutils
git
git-lfs

10
pkgs/applications/video/mpv/default.nix
View File

@ -1,4 +1,4 @@
{ config, stdenv, fetchFromGitHub
{ config, stdenv, fetchFromGitHub, fetchpatch
, addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which
, ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, mujs
, nv-codec-headers, lua, libuchardet, libiconv ? null
@ -104,6 +104,14 @@ in stdenv.mkDerivation rec {
sha256 = "sha256-3l32qQBpvWVjbLp5CZtO039oDQeH7C/cNAKtJxrzlRk=";
};
patches = [
# To make mpv build with libplacebo 3.104.0:
(fetchpatch { # vo_gpu: placebo: update for upstream API changes
url = "https://github.com/mpv-player/mpv/commit/7c4465cefb27d4e0d07535d368febdf77b579566.patch";
sha256 = "1yfc6220ak5kc5kf7zklmsa944nr9q0qaa27l507pgrmvcyiyzrx";
})
];
postPatch = ''
patchShebangs ./TOOLS/
'';

2
pkgs/common-updater/scripts/update-source-version
View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -e
scriptName=update-source-versions # do not use the .wrapped name
scriptName=update-source-version # do not use the .wrapped name
die() {
echo "$scriptName: error: $1" >&2

4
pkgs/development/interpreters/php/7.3.nix
View File

@ -4,8 +4,8 @@ let
generic = (import ./generic.nix) _args;
base = callPackage generic (_args // {
version = "7.3.25";
sha256 = "1yq2fwpg9jgcafcrq4ffqm52r0f80pi6zy7fj1yb1qwim96mlcb9";
version = "7.3.26";
sha256 = "0klxnf6nhsib9b2mdls1x2wbpi04gmgwxajbn593rzalh5y5l7ip";
# https://bugs.php.net/bug.php?id=76826
extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch;

4
pkgs/development/interpreters/php/7.4.nix
View File

@ -4,8 +4,8 @@ let
generic = (import ./generic.nix) _args;
base = callPackage generic (_args // {
version = "7.4.13";
sha256 = "1nhzldjp8jfd1hivfyn5wydim5daibz0vkfxgys2xj8igs2kk8qm";
version = "7.4.14";
sha256 = "1xm1s2w9fsd8q7kjbpqw8s4bs7ggziwws23m0ykkmvmd0l3cm2b8";
});
in base.withExtensions ({ all, ... }: with all; ([

4
pkgs/development/interpreters/php/8.0.nix
View File

@ -4,8 +4,8 @@ let
generic = (import ./generic.nix) _args;
base = callPackage generic (_args // {
version = "8.0.0";
sha256 = "02cx3gvxqvkllp54jfvs83kl8bmpcqyzp9jf1d0l9x5bgv1jv0sy";
version = "8.0.1";
sha256 = "1vmx9rhks8v2198f9d6cq62bway5mrfsz72garjdwcyi82ppckn4";
});
in base.withExtensions ({ all, ... }: with all; ([

81
pkgs/development/interpreters/php/fix-opcache-configure.patch
View File

@ -1,81 +0,0 @@
diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
index 726188597496..781e51d3e44c 100644
--- a/Zend/Zend.m4
+++ b/Zend/Zend.m4
@@ -190,12 +190,6 @@ dnl LIBZEND_OTHER_CHECKS
dnl
AC_DEFUN([LIBZEND_OTHER_CHECKS],[
-AC_ARG_ENABLE([zts],
- [AS_HELP_STRING([--enable-zts],
- [Enable thread safety])],
- [ZEND_ZTS=$enableval],
- [ZEND_ZTS=no])
-
AC_MSG_CHECKING(whether to enable thread-safety)
AC_MSG_RESULT($ZEND_ZTS)
diff --git a/configure.ac b/configure.ac
index 8d6e922fa9bf..e07a75d19ac7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -797,6 +797,19 @@ if test "$PHP_DEBUG_ASSERTIONS" = "yes"; then
ZEND_DEBUG=yes
fi
+AC_ARG_ENABLE([zts],
+ [AS_HELP_STRING([--enable-zts],
+ [Enable thread safety])],
+ [ZEND_ZTS=$enableval],
+ [ZEND_ZTS=no])
+
+if test "$ZEND_ZTS" = "yes"; then
+ AC_DEFINE(ZTS, 1,[ ])
+ PHP_THREAD_SAFETY=yes
+else
+ PHP_THREAD_SAFETY=no
+fi
+
PHP_ARG_ENABLE([rtld-now],
[whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY],
[AS_HELP_STRING([--enable-rtld-now],
@@ -1136,13 +1149,6 @@ LIBZEND_BASIC_CHECKS
LIBZEND_DLSYM_CHECK
LIBZEND_OTHER_CHECKS
-if test "$ZEND_ZTS" = "yes"; then
- AC_DEFINE(ZTS,1,[ ])
- PHP_THREAD_SAFETY=yes
-else
- PHP_THREAD_SAFETY=no
-fi
-
INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM"
INCLUDES="$INCLUDES -I\$(top_builddir)/Zend"
diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
index 054cd28c0247..93d72fb73d19 100644
--- a/ext/opcache/config.m4
+++ b/ext/opcache/config.m4
@@ -66,7 +66,7 @@ if test "$PHP_OPCACHE" != "no"; then
esac
fi
- if test "$enable_zts" = "yes"; then
+ if test "$PHP_THREAD_SAFETY" = "yes"; then
DASM_FLAGS="$DASM_FLAGS -D ZTS=1"
fi
diff --git a/ext/session/config.m4 b/ext/session/config.m4
index 7abc8813b72a..da31bbde86cc 100644
--- a/ext/session/config.m4
+++ b/ext/session/config.m4
@@ -31,7 +31,7 @@ if test "$PHP_MM" != "no"; then
AC_MSG_ERROR(cannot find mm library)
fi
- if test "$enable_zts" = "yes"; then
+ if test "$PHP_THREAD_SAFETY" = "yes"; then
dnl The mm library is not thread-safe, and mod_mm.c refuses to compile.
AC_MSG_ERROR(--with-mm cannot be combined with --enable-zts)
fi

6
pkgs/development/libraries/libosmium/default.nix
View File

@ -2,19 +2,21 @@
stdenv.mkDerivation rec {
pname = "libosmium";
version = "2.15.6";
version = "2.16.0";
src = fetchFromGitHub {
owner = "osmcode";
repo = "libosmium";
rev = "v${version}";
sha256 = "0rqy18bbakp41f44y5id9ixh0ar2dby46z17p4115z8k1vv9znq2";
sha256 = "1na51g6xfm1bx0d0izbg99cwmqn0grp0g41znn93xnhs202qnb2h";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ protozero zlib bzip2 expat boost ];
cmakeFlags = [ "-DINSTALL_GDALCPP:BOOL=ON" ];
doCheck = true;
meta = with stdenv.lib; {

8
pkgs/development/libraries/libplacebo/default.nix
View File

@ -11,11 +11,13 @@
, glslang
, lcms2
, epoxy
, libGL
, xorg
}:
stdenv.mkDerivation rec {
pname = "libplacebo";
version = "2.72.2";
version = "3.104.0";
patches = [
./glsl-import.patch
@ -26,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "videolan";
repo = pname;
rev = "v${version}";
sha256 = "1ijqpx1pagc6qg63ynqrinvckwc8aaw1i0lx48gg5szwk8afib4i";
sha256 = "0p5mx8ch7cp7b54yrkl4fs8bcvqma1h461gx6ps4kagn4dsx8asb";
};
nativeBuildInputs = [
@ -43,6 +45,8 @@ stdenv.mkDerivation rec {
glslang
lcms2
epoxy
libGL
xorg.libX11
];
mesonFlags = [

2
pkgs/development/libraries/libsurvive/default.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
description = "Open Source Lighthouse Tracking System";
homepage = "https://github.com/cntools/libsurvive";
license = licenses.mit;
maintainers = with maintainers; [ prusnak ];
maintainers = with maintainers; [ expipiplus1 prusnak ];
platforms = platforms.linux;
};
}

24
pkgs/development/php-packages/pdlib/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ buildPecl, lib, pkgs }:
let
pname = "pdlib";
version = "1.0.2";
in
buildPecl {
inherit pname version;
src = pkgs.fetchFromGitHub {
owner = "goodspb";
repo = "pdlib";
rev = "v${version}";
sha256 = "0qnmqwlw5vb2rvliap4iz9val6mal4qqixcw69pwskdw5jka6v5i";
};
nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [ (pkgs.dlib.override { guiSupport = true; }) ];
meta = with lib; {
description = "A PHP extension for Dlib";
license = with licenses; [ mit ];
maintainers = lib.teams.php.members;
};
}

30
pkgs/development/python-modules/aiostream/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pytestCheckHook
, pytestcov
, pytest-asyncio
}:
buildPythonPackage rec {
pname = "aiostream";
version = "0.4.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "vxgmichel";
repo = pname;
rev = "v${version}";
sha256 = "1wwnjrzkd61k3arxzk7yhg7cc1099bcwr5kz5n91ai6ma5ln139s";
};
checkInputs = [ pytestCheckHook pytestcov pytest-asyncio ];
meta = with lib; {
description = "Generator-based operators for asynchronous iteration";
homepage = "https://aiostream.readthedocs.io";
license = licenses.gpl3Only;
maintainers = [ maintainers.rmcgibbo ];
};
}

4
pkgs/development/python-modules/cupy/default.nix
View File

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "cupy";
version = "8.2.0";
version = "8.3.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "8e4bc8428fb14309d73194e19bc4b47e1d6a330678a200e36d9d4b932f1be2e8";
sha256 = "db699fddfde7806445908cf6454c6f4985e7a9563b40405ddf97845d808c5f12";
};
checkInputs = [

4
pkgs/development/python-modules/eliot/default.nix
View File

@ -15,12 +15,12 @@
buildPythonPackage rec {
pname = "eliot";
version = "1.12.0";
version = "1.13.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "0wabv7hk63l12881f4zw02mmj06583qsx2im0yywdjlj8f56vqdn";
sha256 = "5760194b308a7ab35514ae1b942d88e9f2359071556d82580383f09ca586fff7";
};
checkInputs = [

4
pkgs/development/python-modules/eventlet/default.nix
View File

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "eventlet";
version = "0.29.1";
version = "0.30.0";
src = fetchPypi {
inherit pname version;
sha256 = "9faff63631b01277c463ae91cd4ab3f25a2f0f5abe3219d43a386ef1daa6159a";
sha256 = "19d6f3aa9525221ba60d0ec31b570508021af7ad5497fb77f77501fe9a7c34d3";
};
propagatedBuildInputs = [ dnspython greenlet monotonic six ]

4
pkgs/development/python-modules/folium/default.nix
View File

@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "folium";
version = "0.11.0";
version = "0.12.0";
src = fetchPypi {
inherit pname version;
sha256 = "540789abc21872469e52c59ac3962c61259a8df557feadd6514eb23eb0a64ca7";
sha256 = "d45ace0a813ae65f202ce0356eb29c40a5e8fde071e4d6b5be0a89587ebaeab2";
};
disabled = pythonOlder "3.5";

4
pkgs/development/python-modules/itemloaders/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "itemloaders";
version = "1.0.3";
version = "1.0.4";
disabled = isPy27;
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "scrapy";
repo = pname;
rev = "v${version}";
sha256 = "1s8c2il7jyfixpb7h5zq0lf4s07pqwia4ycpf3slb8whcp0h8bfm";
sha256 = "0j68xgx2z63sc1nc9clw6744036vfbijdsghvjv6pk674d5lgyam";
};
propagatedBuildInputs = [ w3lib parsel jmespath itemadapter ];

7
pkgs/development/python-modules/jc/default.nix
View File

@ -5,22 +5,25 @@
, xmltodict
, pygments
, isPy27
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "jc";
version = "1.14.0";
version = "1.14.1";
disabled = isPy27;
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = "jc";
rev = "v${version}";
sha256 = "0js3mqp6xxg45qsz8wnyyqf4m0wj1kz67bkmvirhdy7s01zhd5hq";
sha256 = "1vzzz7dlg6apxhcl0qkfdpp2v9d0q6jyafpfmklkcbjs31zvwcsw";
};
propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ];
checkInputs = [ pytestCheckHook ];
meta = with stdenv.lib; {
description = "This tool serializes the output of popular command line tools and filetypes to structured JSON output";
homepage = "https://github.com/kellyjonbrazil/jc";

6
pkgs/development/python-modules/pychromecast/default.nix
View File

@ -2,17 +2,19 @@
buildPythonPackage rec {
pname = "PyChromecast";
version = "7.7.1";
version = "7.7.2";
src = fetchPypi {
inherit pname version;
sha256 = "09mdz1y1bfwkszxsawffwy1mr7lc1j2rma571qkb60sk76107zfn";
sha256 = "1w7jayb0z529bh1ybb16pfm0m08qqi4px1q0qwlvcxlcrd2v3m5a";
};
disabled = !isPy3k;
propagatedBuildInputs = [ requests zeroconf protobuf casttube ];
# no tests available
doCheck = false;
pythonImportsCheck = [ "pychromecast" ];
meta = with lib; {

4
pkgs/development/python-modules/pyosmium/default.nix
View File

@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "pyosmium";
version = "3.0.1";
version = "3.1.0";
disabled = pythonOlder "3.4" || isPyPy;
@ -12,7 +12,7 @@ buildPythonPackage rec {
owner = "osmcode";
repo = pname;
rev = "v${version}";
sha256 = "06jngbmmmswhyi5q5bjph6gwss28d2azn5414zf0arik5bcvz128";
sha256 = "0m11hdgiysdhyi5yn6nj8a8ycjzx5hpjy7n1c4j6q5caifj7rf7h";
};
nativeBuildInputs = [ cmake ];

20
pkgs/development/tools/ocaml/camlp5/default.nix
View File

@ -1,20 +1,26 @@
{ stdenv, fetchzip, ocaml }:
{ stdenv, fetchzip, ocaml, perl }:
if stdenv.lib.versionOlder ocaml.version "4.02"
then throw "camlp5 is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation {
name = "camlp5-7.13";
name = "camlp5-7.14";
src = fetchzip {
url = "https://github.com/camlp5/camlp5/archive/rel713.tar.gz";
sha256 = "1d9spy3f5ahixm8nxxk086kpslzva669a5scn49am0s7vx4i71kp";
url = "https://github.com/camlp5/camlp5/archive/rel714.tar.gz";
sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w";
};
buildInputs = [ ocaml ];
buildInputs = [ ocaml perl ];
prefixKey = "-prefix ";
preConfigure = "configureFlagsArray=(--strict" +
" --libdir $out/lib/ocaml/${ocaml.version}/site-lib)";
preConfigure = ''
configureFlagsArray=(--strict --libdir $out/lib/ocaml/${ocaml.version}/site-lib)
patchShebangs ./config/find_stuffversion.pl
'';
buildFlags = [ "world.opt" ];

4
pkgs/games/sauerbraten/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "sauerbraten";
version = "2020-12-04";
version = "2020-12-27";
src = fetchzip {
url = "mirror://sourceforge/sauerbraten/sauerbraten_${builtins.replaceStrings [ "-" ] [ "_" ] version}_linux.tar.bz2";
sha256 = "1hknwpnvsakz6s7l7j1r5aqmgrzp4wcbn8yg8nxmvsddbhxdj1kc";
sha256 = "0llknzj23vx6f3y452by9c7wlhzclyq4bqi22qd52m3l916z2mn5";
};
nativeBuildInputs = [

24
pkgs/misc/vim-plugins/generated.nix
View File

@ -87,6 +87,18 @@ let
meta.homepage = "https://github.com/vim-scripts/align/";
};
aniseed = buildVimPluginFrom2Nix {
pname = "aniseed";
version = "2021-01-08";
src = fetchFromGitHub {
owner = "Olical";
repo = "aniseed";
rev = "50adbc5ed5bb97b73b0b0c3241d9e62621ca59f9";
sha256 = "1wy5jd86273q7sxa50kv88flqdgmg9z2m4b6phpw3xnl5d1sj9f7";
};
meta.homepage = "https://github.com/Olical/aniseed/";
};
ansible-vim = buildVimPluginFrom2Nix {
pname = "ansible-vim";
version = "2020-10-15";
@ -5185,6 +5197,18 @@ let
meta.homepage = "https://github.com/lambdalisue/vim-gista/";
};
vim-git = buildVimPluginFrom2Nix {
pname = "vim-git";
version = "2020-07-13";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-git";
rev = "4be54a3e2e300a94f6f7dfa7a6ee9e81245c9886";
sha256 = "1061l9igdywfbqgwpf2f25yby78phb512hjbyzvqz5l1p7dw1xyd";
};
meta.homepage = "https://github.com/tpope/vim-git/";
};
vim-gitbranch = buildVimPluginFrom2Nix {
pname = "vim-gitbranch";
version = "2017-05-27";

2
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -405,6 +405,7 @@ nvim-treesitter/playground
ocaml/vim-ocaml
octol/vim-cpp-enhanced-highlight
ojroques/vim-oscyank@main
Olical/aniseed
Olical/conjure
OrangeT/vim-csharp
osyo-manga/shabadou.vim
@ -560,6 +561,7 @@ tpope/vim-eunuch
tpope/vim-fireplace
tpope/vim-flagship
tpope/vim-fugitive
tpope/vim-git
tpope/vim-liquid
tpope/vim-obsession
tpope/vim-pathogen

21
pkgs/shells/oksh/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, lib, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "oksh";
version = "6.8.1";
src = fetchFromGitHub {
owner = "ibara";
repo = pname;
rev = "${pname}-${version}";
sha256 = "0lny550qfanysc4pqs0mxxx8zyz6plv9ll8y05gz0xmq9vx5384r";
};
meta = with stdenv.lib; {
description = "Portable OpenBSD ksh, based on the Public Domain Korn Shell (pdksh)";
homepage = "https://github.com/ibara/oksh";
license = licenses.publicDomain;
maintainers = with maintainers; [ siraben ];
platforms = platforms.all;
};
}

5
pkgs/tools/X11/opentabletdriver/default.nix
View File

@ -17,6 +17,7 @@
, copyDesktopItems
, makeDesktopItem
, makeWrapper
, nixosTests
, wrapGAppsHook
}:
@ -154,6 +155,10 @@ stdenv.mkDerivation rec {
dontWrapGApps = true;
dontStrip = true;
passthru.tests = {
otd-runs = nixosTests.opentabletdriver;
};
meta = with lib; {
description = "Open source, cross-platform, user-mode tablet driver";
homepage = "https://github.com/InfinityGhost/OpenTabletDriver";

4
pkgs/tools/admin/lxd/default.nix
View File

@ -18,13 +18,13 @@ let
in
buildGoPackage rec {
pname = "lxd";
version = "4.9";
version = "4.10";
goPackagePath = "github.com/lxc/lxd";
src = fetchurl {
url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "0sq3avgsrdzkbsil0xsri60xxi0bzf4l6w43w23lbhacrby1spj4";
sha256 = "0s8lbvh2vsqphvspyjyxp5s589gf2wrjpka8v496lf6fv1nsi5s8";
};
postPatch = ''

4
pkgs/tools/package-management/nix-update/default.nix
View File

@ -7,13 +7,13 @@
buildPythonApplication rec {
pname = "nix-update";
version = "0.3.1";
version = "0.3.2";
src = fetchFromGitHub {
owner = "Mic92";
repo = pname;
rev = version;
sha256 = "sha256-0icQi1HClLMVDOugKckF2J8tEDeMfmW5kgCItJ9n2eo=";
sha256 = "1ykxr0yah7zl06igm7wiji9zx3y0xpjc37hbfhn6gnir6ssa0kqp";
};
makeWrapperArgs = [

4
pkgs/tools/system/inxi/default.nix
View File

@ -3,7 +3,7 @@
, withRecommends ? false # Install (almost) all recommended tools (see --recommends)
, withRecommendedSystemPrograms ? withRecommends, util-linuxMinimal, dmidecode
, file, hddtemp, iproute, ipmitool, usbutils, kmod, lm_sensors, smartmontools
, binutils, tree, upower
, binutils, tree, upower, pciutils
, withRecommendedDisplayInformationPrograms ? withRecommends, glxinfo, xorg
}:
@ -12,7 +12,7 @@ let
"--prefix PATH ':' '${stdenv.lib.makeBinPath programs}'";
recommendedSystemPrograms = lib.optionals withRecommendedSystemPrograms [
util-linuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod
lm_sensors smartmontools binutils tree upower
lm_sensors smartmontools binutils tree upower pciutils
];
recommendedDisplayInformationPrograms = lib.optionals
withRecommendedDisplayInformationPrograms

8
pkgs/top-level/all-packages.nix
View File

@ -2494,7 +2494,9 @@ in
monetdb = callPackage ../servers/sql/monetdb { };
monado = callPackage ../applications/graphics/monado {};
monado = callPackage ../applications/graphics/monado {
inherit (gst_all_1) gstreamer gst-plugins-base;
};
mons = callPackage ../tools/misc/mons {};
@ -8901,6 +8903,8 @@ in
oil = callPackage ../shells/oil { };
oksh = callPackage ../shells/oksh { };
pash = callPackage ../shells/pash { };
tcsh = callPackage ../shells/tcsh { };
@ -25557,6 +25561,8 @@ in
xrestop = callPackage ../tools/X11/xrestop { };
xrgears = callPackage ../applications/graphics/xrgears { };
xsd = callPackage ../development/libraries/xsd { };
xscope = callPackage ../applications/misc/xscope { };

7
pkgs/top-level/php-packages.nix
View File

@ -80,6 +80,8 @@ lib.makeScope pkgs.newScope (self: with self; {
oci8 = callPackage ../development/php-packages/oci8 { };
pdlib = callPackage ../development/php-packages/pdlib { };
pcov = callPackage ../development/php-packages/pcov { };
pcs = buildPecl {
@ -388,10 +390,7 @@ lib.makeScope pkgs.newScope (self: with self; {
buildInputs = [ pcre' ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [
valgrind.dev
];
# HAVE_OPCACHE_FILE_CACHE is defined in config.h, which is
# included from ZendAccelerator.h, but ZendAccelerator.h is
# included after the ifdef...
patches = [] ++ lib.optional (lib.versionAtLeast php.version "8.0") [ ../development/interpreters/php/fix-opcache-configure.patch ] ++lib.optional (lib.versionOlder php.version "7.4") [
patches = [] ++ lib.optional (lib.versionOlder php.version "7.4") [
(pkgs.writeText "zend_file_cache_config.patch" ''
--- a/ext/opcache/zend_file_cache.c
+++ b/ext/opcache/zend_file_cache.c

2
pkgs/top-level/python-packages.nix
View File

@ -265,6 +265,8 @@ in {
aiosqlite = callPackage ../development/python-modules/aiosqlite { };
aiostream = callPackage ../development/python-modules/aiostream { };
aiounifi = callPackage ../development/python-modules/aiounifi { };
aiounittest = callPackage ../development/python-modules/aiounittest { };