mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-21 20:49:52 +03:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
887e342eaa
@ -1,6 +1,6 @@
|
||||
# Contributing to this manual {#chap-contributing}
|
||||
|
||||
The DocBook and CommonMark sources of NixOS' manual are in the [nixos/doc/manual](https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual) subdirectory of the [Nixpkgs](https://github.com/NixOS/nixpkgs) repository.
|
||||
The [DocBook] and CommonMark sources of the NixOS manual are in the [nixos/doc/manual](https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual) subdirectory of the [Nixpkgs](https://github.com/NixOS/nixpkgs) repository.
|
||||
|
||||
You can quickly check your edits with the following:
|
||||
|
||||
@ -11,3 +11,25 @@ $ nix-build nixos/release.nix -A manual.x86_64-linux
|
||||
```
|
||||
|
||||
If the build succeeds, the manual will be in `./result/share/doc/nixos/index.html`.
|
||||
|
||||
**Contributing to the man pages**
|
||||
|
||||
The man pages are written in [DocBook] which is XML.
|
||||
|
||||
To see what your edits look like:
|
||||
|
||||
```ShellSession
|
||||
$ cd /path/to/nixpkgs
|
||||
$ nix-build nixos/release.nix -A manpages.x86_64-linux
|
||||
```
|
||||
|
||||
You can then read the man page you edited by running
|
||||
|
||||
```ShellSession
|
||||
$ man --manpath=result/share/man nixos-rebuild # Replace nixos-rebuild with the command whose manual you edited
|
||||
```
|
||||
|
||||
If you're on a different architecture that's supported by NixOS (check nixos/release.nix) then replace `x86_64-linux` with the architecture.
|
||||
`nix-build` will complain otherwise, but should also tell you which architecture you have + the supported ones.
|
||||
|
||||
[DocBook]: https://en.wikipedia.org/wiki/DocBook
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="chap-contributing">
|
||||
<title>Contributing to this manual</title>
|
||||
<para>
|
||||
The DocBook and CommonMark sources of NixOS’ manual are in the
|
||||
The
|
||||
<link xlink:href="https://en.wikipedia.org/wiki/DocBook">DocBook</link>
|
||||
and CommonMark sources of the NixOS manual are in the
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual">nixos/doc/manual</link>
|
||||
subdirectory of the
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs">Nixpkgs</link>
|
||||
@ -19,4 +21,32 @@ $ nix-build nixos/release.nix -A manual.x86_64-linux
|
||||
If the build succeeds, the manual will be in
|
||||
<literal>./result/share/doc/nixos/index.html</literal>.
|
||||
</para>
|
||||
<para>
|
||||
<emphasis role="strong">Contributing to the man pages</emphasis>
|
||||
</para>
|
||||
<para>
|
||||
The man pages are written in
|
||||
<link xlink:href="https://en.wikipedia.org/wiki/DocBook">DocBook</link>
|
||||
which is XML.
|
||||
</para>
|
||||
<para>
|
||||
To see what your edits look like:
|
||||
</para>
|
||||
<programlisting>
|
||||
$ cd /path/to/nixpkgs
|
||||
$ nix-build nixos/release.nix -A manpages.x86_64-linux
|
||||
</programlisting>
|
||||
<para>
|
||||
You can then read the man page you edited by running
|
||||
</para>
|
||||
<programlisting>
|
||||
$ man --manpath=result/share/man nixos-rebuild # Replace nixos-rebuild with the command whose manual you edited
|
||||
</programlisting>
|
||||
<para>
|
||||
If you’re on a different architecture that’s supported by NixOS
|
||||
(check nixos/release.nix) then replace
|
||||
<literal>x86_64-linux</literal> with the architecture.
|
||||
<literal>nix-build</literal> will complain otherwise, but should
|
||||
also tell you which architecture you have + the supported ones.
|
||||
</para>
|
||||
</chapter>
|
||||
|
||||
@ -282,6 +282,20 @@
|
||||
to match upstream.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The new option
|
||||
<literal>services.tailscale.useRoutingFeatures</literal>
|
||||
controls various settings for using Tailscale features like
|
||||
exit nodes and subnet routers. If you wish to use your machine
|
||||
as an exit node, you can set this setting to
|
||||
<literal>server</literal>, otherwise if you wish to use an
|
||||
exit node you can set this setting to
|
||||
<literal>client</literal>. The strict RPF warning has been
|
||||
removed as the RPF will be loosened automatically based on the
|
||||
value of this setting.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
@ -134,7 +134,7 @@
|
||||
</arg>
|
||||
<arg>
|
||||
<option>-I</option>
|
||||
<replaceable>path</replaceable>
|
||||
<replaceable>NIX_PATH</replaceable>
|
||||
</arg>
|
||||
<arg>
|
||||
<group choice='req'>
|
||||
@ -624,7 +624,7 @@
|
||||
|
||||
<para>
|
||||
In addition, <command>nixos-rebuild</command> accepts various Nix-related
|
||||
flags, including <option>--max-jobs</option> / <option>-j</option>,
|
||||
flags, including <option>--max-jobs</option> / <option>-j</option>, <option>-I</option>,
|
||||
<option>--show-trace</option>, <option>--keep-failed</option>,
|
||||
<option>--keep-going</option>, <option>--impure</option>, and <option>--verbose</option> /
|
||||
<option>-v</option>. See the Nix manual for details.
|
||||
@ -647,6 +647,20 @@
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term>
|
||||
<envar>NIX_PATH</envar>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
A colon-separated list of directories used to look up Nix expressions enclosed in angle brackets (e.g <nixpkgs>). Example
|
||||
<screen>
|
||||
nixpkgs=./my-nixpkgs
|
||||
</screen>
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term>
|
||||
<envar>NIX_SSHOPTS</envar>
|
||||
|
||||
@ -81,3 +81,5 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
- The `services.fwupd` module now allows arbitrary daemon settings to be configured in a structured manner ([`services.fwupd.daemonSettings`](#opt-services.fwupd.daemonSettings)).
|
||||
|
||||
- The `unifi-poller` package and corresponding NixOS module have been renamed to `unpoller` to match upstream.
|
||||
|
||||
- The new option `services.tailscale.useRoutingFeatures` controls various settings for using Tailscale features like exit nodes and subnet routers. If you wish to use your machine as an exit node, you can set this setting to `server`, otherwise if you wish to use an exit node you can set this setting to `client`. The strict RPF warning has been removed as the RPF will be loosened automatically based on the value of this setting.
|
||||
|
||||
@ -11,7 +11,11 @@ let
|
||||
|
||||
mkExcludeFile = cfg:
|
||||
# Write each exclude pattern to a new line
|
||||
pkgs.writeText "excludefile" (concatStringsSep "\n" cfg.exclude);
|
||||
pkgs.writeText "excludefile" (concatMapStrings (s: s + "\n") cfg.exclude);
|
||||
|
||||
mkPatternsFile = cfg:
|
||||
# Write each pattern to a new line
|
||||
pkgs.writeText "patternsfile" (concatMapStrings (s: s + "\n") cfg.patterns);
|
||||
|
||||
mkKeepArgs = cfg:
|
||||
# If cfg.prune.keep e.g. has a yearly attribute,
|
||||
@ -47,6 +51,7 @@ let
|
||||
borg create $extraArgs \
|
||||
--compression ${cfg.compression} \
|
||||
--exclude-from ${mkExcludeFile cfg} \
|
||||
--patterns-from ${mkPatternsFile cfg} \
|
||||
$extraCreateArgs \
|
||||
"::$archiveName$archiveSuffix" \
|
||||
${if cfg.paths == null then "-" else escapeShellArgs cfg.paths}
|
||||
@ -441,6 +446,21 @@ in {
|
||||
];
|
||||
};
|
||||
|
||||
patterns = mkOption {
|
||||
type = with types; listOf str;
|
||||
description = lib.mdDoc ''
|
||||
Include/exclude paths matching the given patterns. The first
|
||||
matching patterns is used, so if an include pattern (prefix `+`)
|
||||
matches before an exclude pattern (prefix `-`), the file is
|
||||
backed up. See [{command}`borg help patterns`](https://borgbackup.readthedocs.io/en/stable/usage/help.html#borg-patterns) for pattern syntax.
|
||||
'';
|
||||
default = [ ];
|
||||
example = [
|
||||
"+ /home/susan"
|
||||
"- /home/*"
|
||||
];
|
||||
};
|
||||
|
||||
readWritePaths = mkOption {
|
||||
type = with types; listOf path;
|
||||
description = lib.mdDoc ''
|
||||
|
||||
@ -4,10 +4,7 @@ with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.tailscale;
|
||||
firewallOn = config.networking.firewall.enable;
|
||||
rpfMode = config.networking.firewall.checkReversePath;
|
||||
isNetworkd = config.networking.useNetworkd;
|
||||
rpfIsStrict = rpfMode == true || rpfMode == "strict";
|
||||
in {
|
||||
meta.maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 ];
|
||||
|
||||
@ -38,14 +35,23 @@ in {
|
||||
defaultText = literalExpression "pkgs.tailscale";
|
||||
description = lib.mdDoc "The package to use for tailscale";
|
||||
};
|
||||
|
||||
useRoutingFeatures = mkOption {
|
||||
type = types.enum [ "none" "client" "server" "both" ];
|
||||
default = "none";
|
||||
example = "server";
|
||||
description = lib.mdDoc ''
|
||||
Enables settings required for Tailscale's routing features like subnet routers and exit nodes.
|
||||
|
||||
To use these these features, you will still need to call `sudo tailscale up` with the relevant flags like `--advertise-exit-node` and `--exit-node`.
|
||||
|
||||
When set to `client` or `both`, reverse path filtering will be set to loose instead of strict.
|
||||
When set to `server` or `both`, IP forwarding will be enabled.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
warnings = optional (firewallOn && rpfIsStrict) ''
|
||||
Strict reverse path filtering breaks Tailscale exit node use and some subnet routing setups. Consider setting:
|
||||
|
||||
networking.firewall.checkReversePath = "loose";
|
||||
'';
|
||||
environment.systemPackages = [ cfg.package ]; # for the CLI
|
||||
systemd.packages = [ cfg.package ];
|
||||
systemd.services.tailscaled = {
|
||||
@ -75,6 +81,13 @@ in {
|
||||
stopIfChanged = false;
|
||||
};
|
||||
|
||||
boot.kernel.sysctl = mkIf (cfg.useRoutingFeatures == "server" || cfg.useRoutingFeatures == "both") {
|
||||
"net.ipv4.conf.all.forwarding" = mkDefault true;
|
||||
"net.ipv6.conf.all.forwarding" = mkDefault true;
|
||||
};
|
||||
|
||||
networking.firewall.checkReversePath = mkIf (cfg.useRoutingFeatures == "client" || cfg.useRoutingFeatures == "both") "loose";
|
||||
|
||||
networking.dhcpcd.denyInterfaces = [ cfg.interfaceName ];
|
||||
|
||||
systemd.network.networks."50-tailscale" = mkIf isNetworkd {
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
let
|
||||
pname = "trezor-suite";
|
||||
version = "22.10.3";
|
||||
version = "22.11.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
suffix = {
|
||||
@ -19,8 +19,8 @@ let
|
||||
src = fetchurl {
|
||||
url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";
|
||||
sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
|
||||
aarch64-linux = "sha512-fI0N1V+6SEZ9eNf+G/w5RcY8oeA5MsVzJnpnWoMzkkHZh5jVHgNbcqVgSPbzvQ/WZNv1MX37KETcxmDwRx//yw==";
|
||||
x86_64-linux = "sha512-zN89Qw6fQh27EaN9ARNwqhiBaiNoMic6Aq2UPG0OSUtOjEOdkGJ2pbR8MgWVccSgRH8ZmAAXZ0snVKfZWHbCjA==";
|
||||
aarch64-linux = "sha512-cZZFc1Ij7KrF0Kc1Xmtg/73ASv56a6SFWFy3Miwl3P5u8ieZGXVDlSQyv84CsuYMbE0Vga3X0XS/BiF7nKNcnA==";
|
||||
x86_64-linux = "sha512-X/IEZGs43riUn6vC5bPyj4DS/VK+s7C10PbBnvwieaclBSVJyQ8H8hbn4eKi0kMVNEl0A9o8W09gXBxAhdNR9g==";
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
|
||||
@ -45,12 +45,12 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "retroarch-bare";
|
||||
version = "1.13.0";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "RetroArch";
|
||||
hash = "sha256-eEe0mM9gUWgEzoRH1Iuet20US9eXNtCVSBi2kX1njVw=";
|
||||
hash = "sha256-oEENGehbzjJq1kTiz6gkXHMMe/rXjWPxxMoe4RqdqK4=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "libretro-core-info";
|
||||
version = "1.13.0";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "libretro-core-info";
|
||||
hash = "sha256-rTq2h+IGJduBkP4qCACmm3T2PvbZ0mOmwD1jLkJ2j/Q=";
|
||||
hash = "sha256-3nw8jUxBQJxiKlWS6OjTjwUYWKx3r2E7eHmbj4naWrk=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{
|
||||
"stable": {
|
||||
"version": "108.0.5359.98",
|
||||
"sha256": "07jnhd5y7k4zp2ipz052isw7llagxn8l8rbz8x3jkjz3f5wi7dk0",
|
||||
"sha256bin64": "1hx49932g8abnb5f3a4ly7kjbrkh5bs040dh96zpxvfqx7dn6vrs",
|
||||
"version": "108.0.5359.124",
|
||||
"sha256": "0x9ac6m4xdccjdrk2bmq4y7bhfpgf2dv0q7lsbbsa50vlv1gm3fl",
|
||||
"sha256bin64": "00c11svz9dzkg57484jg7c558l0jz8jbgi5zyjs1w7xp24vpnnpg",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-10-05",
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lefthook";
|
||||
version = "1.2.4";
|
||||
version = "1.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "evilmartians";
|
||||
repo = "lefthook";
|
||||
sha256 = "sha256-Z6j/Y8b9lq2nYS5Ki8iJoDsG3l5M6RylfDqQL7WrwNg=";
|
||||
sha256 = "sha256-M15ESB8JCSryD6/+6N2EA6NUzLI4cwgAJUQC9UDNJrM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-sBcgt2YsV9RQhSjPN6N54tRk7nNvcOVhPEsEP+0Dtco=";
|
||||
vendorSha256 = "sha256-KNegRQhVZMNDgcJZOgEei3oviDPM/RFwZbpoh38pxBw=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cinnamon-translations";
|
||||
version = "5.6.0";
|
||||
version = "5.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-ztHHqX0OuwSFGlxCoJhZXnUsMM0WrkwiQINgDVlb0XA=";
|
||||
hash = "sha256-567xkQGLLhZtjAWXzW/MRiD14rrWeg0yvx97jtukRvc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,9 +1,6 @@
|
||||
import ./generic.nix {
|
||||
major_version = "5";
|
||||
minor_version = "0";
|
||||
patch_version = "0-rc1";
|
||||
src = fetchTarball {
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-5.0/ocaml-5.0.0~rc1.tar.xz";
|
||||
sha256 = "sha256:1ql9rmh2g9fhfv99vk9sdca1biiin32vi4idgdgl668n0vb8blw8";
|
||||
};
|
||||
patch_version = "0";
|
||||
sha256 = "sha256-yxfwpTTdSz/sk9ARsL4bpcYIfaAzz3iehaNLlkHsxl8=";
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio
|
||||
{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bash, pkg-config, autoconf, cpio
|
||||
, file, which, unzip, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib
|
||||
, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst
|
||||
, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk18-bootstrap
|
||||
@ -49,6 +49,13 @@ let
|
||||
url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
|
||||
sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
|
||||
})
|
||||
|
||||
# Patch borrowed from Alpine to fix build errors with musl libc and recent gcc.
|
||||
# This is applied anywhere to prevent patchrot.
|
||||
(fetchpatch {
|
||||
url = "https://git.alpinelinux.org/aports/plain/testing/openjdk18/FixNullPtrCast.patch?id=b93d1fc37fcf106144958d957bb97c7db67bd41f";
|
||||
hash = "sha256-nvO8RcmKwMcPdzq28mZ4If1XJ6FQ76CYWqRIozPCk5U=";
|
||||
})
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
./swing-use-gtk-jdk13.patch
|
||||
];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio
|
||||
{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bash, pkg-config, autoconf, cpio
|
||||
, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib
|
||||
, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst
|
||||
, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk19-bootstrap
|
||||
@ -51,6 +51,13 @@ let
|
||||
url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
|
||||
sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
|
||||
})
|
||||
|
||||
# Patch borrowed from Alpine to fix build errors with musl libc and recent gcc.
|
||||
# This is applied anywhere to prevent patchrot.
|
||||
(fetchpatch {
|
||||
url = "https://git.alpinelinux.org/aports/plain/testing/openjdk19/FixNullPtrCast.patch?id=b93d1fc37fcf106144958d957bb97c7db67bd41f";
|
||||
hash = "sha256-cnpeYcVoRYjuDgrl2x27frv6KUAnu1+1MVPehPZy/Cg=";
|
||||
})
|
||||
] ++ lib.optionals (!headless && enableGnome2) [
|
||||
./swing-use-gtk-jdk13.patch
|
||||
];
|
||||
|
||||
@ -17,13 +17,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "duckdb";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XCEX2VCynbMUP5xsxWq8PlHnfrBfES5c2fuu2jhM+tI=";
|
||||
sha256 = "sha256-no4fcukEpzKmh2i41sdXGDljGhEDkzk3rYBATqlq6Gw=";
|
||||
};
|
||||
|
||||
patches = [ ./version.patch ];
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "afsapi";
|
||||
version = "0.2.7";
|
||||
version = "0.2.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "wlcrs";
|
||||
repo = "python-afsapi";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-TTZk/8mfG5lBr8SyMbqSaYDskWKnUlMkAUp94DXPCKo=";
|
||||
hash = "sha256-eE5BsXNtSU6YUhRn4/SKpMrqaYf8tyfLKdxxGOmNJ9I=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
@ -50,6 +50,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python implementation of the Frontier Silicon API";
|
||||
homepage = "https://github.com/wlcrs/python-afsapi";
|
||||
changelog = "https://github.com/wlcrs/python-afsapi/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "22.0.0";
|
||||
version = "22.2.0";
|
||||
pname = "azure-mgmt-network";
|
||||
format = "setuptools";
|
||||
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-qXWmZuiYA6BwFP/uydPi8mV68WlXrJlwP9eiTk+q1Ak=";
|
||||
hash = "sha256-491E1Q59dYFkH5QniR+S5eoiiL/ACwLe+fgYob8/jG4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysigma-backend-qradar";
|
||||
version = "0.2.1";
|
||||
version = "0.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "nNipsx-Sec";
|
||||
repo = "pySigma-backend-qradar";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-kd/KWO3xxIHPgXqvcOrSvdozLG34+DwZedfSVoZ+dDA=";
|
||||
hash = "sha256-4QiPBgzlZG3aeYwn9zodZCXY6mjOktgdPWR5ikg/Y30=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -48,6 +48,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Library to support Qradar for pySigma";
|
||||
homepage = "https://github.com/nNipsx-Sec/pySigma-backend-qradar";
|
||||
changelog = "https://github.com/nNipsx-Sec/pySigma-backend-qradar/releases/tag/v${version}";
|
||||
license = with licenses; [ lgpl21Only ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "circup";
|
||||
version = "1.1.3";
|
||||
version = "1.1.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adafruit";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-BCAsCwQCKMtmjISMVKDblRdev87K4EfX5D2Ot0L5PoQ=";
|
||||
hash = "sha256-nXDje+MJR6olG3G7RO3esf6UAKynMvCP8YetIhnqoeE=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
@ -46,6 +46,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
meta = with lib; {
|
||||
description = "CircuitPython library updater";
|
||||
homepage = "https://github.com/adafruit/circup";
|
||||
changelog = "https://github.com/adafruit/circup/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
124
pkgs/development/tools/poac/default.nix
Normal file
124
pkgs/development/tools/poac/default.nix
Normal file
@ -0,0 +1,124 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, cpm-cmake
|
||||
, git
|
||||
, cacert
|
||||
, boost179
|
||||
, fmt_8
|
||||
, icu
|
||||
, libarchive
|
||||
, libgit2
|
||||
, lz4
|
||||
, ninja
|
||||
, openssl_3
|
||||
, spdlog
|
||||
}:
|
||||
|
||||
let
|
||||
git2Cpp = fetchFromGitHub {
|
||||
owner = "ken-matsui";
|
||||
repo = "git2-cpp";
|
||||
rev = "v0.1.0-alpha.1";
|
||||
sha256 = "sha256-Ub0wrBK5oMfWGv+kpq/W1PN3yzpcfg+XWRFF/lV9VCY=";
|
||||
};
|
||||
|
||||
glob = fetchFromGitHub {
|
||||
owner = "p-ranav";
|
||||
repo = "glob";
|
||||
rev = "v0.0.1";
|
||||
sha256 = "sha256-2y+a7YFBiYX8wbwCCWw1Cm+SFoXGB3ZxLPi/QdZhcdw=";
|
||||
};
|
||||
|
||||
packageProjectCMake = fetchFromGitHub {
|
||||
owner = "TheLartians";
|
||||
repo = "PackageProject.cmake";
|
||||
rev = "v1.3";
|
||||
sha256 = "sha256-ZktftDrPo+JhBt0XKJekv0cyxIagvcgMcXZOBd4RtKs=";
|
||||
};
|
||||
|
||||
mitamaCppResult = fetchFromGitHub {
|
||||
owner = "LoliGothick";
|
||||
repo = "mitama-cpp-result";
|
||||
rev = "v9.3.0";
|
||||
sha256 = "sha256-CWYVPpmPIZZTsqXKh+Ft3SlQ4C9yjUof1mJ8Acn5kmM=";
|
||||
};
|
||||
|
||||
structopt = fetchFromGitHub {
|
||||
owner = "p-ranav";
|
||||
repo = "structopt";
|
||||
rev = "e9722d3c2b52cf751ebc1911b93d9649c4e365cc";
|
||||
sha256 = "sha256-jIfKUyY2QQ2/donywwlz65PY8u7xODGoG6SlNtUhwkg=";
|
||||
};
|
||||
|
||||
toml11 = fetchFromGitHub {
|
||||
owner = "ToruNiina";
|
||||
repo = "toml11";
|
||||
rev = "9086b1114f39a8fb10d08ca704771c2f9f247d02";
|
||||
sha256 = "sha256-fHUElHO4ckNQq7Q88GdbHGxfaAvWoWtGB0eD9y2MnLo=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "poac";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "poacpm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-jXYPeI/rVuTr7OYV5sMgNr+U1OfN0XZtun6mihtlErY=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
mkdir -p ${placeholder "out"}/share/cpm
|
||||
cp ${cpm-cmake}/share/cpm/CPM.cmake ${placeholder "out"}/share/cpm/CPM_0.35.1.cmake
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCPM_USE_LOCAL_PACKAGES=ON"
|
||||
"-DCPM_SOURCE_CACHE=${placeholder "out"}/share"
|
||||
"-DFETCHCONTENT_SOURCE_DIR_FMT=${fmt_8}"
|
||||
"-DFETCHCONTENT_SOURCE_DIR_GIT2-CPP=${git2Cpp}"
|
||||
"-DFETCHCONTENT_SOURCE_DIR_GLOB=${glob}"
|
||||
"-DFETCHCONTENT_SOURCE_DIR_PACKAGEPROJECT.CMAKE=${packageProjectCMake}"
|
||||
"-DFETCHCONTENT_SOURCE_DIR_MITAMA-CPP-RESULT=${mitamaCppResult}"
|
||||
"-DFETCHCONTENT_SOURCE_DIR_NINJA=${ninja.src}"
|
||||
"-DFETCHCONTENT_SOURCE_DIR_STRUCTOPT=${structopt}"
|
||||
"-DFETCHCONTENT_SOURCE_DIR_TOML11=${toml11}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake git cacert ];
|
||||
buildInputs = [
|
||||
(boost179.override {
|
||||
enableShared = stdenv.isDarwin;
|
||||
enableStatic = !stdenv.isDarwin;
|
||||
})
|
||||
fmt_8
|
||||
git2Cpp
|
||||
glob
|
||||
packageProjectCMake
|
||||
mitamaCppResult
|
||||
ninja
|
||||
structopt
|
||||
toml11
|
||||
icu
|
||||
libarchive
|
||||
libgit2
|
||||
lz4
|
||||
openssl_3
|
||||
spdlog
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://poac.pm";
|
||||
description = "Package Manager for C++";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ken-matsui ];
|
||||
platforms = platforms.unix;
|
||||
# https://github.com/NixOS/nixpkgs/pull/189712#issuecomment-1237791234
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64)
|
||||
# error: excess elements in scalar initializer on std::aligned_alloc
|
||||
|| (stdenv.isDarwin && stdenv.isx86_64);
|
||||
};
|
||||
}
|
||||
@ -1,8 +1,8 @@
|
||||
{
|
||||
"1.19": {
|
||||
"url": "https://piston-data.mojang.com/v1/objects/f69c284232d7c7580bd89a5a4931c3581eae1378/server.jar",
|
||||
"sha1": "f69c284232d7c7580bd89a5a4931c3581eae1378",
|
||||
"version": "1.19.2",
|
||||
"url": "https://piston-data.mojang.com/v1/objects/c9df48efed58511cdd0213c56b9013a7b5c9ac1f/server.jar",
|
||||
"sha1": "c9df48efed58511cdd0213c56b9013a7b5c9ac1f",
|
||||
"version": "1.19.3",
|
||||
"javaVersion": 17
|
||||
},
|
||||
"1.18": {
|
||||
|
||||
@ -1,12 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, openpam, darwin }:
|
||||
|
||||
let
|
||||
sdk =
|
||||
if stdenv.isAarch64
|
||||
then null
|
||||
else darwin.apple_sdk.sdk;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pam_reattach";
|
||||
version = "1.3";
|
||||
@ -26,12 +19,10 @@ stdenv.mkDerivation rec {
|
||||
"arm64"
|
||||
}"
|
||||
"-DENABLE_CLI=ON"
|
||||
]
|
||||
++ lib.optional (sdk != null)
|
||||
"-DCMAKE_LIBRARY_PATH=${sdk}/usr/lib";
|
||||
] ++ lib.optional (!stdenv.isAarch64) "-DCMAKE_LIBRARY_PATH=${darwin.apple_sdk.sdk}/usr/lib";
|
||||
|
||||
buildInputs = [ openpam ]
|
||||
++ lib.optional (sdk != null) sdk;
|
||||
++ lib.optional (!stdenv.isAarch64) darwin.apple_sdk.sdk;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "libreddit";
|
||||
version = "0.25.0";
|
||||
version = "0.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libreddit";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-IIL06jhl9wMLQTQtr96kq4Kkf2oGO3xxJxcB9Y34iUk=";
|
||||
hash = "sha256-/K79EHjqkclyh1AmRaevYcyUD4XSrTfd5zjnpOmBNcE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-uIr8aUDErHVUKML2l6nITSBpOxqg3h1Md0948BxvutI=";
|
||||
cargoSha256 = "sha256-KYuEy5MwgdiHHbDDNyb+NVYyXdvx1tCH7dQdPWCCfQo=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
|
||||
@ -7,5 +7,6 @@ in
|
||||
pulumi-aws-native = callPackage' ./pulumi-aws-native.nix { };
|
||||
pulumi-azure-native = callPackage' ./pulumi-azure-native.nix { };
|
||||
pulumi-language-python = callPackage ./pulumi-language-python.nix { };
|
||||
pulumi-language-nodejs = callPackage ./pulumi-language-nodejs.nix { };
|
||||
pulumi-random = callPackage' ./pulumi-random.nix { };
|
||||
}
|
||||
|
||||
33
pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix
Normal file
33
pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, pulumi
|
||||
, nodejs
|
||||
}:
|
||||
buildGoModule rec {
|
||||
inherit (pulumi) version src;
|
||||
|
||||
pname = "pulumi-language-nodejs";
|
||||
|
||||
sourceRoot = "${src.name}/sdk";
|
||||
|
||||
vendorHash = "sha256-IZIdLmNGMFjRdkLPoE9UyON3pX/GBIgz/rv108v8iLY=";
|
||||
|
||||
subPackages = [
|
||||
"nodejs/cmd/pulumi-language-nodejs"
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/pulumi/pulumi/sdk/v3/go/common/version.Version=${version}"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
nodejs
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
cp nodejs/dist/pulumi-resource-pulumi-nodejs $out/bin
|
||||
cp nodejs/dist/pulumi-analyzer-policy $out/bin
|
||||
'';
|
||||
}
|
||||
@ -5,22 +5,27 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mubeng";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0-dev";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kitabisa";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BY3X9N7XnBZ6mVX/o+EXruJmi3HYWMeY9enSuJY4jWI=";
|
||||
hash = "sha256-NBZmu0VcVUhJSdM3fzZ+4Q5oX8uxO6GLpEUq74x8HUU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-1JxyP6CrJ4/g7o3eGeN1kRXJU/jNLEB8fW1bjJytQqQ=";
|
||||
vendorHash = "sha256-1JxyP6CrJ4/g7o3eGeN1kRXJU/jNLEB8fW1bjJytQqQ=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X ktbs.dev/mubeng/common.Version=${version}" ];
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X ktbs.dev/mubeng/common.Version=${version}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Proxy checker and IP rotator";
|
||||
homepage = "https://github.com/kitabisa/mubeng";
|
||||
changelog = "https://github.com/kitabisa/mubeng/releases/tag/v${version}";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, fetchpatch2
|
||||
, Security
|
||||
|
||||
, storeDir ? "/nix/store"
|
||||
@ -37,6 +38,14 @@ let
|
||||
boehmgc = boehmgc-nix;
|
||||
aws-sdk-cpp = aws-sdk-cpp-nix;
|
||||
};
|
||||
|
||||
# https://github.com/NixOS/nix/pull/7473
|
||||
patch-sqlite-exception = fetchpatch2 {
|
||||
name = "nix-7473-sqlite-exception-add-message.patch";
|
||||
url = "https://github.com/hercules-ci/nix/commit/c965f35de71cc9d88f912f6b90fd7213601e6eb8.patch";
|
||||
sha256 = "sha256-tI5nKU7SZgsJrxiskJ5nHZyfrWf5aZyKYExM0792N80=";
|
||||
};
|
||||
|
||||
in lib.makeExtensible (self: {
|
||||
nix_2_3 = (common rec {
|
||||
version = "2.3.16";
|
||||
@ -88,6 +97,7 @@ in lib.makeExtensible (self: {
|
||||
url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";
|
||||
sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
|
||||
})
|
||||
patch-sqlite-exception
|
||||
];
|
||||
};
|
||||
|
||||
@ -102,6 +112,7 @@ in lib.makeExtensible (self: {
|
||||
url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";
|
||||
sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
|
||||
})
|
||||
patch-sqlite-exception
|
||||
];
|
||||
};
|
||||
|
||||
@ -116,6 +127,7 @@ in lib.makeExtensible (self: {
|
||||
url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";
|
||||
sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
|
||||
})
|
||||
patch-sqlite-exception
|
||||
];
|
||||
};
|
||||
|
||||
@ -124,6 +136,7 @@ in lib.makeExtensible (self: {
|
||||
sha256 = "sha256-sQ9C101CL/eVN5JgH91ozHFWU4+bXr8/Fi/8NQk6xRI=";
|
||||
patches = [
|
||||
./patches/flaky-tests.patch
|
||||
patch-sqlite-exception
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
|
||||
a common set of abstractions that can be used by standard GUI and text
|
||||
mode package managers.
|
||||
'';
|
||||
homepage = "http://www.packagekit.org/";
|
||||
homepage = "https://github.com/PackageKit/PackageKit";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ matthewbauer ];
|
||||
|
||||
@ -1,4 +1,16 @@
|
||||
{ lib, stdenv, fetchFromGitHub, jre, jdk, gradle_5, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, jre
|
||||
, jdk
|
||||
, gradle_6
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, perl
|
||||
, writeText
|
||||
, runtimeShell
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "jd-gui";
|
||||
@ -8,14 +20,23 @@ let
|
||||
owner = "java-decompiler";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "010bd3q2m4jy4qz5ahdx86b5f558s068gbjlbpdhq3bhh4yrjy20";
|
||||
hash = "sha256-QHiZPYFwDQzbXVSuhwzQqBRXlkG9QVU+Jl6SKvBoCwQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/java-decompiler/jd-gui/pull/362
|
||||
(fetchpatch {
|
||||
name = "nebula-plugin-gradle-6-compatibility.patch";
|
||||
url = "https://github.com/java-decompiler/jd-gui/commit/91f805f9dc8ce0097460e63c8095ccea870687e6.patch";
|
||||
hash = "sha256-9eaM9Mx2FaKIhGSOHjATKN/CrtvJeXyrH8Mdx8LNtpE=";
|
||||
})
|
||||
];
|
||||
|
||||
deps = stdenv.mkDerivation {
|
||||
name = "${pname}-deps";
|
||||
inherit src;
|
||||
inherit src patches;
|
||||
|
||||
nativeBuildInputs = [ jdk perl gradle_5 ];
|
||||
nativeBuildInputs = [ jdk perl gradle_6 ];
|
||||
|
||||
buildPhase = ''
|
||||
export GRADLE_USER_HOME=$(mktemp -d);
|
||||
@ -32,7 +53,7 @@ let
|
||||
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "1qil12s0daxpxj5xj5dj6s2k89is0kiir2vcafkm3lasc41acmk3";
|
||||
outputHash = "sha256-gqUyZE+MoZRYCcJx95Qc4dZIC3DZvxee6UQhpfveDI4=";
|
||||
};
|
||||
|
||||
# Point to our local deps repo
|
||||
@ -68,10 +89,10 @@ let
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit pname version src;
|
||||
inherit pname version src patches;
|
||||
name = "${pname}-${version}";
|
||||
|
||||
nativeBuildInputs = [ jdk gradle_5 copyDesktopItems ];
|
||||
nativeBuildInputs = [ jdk gradle_6 copyDesktopItems ];
|
||||
|
||||
buildPhase = ''
|
||||
export GRADLE_USER_HOME=$(mktemp -d)
|
||||
|
||||
@ -10718,6 +10718,10 @@ with pkgs;
|
||||
|
||||
po4a = perlPackages.Po4a;
|
||||
|
||||
poac = callPackage ../development/tools/poac {
|
||||
inherit (llvmPackages_14) stdenv;
|
||||
};
|
||||
|
||||
podiff = callPackage ../tools/text/podiff { };
|
||||
|
||||
pocketbase = callPackage ../servers/pocketbase { };
|
||||
@ -22150,7 +22154,11 @@ with pkgs;
|
||||
prospector = callPackage ../development/tools/prospector { };
|
||||
|
||||
# https://github.com/protocolbuffers/protobuf/issues/10418
|
||||
protobuf = if stdenv.hostPlatform.is32bit then protobuf3_20 else
|
||||
# protobuf versions have to match between build-time and run-time
|
||||
# Using "targetPlatform" in the check makes sure that the version of
|
||||
# pkgsCross.armv7l-hf-multiplatform.buildPackages.protobuf matches the
|
||||
# version of pkgsCross.armv7l-hf-multiplatform.protobuf
|
||||
protobuf = if stdenv.targetPlatform.is32bit then protobuf3_20 else
|
||||
protobuf3_21;
|
||||
|
||||
protobuf3_21 = callPackage ../development/libraries/protobuf/3.21.nix { };
|
||||
|
||||
@ -1648,7 +1648,7 @@ in let inherit (pkgs) callPackage; in rec
|
||||
|
||||
ocamlPackages_5_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/5.0.nix { });
|
||||
|
||||
ocamlPackages_latest = ocamlPackages_4_14;
|
||||
ocamlPackages_latest = ocamlPackages_5_0;
|
||||
|
||||
ocamlPackages = ocamlPackages_4_14;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user