Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
789ae2c93d
30 changed files with 353 additions and 101 deletions
|
|
@ -121,6 +121,12 @@
|
|||
githubId = 7414843;
|
||||
name = "Nicholas von Klitzing";
|
||||
};
|
||||
_3JlOy-PYCCKUi = {
|
||||
name = "3JlOy-PYCCKUi";
|
||||
email = "3jl0y_pycckui@riseup.net";
|
||||
github = "3JlOy-PYCCKUi";
|
||||
githubId = 46464602;
|
||||
};
|
||||
_360ied = {
|
||||
name = "Brian Zhu";
|
||||
email = "therealbarryplayer@gmail.com";
|
||||
|
|
@ -4552,6 +4558,12 @@
|
|||
githubId = 225893;
|
||||
name = "James Cook";
|
||||
};
|
||||
farcaller = {
|
||||
name = "Vladimir Pouzanov";
|
||||
email = "farcaller@gmail.com";
|
||||
github = "farcaller";
|
||||
githubId = 693;
|
||||
};
|
||||
fare = {
|
||||
email = "fahree@gmail.com";
|
||||
github = "fare";
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<listitem>
|
||||
<para>
|
||||
<emphasis>Stable channels</emphasis>, such as
|
||||
<link xlink:href="https://nixos.org/channels/nixos-22.05"><literal>nixos-22.11</literal></link>.
|
||||
<link xlink:href="https://nixos.org/channels/nixos-22.11"><literal>nixos-22.11</literal></link>.
|
||||
These only get conservative bug fixes and package upgrades. For
|
||||
instance, a channel update may cause the Linux kernel on your
|
||||
system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix),
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
<listitem>
|
||||
<para>
|
||||
<emphasis>Small channels</emphasis>, such as
|
||||
<link xlink:href="https://nixos.org/channels/nixos-22.05-small"><literal>nixos-22.11-small</literal></link>
|
||||
<link xlink:href="https://nixos.org/channels/nixos-22.11-small"><literal>nixos-22.11-small</literal></link>
|
||||
or
|
||||
<link xlink:href="https://nixos.org/channels/nixos-unstable-small"><literal>nixos-unstable-small</literal></link>.
|
||||
These are identical to the stable and unstable channels
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ expressions and associated binaries. The NixOS channels are updated
|
|||
automatically from NixOS's Git repository after certain tests have
|
||||
passed and all packages have been built. These channels are:
|
||||
|
||||
- *Stable channels*, such as [`nixos-22.11`](https://nixos.org/channels/nixos-22.05).
|
||||
- *Stable channels*, such as [`nixos-22.11`](https://nixos.org/channels/nixos-22.11).
|
||||
These only get conservative bug fixes and package upgrades. For
|
||||
instance, a channel update may cause the Linux kernel on your system
|
||||
to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not
|
||||
|
|
@ -19,7 +19,7 @@ passed and all packages have been built. These channels are:
|
|||
radical changes between channel updates. It's not recommended for
|
||||
production systems.
|
||||
|
||||
- *Small channels*, such as [`nixos-22.11-small`](https://nixos.org/channels/nixos-22.05-small)
|
||||
- *Small channels*, such as [`nixos-22.11-small`](https://nixos.org/channels/nixos-22.11-small)
|
||||
or [`nixos-unstable-small`](https://nixos.org/channels/nixos-unstable-small).
|
||||
These are identical to the stable and unstable channels described above,
|
||||
except that they contain fewer binary packages. This means they get updated
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "polkadot";
|
||||
version = "0.9.33";
|
||||
version = "0.9.36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paritytech";
|
||||
repo = "polkadot";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vAFGLcsbGuoaNtxtEIHSeX00nsULJROCEhaMv5IEcp4=";
|
||||
sha256 = "sha256-HzQFlnn+SPasI0g0DYDCRoFCMVyxlUmEQAobvzRnAW4=";
|
||||
|
||||
# the build process of polkadot requires a .git folder in order to determine
|
||||
# the git commit hash that is being built and add it to the version string.
|
||||
|
|
@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
|
|||
'';
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-SZUkgtI/4kA5iWzalmGo5KXRHXKgdeCo2SSCVF66p5E=";
|
||||
cargoSha256 = "sha256-P31GW/1HiaZLF6e8Fq1YnH1ZLhiOhURm8st9a4KRlJU=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,33 +3,31 @@
|
|||
, fetchFromGitHub
|
||||
, qmake
|
||||
, qtbase
|
||||
, qttools
|
||||
, qtimageformats
|
||||
, qtsvg
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qview";
|
||||
version = "4.0";
|
||||
version = "5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jurplel";
|
||||
repo = "qView";
|
||||
rev = version;
|
||||
sha256 = "15n9cq7w3ckinnx38hvncxrbkv4qm4k51sal41q4y0pkvhmafhnr";
|
||||
hash = "sha256-VQ0H9iPrrxO9e/kMo7yZ/zN5I2qDWBCAFacS9uGuZLI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qttools
|
||||
qtimageformats
|
||||
qtsvg
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
sed "s|/usr/|$out/|g" -i qView.pro
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Practical and minimal image viewer";
|
||||
homepage = "https://interversehq.com/qview/";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "rmapi";
|
||||
version = "0.0.23";
|
||||
version = "0.0.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juruen";
|
||||
repo = "rmapi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-x6J3lQqSiqROLFB+S6nY/ONSluc7ffqJcK93bQpsjIs=";
|
||||
sha256 = "sha256-7pwCd9tey7w5B8UgsMLHegPqmmY1prLM+Sk9o42X9lY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Id2RaiSxthyR6egDQz2zulbSZ4STRTaA3yQIr6Mx9kg=";
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, pcre2
|
||||
, gnome
|
||||
, makeWrapper
|
||||
}:
|
||||
let
|
||||
vendorHashes = {
|
||||
|
|
@ -54,12 +56,20 @@ flutter.mkFlutterApp rec {
|
|||
# Symlink binary.
|
||||
ln -sf "$out/app/authenticator" "$out/bin/yubioath-flutter"
|
||||
|
||||
# Needed for QR scanning to work.
|
||||
wrapProgram "$out/bin/yubioath-flutter" \
|
||||
--prefix PATH : ${lib.makeBinPath [ gnome.gnome-screenshot ]}
|
||||
|
||||
# Set the correct path to the binary in desktop file.
|
||||
substituteInPlace "$out/share/applications/com.yubico.authenticator.desktop" \
|
||||
--replace "@EXEC_PATH/authenticator" "$out/bin/yubioath-flutter" \
|
||||
--replace "@EXEC_PATH/linux_support/com.yubico.yubioath.png" "$out/share/icons/com.yubico.yubioath.png"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pcre2
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
{ picom, lib, fetchFromGitHub }:
|
||||
{ pcre, pcre2, picom, lib, fetchFromGitHub }:
|
||||
|
||||
picom.overrideAttrs (oldAttrs: rec {
|
||||
pname = "picom-next";
|
||||
version = "unstable-2022-09-29";
|
||||
version = "unstable-2022-12-23";
|
||||
buildInputs = [ pcre2 ] ++ lib.remove pcre oldAttrs.buildInputs;
|
||||
src = fetchFromGitHub {
|
||||
owner = "yshui";
|
||||
repo = "picom";
|
||||
rev = "0fe4e0a1d4e2c77efac632b15f9a911e47fbadf3";
|
||||
sha256 = "1slcmayja8cszapxzs83xl1i9n9q0dz79cn5gzzf4mfcwvnxp8km";
|
||||
rev = "60ac2b64db78363fe04189cc734daea3d721d87e";
|
||||
sha256 = "09s8kgczks01xbvg3qxqi2rz3lkzgdfyvhrj30mg6n11b6xfgi0d";
|
||||
};
|
||||
meta.maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ];
|
||||
})
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
, gmp, mpfr, libmpc, gettext, which, patchelf
|
||||
, isl ? null # optional, for the Graphite optimization framework.
|
||||
, zlib ? null
|
||||
, libucontext ? null
|
||||
, gnatboot ? null
|
||||
, enableMultilib ? false
|
||||
, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins
|
||||
|
|
@ -70,6 +71,44 @@ let majorVersion = "12";
|
|||
})
|
||||
++ optional langD ../libphobos.patch
|
||||
|
||||
# backport fixes to build gccgo with musl libc
|
||||
++ optionals (langGo && stdenv.hostPlatform.isMusl) [
|
||||
(fetchpatch {
|
||||
excludes = [ "gcc/go/gofrontend/MERGE" ];
|
||||
url = "https://github.com/gcc-mirror/gcc/commit/cf79b1117bd177d3d4c6ed24b6fa243c3628ac2d.diff";
|
||||
hash = "sha256-mS5ZiYi5D8CpGXrWg3tXlbhp4o86ew1imCTwaHLfl+I=";
|
||||
})
|
||||
(fetchpatch {
|
||||
excludes = [ "gcc/go/gofrontend/MERGE" ];
|
||||
url = "https://github.com/gcc-mirror/gcc/commit/7f195a2270910a6ed08bd76e3a16b0a6503f9faf.diff";
|
||||
hash = "sha256-Ze/cFM0dQofKH00PWPDoklXUlwWhwA1nyTuiDAZ6FKo=";
|
||||
})
|
||||
(fetchpatch {
|
||||
excludes = [ "gcc/go/gofrontend/MERGE" ];
|
||||
url = "https://github.com/gcc-mirror/gcc/commit/762fd5e5547e464e25b4bee435db6df4eda0de90.diff";
|
||||
hash = "sha256-o28upwTcHAnHG2Iq0OewzwSBEhHs+XpBGdIfZdT81pk=";
|
||||
})
|
||||
(fetchpatch {
|
||||
excludes = [ "gcc/go/gofrontend/MERGE" ];
|
||||
url = "https://github.com/gcc-mirror/gcc/commit/e73d9fcafbd07bc3714fbaf8a82db71d50015c92.diff";
|
||||
hash = "sha256-1SjYCVHLEUihdON2TOC3Z2ufM+jf2vH0LvYtZL+c1Fo=";
|
||||
})
|
||||
(fetchpatch {
|
||||
excludes = [ "gcc/go/gofrontend/MERGE" ];
|
||||
url = "https://github.com/gcc-mirror/gcc/commit/b6c6a3d64f2e4e9347733290aca3c75898c44b2e.diff";
|
||||
hash = "sha256-RycJ3YCHd3MXtYFjxP0zY2Wuw7/C4bWoBAQtTKJZPOQ=";
|
||||
})
|
||||
(fetchpatch {
|
||||
excludes = [ "gcc/go/gofrontend/MERGE" ];
|
||||
url = "https://github.com/gcc-mirror/gcc/commit/2b1a604a9b28fbf4f382060bebd04adb83acc2f9.diff";
|
||||
hash = "sha256-WiBQG0Xbk75rHk+AMDvsbrm+dc7lDH0EONJXSdEeMGE=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gcc-mirror/gcc/commit/c86b726c048eddc1be320c0bf64a897658bee13d.diff";
|
||||
hash = "sha256-QSIlqDB6JRQhbj/c3ejlmbfWz9l9FurdSWxpwDebnlI=";
|
||||
})
|
||||
]
|
||||
|
||||
# Obtain latest patch with ../update-mcfgthread-patches.sh
|
||||
++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch;
|
||||
|
||||
|
|
@ -178,6 +217,7 @@ stdenv.mkDerivation ({
|
|||
targetPackages.stdenv.cc.bintools # For linking code at run-time
|
||||
] ++ (optional (isl != null) isl)
|
||||
++ (optional (zlib != null) zlib)
|
||||
++ (optional (langGo && stdenv.hostPlatform.isMusl) libucontext)
|
||||
;
|
||||
|
||||
depsTargetTarget = optional (!crossStageStatic && threadsCross != {}) threadsCross.package;
|
||||
|
|
|
|||
|
|
@ -199,11 +199,10 @@ let
|
|||
"--enable-shared"
|
||||
] ++ [
|
||||
"--with-threads"
|
||||
"--enable-unicode=ucs${toString ucsEncoding}"
|
||||
] ++ optionals (stdenv.hostPlatform.isCygwin || stdenv.hostPlatform.isAarch64) [
|
||||
"--with-system-ffi"
|
||||
] ++ optionals stdenv.hostPlatform.isCygwin [
|
||||
"--with-system-expat"
|
||||
"--enable-unicode=ucs${toString ucsEncoding}"
|
||||
] ++ optionals stdenv.hostPlatform.isCygwin [
|
||||
"ac_cv_func_bind_textdomain_codeset=yes"
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
"--disable-toolbox-glue"
|
||||
|
|
@ -238,10 +237,7 @@ let
|
|||
strictDeps = true;
|
||||
buildInputs =
|
||||
optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
|
||||
[ bzip2 openssl zlib ]
|
||||
++ optional (stdenv.hostPlatform.isCygwin || stdenv.hostPlatform.isAarch64) libffi
|
||||
++ optional stdenv.hostPlatform.isCygwin expat
|
||||
++ [ db gdbm ncurses sqlite readline ]
|
||||
[ bzip2 openssl zlib libffi expat db gdbm ncurses sqlite readline ]
|
||||
++ optionals x11Support [ tcl tk libX11 ]
|
||||
++ optional (stdenv.isDarwin && configd != null) configd;
|
||||
nativeBuildInputs =
|
||||
|
|
|
|||
23
pkgs/development/libraries/libucontext/default.nix
Normal file
23
pkgs/development/libraries/libucontext/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libucontext";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kaniini";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fk3ZKkp3dsyeF6SOWSccr5MkKEwS4AAuosD/h+6wjSw=";
|
||||
};
|
||||
|
||||
makeFlags = [ "DESTDIR=$(out)" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/kaniini/libucontext";
|
||||
description = "ucontext implementation featuring glibc-compatible ABI";
|
||||
license = licenses.isc;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.yuka ];
|
||||
};
|
||||
}
|
||||
47
pkgs/development/libraries/mpdecimal/default.nix
Normal file
47
pkgs/development/libraries/mpdecimal/default.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mpdecimal";
|
||||
version = "2.5.1";
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-${version}.tar.gz";
|
||||
hash = "sha256-n5zUwEH5m1xJ/7e1nZ8S2VtoPYhYVgiqVqYwdmeysh8=";
|
||||
};
|
||||
|
||||
configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ];
|
||||
|
||||
meta = {
|
||||
description = "Library for arbitrary precision decimal floating point arithmetic";
|
||||
|
||||
longDescription = ''
|
||||
libmpdec is a fast C/C++ library for correctly-rounded arbitrary
|
||||
precision decimal floating point arithmetic. It is a complete
|
||||
implementation of Mike Cowlishaw/IBM's General Decimal Arithmetic
|
||||
Specification. The full specification is available here:
|
||||
|
||||
http://speleotrove.com/decimal/
|
||||
|
||||
libmpdec will - with minor restrictions - also conform to the IEEE
|
||||
754-2008 Standard for Floating-Point Arithmetic, provided that the
|
||||
appropriate context parameters are set.
|
||||
|
||||
libmpdec++ is a complete implementation of the General Decimal Arithmetic
|
||||
Specification. libmpdec++ is mostly a header library around libmpdec's C
|
||||
functions.
|
||||
'';
|
||||
|
||||
homepage = "https://www.bytereef.org/mpdecimal/index.html";
|
||||
|
||||
downloadPage = "https://www.bytereef.org/mpdecimal/download.html";
|
||||
|
||||
changelog = "https://www.bytereef.org/mpdecimal/changelog.html";
|
||||
|
||||
license = lib.licenses.bsd2;
|
||||
|
||||
maintainers = with lib.maintainers; [ kaction ];
|
||||
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "maestro";
|
||||
version = "1.18.2";
|
||||
version = "1.18.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip";
|
||||
sha256 = "02w544q5dwyayl3mcrp0q4b140bpmk0xpcjjqq0i0sbhffzw1jn8";
|
||||
sha256 = "13kv6ydd2xka0lnnpcn5jv12pw9n6p7nljdlgkimwvsqsh1z5kfc";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://maestro.mobile.dev/";
|
||||
license = licenses.asl20;
|
||||
platforms = lib.platforms.all;
|
||||
changelog = "https://github.com/mobile-dev-inc/maestro/blob/main/CHANGELOG.md";
|
||||
maintainers = with maintainers; [ SubhrajyotiSen ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
homepage = "https://apgdiff.com";
|
||||
license = licenses.mit;
|
||||
inherit (jre.meta) platforms;
|
||||
sourceProvenance = sourceTypes.binaryBytecode;
|
||||
sourceProvenance = [ sourceTypes.binaryBytecode ];
|
||||
maintainers = [ maintainers.misterio77 ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
|
|
@ -7,8 +8,12 @@
|
|||
, cairo
|
||||
, gtk3
|
||||
, webkitgtk
|
||||
, darwin
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tauri";
|
||||
version = "1.2.3";
|
||||
|
|
@ -26,7 +31,8 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "sha256-Hp6+T2CN0CsXaGnCVqAYaOjZNDkmI+MXDfHIgbU1S0g=";
|
||||
|
||||
buildInputs = [ glibc libsoup cairo gtk3 webkitgtk ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ]
|
||||
++ lib.optionals stdenv.isDarwin [ CoreServices Security ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
homepage = "https://github.com/itchio/itch";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
sourceProvenance = lib.sourceTypes.binaryBytecode;
|
||||
sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
|
||||
maintainers = with maintainers; [ pasqui23 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,20 +8,20 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "r2mod_cli";
|
||||
version = "1.2.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Foldex";
|
||||
repo = "r2mod_cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FS9P/uTZU4d6zpM3TlEW6i6PLGHxqqO2fc8D7VsPCig=";
|
||||
sha256 = "sha256-WL6zF6EdGjNyOm0j4zYZ1Oe7StEttKFNO28Ne/dA7CQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ bashInteractive ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/r2mod --prefix PATH : "${lib.makeBinPath [ jq p7zip ]}";
|
||||
|
|
|
|||
72
pkgs/servers/mautrix-googlechat/default.nix
Normal file
72
pkgs/servers/mautrix-googlechat/default.nix
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
{ fetchFromGitHub, fetchpatch
|
||||
, lib
|
||||
, python3
|
||||
, protobuf3_20
|
||||
, enableE2be ? true, enableMetrics ? true, enableSqlite ? true
|
||||
}: python3.pkgs.buildPythonApplication rec {
|
||||
pname = "mautrix-googlechat";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "googlechat";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UVWYT0HTOUEkBG0n6KNhCSSO/2PAF1rIvCaw478z+q0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# patch setup.py to generate $out/bin/mautrix-googlechat
|
||||
# https://github.com/mautrix/googlechat/pull/81
|
||||
name = "mautrix-googlechat-entry-point.patch";
|
||||
url = "https://github.com/mautrix/googlechat/pull/81/commits/112fa3d27bc6f89a02321cb80d219de149e00df8.patch";
|
||||
sha256 = "sha256-DsITDNLsIgBIqN6sD5JHaFW0LToxVUTzWc7mE2L09IQ=";
|
||||
})
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
postPatch = ''
|
||||
sed -i requirements.txt \
|
||||
-e 's/asyncpg>=.*/asyncpg/'
|
||||
'';
|
||||
|
||||
baseConfigPath = "share/mautrix-googlechat/example-config.yaml";
|
||||
postInstall = ''
|
||||
rm $out/example-config.yaml
|
||||
install -D mautrix_googlechat/example-config.yaml $out/$baseConfigPath
|
||||
'';
|
||||
|
||||
passthru.optional-dependencies = with python3.pkgs; {
|
||||
e2be = [
|
||||
python-olm
|
||||
pycryptodome
|
||||
unpaddedbase64
|
||||
];
|
||||
metrics = [ prometheus-client ];
|
||||
sqlite = [ aiosqlite ];
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
aiohttp
|
||||
yarl
|
||||
asyncpg
|
||||
ruamel-yaml
|
||||
CommonMark
|
||||
python-magic
|
||||
(protobuf.override {
|
||||
protobuf = protobuf3_20;
|
||||
})
|
||||
mautrix
|
||||
] ++ lib.optionals enableE2be passthru.optional-dependencies.e2be
|
||||
++ lib.optionals enableMetrics passthru.optional-dependencies.metrics
|
||||
++ lib.optionals enableSqlite passthru.optional-dependencies.sqlite;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/mautrix/googlechat";
|
||||
description = "A Matrix-Google Chat puppeting bridge";
|
||||
license = licenses.agpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ arcnmx ];
|
||||
};
|
||||
}
|
||||
|
|
@ -144,7 +144,7 @@ let
|
|||
homepage = "ONLYOFFICE Document Server is an online office suite comprising viewers and editors";
|
||||
license = licenses.agpl3;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = sourceTypes.binaryNativeCode;
|
||||
sourceProvenance = [ sourceTypes.binaryNativeCode ];
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,36 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, nixosTests, writeScript }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wordpress";
|
||||
version = "6.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://wordpress.org/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-IR6FSmm3Pd8cCHNQTH1oIaLYsEP1obVjr0bDJkD7H60=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/wordpress
|
||||
cp -r . $out/share/wordpress
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) wordpress;
|
||||
};
|
||||
|
||||
passthru.updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p common-updater-scripts jq
|
||||
set -eu -o pipefail
|
||||
version=$(curl --globoff "https://api.wordpress.org/core/version-check/1.7/" | jq -r '.offers[0].version')
|
||||
update-source-version wordpress $version
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wordpress.org";
|
||||
description = "WordPress is open source software you can use to create a beautiful website, blog, or app";
|
||||
license = [ licenses.gpl2 ];
|
||||
maintainers = [ maintainers.basvandijk ];
|
||||
platforms = platforms.all;
|
||||
{ callPackage }: builtins.mapAttrs (_: callPackage ./generic.nix) rec {
|
||||
wordpress = wordpress6_1;
|
||||
wordpress6_1 = {
|
||||
version = "6.1.1";
|
||||
hash = "sha256-IR6FSmm3Pd8cCHNQTH1oIaLYsEP1obVjr0bDJkD7H60=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
36
pkgs/servers/web-apps/wordpress/generic.nix
Normal file
36
pkgs/servers/web-apps/wordpress/generic.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib, version, hash, stdenv, fetchurl, nixosTests, writeScript }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wordpress";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://wordpress.org/${pname}-${version}.tar.gz";
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/wordpress
|
||||
cp -r . $out/share/wordpress
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) wordpress;
|
||||
};
|
||||
|
||||
passthru.updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p common-updater-scripts jq
|
||||
set -eu -o pipefail
|
||||
version=$(curl --globoff "https://api.wordpress.org/core/version-check/1.7/" | jq -r '.offers[0].version')
|
||||
update-source-version wordpress $version
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wordpress.org";
|
||||
description = "WordPress is open source software you can use to create a beautiful website, blog, or app";
|
||||
license = [ licenses.gpl2 ];
|
||||
maintainers = [ maintainers.basvandijk ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -93,14 +93,14 @@ let
|
|||
|
||||
hasNonSourceProvenance = attrs:
|
||||
(attrs ? meta.sourceProvenance) &&
|
||||
isNonSource (lib.lists.toList attrs.meta.sourceProvenance);
|
||||
isNonSource attrs.meta.sourceProvenance;
|
||||
|
||||
# Allow granular checks to allow only some non-source-built packages
|
||||
# Example:
|
||||
# { pkgs, ... }:
|
||||
# {
|
||||
# allowNonSource = false;
|
||||
# allowNonSourcePredicate = with pkgs.lib.lists; pkg: !(any (p: !p.isSource && p != lib.sourceTypes.binaryFirmware) (toList pkg.meta.sourceProvenance));
|
||||
# allowNonSourcePredicate = with pkgs.lib.lists; pkg: !(any (p: !p.isSource && p != lib.sourceTypes.binaryFirmware) pkg.meta.sourceProvenance);
|
||||
# }
|
||||
allowNonSourcePredicate = config.allowNonSourcePredicate or (x: false);
|
||||
|
||||
|
|
@ -269,7 +269,7 @@ let
|
|||
license = let
|
||||
licenseType = either (attrsOf anything) str; # TODO disallow `str` licenses, use a module
|
||||
in either licenseType (listOf licenseType);
|
||||
sourceProvenance = either (listOf (attrsOf anything)) (attrsOf anything);
|
||||
sourceProvenance = listOf lib.types.attrs;
|
||||
maintainers = listOf (attrsOf anything); # TODO use the maintainer type from lib/tests/maintainer-module.nix
|
||||
priority = int;
|
||||
platforms = listOf str;
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://pulumi.io/";
|
||||
description = "Pulumi is a cloud development platform that makes creating cloud programs easy and productive";
|
||||
sourceProvenance = sourceTypes.fromSource;
|
||||
sourceProvenance = [ sourceTypes.fromSource ];
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "sing-box";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SagerNet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CNy+C5E5iAZHZ7PsS0Hj43irCuCvy/bes3kovvH81/o=";
|
||||
hash = "sha256-FbW2h/muCk/vAItYHYRA/DFFPQvmTqNq74XUZQkUXaA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fUHfvqzbu2P7N413dDuV41myhReNSYvgF+Cc6SgG6y4=";
|
||||
vendorHash = "sha256-kJE+1bekIpv36cG0/Gi25kjnJmTjTp6lt344kFCUSXI=";
|
||||
|
||||
tags = [
|
||||
"with_quic"
|
||||
|
|
|
|||
31
pkgs/tools/networking/wireproxy/default.nix
Normal file
31
pkgs/tools/networking/wireproxy/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "wireproxy";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "octeep";
|
||||
repo = "wireproxy";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5xyKmFxXYhrR8EbG1/ByD10lhkPT9Ky1lq+LL2djaao=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X main.version=v${version}"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-/LZs6N2m5nHx735Ug+PcM1I1ZL9f8VYEpd7Tt4WizMQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Wireguard client that exposes itself as a socks5 proxy";
|
||||
homepage = "https://github.com/octeep/wireproxy";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ _3JlOy-PYCCKUi ];
|
||||
};
|
||||
}
|
||||
|
|
@ -4,25 +4,25 @@ GEM
|
|||
addressable (2.8.1)
|
||||
public_suffix (>= 2.0.2, < 6.0)
|
||||
dotenv (2.8.1)
|
||||
faraday (2.7.1)
|
||||
faraday (2.7.2)
|
||||
faraday-net_http (>= 2.0, < 3.1)
|
||||
ruby2_keywords (>= 0.0.4)
|
||||
faraday-net_http (3.0.2)
|
||||
licensee (9.15.3)
|
||||
licensee (9.16.0)
|
||||
dotenv (~> 2.0)
|
||||
octokit (>= 4.20, < 7.0)
|
||||
reverse_markdown (>= 1, < 3)
|
||||
rugged (>= 0.24, < 2.0)
|
||||
thor (>= 0.19, < 2.0)
|
||||
mini_portile2 (2.8.0)
|
||||
nokogiri (1.13.9)
|
||||
mini_portile2 (2.8.1)
|
||||
nokogiri (1.13.10)
|
||||
mini_portile2 (~> 2.8.0)
|
||||
racc (~> 1.4)
|
||||
octokit (6.0.1)
|
||||
faraday (>= 1, < 3)
|
||||
sawyer (~> 0.9)
|
||||
public_suffix (5.0.0)
|
||||
racc (1.6.0)
|
||||
public_suffix (5.0.1)
|
||||
racc (1.6.2)
|
||||
reverse_markdown (2.1.1)
|
||||
nokogiri
|
||||
ruby2_keywords (0.0.5)
|
||||
|
|
@ -39,4 +39,4 @@ DEPENDENCIES
|
|||
licensee
|
||||
|
||||
BUNDLED WITH
|
||||
2.3.25
|
||||
2.3.26
|
||||
|
|
|
|||
|
|
@ -26,10 +26,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1wyz9ab0mzi84gpf81fs19vrixglmmxi25k6n1mn9h141qmsp590";
|
||||
sha256 = "17lacy6n0hsayafvgxgzmngfq2x62b2arbn32bj2yyzmgxwyxhqn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.7.1";
|
||||
version = "2.7.2";
|
||||
};
|
||||
faraday-net_http = {
|
||||
groups = ["default"];
|
||||
|
|
@ -47,20 +47,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0n0l1c8kxhpdg6pgv1wgwpdfc7gqkygpd8h41shwc95rapdha9gg";
|
||||
sha256 = "0i4hs0vbgp0w3pdddr37zhydm16af122rmr0w39v3nqrj1ir65kv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "9.15.3";
|
||||
version = "9.16.0";
|
||||
};
|
||||
mini_portile2 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy";
|
||||
sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
};
|
||||
nokogiri = {
|
||||
dependencies = ["mini_portile2" "racc"];
|
||||
|
|
@ -68,10 +68,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn";
|
||||
sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.13.9";
|
||||
version = "1.13.10";
|
||||
};
|
||||
octokit = {
|
||||
dependencies = ["faraday" "sawyer"];
|
||||
|
|
@ -89,20 +89,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6";
|
||||
sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
};
|
||||
racc = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d";
|
||||
sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.0";
|
||||
version = "1.6.2";
|
||||
};
|
||||
reverse_markdown = {
|
||||
dependencies = ["nokogiri"];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "miller";
|
||||
version = "6.5.0";
|
||||
version = "6.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johnkerl";
|
||||
repo = "miller";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-k/ibxJYgk3CT+/mYJ3DN9GatuiIgMPMs1+5cbCg4jxM=";
|
||||
sha256 = "sha256-Uvf2kkWD6ir8XicEX+FNYmd2A9c/jd6GgwjYomNfjfc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-UQHqDuQeXfmGrRYSbqW6lnBDVTgDJGhJWmH4kgPrggE=";
|
||||
vendorSha256 = "sha256-VW0mTq0oc95wVkFa+0rpsiOlS/9LT2Xy6u0RtSTsEoA=";
|
||||
|
||||
subPackages = [ "cmd/mlr" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8852,6 +8852,8 @@ with pkgs;
|
|||
|
||||
mautrix-facebook = callPackage ../servers/mautrix-facebook { };
|
||||
|
||||
mautrix-googlechat = callPackage ../servers/mautrix-googlechat { };
|
||||
|
||||
mautrix-signal = recurseIntoAttrs (callPackage ../servers/mautrix-signal { });
|
||||
|
||||
mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { });
|
||||
|
|
@ -12892,6 +12894,8 @@ with pkgs;
|
|||
|
||||
wireguard-tools = callPackage ../tools/networking/wireguard-tools { };
|
||||
|
||||
wireproxy = callPackage ../tools/networking/wireproxy { };
|
||||
|
||||
wiringpi = callPackage ../os-specific/linux/wiringpi { };
|
||||
|
||||
wg-friendly-peer-names = callPackage ../tools/networking/wg-friendly-peer-names { };
|
||||
|
|
@ -14492,7 +14496,7 @@ with pkgs;
|
|||
|
||||
gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { };
|
||||
|
||||
gccgo = wrapCC (gcc.cc.override {
|
||||
gccgo = wrapCC ((if stdenv.hostPlatform.isMusl then gcc_latest else gcc).cc.override {
|
||||
name = "gccgo";
|
||||
langCC = true; #required for go.
|
||||
langC = true;
|
||||
|
|
@ -19699,6 +19703,8 @@ with pkgs;
|
|||
|
||||
mpfi = callPackage ../development/libraries/mpfi { };
|
||||
|
||||
mpdecimal = callPackage ../development/libraries/mpdecimal { };
|
||||
|
||||
mpfshell = callPackage ../development/tools/mpfshell { };
|
||||
|
||||
# A GMP fork
|
||||
|
|
@ -21495,6 +21501,8 @@ with pkgs;
|
|||
|
||||
libusbsio = callPackage ../development/libraries/libusbsio { };
|
||||
|
||||
libucontext = callPackage ../development/libraries/libucontext { };
|
||||
|
||||
libutempter = callPackage ../development/libraries/libutempter { };
|
||||
|
||||
libuldaq = callPackage ../development/libraries/libuldaq { };
|
||||
|
|
@ -37963,7 +37971,7 @@ with pkgs;
|
|||
|
||||
wmutils-opt = callPackage ../tools/X11/wmutils-opt { };
|
||||
|
||||
wordpress = callPackage ../servers/web-apps/wordpress { };
|
||||
inherit (callPackage ../servers/web-apps/wordpress {}) wordpress wordpress6_1;
|
||||
|
||||
wordpressPackages = ( callPackage ../servers/web-apps/wordpress/packages {
|
||||
plugins = lib.importJSON ../servers/web-apps/wordpress/packages/plugins.json;
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ let
|
|||
# with their host distribution's versions of nix's numerous
|
||||
# build dependencies.
|
||||
nixCrossStatic = {
|
||||
nixStatic = platforms.linux; # no need for buildPlatform=*-darwin
|
||||
nixStatic = linux; # no need for buildPlatform=*-darwin
|
||||
};
|
||||
|
||||
in
|
||||
|
|
|
|||
Loading…
Reference in a new issue