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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-06-22 12:05:04 +00:00 committed by GitHub
commit b766664645
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 2046 additions and 1390 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -11420,6 +11420,12 @@
fingerprint = "85F8 E850 F8F2 F823 F934 535B EC50 6589 9AEA AF4C";
}];
};
yuka = {
email = "yuka@yuka.dev";
github = "yu-re-ka";
githubId = 86169957;
name = "Yureka";
};
yusdacra = {
email = "y.bera003.06@protonmail.com";
github = "yusdacra";

1
maintainers/team-list.nix
View File

@ -136,6 +136,7 @@ with lib.maintainers; {
mmilata
petabyteboy
ryantm
yuka
];
scope = "Maintain Jitsi.";
};

7
nixos/lib/test-driver/test-driver.py
View File

@ -462,9 +462,10 @@ class Machine:
Should only be used during test development, not in the production test."""
self.connect()
self.log("Terminal is ready (there is no prompt):")
telnet = telnetlib.Telnet()
telnet.sock = self.shell # type: ignore
telnet.interact()
subprocess.run(
["socat", "READLINE", f"FD:{self.shell.fileno()}"],
pass_fds=[self.shell.fileno()],
)
def succeed(self, *commands: str) -> str:
"""Execute each command and check that it succeeds."""

2
nixos/lib/testing-python.nix
View File

@ -64,7 +64,7 @@ rec {
wrapProgram $out/bin/nixos-test-driver \
--argv0 ${name} \
--prefix PATH : "${lib.makeBinPath [ qemu_pkg vde2 netpbm coreutils ]}" \
--prefix PATH : "${lib.makeBinPath [ qemu_pkg vde2 netpbm coreutils socat ]}" \
${lib.optionalString enableOCR
"--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \

4
nixos/modules/programs/phosh.nix
View File

@ -143,10 +143,14 @@ in {
oskItem
];
systemd.packages = [ pkgs.phosh ];
programs.feedbackd.enable = true;
security.pam.services.phosh = {};
hardware.opengl.enable = mkDefault true;
services.gnome.core-shell.enable = true;
services.gnome.core-os-services.enable = true;
services.xserver.displayManager.sessionPackages = [ pkgs.phosh ];

1
nixos/modules/services/monitoring/prometheus/default.nix
View File

@ -945,6 +945,7 @@ in {
RuntimeDirectoryMode = "0700";
WorkingDirectory = workingDir;
StateDirectory = cfg.stateDir;
StateDirectoryMode = "0700";
};
};
};

4
pkgs/applications/graphics/ImageMagick/6.x.nix
View File

@ -16,13 +16,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
version = "6.9.12-15";
version = "6.9.12-16";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick6";
rev = version;
sha256 = "sha256-bel4p45eQfQPIp5/sawhTYTfyuYRQ5nFuGh4qqt1zDs=";
sha256 = "sha256-kg8vt88G6huRbJlVYztKxHiFPhGz/QHuNKtbhmai790=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

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

@ -191,7 +191,7 @@ stdenv.mkDerivation {
meta = with lib; {
homepage = "http://www.gitlab.com/";
platforms = platforms.linux;
maintainers = with maintainers; [ fpletz globin krav talyz ];
maintainers = with maintainers; [ fpletz globin krav talyz yuka ];
} // (if gitlabEnterprise then
{
license = licenses.unfreeRedistributable; # https://gitlab.com/gitlab-org/gitlab-ee/raw/master/LICENSE

4
pkgs/applications/virtualization/runc/default.nix
View File

@ -16,13 +16,13 @@
buildGoModule rec {
pname = "runc";
version = "1.0.0-rc95";
version = "1.0.0";
src = fetchFromGitHub {
owner = "opencontainers";
repo = "runc";
rev = "v${version}";
sha256 = "sha256-q4sXcvJO9gyo7m0vlaMrwh7ZZHYa58FJy3GatWndS6M=";
sha256 = "sha256-slNVSlyJLaqIFF4uJP/7u4M0AkJLQjqkHO5TeKFYgSA=";
};
vendorSha256 = null;

32
pkgs/applications/window-managers/phosh/default.nix
View File

@ -35,36 +35,16 @@ let
rev = "ae1a34aafce7026b8c0f65a43c9192d756fe1057";
sha256 = "0a4qh5pgyjki904qf7qmvqz2ksxb0p8xhgl2aixfbhixn0pw6saw";
};
executable = writeText "phosh" ''
PHOC_INI=@out@/share/phosh/phoc.ini
GNOME_SESSION_ARGS="--disable-acceleration-check --session=phosh --debug"
if [ -f /etc/phosh/phoc.ini ]; then
PHOC_INI=/etc/phosh/phoc.ini
elif [ -f /etc/phosh/rootston.ini ]; then
# honor old configs
PHOC_INI=/etc/phosh/rootston.ini
fi
# Run gnome-session through a login shell so it picks
# variables from /etc/profile.d (XDG_*)
[ -n "$WLR_BACKENDS" ] || WLR_BACKENDS=drm,libinput
export WLR_BACKENDS
exec "${phoc}/bin/phoc" -C "$PHOC_INI" \
-E "bash -lc 'XDG_DATA_DIRS=$XDG_DATA_DIRS:\$XDG_DATA_DIRS ${gnome.gnome-session}/bin/gnome-session $GNOME_SESSION_ARGS'"
'';
in stdenv.mkDerivation rec {
pname = "phosh";
version = "0.10.2";
version = "0.11.0";
src = fetchFromGitLab {
domain = "source.puri.sm";
owner = "Librem5";
repo = pname;
rev = "v${version}";
sha256 = "07i8wpzl7311dcf9s57s96qh1v672c75wv6cllrxx7fsmpf8fhx4";
sha256 = "104qib4blh32s7bg6j3xza3s9syrxrvyh2wpyh5yx7v5wqarr20x";
};
nativeBuildInputs = [
@ -104,6 +84,8 @@ in stdenv.mkDerivation rec {
# Temporarily disabled - Test is broken (SIGABRT)
doCheck = false;
mesonFlags = [ "-Dsystemd=true" "-Dcompositor=${phoc}/bin/phoc" ];
postUnpack = ''
rmdir $sourceRoot/subprojects/gvc
ln -s ${gvc} $sourceRoot/subprojects/gvc
@ -123,15 +105,11 @@ in stdenv.mkDerivation rec {
runHook postCheck
'';
# Replace the launcher script with ours
postInstall = ''
substituteAll ${executable} $out/bin/phosh
'';
# Depends on GSettings schemas in gnome-shell
preFixup = ''
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${gnome.gnome-shell}/share/gsettings-schemas/${gnome.gnome-shell.name}"
--set GNOME_SESSION "${gnome.gnome-session}/bin/gnome-session"
)
'';

4
pkgs/development/compilers/ponyc/pony-corral.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation ( rec {
pname = "corral";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "ponylang";
repo = pname;
rev = version;
sha256 = "sha256-mQ/SxnppChZ+6PKVo5VM+QiNn94F4qJT1kQSrwXTa7k=";
sha256 = "1g4dkf5hsnykn3x6yx6ycjzmzzr1nwl59lj13j7zyka1ibv53hwf";
};
buildInputs = [ ponyc ];

51
pkgs/development/libraries/gdcm/default.nix
View File

@ -1,40 +1,45 @@
{ lib, stdenv, fetchurl, cmake, vtk_7, darwin
, enablePython ? false, python ? null, swig ? null}:
{ lib
, stdenv
, fetchFromGitHub
, cmake
, enableVTK ? true
, vtk
, ApplicationServices
, Cocoa
, enablePython ? false
, python
, swig
}:
stdenv.mkDerivation rec {
version = "3.0.8";
pname = "gdcm";
version = "3.0.9";
src = fetchurl {
url = "mirror://sourceforge/gdcm/${pname}-${version}.tar.bz2";
sha256 = "1q9p0r7wszn51yak9wdp61fd9i0wj3f8ja2frmhk7d1gxic7j1rk";
src = fetchFromGitHub {
owner = "malaterre";
repo = "GDCM";
rev = "v${version}";
sha256 = "sha256-wqrM8lxJM8VL+1QEdu6Gr1XWT1j9pT6gGd3yn1yokIY=";
};
dontUseCmakeBuildDir = true;
cmakeFlags = [
"-DGDCM_BUILD_APPLICATIONS=ON"
"-DGDCM_BUILD_SHARED_LIBS=ON"
] ++ lib.optionals enableVTK [
"-DGDCM_USE_VTK=ON"
]
++ lib.optional enablePython [
] ++ lib.optionals enablePython [
"-DGDCM_WRAP_PYTHON:BOOL=ON"
"-DGDCM_INSTALL_PYTHONMODULE_DIR=${placeholder "out"}/${python.sitePackages}"
];
preConfigure = ''
cmakeDir=$PWD
mkdir ../build
cd ../build
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ vtk_7 ]
++ lib.optional stdenv.isDarwin [
darwin.apple_sdk.frameworks.ApplicationServices
darwin.apple_sdk.frameworks.Cocoa
] ++ lib.optional enablePython [ swig python ];
propagatedBuildInputs = [ ];
buildInputs = lib.optionals enableVTK [
vtk
] ++ lib.optionals stdenv.isDarwin [
ApplicationServices
Cocoa
] ++ lib.optionals enablePython [ swig python ];
meta = with lib; {
description = "The grassroots cross-platform DICOM implementation";
@ -44,6 +49,6 @@ stdenv.mkDerivation rec {
'';
homepage = "http://gdcm.sourceforge.net/";
license = with licenses; [ bsd3 asl20 ];
platforms = platforms.all;
maintainers = with maintainers; [ tfmoraes ];
};
}

1
pkgs/development/node-packages/node-packages.json
View File

@ -142,6 +142,7 @@
, "kaput-cli"
, "katex"
, "karma"
, "keyoxide"
, "lcov-result-merger"
, "leetcode-cli"
, "vsc-leetcode-cli"

3059
pkgs/development/node-packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "adb-shell";
version = "0.3.3";
version = "0.3.4";
disabled = !isPy3k;
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "JeffLIrion";
repo = "adb_shell";
rev = "v${version}";
sha256 = "sha256-QVSPQk/QNnIjTgKGuIg0e58qCH91wn7e4TwgWSmOJEk=";
sha256 = "sha256-H1GVbMeaVUZh8T1jgZP2o+emEkK4fOi5k4aL9ayVesA=";
};
propagatedBuildInputs = [

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

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "millheater";
version = "0.4.1";
version = "0.4.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "pymill";
rev = version;
sha256 = "0dypv4xwdqcv45aibfkik2slm9r8y7pd2gwqa49kn96f40kdfwb0";
sha256 = "sha256-B9/nxlPHAPZzbOMQj81CxTEjI03JQxfH8F8vy1E4HIQ=";
};
propagatedBuildInputs = [

95
pkgs/games/grapejuice/default.nix Normal file
View File

@ -0,0 +1,95 @@
{ lib
, fetchFromGitLab
, gobject-introspection
, python3Packages
, gtk3
, wrapGAppsHook
, glib
, cairo
, desktop-file-utils
, xdg-utils
, xdg-user-dirs
, wine
, winetricks
}:
python3Packages.buildPythonApplication rec {
pname = "grapejuice";
version = "3.12.5";
src = fetchFromGitLab {
owner = "BrinkerVII";
repo = "grapejuice";
rev = "v${version}";
sha256 = "1xgxyfwwghy9l17i6y40axdrpp4fgxgdr5y97flwmfivif01ifs1";
};
nativeBuildInputs = [
gobject-introspection
desktop-file-utils
glib
gtk3
wrapGAppsHook
];
buildInputs = [
cairo
];
propagatedBuildInputs = with python3Packages; [
requests
pygobject3
dbus-python
packaging
psutil
setuptools
];
dontWrapGApps = true;
makeWrapperArgs = [
"\${gappsWrapperArgs[@]}"
"--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs xdg-utils wine (winetricks.override { wine = wine; }) ]}"
];
postPatch = ''
substituteInPlace requirements.txt \
--replace "PyGObject-stubs" ""
substituteInPlace src/grapejuice_common/assets/desktop/grapejuice.desktop \
--replace \$GRAPEJUICE_EXECUTABLE "$out/bin/grapejuice" \
--replace \$GRAPEJUICE_ICON grapejuice
substituteInPlace src/grapejuice_common/assets/desktop/roblox-player.desktop \
--replace \$GRAPEJUICE_EXECUTABLE "$out/bin/grapejuice" \
--replace \$PLAYER_ICON "grapejuice-roblox-player"
substituteInPlace src/grapejuice_common/assets/desktop/roblox-app.desktop \
--replace \$GRAPEJUICE_EXECUTABLE "$out/bin/grapejuice" \
--replace \$PLAYER_ICON "grapejuice-roblox-player"
substituteInPlace src/grapejuice_common/assets/desktop/roblox-studio.desktop \
--replace \$GRAPEJUICE_EXECUTABLE "$out/bin/grapejuice" \
--replace \$STUDIO_ICON "grapejuice-roblox-studio"
'';
postInstall = ''
mkdir -p "$out/share/icons" "$out/share/applications" "$out/share/mime/packages"
cp -r src/grapejuice_common/assets/desktop/* $out/share/applications/
cp -r src/grapejuice_common/assets/icons $out/share/
cp src/grapejuice_common/assets/mime_xml/*.xml $out/share/mime/packages/
'';
# No tests
doCheck = false;
pythonImportsCheck = [ "grapejuice" ];
meta = with lib; {
homepage = "https://gitlab.com/brinkervii/grapejuice";
description = "Simple Wine+Roblox management tool";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ artturin ];
};
}

18
pkgs/os-specific/linux/kernel/hardened/patches.json
View File

@ -13,20 +13,20 @@
},
"5.10": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.44-hardened1.patch",
"sha256": "12bxv87w74lj73vqflpfk022x2ig81lfn4pf1gfanw9zxjrapw4m",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.44-hardened1/linux-hardened-5.10.44-hardened1.patch"
"name": "linux-hardened-5.10.45-hardened1.patch",
"sha256": "1382dflkv31b9apf3l0b5wcq8hyi69jm03139z3m0vbxi93pk44z",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.45-hardened1/linux-hardened-5.10.45-hardened1.patch"
},
"5.12": {
"extra": "-hardened1",
"name": "linux-hardened-5.12.11-hardened1.patch",
"sha256": "15qi1znszdg6c0v077k1p4gs0kbpvp6hqjcyg262yqjlpn1c7hcb",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.11-hardened1/linux-hardened-5.12.11-hardened1.patch"
"name": "linux-hardened-5.12.12-hardened1.patch",
"sha256": "10923kjxhfphsh1wr0zjj3lk16bxkq9ana4hyy8af7cn2k30k4iw",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.12-hardened1/linux-hardened-5.12.12-hardened1.patch"
},
"5.4": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.126-hardened1.patch",
"sha256": "05bjry8390iy01nfvkp12x78brgndwm5rsqhnl7yp6vwgdi0fyj1",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.126-hardened1/linux-hardened-5.4.126-hardened1.patch"
"name": "linux-hardened-5.4.127-hardened1.patch",
"sha256": "1qsz5cnm0ny138pbd9f7j5avvz69g51db7dgr1q4farrjml3nshy",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.127-hardened1/linux-hardened-5.4.127-hardened1.patch"
}
}

4
pkgs/os-specific/linux/kernel/linux-5.10.nix
View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.44";
version = "5.10.45";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0ry7hfcj07xc6l9mrm5f0ylz54ca3aklgf9x6plf2k45kjjyzgkp";
sha256 = "01rmw5rnxyybr8sh0v9rgamrg71ign2nr7m0ilrq9704k6dj9dzj";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];

4
pkgs/os-specific/linux/kernel/linux-5.12.nix
View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.12.11";
version = "5.12.12";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0ykzyvb4c6mqcy0fl3wvpn4laj1cllsg80dxnv0gssjz6q836z5f";
sha256 = "1a1ymbgkp8ngrkf7cfjrn56zb9qz1mm1j1pmd60g85ln7nyb4ai1";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];

4
pkgs/os-specific/linux/kernel/linux-5.4.nix
View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.126";
version = "5.4.127";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0xsjcdgiix8slykzi9c12pl5hk2fnz1bqrxxdcr79d9nmfc7kzf7";
sha256 = "1gr89x1ymxaslp9fqcchaa7939yvhxy67z3pgskmx6z2vrd9pgd0";
};
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];

4
pkgs/os-specific/linux/kernel/linux-libre.nix
View File

@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "18115";
sha256 = "00wsxlhz7lc4qk7jcgshb05hvv3mm4m8r3zalc9wvp4r1r6xbbjp";
rev = "18132";
sha256 = "01mgpfx5cddq4bgffydkxpm3xlgf7zfjr1c1icsyn7f2pibd114q";
}
, ...
}:

9
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -102,4 +102,13 @@
name = "mac_nvme_t2";
patch = ./mac-nvme-t2.patch;
};
rtnetlink_fix_regression_in_bridge_vlan_configuration = rec {
name = "rtnetlink_fix_regression_in_bridge_vlan_configuration";
patch = fetchpatch {
name = name + ".patch";
url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=d2e381c4963663bca6f30c3b996fa4dbafe8fcb5";
sha256 = "0ragdi13yh5ypp9x49vrdjqx8ddh7sq7i1qjp8fyrbk3n0jdaac3";
};
};
}

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2021.6.5";
version = "2021.6.6";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];

4
pkgs/servers/home-assistant/default.nix
View File

@ -180,7 +180,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2021.6.5";
hassVersion = "2021.6.6";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@ -197,7 +197,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
sha256 = "1cp294hy35k9hjbp8iqmaf1m5qbbkh3jwf92ym49waw8di5a5wvh";
sha256 = "0r8l2qya9pdl65kq3xrnb1vhmbnxm3bj12hn1wyxmw56l8m9l5d5";
};
# leave this in, so users don't have to constantly update their downstream patch handling

2
pkgs/servers/pleroma/default.nix
View File

@ -218,7 +218,7 @@ beamPackages.mixRelease rec {
description = "ActivityPub microblogging server";
homepage = https://git.pleroma.social/pleroma/pleroma;
license = licenses.agpl3;
maintainers = with maintainers; [ petabyteboy ninjatrappeur ];
maintainers = with maintainers; [ petabyteboy ninjatrappeur yuka ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
};
}

23
pkgs/tools/misc/beats/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "beats";
version = "1.0";
src = fetchFromGitHub {
owner = "j0hax";
repo = "beats";
rev = "v${version}";
sha256 = "0qs5cmbncqhs11m4whqmrh2gvv3p3b37qz57xh78x2ma8jbhskqz";
};
makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
homepage = "https://github.com/j0hax/beats";
license = licenses.gpl3Only;
description = "Swatch Internet Time implemented as a C program";
platforms = platforms.all;
maintainers = [ maintainers.j0hax ];
};
}

2
pkgs/tools/misc/coreboot-utils/default.nix
View File

@ -7,7 +7,7 @@ let
description = "Various coreboot-related tools";
homepage = "https://www.coreboot.org";
license = licenses.gpl2;
maintainers = with maintainers; [ petabyteboy felixsinger ];
maintainers = with maintainers; [ petabyteboy felixsinger yuka ];
platforms = platforms.linux;
};

12
pkgs/tools/misc/entr/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, coreutils, ncurses }:
{ lib, stdenv, fetchurl, coreutils, ncurses, fetchpatch }:
stdenv.mkDerivation rec {
pname = "entr";
@ -9,6 +9,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-4lak0vvkb2EyRggzukR+ZdfzW6nQsmXnxBUDl8xEBaI=";
};
patches = lib.optionals stdenv.isDarwin [
# Fix v4.9 segfault on Darwin. remove with the next update
# https://github.com/eradman/entr/issues/74
(fetchpatch {
url = "https://github.com/eradman/entr/commit/468d77d45925abba826bb1dcda01487dbe37eb33.patch";
sha256 = "17kkcrsnac0pb930sf2kix71h4c7krzsrvz8pskx0vm39n1c9xfi";
includes = [ "entr.c" ];
})
];
postPatch = ''
substituteInPlace Makefile.bsd --replace /bin/echo echo
substituteInPlace entr.c --replace /bin/cat ${coreutils}/bin/cat

45
pkgs/tools/misc/plocate/default.nix Normal file
View File

@ -0,0 +1,45 @@
{ stdenv
, lib
, fetchgit
, pkg-config
, meson
, ninja
, systemd
, liburing
, zstd
}:
stdenv.mkDerivation rec {
pname = "plocate";
version = "1.1.7";
src = fetchgit {
url = "https://git.sesse.net/plocate";
rev = version;
sha256 = "sha256-5Ie4qgiKUoI9Kma6YvjXirvBbpbKVuaMSSAZa36zN3M=";
};
postPatch = ''
sed -i meson.build \
-e "s@unitdir =.*@unitdir = '$out/lib/systemd/system'@" \
-e '/mkdir\.sh/d'
'';
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [ systemd liburing zstd ];
mesonFlags = [
# I don't know why we can't do this but instead have to resort to patching meson.build
# "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
"-Dsharedstatedir=/var/lib"
];
meta = with lib; {
description = "Much faster locate";
homepage = "https://plocate.sesse.net/";
license = licenses.mit;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.linux;
};
}

6
pkgs/tools/text/vale/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "vale";
version = "2.10.2";
version = "2.10.4";
subPackages = [ "cmd/vale" ];
outputs = [ "out" "data" ];
@ -11,10 +11,10 @@ buildGoModule rec {
owner = "errata-ai";
repo = "vale";
rev = "v${version}";
sha256 = "0cpq2pv6d67fdnm2qbb7p9amk0as8bm4knkywak8fsqadxfadx80";
sha256 = "0gw7b6gvzp2f7la1mb74bg92nd8zk5fiajsihcqpni2a79js1s6y";
};
vendorSha256 = "14zimsl0f7sxqqka00krix3q2mxdcpk8n2zh7bz8awjwzn4kg8m3";
vendorSha256 = "15r97mpsailsa4ja6mh5wrjcjacppm0vwma9q6znsa2f1x2apc6y";
postInstall = ''
mkdir -p $data/share/vale

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

@ -1860,6 +1860,8 @@ in
bat-extras = recurseIntoAttrs (callPackages ../tools/misc/bat-extras { });
beats = callPackage ../tools/misc/beats { };
beauty-line-icon-theme = callPackage ../data/icons/beauty-line-icon-theme {
inherit (plasma5Packages) breeze-icons;
};
@ -2819,6 +2821,10 @@ in
gti = callPackage ../tools/misc/gti { };
grapejuice = callPackage ../games/grapejuice {
wine = wineWowPackages.unstable;
};
hdate = callPackage ../applications/misc/hdate { };
heatseeker = callPackage ../tools/misc/heatseeker { };
@ -15106,7 +15112,9 @@ in
gdal_2 = callPackage ../development/libraries/gdal/2.4.nix { };
gdcm = callPackage ../development/libraries/gdcm { };
gdcm = callPackage ../development/libraries/gdcm {
inherit (darwin.apple_sdk.frameworks) ApplicationServices Cocoa;
};
ggz_base_libs = callPackage ../development/libraries/ggz_base_libs {};
@ -20681,6 +20689,7 @@ in
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.rtl8761b_support
kernelPatches.rtnetlink_fix_regression_in_bridge_vlan_configuration
];
};
@ -20695,6 +20704,7 @@ in
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.rtnetlink_fix_regression_in_bridge_vlan_configuration
];
};
@ -20702,6 +20712,7 @@ in
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.rtnetlink_fix_regression_in_bridge_vlan_configuration
];
};
@ -20761,6 +20772,7 @@ in
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.rtnetlink_fix_regression_in_bridge_vlan_configuration
];
};
@ -25810,6 +25822,8 @@ in
mlocate = callPackage ../tools/misc/mlocate { };
plocate = callPackage ../tools/misc/plocate { };
mypaint = callPackage ../applications/graphics/mypaint { };
mypaint-brushes1 = callPackage ../development/libraries/mypaint-brushes/1.0.nix { };