forked from mirrors/nixpkgs
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
711a4065ab
|
|
@ -4679,6 +4679,12 @@
|
|||
githubId = 993484;
|
||||
name = "Greg Hale";
|
||||
};
|
||||
imgabe = {
|
||||
email = "gabrielpmonte@hotmail.com";
|
||||
github = "imgabe";
|
||||
githubId = 24387926;
|
||||
name = "Gabriel Pereira";
|
||||
};
|
||||
imlonghao = {
|
||||
email = "nixos@esd.cc";
|
||||
github = "imlonghao";
|
||||
|
|
|
|||
|
|
@ -163,6 +163,15 @@ let cfg = config.services.xserver.libinput;
|
|||
'';
|
||||
};
|
||||
|
||||
transformationMatrix = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description = ''
|
||||
A string of 9 space-separated floating point numbers. Sets the transformation matrix to
|
||||
the 3x3 matrix where the first row is (abc), the second row is (def) and the third row is (ghi).
|
||||
'';
|
||||
};
|
||||
|
||||
disableWhileTyping = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
|
|
@ -196,6 +205,7 @@ let cfg = config.services.xserver.libinput;
|
|||
${optionalString (cfg.${deviceType}.accelSpeed != null) ''Option "AccelSpeed" "${cfg.${deviceType}.accelSpeed}"''}
|
||||
${optionalString (cfg.${deviceType}.buttonMapping != null) ''Option "ButtonMapping" "${cfg.${deviceType}.buttonMapping}"''}
|
||||
${optionalString (cfg.${deviceType}.calibrationMatrix != null) ''Option "CalibrationMatrix" "${cfg.${deviceType}.calibrationMatrix}"''}
|
||||
${optionalString (cfg.${deviceType}.transformationMatrix != null) ''Option "TransformationMatrix" "${cfg.${deviceType}.transformationMatrix}"''}
|
||||
${optionalString (cfg.${deviceType}.clickMethod != null) ''Option "ClickMethod" "${cfg.${deviceType}.clickMethod}"''}
|
||||
Option "LeftHanded" "${xorgBool cfg.${deviceType}.leftHanded}"
|
||||
Option "MiddleEmulation" "${xorgBool cfg.${deviceType}.middleEmulation}"
|
||||
|
|
@ -227,6 +237,7 @@ in {
|
|||
"sendEventsMode"
|
||||
"tapping"
|
||||
"tappingDragLock"
|
||||
"transformationMatrix"
|
||||
"disableWhileTyping"
|
||||
"additionalOptions"
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "Mopidy-Iris";
|
||||
version = "3.58.0";
|
||||
version = "3.58.2";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1bsmc4p7b6v4mm8fi9zsy0knzdccnz1dc6ckrdr18kw2ji0hiyx2";
|
||||
sha256 = "1cni9dd1c97bp92crjhsbwml12z8i6wkmj79zz8qvk46k8ixy3vp";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
let
|
||||
pname = "MyCrypto";
|
||||
version = "1.7.16";
|
||||
hash = "sha256-fvV/dT9tj8/d/kjM0dVj3IC/O7Y/yG8fscDCzUBwHKI=";
|
||||
version = "1.7.17";
|
||||
sha256 = "20eb48989b5ae5e60e438eff6830ac79a0d89ac26dff058097260e747e866444"; # Taken from release's checksums.txt.gpg
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mycryptohq/mycrypto/releases/download/${version}/linux-x86-64_${version}_MyCrypto.AppImage";
|
||||
inherit hash;
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
|
|
|||
85
pkgs/applications/video/clapper/default.nix
Normal file
85
pkgs/applications/video/clapper/default.nix
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
{ config
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, python3
|
||||
, pkg-config
|
||||
, ninja
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, desktop-file-utils
|
||||
, makeWrapper
|
||||
, shared-mime-info
|
||||
, wrapGAppsHook
|
||||
, meson
|
||||
, gjs
|
||||
, gtk4
|
||||
, gst_all_1
|
||||
, libadwaita
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clapper";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Rafostar";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1gf4z9lib5rxi1xilkxxyywakm9zlq5915w2wib09jyh0if82ahr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils # for update-desktop-database
|
||||
glib
|
||||
gobject-introspection
|
||||
meson
|
||||
ninja
|
||||
makeWrapper
|
||||
pkg-config
|
||||
python3
|
||||
shared-mime-info # for update-mime-database
|
||||
wrapGAppsHook # for gsettings
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gjs
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-plugins-ugly
|
||||
gtk4
|
||||
libadwaita
|
||||
wayland
|
||||
wayland-protocols
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs build-aux/meson/postinstall.py
|
||||
'';
|
||||
|
||||
mesonFlags = [
|
||||
# TODO: https://github.com/NixOS/nixpkgs/issues/36468
|
||||
"-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
cp ${src}/data/icons/*.svg $out/share/icons/hicolor/scalable/apps/
|
||||
cp ${src}/data/icons/*.svg $out/share/icons/hicolor/symbolic/apps/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A GNOME media player built using GJS with GTK4 toolkit and powered by GStreamer with OpenGL rendering. ";
|
||||
longDescription = ''
|
||||
Clapper is a GNOME media player build using GJS with GTK4 toolkit.
|
||||
The media player is using GStreamer as a media backend and renders everything via OpenGL.
|
||||
'';
|
||||
homepage = "https://github.com/Rafostar/clapper";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ tomfitzhenry ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "indilib";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "indilib";
|
||||
repo = "indi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qXGTHyXhJrApexQL31fba0ZvnHEyTsY3Tb7aB4GpGn4=";
|
||||
sha256 = "sha256-5MaN1aNyHpZzKwQPUpp9NYRh7i+lx1N70+J1gczdtAE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -40,7 +40,8 @@ stdenv.mkDerivation rec {
|
|||
postPatch = ''
|
||||
for f in indi-qsi/CMakeLists.txt \
|
||||
indi-dsi/CMakeLists.txt \
|
||||
indi-armadillo-platypus/CMakeLists.txt
|
||||
indi-armadillo-platypus/CMakeLists.txt \
|
||||
indi-orion-ssg3/CMakeLists.txt
|
||||
do
|
||||
substituteInPlace $f \
|
||||
--replace "/lib/udev/rules.d" "lib/udev/rules.d" \
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, lib, callPackage, fetchFromGitHub, indilib }:
|
||||
|
||||
let
|
||||
indi-version = "1.9.1";
|
||||
indi-version = "1.9.2";
|
||||
indi-3rdparty-src = fetchFromGitHub {
|
||||
owner = "indilib";
|
||||
repo = "indi-3rdparty";
|
||||
rev = "v${indi-version}";
|
||||
sha256 = "sha256-F0O4WUYdUL6IjJyON/XJp78v4n5rj0unm1xTzEsEH0k=";
|
||||
sha256 = "sha256-dpuJ/J5gc+kAklbvMjsWic9jusXWB4gUcT8E/1eSLXQ=";
|
||||
};
|
||||
indi-firmware = callPackage ./indi-firmware.nix {
|
||||
version = indi-version;
|
||||
|
|
|
|||
|
|
@ -27,12 +27,12 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "4.1.0";
|
||||
version = "4.2.1";
|
||||
sourceRoot = ".";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
|
||||
sha256 = "1svf9n345m0ag05hlcw3cwsl6bw2imcn4da25yyzcl3ar5axfxzk";
|
||||
sha256 = "Eup6oR4r2xLeHc65k5oi6W9aSAQ3yxfBIzedjg/fXoI=";
|
||||
};
|
||||
|
||||
# Update with `eval $(nix-build -A bazel.updater)`,
|
||||
|
|
@ -56,7 +56,7 @@ let
|
|||
else srcs."java_tools_javac11_linux-v10.6.zip")
|
||||
srcs."coverage_output_generator-v2.5.zip"
|
||||
srcs.build_bazel_rules_nodejs
|
||||
srcs."android_tools_pkg-0.19.0rc3.tar.gz"
|
||||
srcs."android_tools_pkg-0.23.0.tar.gz"
|
||||
srcs.bazel_toolchains
|
||||
srcs.com_github_grpc_grpc
|
||||
srcs.upb
|
||||
|
|
|
|||
|
|
@ -62,14 +62,14 @@
|
|||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837",
|
||||
"url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz"
|
||||
"sha256": "ed5290594244c2eeab41f0104519bcef51e27c699ff4b379fcbd25215270513e",
|
||||
"url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.23.0.tar.gz"
|
||||
},
|
||||
"android_tools_pkg-0.19.0rc3.tar.gz": {
|
||||
"name": "android_tools_pkg-0.19.0rc3.tar.gz",
|
||||
"sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837",
|
||||
"android_tools_pkg-0.23.0.tar.gz": {
|
||||
"name": "android_tools_pkg-0.23.0.tar.gz",
|
||||
"sha256": "ed5290594244c2eeab41f0104519bcef51e27c699ff4b379fcbd25215270513e",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz"
|
||||
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.23.0.tar.gz"
|
||||
]
|
||||
},
|
||||
"b1c40e1de81913a3c40e5948f78719c28152486d.zip": {
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "richgo";
|
||||
version = "0.3.6";
|
||||
version = "0.3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyoh86";
|
||||
repo = "richgo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ehhrJlB0XzLHkspvP6vL8MtrjE12baBFkbqWMD41/Sg=";
|
||||
sha256 = "sha256-yVt0iFH9tYCeIWJC16ve988xBXgt96357YiHfsxai7g=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-986Abeeb1MHB/0yN1oud6t8wHD5B5MisRHKZcwOq4tU=";
|
||||
vendorSha256 = "sha256-IJjJ4X3mv2PUmwzt5/hgv1N6R0w+EXGSrCS4q+INJrA=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
|
||||
version = "0.27.0";
|
||||
version = "0.27.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crawl";
|
||||
repo = "crawl";
|
||||
rev = version;
|
||||
sha256 = "sha256-TTdzFWoWn9OfxosEsxUjmDtPmtHukpT0J/0y4kUvBvo=";
|
||||
sha256 = "sha256-fyI7OIzhYXNTjIgJLqApyPMmiG3iof1b5XuGudNanos=";
|
||||
};
|
||||
|
||||
# Patch hard-coded paths and remove force library builds
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pioneer";
|
||||
version = "20210203";
|
||||
version = "20210723";
|
||||
|
||||
src = fetchFromGitHub{
|
||||
owner = "pioneerspacesim";
|
||||
repo = "pioneer";
|
||||
rev = version;
|
||||
sha256 = "sha256-51HXbX15uB1Xf9Re7Qi41BnJ9OW+GeXQhylJ+HwP0f8=";
|
||||
sha256 = "sha256-w+ECVv96MoS69815+X0PqguDiGDhHoTnAnnYtLpMScI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -117,15 +117,46 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
antfu.icons-carbon = buildVscodeMarketplaceExtension {
|
||||
antfu = {
|
||||
icons-carbon = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "icons-carbon";
|
||||
publisher = "antfu";
|
||||
version = "0.2.2";
|
||||
sha256 = "0mfap16la09mn0jhvy8s3dainrmjz64vra7d0d4fbcpgg420kv3f";
|
||||
};
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
slidev = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "antfu";
|
||||
name = "slidev";
|
||||
version = "0.3.2";
|
||||
sha256 = "sha256-vzmByEiKZIkd707Bs4RGQrMII5sghYlkQI6aAJOHFcY=";
|
||||
};
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
arcticicestudio.nord-visual-studio-code = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "icons-carbon";
|
||||
publisher = "antfu";
|
||||
version = "0.2.2";
|
||||
sha256 = "0mfap16la09mn0jhvy8s3dainrmjz64vra7d0d4fbcpgg420kv3f";
|
||||
name = "nord-visual-studio-code";
|
||||
publisher = "arcticicestudio";
|
||||
version = "0.18.0";
|
||||
sha256 = "sha256-Uo6peR+2ZNX6nwJ0Yar32Pe0rfBZ+f6ef1cYhUvVUbE=";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "An arctic, north-bluish clean and elegant Visual Studio Code theme.";
|
||||
downloadPage =
|
||||
"https://marketplace.visualstudio.com/items?itemName=arcticicestudio.nord-visual-studio-code";
|
||||
homepage = "https://github.com/arcticicestudio/nord-visual-studio-code";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ imgabe ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vsftpd";
|
||||
version = "3.0.3";
|
||||
version = "3.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://security.appspot.com/downloads/vsftpd-${version}.tar.gz";
|
||||
sha256 = "1xsyjn68k3fgm2incpb3lz2nikffl9by2safp994i272wvv2nkcx";
|
||||
sha256 = "sha256-JrYCrkVLC6bZnvRKCba54N+n9nIoEGc23x8njHC8kdM=";
|
||||
};
|
||||
|
||||
buildInputs = [ libcap openssl pam ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "oneshot";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raphaelreyna";
|
||||
repo = "oneshot";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LxLMETZzoeu7qEHpUFmo/h+7sdly+R5ZWsNhyttcbpA=";
|
||||
sha256 = "sha256-5NCGKgmioTOHGJEWMIEsZlA+072XXL9L8KbEH6+caHc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-rL/NWIIggvngTrdTDm1g1uH3vC55JF3cWllPc6Yb5jc=";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "peco";
|
||||
version = "0.5.8";
|
||||
version = "0.5.10";
|
||||
|
||||
subPackages = [ "cmd/peco" ];
|
||||
|
||||
|
|
@ -10,10 +10,10 @@ buildGoModule rec {
|
|||
owner = "peco";
|
||||
repo = "peco";
|
||||
rev = "v${version}";
|
||||
sha256 = "12xbqisk7bcy38fmjxcs069a0600gncbqzscqw6x37lgw6hlw52x";
|
||||
sha256 = "sha256-Iu2MclUbUYX1FuMnE65Qdk0S+5+K3HW86WIdQrNUyY8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1p8pc50ql2vqnn0crx0y558i3m0d6vcdaj3995h3f0908pnk6x7q";
|
||||
vendorSha256 = "sha256-+HQz7UUgATdgSWlI1dg2DdQRUSke9MyAtXgLikFhF90=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simplistic interactive filtering tool";
|
||||
|
|
|
|||
|
|
@ -23512,6 +23512,8 @@ with pkgs;
|
|||
|
||||
cipher = callPackage ../applications/misc/cipher { };
|
||||
|
||||
clapper = callPackage ../applications/video/clapper { };
|
||||
|
||||
claws-mail-gtk2 = callPackage ../applications/networking/mailreaders/claws-mail {
|
||||
inherit (xorg) libSM;
|
||||
useGtk3 = false;
|
||||
|
|
|
|||
Loading…
Reference in a new issue