Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
a851087ffa
|
|
@ -13028,6 +13028,12 @@
|
|||
github = "ribose-jeffreylau";
|
||||
githubId = 2649467;
|
||||
};
|
||||
ricarch97 = {
|
||||
email = "ricardo.steijn97@gmail.com";
|
||||
github = "RicArch97";
|
||||
githubId = 61013287;
|
||||
name = "Ricardo Steijn";
|
||||
};
|
||||
richardipsum = {
|
||||
email = "richardipsum@fastmail.co.uk";
|
||||
github = "richardipsum";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dnscontrol";
|
||||
version = "3.30.0";
|
||||
version = "3.31.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/ULO0ev1ybENaSrzAgblUdnyGp6QfFxO8XSHpH2wGpU=";
|
||||
sha256 = "sha256-NwczSmaWzwZXKwnd7AvM758/E85lFWF3SvknOx9/tf0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BtwSn3MLeMkjKBRXhln7hCB3wBVkKASe0zzfqbALQMQ=";
|
||||
vendorHash = "sha256-BE/UnJw5elHYmyB+quN89ZkrlMcTjaVN0T2+h8cpPS8=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
29
pkgs/applications/window-managers/sway/fx.nix
Normal file
29
pkgs/applications/window-managers/sway/fx.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ fetchFromGitHub, lib, sway-unwrapped }:
|
||||
|
||||
sway-unwrapped.overrideAttrs (oldAttrs: rec {
|
||||
pname = "swayfx";
|
||||
version = "0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WillPower3309";
|
||||
repo = "swayfx";
|
||||
rev = version;
|
||||
sha256 = "sha256-nVy7GdAnheWhjevcCPE407xWSLN8F4Le0uq2RDwv/Zc=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Beautiful Sway Fork";
|
||||
homepage = "https://github.com/WillPower3309/swayfx";
|
||||
maintainers = with maintainers; [ ricarch97 ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
|
||||
longDescription = ''
|
||||
Fork of Sway, an incredible and one of the most well established Wayland
|
||||
compositors, and a drop-in replacement for the i3 window manager for X11.
|
||||
SwayFX adds extra options and effects to the original Sway, such as rounded corners,
|
||||
shadows and inactive window dimming to bring back some of the Picom X11
|
||||
compositor functionality, which was commonly used with the i3 window manager.
|
||||
'';
|
||||
};
|
||||
})
|
||||
|
|
@ -15,24 +15,72 @@
|
|||
then null
|
||||
else pkgs.bintools
|
||||
, darwin
|
||||
# LLVM release information; specify one of these but not both:
|
||||
, gitRelease ? null
|
||||
# i.e.:
|
||||
# {
|
||||
# version = /* i.e. "15.0.0" */;
|
||||
# rev = /* commit SHA */;
|
||||
# rev-version = /* human readable version; i.e. "unstable-2022-26-07" */;
|
||||
# sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */;
|
||||
# }
|
||||
, officialRelease ? { version = "15.0.7"; sha256 = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s="; }
|
||||
# i.e.:
|
||||
# {
|
||||
# version = /* i.e. "15.0.0" */;
|
||||
# candidate = /* optional; if specified, should be: "rcN" */
|
||||
# sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */;
|
||||
# }
|
||||
# By default, we'll try to fetch a release from `github:llvm/llvm-project`
|
||||
# corresponding to the `gitRelease` or `officialRelease` specified.
|
||||
#
|
||||
# You can provide your own LLVM source by specifying this arg but then it's up
|
||||
# to you to make sure that the LLVM repo given matches the release configuration
|
||||
# specified.
|
||||
, monorepoSrc ? null
|
||||
}:
|
||||
|
||||
assert let
|
||||
int = a: if a then 1 else 0;
|
||||
xor = a: b: ((builtins.bitXor (int a) (int b)) == 1);
|
||||
in
|
||||
lib.assertMsg
|
||||
(xor
|
||||
(gitRelease != null)
|
||||
(officialRelease != null))
|
||||
("must specify `gitRelease` or `officialRelease`" +
|
||||
(lib.optionalString (gitRelease != null) " — not both"));
|
||||
let
|
||||
release_version = "15.0.0";
|
||||
candidate = ""; # empty or "rcN"
|
||||
dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
|
||||
rev = "a5640968f2f7485b2aa4919f5fa68fd8f23e2d1f"; # When using a Git commit
|
||||
rev-version = "unstable-2022-26-07"; # When using a Git commit
|
||||
version = if rev != "" then rev-version else "${release_version}${dash-candidate}";
|
||||
targetConfig = stdenv.targetPlatform.config;
|
||||
monorepoSrc' = monorepoSrc;
|
||||
in let
|
||||
releaseInfo = if gitRelease != null then rec {
|
||||
original = gitRelease;
|
||||
release_version = original.version;
|
||||
version = gitRelease.rev-version;
|
||||
} else rec {
|
||||
original = officialRelease;
|
||||
release_version = original.version;
|
||||
version = if original ? candidate then
|
||||
"${release_version}-${original.candidate}"
|
||||
else
|
||||
release_version;
|
||||
};
|
||||
|
||||
monorepoSrc = fetchFromGitHub {
|
||||
monorepoSrc = if monorepoSrc' != null then
|
||||
monorepoSrc'
|
||||
else let
|
||||
sha256 = releaseInfo.original.sha256;
|
||||
rev = if gitRelease != null then
|
||||
gitRelease.rev
|
||||
else
|
||||
"llvmorg-${releaseInfo.version}";
|
||||
in fetchFromGitHub {
|
||||
owner = "llvm";
|
||||
repo = "llvm-project";
|
||||
rev = if rev != "" then rev else "llvmorg-${version}";
|
||||
sha256 = "1sh5xihdfdn2hp7ds3lkaq1bfrl4alj36gl1aidmhlw65p5rdvl7";
|
||||
inherit rev sha256;
|
||||
};
|
||||
|
||||
inherit (releaseInfo) release_version version;
|
||||
|
||||
llvm_meta = {
|
||||
license = lib.licenses.ncsa;
|
||||
maintainers = lib.teams.llvm.members;
|
||||
|
|
|
|||
|
|
@ -241,6 +241,38 @@ in stdenv.mkDerivation (rec {
|
|||
)
|
||||
'';
|
||||
|
||||
# Defensive check: some paths (that we make symlinks to) depend on the release
|
||||
# version, for example:
|
||||
# - https://github.com/llvm/llvm-project/blob/406bde9a15136254f2b10d9ef3a42033b3cb1b16/clang/lib/Headers/CMakeLists.txt#L185
|
||||
#
|
||||
# So we want to sure that the version in the source matches the release
|
||||
# version we were given.
|
||||
#
|
||||
# We do this check here, in the LLVM build, because it happens early.
|
||||
postConfigure = let
|
||||
v = lib.versions;
|
||||
major = v.major release_version;
|
||||
minor = v.minor release_version;
|
||||
patch = v.patch release_version;
|
||||
in ''
|
||||
# $1: part, $2: expected
|
||||
check_version() {
|
||||
part="''${1^^}"
|
||||
part="$(cat include/llvm/Config/llvm-config.h | grep "#define LLVM_VERSION_''${part} " | cut -d' ' -f3)"
|
||||
|
||||
if [[ "$part" != "$2" ]]; then
|
||||
echo >&2 \
|
||||
"mismatch in the $1 version! we have version ${release_version}" \
|
||||
"and expected the $1 version to be '$2'; the source has '$part' instead"
|
||||
exit 3
|
||||
fi
|
||||
}
|
||||
|
||||
check_version major ${major}
|
||||
check_version minor ${minor}
|
||||
check_version patch ${patch}
|
||||
'';
|
||||
|
||||
# E.g. mesa.drivers use the build-id as a cache key (see #93946):
|
||||
LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1";
|
||||
|
||||
|
|
|
|||
|
|
@ -112,12 +112,12 @@ let
|
|||
};
|
||||
|
||||
self = mkDerivation rec {
|
||||
version = "8.1.0";
|
||||
version = "8.2.0";
|
||||
pname = "octave";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/octave/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-gFIHTRew72Q9A33oqziWcsdSuyAe6c6k36aYWPtqIT8=";
|
||||
sha256 = "sha256-V9F/kYqUDTjKM0ghHhELNNc1oyKofbccF3xGkqSanIQ=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.1.17";
|
||||
hash = "sha256-9Pspig6wkflE7OusV7dtqudoqXDC9RYQpask802MDK8=";
|
||||
version = "8.1.18";
|
||||
hash = "sha256-0qww1rV0/KWU/gzAHAaT4jWFsnRD40KwqrBydM3kQW4=";
|
||||
});
|
||||
|
||||
in
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.2.4";
|
||||
hash = "sha256-eRhvlL1RDbhuMeU13USCd6Hrkqh4eDA6Hq1EYC2LEZc=";
|
||||
version = "8.2.5";
|
||||
hash = "sha256-5agGY8yk9gRK2GpIl5gUfHrwN+ypb2zTV6s20oy2N1c=";
|
||||
});
|
||||
|
||||
in
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sundials";
|
||||
version = "6.5.0";
|
||||
version = "6.5.1";
|
||||
|
||||
outputs = [ "out" "examples" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz";
|
||||
hash = "sha256-TguZjf8pKiYX4Xlgm1ObUR64CDb1+qz4AOaIqIYohQI=";
|
||||
hash = "sha256-QlIwOAUXHk290ZoB5Swdz+Da/FmcPP7bClwv+wRainU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,15 +16,10 @@ buildOctavePackage rec {
|
|||
version = "2.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-CFLqlHrTwQzCvpPAtQigCVL3Fs8V05Tmh6nkEsnaV2I=";
|
||||
url = "https://github.com/ltfat/ltfat/releases/download/v${version}/${pname}-${version}-of.tar.gz";
|
||||
sha256 = "sha256-8AqEDEfgYwftKUj8ynFQzBa3G3zTdhNtsZ2bW16DV7Q=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes a syntax error with performing multiplication.
|
||||
./syntax-error.patch
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
fftw
|
||||
fftwSinglePrec
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
diff --git a/inst/nonstatgab/nsdgt.m b/inst/nonstatgab/nsdgt.m
|
||||
index ac53963..81656cb 100644
|
||||
--- a/inst/nonstatgab/nsdgt.m
|
||||
+++ b/inst/nonstatgab/nsdgt.m
|
||||
@@ -149,8 +149,8 @@ for ii = 1:N
|
||||
col = ceil(Lg/M(ii));
|
||||
|
||||
temp = zeros(col*M(ii),W,assert_classname(f,g{1}));
|
||||
- temp([end-floor(Lg/2)+1:end,1:ceil(Lg/2)],:) = bsxfun(@ ...
|
||||
- times,f(win_range,:),g{ii}(idx));
|
||||
+ temp([end-floor(Lg/2)+1:end,1:ceil(Lg/2)],:) = bsxfun(@times, ...
|
||||
+ f(win_range,:),g{ii}(idx));
|
||||
|
||||
temp = reshape(temp,M(ii),col,W);
|
||||
X = squeeze(fft(sum(temp,2)));
|
||||
|
|
@ -8,7 +8,7 @@ buildOctavePackage rec {
|
|||
version = "2.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
|
||||
url = "https://github.com/stk-kriging/stk/releases/download/${version}/${pname}-${version}-octpkg.tar.gz";
|
||||
sha256 = "sha256-dgxpw2L7e9o/zimsLPoqW7dEihrrNsks62XtuXt4zTI=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-eventgrid";
|
||||
version = "4.9.1";
|
||||
version = "4.10.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-zRiS5XsinEQoyYsg2PSso3Y2pC7QwB1fbVkCF1OeQ3U=";
|
||||
hash = "sha256-PWl+rA/JAe0rUKU24oQuYlt7U4Cyi14T7cVlA/B60VY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "devito";
|
||||
version = "4.8.0";
|
||||
version = "4.8.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
|||
owner = "devitocodes";
|
||||
repo = "devito";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Wuq49deZKhIHHhxgxgzxxY/3aQcJVCJ0ofGwDrUcHkY=";
|
||||
hash = "sha256-JLfTWfQ9HYb7jsPAuAfNXuIWv7lOomJGE9hBss+AI7o=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -28,14 +28,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery";
|
||||
version = "3.7.0";
|
||||
version = "3.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-z59UP606r0hxxT9Wtxjh75Spp3ixfxaJABX2/CXDKOw=";
|
||||
hash = "sha256-ObBVCHqEcbDrq3pL9U3s2oRbYIexBO8L4HjO0eHcyyY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mautrix";
|
||||
version = "0.19.9";
|
||||
version = "0.19.11";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "mautrix";
|
||||
repo = "python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-GyviaWFPiT0ka0IUFU53DLPT8R8kRhTztvKTG9b7ads=";
|
||||
hash = "sha256-FomD7FecY/FGPxnhqENeerGejnpBkjQSlMpZKNhUylI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "onvif-zeep-async";
|
||||
version = "1.2.5";
|
||||
version = "1.2.11";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-JjdttEa3Mua4aTaLvr3v9o/ZG+FAQ4g2+ijvUIdhf90=";
|
||||
hash = "sha256-SCK4PITp9XRlHeon10Sh5GvhMWNPLu4Y4oFLRC8JHVo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytelegrambotapi";
|
||||
version = "4.10.0";
|
||||
version = "4.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "eternnoir";
|
||||
repo = "pyTelegramBotAPI";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-uzdhNCMl5NdOSHVMZe4BcpCjHQCyaTqlTdWTtzPqj04=";
|
||||
hash = "sha256-K81B8cNQ5Vvu8nH8kiroeffwRaUIKpwnpX2Jq7xPjB0=";
|
||||
};
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydrive2";
|
||||
version = "1.15.1";
|
||||
version = "1.15.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "PyDrive2";
|
||||
inherit version;
|
||||
hash = "sha256-Hx8xuMned3vUDrDRhqYirLPmsbjjxWPlCNRoxZp50/o=";
|
||||
hash = "sha256-qPUNmWydx25RwAO8wHcP6XIi+gH7Dm6p0CfwrPfs564=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyfibaro";
|
||||
version = "0.6.9";
|
||||
version = "0.7.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "rappenze";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-vyp+O5Oj1/OYALGb+ioXeFdlDveR8j5M9Z40QTC+sj4=";
|
||||
hash = "sha256-3qE9U3yyIFl245RihcL3Kvm1NHFd42r6dvZ2Gz4sOvY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylaunches";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "ludeeus";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1b41j384lqg3gc7dsmdzp7anrsymqgc1895lc5j8g43x2mfgbjnh";
|
||||
sha256 = "sha256-bIcnYcbfAwjet3cg97y+ujFfY2916ANk4sw0sZoU59g=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyunifiprotect";
|
||||
version = "4.7.0";
|
||||
version = "4.8.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
|||
owner = "briis";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VvziL9IfPP19whwaLpNp42mZEduGqnPjPJtlSjTNmMo=";
|
||||
hash = "sha256-+fZtzSUTObWkLQ7Nq6pCP+vN1+OUFi3d8AJdr5FGI+k=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ttp-templates";
|
||||
version = "0.3.2";
|
||||
version = "0.3.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "dmulyalin";
|
||||
repo = "ttp_templates";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Bm9//hahM1sP/XDUDR7JcGWz0qF8ovkWZU5x/qj0UZg=";
|
||||
hash = "sha256-NlTTydGdjn+hwAKYEyINg/9k/EdnLq2gU9cnujpZQLM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
, pythonSupport ? stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isCygwin, python3 ? null
|
||||
, enableDebuginfod ? true, elfutils
|
||||
, guile ? null
|
||||
, hostCpuOnly ? false
|
||||
, safePaths ? [
|
||||
# $debugdir:$datadir/auto-load are whitelisted by default by GDB
|
||||
"$debugdir" "$datadir/auto-load"
|
||||
|
|
@ -27,7 +28,7 @@ in
|
|||
assert pythonSupport -> python3 != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = targetPrefix + basename;
|
||||
pname = targetPrefix + basename + lib.optionalString hostCpuOnly "-host-cpu-only";
|
||||
version = "13.1";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
@ -94,7 +95,8 @@ stdenv.mkDerivation rec {
|
|||
"--program-prefix=${targetPrefix}"
|
||||
|
||||
"--disable-werror"
|
||||
"--enable-targets=all" "--enable-64-bit-bfd"
|
||||
] ++ lib.optional (!hostCpuOnly) "--enable-targets=all" ++ [
|
||||
"--enable-64-bit-bfd"
|
||||
"--disable-install-libbfd"
|
||||
"--disable-shared" "--enable-static"
|
||||
"--with-system-zlib"
|
||||
|
|
|
|||
822
pkgs/games/jumpy/Cargo.lock
generated
822
pkgs/games/jumpy/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,9 +1,11 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, fetchpatch
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, zstd
|
||||
, stdenv
|
||||
, alsa-lib
|
||||
, libxkbcommon
|
||||
, udev
|
||||
|
|
@ -15,30 +17,44 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jumpy";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fishfolk";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vBnHNc/kCyZ8gTWhQShn4lBQECguFBzBd7xIfLBgm7A=";
|
||||
sha256 = "sha256-03VPfSIlGB8Cc1jWzZSj9MBFBBmMjyx+RdHr3r3oolU=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"bevy_simple_tilemap-0.10.1" = "sha256-Q/AsBZjsr+uTIh/oN0OsIJxntZ4nuc1AReo0Ronj930=";
|
||||
"bones_asset-0.1.0" = "sha256-CyP7rbS3X26xlCFxn3g9YhZze7UeqxQ1wULrZ3er7Xc=";
|
||||
"bones_asset-0.1.0" = "sha256-YyY5OsbRLkpAgvNifRiXfmzfsgFw/oFV1nQVCkXG4j4=";
|
||||
};
|
||||
};
|
||||
|
||||
patches = [
|
||||
# removes unused patch in patch.crates-io, which cases the build to fail
|
||||
# error: failed to load source for dependency `bevy_simple_tilemap`
|
||||
# Caused by: attempting to update a git repository, but --frozen was specified
|
||||
./remove-unused-patch.patch
|
||||
|
||||
# the crate version is outdated
|
||||
(fetchpatch {
|
||||
name = "bump-version-to-0-6-1.patch";
|
||||
url = "https://github.com/fishfolk/jumpy/commit/15081c425056cdebba1bc90bfcaba50a2e24829f.patch";
|
||||
hash = "sha256-dxLfy1HMdjh2VPbqMb/kwvDxeuptFi3W9tLzvg6TLsE=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [
|
||||
buildInputs = [
|
||||
zstd
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
alsa-lib
|
||||
libxkbcommon
|
||||
udev
|
||||
|
|
@ -55,6 +71,10 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoBuildFlags = [ "--bin" "jumpy" ];
|
||||
|
||||
env = {
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
mkdir $out/share
|
||||
cp -r assets $out/share
|
||||
|
|
|
|||
22
pkgs/games/jumpy/remove-unused-patch.patch
Normal file
22
pkgs/games/jumpy/remove-unused-patch.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -4977,8 +4977,3 @@ dependencies = [
|
||||
"libc",
|
||||
"pkg-config",
|
||||
]
|
||||
-
|
||||
-[[patch.unused]]
|
||||
-name = "bevy_simple_tilemap"
|
||||
-version = "0.11.0"
|
||||
-source = "git+https://github.com/forbjok/bevy_simple_tilemap.git#9a1d4332e961327443adb16aca306f837b6f4da5"
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -94,8 +94,6 @@ codegen-units = 1 # Improved rapier physics perf, so it might help other stuf
|
||||
lto = true
|
||||
|
||||
[patch.crates-io]
|
||||
-bevy_simple_tilemap = { git = "https://github.com/forbjok/bevy_simple_tilemap.git" }
|
||||
-
|
||||
bones_lib = { git = "https://github.com/fishfolk/bones" }
|
||||
bones_bevy_asset = { git = "https://github.com/fishfolk/bones" }
|
||||
type_ulid = { git = "https://github.com/fishfolk/bones" }
|
||||
|
|
@ -16,20 +16,20 @@
|
|||
|
||||
buildGo120Module rec {
|
||||
pname = "evcc";
|
||||
version = "0.116.0";
|
||||
version = "0.116.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-YM6E1g6lrgDTMrfSRacbPM0yXPAgBzGvLHdyaqncuWc=";
|
||||
hash = "sha256-SZwfXoIJRdkr0jQSizmXGOWZYteqa2IWrJNSTOQ3OQ8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-O13m6yQvPha1AToK3Y2naeA70BUx+WBv6D8YniMSk7s=";
|
||||
vendorHash = "sha256-V0etgtYoU5a6OexoHmy4rKv2J9qvNlT57utJp1Nxyas=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
hash = "sha256-OqY1pAkr/0uRzD2/wLwNYCV6XQLRsG+Jc5ST+04NFuE=";
|
||||
hash = "sha256-GmNyjXt5eskf59e9dt1OLB4gayBFbk/pG+7dJ5qoO+Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "check_ssl_cert";
|
||||
version = "2.62.0";
|
||||
version = "2.64.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matteocorti";
|
||||
repo = "check_ssl_cert";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AAQLJ+dipWTPgRJWACF7DS4IHnDQ6z/ddjW9f/6h734=";
|
||||
hash = "sha256-/5ozeabGqFpEfBi2WVRHUpaSwQjvuq8RRw2hNDp8j34=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch";
|
||||
homepage = "https://freeswitch.org/";
|
||||
license = lib.licenses.mpl11;
|
||||
maintainers = with lib.maintainers; [ misuzu ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = with lib.platforms; unix;
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -35,6 +35,14 @@ stdenv.mkDerivation rec {
|
|||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib
|
||||
cp libhfuzz/libhfuzz.a $out/lib
|
||||
cp libhfuzz/libhfuzz.so $out/lib
|
||||
cp libhfcommon/libhfcommon.a $out/lib
|
||||
cp libhfnetdriver/libhfnetdriver.a $out/lib
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description =
|
||||
"A security oriented, feedback-driven, evolutionary, easy-to-use fuzzer";
|
||||
|
|
@ -53,7 +61,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = "https://honggfuzz.dev/";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ cpu chivay ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,21 +1,24 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, pcre
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ucg";
|
||||
version = "0.3.3+date=2019-02-25";
|
||||
version = "unstable-2022-09-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gvansickle";
|
||||
repo = pname;
|
||||
rev = "c3a67632f1e3f332bfb102f0db167f34a2e42da7";
|
||||
sha256 = "sha256-/wU1PmI4ejlv7gZzZNasgROYXFiDiIxE9BFoCo6+G5Y=";
|
||||
repo = "ucg";
|
||||
rev = "cbb185e8adad6546b7e1c5e9ca59a81f98dca49f";
|
||||
hash = "sha256-Osdyxp8DoEjcr2wQLCPqOQ2zQf/0JWYxaDpZB02ACWo=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
|
|
@ -40,8 +43,8 @@ stdenv.mkDerivation rec {
|
|||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/gvansickle/ucg/";
|
||||
meta = {
|
||||
homepage = "https://gvansickle.github.io/ucg/";
|
||||
description = "Grep-like tool for searching large bodies of source code";
|
||||
longDescription = ''
|
||||
UniversalCodeGrep (ucg) is an extremely fast grep-like tool specialized
|
||||
|
|
@ -49,10 +52,10 @@ stdenv.mkDerivation rec {
|
|||
command-line compatible with Ack, to some extent with ag, and where
|
||||
appropriate with grep. Search patterns are specified as PCRE regexes.
|
||||
'';
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = with platforms; unix;
|
||||
broken = stdenv.isAarch64; # cpuid.h: no such file or directory
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
broken = stdenv.isAarch64 || stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
})
|
||||
# TODO: report upstream
|
||||
|
|
|
|||
|
|
@ -516,7 +516,7 @@ xindy = stdenv.mkDerivation {
|
|||
pkg-config perl
|
||||
(texlive.combine { inherit (texlive) scheme-basic cyrillic ec; })
|
||||
];
|
||||
buildInputs = [ clisp libiconv ];
|
||||
buildInputs = [ clisp libiconv perl ];
|
||||
|
||||
configureFlags = [ "--with-clisp-runtime=system" "--disable-xindy-docs" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "waynergy";
|
||||
version = "0.0.15";
|
||||
version = "0.0.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "r-c-f";
|
||||
repo = "waynergy";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pk1U3svy9r7O9ivFjBNXsaOmgc+nv2QTuwwHejB7B4Q=";
|
||||
hash = "sha256-DHP84AYDd3M8on4LgS2TzFU/QulrWXdl1qbLV+qKoxw=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -8076,7 +8076,7 @@ with pkgs;
|
|||
|
||||
robodoc = callPackage ../tools/text/robodoc { };
|
||||
|
||||
ucg = callPackage ../tools/text/ucg { stdenv = gcc10StdenvCompat; };
|
||||
ucg = callPackage ../tools/text/ucg { };
|
||||
|
||||
grive2 = callPackage ../tools/filesystems/grive2 { };
|
||||
|
||||
|
|
@ -19088,6 +19088,8 @@ with pkgs;
|
|||
guile = null;
|
||||
};
|
||||
|
||||
gdbHostCpuOnly = gdb.override { hostCpuOnly = true; };
|
||||
|
||||
gf = callPackage ../development/tools/misc/gf { };
|
||||
|
||||
java-language-server = callPackage ../development/tools/java/java-language-server { };
|
||||
|
|
@ -30960,6 +30962,8 @@ with pkgs;
|
|||
|
||||
swaycons = callPackage ../applications/window-managers/sway/swaycons.nix { };
|
||||
|
||||
swayfx = callPackage ../applications/window-managers/sway/fx.nix { };
|
||||
|
||||
swaylock-fancy = callPackage ../applications/window-managers/sway/lock-fancy.nix { };
|
||||
|
||||
swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue