mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 01:13:05 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
07fb9cae4e
@ -86,6 +86,7 @@ let
|
||||
mkService = name: keyboard: nameValuePair (mkName name) {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
Type = "notify";
|
||||
ExecStart = ''
|
||||
${getExe cfg.package} \
|
||||
--cfg ${mkConfig name keyboard} \
|
||||
@ -123,8 +124,7 @@ let
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
RestrictAddressFamilies =
|
||||
if (keyboard.port == null) then "none" else [ "AF_INET" ];
|
||||
RestrictAddressFamilies = [ "AF_UNIX" ] ++ optional (keyboard.port != null) "AF_INET";
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
SystemCallArchitectures = [ "native" ];
|
||||
|
||||
36
pkgs/applications/misc/river-luatile/default.nix
Normal file
36
pkgs/applications/misc/river-luatile/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, luajit
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "river-luatile";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MaxVerevkin";
|
||||
repo = "river-luatile";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eZgoFbat7X/jh5udlNyIuTheBUCHpaVRbsojYLATO18=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Vqyt5bL1lVhy/Wxd+zF7Wugvb7dW1N9Kq2TTFSaodnE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
luajit
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Write your own river layout generator in lua";
|
||||
homepage = "https://github.com/MaxVerevkin/river-luatile";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ pinpox ];
|
||||
};
|
||||
}
|
||||
@ -2,25 +2,41 @@
|
||||
, lib
|
||||
, buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, python-dateutil
|
||||
, pandas
|
||||
, requests
|
||||
, lxml
|
||||
, openpyxl
|
||||
, xlrd
|
||||
, h5py
|
||||
, odfpy
|
||||
, psycopg2
|
||||
, pyshp
|
||||
# python requirements
|
||||
, beautifulsoup4
|
||||
, boto3
|
||||
, faker
|
||||
, fonttools
|
||||
, pyyaml
|
||||
, pdfminer-six
|
||||
, vobject
|
||||
, tabulate
|
||||
, wcwidth
|
||||
, zstandard
|
||||
, setuptools
|
||||
, h5py
|
||||
, importlib-metadata
|
||||
, lxml
|
||||
, matplotlib
|
||||
, numpy
|
||||
, odfpy
|
||||
, openpyxl
|
||||
, pandas
|
||||
, pdfminer-six
|
||||
, praw
|
||||
, psutil
|
||||
, psycopg2
|
||||
, pyarrow
|
||||
, pyshp
|
||||
, pypng
|
||||
, python-dateutil
|
||||
, pyyaml
|
||||
, requests
|
||||
, seaborn
|
||||
, setuptools
|
||||
, sh
|
||||
, tabulate
|
||||
, urllib3
|
||||
, vobject
|
||||
, wcwidth
|
||||
, xlrd
|
||||
, xlwt
|
||||
, zstandard
|
||||
, zulip
|
||||
# other
|
||||
, git
|
||||
, withPcap ? true, dpkt, dnslib
|
||||
, withXclip ? stdenv.isLinux, xclip
|
||||
@ -29,13 +45,13 @@
|
||||
}:
|
||||
buildPythonApplication rec {
|
||||
pname = "visidata";
|
||||
version = "2.10.2";
|
||||
version = "2.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "saulpw";
|
||||
repo = "visidata";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OKCrlUWHgbaLZJPVvs9lnw4cD27pRoO7F9oel1NzT6A=";
|
||||
hash = "sha256-G/9paJFJsRfIxMJ2hbuVS7pxCfSUCK69DNV2DHi60qA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -47,11 +63,13 @@ buildPythonApplication rec {
|
||||
lxml
|
||||
openpyxl
|
||||
xlrd
|
||||
xlwt
|
||||
h5py
|
||||
psycopg2
|
||||
boto3
|
||||
pyshp
|
||||
#mapbox-vector-tile
|
||||
#pypng
|
||||
pypng
|
||||
fonttools
|
||||
#sas7bdat
|
||||
#xport
|
||||
@ -66,6 +84,22 @@ buildPythonApplication rec {
|
||||
wcwidth
|
||||
zstandard
|
||||
odfpy
|
||||
urllib3
|
||||
pyarrow
|
||||
seaborn
|
||||
matplotlib
|
||||
sh
|
||||
psutil
|
||||
numpy
|
||||
|
||||
#requests_cache
|
||||
beautifulsoup4
|
||||
|
||||
faker
|
||||
praw
|
||||
zulip
|
||||
#pyairtable
|
||||
|
||||
setuptools
|
||||
importlib-metadata
|
||||
] ++ lib.optionals withPcap [ dpkt dnslib ]
|
||||
@ -81,14 +115,16 @@ buildPythonApplication rec {
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
# disable some tests which require access to the network
|
||||
rm tests/load-http.vd # http
|
||||
rm tests/graph-cursor-nosave.vd # http
|
||||
rm tests/messenger-nosave.vd # dns
|
||||
rm -f tests/load-http.vd # http
|
||||
rm -f tests/graph-cursor-nosave.vd # http
|
||||
rm -f tests/messenger-nosave.vd # dns
|
||||
|
||||
# tests use git to compare outputs to references
|
||||
git init -b "test-reference"
|
||||
git config user.name "nobody"; git config user.email "no@where"
|
||||
git add .; git commit -m "test reference"
|
||||
git config user.name "nobody"
|
||||
git config user.email "no@where"
|
||||
git add .
|
||||
git commit -m "test reference"
|
||||
|
||||
substituteInPlace dev/test.sh --replace "bin/vd" "$out/bin/vd"
|
||||
bash dev/test.sh
|
||||
|
||||
@ -121,7 +121,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postConfigure = ''
|
||||
# Avoid unintended clousure growth.
|
||||
sed -i 's|/nix/store/\(.\{8\}\)[^-]*-|/nix/store/\1...-|g' ./src/build-info.h
|
||||
sed -i 's|${builtins.storeDir}/\(.\{8\}\)[^-]*-|${builtins.storeDir}/\1...-|g' ./src/build-info.h
|
||||
'';
|
||||
|
||||
hardeningDisable = [ "stackprotector" ];
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, llvmPackages_14, fetchFromGitHub, openssl, sqlite }:
|
||||
{ lib, stdenv, darwin, fetchFromGitHub, openssl, sqlite }:
|
||||
|
||||
(if stdenv.isDarwin then llvmPackages_14.stdenv else stdenv).mkDerivation rec {
|
||||
(if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20230316";
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@ symlinkJoin {
|
||||
fixSymlink () {
|
||||
local link=$1
|
||||
local target=$(readlink $link);
|
||||
local newtarget=$(sed "s@/nix/store/[^/]*/@$out/@" <<< "$target")
|
||||
local newtarget=$(sed "s@${builtins.storeDir}/[^/]*/@$out/@" <<< "$target")
|
||||
if [[ $target != $newtarget ]] && [[ -d $newtarget ]]; then
|
||||
echo fixing link to point to $newtarget instead of $target
|
||||
rm $link
|
||||
@ -35,7 +35,7 @@ symlinkJoin {
|
||||
fixSymlink $out/lib/systemd/user
|
||||
for i in $out/share/dbus-1/services/*.service $out/lib/systemd/user/*.service; do
|
||||
echo fixing service file $i to point to $out
|
||||
sed -i "s@/nix/store/[^/]*/@$out/@" $i
|
||||
sed -i "s@${builtins.storeDir}/[^/]*/@$out/@" $i
|
||||
done
|
||||
'';
|
||||
}
|
||||
|
||||
@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
|
||||
# notably texlive, and we don't want texlive to become a runtime
|
||||
# dependency
|
||||
for file in $(find $out -name Makefile) ; do
|
||||
sed -i "s@/nix/store/[^/]*/bin/@@" "$file" ;
|
||||
sed -i "s@${builtins.storeDir}/[^/]*/bin/@@" "$file" ;
|
||||
done;
|
||||
|
||||
# reference cycle
|
||||
|
||||
@ -176,7 +176,7 @@ stdenvNoCC.mkDerivation (args // {
|
||||
# Note that toString is necessary here as it results in the path at
|
||||
# eval time (i.e. to the file in your local Nixpkgs checkout) rather
|
||||
# than the Nix store path of the path after it's been imported.
|
||||
if lib.isPath nugetDeps && !lib.hasPrefix "/nix/store/" (toString nugetDeps)
|
||||
if lib.isPath nugetDeps && !lib.hasPrefix "${builtins.storeDir}/" (toString nugetDeps)
|
||||
then toString nugetDeps
|
||||
else ''$(mktemp -t "${pname}-deps-XXXXXX.nix")'';
|
||||
in
|
||||
|
||||
@ -3,7 +3,7 @@ let
|
||||
stripScheme =
|
||||
builtins.replaceStrings [ "https://" "http://" ] [ "" "" ];
|
||||
stripNixStore =
|
||||
s: lib.removePrefix "/nix/store/" s;
|
||||
s: lib.removePrefix "${builtins.storeDir}/" s;
|
||||
in
|
||||
{ name
|
||||
, registry ? "https://registry-1.docker.io/v2/"
|
||||
|
||||
@ -140,7 +140,7 @@ stdenv.mkDerivation (
|
||||
(lib.optional doCoverityAnalysis args.cov-build) ++
|
||||
(lib.optional doCoverityAnalysis args.xz);
|
||||
|
||||
lcovFilter = ["/nix/store/*"] ++ lcovFilter;
|
||||
lcovFilter = ["${builtins.storeDir}/*"] ++ lcovFilter;
|
||||
|
||||
inherit lcovExtraTraceFiles;
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "identify";
|
||||
version = "2.5.21";
|
||||
version = "2.5.22";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "pre-commit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4e25m4RIeWKDXxbhIrfKqKgTxSqtDgwyShoRIbxGN0c=";
|
||||
hash = "sha256-SSbphjcfgexVveXp2BfAiGzehb2tSBcsMEse5uSh9Xo=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jc";
|
||||
version = "1.23.0";
|
||||
version = "1.23.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kellyjonbrazil";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0ZKdySzRHHtDWvSrQ0qJTggu48TyCBVrtEZZkM8HqNQ=";
|
||||
hash = "sha256-3AH/NKYMACNuS0I2RsyU+L5Vksdv9H/q3aV1US64rk0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mailchecker";
|
||||
version = "5.0.7";
|
||||
version = "5.0.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-u5htHCI10mn6AQDlAShMpbyI4PcqiRgpRvsy5Q3km+0=";
|
||||
hash = "sha256-rqayN1W+dqHSdRH7NFKtD07r2OztQq5FBhMaJEI3iwY=";
|
||||
};
|
||||
|
||||
# Module has no tests
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scmrepo";
|
||||
version = "0.1.16";
|
||||
version = "0.1.17";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-d8CwvxWdFhKXzv6mzWh+WIH6VSBsQOpdyc5UIwrh7kg=";
|
||||
hash = "sha256-hY46bowYJFmGfEmynTtGgXXkF9D5AcqApO7I/BIl/Lw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yalexs-ble";
|
||||
version = "2.1.1";
|
||||
version = "2.1.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tYdm6XrjltQtN9m23GB9WDWLbXb4pMNiLQWpxxeqsLY=";
|
||||
hash = "sha256-FvZ0U8aZNnGehDMt3+LWLYKU/CSPpifWE7STZkA+0iA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
, docbook_xsl
|
||||
, docbook_xml_dtd_45
|
||||
, which
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -21,8 +22,9 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-wr2O9EqDvHaMQwnjFLLtP1XxfUwFa/P6gGqYNNPVyaA=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ pkg-config installShellFiles libxslt docbook_xsl docbook_xml_dtd_45 which python3 ];
|
||||
buildInputs = [ pcre (python3.withPackages (ps: [ps.pygments])) ];
|
||||
nativeBuildInputs = [ installShellFiles libxslt docbook_xsl docbook_xml_dtd_45 which ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" "MATCHCOMPILER=yes" "FILESDIR=$(out)/share/cppcheck" "HAVE_RULES=yes" ];
|
||||
|
||||
@ -30,17 +32,22 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
--replace 'PCRE_CONFIG = $(shell which pcre-config)' 'PCRE_CONFIG = $(PKG_CONFIG) libpcre'
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
make DB2MAN=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl man
|
||||
'';
|
||||
|
||||
# test/testcondition.cpp:4949(TestCondition::alwaysTrueContainer): Assertion failed.
|
||||
doCheck = !(stdenv.isLinux && stdenv.isAarch64);
|
||||
|
||||
postInstall = ''
|
||||
installManPage cppcheck.1
|
||||
'';
|
||||
|
||||
# test/testcondition.cpp:4949(TestCondition::alwaysTrueContainer): Assertion failed.
|
||||
doCheck = !(stdenv.isLinux && stdenv.isAarch64);
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.17.12";
|
||||
version = "0.17.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evanw";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-75qDQWAp6cmuXtq90oIIQCj5IKUoQxNARxhFo2Sm5mk=";
|
||||
hash = "sha256-b9hepd8rF96lU/986Kgc0aSulUylecu73cuxM6Kuu24=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ginkgo";
|
||||
version = "2.9.1";
|
||||
version = "2.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onsi";
|
||||
repo = "ginkgo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ew0O+xuRsIrjxJxmdYegbYjcXeEmpL00fJS43jyGIEg=";
|
||||
sha256 = "sha256-lRJCRdt/LIFG6MmCkzlvp77CxM4Md7+eyyiw32Xz9rw=";
|
||||
};
|
||||
vendorHash = "sha256-nz32DPm0Sg13ScAeXUYagXvxhpRm+L+rvvY0gE1L584=";
|
||||
vendorHash = "sha256-1+uB/UuwrZw17eSRLwcER67z/Qxg2H04vbBdk2FKYf0=";
|
||||
|
||||
# integration tests expect more file changes
|
||||
# types tests are missing CodeLocation
|
||||
|
||||
@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://godotengine.org";
|
||||
description = "Free and Open Source 2D and 3D game engine";
|
||||
license = licenses.mit;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ twey ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -125,7 +125,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://godotengine.org";
|
||||
description = "Free and Open Source 2D and 3D game engine";
|
||||
license = licenses.mit;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ twey shiryel ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -34,7 +34,7 @@ else symlinkJoin {
|
||||
cp "$1" "''${1}.bk"
|
||||
unlink "$1"
|
||||
mv "''${1}.bk" "$1"
|
||||
sed -i "$1" -e "s,/nix/store/.\+\(/bin/cataclysm-tiles\),$out\1,"
|
||||
sed -i "$1" -e "s,${builtins.storeDir}/.\+\(/bin/cataclysm-tiles\),$out\1,"
|
||||
}
|
||||
for script in "$out/share/applications/cataclysm-dda.desktop" \
|
||||
"$out/Applications/Cataclysm.app/Contents/MacOS/Cataclysm.sh"
|
||||
|
||||
@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
|
||||
+ lib.optionalString (kernel != null) ''
|
||||
make install_driver
|
||||
kernel_dev=${kernel.dev}
|
||||
kernel_dev=''${kernel_dev#/nix/store/}
|
||||
kernel_dev=''${kernel_dev#${builtins.storeDir}/}
|
||||
kernel_dev=''${kernel_dev%%-linux*dev*}
|
||||
if test -f "$out/lib/modules/${kernel.modDirVersion}/extra/scap.ko"; then
|
||||
sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/scap.ko
|
||||
|
||||
@ -312,8 +312,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
if dl.pkg == null then ''
|
||||
# remove the dependency on the library by replacing it with an invalid path
|
||||
for file in $(grep -lr '"${dl.name}"' src); do
|
||||
echo "patching dlopen(\"${dl.name}\", …) in $file to an invalid store path ("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}")…"
|
||||
substituteInPlace "$file" --replace '"${dl.name}"' '"/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}"'
|
||||
echo "patching dlopen(\"${dl.name}\", …) in $file to an invalid store path ("${builtins.storeDir}/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}")…"
|
||||
substituteInPlace "$file" --replace '"${dl.name}"' '"${builtins.storeDir}/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}"'
|
||||
done
|
||||
'' else ''
|
||||
# ensure that the library we provide actually exists
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pdns-recursor";
|
||||
version = "4.8.2";
|
||||
version = "4.8.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
|
||||
sha256 = "sha256-Q4LT6E8TQBaFdyd53+3my8gVfs9nY/p/2x3TPuP3msc=";
|
||||
sha256 = "sha256-N7kaVFjFRBH0444tEmPs9B51HkPF/WboExANmXjwJQU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tailscale";
|
||||
version = "1.38.1";
|
||||
version = "1.38.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2VTYZhC/U32fzEJCxkCB35IqQBALKXQA23SvhY57lSU=";
|
||||
hash = "sha256-5WNP1wVaKKTauny/dANODMCiQmyzOcWRd83RUInoCuk=";
|
||||
};
|
||||
vendorHash = "sha256-LIvaxSo+4LuHUk8DIZ27IaRQwaDnjW6Jwm5AEc/V95A=";
|
||||
|
||||
|
||||
@ -1564,11 +1564,11 @@ self: with self; {
|
||||
# THIS IS A GENERATED FILE. DO NOT EDIT!
|
||||
mkfontscale = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto, zlib }: stdenv.mkDerivation {
|
||||
pname = "mkfontscale";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2";
|
||||
sha256 = "1ixsnsm2mn0zy9ksdid0lj6irnhvasfik9mz8bbrs5sajzmra16a";
|
||||
url = "mirror://xorg/individual/app/mkfontscale-1.2.2.tar.xz";
|
||||
sha256 = "1i6mw97r2s1rb6spjj8fbdsgw6197smaqq2haqgnwhz73xdzpqwa";
|
||||
};
|
||||
hardeningDisable = [ "bindnow" "relro" ];
|
||||
strictDeps = true;
|
||||
|
||||
@ -15,7 +15,7 @@ mirror://xorg/individual/app/fonttosfnt-1.2.2.tar.bz2
|
||||
mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2
|
||||
mirror://xorg/individual/app/ico-1.0.5.tar.bz2
|
||||
mirror://xorg/individual/app/listres-1.0.4.tar.bz2
|
||||
mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2
|
||||
mirror://xorg/individual/app/mkfontscale-1.2.2.tar.xz
|
||||
mirror://xorg/individual/app/oclock-1.0.4.tar.bz2
|
||||
mirror://xorg/individual/app/sessreg-1.1.2.tar.bz2
|
||||
mirror://xorg/individual/app/setxkbmap-1.3.2.tar.bz2
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "qovery-cli";
|
||||
version = "0.52.2";
|
||||
version = "0.53.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vZBNoDh/QnrTQrDubocA3FL7Cn5M1n/w+hE99GF9QC4=";
|
||||
hash = "sha256-vxCDb4qiq7/19wvtWQRCzGxUz+FvWyeKSQIpsiUtwGs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-V7yPXSN+3H8NkD384MkvKbymNQ/O2Q9HoMO4M8mzVto=";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, perl, fetchFromGitHub, fetchpatch, nix-update-script, testers, cowsay }:
|
||||
{ lib, stdenv, perl, fetchFromGitHub, fetchpatch, makeWrapper, nix-update-script, testers, cowsay }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cowsay";
|
||||
@ -22,8 +22,14 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ perl ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/cowsay \
|
||||
--suffix COWPATH : $out/share/cowsay/cows
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"prefix=${placeholder "out"}"
|
||||
];
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-03-23";
|
||||
version = "2023-03-25";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-g8dijq9GsMZdkVX/dFEdCPyUX2L5gDOEAqQTckW6HZk=";
|
||||
hash = "sha256-pmhjSZMnTJn0MDKsCk799DrHBDqvUw8M9wxBx65W9pQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sbctl";
|
||||
version = "0.10";
|
||||
version = "0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Foxboron";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-rjqfWOJRG+9GbNNeRafkNx7Khm/vtGeMlfKkz0qFXJY=";
|
||||
hash = "sha256-kApPb8X1JCP1XfyVFcoCDd+yrytTKSkNWRHKDA3mGaQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-3wT/pWKIdEpkLUpOmpKhLA9AyO36LqZBAwamzOUGhFY=";
|
||||
vendorHash = "sha256-WbPYTETTOzqWH+q6fzyDgm0wMScbLWlksLxkDjopF4E=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/foxboron/sbctl.DatabasePath=${databasePath}" ];
|
||||
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yara";
|
||||
version = "4.2.3";
|
||||
version = "4.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VirusTotal";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ol2btm1A8JdvYrjD0hPtc17A4L9wgr4l30C8VrImVoE=";
|
||||
hash = "sha256-xjGlK0jUDpkDXnI0odErtF+Xcx0I/orD0v5EZw8mhvs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -16,6 +16,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"python-dotenv"
|
||||
"rich"
|
||||
];
|
||||
|
||||
|
||||
@ -7,27 +7,23 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kanata";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jtroo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mQSbsJ+3mKoDMg0ewwR7UvXUq+5WA9aTPKWCaTz8nDE=";
|
||||
sha256 = "sha256-gHkcOn37MNpcP6ra1Eur9O4/trPGmAOAGVU1NwiuQGY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Pu96OGfnXNaIse/IcwFJWxGMlKOVhZ6DtvgXJkHh+Ao=";
|
||||
|
||||
cargoPatches = [
|
||||
(fetchpatch {
|
||||
name = "serialize-cfg-parsing-tests-for-1.2.0.patch";
|
||||
url = "https://github.com/jtroo/kanata/commit/9ef1e80fbcb40402262e08bd9196d000f73f686d.patch";
|
||||
hash = "sha256-/FhyaYx4usDjGoVfRktf9dtwjY4oXdMQKqxLz00/NPY=";
|
||||
})
|
||||
];
|
||||
cargoHash = "sha256-C2d7QdgWd9RTQtXLD4mO0txpzo/SbemJx9YYu62QbqA=";
|
||||
|
||||
buildFeatures = lib.optional withCmd "cmd";
|
||||
|
||||
postInstall = ''
|
||||
install -Dm 444 assets/kanata-icon.svg $out/share/icons/hicolor/scalable/apps/kanata.svg
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool to improve keyboard comfort and usability with advanced customization";
|
||||
homepage = "https://github.com/jtroo/kanata";
|
||||
|
||||
@ -5574,6 +5574,8 @@ with pkgs;
|
||||
zig = zig_0_9;
|
||||
};
|
||||
|
||||
river-luatile = callPackage ../applications/misc/river-luatile{ };
|
||||
|
||||
rmapi = callPackage ../applications/misc/remarkable/rmapi { };
|
||||
|
||||
rmate-sh = callPackage ../tools/misc/rmate-sh { };
|
||||
@ -7900,13 +7902,9 @@ with pkgs;
|
||||
|
||||
gocryptfs = callPackage ../tools/filesystems/gocryptfs { };
|
||||
|
||||
godot_4 = callPackage ../development/tools/godot/4 {
|
||||
scons = sconsPackages.scons_4_1_0;
|
||||
};
|
||||
godot_4 = callPackage ../development/tools/godot/4 { };
|
||||
|
||||
godot = callPackage ../development/tools/godot/3 {
|
||||
scons = sconsPackages.scons_4_1_0;
|
||||
};
|
||||
godot = callPackage ../development/tools/godot/3 { };
|
||||
|
||||
godot-export-templates = callPackage ../development/tools/godot/3/export-templates.nix { };
|
||||
|
||||
@ -12077,7 +12075,7 @@ with pkgs;
|
||||
|
||||
sigil = libsForQt5.callPackage ../applications/editors/sigil { };
|
||||
|
||||
signalbackup-tools = darwin.apple_sdk_11_0.callPackage ../applications/networking/instant-messengers/signalbackup-tools { };
|
||||
signalbackup-tools = callPackage ../applications/networking/instant-messengers/signalbackup-tools { };
|
||||
|
||||
signald = callPackage ../applications/networking/instant-messengers/signald { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user