Merge master into staging-next
This commit is contained in:
@@ -2476,8 +2476,8 @@ let
|
||||
mktplcRef = {
|
||||
publisher = "jeff-hykin";
|
||||
name = "better-nix-syntax";
|
||||
version = "2.2.3";
|
||||
hash = "sha256-KhmkCMBWagi0JjZvupgaU7LA6hsGRE6SiHqdJlXyyX8=";
|
||||
version = "2.3.0";
|
||||
hash = "sha256-Zb4RFs2qkSMeQKkNXk4brrZBDiRK4e08taOOgdRWQEk=";
|
||||
};
|
||||
meta = {
|
||||
description = "Visual Studio Code extension providing Nix Syntax highlighting";
|
||||
|
||||
@@ -741,11 +741,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"integrations_github": {
|
||||
"hash": "sha256-FVDx8KH7foy1rZigDVEWMEalQ9nJnLkRjkJsFi0aEuM=",
|
||||
"hash": "sha256-EjCL6RcTw+2uhfwgyiFRfsXYkkDHZqlSSzEcb4CRvIo=",
|
||||
"homepage": "https://registry.terraform.io/providers/integrations/github",
|
||||
"owner": "integrations",
|
||||
"repo": "terraform-provider-github",
|
||||
"rev": "v6.7.1",
|
||||
"rev": "v6.7.3",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -1282,13 +1282,13 @@
|
||||
"vendorHash": "sha256-rWiafaFE1RolO9JUN1WoW4EWJjR7kpfeVEOTLf21j50="
|
||||
},
|
||||
"tailscale_tailscale": {
|
||||
"hash": "sha256-hkqlstHLHBERVenwyVUew+b26liFQpRh99vIMI0TCBY=",
|
||||
"hash": "sha256-EiaQKO4Pg+89Mc8nwSarKhHBtr+yEKWEyZ4i0LeOfu4=",
|
||||
"homepage": "https://registry.terraform.io/providers/tailscale/tailscale",
|
||||
"owner": "tailscale",
|
||||
"repo": "terraform-provider-tailscale",
|
||||
"rev": "v0.23.0",
|
||||
"rev": "v0.24.0",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-9VyRFLpwF/+5iidLdzilztAdv/YaujUKoRwIyLgiV6o="
|
||||
"vendorHash": "sha256-GhXplzkv0ouWSo4fNs7C0h87sFguhre6ez4d0Pgd/5w="
|
||||
},
|
||||
"telmate_proxmox": {
|
||||
"hash": "sha256-1aKKlOIk1mH4yx66eD635d1IaUWXIiBGHEt4A2F2mGM=",
|
||||
|
||||
@@ -22,6 +22,12 @@ self: super: {
|
||||
fetchrepoproject = args: super.fetchrepoproject ({ preferLocalBuild = false; } // args);
|
||||
fetchs3 = args: super.fetchs3 ({ preferLocalBuild = false; } // args);
|
||||
fetchsvn = args: super.fetchsvn ({ preferLocalBuild = false; } // args);
|
||||
fetchurl = args: super.fetchurl ({ preferLocalBuild = false; } // args);
|
||||
fetchurl =
|
||||
fpArgs:
|
||||
super.fetchurl (
|
||||
super.lib.extends (finalAttrs: args: { preferLocalBuild = args.preferLocalBuild or false; }) (
|
||||
super.lib.toFunction fpArgs
|
||||
)
|
||||
);
|
||||
mkNugetSource = args: super.mkNugetSource ({ preferLocalBuild = false; } // args);
|
||||
}
|
||||
|
||||
@@ -15,21 +15,21 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "anubis";
|
||||
version = "1.22.0";
|
||||
version = "1.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TecharoHQ";
|
||||
repo = "anubis";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-LOYBl9r00AJljGvlacd506cLeMr8Ndh817/ZIw46Uu0=";
|
||||
hash = "sha256-uuYPtkhHMP2WafV7iFMwuh8Bm39Mf7ww6H/io54dwCM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/iTAbwYSHTz9SrJ0vrAXsA+3yS0jUreJDF52gju9CgU=";
|
||||
vendorHash = "sha256-0W3nBc4vu3hnQTDB561zmx/2rOYo7D+vo8jvx10cBUc=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
name = "anubis-npm-deps";
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-s+OxVf6Iysobfuo0nAh5qF157opD2sR5D+7awAx6GTs=";
|
||||
hash = "sha256-KEQYF+LTSw0g3+wF4e8u31ERYsNVHlOjTMdDH6Q2/hI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -40,14 +40,14 @@ let
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "cameractrls";
|
||||
version = "0.6.7";
|
||||
version = "0.6.8";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "soyersoyer";
|
||||
repo = "cameractrls";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MM+Py8tHtqJWIGmGg3RaIhJa0E1zM3hXOnTOqXPuejw=";
|
||||
hash = "sha256-kc5/HbtDZHJHR2loo8Zs555GRW6ynSdBLr3Uowo+OEA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
libnetfilter_queue,
|
||||
libnfnetlink,
|
||||
libmnl,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fakehttp";
|
||||
version = "0.9.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MikeWang000000";
|
||||
repo = "FakeHTTP";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-XjWveBsRJq5iNpk3e9lmVKMoB3q5tr4OiNY+kYEqtEE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libnetfilter_queue
|
||||
libnfnetlink
|
||||
libmnl
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"CROSS_PREFIX=${stdenv.cc.targetPrefix}"
|
||||
"VERSION=${finalAttrs.version}"
|
||||
];
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Obfuscate all your TCP connections into HTTP protocol";
|
||||
homepage = "https://github.com/MikeWang000000/FakeHTTP";
|
||||
changelog = "https://github.com/MikeWang000000/FakeHTTP/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ moraxyc ];
|
||||
mainProgram = "fakehttp";
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -170,11 +170,11 @@ let
|
||||
|
||||
linux = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "141.0.7390.122";
|
||||
version = "142.0.7444.59";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-svzUxJiw5ldHwl413QV+9Egixes8D7tEmqFU+k94mlA=";
|
||||
hash = "sha256-j7WXeRIyuqwvwWGtds4g20kKM+wWkj0R7O/nw6kdsPo=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
@@ -272,11 +272,11 @@ let
|
||||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "141.0.7390.123";
|
||||
version = "142.0.7444.60";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.google.com/release2/chrome/adavkzngpjaayzmntr45fwn25nyq_141.0.7390.123/GoogleChrome-141.0.7390.123.dmg";
|
||||
hash = "sha256-06sXHnSG2x8+OSbgXcPsErgdmjypIlbylrb61Du6j7U=";
|
||||
url = "http://dl.google.com/release2/chrome/pgkesp3xybyklm4wlxch42zlny_142.0.7444.60/GoogleChrome-142.0.7444.60.dmg";
|
||||
hash = "sha256-OhtURSA1rH6j7Bxp0Mg3kGREd44lwVbqH2gEnG8wrFg=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
||||
@@ -2,43 +2,44 @@
|
||||
lib,
|
||||
gitUpdater,
|
||||
fetchFromGitHub,
|
||||
buildPythonApplication,
|
||||
pythonOlder,
|
||||
requests,
|
||||
filelock,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
buildPythonApplication {
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "legendary-gl"; # Name in pypi
|
||||
version = "0.20.34";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "derrod";
|
||||
repo = "legendary";
|
||||
rev = "56d439ed2d3d9f34e2b08fa23e627c23a487b8d6";
|
||||
sha256 = "sha256-yCHeeEGw+9gtRMGyIhbStxJhmSM/1Fqly7HSRDkZILQ=";
|
||||
hash = "sha256-yCHeeEGw+9gtRMGyIhbStxJhmSM/1Fqly7HSRDkZILQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
requests
|
||||
filelock
|
||||
];
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = python3Packages.pythonOlder "3.8";
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "legendary" ];
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
meta = {
|
||||
description = "Free and open-source Epic Games Launcher alternative";
|
||||
homepage = "https://github.com/derrod/legendary";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ equirosa ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ equirosa ];
|
||||
mainProgram = "legendary";
|
||||
};
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
}
|
||||
@@ -13,11 +13,11 @@
|
||||
}:
|
||||
let
|
||||
pname = "maptool";
|
||||
version = "1.18.5";
|
||||
version = "1.18.6";
|
||||
repoBase = "https://github.com/RPTools/maptool";
|
||||
src = fetchurl {
|
||||
url = "${repoBase}/releases/download/${version}/maptool-${version}-x86_64.pkg.tar.zst";
|
||||
hash = "sha256-67szWKgx3B5HacpzYThxGDHKHK5qz2GQ15+ZEuEGlAU=";
|
||||
hash = "sha256-QSJjXgzjoKIwTvIx6iWCHjleJTAAI7qnbcxZb8sygxY=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.140.0";
|
||||
version = "1.141.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nk1nOfJQOBgnlIAju+Q8+0Q0wTGaymhSQSdwecTJLUY=";
|
||||
hash = "sha256-trn5+OOtubOOjlOjJ7WCgeMz2IAsxurHvPQYg/RkEX4=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
|
||||
@@ -97,7 +97,7 @@ let
|
||||
++ lib.optionals mediaSupport [ ffmpeg ]
|
||||
);
|
||||
|
||||
version = "14.5.8";
|
||||
version = "15.0";
|
||||
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
@@ -109,7 +109,7 @@ let
|
||||
"https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-82Y1QpnvXFKEXQtgUHCGh+2KYytbA+B1YwF0OtfvtSA=";
|
||||
hash = "sha256-BD5pnPeE3PZHJKNoJE46Gm6i+ksc7wdl9Eq7pWqB84g=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mizani";
|
||||
version = "0.14.2";
|
||||
version = "0.14.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "has2k1";
|
||||
repo = "mizani";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-g7eGajqFLgFWxNKefuYVWF439zVohU8W1j3w91nblEY=";
|
||||
hash = "sha256-LUustvdD+8J6xu4HrvdFlVHlPGnt+h/0ZvGH7ZiVBUY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
@@ -16,9 +16,9 @@ let
|
||||
variants = {
|
||||
# ./update-zen.py zen
|
||||
zen = {
|
||||
version = "6.17.2"; # zen
|
||||
version = "6.17.6"; # zen
|
||||
suffix = "zen1"; # zen
|
||||
sha256 = "0xb0x8726znk7v39incvdsmqh0plfzyjj4sg0dmbjqlgi2kh560r"; # zen
|
||||
sha256 = "0kkrfmxj1q7il7njc1s8fnn459rcgviyy5q2kbynasrqij5kdciy"; # zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
|
||||
@@ -13177,8 +13177,6 @@ with pkgs;
|
||||
|
||||
leela-zero = libsForQt5.callPackage ../games/leela-zero { };
|
||||
|
||||
legendary-gl = python3Packages.callPackage ../games/legendary-gl { };
|
||||
|
||||
liquidwar = callPackage ../games/liquidwar {
|
||||
guile = guile_2_0;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user