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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-11-29 06:01:21 +00:00 committed by GitHub
commit 60dbc4d7a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 162 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/misc/ola/default.nix
View File

@ -4,6 +4,7 @@
, bison
, flex
, pkg-config
, libftdi1
, libuuid
, cppunit
, protobuf
@ -26,7 +27,17 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoreconfHook bison flex pkg-config perl ];
buildInputs = [ libuuid cppunit protobuf zlib avahi libmicrohttpd python3 ];
buildInputs = [
# required for ola-ftdidmx plugin (support for 'dumb' FTDI devices)
libftdi1
libuuid
cppunit
protobuf
zlib
avahi
libmicrohttpd
python3
];
propagatedBuildInputs = [
python3.pkgs.protobuf
python3.pkgs.numpy

4
pkgs/data/icons/numix-icon-theme-circle/default.nix
View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-circle";
version = "22.11.05";
version = "22.11.26";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "sha256-1SeXPkqBakqJMys5GQXdcSkI2I/VpnEWD1BZAHFWfCs=";
sha256 = "sha256-LdSHzIgXDixRI8xIwBrH7lqzUQbXdJXu5gFd9x8Ytzs=";
};
nativeBuildInputs = [ gtk3 ];

4
pkgs/data/icons/numix-icon-theme-square/default.nix
View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-square";
version = "22.11.05";
version = "22.11.26";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "sha256-XHf9YzZ9VY63Jv7HXSL2NAfft1VYeMzcqd9+vz1CBhg=";
sha256 = "sha256-aHDO/Qi3NeF2dFElr6fn34yuuwMJ1fK63AoEjSUt81I=";
};
nativeBuildInputs = [ gtk3 ];

2
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View File

@ -211,6 +211,8 @@ package-maintainers:
- pava
- slynx
- tlynx
- xmonad
- xmonad-contrib
expipiplus1:
- VulkanMemoryAllocator
- autoapply

11
pkgs/development/libraries/cairo/default.nix
View File

@ -5,19 +5,16 @@
, xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12
, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, glSupport ? x11Support && config.cairo.gl or (libGLSupported && stdenv.isLinux)
, libGL ? null # libGLU libGL is no longer a big dependency
, libGL # libGLU libGL is no longer a big dependency
, pdfSupport ? true
, darwin
}:
assert glSupport -> x11Support && libGL != null;
let
version = "1.16.0";
inherit (lib) optional optionals;
in stdenv.mkDerivation rec {
pname = "cairo";
inherit version;
version = "1.16.0";
src = fetchurl {
url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz";
@ -137,7 +134,6 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "A 2D graphics library with support for multiple output devices";
longDescription = ''
Cairo is a 2D graphics library with support for multiple output
devices. Currently supported output targets include the X
@ -149,11 +145,8 @@ in stdenv.mkDerivation rec {
media while taking advantage of display hardware acceleration
when available (e.g., through the X Render Extension).
'';
homepage = "http://cairographics.org/";
license = with licenses; [ lgpl2Plus mpl10 ];
platforms = platforms.all;
};
}

12
pkgs/development/ocaml-modules/integers/default.nix
View File

@ -1,18 +1,20 @@
{ lib, fetchFromGitHub, buildDunePackage, ocaml }:
{ lib, fetchFromGitHub, buildDunePackage
, stdlib-shims
}:
buildDunePackage rec {
pname = "integers";
version = "0.5.1";
useDune2 = lib.versionAtLeast ocaml.version "4.08";
version = "0.7.0";
src = fetchFromGitHub {
owner = "ocamllabs";
repo = "ocaml-integers";
rev = version;
sha256 = "0by5pc851fk7ccxqy1w2qc5jwn9z8whyqhs5gxlm5986vr9msnyi";
sha256 = "sha256-zuUgP1jOiVT0q6GisGpkqx7nybWbARgnAcU8NYqvCzA=";
};
propagatedBuildInputs = [ stdlib-shims ];
meta = {
description = "Various signed and unsigned integer types for OCaml";
license = lib.licenses.mit;

4
pkgs/development/python-modules/appthreat-vulnerability-db/default.nix
View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "appthreat-vulnerability-db";
version = "4.0.0";
version = "4.0.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "AppThreat";
repo = "vulnerability-db";
rev = "refs/tags/v${version}";
sha256 = "sha256-tGvhbhldevMsa9091GDBq2vLRgMdOqc9kiEF8OZeUI8=";
sha256 = "sha256-Fn0KaIkP4WnXOT87qaXNqM+GcQcqiuxcSK6yq1+MmGE=";
};
propagatedBuildInputs = [

6
pkgs/development/tools/jql/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "jql";
version = "5.1.2";
version = "5.1.3";
src = fetchFromGitHub {
owner = "yamafaktory";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Vv22BDFecGEketJb0qQ4+FxSB2BLb9LcnEAqm/BKRxM=";
sha256 = "sha256-xCtTa2CLLhdflcjjqxiOgRRuxlIHhcHo8gsdLMVuxvQ=";
};
cargoSha256 = "sha256-DRrewxKOR0LjpgoN7TWXHWxJxcZ/psjI/lSnyzBXRXM=";
cargoSha256 = "sha256-yB9PemmX69bDkLTasroX3tTNzd13o7mu/fdSptsEMgM=";
meta = with lib; {
description = "A JSON Query Language CLI tool built with Rust";

48
pkgs/games/mari0/default.nix
View File

@ -1,23 +1,10 @@
{ lib, stdenv, fetchFromGitHub, zip, love_11, lua, makeWrapper, makeDesktopItem }:
{ lib, stdenv, fetchFromGitHub, zip, love, makeWrapper, makeDesktopItem
, copyDesktopItems }:
let
stdenv.mkDerivation rec {
pname = "mari0";
version = "1.6.2";
desktopItem = makeDesktopItem {
name = "mari0";
exec = pname;
comment = "Crossover between Super Mario Bros. and Portal";
desktopName = "mari0";
genericName = "mari0";
categories = [ "Game" ];
};
in
stdenv.mkDerivation {
inherit pname version;
src = fetchFromGitHub {
owner = "Stabyourself";
repo = pname;
@ -25,17 +12,26 @@ stdenv.mkDerivation {
sha256 = "1zqaq4w599scsjvy1rsb21fd2r8j3srx9vym4ir9bh666dp36gxa";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ lua love_11 zip ];
nativeBuildInputs = [ makeWrapper copyDesktopItems zip ];
installPhase =
''
mkdir -p $out/bin $out/share/games/lovegames $out/share/applications
zip -9 -r ${pname}.love ./*
mv ${pname}.love $out/share/games/lovegames/${pname}.love
makeWrapper ${love_11}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
ln -s ${desktopItem}/share/applications/* $out/share/applications/
chmod +x $out/bin/${pname}
desktopItems = [
(makeDesktopItem {
name = "mari0";
exec = pname;
comment = "Crossover between Super Mario Bros. and Portal";
desktopName = "mari0";
genericName = "mari0";
categories = [ "Game" ];
})
];
installPhase = ''
runHook preInstall
zip -9 -r mari0.love ./*
install -Dm444 -t $out/share/games/lovegames/ mari0.love
makeWrapper ${love}/bin/love $out/bin/mari0 \
--add-flags $out/share/games/lovegames/mari0.love
runHook postInstall
'';
meta = with lib; {

4
pkgs/servers/jackett/default.nix
View File

@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
version = "0.20.2291";
version = "0.20.2297";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "cJ+muM6dv7pgV1uKsvZuodghi7Y1K5HQKt9ZcIrYLmw=";
sha256 = "p130QRxa0/VG7tJ5aXCeoH1jPjJWnxM63DYOGpos7qI=";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";

36
pkgs/tools/networking/motrix/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib
, appimageTools
, fetchurl
}:
let
pname = "motrix";
version = "1.6.11";
src = fetchurl {
url = "https://github.com/agalwood/Motrix/releases/download/v${version}/Motrix-${version}.AppImage";
sha256 = "sha256-tE2Q7NM+cQOg+vyqyfRwg05EOMQWhhggTA6S+VT+SkM=";
};
appimageContents = appimageTools.extractType2 {
inherit pname version src;
};
in
appimageTools.wrapType2 rec {
inherit pname version src;
extraInstallCommands = ''
mv $out/bin/${pname}-${version} $out/bin/${pname}
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
cp -r ${appimageContents}/usr/share/icons $out/share
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
'';
meta = with lib; {
description = "A full-featured download manager";
homepage = "https://motrix.app";
license = licenses.mit;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ dit7ya ];
};
}

6
pkgs/tools/security/enpass/data.json
View File

@ -1,8 +1,8 @@
{
"amd64": {
"path": "pool/main/e/enpass/enpass_6.6.1.809_amd64.deb",
"sha256": "b1b9bd67653c3163bd80b340150ecf123552cbe4af23c350fbadea8ffd7939ba",
"version": "6.6.1.809"
"path": "pool/main/e/enpass/enpass_6.8.5.1173_amd64.deb",
"sha256": "5855e617041d73682320f3643eb4136c93eef2beaf3be9d37cbadfc76d719b5b",
"version": "6.8.5.1173"
},
"i386": {
"path": "pool/main/e/enpass/enpass_5.6.9_i386.deb",

9
pkgs/tools/security/enpass/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, dpkg, xorg
, glib, libGLU, libGL, libpulseaudio, zlib, dbus, fontconfig, freetype
, gtk3, pango
, makeWrapper , python3Packages, lib
, makeWrapper , python3Packages, lib, libcap
, lsof, curl, libuuid, cups, mesa, xz, libxkbcommon
}:
@ -14,7 +14,7 @@ let
data = all_data.${system_map.${stdenv.hostPlatform.system} or (throw "Unsupported platform")};
baseUrl = "http://repo.sinew.in";
baseUrl = "https://apt.enpass.io";
# used of both wrappers and libpath
libPath = lib.makeLibraryPath (with xorg; [
@ -32,12 +32,17 @@ let
libXrender
libXScrnSaver
libxcb
libcap
glib
gtk3
pango
curl
libuuid
cups
xcbutilwm # libxcb-icccm.so.4
xcbutilimage # libxcb-image.so.0
xcbutilkeysyms # libxcb-keysyms.so.1
xcbutilrenderutil # libxcb-render-util.so.0
xz
libxkbcommon
]);

56
pkgs/tools/wayland/gtklock/default.nix Normal file
View File

@ -0,0 +1,56 @@
{ lib
, stdenv
, fetchFromGitHub
, pkgs
, pam
, scdoc
, gtk3
, pkg-config
, gtk-layer-shell
, glib
, wayland
, wayland-scanner
}:
stdenv.mkDerivation rec {
pname = "gtklock";
version = "2.0.1";
src = fetchFromGitHub {
owner = "jovanlanik";
repo = pname;
rev = "v${version}";
sha256 = "sha256-W+GyeGxlfp1YZtSFEZYXuHmvTVZ8mU1oBcsrWN1yvjU=";
};
strictDeps = true;
nativeBuildInputs = [
scdoc
pkg-config
wayland-scanner
glib
];
buildInputs = [
wayland
gtk3
pam
gtk-layer-shell
];
installFlags = [
"DESTDIR=$(out)"
"PREFIX="
];
meta = with lib; {
description = "GTK-based lockscreen for Wayland";
longDescription = ''
Important note: for gtklock to work you need to set "security.pam.services.gtklock = {};" manually.
''; # Following nixpkgs/pkgs/applications/window-managers/sway/lock.nix
homepage = "https://github.com/jovanlanik/gtklock";
license = licenses.gpl3;
maintainers = with maintainers; [ dit7ya ];
};
}

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

@ -9412,6 +9412,8 @@ with pkgs;
mosh = callPackage ../tools/networking/mosh { };
motrix = callPackage ../tools/networking/motrix { };
mpage = callPackage ../tools/text/mpage { };
mprime = callPackage ../tools/misc/mprime { };
@ -29188,6 +29190,8 @@ with pkgs;
gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { };
gtklock = callPackage ../tools/wayland/gtklock { };
guardian-agent = callPackage ../tools/networking/guardian-agent { };
gv = callPackage ../applications/misc/gv { };