Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
f66291aefe
@ -5775,6 +5775,11 @@
|
||||
githubId = 7047019;
|
||||
name = "Florent Becker";
|
||||
};
|
||||
galen = {
|
||||
github = "galenhuntington";
|
||||
githubId = 1851962;
|
||||
name = "Galen Huntington";
|
||||
};
|
||||
gamb = {
|
||||
email = "adam.gamble@pm.me";
|
||||
github = "gamb";
|
||||
|
||||
@ -307,6 +307,18 @@ with lib.maintainers; {
|
||||
shortName = "Geospatial";
|
||||
};
|
||||
|
||||
gitlab = {
|
||||
members = [
|
||||
globin
|
||||
krav
|
||||
talyz
|
||||
yayayayaka
|
||||
yuka
|
||||
];
|
||||
scope = "Maintain gitlab packages.";
|
||||
shortName = "gitlab";
|
||||
};
|
||||
|
||||
golang = {
|
||||
members = [
|
||||
kalbasit
|
||||
@ -594,7 +606,6 @@ with lib.maintainers; {
|
||||
|
||||
nix = {
|
||||
members = [
|
||||
Profpatsch
|
||||
eelco
|
||||
grahamc
|
||||
pierron
|
||||
|
||||
@ -611,4 +611,6 @@ in {
|
||||
(mkRenamedOptionModule [ "services" "gitlab-runner" "sessionServer" "advertiseAddress" ] [ "services" "gitlab-runner" "settings" "session_server" "advertise_address" ] )
|
||||
(mkRenamedOptionModule [ "services" "gitlab-runner" "sessionServer" "sessionTimeout" ] [ "services" "gitlab-runner" "settings" "session_server" "session_timeout" ] )
|
||||
];
|
||||
|
||||
meta.maintainers = teams.gitlab.members;
|
||||
}
|
||||
|
||||
@ -80,6 +80,9 @@ in {
|
||||
"example.com" = "full";
|
||||
"@admin:example.com" = "admin";
|
||||
};
|
||||
telegram = {
|
||||
connection.use_ipv6 = true;
|
||||
};
|
||||
}
|
||||
'';
|
||||
description = lib.mdDoc ''
|
||||
|
||||
@ -1685,5 +1685,5 @@ in {
|
||||
};
|
||||
|
||||
meta.doc = ./gitlab.md;
|
||||
|
||||
meta.maintainers = teams.gitlab.members;
|
||||
}
|
||||
|
||||
@ -67,14 +67,14 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||
interfaces-config.interfaces = [ "eth1" ];
|
||||
subnet6 = [ {
|
||||
interface = "eth1";
|
||||
subnet = "2001:DB8:F::/36";
|
||||
subnet = "2001:DB8::/32";
|
||||
pd-pools = [ {
|
||||
prefix = "2001:DB8:F::";
|
||||
prefix = "2001:DB8:1000::";
|
||||
prefix-len = 36;
|
||||
delegated-len = 48;
|
||||
} ];
|
||||
pools = [ {
|
||||
pool = "2001:DB8:0000:0000:FFFF::-2001:DB8:0000:0000:FFFF::FFFF";
|
||||
pool = "2001:DB8:0000:0000::-2001:DB8:0FFF:FFFF::FFFF";
|
||||
} ];
|
||||
} ];
|
||||
|
||||
|
||||
@ -64,7 +64,7 @@ stdenv.mkDerivation {
|
||||
homepage = "https://www.inference.org.uk/dasher/";
|
||||
description = "Information-efficient text-entry interface, driven by natural continuous pointing gestures";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = [ lib.maintainers.Profpatsch ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -372,13 +372,13 @@ let
|
||||
mktplcRef = {
|
||||
name = "Millet";
|
||||
publisher = "azdavis";
|
||||
version = "0.3.5";
|
||||
sha256 = "sha256-lQ7EMs6nsTEgP9BESMpyoZG7QVOe7DXzfg/iZr1+DCQ=";
|
||||
version = "0.12.5";
|
||||
sha256 = "sha256-gJIxCdoxWGThalY+qJ930UtRLFkvr34LfaSioAZH9TQ=";
|
||||
};
|
||||
nativeBuildInputs = [ jq moreutils ];
|
||||
postInstall = ''
|
||||
cd "$out/$installPrefix"
|
||||
jq '.contributes.configuration.properties."millet.server.path".default = "${millet}/bin/lang-srv"' package.json | sponge package.json
|
||||
jq '.contributes.configuration.properties."millet.server.path".default = "${millet}/bin/millet-ls"' package.json | sponge package.json
|
||||
'';
|
||||
meta = {
|
||||
description = "Standard ML support for VS Code";
|
||||
|
||||
@ -24,21 +24,21 @@ let
|
||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0ykchyksfc7aqar2f691jva36v0syn575rj6hydws0y79pplvinh";
|
||||
x86_64-darwin = "1zayc6z4zfkjb238dx51b1f2s9clqzhxhvb91j5w0ayqk735bd5d";
|
||||
aarch64-linux = "1nbnprf6sjqqrw7qha0r6f78n7jjvhn8kv1wxh5pi535nlmxza14";
|
||||
aarch64-darwin = "0lijfhlbj0vsjd6kdfr0fmks2spjazrzwnlxxw0ka80psxghavs6";
|
||||
armv7l-linux = "0dhgb1lxq8r4fk6nkb14h986w3dj19llvjvn8jq4mxdbscnik2j5";
|
||||
x86_64-linux = "09prf6sv0znsrmysflbsa8f9gsdjxjscl5jmwz1b7gx06ambkx40";
|
||||
x86_64-darwin = "1xgxf5drrc8dhl3hjp7xia0ccb5244avr1ckmqkxdcxy70h1s4ki";
|
||||
aarch64-linux = "0fjhw903kyx38v22fr253cx9xqwbgak7ksxsp30ngyzh5zpp8854";
|
||||
aarch64-darwin = "0klbmgjy3bwjb8svggd5j0mlxp3ni711jp2bnh35n64z8ai29rqk";
|
||||
armv7l-linux = "03im7n827fmdm6g5x7n63fiac9g9p3rrwbj2na0ljyn5072mmh6d";
|
||||
}.${system} or throwSystem;
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.79.2";
|
||||
version = "1.80.0";
|
||||
pname = "vscode";
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "695af097c7bd098fbf017ce3ac85e09bbc5dda06";
|
||||
rev = "660393deaaa6d1996740ff4880f1bad43768c814";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
|
||||
@ -62,7 +62,7 @@ in
|
||||
src = fetchurl {
|
||||
name = "vscode-server-${rev}.tar.gz";
|
||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||
sha256 = "0xbc20vh6rj2g6wvw73k8wqm1lxwirph3swwilq5f9hmkzha1z7i";
|
||||
sha256 = "1pkpfsrd686whl9zghxxyiw3x696msh24cf67h2k9yp1d4a9cdz8";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
38
pkgs/applications/graphics/xv/default.nix
Normal file
38
pkgs/applications/graphics/xv/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
xorg,
|
||||
libpng,
|
||||
libwebp,
|
||||
libtiff,
|
||||
libjpeg,
|
||||
jasper,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xv";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jasper-software";
|
||||
repo = "xv";
|
||||
rev = "v${version}";
|
||||
sha256 = "vwSUKWr4Hffx04ATUI58m7UOS/lVTnIVDC3ZTWRwJMM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ xorg.libX11 xorg.libXt libpng libwebp libtiff jasper ];
|
||||
|
||||
meta = {
|
||||
description = "Classic image viewer and editor for X.";
|
||||
homepage = "http://www.trilon.com/xv/";
|
||||
license = {
|
||||
fullName = "XV License";
|
||||
url = "https://github.com/jasper-software/xv/blob/main/src/README";
|
||||
free = false;
|
||||
};
|
||||
maintainers = with lib.maintainers; [ galen ];
|
||||
};
|
||||
}
|
||||
@ -42,7 +42,7 @@ buildPythonApplication rec {
|
||||
description = "A tool that converts RSS/Atom newsfeeds to email";
|
||||
homepage = "https://pypi.python.org/pypi/rss2email";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ Profpatsch ekleog ];
|
||||
maintainers = with maintainers; [ ekleog ];
|
||||
};
|
||||
passthru.tests = {
|
||||
smoke-test = nixosTests.rss2email;
|
||||
|
||||
@ -59,7 +59,7 @@ in stdenv.mkDerivation {
|
||||
'';
|
||||
homepage = "https://github.com/brettlangdon/git-vendor";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.Profpatsch ];
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
||||
|
||||
@ -211,7 +211,7 @@ stdenv.mkDerivation {
|
||||
meta = with lib; {
|
||||
homepage = "http://www.gitlab.com/";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ globin krav talyz yayayayaka yuka ];
|
||||
maintainers = teams.gitlab.members;
|
||||
} // (if gitlabEnterprise then
|
||||
{
|
||||
license = licenses.unfreeRedistributable; # https://gitlab.com/gitlab-org/gitlab-ee/raw/master/LICENSE
|
||||
|
||||
@ -61,7 +61,7 @@ buildGoModule ({
|
||||
homepage = "https://gitlab.com/gitlab-org/gitaly";
|
||||
description = "A Git RPC service for handling all the git calls made by GitLab";
|
||||
platforms = platforms.linux ++ [ "x86_64-darwin" ];
|
||||
maintainers = with maintainers; [ roblabla globin talyz yayayayaka ];
|
||||
maintainers = teams.gitlab.members;
|
||||
license = licenses.mit;
|
||||
};
|
||||
} // commonOpts)
|
||||
|
||||
@ -19,6 +19,6 @@ buildGoModule rec {
|
||||
homepage = "https://gitlab.com/gitlab-org/gitlab-pages";
|
||||
changelog = "https://gitlab.com/gitlab-org/gitlab-pages/-/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ajs124 das_j ];
|
||||
maintainers = with maintainers; [ ajs124 das_j ] ++ teams.gitlab.members;
|
||||
};
|
||||
}
|
||||
|
||||
@ -26,7 +26,7 @@ buildGoModule rec {
|
||||
description = "SSH access and repository management app for GitLab";
|
||||
homepage = "http://www.gitlab.com/";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ globin talyz yayayayaka ];
|
||||
maintainers = teams.gitlab.members;
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
||||
@ -24,7 +24,7 @@ buildGoModule rec {
|
||||
meta = with lib; {
|
||||
homepage = "http://www.gitlab.com/";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ globin talyz yayayayaka ];
|
||||
maintainers = teams.gitlab.members;
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
||||
@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation {
|
||||
See https://github.com/tonsky/FiraCode/issues/211.
|
||||
'';
|
||||
license = licenses.ofl;
|
||||
maintainers = [ maintainers.Profpatsch ];
|
||||
maintainers = [ ];
|
||||
homepage = "https://github.com/tonsky/FiraCode/issues/211#issuecomment-239058632";
|
||||
};
|
||||
}
|
||||
|
||||
@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec {
|
||||
description = "A font with ligatures for Haskell code based off Source Code Pro";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ davidrusu Profpatsch ];
|
||||
maintainers = with maintainers; [ davidrusu ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -57,6 +57,6 @@ symlinkJoin {
|
||||
license = lib.licenses.ofl;
|
||||
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ bergey minijackson Profpatsch ];
|
||||
maintainers = with lib.maintainers; [ bergey minijackson ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -35,6 +35,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
homepage = "https://www.theleagueofmoveabletype.com/raleway";
|
||||
license = lib.licenses.ofl;
|
||||
maintainers = with lib.maintainers; [ minijackson Profpatsch ];
|
||||
maintainers = with lib.maintainers; [ minijackson ];
|
||||
};
|
||||
})
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "paperwm";
|
||||
repo = "PaperWM";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-QTeUbhqHi1fMhw5cgT5S6JGgDaPhBuMwn4nRcp7mSMU=";
|
||||
hash = "sha256-oGBnQGtx2ku4cfgZkZ3OdHlVuiYR8hy1eYDWDZP3fn4=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "A package manager for PureScript based on package sets";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ Profpatsch ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = [ "x86_64-darwin" "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = [ lib.maintainers.Profpatsch ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Mount Android phones on Linux with adb, no root required";
|
||||
inherit (src.meta) homepage;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ Profpatsch aleksana ];
|
||||
maintainers = with maintainers; [ aleksana ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,27 +6,28 @@
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, hatchling
|
||||
, hatch-vcs
|
||||
, toolz
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "in-n-out";
|
||||
version = "0.1.7";
|
||||
format = "setuptools";
|
||||
version = "0.1.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-g4Dw0ejB6BxcMpRZGgxNDeAyuY93UROVsIrAwv6vSqY=";
|
||||
pname = "in_n_out";
|
||||
inherit version;
|
||||
hash = "sha256-gWKvh4fmgutLNtBH+RQZnYDxEk46QUIM1T3mgOfQolQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython_3
|
||||
setuptools
|
||||
setuptools-scm
|
||||
hatchling
|
||||
hatch-vcs
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -52,7 +53,7 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module for dependency injection and result processing";
|
||||
homepage = "https://app-model.readthedocs.io/";
|
||||
homepage = "https://github.com/pyapp-kit/in-n-out";
|
||||
changelog = "https://github.com/pyapp-kit/in-n-out/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
|
||||
@ -8,12 +8,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "3.22.2";
|
||||
version = "3.22.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-YT9Ponvz19SqHAJUO9/KSaBPQrW2W++MRNgF/8L0OPc=";
|
||||
hash = "sha256-PrXqBYOEFCXIZsihhImh1swbGFRCoyTGl82dkfBE7aU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@ -69,6 +69,6 @@ buildGoModule rec {
|
||||
homepage = "https://buildah.io/";
|
||||
changelog = "https://github.com/containers/buildah/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ Profpatsch ] ++ teams.podman.members;
|
||||
maintainers = with maintainers; [ ] ++ teams.podman.members;
|
||||
};
|
||||
}
|
||||
|
||||
@ -69,6 +69,6 @@ buildGoModule rec {
|
||||
license = licenses.mit;
|
||||
homepage = "https://about.gitlab.com/gitlab-ci/";
|
||||
platforms = platforms.unix ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ bachp zimbatm globin yayayayaka ];
|
||||
maintainers = with maintainers; [ bachp zimbatm globin ] ++ teams.gitlab.members;
|
||||
};
|
||||
}
|
||||
|
||||
@ -28,7 +28,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "analysis"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"config",
|
||||
"diagnostic",
|
||||
@ -108,7 +108,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "chain-map"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"str-util",
|
||||
@ -121,7 +121,7 @@ source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e
|
||||
|
||||
[[package]]
|
||||
name = "cm-syntax"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"lex-util",
|
||||
"paths",
|
||||
@ -150,7 +150,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "config"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"serde",
|
||||
@ -178,7 +178,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
|
||||
|
||||
[[package]]
|
||||
name = "cov-mark"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"once_cell",
|
||||
@ -415,7 +415,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "input"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"cm-syntax",
|
||||
"config",
|
||||
@ -475,7 +475,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306"
|
||||
|
||||
[[package]]
|
||||
name = "lang-srv"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"analysis",
|
||||
"anyhow",
|
||||
@ -503,7 +503,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
|
||||
[[package]]
|
||||
name = "lex-util"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
@ -575,7 +575,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "millet-cli"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"analysis",
|
||||
"codespan-reporting",
|
||||
@ -593,7 +593,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "millet-ls"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"env_logger",
|
||||
@ -622,7 +622,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "mlb-hir"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"paths",
|
||||
@ -633,7 +633,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "mlb-statics"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"config",
|
||||
"diagnostic",
|
||||
@ -657,7 +657,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "mlb-syntax"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"lex-util",
|
||||
"paths",
|
||||
@ -729,7 +729,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "panic-hook"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"better-panic",
|
||||
]
|
||||
@ -923,7 +923,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "slash-var-path"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"str-util",
|
||||
@ -931,14 +931,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-comment"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"sml-syntax",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-dynamics"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"fmt-util",
|
||||
@ -949,7 +949,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-dynamics-tests"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"config",
|
||||
"pretty_assertions",
|
||||
@ -965,7 +965,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-file-syntax"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"config",
|
||||
"elapsed",
|
||||
@ -979,7 +979,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-fixity"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"once_cell",
|
||||
@ -988,7 +988,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-hir"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"la-arena",
|
||||
"sml-lab",
|
||||
@ -999,7 +999,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-hir-lower"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"config",
|
||||
"cov-mark",
|
||||
@ -1014,14 +1014,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-lab"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"str-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-lex"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"cov-mark",
|
||||
"diagnostic",
|
||||
@ -1036,7 +1036,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#3948485e5bf5649e50271caf3e
|
||||
|
||||
[[package]]
|
||||
name = "sml-naive-fmt"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"sml-comment",
|
||||
@ -1045,11 +1045,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-namespace"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
|
||||
[[package]]
|
||||
name = "sml-parse"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"diagnostic",
|
||||
"event-parse",
|
||||
@ -1061,14 +1061,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-path"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"str-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sml-scon"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"num-bigint",
|
||||
"num-traits",
|
||||
@ -1077,7 +1077,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-statics"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"chain-map",
|
||||
"config",
|
||||
@ -1100,7 +1100,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-statics-types"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"chain-map",
|
||||
"code-h2-md-map",
|
||||
@ -1119,7 +1119,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-symbol-kind"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"sml-namespace",
|
||||
"sml-statics-types",
|
||||
@ -1127,7 +1127,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-syntax"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"char-name",
|
||||
"code-h2-md-map",
|
||||
@ -1140,7 +1140,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "sml-ty-var-scope"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"fast-hash",
|
||||
"sml-hir",
|
||||
@ -1208,7 +1208,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tests"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"analysis",
|
||||
"cm-syntax",
|
||||
@ -1552,7 +1552,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "xtask"
|
||||
version = "0.12.4"
|
||||
version = "0.12.5"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"flate2",
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "millet";
|
||||
version = "0.12.4";
|
||||
version = "0.12.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "azdavis";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RSi6rJL0RG1A1mKn4BznQjBfPlBvEC73vx0YevqvZ3E=";
|
||||
hash = "sha256-sG4mowQMBiFAgTO1Rf+NCD2/GRgaqmmEQ1oSxn3hGTM=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
23
pkgs/development/tools/misc/regex-cli/default.nix
Normal file
23
pkgs/development/tools/misc/regex-cli/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "regex-cli";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-4l12Eaab1G3SP3Srxt3UR9MCRlLm0KDPx/Z2rQpSQR0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fAIYWzfzq/VuBc684SG7p365uudX9M/TtVdMahyrmdk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A command line tool for debugging, ad hoc benchmarking and generating regular expressions";
|
||||
homepage = "https://github.com/rust-lang/regex/tree/master/regex-cli";
|
||||
license = with licenses; [ asl20 mit ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
37
pkgs/development/tools/misc/wasmer-pack/default.nix
Normal file
37
pkgs/development/tools/misc/wasmer-pack/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasmer-pack";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wasmerio";
|
||||
repo = "wasmer-pack";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+wqgYkdkuhPFkJBdQLnUKAGmUfGBU9mBfMRNBFmiT4E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-nyhjwEZyT8IEb0pTbou/EtN47gehge3fUCQVPs2TkIY=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
cargoBuildFlags = [ "-p=wasmer-pack-cli" ];
|
||||
|
||||
# requires internet access
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Import your WebAssembly code just like any other dependency";
|
||||
homepage = "https://github.com/wasmerio/wasmer-pack";
|
||||
changelog = "https://github.com/wasmerio/wasmer-pack/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
@ -163,6 +163,6 @@ rustPlatform.buildRustPackage {
|
||||
* Dependency-free so that the runtime library (which is written in pure C) can be embedded in any application
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ Profpatsch oxalica ];
|
||||
maintainers = with maintainers; [ oxalica Profpatsch ];
|
||||
};
|
||||
}
|
||||
|
||||
26
pkgs/development/tools/rust/cargo-cranky/default.nix
Normal file
26
pkgs/development/tools/rust/cargo-cranky/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-cranky";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ericseppanen";
|
||||
repo = "cargo-cranky";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3ARl3z+2nz05UaKf8ChN6mvPY2qMjUNxGnGJ1P0xkas=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-jmyrtaJTdZlffC7i5k7z9BEsHAs1rPTCs2/jgq1Jt6Y=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "An easy to configure wrapper for Rust's clippy";
|
||||
homepage = "https://github.com/ericseppanen/cargo-cranky";
|
||||
changelog = "https://github.com/ericseppanen/cargo-cranky/releases/tag/${src.rev}";
|
||||
license = with licenses; [ asl20 mit ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
@ -46,6 +46,6 @@ let
|
||||
|
||||
in
|
||||
overrideMeta shellcheck (old: {
|
||||
maintainers = with lib.maintainers; [ Profpatsch zowoq ];
|
||||
maintainers = with lib.maintainers; [ zowoq ];
|
||||
outputsToInstall = [ "bin" "man" "doc" ];
|
||||
})
|
||||
|
||||
@ -277,6 +277,6 @@ python3.pkgs.buildPythonApplication {
|
||||
'';
|
||||
license = licenses.agpl3Plus;
|
||||
platforms = platforms.mesaPlatforms;
|
||||
maintainers = with maintainers; [ oxij Profpatsch euank ];
|
||||
maintainers = with maintainers; [ oxij euank ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Old-school vertical shoot-em-up / bullet hell";
|
||||
homepage = "https://garden.sourceforge.net/drupal/";
|
||||
maintainers = with maintainers; [ Profpatsch ];
|
||||
maintainers = with maintainers; [ ];
|
||||
license = licenses.gpl3;
|
||||
};
|
||||
|
||||
|
||||
@ -49,7 +49,7 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/sentriz/gonic";
|
||||
description = "Music streaming server / subsonic server API implementation";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ Profpatsch ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,11 +9,19 @@ let
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.28.0a9";
|
||||
version = "1.29.0a2";
|
||||
pname = "tulir-telethon";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-7lRoJYhy9c8RxJTW1/7SrNtA36mwIrPcyRMPVNhWJTk=";
|
||||
hash = "sha256-pTN8mJxbXvnhL11PCH/ZLeSqW0GV124Y3JnDcLek8JE=";
|
||||
};
|
||||
doCheck = false;
|
||||
});
|
||||
mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.20.0";
|
||||
src = oldAttrs.src.override {
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-op28CGpJBcCBiy0WXboaf4JeNRIMX6653QkAV6XW/yI=";
|
||||
};
|
||||
doCheck = false;
|
||||
});
|
||||
@ -22,14 +30,14 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonPackage rec {
|
||||
pname = "mautrix-telegram";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
disabled = python.pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "telegram";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-OPWa3jqaLnV7M1Q77N10A3HT65dNon6RWE5mbQRvjEs=";
|
||||
hash = "sha256-n3gO8R5lVl/8Tgo2tPzM64O2BRhoitsuPIC87bfxczc=";
|
||||
};
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
@ -20,11 +20,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kea";
|
||||
version = "2.2.0"; # only even minor versions are stable
|
||||
version = "2.4.0"; # only even minor versions are stable
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-2n2QymKncmAtrG535QcxkDhCKJWtaO6xQvFIfWfVMdI=";
|
||||
hash = "sha256-OjPNCNwzGf9UTmu/LAQpBCEG9AUevhFdwbsmJclQA/c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -83,6 +83,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://downloads.isc.org/isc/kea/${version}/Kea-${version}-ReleaseNotes.txt";
|
||||
homepage = "https://kea.isc.org/";
|
||||
description = "High-performance, extensible DHCP server by ISC";
|
||||
longDescription = ''
|
||||
|
||||
@ -1853,7 +1853,6 @@ mapAliases ({
|
||||
); # Added 2022-08-02
|
||||
xpraGtk3 = throw "'xpraGtk3' has been renamed to/replaced by 'xpra'"; # Converted to throw 2022-02-22
|
||||
xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25
|
||||
xv = xxv; # Added 2020-02-22
|
||||
xvidcap = throw "'xvidcap' has been removed because of a broken dependency"; # Added 2022-11-08
|
||||
xvfb_run = xvfb-run; # Added 2021-05-07
|
||||
|
||||
|
||||
@ -16693,6 +16693,7 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
|
||||
};
|
||||
cargo-component = callPackage ../development/tools/rust/cargo-component { };
|
||||
cargo-cranky = callPackage ../development/tools/rust/cargo-cranky { };
|
||||
cargo-criterion = callPackage ../development/tools/rust/cargo-criterion { };
|
||||
cargo-cyclonedx = callPackage ../development/tools/rust/cargo-cyclonedx {
|
||||
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation;
|
||||
@ -19515,6 +19516,8 @@ with pkgs;
|
||||
regclient = callPackage ../development/tools/regclient { };
|
||||
inherit (regclient) regbot regctl regsync;
|
||||
|
||||
regex-cli = callPackage ../development/tools/misc/regex-cli { };
|
||||
|
||||
reno = callPackage ../development/tools/reno { };
|
||||
|
||||
re2c = callPackage ../development/tools/parsing/re2c { };
|
||||
@ -19919,6 +19922,8 @@ with pkgs;
|
||||
|
||||
wails = callPackage ../development/tools/wails { };
|
||||
|
||||
wasmer-pack = callPackage ../development/tools/misc/wasmer-pack { };
|
||||
|
||||
whatsapp-for-linux = callPackage ../applications/networking/instant-messengers/whatsapp-for-linux { };
|
||||
|
||||
whatstyle = callPackage ../development/tools/misc/whatstyle {
|
||||
@ -36140,6 +36145,8 @@ with pkgs;
|
||||
|
||||
xnotify = callPackage ../tools/X11/xnotify { };
|
||||
|
||||
xv = callPackage ../applications/graphics/xv { };
|
||||
|
||||
xygrib = libsForQt5.callPackage ../applications/misc/xygrib { };
|
||||
|
||||
xzgv = callPackage ../applications/graphics/xzgv { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user