Merge staging-next into staging
This commit is contained in:
commit
72dd6c7f56
|
@ -13,7 +13,7 @@ checking for entire option trees, it is only recommended for use in
|
|||
submodules.
|
||||
|
||||
::: {#ex-freeform-module .example}
|
||||
**Example: Freeform submodule**
|
||||
### Freeform submodule
|
||||
|
||||
The following shows a submodule assigning a freeform type that allows
|
||||
arbitrary attributes with `str` values below `settings`, but also
|
||||
|
|
|
@ -77,6 +77,7 @@ The option's description is "Whether to enable \<name\>.".
|
|||
For example:
|
||||
|
||||
::: {#ex-options-declarations-util-mkEnableOption-magic .example}
|
||||
### `mkEnableOption` usage
|
||||
```nix
|
||||
lib.mkEnableOption (lib.mdDoc "magic")
|
||||
# is like
|
||||
|
@ -126,6 +127,7 @@ During the transition to CommonMark documentation `mkPackageOption` creates an o
|
|||
Examples:
|
||||
|
||||
::: {#ex-options-declarations-util-mkPackageOption-hello .example}
|
||||
### Simple `mkPackageOption` usage
|
||||
```nix
|
||||
lib.mkPackageOptionMD pkgs "hello" { }
|
||||
# is like
|
||||
|
@ -139,6 +141,7 @@ lib.mkOption {
|
|||
:::
|
||||
|
||||
::: {#ex-options-declarations-util-mkPackageOption-ghc .example}
|
||||
### `mkPackageOption` with explicit default and example
|
||||
```nix
|
||||
lib.mkPackageOptionMD pkgs "GHC" {
|
||||
default = [ "ghc" ];
|
||||
|
@ -156,6 +159,7 @@ lib.mkOption {
|
|||
:::
|
||||
|
||||
::: {#ex-options-declarations-util-mkPackageOption-extraDescription .example}
|
||||
### `mkPackageOption` with additional description text
|
||||
```nix
|
||||
mkPackageOption pkgs [ "python39Packages" "pytorch" ] {
|
||||
extraDescription = "This is an example and doesn't actually do anything.";
|
||||
|
@ -217,7 +221,7 @@ changing the main service module file and the type system automatically
|
|||
enforces that there can only be a single display manager enabled.
|
||||
|
||||
::: {#ex-option-declaration-eot-service .example}
|
||||
**Example: Extensible type placeholder in the service module**
|
||||
### Extensible type placeholder in the service module
|
||||
```nix
|
||||
services.xserver.displayManager.enable = mkOption {
|
||||
description = "Display manager to use";
|
||||
|
@ -227,7 +231,7 @@ services.xserver.displayManager.enable = mkOption {
|
|||
:::
|
||||
|
||||
::: {#ex-option-declaration-eot-backend-gdm .example}
|
||||
**Example: Extending `services.xserver.displayManager.enable` in the `gdm` module**
|
||||
### Extending `services.xserver.displayManager.enable` in the `gdm` module
|
||||
```nix
|
||||
services.xserver.displayManager.enable = mkOption {
|
||||
type = with types; nullOr (enum [ "gdm" ]);
|
||||
|
@ -236,7 +240,7 @@ services.xserver.displayManager.enable = mkOption {
|
|||
:::
|
||||
|
||||
::: {#ex-option-declaration-eot-backend-sddm .example}
|
||||
**Example: Extending `services.xserver.displayManager.enable` in the `sddm` module**
|
||||
### Extending `services.xserver.displayManager.enable` in the `sddm` module
|
||||
```nix
|
||||
services.xserver.displayManager.enable = mkOption {
|
||||
type = with types; nullOr (enum [ "sddm" ]);
|
||||
|
|
|
@ -36,7 +36,7 @@ merging is handled.
|
|||
together. This type is recommended when the option type is unknown.
|
||||
|
||||
::: {#ex-types-anything .example}
|
||||
**Example: `types.anything` Example**
|
||||
### `types.anything`
|
||||
|
||||
Two definitions of this type like
|
||||
|
||||
|
@ -356,7 +356,7 @@ you will still need to provide a default value (e.g. an empty attribute set)
|
|||
if you want to allow users to leave it undefined.
|
||||
|
||||
::: {#ex-submodule-direct .example}
|
||||
**Example: Directly defined submodule**
|
||||
### Directly defined submodule
|
||||
```nix
|
||||
options.mod = mkOption {
|
||||
description = "submodule example";
|
||||
|
@ -375,7 +375,7 @@ options.mod = mkOption {
|
|||
:::
|
||||
|
||||
::: {#ex-submodule-reference .example}
|
||||
**Example: Submodule defined as a reference**
|
||||
### Submodule defined as a reference
|
||||
```nix
|
||||
let
|
||||
modOptions = {
|
||||
|
@ -403,7 +403,7 @@ multiple definitions of the submodule option set
|
|||
([Example: Definition of a list of submodules](#ex-submodule-listof-definition)).
|
||||
|
||||
::: {#ex-submodule-listof-declaration .example}
|
||||
**Example: Declaration of a list of submodules**
|
||||
### Declaration of a list of submodules
|
||||
```nix
|
||||
options.mod = mkOption {
|
||||
description = "submodule example";
|
||||
|
@ -422,7 +422,7 @@ options.mod = mkOption {
|
|||
:::
|
||||
|
||||
::: {#ex-submodule-listof-definition .example}
|
||||
**Example: Definition of a list of submodules**
|
||||
### Definition of a list of submodules
|
||||
```nix
|
||||
config.mod = [
|
||||
{ foo = 1; bar = "one"; }
|
||||
|
@ -437,7 +437,7 @@ multiple named definitions of the submodule option set
|
|||
([Example: Definition of attribute sets of submodules](#ex-submodule-attrsof-definition)).
|
||||
|
||||
::: {#ex-submodule-attrsof-declaration .example}
|
||||
**Example: Declaration of attribute sets of submodules**
|
||||
### Declaration of attribute sets of submodules
|
||||
```nix
|
||||
options.mod = mkOption {
|
||||
description = "submodule example";
|
||||
|
@ -456,7 +456,7 @@ options.mod = mkOption {
|
|||
:::
|
||||
|
||||
::: {#ex-submodule-attrsof-definition .example}
|
||||
**Example: Definition of attribute sets of submodules**
|
||||
### Definition of attribute sets of submodules
|
||||
```nix
|
||||
config.mod.one = { foo = 1; bar = "one"; };
|
||||
config.mod.two = { foo = 2; bar = "two"; };
|
||||
|
@ -476,7 +476,7 @@ Types are mainly characterized by their `check` and `merge` functions.
|
|||
([Example: Overriding a type check](#ex-extending-type-check-2)).
|
||||
|
||||
::: {#ex-extending-type-check-1 .example}
|
||||
**Example: Adding a type check**
|
||||
### Adding a type check
|
||||
|
||||
```nix
|
||||
byte = mkOption {
|
||||
|
@ -487,7 +487,7 @@ Types are mainly characterized by their `check` and `merge` functions.
|
|||
:::
|
||||
|
||||
::: {#ex-extending-type-check-2 .example}
|
||||
**Example: Overriding a type check**
|
||||
### Overriding a type check
|
||||
|
||||
```nix
|
||||
nixThings = mkOption {
|
||||
|
|
|
@ -143,7 +143,7 @@ These functions all return an attribute set with these values:
|
|||
:::
|
||||
|
||||
::: {#ex-settings-nix-representable .example}
|
||||
**Example: Module with conventional `settings` option**
|
||||
### Module with conventional `settings` option
|
||||
|
||||
The following shows a module for an example program that uses a JSON
|
||||
configuration file. It demonstrates how above values can be used, along
|
||||
|
@ -218,7 +218,7 @@ the port, which will enforce it to be a valid integer and make it show
|
|||
up in the manual.
|
||||
|
||||
::: {#ex-settings-typed-attrs .example}
|
||||
**Example: Declaring a type-checked `settings` attribute**
|
||||
### Declaring a type-checked `settings` attribute
|
||||
```nix
|
||||
settings = lib.mkOption {
|
||||
type = lib.types.submodule {
|
||||
|
|
|
@ -37,7 +37,7 @@ options, but does not declare any. The structure of full NixOS modules
|
|||
is shown in [Example: Structure of NixOS Modules](#ex-module-syntax).
|
||||
|
||||
::: {#ex-module-syntax .example}
|
||||
**Example: Structure of NixOS Modules**
|
||||
### Structure of NixOS Modules
|
||||
```nix
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
|
@ -100,7 +100,7 @@ Exec directives](#exec-escaping-example) for an example. When using these
|
|||
functions system environment substitution should *not* be disabled explicitly.
|
||||
|
||||
::: {#locate-example .example}
|
||||
**Example: NixOS Module for the "locate" Service**
|
||||
### NixOS Module for the "locate" Service
|
||||
```nix
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
|
@ -161,7 +161,7 @@ in {
|
|||
:::
|
||||
|
||||
::: {#exec-escaping-example .example}
|
||||
**Example: Escaping in Exec directives**
|
||||
### Escaping in Exec directives
|
||||
```nix
|
||||
{ config, lib, pkgs, utils, ... }:
|
||||
|
||||
|
|
|
@ -538,7 +538,7 @@ drive (here `/dev/sda`). [Example: NixOS Configuration](#ex-config) shows a
|
|||
corresponding configuration Nix expression.
|
||||
|
||||
::: {#ex-partition-scheme-MBR .example}
|
||||
**Example: Example partition schemes for NixOS on `/dev/sda` (MBR)**
|
||||
### Example partition schemes for NixOS on `/dev/sda` (MBR)
|
||||
```ShellSession
|
||||
# parted /dev/sda -- mklabel msdos
|
||||
# parted /dev/sda -- mkpart primary 1MB -8GB
|
||||
|
@ -547,7 +547,7 @@ corresponding configuration Nix expression.
|
|||
:::
|
||||
|
||||
::: {#ex-partition-scheme-UEFI .example}
|
||||
**Example: Example partition schemes for NixOS on `/dev/sda` (UEFI)**
|
||||
### Example partition schemes for NixOS on `/dev/sda` (UEFI)
|
||||
```ShellSession
|
||||
# parted /dev/sda -- mklabel gpt
|
||||
# parted /dev/sda -- mkpart primary 512MB -8GB
|
||||
|
@ -558,7 +558,7 @@ corresponding configuration Nix expression.
|
|||
:::
|
||||
|
||||
::: {#ex-install-sequence .example}
|
||||
**Example: Commands for Installing NixOS on `/dev/sda`**
|
||||
### Commands for Installing NixOS on `/dev/sda`
|
||||
|
||||
With a partitioned disk.
|
||||
|
||||
|
@ -578,7 +578,7 @@ With a partitioned disk.
|
|||
:::
|
||||
|
||||
::: {#ex-config .example}
|
||||
**Example: NixOS Configuration**
|
||||
### Example: NixOS Configuration
|
||||
```ShellSession
|
||||
{ config, pkgs, ... }: {
|
||||
imports = [
|
||||
|
|
|
@ -80,7 +80,8 @@ The first step to declare the list of packages you want in your Emacs
|
|||
installation is to create a dedicated derivation. This can be done in a
|
||||
dedicated {file}`emacs.nix` file such as:
|
||||
|
||||
[]{#ex-emacsNix}
|
||||
::: {.example #ex-emacsNix}
|
||||
### Nix expression to build Emacs with packages (`emacs.nix`)
|
||||
|
||||
```nix
|
||||
/*
|
||||
|
@ -136,6 +137,7 @@ in
|
|||
pkgs.notmuch # From main packages set
|
||||
])
|
||||
```
|
||||
:::
|
||||
|
||||
The result of this configuration will be an {command}`emacs`
|
||||
command which launches Emacs with all of your chosen packages in the
|
||||
|
@ -158,19 +160,24 @@ and yasnippet.
|
|||
|
||||
The list of available packages in the various ELPA repositories can be seen
|
||||
with the following commands:
|
||||
[]{#module-services-emacs-querying-packages}
|
||||
::: {.example #module-services-emacs-querying-packages}
|
||||
### Querying Emacs packages
|
||||
|
||||
```
|
||||
nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.elpaPackages
|
||||
nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.melpaPackages
|
||||
nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.melpaStablePackages
|
||||
nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.orgPackages
|
||||
```
|
||||
:::
|
||||
|
||||
If you are on NixOS, you can install this particular Emacs for all users by
|
||||
adding it to the list of system packages (see
|
||||
[](#sec-declarative-package-mgmt)). Simply modify your file
|
||||
{file}`configuration.nix` to make it contain:
|
||||
[]{#module-services-emacs-configuration-nix}
|
||||
::: {.example #module-services-emacs-configuration-nix}
|
||||
### Custom Emacs in `configuration.nix`
|
||||
|
||||
```
|
||||
{
|
||||
environment.systemPackages = [
|
||||
|
@ -179,6 +186,7 @@ adding it to the list of system packages (see
|
|||
];
|
||||
}
|
||||
```
|
||||
:::
|
||||
|
||||
In this case, the next {command}`nixos-rebuild switch` will take
|
||||
care of adding your {command}`emacs` to the {var}`PATH`
|
||||
|
@ -192,7 +200,9 @@ If you are not on NixOS or want to install this particular Emacs only for
|
|||
yourself, you can do so by adding it to your
|
||||
{file}`~/.config/nixpkgs/config.nix` (see
|
||||
[Nixpkgs manual](https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides)):
|
||||
[]{#module-services-emacs-config-nix}
|
||||
::: {.example #module-services-emacs-config-nix}
|
||||
### Custom Emacs in `~/.config/nixpkgs/config.nix`
|
||||
|
||||
```
|
||||
{
|
||||
packageOverrides = super: let self = super.pkgs; in {
|
||||
|
@ -200,6 +210,7 @@ yourself, you can do so by adding it to your
|
|||
};
|
||||
}
|
||||
```
|
||||
:::
|
||||
|
||||
In this case, the next `nix-env -f '<nixpkgs>' -iA
|
||||
myemacs` will take care of adding your emacs to the
|
||||
|
@ -214,7 +225,9 @@ automatically generated {file}`emacs.desktop` (useful if you
|
|||
only use {command}`emacsclient`), you can change your file
|
||||
{file}`emacs.nix` in this way:
|
||||
|
||||
[]{#ex-emacsGtk3Nix}
|
||||
::: {.example #ex-emacsGtk3Nix}
|
||||
### Custom Emacs build
|
||||
|
||||
```
|
||||
{ pkgs ? import <nixpkgs> {} }:
|
||||
let
|
||||
|
@ -231,8 +244,9 @@ let
|
|||
});
|
||||
in [...]
|
||||
```
|
||||
:::
|
||||
|
||||
After building this file as shown in [the example above](#ex-emacsNix), you
|
||||
After building this file as shown in [](#ex-emacsNix), you
|
||||
will get an GTK 3-based Emacs binary pre-loaded with your favorite packages.
|
||||
|
||||
## Running Emacs as a Service {#module-services-emacs-running}
|
||||
|
@ -327,7 +341,10 @@ This will add the symlink
|
|||
|
||||
The Emacs init file should be changed to load the extension packages at
|
||||
startup:
|
||||
[]{#module-services-emacs-package-initialisation}
|
||||
|
||||
::: {.example #module-services-emacs-package-initialisation}
|
||||
### Package initialization in `.emacs`
|
||||
|
||||
```
|
||||
(require 'package)
|
||||
|
||||
|
@ -337,6 +354,7 @@ startup:
|
|||
(setq package-enable-at-startup nil)
|
||||
(package-initialize)
|
||||
```
|
||||
:::
|
||||
|
||||
After the declarative emacs package configuration has been tested,
|
||||
previously downloaded packages can be cleaned up by removing
|
||||
|
@ -377,7 +395,9 @@ To install the DocBook 5.0 schemas, either add
|
|||
Then customize the variable {var}`rng-schema-locating-files` to
|
||||
include {file}`~/.emacs.d/schemas.xml` and put the following
|
||||
text into that file:
|
||||
[]{#ex-emacs-docbook-xml}
|
||||
::: {.example #ex-emacs-docbook-xml}
|
||||
### nXML Schema Configuration (`~/.emacs.d/schemas.xml`)
|
||||
|
||||
```xml
|
||||
<?xml version="1.0"?>
|
||||
<!--
|
||||
|
@ -397,3 +417,4 @@ text into that file:
|
|||
-->
|
||||
</locatingRules>
|
||||
```
|
||||
:::
|
||||
|
|
|
@ -169,18 +169,26 @@ let
|
|||
# Create a directory for exchanging data with the VM.
|
||||
mkdir -p "$TMPDIR/xchg"
|
||||
|
||||
${lib.optionalString cfg.useBootLoader
|
||||
${lib.optionalString cfg.useEFIBoot
|
||||
''
|
||||
# Expose EFI variables, it's useful even when we are not using a bootloader (!).
|
||||
# We might be interested in having EFI variable storage present even if we aren't booting via UEFI, hence
|
||||
# no guard against `useBootLoader`. Examples:
|
||||
# - testing PXE boot or other EFI applications
|
||||
# - directbooting LinuxBoot, which `kexec()s` into a UEFI environment that can boot e.g. Windows
|
||||
NIX_EFI_VARS=$(readlink -f "''${NIX_EFI_VARS:-${config.system.name}-efi-vars.fd}")
|
||||
|
||||
${lib.optionalString cfg.useEFIBoot
|
||||
''
|
||||
# VM needs writable EFI vars
|
||||
if ! test -e "$NIX_EFI_VARS"; then
|
||||
cp ${systemImage}/efi-vars.fd "$NIX_EFI_VARS"
|
||||
chmod 0644 "$NIX_EFI_VARS"
|
||||
fi
|
||||
''}
|
||||
# VM needs writable EFI vars
|
||||
if ! test -e "$NIX_EFI_VARS"; then
|
||||
${if cfg.useBootLoader then
|
||||
# We still need the EFI var from the make-disk-image derivation
|
||||
# because our "switch-to-configuration" process might
|
||||
# write into it and we want to keep this data.
|
||||
''cp ${systemImage}/efi-vars.fd "$NIX_EFI_VARS"''
|
||||
else
|
||||
''cp ${cfg.efi.variables} "$NIX_EFI_VARS"''
|
||||
}
|
||||
chmod 0644 "$NIX_EFI_VARS"
|
||||
fi
|
||||
''}
|
||||
|
||||
cd "$TMPDIR"
|
||||
|
|
|
@ -67,7 +67,7 @@ rec {
|
|||
networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ];
|
||||
};
|
||||
}) {} [
|
||||
"6_1"
|
||||
"6_1" "6_2"
|
||||
];
|
||||
|
||||
testScript = ''
|
||||
|
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "audacious";
|
||||
version = "4.3";
|
||||
version = "4.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
|
||||
sha256 = "sha256-J1hNyEXH5w24ySZ5kJRfFzIqHsyA/4tFLpypFqDOkJE=";
|
||||
sha256 = "sha256-heniaEFQW1HjQu5yotBfGb74lPVnoCnrs/Pgwa20IEI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "0.9.9";
|
||||
version = "0.9.10";
|
||||
pname = "qjackctl";
|
||||
|
||||
# some dependencies such as killall have to be installed additionally
|
||||
|
@ -14,7 +14,7 @@ mkDerivation rec {
|
|||
owner = "rncbc";
|
||||
repo = "qjackctl";
|
||||
rev = "${pname}_${lib.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "sha256-6mVvLr+4kSkjp0Mc/XtFxSaO/OblhdsvicrV1luq8I8=";
|
||||
sha256 = "sha256-XF5v+VgSCqqV2ft9qw1NTNzeYOv1OuhljJGdgikPLEo=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -34,13 +34,13 @@ stdenv.mkDerivation {
|
|||
pname = binName;
|
||||
# versions are specified in `squeezelite.h`
|
||||
# see https://github.com/ralph-irving/squeezelite/issues/29
|
||||
version = "1.9.9.1428";
|
||||
version = "1.9.9.1430";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ralph-irving";
|
||||
repo = "squeezelite";
|
||||
rev = "74fe7934ec60cc31565f088796f56e911f51679c";
|
||||
hash = "sha256-85Pz6psyK3VXOIrINcoIeHZT5j9UfJqWIxTavwqHx04=";
|
||||
rev = "663db8f64d73dceca6a2a18cdb705ad846daa272";
|
||||
hash = "sha256-PROb6d5ixO7lk/7wsjh2vkPkPgAvd6x+orQOY078IAs=";
|
||||
};
|
||||
|
||||
buildInputs = [ flac libmad libvorbis mpg123 ]
|
||||
|
|
|
@ -11,6 +11,8 @@
|
|||
, libXrandr
|
||||
, libXi
|
||||
, libGL
|
||||
, libxkbcommon
|
||||
, wayland
|
||||
, stdenv
|
||||
, gtk3
|
||||
, darwin
|
||||
|
@ -45,18 +47,21 @@ rustPlatform.buildRustPackage rec {
|
|||
openssl
|
||||
fontconfig
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
libGL
|
||||
libX11
|
||||
libXcursor
|
||||
libXi
|
||||
libXrandr
|
||||
libGL
|
||||
gtk3
|
||||
|
||||
libxkbcommon
|
||||
wayland
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.libobjc
|
||||
];
|
||||
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
patchelf $out/bin/oculante --add-rpath ${lib.makeLibraryPath [ libGL ]}
|
||||
patchelf $out/bin/oculante --add-rpath ${lib.makeLibraryPath [ libxkbcommon libX11 ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -19,13 +19,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "p2pool";
|
||||
version = "3.2";
|
||||
version = "3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SChernykh";
|
||||
repo = "p2pool";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-KJ7KE1Joma4KXSqNQi3z+Q3hhc3HLNEaQjunu79qjUs=";
|
||||
sha256 = "sha256-sCG2Dr0gDznOyuSCVm/Zop+64elUZLt+XSDff2jQlwg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee
|
||||
, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, gobject-introspection, wrapGAppsHook
|
||||
, qrencode, webkitgtk, discount, json-glib }:
|
||||
, qrencode, webkitgtk, discount, json-glib, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pdfpc";
|
||||
|
@ -33,6 +33,16 @@ stdenv.mkDerivation rec {
|
|||
json-glib
|
||||
];
|
||||
|
||||
patches = [
|
||||
# needed for compiling pdfpc 4.6.0 with vala 0.56.7, see
|
||||
# https://github.com/pdfpc/pdfpc/issues/686
|
||||
# https://github.com/pdfpc/pdfpc/pull/687
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pdfpc/pdfpc/commit/d38edfac63bec54173b4b31eae5c7fb46cd8f714.diff";
|
||||
hash = "sha256-KC2oyzcwU2fUmxaed8qAsKcePwR5KcXgpVdstJg8KmU=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = lib.optional stdenv.isDarwin "-DMOVIES=OFF";
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
(callPackage ./generic.nix { }) {
|
||||
channel = "edge";
|
||||
version = "23.4.2";
|
||||
sha256 = "1g7ghvxrk906sz6kgclyk078jlbxjm0idx5mbj6ll6q756ncnzyl";
|
||||
vendorSha256 = "sha256-B0vqZBycn2IYxjy0kMOtN3KnQA8ARiKDaH6mT6dtXTo=";
|
||||
version = "23.4.3";
|
||||
sha256 = "1wyqqb2frxrid7ln0qq8x6y3sg0a6dnq464csryzsh00arycyfph";
|
||||
vendorSha256 = "sha256-5T3YrYr7xeRkAADeE24BPu4PYU4mHFspqAiBpS8n4Y0=";
|
||||
}
|
||||
|
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.225";
|
||||
version = "1.2.231";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-t8IO+x8YXB+5TnO9fglzubNXOhCJQPw1p0E/pkgKGfM=";
|
||||
hash = "sha256-tiIfdODyUH3RoB1Htono2ZgN8+kiM1BXpNPn2B9V/mk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GCGfhcm/96w73S/NQc8lBDUHon6pB0i5t5qIvBD8f08=";
|
||||
vendorHash = "sha256-SRNxV3zRYfbMJB4iGic3lu25VXIrl5011rB6AYqZG8U=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dnscontrol";
|
||||
version = "3.31.2";
|
||||
version = "3.31.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vKfbL2a/5rTVsG0rDs/D0t5eXDNWlbwURI2FYzGu9lY=";
|
||||
sha256 = "sha256-jGM/Of5/wSMs7cedbGmgJC05gxxHOCAjjEZ2Qmlxgew=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BE/UnJw5elHYmyB+quN89ZkrlMcTjaVN0T2+h8cpPS8=";
|
||||
vendorHash = "sha256-N7KS48Kr9SipliZ9JhMo2u9pRoE8+pxhC8B/YcZlNyg=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubo";
|
||||
version = "0.19.1"; # When updating, also check if the repo version changed and adjust repoVersion below
|
||||
version = "0.19.2"; # When updating, also check if the repo version changed and adjust repoVersion below
|
||||
rev = "v${version}";
|
||||
|
||||
passthru.repoVersion = "13"; # Also update kubo-migrator when changing the repo version
|
||||
|
@ -10,7 +10,7 @@ buildGoModule rec {
|
|||
# Kubo makes changes to it's source tarball that don't match the git source.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
|
||||
hash = "sha256-gQIJKV5MD0TZ0GYdLFWNePnExThqEjUmZKCAHhGwtMU=";
|
||||
hash = "sha256-HPhlKAavINaN0SJHWmeJRx43jfeHeYDZb3/dZ55kMLI=";
|
||||
};
|
||||
|
||||
# tarball contains multiple files/directories
|
||||
|
@ -58,6 +58,6 @@ buildGoModule rec {
|
|||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "ipfs";
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
maintainers = with maintainers; [ Luflosi fpletz ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nali";
|
||||
version = "0.7.2";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zu1k";
|
||||
repo = "nali";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tIn5ty7faM9BBmUWCvok94QOAMVtz5daCPpZkDGOJfo=";
|
||||
sha256 = "sha256-ZKLxsq7ybom96NKWkioROAVXUoY20zFBZn7ksk4XvT4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-l3Fs1Hd0kXI56uotic1407tb4ltkCSMzqqozFpvobH8=";
|
||||
|
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
resholve.mkDerivation rec {
|
||||
pname = "wgnord";
|
||||
version = "0.1.10";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phirecc";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-T7dAEgi4tGvrzBABGLzKHhpCx0bxSCtTVI5iJJqJGlE=";
|
||||
hash = "sha256-00513jr3Sk8YahqI14pQ7pU4P7MBUlsqXXfrACu35RQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -1,60 +0,0 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, vala
|
||||
, gtk4
|
||||
, libgee
|
||||
, libadwaita
|
||||
, gtksourceview5
|
||||
, blueprint-compiler
|
||||
, wrapGAppsHook4
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "paper-note";
|
||||
version = "22.11";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "posidon_software";
|
||||
repo = "paper";
|
||||
rev = version;
|
||||
hash = "sha256-o5MYagflHE8Aup8CbqauRBrdt3TrSlffs35psYT7hyE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
vala
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
blueprint-compiler
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk4
|
||||
libadwaita
|
||||
libgee
|
||||
gtksourceview5
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/meson.build \
|
||||
--replace "1.2.0" "${libadwaita.version}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A pretty note-taking app for GNOME";
|
||||
homepage = "https://gitlab.com/posidon_software/paper";
|
||||
mainProgram = "io.posidon.Paper";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ j0lol ];
|
||||
};
|
||||
}
|
|
@ -1,6 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, mkDerivation
|
||||
, fetchurl
|
||||
, dpkg
|
||||
, wrapGAppsHook
|
||||
|
@ -12,8 +11,8 @@
|
|||
, mesa
|
||||
, libtiff
|
||||
, cups
|
||||
, udev
|
||||
, xorg
|
||||
, steam-run
|
||||
, makeWrapper
|
||||
, useChineseVersion ? false
|
||||
}:
|
||||
|
@ -54,6 +53,10 @@ stdenv.mkDerivation rec {
|
|||
nspr
|
||||
mesa
|
||||
libtiff
|
||||
udev
|
||||
];
|
||||
|
||||
runtimeDependencies = [
|
||||
cups.lib
|
||||
];
|
||||
|
||||
|
@ -71,12 +74,6 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace $i \
|
||||
--replace /usr/bin $out/bin
|
||||
done
|
||||
for i in wps wpp et wpspdf; do
|
||||
mv $out/bin/$i $out/bin/.$i-orig
|
||||
makeWrapper ${steam-run}/bin/steam-run $out/bin/$i \
|
||||
--add-flags $out/bin/.$i-orig \
|
||||
--argv0 $i
|
||||
done
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
@ -86,6 +83,8 @@ stdenv.mkDerivation rec {
|
|||
preFixup = ''
|
||||
# The following libraries need libtiff.so.5, but nixpkgs provides libtiff.so.6
|
||||
patchelf --replace-needed libtiff.so.5 libtiff.so $out/opt/kingsoft/wps-office/office6/{libpdfmain.so,libqpdfpaint.so,qt/plugins/imageformats/libqtiff.so}
|
||||
# dlopen dependency
|
||||
patchelf --add-needed libudev.so.1 $out/opt/kingsoft/wps-office/office6/addons/cef/libcef.so
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
, lpcnetfreedv
|
||||
, portaudio
|
||||
, speexdsp
|
||||
, hamlib
|
||||
, hamlib_4
|
||||
, wxGTK32
|
||||
, pulseSupport ? config.pulseaudio or stdenv.isLinux
|
||||
, AppKit
|
||||
|
@ -24,13 +24,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freedv";
|
||||
version = "1.8.8.1";
|
||||
version = "1.8.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "drowe67";
|
||||
repo = "freedv-gui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zFfPXI15XnzHSG1hrMQz82aAVOc/Qqr1FHUrmaTLOk0=";
|
||||
hash = "sha256-HDHXVTkXC1fCqj4lnxURmXvQNtwDX4zA6/QFnYceUI4=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
|
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
|||
libsndfile
|
||||
lpcnetfreedv
|
||||
speexdsp
|
||||
hamlib
|
||||
hamlib_4
|
||||
wxGTK32
|
||||
] ++ (if pulseSupport then [ libpulseaudio ] else [ portaudio ])
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "verilator";
|
||||
version = "5.008";
|
||||
version = "5.010";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+eJBGvQOk5w+PyUF3aieuXZVeKNS4cKQqHnJibKwFnM=";
|
||||
hash = "sha256-NaWatK4sAc+MJolbQs4TDaD9TvY6VAj/KVZBkIq++sQ=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
@ -12,11 +12,11 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "1.3.76";
|
||||
version = "1.3.80";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://firmware.ardupilot.org/Tools/MissionPlanner/MissionPlanner-${version}.zip";
|
||||
sha256 = "sha256-vdunUGwLjDKf1LDhtyTQAExddecyWc1TdZOyuu0qMlk=";
|
||||
sha256 = "sha256-iivlaQWtOMJHchmR92FoqTaosGJ9F1AgFtuFgDE/9qQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper mono unzip ];
|
||||
|
|
377
pkgs/applications/virtualization/pods/Cargo.lock
generated
377
pkgs/applications/virtualization/pods/Cargo.lock
generated
|
@ -10,9 +10,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
|
|||
|
||||
[[package]]
|
||||
name = "aho-corasick"
|
||||
version = "0.7.20"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
|
||||
checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
@ -28,9 +28,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "anyhow"
|
||||
version = "1.0.70"
|
||||
version = "1.0.71"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
|
||||
checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
|
||||
|
||||
[[package]]
|
||||
name = "ashpd"
|
||||
|
@ -71,7 +71,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.11",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
@ -82,7 +82,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.11",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
@ -120,9 +120,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "bumpalo"
|
||||
version = "3.12.0"
|
||||
version = "3.12.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
|
||||
checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8"
|
||||
|
||||
[[package]]
|
||||
name = "byteorder"
|
||||
|
@ -175,11 +175,12 @@ checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
|
|||
|
||||
[[package]]
|
||||
name = "cfg-expr"
|
||||
version = "0.14.0"
|
||||
version = "0.15.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a35b255461940a32985c627ce82900867c61db1659764d3675ea81963f72a4c6"
|
||||
checksum = "c8790cf1286da485c72cf5fc7aeba308438800036ec67d89425924c4807268c9"
|
||||
dependencies = [
|
||||
"smallvec",
|
||||
"target-lexicon",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
@ -240,15 +241,15 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "core-foundation-sys"
|
||||
version = "0.8.3"
|
||||
version = "0.8.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
|
||||
checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
|
||||
|
||||
[[package]]
|
||||
name = "cpufeatures"
|
||||
version = "0.2.6"
|
||||
version = "0.2.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181"
|
||||
checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
@ -296,7 +297,7 @@ dependencies = [
|
|||
"proc-macro2",
|
||||
"quote",
|
||||
"scratch",
|
||||
"syn 2.0.11",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
@ -313,7 +314,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.11",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
@ -337,31 +338,11 @@ dependencies = [
|
|||
"crypto-common",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs"
|
||||
version = "4.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
|
||||
dependencies = [
|
||||
"dirs-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dirs-sys"
|
||||
version = "0.3.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"redox_users",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "enumflags2"
|
||||
version = "0.7.5"
|
||||
version = "0.7.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb"
|
||||
checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2"
|
||||
dependencies = [
|
||||
"enumflags2_derive",
|
||||
"serde",
|
||||
|
@ -369,24 +350,24 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "enumflags2_derive"
|
||||
version = "0.7.4"
|
||||
version = "0.7.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae"
|
||||
checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "errno"
|
||||
version = "0.3.0"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0"
|
||||
checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
|
||||
dependencies = [
|
||||
"errno-dragonfly",
|
||||
"libc",
|
||||
"windows-sys",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
@ -435,21 +416,21 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "filetime"
|
||||
version = "0.2.20"
|
||||
version = "0.2.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412"
|
||||
checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"redox_syscall 0.2.16",
|
||||
"windows-sys",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "flate2"
|
||||
version = "1.0.25"
|
||||
version = "1.0.26"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
|
||||
checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
|
||||
dependencies = [
|
||||
"crc32fast",
|
||||
"miniz_oxide",
|
||||
|
@ -472,9 +453,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "futures"
|
||||
version = "0.3.27"
|
||||
version = "0.3.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549"
|
||||
checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
|
||||
dependencies = [
|
||||
"futures-channel",
|
||||
"futures-core",
|
||||
|
@ -487,9 +468,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "futures-channel"
|
||||
version = "0.3.27"
|
||||
version = "0.3.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac"
|
||||
checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"futures-sink",
|
||||
|
@ -497,15 +478,15 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "futures-core"
|
||||
version = "0.3.27"
|
||||
version = "0.3.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd"
|
||||
checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
|
||||
|
||||
[[package]]
|
||||
name = "futures-executor"
|
||||
version = "0.3.27"
|
||||
version = "0.3.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83"
|
||||
checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"futures-task",
|
||||
|
@ -514,38 +495,38 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "futures-io"
|
||||
version = "0.3.27"
|
||||
version = "0.3.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91"
|
||||
checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
|
||||
|
||||
[[package]]
|
||||
name = "futures-macro"
|
||||
version = "0.3.27"
|
||||
version = "0.3.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6"
|
||||
checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "futures-sink"
|
||||
version = "0.3.27"
|
||||
version = "0.3.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2"
|
||||
checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
|
||||
|
||||
[[package]]
|
||||
name = "futures-task"
|
||||
version = "0.3.27"
|
||||
version = "0.3.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879"
|
||||
checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
|
||||
|
||||
[[package]]
|
||||
name = "futures-util"
|
||||
version = "0.3.27"
|
||||
version = "0.3.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab"
|
||||
checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
|
||||
dependencies = [
|
||||
"futures-channel",
|
||||
"futures-core",
|
||||
|
@ -692,9 +673,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.8"
|
||||
version = "0.2.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
|
||||
checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
|
@ -723,9 +704,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gio"
|
||||
version = "0.17.4"
|
||||
version = "0.17.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2261a3b4e922ec676d1c27ac466218c38cf5dcb49a759129e54bb5046e442125"
|
||||
checksum = "d14522e56c6bcb6f7a3aebc25cbcfb06776af4c0c25232b601b4383252d7cb92"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"futures-channel",
|
||||
|
@ -756,9 +737,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "glib"
|
||||
version = "0.17.5"
|
||||
version = "0.17.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cfb53061756195d76969292c2d2e329e01259276524a9bae6c9b73af62854773"
|
||||
checksum = "a7f1de7cbde31ea4f0a919453a2dcece5d54d5b70e08f8ad254dc4840f5f09b6"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"futures-channel",
|
||||
|
@ -779,9 +760,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "glib-macros"
|
||||
version = "0.17.6"
|
||||
version = "0.17.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "32e73a9790e243f6d55d8e302426419f6084a1de7a84cd07f7268300408a19de"
|
||||
checksum = "0a7206c5c03851ef126ea1444990e81fdd6765fb799d5bc694e4897ca01bb97f"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"heck",
|
||||
|
@ -870,9 +851,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gtk4"
|
||||
version = "0.6.4"
|
||||
version = "0.6.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e30e124b5a605f6f5513db13958bfcd51d746607b20bc7bb718b33e303274ed"
|
||||
checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cairo-rs",
|
||||
|
@ -893,9 +874,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gtk4-macros"
|
||||
version = "0.6.5"
|
||||
version = "0.6.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f041a797fb098bfb06e432c61738133604bfa3af57f13f1da3b9d46271422ef0"
|
||||
checksum = "6a4d6b61570f76d3ee542d984da443b1cd69b6105264c61afec3abed08c2500f"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"proc-macro-crate",
|
||||
|
@ -1004,9 +985,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
|
|||
|
||||
[[package]]
|
||||
name = "hyper"
|
||||
version = "0.14.25"
|
||||
version = "0.14.26"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899"
|
||||
checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4"
|
||||
dependencies = [
|
||||
"bytes 1.4.0",
|
||||
"futures-channel",
|
||||
|
@ -1040,9 +1021,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "iana-time-zone"
|
||||
version = "0.1.55"
|
||||
version = "0.1.56"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "716f12fbcfac6ffab0a5e9ec51d0a0ff70503742bb2dc7b99396394c9dc323f0"
|
||||
checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
|
||||
dependencies = [
|
||||
"android_system_properties",
|
||||
"core-foundation-sys",
|
||||
|
@ -1094,13 +1075,13 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "io-lifetimes"
|
||||
version = "1.0.9"
|
||||
version = "1.0.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb"
|
||||
checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
|
||||
dependencies = [
|
||||
"hermit-abi 0.3.1",
|
||||
"libc",
|
||||
"windows-sys",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
@ -1161,9 +1142,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.140"
|
||||
version = "0.2.142"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
|
||||
checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
|
||||
|
||||
[[package]]
|
||||
name = "libpanel"
|
||||
|
@ -1207,9 +1188,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
version = "0.3.0"
|
||||
version = "0.3.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cd550e73688e6d578f0ac2119e32b797a327631a42f9433e59d02e139c8df60d"
|
||||
checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c"
|
||||
|
||||
[[package]]
|
||||
name = "locale_config"
|
||||
|
@ -1280,9 +1261,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
|
|||
|
||||
[[package]]
|
||||
name = "miniz_oxide"
|
||||
version = "0.6.2"
|
||||
version = "0.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
|
||||
checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
|
||||
dependencies = [
|
||||
"adler",
|
||||
]
|
||||
|
@ -1296,7 +1277,7 @@ dependencies = [
|
|||
"libc",
|
||||
"log",
|
||||
"wasi 0.11.0+wasi-snapshot-preview1",
|
||||
"windows-sys",
|
||||
"windows-sys 0.45.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
@ -1318,7 +1299,6 @@ dependencies = [
|
|||
"cfg-if",
|
||||
"libc",
|
||||
"memoffset 0.7.1",
|
||||
"pin-utils",
|
||||
"static_assertions",
|
||||
]
|
||||
|
||||
|
@ -1503,8 +1483,9 @@ checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
|
|||
|
||||
[[package]]
|
||||
name = "podman-api"
|
||||
version = "0.10.0-dev"
|
||||
source = "git+https://github.com/vv9k/podman-api-rs.git#33cf4bf6723f269f632115c9c165d54c501e1890"
|
||||
version = "0.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4d0ade207138f12695cb4be3b590283f1cf764c5c4909f39966c4b4b0dba7c1e"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"byteorder",
|
||||
|
@ -1526,8 +1507,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "podman-api-stubs"
|
||||
version = "0.10.0-dev"
|
||||
source = "git+https://github.com/vv9k/podman-api-rs.git#33cf4bf6723f269f632115c9c165d54c501e1890"
|
||||
version = "0.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2d280c623f633a0dded88feab9e387f98451506431d5b7308a858c643305dcee"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"serde",
|
||||
|
@ -1536,7 +1518,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "pods"
|
||||
version = "1.1.0"
|
||||
version = "1.1.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"ashpd",
|
||||
|
@ -1603,9 +1585,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.54"
|
||||
version = "1.0.56"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534"
|
||||
checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
@ -1667,22 +1649,11 @@ dependencies = [
|
|||
"bitflags",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_users"
|
||||
version = "0.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
"redox_syscall 0.2.16",
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.7.3"
|
||||
version = "1.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
|
||||
checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
|
@ -1691,9 +1662,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.6.29"
|
||||
version = "0.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
|
||||
checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
|
||||
|
||||
[[package]]
|
||||
name = "rustc_version"
|
||||
|
@ -1706,16 +1677,16 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.37.5"
|
||||
version = "0.37.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0e78cc525325c06b4a7ff02db283472f3c042b7ff0c391f96c6d5ac6f4f91b75"
|
||||
checksum = "8bbfc1d1c7c40c01715f47d71444744a81669ca84e8b63e25a55e169b1f86433"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"errno",
|
||||
"io-lifetimes",
|
||||
"libc",
|
||||
"linux-raw-sys",
|
||||
"windows-sys",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
@ -1738,29 +1709,29 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
|
|||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.159"
|
||||
version = "1.0.160"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
|
||||
checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.159"
|
||||
version = "1.0.160"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
|
||||
checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.11",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.95"
|
||||
version = "1.0.96"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
|
||||
checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"ryu",
|
||||
|
@ -1775,7 +1746,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.11",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
@ -1798,15 +1769,6 @@ dependencies = [
|
|||
"digest",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "signal-hook-registry"
|
||||
version = "1.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "slab"
|
||||
version = "0.4.8"
|
||||
|
@ -1834,9 +1796,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "sourceview5"
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "850a255e21be2bfd5db5ae76f90b1748f7b397440912031eab5e10b5cab2bde8"
|
||||
checksum = "ee960607b1f7fda934dce68e76e925989ebe186ac04d6ab5ea9ce93e13835c03"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"futures-channel",
|
||||
|
@ -1887,9 +1849,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.11"
|
||||
version = "2.0.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40"
|
||||
checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
@ -1898,9 +1860,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "syslog"
|
||||
version = "6.0.1"
|
||||
version = "6.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "978044cc68150ad5e40083c9f6a725e6fd02d7ba1bcf691ec2ff0d66c0b41acc"
|
||||
checksum = "7434e95bcccce1215d30f4bf84fe8c00e8de1b9be4fb736d747ca53d36e7f96f"
|
||||
dependencies = [
|
||||
"error-chain",
|
||||
"hostname",
|
||||
|
@ -1911,9 +1873,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "system-deps"
|
||||
version = "6.0.4"
|
||||
version = "6.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "555fc8147af6256f3931a36bb83ad0023240ce9cf2b319dec8236fd1f220b05f"
|
||||
checksum = "d0fe581ad25d11420b873cf9aedaca0419c2b411487b134d4d21065f3d092055"
|
||||
dependencies = [
|
||||
"cfg-expr",
|
||||
"heck",
|
||||
|
@ -1933,6 +1895,12 @@ dependencies = [
|
|||
"xattr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "target-lexicon"
|
||||
version = "0.12.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5"
|
||||
|
||||
[[package]]
|
||||
name = "temp-dir"
|
||||
version = "0.1.11"
|
||||
|
@ -1949,7 +1917,7 @@ dependencies = [
|
|||
"fastrand",
|
||||
"redox_syscall 0.3.5",
|
||||
"rustix",
|
||||
"windows-sys",
|
||||
"windows-sys 0.45.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
@ -1978,7 +1946,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.11",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
@ -2038,9 +2006,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
|
|||
|
||||
[[package]]
|
||||
name = "tokio"
|
||||
version = "1.27.0"
|
||||
version = "1.28.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
|
||||
checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"bytes 1.4.0",
|
||||
|
@ -2048,17 +2016,16 @@ dependencies = [
|
|||
"mio",
|
||||
"num_cpus",
|
||||
"pin-project-lite",
|
||||
"signal-hook-registry",
|
||||
"socket2",
|
||||
"tracing",
|
||||
"windows-sys",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tokio-stream"
|
||||
version = "0.1.12"
|
||||
version = "0.1.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313"
|
||||
checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"pin-project-lite",
|
||||
|
@ -2134,13 +2101,13 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "tracing-attributes"
|
||||
version = "0.1.23"
|
||||
version = "0.1.24"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
|
||||
checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
"syn 2.0.15",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
@ -2243,8 +2210,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "vte4"
|
||||
version = "0.5.0"
|
||||
source = "git+https://gitlab.gnome.org/World/Rust/vte4-rs.git#b8d3b182e9c28235961741e1d3d311d9689f07ff"
|
||||
version = "0.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "58204be19a32d0925cb4faf05339c769ba699f66471f1f53af1fdecd7125a64b"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"gdk4",
|
||||
|
@ -2259,8 +2227,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "vte4-sys"
|
||||
version = "0.5.0"
|
||||
source = "git+https://gitlab.gnome.org/World/Rust/vte4-rs.git#b8d3b182e9c28235961741e1d3d311d9689f07ff"
|
||||
version = "0.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e64b85a2b09ffbb8acf8147b39ceeb88b0fec74dfad26880004b5f6cb8ffce47"
|
||||
dependencies = [
|
||||
"gdk4-sys",
|
||||
"gio-sys",
|
||||
|
@ -2390,11 +2359,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
|||
|
||||
[[package]]
|
||||
name = "windows"
|
||||
version = "0.47.0"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2649ff315bee4c98757f15dac226efe3d81927adbb6e882084bb1ee3e0c330a7"
|
||||
checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
|
||||
dependencies = [
|
||||
"windows-targets 0.47.0",
|
||||
"windows-targets 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
@ -2406,6 +2375,15 @@ dependencies = [
|
|||
"windows-targets 0.42.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
|
||||
dependencies = [
|
||||
"windows-targets 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.42.2"
|
||||
|
@ -2423,17 +2401,17 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.47.0"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2f8996d3f43b4b2d44327cd71b7b0efd1284ab60e6e9d0e8b630e18555d87d3e"
|
||||
checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm 0.47.0",
|
||||
"windows_aarch64_msvc 0.47.0",
|
||||
"windows_i686_gnu 0.47.0",
|
||||
"windows_i686_msvc 0.47.0",
|
||||
"windows_x86_64_gnu 0.47.0",
|
||||
"windows_x86_64_gnullvm 0.47.0",
|
||||
"windows_x86_64_msvc 0.47.0",
|
||||
"windows_aarch64_gnullvm 0.48.0",
|
||||
"windows_aarch64_msvc 0.48.0",
|
||||
"windows_i686_gnu 0.48.0",
|
||||
"windows_i686_msvc 0.48.0",
|
||||
"windows_x86_64_gnu 0.48.0",
|
||||
"windows_x86_64_gnullvm 0.48.0",
|
||||
"windows_x86_64_msvc 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
@ -2444,9 +2422,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
|
|||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.47.0"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "831d567d53d4f3cb1db332b68e6e2b6260228eb4d99a777d8b2e8ed794027c90"
|
||||
checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
|
@ -2456,9 +2434,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
|
|||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.47.0"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6a42d54a417c60ce4f0e31661eed628f0fa5aca73448c093ec4d45fab4c51cdf"
|
||||
checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
|
@ -2468,9 +2446,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
|
|||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.47.0"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c1925beafdbb22201a53a483db861a5644123157c1c3cee83323a2ed565d71e3"
|
||||
checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
|
@ -2480,9 +2458,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
|
|||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.47.0"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3a8ef8f2f1711b223947d9b69b596cf5a4e452c930fb58b6fc3fdae7d0ec6b31"
|
||||
checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
|
@ -2492,9 +2470,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
|
|||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.47.0"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7acaa0c2cf0d2ef99b61c308a0c3dbae430a51b7345dedec470bd8f53f5a3642"
|
||||
checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
|
@ -2504,9 +2482,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
|
|||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.47.0"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e5a0628f71be1d11e17ca4a0e9e15b3a5180f6fbf1c2d55e3ba3f850378052c1"
|
||||
checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
|
@ -2516,15 +2494,15 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
|
|||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.47.0"
|
||||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9d6e62c256dc6d40b8c8707df17df8d774e60e39db723675241e7c15e910bce7"
|
||||
checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
|
||||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
version = "0.4.1"
|
||||
version = "0.4.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
|
||||
checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
@ -2539,24 +2517,32 @@ dependencies = [
|
|||
]
|
||||
|
||||
[[package]]
|
||||
name = "zbus"
|
||||
version = "3.11.1"
|
||||
name = "xdg-home"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3dc29e76f558b2cb94190e8605ecfe77dd40f5df8c072951714b4b71a97f5848"
|
||||
checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd"
|
||||
dependencies = [
|
||||
"nix",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "zbus"
|
||||
version = "3.12.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "29242fa5ec5693629ae74d6eb1f69622a9511f600986d6d9779bccf36ac316e3"
|
||||
dependencies = [
|
||||
"async-broadcast",
|
||||
"async-recursion",
|
||||
"async-trait",
|
||||
"byteorder",
|
||||
"derivative",
|
||||
"dirs",
|
||||
"enumflags2",
|
||||
"event-listener",
|
||||
"futures-core",
|
||||
"futures-sink",
|
||||
"futures-util",
|
||||
"hex",
|
||||
"lazy_static",
|
||||
"nix",
|
||||
"once_cell",
|
||||
"ordered-stream",
|
||||
|
@ -2569,6 +2555,7 @@ dependencies = [
|
|||
"tracing",
|
||||
"uds_windows",
|
||||
"winapi",
|
||||
"xdg-home",
|
||||
"zbus_macros",
|
||||
"zbus_names",
|
||||
"zvariant",
|
||||
|
@ -2576,9 +2563,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "zbus_macros"
|
||||
version = "3.11.1"
|
||||
version = "3.12.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "62a80fd82c011cd08459eaaf1fd83d3090c1b61e6d5284360074a7475af3a85d"
|
||||
checksum = "537793e26e9af85f774801dc52c6f6292352b2b517c5cf0449ffd3735732a53a"
|
||||
dependencies = [
|
||||
"proc-macro-crate",
|
||||
"proc-macro2",
|
||||
|
|
|
@ -17,21 +17,17 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pods";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marhkb";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BvSDFWmIQ55kbZtWybemZXT7lSDwxSCpPAsqwElZOBM=";
|
||||
sha256 = "sha256-GTRHysG1zPr6MorGoSKYq8TgAdTH/bU/AxVrP2Ghqec=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"podman-api-0.10.0-dev" = "sha256-6xpPdssfgXY5sDyZOzApaZPjzDLqq734UEl9FTkZyQQ=";
|
||||
"vte4-0.5.0" = "sha256-7yXIcvMNAAeyK57O5l42ndBI+Ij55KFwClhBeLM5Zlo=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "hackgen-font";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/yuru7/HackGen/releases/download/v${version}/HackGen_v${version}.zip";
|
||||
hash = "sha256-vKbiM3QUryey0m6oilO0lT6+efkCTLCwdtPF7PinkmU=";
|
||||
hash = "sha256-Ah2oVP8nzFiYA76kMPa9+YHQwFxq4i1muwkcmC7TzOk=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "hackgen-nf-font";
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/yuru7/HackGen/releases/download/v${version}/HackGen_NF_v${version}.zip";
|
||||
hash = "sha256-RLEq5IoA3gk/IzabV8wdJYj8yMpbWQVz+Qunef6oNOs=";
|
||||
hash = "sha256-Lh4WQJjeP4JuR8jSXpRNSrjRsNPmNXSx5AItNYMJL2A=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -1,27 +1,53 @@
|
|||
{ lib, stdenv, buildGoModule, fetchFromGitHub, buildFHSEnv, installShellFiles }:
|
||||
{ lib, stdenv, buildGoModule, fetchFromGitHub, buildFHSEnv, installShellFiles, go-task }:
|
||||
|
||||
let
|
||||
|
||||
pkg = buildGoModule rec {
|
||||
pname = "arduino-cli";
|
||||
version = "0.31.0";
|
||||
version = "0.32.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arduino";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-y51/5Gu6nTaL+XLP7hLk/gaksIdRahecl5q5jYBWATE=";
|
||||
hash = "sha256-Em8L2ZYS1rgW46/MP5hs/EBWGcb5GP3EDEzWi072F/I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
go-task
|
||||
];
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-JuuGJuSax2tfuQHH/Hqk1JpQE2OboYJKJjzPjIZ1UD8=";
|
||||
vendorSha256 = "sha256-+5Cj6wdX25fK+Y9czTwRRqCdY+0iarvii9nD3QMDh+c=";
|
||||
|
||||
doCheck = false;
|
||||
postPatch = let
|
||||
skipTests = [
|
||||
# tries to "go install"
|
||||
"TestDummyMonitor"
|
||||
# try to Get "https://downloads.arduino.cc/libraries/library_index.tar.bz2"
|
||||
"TestDownloadAndChecksums"
|
||||
"TestParseArgs"
|
||||
"TestParseReferenceCores"
|
||||
"TestPlatformSearch"
|
||||
"TestPlatformSearchSorting"
|
||||
];
|
||||
in ''
|
||||
substituteInPlace Taskfile.yml \
|
||||
--replace "go test" "go test -p $NIX_BUILD_CORES -skip '(${lib.concatStringsSep "|" skipTests})'"
|
||||
'';
|
||||
|
||||
doCheck = stdenv.isLinux;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
task go:test
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w" "-X github.com/arduino/arduino-cli/version.versionString=${version}" "-X github.com/arduino/arduino-cli/version.commit=unknown"
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "cbqn-bytecode";
|
||||
version = "unstable-2023-01-27";
|
||||
version = "unstable-2023-04-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dzaima";
|
||||
repo = "cbqnBytecode";
|
||||
rev = "b2f47806ea770451d06d04e20177baeaec92e6dd";
|
||||
hash = "sha256-dukpEB5qg6jF4AIHKK+atTvCKZTVtJ1M/nw7+SNp250=";
|
||||
rev = "78ed4102f914eb5fa490d76d4dcd4f8be6e53417";
|
||||
hash = "sha256-IOhxcfGmpARiTdFMSpc+Rh8VXtasZdfP6vKJzULNxAg=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation {
|
|||
homepage = "https://github.com/dzaima/cbqnBytecode";
|
||||
description = "CBQN precompiled bytecode";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk ];
|
||||
maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk detegr ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -3,13 +3,13 @@
|
|||
, stdenv
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, fixDarwinDylibNames
|
||||
, genBytecode ? false
|
||||
, bqn-path ? null
|
||||
, mbqn-source ? null
|
||||
, enableReplxx ? false
|
||||
, enableSingeli ? stdenv.hostPlatform.avx2Support
|
||||
# No support for macOS' .dylib on the CBQN side
|
||||
, enableLibcbqn ? stdenv.hostPlatform.isLinux
|
||||
, enableLibcbqn ? ((stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) && !enableReplxx)
|
||||
, libffi
|
||||
, pkg-config
|
||||
}:
|
||||
|
@ -24,18 +24,18 @@ assert genBytecode -> ((bqn-path != null) && (mbqn-source != null));
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone";
|
||||
version = "unstable-2023-02-01";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dzaima";
|
||||
repo = "CBQN";
|
||||
rev = "05c1270344908e98c9f2d06b3671c3646f8634c3";
|
||||
hash = "sha256-wKeyYWMgTZPr+Ienz3xnsXeD67vwdK4sXbQlW+GpQho=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-M9GTsm65DySLcMk9QDEhImHnUvWtYGPwiG657wHg3KA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
||||
|
||||
buildInputs = [
|
||||
libffi
|
||||
|
@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postPatch = ''
|
||||
sed -i '/SHELL =.*/ d' makefile
|
||||
patchShebangs build/build
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
|
@ -103,7 +104,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/dzaima/CBQN/";
|
||||
description = "BQN implementation in C";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk ];
|
||||
maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk detegr ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation {
|
|||
homepage = "https://github.com/dzaima/replxx";
|
||||
description = "A replxx fork for CBQN";
|
||||
license = licenses.free;
|
||||
maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk ];
|
||||
maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk detegr ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation {
|
|||
homepage = "https://github.com/mlochbaum/Singeli";
|
||||
description = "A metaprogramming DSL for SIMD";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk ];
|
||||
maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk detegr ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -11,14 +11,6 @@ diff --git a/gspell/Makefile.am b/gspell/Makefile.am
|
|||
index 69ee421..7c58973 100644
|
||||
--- a/gspell/Makefile.am
|
||||
+++ b/gspell/Makefile.am
|
||||
@@ -95,6 +95,7 @@ nodist_libgspell_core_la_SOURCES = \
|
||||
$(BUILT_SOURCES)
|
||||
|
||||
libgspell_core_la_LIBADD = \
|
||||
+ $(GTK_MAC_LIBS) \
|
||||
$(CODE_COVERAGE_LIBS)
|
||||
|
||||
libgspell_core_la_CFLAGS = \
|
||||
@@ -161,6 +162,12 @@ gspell_private_headers += \
|
||||
gspell_private_c_files += \
|
||||
gspell-osx.c
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPackages
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
|
@ -12,23 +13,23 @@
|
|||
, vala
|
||||
, gobject-introspection
|
||||
, gnome
|
||||
, gtk-mac-integration
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gspell";
|
||||
version = "1.12.0";
|
||||
version = "1.12.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
outputBin = "dev";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "QNKFDxu26HdSRvoeOUOLNsqvvbraHSihn6HKB+H/gq0=";
|
||||
sha256 = "jsRPMgUuiW/N1JJuuBSjJuOaUEfiUe7HuQVvvZREsPE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Extracted from: https://github.com/Homebrew/homebrew-core/blob/2a27fb86b08afc7ae6dff79cf64aafb8ecc93275/Formula/gspell.rb#L125-L149
|
||||
# Dropped the GTK_MAC_* changes since gtk-mac-integration is not needed since 1.12.1
|
||||
./0001-Darwin-build-fix.patch
|
||||
];
|
||||
|
||||
|
@ -45,8 +46,6 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
gtk3
|
||||
icu
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
gtk-mac-integration
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yoda";
|
||||
version = "1.9.7";
|
||||
version = "1.9.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
|
||||
hash = "sha256-jQe7BNy3k2SFhxihggNFLY2foAAp+pQjnq+oUpAyuP8=";
|
||||
hash = "sha256-e8MGJGirulCv8+y4sizmdxlgNgCYkGiO9FM6qn+S5uQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [
|
||||
|
@ -41,6 +41,9 @@ stdenv.mkDerivation rec {
|
|||
postPatch = ''
|
||||
touch pyext/yoda/*.{pyx,pxd}
|
||||
patchShebangs .
|
||||
|
||||
substituteInPlace pyext/yoda/plotting/script_generator.py \
|
||||
--replace '/usr/bin/env python' '${python.interpreter}'
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
@ -1,11 +1,26 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, meson
|
||||
, buildPackages
|
||||
, cmake
|
||||
, ninja
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
# Fix regression in precomputing CMAKE_SIZEOF_VOID_P
|
||||
# See https://github.com/mesonbuild/meson/pull/11761
|
||||
let fixedMeson =
|
||||
buildPackages.meson.overrideAttrs (
|
||||
{patches ? [], ...}: {
|
||||
patches = patches ++ [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mesonbuild/meson/commit/7c78c2b5a0314078bdabb998ead56925dc8b0fc0.patch";
|
||||
sha256 = "sha256-vSnHhuOIXf/1X+bUkUmGND5b30ES0O8EDArwb4p2/w4=";
|
||||
})
|
||||
];
|
||||
}
|
||||
); in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tomlplusplus";
|
||||
version = "3.3.0";
|
||||
|
@ -17,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||
hash = "sha256-INX8TOEumz4B5coSxhiV7opc3rYJuQXT2k1BJ3Aje1M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson cmake ninja ];
|
||||
nativeBuildInputs = [ fixedMeson cmake ninja ];
|
||||
|
||||
meta = with lib;{
|
||||
homepage = "https://github.com/marzer/tomlplusplus";
|
||||
|
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "browser-cookie3";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-fyyZ7pkNlD6MH1+SRUYjU0mXMUsZJ3qhOqJrcmJ/hgc=";
|
||||
hash = "sha256-bSP6likSwEbxN4S9qbJmPcs8joc5e10FiqVL9gE7ni8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "niaaml";
|
||||
version = "1.1.11";
|
||||
version = "1.1.12";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "lukapecnik";
|
||||
repo = "NiaAML";
|
||||
rev = version;
|
||||
hash = "sha256-B87pI1EpZj1xECrgTmzN5S35Cy1nPowBRyu1IDb5zCE=";
|
||||
hash = "sha256-GAUXEkUOD04DQtRG/RAeeeLmenBd25h18Lmrxbm4X3A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -37,9 +37,10 @@ buildPythonPackage rec {
|
|||
scikit-learn
|
||||
];
|
||||
|
||||
# create scikit-learn dep version consistent
|
||||
# create scikit-learn and niapy deps version consistent
|
||||
preBuild = ''
|
||||
toml-adapt -path pyproject.toml -a change -dep scikit-learn -ver X
|
||||
toml-adapt -path pyproject.toml -a change -dep niapy -ver X
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nocasedict";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-M797DqUO7mutFtx0AP2J3S1Tedm6nPF2NL8qWa42/wo=";
|
||||
hash = "sha256-lgy2mfEgnagKw546tQqnNC/oyp9wYGwjRHpRBVBDXlA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -26,21 +26,22 @@
|
|||
, sphinx-autodoc-typehints
|
||||
|
||||
# tests
|
||||
, anyio
|
||||
, pproxy
|
||||
, pytest-asyncio
|
||||
, pytest-randomly
|
||||
, pytestCheckHook
|
||||
, postgresqlTestHook
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "psycopg";
|
||||
version = "3.1.8";
|
||||
version = "3.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psycopg";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-VmuotHcLWd+k8/GLv0N2wSZR0sZjY+TmGBQjhpYE3YA=";
|
||||
hash = "sha256-yRb6yRpX1vDmXpYu4O50MYMpP2j75aSqhXCWMF1xVH0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -49,15 +50,10 @@ let
|
|||
libpq = "${postgresql.lib}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
libc = "${stdenv.cc.libc}/lib/libc.so.6";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "cython-3.0.0b1-compat.patch";
|
||||
url = "https://github.com/psycopg/psycopg/commit/573446a14312f36257ed9dcfb8eb2756b69d5d9b.patch";
|
||||
hash = "sha256-NWItarNb/Yyfj1avb/SXTkinVGxvWUGH8y6tR/zhVmE=";
|
||||
})
|
||||
];
|
||||
|
||||
baseMeta = {
|
||||
changelog = "https://github.com/psycopg/psycopg/blob/master/docs/news.rst";
|
||||
changelog = "https://github.com/psycopg/psycopg/blob/${version}/docs/news.rst#current-release";
|
||||
homepage = "https://github.com/psycopg/psycopg";
|
||||
license = lib.licenses.lgpl3Plus;
|
||||
maintainers = with lib.maintainers; [ hexa ];
|
||||
|
@ -170,20 +166,28 @@ buildPythonPackage rec {
|
|||
pool = [ psycopg-pool ];
|
||||
};
|
||||
|
||||
preCheck = ''
|
||||
cd ..
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
anyio
|
||||
pproxy
|
||||
pytest-asyncio
|
||||
pytest-randomly
|
||||
pytestCheckHook
|
||||
postgresql
|
||||
]
|
||||
++ lib.optional (stdenv.isLinux) postgresqlTestHook
|
||||
++ passthru.optional-dependencies.c
|
||||
++ passthru.optional-dependencies.pool;
|
||||
|
||||
env = {
|
||||
postgresqlEnableTCP = 1;
|
||||
PGUSER = "psycopg";
|
||||
};
|
||||
|
||||
preCheck = ''
|
||||
cd ..
|
||||
'' + lib.optionalString (stdenv.isLinux) ''
|
||||
export PSYCOPG_TEST_DSN="host=127.0.0.1 user=$PGUSER"
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# don't depend on mypy for tests
|
||||
"test_version"
|
||||
|
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-swiftclient";
|
||||
version = "4.2.0";
|
||||
version = "4.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-o/Ynzp+1S1fTD9tB3DBb1eYFM+62mueeSWrU7F6EjIU=";
|
||||
hash = "sha256-Hj3fmYzL6n3CWqbfjrPffTi/S8lrBl8vhEMeglmBezM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -30,14 +30,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "tempest";
|
||||
version = "33.0.0";
|
||||
version = "34.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-aEtBAE3p+HVw/macwZtKo20mSJctrsIN7idqWe6Dvtc=";
|
||||
hash = "sha256-VLcTyiJ+ce2VqhD1OYRUa+ep34ry/mb61qntiqVsTCQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -65,14 +65,14 @@ let
|
|||
|
||||
package = buildPythonApplication rec {
|
||||
pname = "buildbot";
|
||||
version = "3.7.0";
|
||||
version = "3.8.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-YMLT1SP6NenJIUVTvr58GVrtNXHw+bhfgMpZu3revG4=";
|
||||
hash = "sha256-Z4BmC6Ed+7y4rJologiLXhkIvucXz65KEBxX3LFqExY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -6,7 +6,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-4BXCOLW5e7RuZEzyD+oRmS2I4oT2W3oTcH4ZPxwKKvU=";
|
||||
hash = "sha256-duv8oKgVGfeOzjKiI8Ltmto0dcGSI1xtSy8YbqtIFTk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -1,12 +1,14 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, callPackage, mock, cairosvg, klein, jinja2, buildbot-pkg }:
|
||||
{
|
||||
# this is exposed for potential plugins to use and for nix-update
|
||||
inherit buildbot-pkg;
|
||||
www = buildPythonPackage rec {
|
||||
pname = "buildbot-www";
|
||||
inherit (buildbot-pkg) version;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-t4xHfox6h5PY4+phdCQbClHd77+WfpUWErMZCEcMxu0=";
|
||||
hash = "sha256-6hLJADdd84LTpxVB8C+i8rea9/65QfcCPuZC/7+55Co=";
|
||||
};
|
||||
|
||||
# Remove unnecessary circular dependency on buildbot
|
||||
|
@ -33,7 +35,7 @@
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-JySn7QO+SgoXjVeV4wYwc9twr0Q2c/wsEspqeq038+k=";
|
||||
hash = "sha256-JA+3WnZAN4224LbrluHJcnTmQ8VnuAmoEqqLtw0H10M=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
|
@ -55,7 +57,7 @@
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-935eeF2kpT68lK/UMg8MZQOYEj7D8FaT9iSs/lNahYA=";
|
||||
hash = "sha256-NwLb9aQQwOxo9AqvsYbl/g8mNUeufdPrCwFMJNzdfQM=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
|
@ -77,7 +79,7 @@
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-3pHSiVoOZj2iCGfiz+tMWWMPHSBH5Ggp6e3+a8topsg=";
|
||||
hash = "sha256-hIBH8+RvZ53Txxl2FyrCs+ZFzRAAbK2th5Im2gZCs3c=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
|
@ -99,7 +101,7 @@
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-5Qr1FeYIJG/qaFaTB7ScFN9uca+joHKE6FlfKwhubfo=";
|
||||
hash = "sha256-iK9MwE5Nzc0tHMui0LquCqTFIPbRTEYeHam+5hiOQJE=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
|
@ -121,7 +123,7 @@
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-H0Dn+uTtFyZgyqbk3QQEc5t7CJovyzU+XuCoTe4Ajug=";
|
||||
hash = "sha256-HtVleYQE+pfwso7oBNucRjHEkwjgQSZJ6Ts1x7ncLsA=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
|
|
|
@ -2,11 +2,12 @@
|
|||
#!nix-shell -i bash -p nix-update
|
||||
set -eu -o pipefail
|
||||
|
||||
nix-update python3Packages.buildbot
|
||||
nix-update --version=skip python3Packages.buildbot-worker
|
||||
nix-update --version=skip python3Packages.buildbot-pkg
|
||||
nix-update --version=skip python3Packages.buildbot-plugins.www
|
||||
nix-update --version=skip python3Packages.buildbot-plugins.console-view
|
||||
nix-update --version=skip python3Packages.buildbot-plugins.waterfall-view
|
||||
nix-update --version=skip python3Packages.buildbot-plugins.grid-view
|
||||
nix-update --version=skip python3Packages.buildbot-plugins.wsgi-dashboards
|
||||
nix-update buildbot
|
||||
nix-update --version=skip buildbot-worker
|
||||
nix-update --version=skip buildbot-plugins.buildbot-pkg
|
||||
nix-update --version=skip buildbot-plugins.www
|
||||
nix-update --version=skip buildbot-plugins.console-view
|
||||
nix-update --version=skip buildbot-plugins.waterfall-view
|
||||
nix-update --version=skip buildbot-plugins.grid-view
|
||||
nix-update --version=skip buildbot-plugins.wsgi-dashboards
|
||||
nix-update --version=skip buildbot-plugins.badges
|
||||
|
|
|
@ -28,7 +28,7 @@ buildPythonPackage (rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Lc+FNrfXLfeEnDqNBs9R96jtoFEOCG2vLRWGKip/+VM=";
|
||||
hash = "sha256-et0R0pNxtL5QCgHRT1/q5t+hb6cLl6NU3AowzT/WC90=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "datree";
|
||||
version = "1.8.65";
|
||||
version = "1.8.67";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "datreeio";
|
||||
repo = "datree";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-UL8VVKQBRwJz7kw9/0IHaFvsh3h94BrzDoqDFqOzjXU=";
|
||||
hash = "sha256-TX6+yNRHfSPkJP2+LN0SmEirJo1UzIFpM45sB7oI+8g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MrVIpr2iwddW3yUeBuDfeg+Xo9Iarr/fp4Rc4WGYGeU=";
|
||||
|
|
|
@ -7,6 +7,10 @@ buildGoModule rec {
|
|||
pname = "gomplate";
|
||||
version = "3.11.5";
|
||||
|
||||
# gomplate is currently built w/ go 1.19 (see pkgs/top-level/all-packages.nix), but
|
||||
# it seems the reported "go 1.20 build failure" does no longer occurr.
|
||||
# TODO remove indication to use go 1.19 in pkgs/top-level/all-packages.nix when next upgrading gomplate
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hairyhenderson";
|
||||
repo = pname;
|
||||
|
|
|
@ -14,6 +14,13 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-swapHA/ZO8QoDPwumMt6s5gf91oYe+oyk4EfRSyJqMg=";
|
||||
};
|
||||
|
||||
# https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-devel/m4/m4-1.4.19-r1.ebuild
|
||||
patches = lib.optional stdenv.hostPlatform.isLoongArch64 ./loong-fix-build.patch;
|
||||
postPatch = if stdenv.hostPlatform.isLoongArch64 then ''
|
||||
touch ./aclocal.m4 ./lib/config.hin ./configure ./doc/stamp-vti || die
|
||||
find . -name Makefile.in -exec touch {} + || die
|
||||
'' else null;
|
||||
|
||||
strictDeps = true;
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
30
pkgs/development/tools/misc/gnum4/loong-fix-build.patch
Normal file
30
pkgs/development/tools/misc/gnum4/loong-fix-build.patch
Normal file
|
@ -0,0 +1,30 @@
|
|||
[xen0n: this is https://github.com/sunhaiyong1978/CLFS-for-LoongArch/blob/1.0/patches/stack-direction-add-loongarch.patch with line number tweak, and change to generated file added as well.]
|
||||
From: Sun Haiyong <youbest@sina.com>
|
||||
Date: Tue, 31 Aug 2021 11:11:52 +0800
|
||||
Subject: [PATCH] stack-direction: Add support for loongarch CPU
|
||||
|
||||
* m4/stack-direction.m4 (SV_STACK_DIRECTION): When the CPU is loongarch,
|
||||
set "sv_cv_stack_direction" to "-1" .
|
||||
--- a/m4/stack-direction.m4
|
||||
+++ b/m4/stack-direction.m4
|
||||
@@ -31,6 +31,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
|
||||
i?86 | x86_64 | \
|
||||
i860 | \
|
||||
ia64 | \
|
||||
+ loongarch* | \
|
||||
m32r | \
|
||||
m68* | \
|
||||
m88k | \
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -46399,6 +46399,7 @@ else $as_nop
|
||||
i?86 | x86_64 | \
|
||||
i860 | \
|
||||
ia64 | \
|
||||
+ loongarch* | \
|
||||
m32r | \
|
||||
m68* | \
|
||||
m88k | \
|
||||
--
|
||||
2.17.2
|
||||
|
|
@ -2,20 +2,21 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-llvm-lines";
|
||||
version = "0.4.27";
|
||||
version = "0.4.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtolnay";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-nojFHP3JhhJSzYeRGZKpUpNcVdMg21L+t6vTxIalsJs=";
|
||||
hash = "sha256-ebsmQM3KLhNfBGRXosOlim+rMTg7aQu0LXL4iGr9FRQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ZVi3j5FbcYYQJ5QOW1tiotiqwOjF9uv1VLHrZL0LBxc=";
|
||||
cargoHash = "sha256-YXJfEofipN33aItuqzVZkPvszeZqLyikBoF+viQgCeM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Count the number of lines of LLVM IR across all instantiations of a generic function";
|
||||
homepage = "https://github.com/dtolnay/cargo-llvm-lines";
|
||||
changelog = "https://github.com/dtolnay/cargo-llvm-lines/releases/tag/${src.rev}";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
|
|
|
@ -34,7 +34,7 @@ buildGoModule rec {
|
|||
homepage = "https://git.helsinki.tools/helsinki-systems/wp4nix";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ onny ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
71
pkgs/games/doom-ports/doomretro/default.nix
Normal file
71
pkgs/games/doom-ports/doomretro/default.nix
Normal file
|
@ -0,0 +1,71 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, SDL2
|
||||
, SDL2_image
|
||||
, SDL2_mixer
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "doomretro";
|
||||
version = "4.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bradharding";
|
||||
repo = "doomretro";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-WCTCDOjBxVOkD06jF9wF2ELoyMhWa4lnZz82GbI1Axs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
SDL2_image
|
||||
SDL2_mixer
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.doomretro.com/";
|
||||
description = "A classic, refined DOOM source port";
|
||||
longDescription = ''
|
||||
DOOM Retro is the classic, refined DOOM source port for Windows PC. It
|
||||
represents how I like my DOOM to be today, in all its dark and gritty,
|
||||
unapologetically pixelated glory. I have strived to craft a unique and
|
||||
cohesive set of compelling features, while continuing to uphold my respect
|
||||
for that classic, nostalgic DOOM experience many of us, after all this
|
||||
time, still hold dear.
|
||||
|
||||
DOOM Retro has been under relentless, meticulous development since its
|
||||
debut on December 10, 2013 commemorating DOOM's 20th anniversary, and it
|
||||
has absolutely no intention of stopping. Its source code was originally
|
||||
derived from Chocolate DOOM but is now very much its own beast. It does
|
||||
include the usual, necessary enhancements that you'll find in all those
|
||||
other DOOM source ports out there, but it also has many of its own cool,
|
||||
original ideas that continues to set itself apart.
|
||||
|
||||
DOOM Retro is and always will be intentionally minimalistic in its
|
||||
approach, and does a few things differently. It supports all vanilla,
|
||||
limit removing, BOOM, MBF and MBF21-compatible maps and mods. In order to
|
||||
freely implement certain features, and due to the nature of DOOM demos,
|
||||
DOOM Retro does not support their recording or playback.
|
||||
|
||||
DOOM Retro is singleplayer only. Written in C, and released as free, open
|
||||
source software under version 3 of the GNU General Public License, DOOM
|
||||
Retro's 100,000 or so lines of code are diligently maintained in this
|
||||
public Git repository and regularly compiled into both 32 and 64-bit
|
||||
Windows apps using Microsoft Visual Studio Community 2022. Although next
|
||||
to no support is provided, DOOM Retro's source code may also be compiled
|
||||
and run under Linux and macOS.
|
||||
'';
|
||||
changelog = "https://github.com/bradharding/doomretro/releases/tag/${finalAttrs.src.rev}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
openttd.overrideAttrs (oldAttrs: rec {
|
||||
pname = "openttd-jgrpp";
|
||||
version = "0.52.1";
|
||||
version = "0.53.1";
|
||||
|
||||
src = fetchFromGitHub rec {
|
||||
owner = "JGRennison";
|
||||
repo = "OpenTTD-patches";
|
||||
rev = "jgrpp-${version}";
|
||||
hash = "sha256-1coNn+L4DrkqyOOnDyNpzCnIe/pOzGSB5+DNs8ETdGU=";
|
||||
hash = "sha256-+5AOsop3x1fkX5UfxMFLhrTLeSnt+E0PYoU5n31N3f4=";
|
||||
};
|
||||
|
||||
buildInputs = oldAttrs.buildInputs ++ [ zstd ];
|
||||
|
|
|
@ -8,14 +8,14 @@
|
|||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
version = "2.8.1";
|
||||
version = "2.8.2";
|
||||
pname = "grafana-loki";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "loki";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kMVbswnq8hnPv/QmvPXmOL4QOTHyuKvgQ6+CNX0DunQ=";
|
||||
hash = "sha256-29cpDLIwKw0CaYaNGv31E7sNTaRepymjvAZ8TL4RpxY=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
@ -54,6 +54,7 @@ buildGoModule rec {
|
|||
description = "Like Prometheus, but for logs";
|
||||
license = with licenses; [ agpl3Only asl20 ];
|
||||
homepage = "https://grafana.com/oss/loki/";
|
||||
changelog = "https://github.com/grafana/loki/releases/tag/v${version}";
|
||||
maintainers = with maintainers; [ willibutz globin mmahut indeednotjames ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,5 +1,9 @@
|
|||
{ callPackage }: builtins.mapAttrs (_: callPackage ./generic.nix) rec {
|
||||
wordpress = wordpress6_1;
|
||||
wordpress = wordpress6_2;
|
||||
wordpress6_2 = {
|
||||
version = "6.2";
|
||||
hash = "sha256-FDEo3rZc7SU9yqAplUScSMUWOEVS0e/PsrOPjS9m+QQ=";
|
||||
};
|
||||
wordpress6_1 = {
|
||||
version = "6.1.1";
|
||||
hash = "sha256-IR6FSmm3Pd8cCHNQTH1oIaLYsEP1obVjr0bDJkD7H60=";
|
||||
|
|
|
@ -1,14 +1,20 @@
|
|||
{
|
||||
"de_DE": {
|
||||
"path": "de_DE",
|
||||
"rev": "1036537",
|
||||
"sha256": "001jh83kv86av8yvkdwfcvpwik1yz8qxkyybmqkgx13hpaxhbf80",
|
||||
"version": "6.0"
|
||||
"rev": "1095174",
|
||||
"sha256": "1rrkxzblk14f77daiypyg8j4nlzmk6mmfmsb3431cxyz7swxggll",
|
||||
"version": "6.1"
|
||||
},
|
||||
"fr_FR": {
|
||||
"path": "fr_FR",
|
||||
"rev": "1004765",
|
||||
"sha256": "0g8h21hi4p0vl6pa57656lm508ycdyhpadq1liwk2d4x183avygh",
|
||||
"version": "6.0"
|
||||
"rev": "1073950",
|
||||
"sha256": "0gzgnwsdv83w8rmms52kjb60zmx1dcmik96561a4r95i4wi2nqrr",
|
||||
"version": "6.1"
|
||||
},
|
||||
"ro_RO": {
|
||||
"path": "ro_RO",
|
||||
"rev": "1096709",
|
||||
"sha256": "067iknc79sr185hl9f6d92jgz74bzp39k6j2mck6d9m5qa2f398r",
|
||||
"version": "6.1"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,16 +6,16 @@
|
|||
"version": "2.4.5"
|
||||
},
|
||||
"akismet": {
|
||||
"path": "akismet/tags/5.0.2",
|
||||
"rev": "2827210",
|
||||
"sha256": "0qxpivk7s0q23bf64bwq8k81l593jyc178kqlgnvfkkvgs51kjk7",
|
||||
"version": "5.0.2"
|
||||
"path": "akismet/tags/5.1",
|
||||
"rev": "2894240",
|
||||
"sha256": "032b3hhdqyjj4y4z246wlhyjj74qw0c60kndc7nv79l7h3i1q10f",
|
||||
"version": "5.1"
|
||||
},
|
||||
"antispam-bee": {
|
||||
"path": "antispam-bee/tags/2.11.1",
|
||||
"rev": "2748316",
|
||||
"sha256": "1hjq1yazvypc84lwcjq7za1n3s7vcxd9mc50adpinkwjjph1cgxn",
|
||||
"version": "2.11.1"
|
||||
"path": "antispam-bee/tags/2.11.2",
|
||||
"rev": "2860691",
|
||||
"sha256": "0yg82rx4n0bmj71d0mcjspghg9m3fp7ndf4jsjcp3kvbnhlxihaa",
|
||||
"version": "2.11.2"
|
||||
},
|
||||
"async-javascript": {
|
||||
"path": "async-javascript/tags/2.21.08.31",
|
||||
|
@ -24,16 +24,16 @@
|
|||
"version": "2.21.08.31"
|
||||
},
|
||||
"breeze": {
|
||||
"path": "breeze/tags/2.0.14",
|
||||
"rev": "2822681",
|
||||
"sha256": "1c47yw802yrkmbsa922xvh08x0wvcgqdy11j55qr4l9dsk9ljbv3",
|
||||
"version": "2.0.14"
|
||||
"path": "breeze/tags/2.0.18",
|
||||
"rev": "2883385",
|
||||
"sha256": "1fx186mqlmda5sk3a3pndnjadalygp2xw27xffmvwmvvmv7nikv9",
|
||||
"version": "2.0.18"
|
||||
},
|
||||
"co-authors-plus": {
|
||||
"path": "co-authors-plus/tags/3.5.7",
|
||||
"rev": "2844205",
|
||||
"sha256": "0d6ji1410fg0mp8926y8c5nmnkp2m76wrbaia7ppb0c9h1pbki65",
|
||||
"version": "3.5.7"
|
||||
"path": "co-authors-plus/tags/3.5.10",
|
||||
"rev": "2853502",
|
||||
"sha256": "1nlw3bkvz05fl1d4fyh3b9n27hchs90w9c30hikhpj2vxfkpc4zh",
|
||||
"version": "3.5.10"
|
||||
},
|
||||
"code-syntax-block": {
|
||||
"path": "code-syntax-block/tags/3.1.1",
|
||||
|
@ -42,10 +42,10 @@
|
|||
"version": "3.1.1"
|
||||
},
|
||||
"cookie-notice": {
|
||||
"path": "cookie-notice/tags/2.4.4",
|
||||
"rev": "2833482",
|
||||
"sha256": "03ip3yxg8151snbrzmyxxlflrlhdd9gppnlhjlsg46m5760c5bxw",
|
||||
"version": "2.4.4"
|
||||
"path": "cookie-notice/tags/2.4.8",
|
||||
"rev": "2888335",
|
||||
"sha256": "0gya4qi0hxhvry9a6r3lmby242lf7yqam96vdhyav080s7fr4m8b",
|
||||
"version": "2.4.8"
|
||||
},
|
||||
"disable-xml-rpc": {
|
||||
"path": "disable-xml-rpc/tags/1.0.1",
|
||||
|
@ -54,10 +54,10 @@
|
|||
"version": "1.0.1"
|
||||
},
|
||||
"gutenberg": {
|
||||
"path": "gutenberg/tags/14.9.1",
|
||||
"rev": "2845697",
|
||||
"sha256": "0wkwbka78nj6dqrjrm9qpbzfk848v38myrzvdwk40qz8ab6mhrqb",
|
||||
"version": "14.9.1"
|
||||
"path": "gutenberg/tags/15.5.0",
|
||||
"rev": "2894522",
|
||||
"sha256": "132bbnvnv43pq7bn16r3fkks6r3jl4bnqksvh2q7hmysr8xgllwf",
|
||||
"version": "15.5.0"
|
||||
},
|
||||
"hello-dolly": {
|
||||
"path": "hello-dolly/tags/1.7.2",
|
||||
|
@ -67,15 +67,15 @@
|
|||
},
|
||||
"hkdev-maintenance-mode": {
|
||||
"path": "hkdev-maintenance-mode/trunk",
|
||||
"rev": "2826725",
|
||||
"sha256": "1y70wksgj07n2yd10sg7vf0nddjw9g3vhyfxfbm57m1bb0826zpd",
|
||||
"version": "2.2.6"
|
||||
"rev": "2858025",
|
||||
"sha256": "1p844pjyiz2ydv0imwa13dfbp8150rlghla454dflk3rcdmxzj1n",
|
||||
"version": "2.3.2"
|
||||
},
|
||||
"jetpack": {
|
||||
"path": "jetpack/tags/11.7",
|
||||
"rev": "2846103",
|
||||
"sha256": "0nsq0m3ir3dygivljwg05nl8m2bsb47r8nq9r83jj930a996x5cj",
|
||||
"version": "11.7"
|
||||
"path": "jetpack/tags/12.0",
|
||||
"rev": "2893834",
|
||||
"sha256": "1sxa15qspk5z0qgx44v97gpa70v0h4r6gmyhqg0722ijnvli6dx0",
|
||||
"version": "12.0"
|
||||
},
|
||||
"jetpack-lite": {
|
||||
"path": "jetpack-lite/tags/3.0.3",
|
||||
|
@ -84,34 +84,34 @@
|
|||
"version": "3.0.3"
|
||||
},
|
||||
"lightbox-photoswipe": {
|
||||
"path": "lightbox-photoswipe/tags/5.0.19",
|
||||
"rev": "2845708",
|
||||
"sha256": "00nll7i5h71bq9h3f4fnkf4zg1z8vrmrmzq7a5f71ysymsw104g1",
|
||||
"version": "5.0.19"
|
||||
"path": "lightbox-photoswipe/tags/5.0.30",
|
||||
"rev": "2891767",
|
||||
"sha256": "13y2ascd8cq1kvn8kl2r6xpz3fl8silm0llbbybmdqiihc41mwdw",
|
||||
"version": "5.0.30"
|
||||
},
|
||||
"mailpoet": {
|
||||
"path": "mailpoet/tags/4.4.0",
|
||||
"rev": "2846160",
|
||||
"sha256": "0p99634i5k11m06lbh3cx92iacbgv4qc9cix9p8w8349v0wp66a8",
|
||||
"version": "4.4.0"
|
||||
"path": "mailpoet/tags/4.11.0",
|
||||
"rev": "2893564",
|
||||
"sha256": "1zcxb3r4lypa4ha75ngxvf4n0qn2457bkgrzi0y75i69y1bxmyls",
|
||||
"version": "4.11.0"
|
||||
},
|
||||
"merge-minify-refresh": {
|
||||
"path": "merge-minify-refresh/trunk",
|
||||
"rev": "2749953",
|
||||
"sha256": "1k3d59jfz4v6fjsm37gy0i32b6cr4vxv8rrrgll82fpwxs60i866",
|
||||
"version": "1.13.2"
|
||||
"rev": "2887489",
|
||||
"sha256": "11z5d2f5kylszfl47ifxzb9ayyhr3haxds5hvm5dknphczkmjg4j",
|
||||
"version": "1.14.2"
|
||||
},
|
||||
"opengraph": {
|
||||
"path": "opengraph/tags/1.11.0",
|
||||
"rev": "2815207",
|
||||
"sha256": "08fs38gkrfy4i3gx5lpw95hhdqfnzybzxds2ipmpdildx31i9qy1",
|
||||
"version": "1.11.0"
|
||||
"path": "opengraph/tags/1.11.1",
|
||||
"rev": "2892781",
|
||||
"sha256": "0z0vxvmd2brgh32hjfns0hssi93k7rw4rnsf8jx9gff3q6xxhlkc",
|
||||
"version": "1.11.1"
|
||||
},
|
||||
"simple-login-captcha": {
|
||||
"path": "simple-login-captcha/tags/1.3.4",
|
||||
"rev": "2827561",
|
||||
"sha256": "11lrhgyfas2gxdc8jfckzr9dr0i0cws4gz029gj9zi9n031fr5wc",
|
||||
"version": "1.3.4"
|
||||
"path": "simple-login-captcha/tags/1.3.5",
|
||||
"rev": "2887191",
|
||||
"sha256": "0jwm4snrw6lwkq48258n0aca8rn16mlgr5n9ngj6b38i2nj5i7i3",
|
||||
"version": "1.3.5"
|
||||
},
|
||||
"static-mail-sender-configurator": {
|
||||
"path": "static-mail-sender-configurator/tags/0.9.3",
|
||||
|
@ -120,10 +120,10 @@
|
|||
"version": "0.9.3"
|
||||
},
|
||||
"webp-converter-for-media": {
|
||||
"path": "webp-converter-for-media/tags/5.6.3",
|
||||
"rev": "2846410",
|
||||
"sha256": "17h4dbd77qfb6djlw87s2cswhpb63d78jj4f629q81hfasm87rdw",
|
||||
"version": "5.6.3"
|
||||
"path": "webp-converter-for-media/tags/5.8.4",
|
||||
"rev": "2883502",
|
||||
"sha256": "073zki4a3di322cavav2iyv3yqaksqc6pmd0jikv9kc63b6vxapc",
|
||||
"version": "5.8.4"
|
||||
},
|
||||
"webp-express": {
|
||||
"path": "webp-express/tags/0.25.5",
|
||||
|
@ -132,16 +132,16 @@
|
|||
"version": "0.25.5"
|
||||
},
|
||||
"wordpress-seo": {
|
||||
"path": "wordpress-seo/tags/19.14",
|
||||
"rev": "2845973",
|
||||
"sha256": "03z416vj5xw4pq58g5jr5ai7hkjswi94xjldcah22iy0q6031v2n",
|
||||
"version": "19.14"
|
||||
"path": "wordpress-seo/tags/20.4",
|
||||
"rev": "2888177",
|
||||
"sha256": "1wc0r8d7i32g5c9djb5mwhawj4yrrlbhga1x3zlrpg52kqz27pbn",
|
||||
"version": "20.4"
|
||||
},
|
||||
"worker": {
|
||||
"path": "worker/tags/4.9.16",
|
||||
"rev": "2839308",
|
||||
"sha256": "0dg3ibzjfxsg7qqk9fbinc9q2hz5iin1qidb7ggvd48y9rbjb2s9",
|
||||
"version": "4.9.16"
|
||||
"path": "worker/tags/4.9.17",
|
||||
"rev": "2894123",
|
||||
"sha256": "067zx6b8fl87g901vglci870z38kg8igrdxlrcra4xwrll2c01si",
|
||||
"version": "4.9.17"
|
||||
},
|
||||
"wp-change-email-sender": {
|
||||
"path": "wp-change-email-sender/trunk",
|
||||
|
@ -150,16 +150,16 @@
|
|||
"version": "1.0"
|
||||
},
|
||||
"wp-fastest-cache": {
|
||||
"path": "wp-fastest-cache/tags/1.1.0",
|
||||
"rev": "2846969",
|
||||
"sha256": "0vzmsvifzizm3cdp3g3zrr02d6f35mi35dhbmng7xkz5lfvi78i9",
|
||||
"version": "1.1.0"
|
||||
"path": "wp-fastest-cache/tags/1.1.3",
|
||||
"rev": "2895486",
|
||||
"sha256": "190451g1b2dsizrgi6vghmxnd4mikgbdj2314r4hjn8lam3wpixi",
|
||||
"version": "1.1.3"
|
||||
},
|
||||
"wp-gdpr-compliance": {
|
||||
"path": "wp-gdpr-compliance/tags/2.0.21",
|
||||
"rev": "2845379",
|
||||
"sha256": "1bdwvvrrr1rm64lfdfyzmgbcs2f89mbs3jbzpkcapcl81ad9wjki",
|
||||
"version": "2.0.21"
|
||||
"path": "wp-gdpr-compliance/tags/2.0.22",
|
||||
"rev": "2865556",
|
||||
"sha256": "0zgn3pg2zhqqv89rl6pqwd3p3hvspsnn47iab7xw0d79nby0nh7c",
|
||||
"version": "2.0.22"
|
||||
},
|
||||
"wp-mail-smtp": {
|
||||
"path": "wp-mail-smtp/tags/3.7.0",
|
||||
|
@ -168,10 +168,10 @@
|
|||
"version": "3.7.0"
|
||||
},
|
||||
"wp-statistics": {
|
||||
"path": "wp-statistics/tags/13.2.15",
|
||||
"rev": "2847850",
|
||||
"sha256": "1x205kffqzqm2156vxb67i12a2k4figzbdhahilnbl1qihskgcsy",
|
||||
"version": "13.2.15"
|
||||
"path": "wp-statistics/tags/14.0.2",
|
||||
"rev": "2877167",
|
||||
"sha256": "1wk4il8pl1k78gsb9ayvsf0wnnhnj39igf23aazaiikn2mmz7zzw",
|
||||
"version": "14.0.2"
|
||||
},
|
||||
"wp-user-avatars": {
|
||||
"path": "wp-user-avatars/trunk",
|
||||
|
@ -180,9 +180,9 @@
|
|||
"version": "1.4.1"
|
||||
},
|
||||
"wpforms-lite": {
|
||||
"path": "wpforms-lite/tags/1.7.9.1",
|
||||
"rev": "2846820",
|
||||
"sha256": "0a7qzxvzzg5c2m623ghfvza4xpzagzhm28iy93j4557j6b5118fg",
|
||||
"version": "1.7.9.1"
|
||||
"path": "wpforms-lite/tags/1.8.1.1",
|
||||
"rev": "2890148",
|
||||
"sha256": "0qf99shcz0grnhqkf0rfwn0f5sg8nls0vsnnspwrd2m21ka5jp9k",
|
||||
"version": "1.8.1.1"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,32 +1,32 @@
|
|||
{
|
||||
"twentynineteen": {
|
||||
"path": "twentynineteen/2.4",
|
||||
"rev": "178730",
|
||||
"sha256": "1yi6pfndykgd1igd4fd6rqqg5mqa6hnszi3nwv3h1pmjz5yx7vs1",
|
||||
"version": "2.4"
|
||||
"path": "twentynineteen/2.5",
|
||||
"rev": "188109",
|
||||
"sha256": "0v9fn05mjy81axxff2f37jvsz698hpp8dy18nlnghdab99f36j9c",
|
||||
"version": "2.5"
|
||||
},
|
||||
"twentytwenty": {
|
||||
"path": "twentytwenty/2.1",
|
||||
"rev": "178731",
|
||||
"sha256": "1nqd286jkivaqylz9nfsa8naz2xwpyclhk7b8x8wvb4yn4cgrnc5",
|
||||
"version": "2.1"
|
||||
"path": "twentytwenty/2.2",
|
||||
"rev": "188108",
|
||||
"sha256": "1swmg6n0xcdpz21b2h277ajjhv41apnmnnp1w8frii458vxd121r",
|
||||
"version": "2.2"
|
||||
},
|
||||
"twentytwentyone": {
|
||||
"path": "twentytwentyone/1.7",
|
||||
"rev": "178738",
|
||||
"sha256": "090j6xb2hpq4qjis4yismgzip893ihdqs5r58a13nngl17xilmxw",
|
||||
"version": "1.7"
|
||||
"path": "twentytwentyone/1.8",
|
||||
"rev": "188107",
|
||||
"sha256": "19kb1wvdjyrh5xqhbn69c2gr3mfdl24cbzpdz2d5idb8fqyha5kr",
|
||||
"version": "1.8"
|
||||
},
|
||||
"twentytwentythree": {
|
||||
"path": "twentytwentythree/1.0",
|
||||
"rev": "178734",
|
||||
"sha256": "1avrdg1fnv524xb921rgh2hrj87avbb3hhq1szs1mh9g1gv83i0x",
|
||||
"version": "1.0"
|
||||
"path": "twentytwentythree/1.1",
|
||||
"rev": "188105",
|
||||
"sha256": "1k2249zv5c6n58m875jc6n83ri6fy229l5v8wm757bhb9nqljdpk",
|
||||
"version": "1.1"
|
||||
},
|
||||
"twentytwentytwo": {
|
||||
"path": "twentytwentytwo/1.3",
|
||||
"rev": "178733",
|
||||
"sha256": "11lwmirh83yv8wlgacrb9w1qmczkfqxpnl3dn15n38z494kx7zdg",
|
||||
"version": "1.3"
|
||||
"path": "twentytwentytwo/1.4",
|
||||
"rev": "188106",
|
||||
"sha256": "1y6rmfqchifhs9ckilmn3jnc9hc683a8r2gcsiq0vvvvik9ca09r",
|
||||
"version": "1.4"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
[
|
||||
"de_DE"
|
||||
, "fr_FR"
|
||||
, "ro_RO"
|
||||
]
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, installShellFiles
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
|
@ -11,6 +12,7 @@ let
|
|||
packageOverrides = self: super: {
|
||||
fido2 = super.fido2.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.9.3";
|
||||
format = "setuptools";
|
||||
src = self.fetchPypi {
|
||||
inherit (oldAttrs) pname;
|
||||
inherit version;
|
||||
|
@ -20,6 +22,7 @@ let
|
|||
|
||||
okta = super.okta.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.0.4";
|
||||
format = "setuptools";
|
||||
src = self.fetchPypi {
|
||||
inherit (oldAttrs) pname;
|
||||
inherit version;
|
||||
|
@ -38,17 +41,18 @@ let
|
|||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "gimme-aws-creds";
|
||||
version = "2.5.0"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
version = "2.6.0"; # N.B: if you change this, check if overrides are still up-to-date
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nike-Inc";
|
||||
repo = "gimme-aws-creds";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rU4guBXRRJOG3/JilvEF9DwXM5z2IUV80qj3YcV8Z/I=";
|
||||
hash = "sha256-ojbof0Pf5oer3gFC4AlrRJICSJsQYHBQR8M+WV3VwQs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python.pkgs; [
|
||||
installShellFiles
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
|
@ -63,11 +67,11 @@ python.pkgs.buildPythonApplication rec {
|
|||
ctap-keyring-device
|
||||
requests
|
||||
okta
|
||||
pyjwt
|
||||
];
|
||||
|
||||
checkInputs = with python.pkgs; [
|
||||
pytestCheckHook
|
||||
nose
|
||||
responses
|
||||
];
|
||||
|
||||
|
@ -82,6 +86,8 @@ python.pkgs.buildPythonApplication rec {
|
|||
postInstall = ''
|
||||
rm $out/bin/gimme-aws-creds.cmd
|
||||
chmod +x $out/bin/gimme-aws-creds
|
||||
installShellCompletion --bash --name gimme-aws-creds $out/bin/gimme-aws-creds-autocomplete.sh
|
||||
rm $out/bin/gimme-aws-creds-autocomplete.sh
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bonnie++";
|
||||
version = "1.98";
|
||||
version = "2.00a";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.coker.com.au/bonnie++/bonnie++-${version}.tgz";
|
||||
sha256 = "010bmlmi0nrlp3aq7p624sfaj5a65lswnyyxk3cnz1bqig0cn2vf";
|
||||
sha256 = "sha256-qNM7vYG8frVZzlv25YS5tT+uo5zPtK6S5Y8nJX5Gjw4=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
@ -16,16 +16,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "broot";
|
||||
version = "1.21.2";
|
||||
version = "1.21.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hLWITvW3aRC/2f0v3nJAHTaHtOhddTS171sNA1YLRnQ=";
|
||||
hash = "sha256-YveMIGrcWW52rnTkX9gCUdOaq9+CFS9ByrJv78IeAJA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-RvU8xkcjEVysBRR9bFdVVyICdv8zSS6WTW4bTKlviGE=";
|
||||
cargoHash = "sha256-WEqa2NQ49QrKf572mChha/0u8+kov6GnArsZtu8Igio=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nb";
|
||||
version = "7.4.1";
|
||||
version = "7.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xwmx";
|
||||
repo = "nb";
|
||||
rev = version;
|
||||
sha256 = "sha256-5QuNv6sRr/pfw0Vk+jfSjpowWfsD4kh7c2YoEEuUeKE=";
|
||||
sha256 = "sha256-CZcXV8ZRFnx0qI5vZ8adXUAJWAR+KG/ChTFDQWKqmsA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
@ -218,11 +218,15 @@ class DocBookRenderer(Renderer):
|
|||
result += f"<partintro{maybe_id}>"
|
||||
return result
|
||||
def example_open(self, token: Token, tokens: Sequence[Token], i: int) -> str:
|
||||
if id := token.attrs.get('id'):
|
||||
return f"<anchor xml:id={quoteattr(cast(str, id))} />"
|
||||
return ""
|
||||
if id := cast(str, token.attrs.get('id', '')):
|
||||
id = f'xml:id={quoteattr(id)}' if id else ''
|
||||
return f'<example {id}>'
|
||||
def example_close(self, token: Token, tokens: Sequence[Token], i: int) -> str:
|
||||
return ""
|
||||
return "</example>"
|
||||
def example_title_open(self, token: Token, tokens: Sequence[Token], i: int) -> str:
|
||||
return "<title>"
|
||||
def example_title_close(self, token: Token, tokens: Sequence[Token], i: int) -> str:
|
||||
return "</title>"
|
||||
|
||||
def _close_headings(self, level: Optional[int]) -> str:
|
||||
# we rely on markdown-it producing h{1..6} tags in token.tag for this to work
|
||||
|
|
|
@ -214,11 +214,15 @@ class HTMLRenderer(Renderer):
|
|||
self._ordered_list_nesting -= 1;
|
||||
return "</ol></div>"
|
||||
def example_open(self, token: Token, tokens: Sequence[Token], i: int) -> str:
|
||||
if id := token.attrs.get('id'):
|
||||
return f'<a id="{escape(cast(str, id), True)}" />'
|
||||
return ""
|
||||
if id := cast(str, token.attrs.get('id', '')):
|
||||
id = f'id="{escape(id, True)}"' if id else ''
|
||||
return f'<div class="example"><a {id} />'
|
||||
def example_close(self, token: Token, tokens: Sequence[Token], i: int) -> str:
|
||||
return ""
|
||||
return '</div></div><br class="example-break" />'
|
||||
def example_title_open(self, token: Token, tokens: Sequence[Token], i: int) -> str:
|
||||
return '<p class="title"><strong>'
|
||||
def example_title_close(self, token: Token, tokens: Sequence[Token], i: int) -> str:
|
||||
return '</strong></p><div class="example-contents">'
|
||||
|
||||
def _make_hN(self, level: int) -> tuple[str, str]:
|
||||
return f"h{min(6, max(1, level + self._hlevel_offset))}", ""
|
||||
|
|
|
@ -402,6 +402,18 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer):
|
|||
)
|
||||
if not (items := walk_and_emit(toc, toc_depth)):
|
||||
return ""
|
||||
examples = ""
|
||||
if toc.examples:
|
||||
examples_entries = [
|
||||
f'<dt>{i + 1}. <a href="{ex.target.href()}">{ex.target.toc_html}</a></dt>'
|
||||
for i, ex in enumerate(toc.examples)
|
||||
]
|
||||
examples = (
|
||||
'<div class="list-of-examples">'
|
||||
'<p><strong>List of Examples</strong><p>'
|
||||
f'<dl>{"".join(examples_entries)}</dl>'
|
||||
'</div>'
|
||||
)
|
||||
return (
|
||||
f'<div class="toc">'
|
||||
f' <p><strong>Table of Contents</strong></p>'
|
||||
|
@ -409,6 +421,7 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer):
|
|||
f' {"".join(items)}'
|
||||
f' </dl>'
|
||||
f'</div>'
|
||||
f'{examples}'
|
||||
)
|
||||
|
||||
def _make_hN(self, level: int) -> tuple[str, str]:
|
||||
|
@ -513,6 +526,25 @@ class HTMLConverter(BaseConverter[ManualHTMLRenderer]):
|
|||
self._redirection_targets.add(into)
|
||||
return tokens
|
||||
|
||||
def _number_examples(self, tokens: Sequence[Token], start: int = 1) -> int:
|
||||
for (i, token) in enumerate(tokens):
|
||||
if token.type == "example_title_open":
|
||||
title = tokens[i + 1]
|
||||
assert title.type == 'inline' and title.children
|
||||
# the prefix is split into two tokens because the xref title_html will want
|
||||
# only the first of the two, but both must be rendered into the example itself.
|
||||
title.children = (
|
||||
[
|
||||
Token('text', '', 0, content=f'Example {start}'),
|
||||
Token('text', '', 0, content='. ')
|
||||
] + title.children
|
||||
)
|
||||
start += 1
|
||||
elif token.type.startswith('included_') and token.type != 'included_options':
|
||||
for sub, _path in token.meta['included']:
|
||||
start = self._number_examples(sub, start)
|
||||
return start
|
||||
|
||||
# xref | (id, type, heading inlines, file, starts new file)
|
||||
def _collect_ids(self, tokens: Sequence[Token], target_file: str, typ: str, file_changed: bool
|
||||
) -> list[XrefTarget | tuple[str, str, Token, str, bool]]:
|
||||
|
@ -534,6 +566,8 @@ class HTMLConverter(BaseConverter[ManualHTMLRenderer]):
|
|||
subtyp = bt.type.removeprefix('included_').removesuffix('s')
|
||||
for si, (sub, _path) in enumerate(bt.meta['included']):
|
||||
result += self._collect_ids(sub, sub_file, subtyp, si == 0 and sub_file != target_file)
|
||||
elif bt.type == 'example_open' and (id := cast(str, bt.attrs.get('id', ''))):
|
||||
result.append((id, 'example', tokens[i + 2], target_file, False))
|
||||
elif bt.type == 'inline':
|
||||
assert bt.children
|
||||
result += self._collect_ids(bt.children, target_file, typ, False)
|
||||
|
@ -558,6 +592,11 @@ class HTMLConverter(BaseConverter[ManualHTMLRenderer]):
|
|||
title = prefix + title_html
|
||||
toc_html = f"{n}. {title_html}"
|
||||
title_html = f"Appendix {n}"
|
||||
elif typ == 'example':
|
||||
# skip the prepended `Example N. ` from _number_examples
|
||||
toc_html, title = self._renderer.renderInline(inlines.children[2:]), title_html
|
||||
# xref title wants only the prepended text, sans the trailing colon and space
|
||||
title_html = self._renderer.renderInline(inlines.children[0:1])
|
||||
else:
|
||||
toc_html, title = title_html, title_html
|
||||
title_html = (
|
||||
|
@ -569,6 +608,7 @@ class HTMLConverter(BaseConverter[ManualHTMLRenderer]):
|
|||
return XrefTarget(id, title_html, toc_html, re.sub('<.*?>', '', title), path, drop_fragment)
|
||||
|
||||
def _postprocess(self, infile: Path, outfile: Path, tokens: Sequence[Token]) -> None:
|
||||
self._number_examples(tokens)
|
||||
xref_queue = self._collect_ids(tokens, outfile.name, 'book', True)
|
||||
|
||||
failed = False
|
||||
|
|
|
@ -14,7 +14,7 @@ from .utils import Freezeable
|
|||
FragmentType = Literal['preface', 'part', 'chapter', 'section', 'appendix']
|
||||
|
||||
# in the TOC all fragments are allowed, plus the all-encompassing book.
|
||||
TocEntryType = Literal['book', 'preface', 'part', 'chapter', 'section', 'appendix']
|
||||
TocEntryType = Literal['book', 'preface', 'part', 'chapter', 'section', 'appendix', 'example']
|
||||
|
||||
def is_include(token: Token) -> bool:
|
||||
return token.type == "fence" and token.info.startswith("{=include=} ")
|
||||
|
@ -124,6 +124,7 @@ class TocEntry(Freezeable):
|
|||
next: TocEntry | None = None
|
||||
children: list[TocEntry] = dc.field(default_factory=list)
|
||||
starts_new_chunk: bool = False
|
||||
examples: list[TocEntry] = dc.field(default_factory=list)
|
||||
|
||||
@property
|
||||
def root(self) -> TocEntry:
|
||||
|
@ -138,13 +139,13 @@ class TocEntry(Freezeable):
|
|||
|
||||
@classmethod
|
||||
def collect_and_link(cls, xrefs: dict[str, XrefTarget], tokens: Sequence[Token]) -> TocEntry:
|
||||
result = cls._collect_entries(xrefs, tokens, 'book')
|
||||
entries, examples = cls._collect_entries(xrefs, tokens, 'book')
|
||||
|
||||
def flatten_with_parent(this: TocEntry, parent: TocEntry | None) -> Iterable[TocEntry]:
|
||||
this.parent = parent
|
||||
return itertools.chain([this], *[ flatten_with_parent(c, this) for c in this.children ])
|
||||
|
||||
flat = list(flatten_with_parent(result, None))
|
||||
flat = list(flatten_with_parent(entries, None))
|
||||
prev = flat[0]
|
||||
prev.starts_new_chunk = True
|
||||
paths_seen = set([prev.target.path])
|
||||
|
@ -155,32 +156,39 @@ class TocEntry(Freezeable):
|
|||
prev = c
|
||||
paths_seen.add(c.target.path)
|
||||
|
||||
flat[0].examples = examples
|
||||
|
||||
for c in flat:
|
||||
c.freeze()
|
||||
|
||||
return result
|
||||
return entries
|
||||
|
||||
@classmethod
|
||||
def _collect_entries(cls, xrefs: dict[str, XrefTarget], tokens: Sequence[Token],
|
||||
kind: TocEntryType) -> TocEntry:
|
||||
kind: TocEntryType) -> tuple[TocEntry, list[TocEntry]]:
|
||||
# we assume that check_structure has been run recursively over the entire input.
|
||||
# list contains (tag, entry) pairs that will collapse to a single entry for
|
||||
# the full sequence.
|
||||
entries: list[tuple[str, TocEntry]] = []
|
||||
examples: list[TocEntry] = []
|
||||
for token in tokens:
|
||||
if token.type.startswith('included_') and (included := token.meta.get('included')):
|
||||
fragment_type_str = token.type[9:].removesuffix('s')
|
||||
assert fragment_type_str in get_args(TocEntryType)
|
||||
fragment_type = cast(TocEntryType, fragment_type_str)
|
||||
for fragment, _path in included:
|
||||
entries[-1][1].children.append(cls._collect_entries(xrefs, fragment, fragment_type))
|
||||
subentries, subexamples = cls._collect_entries(xrefs, fragment, fragment_type)
|
||||
entries[-1][1].children.append(subentries)
|
||||
examples += subexamples
|
||||
elif token.type == 'heading_open' and (id := cast(str, token.attrs.get('id', ''))):
|
||||
while len(entries) > 1 and entries[-1][0] >= token.tag:
|
||||
entries[-2][1].children.append(entries.pop()[1])
|
||||
entries.append((token.tag,
|
||||
TocEntry(kind if token.tag == 'h1' else 'section', xrefs[id])))
|
||||
token.meta['TocEntry'] = entries[-1][1]
|
||||
elif token.type == 'example_open' and (id := cast(str, token.attrs.get('id', ''))):
|
||||
examples.append(TocEntry('example', xrefs[id]))
|
||||
|
||||
while len(entries) > 1:
|
||||
entries[-2][1].children.append(entries.pop()[1])
|
||||
return entries[0][1]
|
||||
return (entries[0][1], examples)
|
||||
|
|
|
@ -88,6 +88,8 @@ class Renderer:
|
|||
"ordered_list_close": self.ordered_list_close,
|
||||
"example_open": self.example_open,
|
||||
"example_close": self.example_close,
|
||||
"example_title_open": self.example_title_open,
|
||||
"example_title_close": self.example_title_close,
|
||||
}
|
||||
|
||||
self._admonitions = {
|
||||
|
@ -219,6 +221,10 @@ class Renderer:
|
|||
raise RuntimeError("md token not supported", token)
|
||||
def example_close(self, token: Token, tokens: Sequence[Token], i: int) -> str:
|
||||
raise RuntimeError("md token not supported", token)
|
||||
def example_title_open(self, token: Token, tokens: Sequence[Token], i: int) -> str:
|
||||
raise RuntimeError("md token not supported", token)
|
||||
def example_title_close(self, token: Token, tokens: Sequence[Token], i: int) -> str:
|
||||
raise RuntimeError("md token not supported", token)
|
||||
|
||||
def _is_escaped(src: str, pos: int) -> bool:
|
||||
found = 0
|
||||
|
@ -417,6 +423,32 @@ def _block_attr(md: markdown_it.MarkdownIt) -> None:
|
|||
|
||||
md.core.ruler.push("block_attr", block_attr)
|
||||
|
||||
def _example_titles(md: markdown_it.MarkdownIt) -> None:
|
||||
"""
|
||||
find title headings of examples and stick them into meta for renderers, then
|
||||
remove them from the token stream. also checks whether any example contains a
|
||||
non-title heading since those would make toc generation extremely complicated.
|
||||
"""
|
||||
def example_titles(state: markdown_it.rules_core.StateCore) -> None:
|
||||
in_example = [False]
|
||||
for i, token in enumerate(state.tokens):
|
||||
if token.type == 'example_open':
|
||||
if state.tokens[i + 1].type == 'heading_open':
|
||||
assert state.tokens[i + 3].type == 'heading_close'
|
||||
state.tokens[i + 1].type = 'example_title_open'
|
||||
state.tokens[i + 3].type = 'example_title_close'
|
||||
else:
|
||||
assert token.map
|
||||
raise RuntimeError(f"found example without title in line {token.map[0] + 1}")
|
||||
in_example.append(True)
|
||||
elif token.type == 'example_close':
|
||||
in_example.pop()
|
||||
elif token.type == 'heading_open' and in_example[-1]:
|
||||
assert token.map
|
||||
raise RuntimeError(f"unexpected non-title heading in example in line {token.map[0] + 1}")
|
||||
|
||||
md.core.ruler.push("example_titles", example_titles)
|
||||
|
||||
TR = TypeVar('TR', bound='Renderer')
|
||||
|
||||
class Converter(ABC, Generic[TR]):
|
||||
|
@ -459,6 +491,7 @@ class Converter(ABC, Generic[TR]):
|
|||
self._md.use(_heading_ids)
|
||||
self._md.use(_compact_list_attr)
|
||||
self._md.use(_block_attr)
|
||||
self._md.use(_example_titles)
|
||||
self._md.enable(["smartquotes", "replacements"])
|
||||
|
||||
def _parse(self, src: str) -> list[Token]:
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
import nixos_render_docs as nrd
|
||||
import pytest
|
||||
|
||||
from markdown_it.token import Token
|
||||
|
||||
|
@ -427,18 +428,38 @@ def test_admonitions() -> None:
|
|||
|
||||
def test_example() -> None:
|
||||
c = Converter({})
|
||||
assert c._parse("::: {.example}") == [
|
||||
Token(type='example_open', tag='div', nesting=1, attrs={}, map=[0, 1], level=0, children=None,
|
||||
assert c._parse("::: {.example}\n# foo") == [
|
||||
Token(type='example_open', tag='div', nesting=1, attrs={}, map=[0, 2], level=0, children=None,
|
||||
content='', markup=':::', info=' {.example}', meta={}, block=True, hidden=False),
|
||||
Token(type='example_title_open', tag='h1', nesting=1, attrs={}, map=[1, 2], level=1, children=None,
|
||||
content='', markup='#', info='', meta={}, block=True, hidden=False),
|
||||
Token(type='inline', tag='', nesting=0, attrs={}, map=[1, 2], level=2,
|
||||
content='foo', markup='', info='', meta={}, block=True, hidden=False,
|
||||
children=[
|
||||
Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None,
|
||||
content='foo', markup='', info='', meta={}, block=False, hidden=False)
|
||||
]),
|
||||
Token(type='example_title_close', tag='h1', nesting=-1, attrs={}, map=None, level=1, children=None,
|
||||
content='', markup='#', info='', meta={}, block=True, hidden=False),
|
||||
Token(type='example_close', tag='div', nesting=-1, attrs={}, map=None, level=0, children=None,
|
||||
content='', markup=':::', info='', meta={}, block=True, hidden=False)
|
||||
content='', markup='', info='', meta={}, block=True, hidden=False)
|
||||
]
|
||||
assert c._parse("::: {#eid .example}") == [
|
||||
Token(type='example_open', tag='div', nesting=1, attrs={'id': 'eid'}, map=[0, 1], level=0,
|
||||
assert c._parse("::: {#eid .example}\n# foo") == [
|
||||
Token(type='example_open', tag='div', nesting=1, attrs={'id': 'eid'}, map=[0, 2], level=0,
|
||||
children=None, content='', markup=':::', info=' {#eid .example}', meta={}, block=True,
|
||||
hidden=False),
|
||||
Token(type='example_title_open', tag='h1', nesting=1, attrs={}, map=[1, 2], level=1, children=None,
|
||||
content='', markup='#', info='', meta={}, block=True, hidden=False),
|
||||
Token(type='inline', tag='', nesting=0, attrs={}, map=[1, 2], level=2,
|
||||
content='foo', markup='', info='', meta={}, block=True, hidden=False,
|
||||
children=[
|
||||
Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None,
|
||||
content='foo', markup='', info='', meta={}, block=False, hidden=False)
|
||||
]),
|
||||
Token(type='example_title_close', tag='h1', nesting=-1, attrs={}, map=None, level=1, children=None,
|
||||
content='', markup='#', info='', meta={}, block=True, hidden=False),
|
||||
Token(type='example_close', tag='div', nesting=-1, attrs={}, map=None, level=0, children=None,
|
||||
content='', markup=':::', info='', meta={}, block=True, hidden=False)
|
||||
content='', markup='', info='', meta={}, block=True, hidden=False)
|
||||
]
|
||||
assert c._parse("::: {.example .note}") == [
|
||||
Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None,
|
||||
|
@ -452,3 +473,31 @@ def test_example() -> None:
|
|||
Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None,
|
||||
content='', markup='', info='', meta={}, block=True, hidden=False)
|
||||
]
|
||||
assert c._parse("::: {.example}\n### foo: `code`\nbar\n:::\nbaz") == [
|
||||
Token(type='example_open', tag='div', nesting=1, map=[0, 3], markup=':::', info=' {.example}',
|
||||
block=True),
|
||||
Token(type='example_title_open', tag='h3', nesting=1, map=[1, 2], level=1, markup='###', block=True),
|
||||
Token(type='inline', tag='', nesting=0, map=[1, 2], level=2, content='foo: `code`', block=True,
|
||||
children=[
|
||||
Token(type='text', tag='', nesting=0, content='foo: '),
|
||||
Token(type='code_inline', tag='code', nesting=0, content='code', markup='`')
|
||||
]),
|
||||
Token(type='example_title_close', tag='h3', nesting=-1, level=1, markup='###', block=True),
|
||||
Token(type='paragraph_open', tag='p', nesting=1, map=[2, 3], level=1, block=True),
|
||||
Token(type='inline', tag='', nesting=0, map=[2, 3], level=2, content='bar', block=True,
|
||||
children=[
|
||||
Token(type='text', tag='', nesting=0, content='bar')
|
||||
]),
|
||||
Token(type='paragraph_close', tag='p', nesting=-1, level=1, block=True),
|
||||
Token(type='example_close', tag='div', nesting=-1, markup=':::', block=True),
|
||||
Token(type='paragraph_open', tag='p', nesting=1, map=[4, 5], block=True),
|
||||
Token(type='inline', tag='', nesting=0, map=[4, 5], level=1, content='baz', block=True,
|
||||
children=[
|
||||
Token(type='text', tag='', nesting=0, content='baz')
|
||||
]),
|
||||
Token(type='paragraph_close', tag='p', nesting=-1, block=True)
|
||||
]
|
||||
|
||||
with pytest.raises(RuntimeError) as exc:
|
||||
c._parse("::: {.example}\n### foo\n### bar\n:::")
|
||||
assert exc.value.args[0] == 'unexpected non-title heading in example in line 3'
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tboot";
|
||||
version = "1.10.5";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/tboot/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-O0vhbAPLwlBx7x1L2gtP1VDu2G2sbH9+/fAkI8VRs5M=";
|
||||
sha256 = "sha256-/hnuDEhnL7jIdZ4oUxDo1YYGseDoR+rKH9BhuXGiiQQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl trousers zlib ];
|
||||
|
|
2139
pkgs/tools/system/amdgpu_top/Cargo.lock
generated
Normal file
2139
pkgs/tools/system/amdgpu_top/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
25
pkgs/tools/system/amdgpu_top/default.nix
Normal file
25
pkgs/tools/system/amdgpu_top/default.nix
Normal file
|
@ -0,0 +1,25 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub, libdrm }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "amdgpu_top";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Umio-Yasuno";
|
||||
repo = pname;
|
||||
rev = "v${version}-stable";
|
||||
hash = "sha256-cdKUj0pUlXxMNx0jypuov4hX3CISTDaSQh+KFB5R8ys=";
|
||||
};
|
||||
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
|
||||
buildInputs = [ libdrm ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to display AMDGPU usage";
|
||||
homepage = "https://github.com/Umio-Yasuno/amdgpu_top";
|
||||
changelog = "https://github.com/Umio-Yasuno/amdgpu_top/releases";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ geri1701 ];
|
||||
};
|
||||
}
|
|
@ -55,7 +55,6 @@ stdenv.mkDerivation rec {
|
|||
"--enable-gtk-doc"
|
||||
"--with-dbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d"
|
||||
"--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
|
||||
"--disable-werror"
|
||||
];
|
||||
|
||||
preConfigure = "NO_CONFIGURE=1 ./autogen.sh";
|
||||
|
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epubcheck";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip";
|
||||
sha256 = "sha256-Lcd+rLO4G2i5FTq/okjKQ1+EIfuZ8khkCijgeDxxwq8=";
|
||||
sha256 = "sha256-X4/aIcGd/heNjpTurRHYcawcoZW/utTxYHcUtktsH8o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
@ -1,26 +1,21 @@
|
|||
{ lib, stdenv, fetchurl, fixDarwinDylibNames, which
|
||||
, enableShared ? !(stdenv.hostPlatform.isStatic)
|
||||
, enableStatic ? stdenv.hostPlatform.isStatic
|
||||
# for passthru.tests
|
||||
, nix
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lowdown";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
outputs = [ "out" "lib" "dev" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
|
||||
sha512 = "2izqgzk677y511kms09c0hgar2ax5cd5hspr8djsa3qykaxq0688xkgfad00bl6j0jpixna714ipvqa0gxm480iz2sma7qhdgr6bl4x";
|
||||
sha512 = "2jsskdrx035vy5kyb371swcn23vj7ww1fmrsalmyp1jc3459vgh2lk4nlvrw74r93z9yyzsq9vra2sspx173cpjlr8lyyqdw5h91lms";
|
||||
};
|
||||
|
||||
# Upstream always passes GNU-style "soname", but cctools expects "install_name".
|
||||
# Whatever name is inserted will be replaced by fixDarwinDylibNames.
|
||||
# https://github.com/kristapsdz/lowdown/issues/87
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace Makefile --replace soname install_name
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ which ]
|
||||
++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
|
||||
|
||||
|
@ -49,20 +44,23 @@ stdenv.mkDerivation rec {
|
|||
"install_static"
|
||||
];
|
||||
|
||||
# Fix lib extension so that fixDarwinDylibNames detects it
|
||||
# Symlink liblowdown.so to liblowdown.so.1 (or equivalent)
|
||||
# Fix lib extension so that fixDarwinDylibNames detects it, see
|
||||
# <https://github.com/kristapsdz/lowdown/issues/87#issuecomment-1532243650>.
|
||||
postInstall =
|
||||
let
|
||||
inherit (stdenv.hostPlatform.extensions) sharedLibrary;
|
||||
in
|
||||
|
||||
lib.optionalString (enableShared && stdenv.isDarwin) ''
|
||||
mv $lib/lib/liblowdown.{so.1,1.dylib}
|
||||
'' + lib.optionalString enableShared ''
|
||||
ln -s $lib/lib/liblowdown*${sharedLibrary}* $lib/lib/liblowdown${sharedLibrary}
|
||||
darwinDylib="$lib/lib/liblowdown.2.dylib"
|
||||
mv "$lib/lib/liblowdown.so.2" "$darwinDylib"
|
||||
|
||||
# Make sure we are re-creating a symbolic link here
|
||||
test -L "$lib/lib/liblowdown.so"
|
||||
ln -s "$darwinDylib" "$lib/lib/liblowdown.dylib"
|
||||
'';
|
||||
|
||||
doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform;
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
echo '# TEST' > test.md
|
||||
|
@ -70,9 +68,14 @@ stdenv.mkDerivation rec {
|
|||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
|
||||
doCheck = true;
|
||||
checkTarget = "regress";
|
||||
|
||||
passthru.tests = {
|
||||
# most important consumer in nixpkgs
|
||||
inherit nix;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://kristaps.bsd.lv/lowdown/";
|
||||
description = "Simple markdown translator";
|
||||
|
|
|
@ -1196,6 +1196,7 @@ mapAliases ({
|
|||
packet-cli = metal-cli; # Added 2021-10-25
|
||||
paperless = paperless-ngx; # Added 2021-06-06
|
||||
paperless-ng = paperless-ngx; # Added 2022-04-11
|
||||
paper-note = throw "paper-note has been removed: abandoned by upstream"; # Added 2023-05-03
|
||||
parity = openethereum; # Added 2020-08-01
|
||||
parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # Added 2022-01-10
|
||||
parquet-cpp = throw "'parquet-cpp' has been renamed to/replaced by 'arrow-cpp'"; # Converted to throw 2022-02-22
|
||||
|
|
|
@ -1276,6 +1276,8 @@ with pkgs;
|
|||
|
||||
acpica-tools = callPackage ../tools/system/acpica-tools { };
|
||||
|
||||
amdgpu_top = callPackage ../tools/system/amdgpu_top { };
|
||||
|
||||
acquire = with python3Packages; toPythonApplication acquire;
|
||||
|
||||
act = callPackage ../development/tools/misc/act { };
|
||||
|
@ -10923,8 +10925,6 @@ with pkgs;
|
|||
|
||||
pamtester = callPackage ../tools/security/pamtester { };
|
||||
|
||||
paper-note = callPackage ../applications/office/paper-note { };
|
||||
|
||||
paperless-ngx = callPackage ../applications/office/paperless-ngx { };
|
||||
|
||||
paperoni = callPackage ../tools/text/paperoni {
|
||||
|
@ -35732,6 +35732,8 @@ with pkgs;
|
|||
|
||||
doomseeker = qt5.callPackage ../games/doom-ports/doomseeker { };
|
||||
|
||||
doomretro = callPackage ../games/doom-ports/doomretro { };
|
||||
|
||||
chocolate-doom = callPackage ../games/doom-ports/chocolate-doom { };
|
||||
|
||||
crispy-doom = callPackage ../games/doom-ports/crispy-doom { };
|
||||
|
@ -39609,7 +39611,8 @@ with pkgs;
|
|||
|
||||
wmutils-opt = callPackage ../tools/X11/wmutils-opt { };
|
||||
|
||||
inherit (callPackage ../servers/web-apps/wordpress {}) wordpress wordpress6_1;
|
||||
inherit (callPackage ../servers/web-apps/wordpress {})
|
||||
wordpress wordpress6_1 wordpress6_2;
|
||||
|
||||
wordpressPackages = ( callPackage ../servers/web-apps/wordpress/packages {
|
||||
plugins = lib.importJSON ../servers/web-apps/wordpress/packages/plugins.json;
|
||||
|
|
|
@ -186,6 +186,9 @@ in
|
|||
riscv64 = mapTestOnCross lib.systems.examples.riscv64 linuxCommon;
|
||||
riscv32 = mapTestOnCross lib.systems.examples.riscv32 linuxCommon;
|
||||
|
||||
/* Linux on LoongArch */
|
||||
loongarch64-linux = mapTestOnCross lib.systems.examples.loongarch64-linux linuxCommon;
|
||||
|
||||
m68k = mapTestOnCross lib.systems.examples.m68k linuxCommon;
|
||||
s390x = mapTestOnCross lib.systems.examples.s390x linuxCommon;
|
||||
|
||||
|
|
Loading…
Reference in a new issue