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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-03-29 18:13:15 +00:00 committed by GitHub
commit f7049b343c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 592 additions and 536 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
doc/languages-frameworks/python.section.md
View File

@ -1505,11 +1505,12 @@ If you need to change a package's attribute(s) from `configuration.nix` you coul
nixpkgs.config.packageOverrides = super: {
python = super.python.override {
packageOverrides = python-self: python-super: {
zerobin = python-super.zerobin.overrideAttrs (oldAttrs: {
src = super.fetchgit {
url = "https://github.com/sametmax/0bin";
rev = "a344dbb18fe7a855d0742b9a1cede7ce423b34ec";
sha256 = "16d769kmnrpbdr0ph0whyf4yff5df6zi4kmwx7sz1d3r6c8p6xji";
twisted = python-super.twisted.overrideAttrs (oldAttrs: {
src = super.fetchPipy {
pname = "twisted";
version = "19.10.0";
sha256 = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d";
extension = "tar.bz2";
};
});
};
@ -1517,9 +1518,11 @@ If you need to change a package's attribute(s) from `configuration.nix` you coul
};
```
`pythonPackages.zerobin` is now globally overridden. All packages and also the
`zerobin` NixOS service use the new definition. Note that `python-super` refers
to the old package set and `python-self` to the new, overridden version.
`pythonPackages.twisted` is now globally overridden.
All packages and also all NixOS services that reference `twisted`
(such as `services.buildbot-worker`) now use the new definition.
Note that `python-super` refers to the old package set and `python-self`
to the new, overridden version.
To modify only a Python package set instead of a whole Python derivation, use
this snippet:
@ -1527,7 +1530,7 @@ this snippet:
```nix
myPythonPackages = pythonPackages.override {
overrides = self: super: {
zerobin = ...;
twisted = ...;
};
}
```
@ -1540,11 +1543,12 @@ Use the following overlay template:
self: super: {
python = super.python.override {
packageOverrides = python-self: python-super: {
zerobin = python-super.zerobin.overrideAttrs (oldAttrs: {
src = super.fetchgit {
url = "https://github.com/sametmax/0bin";
rev = "a344dbb18fe7a855d0742b9a1cede7ce423b34ec";
sha256 = "16d769kmnrpbdr0ph0whyf4yff5df6zi4kmwx7sz1d3r6c8p6xji";
twisted = python-super.twisted.overrideAttrs (oldAttrs: {
src = super.fetchPypi {
pname = "twisted";
version = "19.10.0";
sha256 = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d";
extension = "tar.bz2";
};
});
};

2
nixos/modules/services/networking/zerobin.nix
View File

@ -88,7 +88,7 @@ in
enable = true;
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig.ExecStart = "${pkgs.pythonPackages.zerobin}/bin/zerobin ${cfg.listenAddress} ${toString cfg.listenPort} false ${cfg.user} ${cfg.group} ${zerobin_config}";
serviceConfig.ExecStart = "${pkgs.zerobin}/bin/zerobin ${cfg.listenAddress} ${toString cfg.listenPort} false ${cfg.user} ${cfg.group} ${zerobin_config}";
serviceConfig.PrivateTmp="yes";
serviceConfig.User = cfg.user;
serviceConfig.Group = cfg.group;

18
pkgs/applications/audio/pulseeffects/default.nix
View File

@ -1,5 +1,6 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, meson
, ninja
, pkg-config
@ -45,13 +46,15 @@ let
];
in stdenv.mkDerivation rec {
pname = "pulseeffects";
version = "5.0.0";
# 5.0.3 crashes. Test carefully before updating.
# https://github.com/wwmm/pulseeffects/issues/927
version = "5.0.2";
src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
sha256 = "1zs13bivxlgcb24lz1pgmgy2chcjxnmn4lz7g1n0ygiaaj4c30xj";
sha256 = "14ir25q6bws26im6qmj3k6hkfdh5pc6mbvln7wkdwy5dv0vix3cm";
};
nativeBuildInputs = [
@ -87,6 +90,15 @@ in stdenv.mkDerivation rec {
zita-convolver
];
patches = [
(fetchpatch {
# Fix build failure.
# https://github.com/wwmm/pulseeffects/pull/934
url = "https://github.com/wwmm/pulseeffects/commit/ab7354a6850d23840b4c9af212dbebf4f31a562f.patch";
sha256 = "1hd05xn6sp0xs632mqgwk19hl40kh2f69mx5mgzahysrj057w22c";
})
];
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
@ -104,6 +116,8 @@ in stdenv.mkDerivation rec {
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
separateDebugInfo = true;
meta = with lib; {
description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications";
homepage = "https://github.com/wwmm/pulseeffects";

30
pkgs/applications/misc/clight/clightd.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
{ lib, stdenv, fetchFromGitHub
, dbus, cmake, pkg-config
, glib, udev, polkit, libusb1, libjpeg, libmodule
, pcre, libXdmcp, util-linux, libpthreadstubs
@ -9,42 +9,34 @@
stdenv.mkDerivation rec {
pname = "clightd";
version = "5.1";
version = "5.2";
src = fetchFromGitHub {
owner = "FedeDP";
repo = "Clightd";
rev = version;
sha256 = "sha256-BEGum0t+FrCTAEQwTsWeYpoIqimTAz+Bv/ZQPQ3fePY=";
sha256 = "sha256-bb+PQsWLf4KnbzWUY6B42yHaDQKN9dtyfwSLe8FBaWU=";
};
patches = [
# Not needed by next version bump
(fetchpatch {
url = "https://github.com/FedeDP/Clightd/commit/a52a2888e3798c572dad359a017cb0d40e7c5fb7.patch";
sha256 = "sha256-nUzNBia1EvBQxinAfjyKbuldBoHLY1hfMaxgG2lKQWg=";
})
];
# dbus-1.pc has datadir=/etc
SYSTEM_BUS_DIR = "${placeholder "out"}/share/dbus-1/system-services";
# systemd.pc has prefix=${systemd.out}
MODULE_LOAD_DIR = "${placeholder "out"}/lib/modules-load.d";
# polkit-gobject-1.pc has prefix=${polkit.out}
POLKIT_ACTION_DIR = "${placeholder "out"}/share/polkit-1/actions";
postPatch = ''
sed -i "s@/etc@$out\0@" CMakeLists.txt
sed -i "s@pkg_get_variable(SYSTEM_BUS_DIR.*@set(SYSTEM_BUS_DIR $SYSTEM_BUS_DIR)@" CMakeLists.txt
sed -i "s@pkg_get_variable(MODULE_LOAD_DIR.*@set(MODULE_LOAD_DIR $MODULE_LOAD_DIR)@" CMakeLists.txt
sed -i "s@pkg_get_variable(POLKIT_ACTION_DIR.*@set(POLKIT_ACTION_DIR $POLKIT_ACTION_DIR)@" CMakeLists.txt
'';
cmakeFlags = with lib;
optional enableDdc "-DENABLE_DDC=1"
++ optional enableDpms "-DENABLE_DPMS=1"
++ optional enableGamma "-DENABLE_GAMMA=1"
++ optional enableScreen "-DENABLE_SCREEN=1";
[ "-DSYSTEMD_SERVICE_DIR=${placeholder "out"}/lib/systemd/system"
"-DDBUS_CONFIG_DIR=${placeholder "out"}/etc/dbus-1/system.d"
# systemd.pc has prefix=${systemd.out}
"-DMODULE_LOAD_DIR=${placeholder "out"}/lib/modules-load.d"
] ++ optional enableDdc "-DENABLE_DDC=1"
++ optional enableDpms "-DENABLE_DPMS=1"
++ optional enableGamma "-DENABLE_GAMMA=1"
++ optional enableScreen "-DENABLE_SCREEN=1";
nativeBuildInputs = [
dbus

42
pkgs/applications/misc/dbeaver/default.nix
View File

@ -1,5 +1,6 @@
{ lib
, stdenv
, copyDesktopItems
, fetchFromGitHub
, makeDesktopItem
, makeWrapper
@ -14,26 +15,16 @@
, zlib
, maven
}:
let
desktopItem = makeDesktopItem {
name = "dbeaver";
exec = "dbeaver";
icon = "dbeaver";
desktopName = "dbeaver";
comment = "SQL Integrated Development Environment";
genericName = "SQL Integrated Development Environment";
categories = "Development;";
};
in
stdenv.mkDerivation rec {
pname = "dbeaver-ce";
version = "21.0.0"; # When updating also update fetchedMavenDeps.sha256
version = "21.0.1"; # When updating also update fetchedMavenDeps.sha256
src = fetchFromGitHub {
owner = "dbeaver";
repo = "dbeaver";
rev = version;
sha256 = "sha256-it0EcPD7TXSknjVkGv22Nq1D4J32OEncQDy4w9CIPNk=";
sha256 = "sha256-9l8604STqmdoUjD+EJCp4aDk4juKsPCmFnD/WYpajxo=";
};
fetchedMavenDeps = stdenv.mkDerivation {
@ -62,6 +53,12 @@ stdenv.mkDerivation rec {
outputHash = "sha256-xKlFFQXd2U513KZKQa7ttSFNX2gxVr9hNsvyaoN/rEE=";
};
nativeBuildInputs = [
copyDesktopItems
makeWrapper
maven
];
buildInputs = [
fontconfig
freetype
@ -71,12 +68,19 @@ stdenv.mkDerivation rec {
libX11
libXrender
libXtst
makeWrapper
zlib
];
nativeBuildInputs = [
maven
desktopItems = [
(makeDesktopItem {
name = "dbeaver";
exec = "dbeaver";
icon = "dbeaver";
desktopName = "dbeaver";
comment = "SQL Integrated Development Environment";
genericName = "SQL Integrated Development Environment";
categories = "Development;";
})
];
buildPhase = ''
@ -89,7 +93,7 @@ stdenv.mkDerivation rec {
installPhase =
let
productTargetPath = "product/standalone/target/products/org.jkiss.dbeaver.core.product";
productTargetPath = "product/community/target/products/org.jkiss.dbeaver.core.product";
platformMap = {
aarch64-linux = "aarch64";
@ -129,10 +133,6 @@ stdenv.mkDerivation rec {
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst ])} \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
# Create desktop item.
mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications
mkdir -p $out/share/pixmaps
ln -s $out/dbeaver/icon.xpm $out/share/pixmaps/dbeaver.xpm

4
pkgs/applications/misc/logseq/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "logseq";
version = "0.0.13";
version = "0.0.15";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
sha256 = "0a7c33f7d5ylcy6lqkpxp78wwyi4n5q4jdy7b8nx7p34sn2jnpf7";
sha256 = "4mnS2ikDPmIyT4P8zXssk6AVx50C24bsP4WpD5xJbD8=";
name = "${pname}-${version}.AppImage";
};

2
pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
View File

@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
"version": "1.7.23",
"version": "1.7.24",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {

4
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View File

@ -8,12 +8,12 @@
let
executableName = "element-desktop";
version = "1.7.23";
version = "1.7.24";
src = fetchFromGitHub {
owner = "vector-im";
repo = "element-desktop";
rev = "v${version}";
sha256 = "0vvjbh81h6sg6dbm9d6ffav0dim9sadvs67jcm702677qgigkc53";
sha256 = "sha256-16sqiOwJvKTs6MPmdkuiPhnr1G7ErWCT5ctp5xqZRlk=";
};
in mkYarnPackage rec {
name = "element-desktop-${version}";

4
pkgs/applications/networking/instant-messengers/element/element-web.nix
View File

@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "element-web";
version = "1.7.23";
version = "1.7.24";
src = fetchurl {
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
sha256 = "10n899gc3qcjy2cskk0whwz60pnvh500x1b57kn22l9bhkg9xkvp";
sha256 = "sha256-u6mcO+MMjrr2YujVVcsaA7qsruirmHJz3o8nAPOecSU=";
};
installPhase = ''

61
pkgs/applications/networking/zerobin/default.nix Normal file
View File

@ -0,0 +1,61 @@
{ lib
, python3Packages
, fetchFromGitHub
, nodePackages
}:
python3Packages.buildPythonApplication rec {
pname = "zerobin";
version = "1.0.5";
src = fetchFromGitHub {
owner = "Tygs";
repo = "0bin";
rev = "v${version}";
sha256 = "1dfy3h823ylz4w2vv3mrmnmiyvf6rvyvsp4j3llr074w9id0zy16";
};
disabled = python3Packages.pythonOlder "3.7";
nativeBuildInputs = [
python3Packages.doit
python3Packages.pyscss
nodePackages.uglify-js
];
propagatedBuildInputs = with python3Packages; [
appdirs
beaker
bleach
bottle
clize
lockfile
paste
];
prePatch = ''
# replace /bin/bash in compress.sh
patchShebangs .
# relax version constraints of some dependencies
substituteInPlace setup.cfg \
--replace "bleach==3.1.5" "bleach>=3.1.5,<4" \
--replace "bottle==0.12.18" "bottle>=0.12.18,<1" \
--replace "Paste==3.4.3" "Paste>=3.4.3,<4"
'';
buildPhase = ''
runHook preBuild
doit build
runHook postBuild
'';
# zerobin has no check, but checking would fail with:
# nix_run_setup runserver: Received extra arguments: test
# See https://github.com/NixOS/nixpkgs/pull/98734#discussion_r495823510
doCheck = false;
meta = with lib; {
description = "A client side encrypted pastebin";
homepage = "https://0bin.net/";
license = licenses.wtfpl;
platforms = platforms.all;
maintainers = with maintainers; [ julm ];
};
}

4
pkgs/applications/terminal-emulators/xterm/default.nix
View File

@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
pname = "xterm";
version = "366";
version = "367";
src = fetchurl {
urls = [
"ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"
"https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"
];
sha256 = "0vmzffy3hzgcgwx305h07ars5sxsq6nnl1ir4xqpxs9zjs2ji2w5";
sha256 = "07y51l06n344pjyxdddq6sdvxw25nl10irl4avynkqjnqyqsiw97";
};
buildInputs = [

7
pkgs/applications/virtualization/qemu/default.nix
View File

@ -101,6 +101,12 @@ stdenv.mkDerivation rec {
})
];
# Otherwise tries to ensure /var/run exists.
postPatch = ''
sed -i "/install_subdir('run', install_dir: get_option('localstatedir'))/d" \
qga/meson.build
'';
preConfigure = ''
unset CPP # intereferes with dependency calculation
# this script isn't marked as executable b/c it's indirectly used by meson. Needed to patch its shebang
@ -119,6 +125,7 @@ stdenv.mkDerivation rec {
"--enable-docs"
"--enable-tools"
"--enable-guest-agent"
"--localstatedir=/var"
"--sysconfdir=/etc"
]
++ optional numaSupport "--enable-numa"

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

@ -2,13 +2,13 @@
stdenv.mkDerivation (rec {
pname = "rnnoise";
version = "2020-06-28";
version = "2021-01-22";
src = fetchFromGitHub {
owner = "xiph";
repo = "rnnoise";
rev = "90ec41ef659fd82cfec2103e9bb7fc235e9ea66c";
sha256 = "02z6qzjajhlpsb80lwl7cqqga9hm638psnqnppjkw84w4lrp15ny";
rev = "1cbdbcf1283499bbb2230a6b0f126eb9b236defd";
sha256 = "1y0rzgmvy8bf9a431garpm2w177s6ajgf79y5ymw4yb0pik57rwb";
};
nativeBuildInputs = [ autoreconfHook ];

21
pkgs/development/python-modules/beaker/default.nix
View File

@ -1,6 +1,8 @@
{ lib
{ stdenv
, lib
, buildPythonPackage
, fetchFromGitHub
, glibcLocales
, nose
, pylibmc
, memcached
@ -19,14 +21,14 @@
buildPythonPackage rec {
pname = "Beaker";
version = "1.10.1";
version = "1.11.0";
# The pypy release do not contains the tests
src = fetchFromGitHub {
owner = "bbangert";
repo = "beaker";
rev = version;
sha256 = "0xrvg503xmi28w0hllr4s7fkap0p09fgw2wax3p1s2r6b3xjvbz7";
sha256 = "059sc7iar90lc2y9mppdis5ddfcxyirz03gmsfb0307f5dsa1dhj";
};
propagatedBuildInputs = [
@ -39,16 +41,16 @@ buildPythonPackage rec {
];
checkInputs = [
nose
mock
webtest
pylibmc
glibcLocales
memcached
redis
mock
nose
pylibmc
pymongo
redis
webtest
];
# Can not run memcached tests because it immediately tries to connect
postPatch = lib.optionalString isPy3k ''
substituteInPlace setup.py \
@ -66,6 +68,7 @@ buildPythonPackage rec {
nosetests \
-e ".*test_ext_.*" \
-e "test_upgrade" \
${lib.optionalString (!stdenv.isLinux) ''-e "test_cookie_expires_different_locale"''} \
-vv tests
'';

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

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
version = "1.17.34"; # N.B: if you change this, change botocore and awscli to a matching version
version = "1.17.39"; # N.B: if you change this, change botocore and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "sha256-jzPLPS/EKwVHpVYKbXOXqpMzb1CJk4Z2KyRQaCwOmSs=";
sha256 = "sha256-tYFP9ztbj8hgHBtztwZ1gH+c5kcTVi4YOghBWiUW7tQ=";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

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

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
version = "1.20.34"; # N.B: if you change this, change boto3 and awscli to a matching version
version = "1.20.39"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "sha256-dJvbFR40AynxslYAv+nSI+kw+LomvXS3FHjKV4Hy/q8=";
sha256 = "sha256-KFBtI/+pq/VmbCyQnH7cg6ERLNRP506xpJYN9WFTHpg=";
};
propagatedBuildInputs = [

3
pkgs/development/python-modules/pyscss/default.nix
View File

@ -26,6 +26,9 @@ buildPythonPackage rec {
++ (lib.optionals (pythonOlder "3.4") [ enum34 pathlib ])
++ (lib.optionals (pythonOlder "2.7") [ ordereddict ]);
# Test suite is broken.
# See https://github.com/Kronuz/pyScss/issues/415
doCheck = false;
checkPhase = ''
py.test
'';

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

@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "sagemaker";
version = "2.31.0";
version = "2.32.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-RMw7l3s0QBzB+exiZg2aBQYeprHUJM+f0Rf+N8ywaBU=";
sha256 = "sha256-gwymCOwmA++FCy0Zl+MxPMbPp+kmNFpx9Azuc34m+J0=";
};
pythonImportsCheck = [

33
pkgs/development/python-modules/zerobin/default.nix
View File

@ -1,33 +0,0 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, cherrypy
, bottle
, lockfile
, clize
}:
buildPythonPackage {
pname = "zerobin";
version = "20160108";
src = fetchFromGitHub {
owner = "sametmax";
repo = "0bin";
rev = "7da1615";
sha256 = "1pzcwy454kn5216pvwjqzz311s6jbh7viw9s6kw4xps6f5h44bid";
};
propagatedBuildInputs = [ cherrypy bottle lockfile clize ];
# zerobin doesn't have any tests, but includes a copy of cherrypy which
# can wrongly fail the check phase.
doCheck = false;
meta = with lib; {
description = "A client side encrypted pastebin";
homepage = "https://0bin.net/";
license = licenses.wtfpl;
};
}

565
pkgs/development/tools/wasm-bindgen-cli/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

6
pkgs/development/tools/wasm-bindgen-cli/default.nix
View File

@ -4,7 +4,7 @@
rustPlatform.buildRustPackage rec {
pname = "wasm-bindgen-cli";
version = "0.2.69";
version = "0.2.73";
src =
let
@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
owner = "rustwasm";
repo = "wasm-bindgen";
rev = version;
sha256 = "1psylk3hlx0ahwib3ph8qdk0jwlp8qzc6dv61002rj7ns28vs4mx";
sha256 = "sha256-JrfS9Z/ZqhoZXJxrxMSLpl2NiktTUkjW6q3xN9AU2zw=";
};
in runCommand "source" { } ''
cp -R ${tarball} $out
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
nativeBuildInputs = [ pkg-config ];
cargoSha256 = "1wrfly7c3an1mjqm7v13mlvx57hwlcxfjijkimicck04q6qdhbp6";
cargoSha256 = "sha256-2UBCcA4eBrSHrJjJdDprsysiOObg2GrC7QtveAydbhk=";
cargoBuildFlags = [ "-p" pname ];
meta = with lib; {

40
pkgs/games/pinball/default.nix Normal file
View File

@ -0,0 +1,40 @@
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config
, libglvnd, SDL, SDL_image, SDL_mixer, xorg
}:
stdenv.mkDerivation rec {
pname = "pinball";
version = "0.3.20201218";
src = fetchurl {
url = "mirror://sourceforge/pinball/pinball-${version}.tar.gz";
sha256 = "0vacypp3ksq1hs6hxpypx7nrfkprbl4ksfywcncckwrh4qcir631";
};
postPatch = ''
sed -i 's/^AUTOMAKE_OPTIONS = gnu$/AUTOMAKE_OPTIONS = foreign/' Makefile.am
'';
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libglvnd SDL SDL_image SDL_mixer xorg.libSM ];
strictDeps = true;
configureFlags = [
"--with-sdl-prefix=${lib.getDev SDL}"
];
NIX_CFLAGS_COMPILE = [
"-I${lib.getDev SDL_image}/include/SDL"
"-I${lib.getDev SDL_mixer}/include/SDL"
];
enableParallelBuilding = true;
meta = with lib; {
homepage = "https://purl.org/rzr/pinball";
description = "Emilia Pinball simulator";
license = licenses.gpl2Only;
maintainers = with maintainers; [ qyliss ];
platforms = platforms.linux;
};
}

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

@ -389,12 +389,12 @@ let
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
version = "2021-03-26";
version = "2021-03-27";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "a1d8f109efba85a98253b743a367e00a042df8cb";
sha256 = "1lyyqkfcmsgqdmd7r0qs0b46c125q6jix833jcc954pgzwlfrk0a";
rev = "7efa17a4193a9835b4b29f9ae3accdc86174cdcf";
sha256 = "0zya44l1svf7f97w2h4jql3zn86nhv8r8lk416xiy22g6kw37xsl";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@ -858,12 +858,12 @@ let
dashboard-nvim = buildVimPluginFrom2Nix {
pname = "dashboard-nvim";
version = "2021-03-14";
version = "2021-03-27";
src = fetchFromGitHub {
owner = "glepnir";
repo = "dashboard-nvim";
rev = "563c8c1885044ad3fbb5339ad5a10439d9899e51";
sha256 = "0xp6dpdz45lfqx0s6xhxkgxwnbbdwiaybjvb0qfyh2pziirxdrxm";
rev = "81b804d4009a9abacc259c542871c34852ec65a3";
sha256 = "0cwarklmyj4wfvjmh7f1nlxnrx8vfvjbrlz3l3j6wc3amcd12kik";
};
meta.homepage = "https://github.com/glepnir/dashboard-nvim/";
};
@ -942,12 +942,12 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
version = "2021-03-25";
version = "2021-03-27";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
rev = "4c8eb502feb8e9601cbcd82ea937aa620a6626b4";
sha256 = "1hgcdl29rn0ag12k663qfx9z3drl94xi0n50jcisk5z4y8xpi6r4";
rev = "7cce9b9e9e1d2c44e07574572f730018d9c7ab9a";
sha256 = "1cazz5ykfl6k0l3cxs3g60n9a5rrd78w0517861lbg9vwll7llw6";
};
meta.homepage = "https://github.com/Shougo/denite.nvim/";
};
@ -1643,12 +1643,12 @@ let
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
version = "2021-03-25";
version = "2021-03-27";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
rev = "2e371a3b89a85ea74afcd2f2926b23919a96e1c8";
sha256 = "0bw2sc02w8ln9sj86p0iwfcwi51n4xyxkby9ib37y3mdiz623vig";
rev = "4ac3ea179d0f751ed1d9300fae63719f55085d7b";
sha256 = "0a5czpf6808xrr327c9kcg68br6whfv41rp4w9073kvf1ir32kp3";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@ -2328,12 +2328,12 @@ let
lspsaga-nvim = buildVimPluginFrom2Nix {
pname = "lspsaga-nvim";
version = "2021-03-20";
version = "2021-03-26";
src = fetchFromGitHub {
owner = "glepnir";
repo = "lspsaga.nvim";
rev = "855a8d816fa4fcd4cc378b32585474bf407812eb";
sha256 = "1f440mmc6j2ybp86vaxwc0icvxl3l00i3vbr12knbcf2p3aigkm9";
rev = "9a377c6e727cff15b4c4c3657e36f3a36e559d50";
sha256 = "0cpyiwckn1dpgf6cyrlh1yffib3dckg18ac84c1bvpmvc37zvghy";
};
meta.homepage = "https://github.com/glepnir/lspsaga.nvim/";
};
@ -2724,12 +2724,12 @@ let
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
version = "2021-03-25";
version = "2021-03-27";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
rev = "84768d4ab4df212c7fe96785a007382218e0fc56";
sha256 = "0z86l7bwr6s3rmamhjyy5hg51f75ca2laki3pwpczfhllxbnwax5";
rev = "2f504fcf734ddb6b281a93e01782ecb0dae0774e";
sha256 = "07yjlqjkxz3g1vk2jd4ns7dppi0lmmzrb6ihj5vhvxgc6nfkh7gg";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@ -3012,24 +3012,24 @@ let
nvim-bqf = buildVimPluginFrom2Nix {
pname = "nvim-bqf";
version = "2021-03-25";
version = "2021-03-27";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-bqf";
rev = "ba1acb0440e3ddc96b1835ce89d910bae216e98b";
sha256 = "1kx5a5zngk8bw7qsklmhzvwqpc0nnhfcj9wasp28dayh3f35m5s0";
rev = "0c568588354c8aec104bb5dcbf833c9e7dfb89b4";
sha256 = "0kzncj80vibfypncc8jnc7wnnywj6ibylshzljpq60d88ib1py8k";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
};
nvim-bufferline-lua = buildVimPluginFrom2Nix {
pname = "nvim-bufferline-lua";
version = "2021-03-22";
version = "2021-03-26";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-bufferline.lua";
rev = "437aa7cacc8eb6b7840e298f55666f4a6dea20e7";
sha256 = "15df8l8mx9cbm5mirn511d965nlxh5gj17d0b6rffxjlzc5ciai3";
rev = "e6953ebd37d79c8656cde6fae5ecf5aeb2483f47";
sha256 = "0k945yi8laaf0y1j770m6ywzbp6g5fl7k0dgk1hf3p1hczy6nhbm";
};
meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/";
};
@ -3156,12 +3156,12 @@ let
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
version = "2021-03-24";
version = "2021-03-27";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
rev = "b29410eff3459fc415048cd5569ad03d5e959296";
sha256 = "060ig6w3lhfp4lb83hmk7v33mfk6k5hs8ifpx5fvxk0v5g0cd9g1";
rev = "7a4049b3d05b0a91e12a9a2c874d7d96475af501";
sha256 = "1gp9flk6myq1y67hhavk7689rfib5na6y012dc78rnwmf2v6gc0z";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@ -3180,12 +3180,12 @@ let
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2021-03-26";
version = "2021-03-27";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "6bfb478a002081d59bafd2cc4fe6ef4ea1761c3b";
sha256 = "1vbqfbxybwrqc4nhi6v6qm5wc2a9zxh7mdh84897njkiykmwn09j";
rev = "97bdebef2c46404cb1441ea62658cdd797265f24";
sha256 = "1j7051cj4lim97kfpzhwgp95y63lk336yshbjsr89al9dxhvsaa3";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -3264,24 +3264,24 @@ let
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree-lua";
version = "2021-03-23";
version = "2021-03-26";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
rev = "e0b9882a8a8ecce8b58076091217d3643f215da3";
sha256 = "1i8mqa45gg0lagcd4q5qwp97zlynkdw42ajw0wh8r92i5bs9crd8";
rev = "709d6b968bd905db03521ea3f44bfcb56e4a2c03";
sha256 = "08amszn1a2dd8xs5339yhmjbwwhnwxxzzav8rhy1va48mq7safmr";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2021-03-24";
version = "2021-03-27";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "88ac3d23653a27973be8ff60e500848cacfcf968";
sha256 = "1diy0j045kcr38nwi641ccq89bzahfacicny2zphyrml1ff7hgff";
rev = "0df7c4aa39a6097e112f001520d2cea257440ed7";
sha256 = "1pb3nvq8f1nvpp184gwqs386kimxvca3wjrdiz74mb5jkhz1khq1";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -3346,6 +3346,18 @@ let
meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/";
};
nvim-whichkey-setup-lua = buildVimPluginFrom2Nix {
pname = "nvim-whichkey-setup-lua";
version = "2021-03-26";
src = fetchFromGitHub {
owner = "AckslD";
repo = "nvim-whichkey-setup.lua";
rev = "59aa0a4287adf6c2c9faabf912cdc005230e7c98";
sha256 = "093yjj28ak1ifbkn1s69wx8ldinj4v2bpf82fhqziw6d58ghwang";
};
meta.homepage = "https://github.com/AckslD/nvim-whichkey-setup.lua/";
};
nvim-yarp = buildVimPluginFrom2Nix {
pname = "nvim-yarp";
version = "2020-04-08";
@ -3769,12 +3781,12 @@ let
registers-nvim = buildVimPluginFrom2Nix {
pname = "registers-nvim";
version = "2021-03-21";
version = "2021-03-27";
src = fetchFromGitHub {
owner = "tversteeg";
repo = "registers.nvim";
rev = "ba84c085ca868515520310073d922132fd811a24";
sha256 = "02qadqyppn7w2ssc7m7zqr5s9iknhj0fbg88w2mdn7s4kcf8jyim";
rev = "69f49a0185fb9c08454d74f441dfe216d18e6a82";
sha256 = "12mgbfysm7cn2qahpmr08451avanvzjzngylf95ss0r2s65whlk4";
};
meta.homepage = "https://github.com/tversteeg/registers.nvim/";
};
@ -4443,12 +4455,12 @@ let
tmux-complete-vim = buildVimPluginFrom2Nix {
pname = "tmux-complete-vim";
version = "2019-11-10";
version = "2021-03-26";
src = fetchFromGitHub {
owner = "wellle";
repo = "tmux-complete.vim";
rev = "7237d8d8d60af7916e3b546a9f4f396df95a1b21";
sha256 = "05ypjahaf7gk4vjc8hhglmw7y8vyjxyhxq8sm0s3np05aw0gdbsc";
rev = "87f6f96c73b599554d1d7f313413d7f9d0336096";
sha256 = "0bqh08q1jv05srd15bp9zrlrdzavxy83v153balvhrrvg3z4lk4x";
};
meta.homepage = "https://github.com/wellle/tmux-complete.vim/";
};
@ -4888,12 +4900,12 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
version = "2021-03-09";
version = "2021-03-27";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
rev = "09dbd09ed3b6318ca4c3cda8f61f02f1bc8ce783";
sha256 = "0hi4yvd5b8il63a42kk10hxc8ixb1khf8h8q601qipkvgla8mpiy";
rev = "ed60e1d36912f64fdbed5640532b1067e11557ca";
sha256 = "0yijan5nknkkxr36rncscm043badn49w6778nwyazi2fx4266jfn";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
@ -5512,12 +5524,12 @@ let
vim-dispatch = buildVimPluginFrom2Nix {
pname = "vim-dispatch";
version = "2021-03-20";
version = "2021-03-26";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-dispatch";
rev = "895c8fa958018fa3366f0e70a18cfeb73a204588";
sha256 = "10q8xgbds6r34ka004qvzd3nkkqv8sas5ca7vx0jwvyhglijy644";
rev = "4313cbb398d8b61b08be09f9b5a9ae4270c86004";
sha256 = "154vxj4bd10i70wd0d40g9j2yji6l5y00a0y4xk9402x5yljjmwr";
};
meta.homepage = "https://github.com/tpope/vim-dispatch/";
};
@ -5872,12 +5884,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
version = "2021-03-25";
version = "2021-03-26";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
rev = "7de9b5a04b9ab63bba381d3cc2c48331ba8e4e7f";
sha256 = "0d33gzblnz4gzd6grfmyb5rfp59jcj86n95ajwn9q2d4snk45h4n";
rev = "eaee845abaf75827cc3c6a3f96d7ff77a3a8beff";
sha256 = "1m5yns33a92mhhjbpba76hnkai0d45k7iwqwdlm524c90cmkff55";
};
meta.homepage = "https://github.com/tpope/vim-fugitive/";
};
@ -5992,12 +6004,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
version = "2021-03-22";
version = "2021-03-26";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
rev = "00c5f2dad170131c0c850dbf331d63ddf515116d";
sha256 = "07ckmqxl25hzv10iarj6xdhg65q8450zriqc9wd6c2hlldj45ys3";
rev = "80d0e38fbdc3b5e88133e730fc563414a0403485";
sha256 = "070by6ki5zw112ia4gvm3zasr1qliysb7lag6s0x7vh1ywdzg9ii";
};
meta.homepage = "https://github.com/fatih/vim-go/";
};
@ -6486,12 +6498,12 @@ let
vim-kitty-navigator = buildVimPluginFrom2Nix {
pname = "vim-kitty-navigator";
version = "2020-12-16";
version = "2021-03-27";
src = fetchFromGitHub {
owner = "knubie";
repo = "vim-kitty-navigator";
rev = "ee9252c62bcdc22e8326373ba1716442658b19d1";
sha256 = "1885gwbv2a4bwwydn129hd7xjgqp0cfjqkm0zw8lfylxgxadg0zb";
rev = "b417bfd95d573254de7dbc4efd2ee12301f2e4a1";
sha256 = "0ai14s0a2i5xiak2n102ji9nhhv3lgkr32prcdl9snfybniy9l7b";
};
meta.homepage = "https://github.com/knubie/vim-kitty-navigator/";
};
@ -8372,12 +8384,12 @@ let
vim-which-key = buildVimPluginFrom2Nix {
pname = "vim-which-key";
version = "2021-02-09";
version = "2021-03-26";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-which-key";
rev = "68bd1775277ad5677ebf5cdc774ca3ba4755d457";
sha256 = "1pg179iz0xvd6r7xks7qrn1c7vh7zmp39s9axhdgp7jisqbhaaqx";
rev = "9b80ded965f088d03ec45bbc9de6cc9119d38d7f";
sha256 = "1rmj8agpyqyrclbvhv3d4wpdrk1cp5xz4sh57d4xymnh0fjb56db";
};
meta.homepage = "https://github.com/liuchengxu/vim-which-key/";
};
@ -8819,12 +8831,12 @@ let
zephyr-nvim = buildVimPluginFrom2Nix {
pname = "zephyr-nvim";
version = "2021-03-23";
version = "2021-03-27";
src = fetchFromGitHub {
owner = "glepnir";
repo = "zephyr-nvim";
rev = "79e273ed8ff386a81e6a88ae888ec6d878a9dcbc";
sha256 = "00x0b2lwrfkmny6rhwjrb1kyp2lai597f6f62whhwgw7iq9j5b5k";
rev = "d0ece1ef669d5799ab4184b05deca74943270232";
sha256 = "0p959ih2xkcskk83fn92w9g0xdqs93s5lq5sq7hw6frc6plk3fh1";
};
meta.homepage = "https://github.com/glepnir/zephyr-nvim/";
};

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

@ -1,5 +1,6 @@
907th/vim-auto-save
aca/completion-tabnine
AckslD/nvim-whichkey-setup.lua@main
ackyshake/Spacegray.vim@main
airblade/vim-gitgutter
airblade/vim-rooter

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

@ -28,11 +28,11 @@ let
in
with py.pkgs; buildPythonApplication rec {
pname = "awscli";
version = "1.19.34"; # N.B: if you change this, change botocore and boto3 to a matching version too
version = "1.19.39"; # N.B: if you change this, change botocore and boto3 to a matching version too
src = fetchPypi {
inherit pname version;
sha256 = "sha256-RJ+ibZmOxH4r+pGI/rrkRES89u0IRUU3sSE5OFSJ2qw=";
sha256 = "sha256-qX8ThQwvwc5wGud5Q4KqO24kGdqvi3oK7K71O5aeJeQ=";
};
# https://github.com/aws/aws-cli/issues/4837

4
pkgs/tools/security/bitwarden_rs/vault.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bitwarden_rs-vault";
version = "2.18.1b";
version = "2.19.0";
src = fetchurl {
url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz";
sha256 = "sha256-MwHTx4ITr2GuBS6qXD4m3aCinpJHQa0Wp0Bbmgg7ATQ=";
sha256 = "sha256:0yrk2b2d5sld4z60siacafdz95gqikcv4snzd6hwhq1l6kz151az";
};
buildCommand = ''

6
pkgs/tools/system/tre-command/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "tre-command";
version = "0.3.5";
version = "0.3.6";
src = fetchFromGitHub {
owner = "dduan";
repo = "tre";
rev = "v${version}";
sha256 = "1yhrawn8xdl84f5f56i8fikidrfbjnqw5ckjagk7f6ngpcjc0wxm";
sha256 = "1r84xzv3p0ml3wac2j7j5fkm7i93v2xvadb8f8al5wi57q39irj7";
};
cargoSha256 = "03zvykjmb61bn8h4pm93iayhw1d53qv3l635jxfii1q7kzjbdnx9";
cargoSha256 = "1nbfgz7njc10b0abs6zwi6wzhlwllps3wah6abc1mj5yhrzwccmh";
nativeBuildInputs = [ installShellFiles ];

64
pkgs/tools/typesetting/multimarkdown/default.nix
View File

@ -1,25 +1,34 @@
{ lib, stdenv, fetchgit, perl }:
{ lib
, stdenv
, fetchFromGitHub
, cmake
, perl
, pkg-config
}:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "multimarkdown";
version = "4.7.1";
version = "6.6.0";
src = fetchgit {
url = "https://github.com/fletcher/MultiMarkdown-4.git";
fetchSubmodules = true;
rev = "dd060247518715ef2b52be22b8f49d0e6d2c3a8b";
sha256 = "11f246r30q2fx4xw7valhqjj4mc4ydj5fv5f2kbl5h93y69q0bw7";
src = fetchFromGitHub {
owner = "fletcher";
repo = "MultiMarkdown-6";
rev = version;
hash = "sha256-emJbY0wucoc/GdjlILoeqjwuwuPpTjXTqZN0gUKOyLg=";
};
preBuild = ''
substituteInPlace enumsToPerl.pl --replace "/usr/bin/perl" "${perl}/bin/perl"
postPatch = ''
patchShebangs tools/enumsToPerl.pl
'';
buildInputs = [ stdenv ];
checkPhase = "make test-all";
installPhase = "make pkg-install prefix='' DESTDIR=$out; make pkg-install-scripts prefix='' DESTDIR=$out";
nativeBuildInputs = [
cmake
perl
pkg-config
];
meta = with lib; {
homepage = "https://fletcher.github.io/MultiMarkdown-6/introduction.html";
description = "A derivative of Markdown that adds new syntax features";
longDescription = ''
MultiMarkdown is a lightweight markup language created by
@ -30,23 +39,20 @@ stdenv.mkDerivation {
It adds the following features to Markdown:
footnotes
tables
citations and bibliography (works best in LaTeX using BibTeX)
math support
automatic cross-referencing ability
smart typography, with support for multiple languages
image attributes
table and image captions
definition lists
glossary entries (LaTeX only)
document metadata (e.g. title, author, date, etc.)
- footnotes
- tables
- citations and bibliography (works best in LaTeX using BibTeX)
- math support
- automatic cross-referencing ability
- smart typography, with support for multiple languages
- image attributes
- table and image captions
- definition lists
- glossary entries (LaTeX only)
- document metadata (e.g. title, author, date, etc.)
'';
homepage = "https://fletcherpenney.net/multimarkdown/";
# licensed under GPLv2+ or MIT:
# https://raw.githubusercontent.com/fletcher/MultiMarkdown-4/master/LICENSE
license = with lib.licenses; [ gpl2Plus mit ];
license = with licenses; [ mit ];
platforms = platforms.all;
maintainers = with lib.maintainers; [ lowfatcomputing ];
maintainers = with maintainers; [ AndersonTorres ];
};
}

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

@ -26244,10 +26244,10 @@ in
wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]);
inherit (wayfireApplications) wayfire wcm;
wayfireApplications-unwrapped = callPackage ../applications/window-managers/wayfire/applications.nix { };
wayfirePlugins = callPackage ../applications/window-managers/wayfire/plugins.nix {
wayfireApplications-unwrapped = recurseIntoAttrs (callPackage ../applications/window-managers/wayfire/applications.nix { });
wayfirePlugins = recurseIntoAttrs (callPackage ../applications/window-managers/wayfire/plugins.nix {
inherit (wayfireApplications-unwrapped) wayfire;
};
});
wf-config = callPackage ../applications/window-managers/wayfire/wf-config.nix { };
waypipe = callPackage ../applications/networking/remote/waypipe { };
@ -26745,6 +26745,8 @@ in
zathura = callPackage ../applications/misc/zathura { };
zerobin = callPackage ../applications/networking/zerobin { };
zeroc-ice = callPackage ../development/libraries/zeroc-ice {
inherit (darwin.apple_sdk.frameworks) Security;
};
@ -27532,6 +27534,11 @@ in
boost = boost166;
};
pinball = callPackage ../games/pinball {
autoreconfHook = with buildPackages;
autoreconfHook.override { automake = automake115x; };
};
pingus = callPackage ../games/pingus {};
pioneer = callPackage ../games/pioneer { };

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

@ -9079,8 +9079,6 @@ in {
python3 = python;
})).py;
zerobin = callPackage ../development/python-modules/zerobin { };
zeroc-ice = callPackage ../development/python-modules/zeroc-ice { };
zeroconf = callPackage ../development/python-modules/zeroconf { };