mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
e706db2a81
@ -5148,6 +5148,12 @@
|
||||
githubId = 3656888;
|
||||
name = "hhm";
|
||||
};
|
||||
hhydraa = {
|
||||
email = "hcurfman@keemail.me";
|
||||
github = "hhydraa";
|
||||
githubId = 58676303;
|
||||
name = "hhydraa";
|
||||
};
|
||||
higebu = {
|
||||
name = "Yuya Kusakabe";
|
||||
email = "yuya.kusakabe@gmail.com";
|
||||
|
||||
@ -186,7 +186,7 @@ in {
|
||||
description = "Real time performance monitoring";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = (with pkgs; [ curl gawk iproute2 which procps ])
|
||||
path = (with pkgs; [ curl gawk iproute2 which procps bash ])
|
||||
++ lib.optional cfg.python.enable (pkgs.python3.withPackages cfg.python.extraPackages)
|
||||
++ lib.optional config.virtualisation.libvirtd.enable (config.virtualisation.libvirtd.package);
|
||||
environment = {
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "mopidy-youtube";
|
||||
version = "3.5";
|
||||
version = "3.6";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "natumbri";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hlokysFFgZZYY7flghgRq6wVG824kpcLkXxk6nMhxn4=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Mp8eCVNGokJRwmYiZYCYRwV1QVDV02Uqfh6fGcPgJss=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null;
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "mandelbulber";
|
||||
version = "2.27";
|
||||
version = "2.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buddhi1980";
|
||||
repo = "mandelbulber2";
|
||||
rev = version;
|
||||
sha256 = "sha256-CNIt+DC3ZYyT8EY1t641y7jW7vn7Rr1PLOsy9bjKaDk=";
|
||||
sha256 = "sha256-NrXfEUoTJSz8C6rNU+tSO4PUUo5YWP0bknzXQieOqDc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
61
pkgs/applications/misc/warpd/default.nix
Normal file
61
pkgs/applications/misc/warpd/default.nix
Normal file
@ -0,0 +1,61 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, git
|
||||
, libXi
|
||||
, libXinerama
|
||||
, libXft
|
||||
, libXfixes
|
||||
, libXtst
|
||||
, libX11
|
||||
, libXext
|
||||
, waylandSupport ? false, cairo, libxkbcommon, wayland
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "warpd";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rvaiya";
|
||||
repo = "warpd";
|
||||
rev = "v${version}";
|
||||
sha256 = "AR/uLgNX1VLPEcfUd8cnplMiaoEJlUxQ55Fst62RnbI=";
|
||||
leaveDotGit = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ git ];
|
||||
|
||||
buildInputs = [
|
||||
libXi
|
||||
libXinerama
|
||||
libXft
|
||||
libXfixes
|
||||
libXtst
|
||||
libX11
|
||||
libXext
|
||||
] ++ lib.optionals waylandSupport [
|
||||
cairo
|
||||
libxkbcommon
|
||||
wayland
|
||||
];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace '-m644' '-Dm644' \
|
||||
--replace '-m755' '-Dm755' \
|
||||
--replace 'warpd.1.gz $(DESTDIR)' 'warpd.1.gz -t $(DESTDIR)' \
|
||||
--replace 'bin/warpd $(DESTDIR)' 'bin/warpd -t $(DESTDIR)'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A modal keyboard driven interface for mouse manipulation.";
|
||||
homepage = "https://github.com/rvaiya/warpd";
|
||||
changelog = "https://github.com/rvaiya/warpd/blob/${src.rev}/CHANGELOG.md";
|
||||
maintainers = with maintainers; [ hhydraa ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
let
|
||||
pname = "electron-mail";
|
||||
version = "4.14.0";
|
||||
version = "5.0.1";
|
||||
name = "ElectronMail-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage";
|
||||
sha256 = "sha256-sahMEj9m10gsceTBnYk8wkWcQoM5s6s1ek1U6u3PTgw=";
|
||||
sha256 = "sha256-w6ZZPIJnAlA8WhNHtM9gsjr7U6wMYT21fGFmkDDAVJU=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit name src; };
|
||||
@ -30,7 +30,7 @@ in appimageTools.wrapType2 {
|
||||
meta = with lib; {
|
||||
description = "ElectronMail is an Electron-based unofficial desktop client for ProtonMail";
|
||||
homepage = "https://github.com/vladimiry/ElectronMail";
|
||||
license = licenses.mit;
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.princemachiavelli ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
|
||||
@ -87,6 +87,17 @@ let
|
||||
x86hash = "f2dc1fd64e5314b62ba87f384958c2bbd48b06b55bed10345cddb05fdc8cffa1";
|
||||
x64suffix = "16";
|
||||
x86suffix = "16";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest2.html";
|
||||
};
|
||||
|
||||
"22.07.0" = {
|
||||
major = "22";
|
||||
minor = "7";
|
||||
patch = "0";
|
||||
x64hash = "a17e4478ad3eac4b0cbc9fb7be0dba2758393ba2d3b6a82b3074ff053586c5f5";
|
||||
x86hash = "f08d9c83a1af7873cbb864b26ec24d731fdc2e5045adee982eeef4083982c5bc";
|
||||
x64suffix = "20";
|
||||
x86suffix = "20";
|
||||
homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html";
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, stdenv, fetchFromGitHub, jdk, maven, javaPackages }:
|
||||
|
||||
let
|
||||
version = "0.9.2";
|
||||
version = "0.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gephi";
|
||||
repo = "gephi";
|
||||
rev = "v${version}";
|
||||
sha256 = "0kqp2nvnsb55j1axb6hk0mlw5alyaiyb70z0mdybhpqqxyw2da2r";
|
||||
sha256 = "sha256-3+tOwcE7TUeexJCugFsx9SgsKeb7ApNqbMEIi9QaKPE=";
|
||||
};
|
||||
|
||||
# perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB)
|
||||
@ -24,7 +24,7 @@ let
|
||||
installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete'';
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "1p7yf97dn0nvr005cbs6vdk3i341s8fya4kfccj8qqad2qgxflif";
|
||||
outputHash = "sha256-kIPsZN0alRAgiMbckQnMWKOKtCZ37D/6MgT17VYcr+s=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@ -45,14 +45,14 @@ let
|
||||
in python3.pkgs.buildPythonApplication rec {
|
||||
pname = "manim";
|
||||
format = "pyproject";
|
||||
version = "0.15.2";
|
||||
version = "0.16.0";
|
||||
disabled = python3.pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ManimCommunity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "l5JiFWCMQbGnwRRtYzCHBXdVzWBrTNPdcIYaAt/wRNA=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-NQI+kJV0Mu2O/DlwwLYQw2jjJk/TmR7avBX9Fe7zmdk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -258,6 +258,10 @@ stdenv.mkDerivation rec {
|
||||
--replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
|
||||
substituteInPlace doc/filters.texi \
|
||||
--replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
|
||||
'' +
|
||||
# ffmpeg 5.1 https://trac.ffmpeg.org/ticket/9841
|
||||
''
|
||||
substituteInPlace tests/Makefile --replace 'include $(SRC_PATH)/tests/fate/imf.mak' ""
|
||||
'';
|
||||
|
||||
configurePlatforms = [];
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
}@args:
|
||||
|
||||
callPackage ./generic.nix (rec {
|
||||
version = "5.0.1";
|
||||
version = "5.1";
|
||||
branch = version;
|
||||
sha256 = "sha256-KN8z1AChwcGyDQepkZeAmjuI73ZfXwfcH/Bn+sZMWdY=";
|
||||
sha256 = "sha256-MrVvsBzpDUUpWK4l6RyVZKv0ntVFPBJ77CPGPlMKqPo=";
|
||||
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
|
||||
} // args)
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libstrophe";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "strophe";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-YJ8A97ECc3VxdGfhUu0YYijAamnrHCO6kr7TAIan96o=";
|
||||
sha256 = "sha256-hNUpHuLwnq66w/VbVAv3QqBFOXDOzd/xPtGGX+j9K2U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem
|
||||
, libX11, libXext, qttools, wrapQtAppsHook
|
||||
, gitUpdater
|
||||
}:
|
||||
@ -24,6 +24,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
sourceRoot = "source/Kvantum";
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# add xdg dirs support
|
||||
url = "https://github.com/tsujan/Kvantum/commit/01989083f9ee75a013c2654e760efd0a1dea4a68.patch";
|
||||
hash = "sha256-HPx+p4Iek/Me78olty1fA0dUNceK7bwOlTYIcQu8ycc=";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Fix plugin dir
|
||||
substituteInPlace style/style.pro \
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cloud-nuke";
|
||||
version = "0.12.2";
|
||||
version = "0.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZBhuRv5IF2VmbvGtXLzVnY3eSso+TSCS05UvCbjtSZ0=";
|
||||
sha256 = "sha256-11oi67826JALCebxwbbX0pJ2XyK7+2hUpsNfYKZ2Bng=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-N4oyyWY/ANuRFxnfBBAGwacofaYR5/ZH867W/2sm+Gk=";
|
||||
vendorSha256 = "sha256-DhFwTh7Bm2mPwXFBiYFylYKqWWcSm5/Cv2tXOJsPqm4=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];
|
||||
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "frugal";
|
||||
version = "3.15.1";
|
||||
version = "3.15.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Workiva";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pRWTjlPTVwFzamq67hzb+ElqZuqP9aEAVz581DNMUBM=";
|
||||
sha256 = "sha256-5Q5HPS5MOOJRRUA0sRZS+QURDz52OGKgwuFswhqQFAg=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-ljZ3tpIJ+tg4UDBDzbse4M6ksb8AgPJLJCZeusMtQ0Q=";
|
||||
vendorSha256 = "sha256-Nqfhrf8zX5F35W3B/XW11Sw7M+mmIL/dfXl+zXqBL0g=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Thrift improved";
|
||||
|
||||
@ -20,22 +20,22 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "displaylink";
|
||||
version = "5.5.0-59.151";
|
||||
version = "5.6.0-59.176";
|
||||
|
||||
src = requireFile rec {
|
||||
name = "displaylink-55.zip";
|
||||
sha256 = "0pswmczzrqqq0s0ksp6rfnkm693ligq4nblki1v53jdh0y7d1gff";
|
||||
name = "displaylink-56.zip";
|
||||
sha256 = "1v9s4ksr4mnl629n24si14g762b7knr00sqacz60mxcmy4mch5fa";
|
||||
message = ''
|
||||
In order to install the DisplayLink drivers, you must first
|
||||
comply with DisplayLink's EULA and download the binaries and
|
||||
sources from here:
|
||||
|
||||
https://www.synaptics.com/products/displaylink-graphics/downloads/ubuntu-5.5
|
||||
https://www.synaptics.com/products/displaylink-graphics/downloads/ubuntu-5.6
|
||||
|
||||
Once you have downloaded the file, please use the following
|
||||
commands and re-run the installation:
|
||||
|
||||
mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu5.5-EXE.zip" \$PWD/${name}
|
||||
mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu5.6-EXE.zip" \$PWD/${name}
|
||||
nix-prefetch-url file://\$PWD/${name}
|
||||
'';
|
||||
};
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "mmc-utils";
|
||||
version = "unstable-2022-04-26";
|
||||
version = "unstable-2022-07-13";
|
||||
|
||||
src = fetchzip rec {
|
||||
url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${passthru.rev}.tar.gz";
|
||||
passthru.rev = "b7e4d5a6ae9942d26a11de9b05ae7d52c0802802";
|
||||
sha256 = "D2QgntRsa6Y39nCkXQupXFbJR++JfBpMeEZE0Gv0btc=";
|
||||
passthru.rev = "d7b343fd262880994f041ce2335442e7bd1071f5";
|
||||
sha256 = "cTF3xSNvZ1wifItPmflNFd+fpYArPRvinM7Cyg3JoeE=";
|
||||
};
|
||||
|
||||
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix=$(out)" ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "Tautulli";
|
||||
version = "2.10.1";
|
||||
version = "2.10.2";
|
||||
format = "other";
|
||||
|
||||
pythonPath = [ setuptools ];
|
||||
@ -12,7 +12,7 @@ buildPythonApplication rec {
|
||||
owner = "Tautulli";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qM3PiBZD0AfbhIdJFYFUGYhsB4U6ZZEW4i7S9waP7VE=";
|
||||
sha256 = "sha256-nEiyYpj5J95tQAFcyRlaF5VEfosCkk4cmdYKLjfeA98=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "lxd";
|
||||
version = "5.3";
|
||||
version = "5.4";
|
||||
|
||||
goPackagePath = "github.com/lxc/lxd";
|
||||
|
||||
@ -20,7 +20,7 @@ buildGoPackage rec {
|
||||
"https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"
|
||||
"https://github.com/lxc/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz"
|
||||
];
|
||||
sha256 = "sha256-DRdKCfp0nL3lg5O/Wm7vX2grO/DBuyhHRi85XI5laZU=";
|
||||
sha256 = "sha256-4jS2fFB30F4i+VjjJWvZHyYkUFRZk9Cq8bTOK9uZOTo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ytcc";
|
||||
version = "2.5.5";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "woefe";
|
||||
repo = "ytcc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DjyVcjU2dVku5ademm6DygMnzWHB7iMqPfU56BBjAwU=";
|
||||
sha256 = "sha256-NTG7CtmlJzrhgr/JRSQ1jjSpJEm+PlF67PlEbPNihFE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext installShellFiles ];
|
||||
|
||||
@ -4878,8 +4878,6 @@ with pkgs;
|
||||
|
||||
circus = callPackage ../tools/networking/circus { };
|
||||
|
||||
citrix_workspace = citrix_workspace_22_05_0;
|
||||
|
||||
cirrus-cli = callPackage ../development/tools/continuous-integration/cirrus-cli { };
|
||||
|
||||
inherit (callPackage ../applications/networking/remote/citrix-workspace { })
|
||||
@ -4890,7 +4888,9 @@ with pkgs;
|
||||
citrix_workspace_21_09_0
|
||||
citrix_workspace_21_12_0
|
||||
citrix_workspace_22_05_0
|
||||
citrix_workspace_22_07_0
|
||||
;
|
||||
citrix_workspace = citrix_workspace_22_07_0;
|
||||
|
||||
cmigemo = callPackage ../tools/text/cmigemo { };
|
||||
|
||||
@ -17724,9 +17724,7 @@ with pkgs;
|
||||
gecode_6 = qt5.callPackage ../development/libraries/gecode { };
|
||||
gecode = gecode_6;
|
||||
|
||||
gephi = callPackage ../applications/science/misc/gephi {
|
||||
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
gephi = callPackage ../applications/science/misc/gephi { };
|
||||
|
||||
gegl = callPackage ../development/libraries/gegl {
|
||||
inherit (darwin.apple_sdk.frameworks) OpenCL;
|
||||
@ -31157,6 +31155,8 @@ with pkgs;
|
||||
|
||||
warp = callPackage ../applications/networking/warp { };
|
||||
|
||||
warpd = callPackage ../applications/misc/warpd { };
|
||||
|
||||
w3m = callPackage ../applications/networking/browsers/w3m { };
|
||||
|
||||
# Should always be the version with the most features
|
||||
|
||||
Loading…
Reference in New Issue
Block a user