cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2023-09-08 00:02:13 +00:00 committed by GitHub
commit 542aa87231
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
54 changed files with 1629 additions and 961 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

139
doc/languages-frameworks/lisp.section.md
View file

@ -1,36 +1,32 @@
# lisp-modules {#lisp} # lisp-modules {#lisp}
This document describes the Nixpkgs infrastructure for building Common Lisp This document describes the Nixpkgs infrastructure for building Common Lisp
libraries that use ASDF (Another System Definition Facility). It lives in systems that use [ASDF](https://asdf.common-lisp.dev/) (Another System
`pkgs/development/lisp-modules`. Definition Facility). It lives in `pkgs/development/lisp-modules`.
## Overview {#lisp-overview} ## Overview {#lisp-overview}
The main entry point of the API are the Common Lisp implementation packages The main entry point of the API are the Common Lisp implementation packages
(e.g. `abcl`, `ccl`, `clasp-common-lisp`, `clisp` `ecl`, `sbcl`) themselves (e.g. `abcl`, `ccl`, `clasp-common-lisp`, `clisp`, `ecl`,
themselves. They have the `pkgs` and `withPackages` attributes, which can be `sbcl`). They have the `pkgs` and `withPackages` attributes, which can be used
used to discover available packages and to build wrappers, respectively. to discover available packages and to build wrappers, respectively.
The `pkgs` attribute set contains packages that were automatically imported from The `pkgs` attribute set contains packages that were automatically
Quicklisp, and any other manually defined ones. Not every package works for all [imported](#lisp-importing-packages-from-quicklisp) from Quicklisp, and any
the CL implementations (e.g. `nyxt` only makes sense for `sbcl`). other [manually defined](#lisp-defining-packages-inside) ones. Not every package
works for all the CL implementations (e.g. `nyxt` only makes sense for `sbcl`).
The `withPackages` function is of primary utility. It is used to build runnable The `withPackages` function is of primary utility. It is used to build
wrappers, with a pinned and pre-built ASDF FASL available in the `ASDF` [runnable wrappers](#lisp-building-wrappers), with a pinned and pre-built
environment variable, and `CL_SOURCE_REGISTRY`/`ASDF_OUTPUT_TRANSLATIONS` [ASDF FASL](#lisp-loading-asdf) available in the `ASDF` environment variable,
configured to find the desired systems on runtime. and `CL_SOURCE_REGISTRY`/`ASDF_OUTPUT_TRANSLATIONS` configured to
[find the desired systems on runtime](#lisp-loading-systems).
With a few exceptions, the primary thing that the infrastructure does is to run
`asdf:load-system` for each system specified in the `systems` argument to
`build-asdf-system`, and save the FASLs to the Nix store. Then, it makes these
FASLs available to wrappers. Any other use-cases, such as producing SBCL
executables with `sb-ext:save-lisp-and-die`, are achieved via overriding the
`buildPhase` etc.
In addition, Lisps have the `withOverrides` function, which can be used to In addition, Lisps have the `withOverrides` function, which can be used to
substitute any package in the scope of their `pkgs`. This will be useful [substitute](#lisp-including-external-pkg-in-scope) any package in the scope of
together with `overrideLispAttrs` when dealing with slashy ASDF systems, because their `pkgs`. This will also be useful together with `overrideLispAttrs` when
they should stay in the main package and be build by specifying the `systems` [dealing with slashy systems](#lisp-dealing-with-slashy-systems), because they
should stay in the main package and be built by specifying the `systems`
argument to `build-asdf-system`. argument to `build-asdf-system`.
## The 90% use case example {#lisp-use-case-example} ## The 90% use case example {#lisp-use-case-example}
@ -42,7 +38,7 @@ The most common way to use the library is to run ad-hoc wrappers like this:
Then, in a shell: Then, in a shell:
``` ```
$ result/bin/sbcl $ sbcl
* (load (sb-ext:posix-getenv "ASDF")) * (load (sb-ext:posix-getenv "ASDF"))
* (asdf:load-system 'alexandria) * (asdf:load-system 'alexandria)
``` ```
@ -53,7 +49,7 @@ Also one can create a `pkgs.mkShell` environment in `shell.nix`/`flake.nix`:
let let
sbcl' = sbcl.withPackages (ps: [ ps.alexandria ]); sbcl' = sbcl.withPackages (ps: [ ps.alexandria ]);
in mkShell { in mkShell {
buildInputs = [ sbcl' ]; packages = [ sbcl' ];
} }
``` ```
@ -67,32 +63,37 @@ buildPhase = ''
## Importing packages from Quicklisp {#lisp-importing-packages-from-quicklisp} ## Importing packages from Quicklisp {#lisp-importing-packages-from-quicklisp}
The library is able to very quickly import all the packages distributed by To save some work of writing Nix expressions, there is a script that imports all
Quicklisp by parsing its `releases.txt` and `systems.txt` files. These files are the packages distributed by Quicklisp into `imported.nix`. This works by parsing
available from [http://beta.quicklisp.org/dist/quicklisp.txt]. its `releases.txt` and `systems.txt` files, which are published every couple of
months on [quicklisp.org](http://beta.quicklisp.org/dist/quicklisp.txt).
The import process is implemented in the `import` directory as Common Lisp The import process is implemented in the `import` directory as Common Lisp
functions in the `org.lispbuilds.nix` ASDF system. To run the script, one can code in the `org.lispbuilds.nix` ASDF system. To run the script, one can
execute `ql-import.lisp`: execute `ql-import.lisp`:
``` ```
cd pkgs/development/lisp-modules
nix-shell --run 'sbcl --script ql-import.lisp' nix-shell --run 'sbcl --script ql-import.lisp'
``` ```
The script will: The script will:
1. Download the latest Quicklisp `systems.txt` and `releases.txt` files 1. Download the latest Quicklisp `systems.txt` and `releases.txt` files
2. Generate an SQLite database of all QL systems in `packages.sqlite` 2. Generate a temporary SQLite database of all QL systems in `packages.sqlite`
3. Generate an `imported.nix` file from the database 3. Generate an `imported.nix` file from the database
The maintainer's job there is to: (The `packages.sqlite` file can be deleted at will, because it is regenerated
each time the script runs.)
1. Re-run the `ql-import.lisp` script The maintainer's job is to:
2. Add missing native dependencies in `ql.nix`
3. For packages that still don't build, package them manually in `packages.nix` 1. Re-run the `ql-import.lisp` script when there is a new Quicklisp release
2. [Add any missing native dependencies](#lisp-quicklisp-adding-native-dependencies) in `ql.nix`
3. For packages that still don't build, [package them manually](#lisp-defining-packages-inside) in `packages.nix`
Also, the `imported.nix` file **must not be edited manually**! It should only be Also, the `imported.nix` file **must not be edited manually**! It should only be
generated as described in this section. generated as described in this section (by running `ql-import.lisp`).
### Adding native dependencies {#lisp-quicklisp-adding-native-dependencies} ### Adding native dependencies {#lisp-quicklisp-adding-native-dependencies}
@ -108,7 +109,7 @@ Packages defined in `packages.nix` contain these dependencies naturally.
The previous implementation of `lisp-modules` didn't fully trust the Quicklisp The previous implementation of `lisp-modules` didn't fully trust the Quicklisp
data, because there were times where the dependencies specified were not data, because there were times where the dependencies specified were not
complete, and caused broken builds. It instead used a `nix-shell` environment to complete and caused broken builds. It instead used a `nix-shell` environment to
discover real dependencies by using the ASDF APIs. discover real dependencies by using the ASDF APIs.
The current implementation has chosen to trust this data, because it's faster to The current implementation has chosen to trust this data, because it's faster to
@ -126,33 +127,46 @@ replace the `systems` attribute of the affected packages. (See the definition of
During Quicklisp import: During Quicklisp import:
- `+` in names are converted to `_plus{_,}`: `cl+ssl`->`cl_plus_ssl`, `alexandria+`->`alexandria_plus` - `+` in names is converted to `_plus{_,}`: `cl+ssl`->`cl_plus_ssl`, `alexandria+`->`alexandria_plus`
- `.` to `_dot_`: `iolib.base`->`iolib_dot_base` - `.` in names is converted to `_dot_`: `iolib.base`->`iolib_dot_base`
- names starting with a number have a `_` prepended (`3d-vectors`->`_3d-vectors`) - names starting with a number have a `_` prepended (`3d-vectors`->`_3d-vectors`)
- `_` in names is converted to `__` for reversibility - `_` in names is converted to `__` for reversibility
## Defining packages manually inside Nixpkgs {#lisp-defining-packages-inside} ## Defining packages manually inside Nixpkgs {#lisp-defining-packages-inside}
New packages, that for some reason are not in Quicklisp, and so cannot be Packages that for some reason are not in Quicklisp, and so cannot be
auto-imported, can be written in the `packages.nix` file. auto-imported, or don't work straight from the import, are defined in the
`packages.nix` file.
In that file, use the `build-asdf-system` function, which is a wrapper around In that file, use the `build-asdf-system` function, which is a wrapper around
`mkDerivation` for building ASDF systems. Various other hacks are present, such `mkDerivation` for building ASDF systems. Various other hacks are present, such
as `build-with-compile-into-pwd` for systems which create files during as `build-with-compile-into-pwd` for systems which create files during
compilation. compilation (such as cl-unicode).
The `build-asdf-system` function is documented with comments in The `build-asdf-system` function is documented
`nix-cl.nix`. Also, `packages.nix` is full of examples of how to use it. [here](#lisp-defining-packages-outside). Also, `packages.nix` is full of
examples of how to use it.
## Defining packages manually outside Nixpkgs {#lisp-defining-packages-outside} ## Defining packages manually outside Nixpkgs {#lisp-defining-packages-outside}
Lisp derivations (`abcl`, `sbcl` etc.) also export the `buildASDFSystem` Lisp derivations (`abcl`, `sbcl` etc.) also export the `buildASDFSystem`
function, which is the same as `build-asdf-system`, except for the `lisp` function, which is similar to `build-asdf-system` from `packages.nix`, but is
argument which is set to the given CL implementation. part of the public API.
It takes the following arguments:
- `pname`: the package name
- `version`: the package version
- `src`: the package source
- `patches`: patches to apply to the source before build
- `nativeLibs`: native libraries used by CFFI and grovelling
- `javaLibs`: Java libraries for ABCL
- `lispLibs`: dependencies on other packages build with `buildASDFSystem`
- `systems`: list of systems to build
It can be used to define packages outside Nixpkgs, and, for example, add them It can be used to define packages outside Nixpkgs, and, for example, add them
into the package scope with `withOverrides` which will be discussed later on. into the package scope with `withOverrides`.
### Including an external package in scope {#lisp-including-external-pkg-in-scope} ### Including an external package in scope {#lisp-including-external-pkg-in-scope}
@ -198,28 +212,6 @@ sbcl.pkgs.alexandria.overrideLispAttrs (oldAttrs: rec {
}) })
``` ```
## Overriding packages in scope {#lisp-overriding-packages-in-scope}
Packages can be woven into a new scope by using `withOverrides`:
```
let
sbcl' = sbcl.withOverrides (self: super: {
alexandria = super.alexandria.overrideLispAttrs (oldAttrs: rec {
pname = "alexandria";
version = "1.4";
src = fetchFromGitLab {
domain = "gitlab.common-lisp.net";
owner = "alexandria";
repo = "alexandria";
rev = "v${version}";
hash = "sha256-1Hzxt65dZvgOFIljjjlSGgKYkj+YBLwJCACi5DZsKmQ=";
};
});
});
in builtins.elemAt sbcl'.pkgs.bordeaux-threads.lispLibs 0
```
### Dealing with slashy systems {#lisp-dealing-with-slashy-systems} ### Dealing with slashy systems {#lisp-dealing-with-slashy-systems}
Slashy (secondary) systems should not exist in their own packages! Instead, they Slashy (secondary) systems should not exist in their own packages! Instead, they
@ -240,8 +232,8 @@ ecl.pkgs.alexandria.overrideLispAttrs (oldAttrs: {
}) })
``` ```
See the respective section on using `withOverrides` for how to weave it back See the [respective section](#lisp-including-external-pkg-in-scope) on using
into `ecl.pkgs`. `withOverrides` for how to weave it back into `ecl.pkgs`.
Note that sometimes the slashy systems might not only have more dependencies Note that sometimes the slashy systems might not only have more dependencies
than the main one, but create a circular dependency between `.asd` than the main one, but create a circular dependency between `.asd`
@ -253,13 +245,16 @@ Wrappers can be built using the `withPackages` function of Common Lisp
implementations (`abcl`, `ecl`, `sbcl` etc.): implementations (`abcl`, `ecl`, `sbcl` etc.):
``` ```
sbcl.withPackages (ps: [ ps.alexandria ps.bordeaux-threads ]) nix-shell -p 'sbcl.withPackages (ps: [ ps.alexandria ps.bordeaux-threads ])'
``` ```
Such a wrapper can then be executed like this: Such a wrapper can then be used like this:
``` ```
result/bin/sbcl $ sbcl
* (load (sb-ext:posix-getenv "ASDF"))
* (asdf:load-system 'alexandria)
* (asdf:load-system 'bordeaux-threads)
``` ```
### Loading ASDF {#lisp-loading-asdf} ### Loading ASDF {#lisp-loading-asdf}

1
lib/systems/default.nix
View file

@ -224,6 +224,7 @@ rec {
gtkSupport = false; gtkSupport = false;
sdlSupport = false; sdlSupport = false;
pulseSupport = false; pulseSupport = false;
pipewireSupport = false;
smbdSupport = false; smbdSupport = false;
seccompSupport = false; seccompSupport = false;
enableDocs = false; enableDocs = false;

49
nixos/modules/programs/yazi.nix Normal file
View file

@ -0,0 +1,49 @@
{ config, lib, pkgs, ... }:
let
cfg = config.programs.yazi;
settingsFormat = pkgs.formats.toml { };
names = [ "yazi" "theme" "keymap" ];
in
{
options.programs.yazi = {
enable = lib.mkEnableOption (lib.mdDoc "yazi terminal file manager");
package = lib.mkPackageOptionMD pkgs "yazi" { };
settings = lib.mkOption {
type = with lib.types; submodule {
options = lib.listToAttrs (map
(name: lib.nameValuePair name (lib.mkOption {
inherit (settingsFormat) type;
default = { };
description = lib.mdDoc ''
Configuration included in `${name}.toml`.
See https://github.com/sxyazi/yazi/blob/v${cfg.package.version}/config/docs/${name}.md for documentation.
'';
}))
names);
};
default = { };
description = lib.mdDoc ''
Configuration included in `$YAZI_CONFIG_HOME`.
'';
};
};
config = lib.mkIf cfg.enable {
environment = {
systemPackages = [ cfg.package ];
variables.YAZI_CONFIG_HOME = "/etc/yazi/";
etc = lib.attrsets.mergeAttrsList (map
(name: lib.optionalAttrs (cfg.settings.${name} != { }) {
"yazi/${name}.toml".source = settingsFormat.generate "${name}.toml" cfg.settings.${name};
})
names);
};
};
meta.maintainers = with lib.maintainers; [ linsui ];
}

7
nixos/modules/services/backup/duplicati.nix
View file

@ -10,6 +10,8 @@ in
services.duplicati = { services.duplicati = {
enable = mkEnableOption (lib.mdDoc "Duplicati"); enable = mkEnableOption (lib.mdDoc "Duplicati");
package = mkPackageOptionMD pkgs "duplicati" { };
port = mkOption { port = mkOption {
default = 8200; default = 8200;
type = types.port; type = types.port;
@ -53,7 +55,7 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.duplicati ]; environment.systemPackages = [ cfg.package ];
systemd.services.duplicati = { systemd.services.duplicati = {
description = "Duplicati backup"; description = "Duplicati backup";
@ -63,7 +65,7 @@ in
{ {
User = cfg.user; User = cfg.user;
Group = "duplicati"; Group = "duplicati";
ExecStart = "${pkgs.duplicati}/bin/duplicati-server --webservice-interface=${cfg.interface} --webservice-port=${toString cfg.port} --server-datafolder=${cfg.dataDir}"; ExecStart = "${cfg.package}/bin/duplicati-server --webservice-interface=${cfg.interface} --webservice-port=${toString cfg.port} --server-datafolder=${cfg.dataDir}";
Restart = "on-failure"; Restart = "on-failure";
} }
(mkIf (cfg.dataDir == "/var/lib/duplicati") { (mkIf (cfg.dataDir == "/var/lib/duplicati") {
@ -83,4 +85,3 @@ in
}; };
} }

9
nixos/modules/services/hardware/openrgb.nix
View file

@ -17,7 +17,14 @@ in {
motherboard = mkOption { motherboard = mkOption {
type = types.nullOr (types.enum [ "amd" "intel" ]); type = types.nullOr (types.enum [ "amd" "intel" ]);
default = null; default = if config.hardware.cpu.intel.updateMicrocode then "intel"
else if config.hardware.cpu.amd.updateMicrocode then "amd"
else null;
defaultText = literalMD ''
if config.hardware.cpu.intel.updateMicrocode then "intel"
else if config.hardware.cpu.amd.updateMicrocode then "amd"
else null;
'';
description = lib.mdDoc "CPU family of motherboard. Allows for addition motherboard i2c support."; description = lib.mdDoc "CPU family of motherboard. Allows for addition motherboard i2c support.";
}; };

6
nixos/modules/services/web-servers/nginx/default.nix
View file

@ -578,11 +578,13 @@ in
}; };
}); });
default = []; default = [];
example = literalExpression ''[ example = literalExpression ''
[
{ addr = "10.0.0.12"; proxyProtocol = true; ssl = true; } { addr = "10.0.0.12"; proxyProtocol = true; ssl = true; }
{ addr = "0.0.0.0"; } { addr = "0.0.0.0"; }
{ addr = "[::0]"; } { addr = "[::0]"; }
]''; ]
'';
description = lib.mdDoc '' description = lib.mdDoc ''
If vhosts do not specify listen, use these addresses by default. If vhosts do not specify listen, use these addresses by default.
This option takes precedence over {option}`defaultListenAddresses` and This option takes precedence over {option}`defaultListenAddresses` and

2
pkgs/applications/audio/picard/default.nix
View file

@ -58,6 +58,8 @@ pythonPackages.buildPythonApplication rec {
pyyaml pyyaml
]; ];
setupPyGlobalFlags = [ "build" "--disable-autoupdate" ];
preCheck = '' preCheck = ''
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
''; '';

3
pkgs/applications/blockchains/clightning/default.nix
View file

@ -44,7 +44,8 @@ stdenv.mkDerivation rec {
tools/generate-wire.py \ tools/generate-wire.py \
tools/update-mocks.sh \ tools/update-mocks.sh \
tools/mockup.sh \ tools/mockup.sh \
devtools/sql-rewrite.py devtools/sql-rewrite.py \
plugins/clnrest/clnrest.py
'' else '' '' else ''
substituteInPlace external/libwally-core/tools/autogen.sh --replace gsed sed && \ substituteInPlace external/libwally-core/tools/autogen.sh --replace gsed sed && \
substituteInPlace external/libwally-core/configure.ac --replace gsed sed substituteInPlace external/libwally-core/configure.ac --replace gsed sed

1
pkgs/applications/editors/emacs/default.nix
View file

@ -10,6 +10,7 @@ lib.makeScope pkgs.newScope (self:
inherit stdenv; inherit stdenv;
inherit (pkgs.darwin) sigtool; inherit (pkgs.darwin) sigtool;
inherit (pkgs.darwin.apple_sdk_11_0) llvmPackages_14;
inherit (pkgs.darwin.apple_sdk_11_0.frameworks) inherit (pkgs.darwin.apple_sdk_11_0.frameworks)
Accelerate AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Accelerate AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit
Quartz QuartzCore UniformTypeIdentifiers WebKit; Quartz QuartzCore UniformTypeIdentifiers WebKit;

39
pkgs/applications/misc/chrysalis/default.nix
View file

@ -2,34 +2,40 @@
let let
pname = "chrysalis"; pname = "chrysalis";
version = "0.12.0"; version = "0.13.2";
in appimageTools.wrapAppImage rec {
name = "${pname}-${version}-binary"; name = "${pname}-${version}-binary";
src = appimageTools.extract {
inherit name;
src = fetchurl { src = fetchurl {
url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; url =
sha256 = "sha256-sQoEO1UII4Gbp7UbHCCyejsd94lkBbi93TH325EamFc="; "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}-x64.AppImage";
}; hash =
"sha512-WuItdQ/hDxbZZ3zulHI74NUkuYfesV/31rA1gPakCFgX2hpPrmKzwUez2vqt4N5qrGyphrR0bcelUatGZhOn5A==";
}; };
appimageContents = appimageTools.extract { inherit name src; };
in appimageTools.wrapType2 rec {
inherit name pname src;
multiArch = false; multiArch = false;
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.glib ];
p.glib
];
# Also expose the udev rules here, so it can be used as: # Also expose the udev rules here, so it can be used as:
# services.udev.packages = [ pkgs.chrysalis ]; # services.udev.packages = [ pkgs.chrysalis ];
# to allow non-root modifications to the keyboards. # to allow non-root modifications to the keyboards.
extraInstallCommands = '' extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname} mv $out/bin/{${name},${pname}}
mkdir -p $out/lib/udev/rules.d install -m 444 \
ln -s \ -D ${appimageContents}/usr/lib/chrysalis/resources/static/udev/60-kaleidoscope.rules \
--target-directory=$out/lib/udev/rules.d \ -t $out/lib/udev/rules.d
${src}/resources/static/udev/60-kaleidoscope.rules
install -m 444 \
-D ${appimageContents}/Chrysalis.desktop \
-t $out/share/applications
substituteInPlace \
$out/share/applications/Chrysalis.desktop \
--replace 'Exec=Chrysalis' 'Exec=${pname}'
cp -r ${appimageContents}/usr/share/icons $out/share
''; '';
meta = with lib; { meta = with lib; {
@ -38,5 +44,6 @@ in appimageTools.wrapAppImage rec {
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ aw ]; maintainers = with maintainers; [ aw ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
mainProgram = pname;
}; };
} }

12
pkgs/applications/misc/coursera-dl/default.nix
View file

@ -15,17 +15,23 @@ python3.pkgs.buildPythonApplication rec {
owner = "coursera-dl"; owner = "coursera-dl";
repo = "coursera-dl"; repo = "coursera-dl";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "0akgwzrsx094jj30n4bd2ilwgva4qxx38v3bgm69iqfxi8c2bqbk"; hash = "sha256-c+ElGIrd4ZhMfWtsNHrHRO3HaRRtEQuGlCSBrvPnbyo=";
}; };
patches = [ patches = [
(fetchpatch { (fetchpatch {
url = "https://github.com/coursera-dl/coursera-dl/commit/c8796e567698be166cb15f54e095140c1a9b567e.patch"; url = "https://github.com/coursera-dl/coursera-dl/commit/c8796e567698be166cb15f54e095140c1a9b567e.patch";
sha256 = "sha256:07ca6zdyw3ypv7yzfv2kzmjvv86h0rwzllcg0zky27qppqz917bv"; hash = "sha256-e52QPr4XH+HnB49R+nkG0KC9Zf1TbPf92dcP7ts3ih0=";
}) })
(fetchpatch { (fetchpatch {
url = "https://github.com/coursera-dl/coursera-dl/commit/6c221706ba828285ca7a30a08708e63e3891b36f.patch"; url = "https://github.com/coursera-dl/coursera-dl/commit/6c221706ba828285ca7a30a08708e63e3891b36f.patch";
sha256 = "sha256-/AKFvBPInSq/lsz+G0jVSl/ukVgCnt66oePAb+66AjI="; hash = "sha256-/AKFvBPInSq/lsz+G0jVSl/ukVgCnt66oePAb+66AjI=";
})
# https://github.com/coursera-dl/coursera-dl/pull/857
(fetchpatch {
name = "python-3.11-compatibility.patch";
url = "https://github.com/coursera-dl/coursera-dl/commit/7b0783433b6b198fca9e51405b18386f90790892.patch";
hash = "sha256-OpW8gqzrMyaE69qH3uGsB5TNQTYaO7pn3uJ7NU5SrcM=";
}) })
]; ];

6
pkgs/applications/misc/tandoor-recipes/common.nix
View file

@ -1,15 +1,15 @@
{ lib, fetchFromGitHub }: { lib, fetchFromGitHub }:
rec { rec {
version = "1.5.4"; version = "1.5.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TandoorRecipes"; owner = "TandoorRecipes";
repo = "recipes"; repo = "recipes";
rev = version; rev = version;
hash = "sha256-cVrgmRDzuLzl2+4UcrLRdrP6ZFWMkavu9OEogNas2fA="; hash = "sha256-3sitrTaIRKmjx+5vWOQXE0/Gu0jJ8VCpOq2cZZVLrbk=";
}; };
yarnHash = "sha256-0u9P/OsoThP8gonrzcnO5zhIboWMI1mTsXHlbt7l9oE="; yarnHash = "sha256-mZ8beCF+3mnpgKED0fP96RBbGbKNNXqEJkGSjgrEGBc=";
meta = with lib; { meta = with lib; {
homepage = "https://tandoor.dev/"; homepage = "https://tandoor.dev/";

5
pkgs/applications/networking/cluster/terraform/default.nix
View file

@ -64,6 +64,7 @@ let
zimbatm zimbatm
zowoq zowoq
techknowlogick techknowlogick
qjoly
]; ];
mainProgram = "terraform"; mainProgram = "terraform";
}; };
@ -167,8 +168,8 @@ rec {
mkTerraform = attrs: pluggable (generic attrs); mkTerraform = attrs: pluggable (generic attrs);
terraform_1 = mkTerraform { terraform_1 = mkTerraform {
version = "1.5.6"; version = "1.5.7";
hash = "sha256-vbV8Tmas7n1o8Q+DG9RrcfdAMa4bJsVg2SsTFH1TJ5M="; hash = "sha256-pIhwJfa71/gW7lw/KRFBO4Q5Z5YMcTt3r9kD25k8cqM=";
vendorHash = "sha256-lQgWNMBf+ioNxzAV7tnTQSIS840XdI9fg9duuwoK+U4="; vendorHash = "sha256-lQgWNMBf+ioNxzAV7tnTQSIS840XdI9fg9duuwoK+U4=";
patches = [ ./provider-path-0_15.patch ]; patches = [ ./provider-path-0_15.patch ];
passthru = { passthru = {

8
pkgs/applications/networking/mailreaders/neomutt/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which { lib, stdenv, fetchFromGitHub, fetchpatch, gettext, makeWrapper, tcl, which
, ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn2, libxml2, notmuch, openssl , ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn2, libxml2, notmuch, openssl
, lua, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib, lndir , lua, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib, lndir
, pkg-config, zstd, enableZstd ? true, enableMixmaster ? false, enableLua ? false , pkg-config, zstd, enableZstd ? true, enableMixmaster ? false, enableLua ? false
@ -19,6 +19,12 @@ stdenv.mkDerivation rec {
patches = [ patches = [
# https://github.com/neomutt/neomutt/issues/3773#issuecomment-1493295144 # https://github.com/neomutt/neomutt/issues/3773#issuecomment-1493295144
./fix-open-very-large-mailbox.patch ./fix-open-very-large-mailbox.patch
(fetchpatch {
name = "disable-incorrect-tests.patch";
url = "https://github.com/neomutt/neomutt/pull/3933.patch";
hash = "sha256-Plei063T8XyXF4/7/nAb6/4OyXz72vBAXHwls9WL1vM=";
excludes = [".github/workflows/macos.yml"];
})
]; ];
buildInputs = [ buildInputs = [

2
pkgs/applications/office/homebank/default.nix
View file

@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
homepage = "http://homebank.free.fr/"; homepage = "http://homebank.free.fr/";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ pSub ]; maintainers = with maintainers; [ pSub ];
platforms = platforms.linux; platforms = platforms.linux ++ platforms.darwin;
}; };
} }

6
pkgs/applications/office/treesheets/default.nix
View file

@ -12,13 +12,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "treesheets"; pname = "treesheets";
version = "unstable-2023-08-31"; version = "unstable-2023-09-07";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aardappel"; owner = "aardappel";
repo = "treesheets"; repo = "treesheets";
rev = "7f68776a9e072520c735479929efecd0d58f362d"; rev = "8d4073d2fedfc9952c3a06fd9d9be17ffeb50cf0";
sha256 = "AO0+Jqt2bEr3pwv417wey9zZWNX9rg0kDoO7qT+YPDg="; sha256 = "BpE402BL9PHx6g2gkeRBP4F2XLAjca3KpyXwFDWayio=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

37
pkgs/by-name/sc/screentest/package.nix Normal file
View file

@ -0,0 +1,37 @@
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, intltool
, pkg-config
, gtk2
}:
stdenv.mkDerivation (finalAttrs: {
pname = "screentest";
version = "unstable-2021-05-10";
src = fetchFromGitHub {
owner = "TobiX";
repo = "screentest";
rev = "780e6cbbbbd6ba93e246e7747fe593b40c4e2747";
hash = "sha256-TJ47c77vQ/aRBJ2uEiFLuAR4dd4CMEo+iAAx0HCFbmA=";
};
nativeBuildInputs = [
autoreconfHook
intltool
pkg-config
];
buildInputs = [ gtk2 ];
meta = with lib; {
description = "A simple screen testing tool";
homepage = "https://github.com/TobiX/screentest";
changelog = "https://github.com/TobiX/screentest/blob/${finalAttrs.src.rev}/NEWS";
license = licenses.gpl2Only;
maintainers = with maintainers; [ evils ];
platforms = platforms.unix;
};
})

4
pkgs/data/icons/elementary-xfce-icon-theme/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "elementary-xfce-icon-theme"; pname = "elementary-xfce-icon-theme";
version = "0.17"; version = "0.18";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shimmerproject"; owner = "shimmerproject";
repo = "elementary-xfce"; repo = "elementary-xfce";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-9WdVUCwHFX6wlu3++QqzV0RgTDYDnUYqK7yUl83liko="; sha256 = "sha256-OgQtqBrYKDgU4mhXLFO8YwiPv2lKqGSdZnfKCd9ri4g=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/data/misc/v2ray-domain-list-community/default.nix
View file

@ -3,12 +3,12 @@
let let
generator = pkgsBuildBuild.buildGoModule rec { generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community"; pname = "v2ray-domain-list-community";
version = "20230902035830"; version = "20230905081311";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "v2fly"; owner = "v2fly";
repo = "domain-list-community"; repo = "domain-list-community";
rev = version; rev = version;
hash = "sha256-xrx0+Zf9c5TYMWVKsAOJvI8x/ZoElnpjzLCPbkZjrzw="; hash = "sha256-lSiEfLfXnxou0pt9k6SFRnCm/CeUh2TBhLzi6BwJs7w=";
}; };
vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8="; vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8=";
meta = with lib; { meta = with lib; {

4
pkgs/data/themes/greybird/default.nix
View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "greybird"; pname = "greybird";
version = "3.23.2"; version = "3.23.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shimmerproject"; owner = "shimmerproject";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "h4sPjKpTufaunVP0d4Z5x/K+vRW1FpuLrMJjydx/a6w="; sha256 = "+MZQ3FThuRFEfoARsF09B7POwytS5RgTs9zYzIHVtfg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/development/compilers/erg/default.nix
View file

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "erg"; pname = "erg";
version = "0.6.19"; version = "0.6.20";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "erg-lang"; owner = "erg-lang";
repo = "erg"; repo = "erg";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-oA0AXTMEdfItvIZi1ITQ3ZR6JPSg9/1V6oeK2wcRERw="; hash = "sha256-xu6lbCdXUf5fqGoEGui44tVpVXlSOdfNFTyAurFRsDA=";
}; };
cargoHash = "sha256-dLMU48/umKHPV6iahazxOYA/eDvFWhzV9xveT2xQ+EE="; cargoHash = "sha256-pRuruqBXnSkTzEPTyZlX130z5IJPxEqWB2/38B7aCeI=";
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper

4
pkgs/development/compilers/go/1.19.nix
View file

@ -47,11 +47,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "go"; pname = "go";
version = "1.19.12"; version = "1.19.13";
src = fetchurl { src = fetchurl {
url = "https://go.dev/dl/go${version}.src.tar.gz"; url = "https://go.dev/dl/go${version}.src.tar.gz";
hash = "sha256-7l1Q4Kf9dLobE3y4eWCaqu+YgL9ytdF0IQDjiucrtVc="; hash = "sha256-zPNrU/sAJKAXNTw92yLB8AvHqAc8aqx5BC2iTuNENNM=";
}; };
strictDeps = true; strictDeps = true;

4
pkgs/development/compilers/go/1.21.nix
View file

@ -46,11 +46,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "go"; pname = "go";
version = "1.21.0"; version = "1.21.1";
src = fetchurl { src = fetchurl {
url = "https://go.dev/dl/go${version}.src.tar.gz"; url = "https://go.dev/dl/go${version}.src.tar.gz";
hash = "sha256-gY1G7ehWgt1VGtN47zek0kcAbxLsWbW3VWAdLOEUNpo="; hash = "sha256-v6Nr916aHpy725q8+dFwfkeb06B4gKiuNWTK7lcRy5k=";
}; };
strictDeps = true; strictDeps = true;

6
pkgs/development/interpreters/cyber/default.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cyber"; pname = "cyber";
version = "unstable-2023-09-01"; version = "unstable-2023-09-07";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fubark"; owner = "fubark";
repo = "cyber"; repo = "cyber";
rev = "1dae891be5ca1e64ad8ab9d60be0b30e1ef28439"; rev = "98022d0b8d266ee4f9d8c524a42abad3ad4134c9";
hash = "sha256-5GCIdk6XCJIXZLFsNMzo15Qhtj7zd/DOcARe8GXF2lc="; hash = "sha256-FEvNSHG/sMB1jBjbBaunGxb6/fSvKhKschFvghsW2Ls=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/development/libraries/boost/generic.nix
View file

@ -149,13 +149,11 @@ stdenv.mkDerivation {
description = "Collection of C++ libraries"; description = "Collection of C++ libraries";
license = licenses.boost; license = licenses.boost;
platforms = platforms.unix ++ platforms.windows; platforms = platforms.unix ++ platforms.windows;
maintainers = with maintainers; [ hjones2199 ];
broken =
# boost-context lacks support for the N32 ABI on mips64. The build # boost-context lacks support for the N32 ABI on mips64. The build
# will succeed, but packages depending on boost-context will fail with # will succeed, but packages depending on boost-context will fail with
# a very cryptic error message. # a very cryptic error message.
stdenv.hostPlatform.isMips64n32; badPlatforms = [ lib.systems.inspect.patterns.isMips64n32 ];
maintainers = with maintainers; [ hjones2199 ];
}; };
passthru = { passthru = {

10
pkgs/development/libraries/netcdf/default.nix
View file

@ -16,11 +16,11 @@ let
inherit (hdf5) mpiSupport mpi; inherit (hdf5) mpiSupport mpi;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "netcdf" + lib.optionalString mpiSupport "-mpi"; pname = "netcdf" + lib.optionalString mpiSupport "-mpi";
version = "4.9.0"; version = "4.9.2";
src = fetchurl { src = fetchurl {
url = "https://downloads.unidata.ucar.edu/netcdf-c/${version}/netcdf-c-${version}.tar.gz"; url = "https://downloads.unidata.ucar.edu/netcdf-c/${version}/netcdf-c-${version}.tar.gz";
hash = "sha256-TJVgIrecCOXhTu6N9RsTwo5hIcK35/qtwhs3WUlAC0k="; hash = "sha256-zxG6u725lj8J9VB54LAZ9tA3H1L44SZKW6jp/asabEg=";
}; };
postPatch = '' postPatch = ''
@ -30,6 +30,10 @@ in stdenv.mkDerivation rec {
for a in ncdap_test/Makefile.am ncdap_test/Makefile.in; do for a in ncdap_test/Makefile.am ncdap_test/Makefile.in; do
substituteInPlace $a --replace testurl.sh " " substituteInPlace $a --replace testurl.sh " "
done done
# Prevent building the tests from prepending `#!/bin/bash` and wiping out the patched shenbangs.
substituteInPlace nczarr_test/Makefile.in \
--replace '#!/bin/bash' '${stdenv.shell}'
''; '';
nativeBuildInputs = [ m4 removeReferencesTo ]; nativeBuildInputs = [ m4 removeReferencesTo ];
@ -65,7 +69,7 @@ in stdenv.mkDerivation rec {
remove-references-to -t ${stdenv.cc} "$(readlink -f $out/lib/libnetcdf.settings)" remove-references-to -t ${stdenv.cc} "$(readlink -f $out/lib/libnetcdf.settings)"
''; '';
doCheck = !(mpiSupport || (stdenv.isDarwin && stdenv.isAarch64)); doCheck = !mpiSupport;
nativeCheckInputs = [ unzip ]; nativeCheckInputs = [ unzip ];
preCheck = '' preCheck = ''

3
pkgs/development/node-packages/overrides.nix
View file

@ -308,12 +308,11 @@ final: prev: {
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
hash = "sha256-0NxYp+W2KbR3xEV2OCXCIL3RqkvLfJHNKgl/PxapVbI="; hash = "sha256-HiZtNHXkoSl3Q4cAerUs8c138AiDJJxzYNQT3I4+ea8=";
}; };
postInstall = with pkgs; '' postInstall = with pkgs; ''
wrapProgram "$out/bin/prisma" \ wrapProgram "$out/bin/prisma" \
--set PRISMA_SCHEMA_ENGINE_BINARY ${prisma-engines}/bin/schema-engine \ --set PRISMA_SCHEMA_ENGINE_BINARY ${prisma-engines}/bin/schema-engine \
--set PRISMA_MIGRATION_ENGINE_BINARY ${prisma-engines}/bin/schema-engine \
--set PRISMA_QUERY_ENGINE_BINARY ${prisma-engines}/bin/query-engine \ --set PRISMA_QUERY_ENGINE_BINARY ${prisma-engines}/bin/query-engine \
--set PRISMA_QUERY_ENGINE_LIBRARY ${lib.getLib prisma-engines}/lib/libquery_engine.node \ --set PRISMA_QUERY_ENGINE_LIBRARY ${lib.getLib prisma-engines}/lib/libquery_engine.node \
--set PRISMA_FMT_BINARY ${prisma-engines}/bin/prisma-fmt --set PRISMA_FMT_BINARY ${prisma-engines}/bin/prisma-fmt

4
pkgs/development/python-modules/ansible-runner/default.nix
View file

@ -23,14 +23,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ansible-runner"; pname = "ansible-runner";
version = "2.3.3"; version = "2.3.4";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-OP9jXkuUeR3ilWyB4mWDbsSWWzDp7jXXL88ycdxGuYs="; hash = "sha256-eaG9E02BPI6jdAWZxv2WGhFCXOd1fy/XJc9W1qGnI2w=";
}; };
patches = [ patches = [

4
pkgs/development/python-modules/dbus-fast/default.nix
View file

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dbus-fast"; pname = "dbus-fast";
version = "1.94.1"; version = "1.95.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices"; owner = "Bluetooth-Devices";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-Ttz6AX/NH6/NNLgU2cMSb5e1jV/cq0LGW3ENARRP7H4="; hash = "sha256-1Qi1pV92V1EIDU/kLhwPhr3Sa92xvcrpHUA36KfzM6w=";
}; };
# The project can build both an optimized cython version and an unoptimized # The project can build both an optimized cython version and an unoptimized

4
pkgs/development/python-modules/google-cloud-dataproc/default.nix
View file

@ -14,14 +14,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-dataproc"; pname = "google-cloud-dataproc";
version = "5.4.3"; version = "5.5.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-2cd8Uqpd31KuZXc22/tTEkApM/crq4SA/C0q/phpdAI="; hash = "sha256-XYjEmBMCkCUxKvAF2KNXwG72C6TMszLikFvLtnjJf14=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/idasen/default.nix
View file

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "idasen"; pname = "idasen";
version = "0.10.1"; version = "0.10.2";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "newAM"; owner = "newAM";
repo = "idasen"; repo = "idasen";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-1ZOnEPB3RJ6i3RwvpP3rG/i1M+Oa9fdfVhc3R+iFndQ="; hash = "sha256-aCAtZsHH1tkti2A7OWw9rV4vij1n6T+R8nMa/MRZuF8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/python-modules/karton-config-extractor/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "karton-config-extractor"; pname = "karton-config-extractor";
version = "2.1.1"; version = "2.2.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "CERT-Polska"; owner = "CERT-Polska";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-ep69Rrm8Ek0lkgctz6vDAZ1MZ8kWKZSyIvMMAmzTngA="; hash = "sha256-X2g/wgWLIY2ZIwH1l83EApyoeYQU5/MWq5S0qmYz+CA=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/pyaml/default.nix
View file

@ -7,11 +7,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyaml"; pname = "pyaml";
version = "23.9.1"; version = "23.9.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-TiAw9fwNO1eEo6eFO6eLGujelDxtulUHh2VQxb0Y84c="; sha256 = "sha256-s/mzgzUyfTIUyIg0kwA3OGwP5EV+GuGXGcVvqiOSIr0=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/pystache/default.nix
View file

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pystache"; pname = "pystache";
version = "0.6.4"; version = "0.6.5";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-4CkCIzBJsW4L4alPDHOJ6AViX2c1eD9FM7AgtaOKJ8c="; hash = "sha256-nyONWgbxiEPg1JHY5OKS3AP+1qVMsKXDS+N6P6qXMXQ=";
}; };
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";

6
pkgs/development/python-modules/sdds/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "sdds"; pname = "sdds";
version = "0.3.1"; version = "0.4.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -16,8 +16,8 @@ buildPythonPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pylhc"; owner = "pylhc";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/v${version}";
hash = "sha256-lb4awMQ7GE7m2N2yiCpJ976I2j8hE98/93zCX7Rp4qU="; hash = "sha256-8tnJAptTUsC0atxM9Dpn90drcprdWrs8fYoX8RDkLyQ=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/zeroconf/default.nix
View file

@ -15,7 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "zeroconf"; pname = "zeroconf";
version = "0.97.0"; version = "0.99.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "jstasiak"; owner = "jstasiak";
repo = "python-zeroconf"; repo = "python-zeroconf";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-qs0Ivkibxb6y9Bw2/Im9/2YabybqbJV0sORRg9RMV/M="; hash = "sha256-T9CDJIK/wMGExk+1Fahbq4gm+t+RRSUxca3SxkHXtJQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/development/tools/analysis/checkov/default.nix
View file

@ -22,14 +22,14 @@ with py.pkgs;
buildPythonApplication rec { buildPythonApplication rec {
pname = "checkov"; pname = "checkov";
version = "2.4.29"; version = "2.4.30";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bridgecrewio"; owner = "bridgecrewio";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-KnPbIfTSf1izk0E2JRdnYJbTDQbzr+d28HNIJrD6CWU="; hash = "sha256-sMNyeVaHdKI3IEN0/UR5XM72zDvMzyVAFMMcauan9J4=";
}; };
patches = [ patches = [

6
pkgs/development/tools/biome/default.nix
View file

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "biome"; pname = "biome";
version = "1.1.1"; version = "1.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "biomejs"; owner = "biomejs";
repo = "biome"; repo = "biome";
rev = "cli/v${version}"; rev = "cli/v${version}";
hash = "sha256-o4D/EwuSCluXfQBZ6LfebyKkR2xKDChV/wd/yZWbF34="; hash = "sha256-DE5D4WLO41JA9f3zy3sBiBQ8MOQCbosx6p9AqIM3ddc=";
}; };
cargoHash = "sha256-T8lIxFc9Jnx0Y8et8O+5JCwci+G3BwOYNjyFQd6fTRM="; cargoHash = "sha256-qP8CyGiWfytjAsxo6xS1ubowzwEqZN0vM/kQSOnS3rw=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

1788
pkgs/development/tools/database/prisma-engines/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

6
pkgs/development/tools/database/prisma-engines/default.nix
View file

@ -14,13 +14,13 @@
# function correctly. # function correctly.
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "prisma-engines"; pname = "prisma-engines";
version = "5.0.0"; version = "5.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "prisma"; owner = "prisma";
repo = "prisma-engines"; repo = "prisma-engines";
rev = version; rev = version;
sha256 = "sha256-/1wTqVvGUmN6PmoP6jXgUIB7QKkvkT5Rsg+L5zr4oN0="; sha256 = "sha256-7bZ6qy5AL7c2F6HfyM7/G36XTkSVsq+T+xxNlrBCXL4=";
}; };
# Use system openssl. # Use system openssl.
@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
"barrel-0.6.6-alpha.0" = "sha256-USh0lQ1z+3Spgc69bRFySUzhuY79qprLlEExTmYWFN8="; "barrel-0.6.6-alpha.0" = "sha256-USh0lQ1z+3Spgc69bRFySUzhuY79qprLlEExTmYWFN8=";
"graphql-parser-0.3.0" = "sha256-0ZAsj2mW6fCLhwTETucjbu4rPNzfbNiHu2wVTBlTNe4="; "graphql-parser-0.3.0" = "sha256-0ZAsj2mW6fCLhwTETucjbu4rPNzfbNiHu2wVTBlTNe4=";
"mysql_async-0.31.3" = "sha256-QIO9s0Upc0/1W7ux1RNJNGKqzO4gB4gMV3NoakAbxkQ="; "mysql_async-0.31.3" = "sha256-QIO9s0Upc0/1W7ux1RNJNGKqzO4gB4gMV3NoakAbxkQ=";
"postgres-native-tls-0.5.0" = "sha256-OYbtGYAvDDCTeYfhav/BI2LJSyMyUERD7xa8GA/57rI="; "postgres-native-tls-0.5.0" = "sha256-150GAIccGDAD+t/iWkLbXe4SblrW/KUcxkTy4Mrie5U=";
}; };
}; };

6
pkgs/development/tools/rust/cargo-component/default.nix
View file

@ -9,13 +9,13 @@
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
pname = "cargo-component"; pname = "cargo-component";
version = "unstable-2023-08-31"; version = "unstable-2023-09-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bytecodealliance"; owner = "bytecodealliance";
repo = "cargo-component"; repo = "cargo-component";
rev = "e57d1d1405ed2d76f1f3d8647480dea700379ff8"; rev = "aa6e3c1168273b5cf6221fa0206f07f2ffb8567d";
hash = "sha256-mN0GDyQemk71im074laeRDzWpVRUWJUFaRJenJGDwLs="; hash = "sha256-80076K+KfvFxyUxneEGAs8U7b+DoJLgUioIOTv+PWtI=";
}; };
cargoLock = { cargoLock = {

6
pkgs/development/tools/rust/cargo-expand/default.nix
View file

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-expand"; pname = "cargo-expand";
version = "1.0.67"; version = "1.0.68";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dtolnay"; owner = "dtolnay";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-l8cEtDb6FlYMqxJyxKxyuwjvLJdefiPRmDnVzRydFPM="; sha256 = "sha256-j1Gq0mK5Gcn66QBiLFkUrIe2EfL3jwx3dRlYKyco77s=";
}; };
cargoHash = "sha256-IWPd4gG4vI7peXxn4ti93fJeHfJoSxEr0+EKEJWw+IE="; cargoHash = "sha256-R4S765CjVLfeGg8Mmd0RJAtERIWj3opLbuWXcdOTFTc=";
meta = with lib; { meta = with lib; {
description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code";

16
pkgs/development/tools/rust/cargo-semver-checks/default.nix
View file

@ -2,8 +2,7 @@
, rustPlatform , rustPlatform
, fetchFromGitHub , fetchFromGitHub
, pkg-config , pkg-config
, libgit2 , libgit2_1_6
, openssl
, zlib , zlib
, stdenv , stdenv
, darwin , darwin
@ -12,22 +11,21 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-semver-checks"; pname = "cargo-semver-checks";
version = "0.22.1"; version = "0.23.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "obi1kenobi"; owner = "obi1kenobi";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Qb01NLWCD7nglceJdUTnlf/XtPHl1P6ukr+QsjxMMos="; hash = "sha256-/yMZ7ZmvCPFkrnuobbNGmgGNw16J8yT0DEUza7PD/Ow=";
}; };
cargoHash = "sha256-Qe/AGLoaCpbo001JkCN5qFytL4vWIPWhy3/pfBRoMmo="; cargoHash = "sha256-u8hja6+T3NwcNub181TfuhI9+QFuIrgqIBlb1lm8+yk=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
libgit2 libgit2_1_6
openssl
zlib zlib
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.Security
@ -37,13 +35,9 @@ rustPlatform.buildRustPackage rec {
git git
]; ];
# use system openssl
buildNoDefaultFeatures = true;
checkFlags = [ checkFlags = [
# requires nightly version of cargo-rustdoc # requires nightly version of cargo-rustdoc
"--skip=both_passing_manifest_path_and_directory_works" "--skip=both_passing_manifest_path_and_directory_works"
"--skip=rustdoc_cmd::tests"
"--skip=verify_binary_contains_lints" "--skip=verify_binary_contains_lints"
# requires internet access # requires internet access

6
pkgs/development/tools/turso-cli/default.nix
View file

@ -5,13 +5,13 @@
}: }:
buildGoModule rec { buildGoModule rec {
pname = "turso-cli"; pname = "turso-cli";
version = "0.81.0"; version = "0.82.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tursodatabase"; owner = "tursodatabase";
repo = "turso-cli"; repo = "turso-cli";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Ck1q3II/o7f+n0pdR5PzUXG2c6GZmQFeddofHzPTLlA="; hash = "sha256-JFuD10EhR1/nmYPMnNsR/8PUR5ScvWyS+vhg7ZO5TpI=";
}; };
vendorHash = "sha256-Y/pg8+w6B1YQqaZ5wj8QZxiBHAG0Tf3Zec5WlVyA4eI="; vendorHash = "sha256-Y/pg8+w6B1YQqaZ5wj8QZxiBHAG0Tf3Zec5WlVyA4eI=";
@ -23,6 +23,6 @@ buildGoModule rec {
description = "This is the command line interface (CLI) to Turso."; description = "This is the command line interface (CLI) to Turso.";
homepage = "https://turso.tech"; homepage = "https://turso.tech";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [zestsystem]; maintainers = with maintainers; [ zestsystem kashw2 ];
}; };
} }

47
pkgs/games/lunar-client/default.nix
View file

@ -1,45 +1,36 @@
{ appimageTools, lib, fetchurl, makeDesktopItem }: { appimageTools
, fetchurl
, lib
}:
let let
name = "lunar-client"; pname = "lunar-client";
version = "2.15.1"; version = "3.0.7";
desktopItem = makeDesktopItem {
name = "lunar-client";
exec = "lunar-client";
icon = "lunarclient";
comment = "Minecraft 1.7, 1.8, 1.12, 1.15, 1.16, 1.17, and 1.18 Client";
desktopName = "Lunar Client";
genericName = "Minecraft Client";
categories = [ "Game" ];
};
appimageContents = appimageTools.extract {
inherit name src;
};
src = fetchurl { src = fetchurl {
url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
name = "lunar-client.AppImage"; hash = "sha256-JpgKxCFXO+oK9D7gpk6AfiZLWzgFlijVWKhvfkBrJwY=";
hash = "sha256-8F6inLctNLCrTvO/f4IWHclpm/6vqW44NKbct0Epp4s=";
}; };
appimageContents = appimageTools.extract { inherit pname version src; };
in in
appimageTools.wrapType1 rec { appimageTools.wrapType2 rec {
inherit name src; inherit pname version src;
extraInstallCommands = '' extraInstallCommands = ''
mkdir -p $out/share/applications mv $out/bin/{${pname}-${version},${pname}}
cp ${desktopItem}/share/applications/* $out/share/applications install -Dm444 ${appimageContents}/launcher.desktop $out/share/applications/lunar-client.desktop
cp -r ${appimageContents}/usr/share/icons/ $out/share/ install -Dm444 ${appimageContents}/launcher.png $out/share/pixmaps/lunar-client.png
substituteInPlace $out/share/applications/lunar-client.desktop \
--replace 'Exec=AppRun --no-sandbox %U' 'Exec=lunar-client' \
--replace 'Icon=launcher' 'Icon=lunar-client'
''; '';
extraPkgs = pkgs: [ pkgs.libpulseaudio ];
meta = with lib; { meta = with lib; {
description = "Minecraft 1.7, 1.8, 1.12, 1.15, 1.16, 1.17, and 1.18 Client"; description = "Free Minecraft client with mods, cosmetics, and performance boost.";
homepage = "https://www.lunarclient.com/"; homepage = "https://www.lunarclient.com/";
license = with licenses; [ unfree ]; license = with licenses; [ unfree ];
maintainers = with maintainers; [ zyansheep Technical27 ]; maintainers = with maintainers; [ zyansheep Technical27 surfaceflinger ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };
} }

6
pkgs/servers/apache-airflow/default.nix
View file

@ -43,12 +43,14 @@ let
in in
# See note in ./python-package.nix for # See note in ./python-package.nix for
# instructions on manually testing the web UI # instructions on manually testing the web UI
with python.pkgs; (toPythonApplication apache-airflow).overrideAttrs (_:{ with python.pkgs; (toPythonApplication apache-airflow).overrideAttrs (previousAttrs: {
# Provide access to airflow's modified python package set # Provide access to airflow's modified python package set
# for the cases where external scripts need to import # for the cases where external scripts need to import
# airflow modules, though *caveat emptor* because many of # airflow modules, though *caveat emptor* because many of
# these packages will not be built by hydra and many will # these packages will not be built by hydra and many will
# not work at all due to the unexpected version overrides # not work at all due to the unexpected version overrides
# here. # here.
passthru.pythonPackages = python.pkgs; passthru = (previousAttrs.passthru or { }) // {
pythonPackages = python.pkgs;
};
}) })

20
pkgs/tools/backup/duplicity/default.nix
View file

@ -1,4 +1,5 @@
{ lib, stdenv { lib
, stdenv
, fetchFromGitLab , fetchFromGitLab
, python3 , python3
, librsync , librsync
@ -11,10 +12,8 @@
, makeWrapper , makeWrapper
, gettext , gettext
}: }:
let
pythonPackages = python3.pkgs; python3.pkgs.buildPythonApplication rec {
in
pythonPackages.buildPythonApplication rec {
pname = "duplicity"; pname = "duplicity";
version = "0.8.23"; version = "0.8.23";
@ -51,14 +50,15 @@ pythonPackages.buildPythonApplication rec {
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
gettext gettext
pythonPackages.wrapPython python3.pkgs.wrapPython
pythonPackages.setuptools-scm python3.pkgs.setuptools-scm
]; ];
buildInputs = [ buildInputs = [
librsync librsync
]; ];
pythonPath = with pythonPackages; [ pythonPath = with python3.pkgs; [
b2sdk b2sdk
boto3 boto3
cffi cffi
@ -82,7 +82,7 @@ pythonPackages.buildPythonApplication rec {
par2cmdline # Add 'par2' to PATH. par2cmdline # Add 'par2' to PATH.
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
util-linux # Add 'setsid' to PATH. util-linux # Add 'setsid' to PATH.
] ++ (with pythonPackages; [ ] ++ (with python3.pkgs; [
lockfile lockfile
mock mock
pexpect pexpect
@ -127,6 +127,6 @@ pythonPackages.buildPythonApplication rec {
description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; description = "Encrypted bandwidth-efficient backup using the rsync algorithm";
homepage = "https://duplicity.gitlab.io/duplicity-web/"; homepage = "https://duplicity.gitlab.io/duplicity-web/";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
platforms = platforms.unix; maintainers = with maintainers; [ ];
}; };
} }

4
pkgs/tools/games/scarab/default.nix
View file

@ -16,13 +16,13 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "scarab"; pname = "scarab";
version = "1.34.0.0"; version = "2.1.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fifty-six"; owner = "fifty-six";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-7SsByXV6HwZnT2VdjzeTZtRuktySxkXb7FulY5RPLEs="; sha256 = "sha256-TbsCj30ZlZmm+i/k31eo9X+XE9Zu13uL9QZOGaRm9zs=";
}; };
nugetDeps = ./deps.nix; nugetDeps = ./deps.nix;

75
pkgs/tools/games/scarab/deps.nix generated
View file

@ -2,33 +2,48 @@
# Please dont edit it manually, your changes might get overwritten! # Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [ { fetchNuGet }: [
(fetchNuGet { pname = "Avalonia"; version = "11.0.999-cibuild0036218-beta"; sha256 = "02nsmz69jc38rh73vb7gvagfxy1wipdmgc75ddgjag17xraip5r6"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/f990ff61-c538-476f-9f8c-0e9691a4ee55/nuget/v3/flat2/avalonia/11.0.999-cibuild0036218-beta/avalonia.11.0.999-cibuild0036218-beta.nupkg"; }) (fetchNuGet { pname = "Avalonia"; version = "11.0.0"; sha256 = "0wfbwrr8p5hg9f809d44gh2zfkfwnwayfw84vs33hh7ms0r380gd"; })
(fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; })
(fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.19"; sha256 = "1vlhyjb2g98hh5gnisg4bdl9p93x8lmnkc97d24hpxgflcd7szs7"; }) (fetchNuGet { pname = "Avalonia.AvaloniaEdit"; version = "11.0.0"; sha256 = "12ibz472083iiz5zskd1ivigggbl0d9yv3nazgw17s97nmnl2lpj"; })
(fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.999-cibuild0036218-beta"; sha256 = "1nxlmywaw6h9vqdr17l0ryyxiln50zhwhj1p2n38x4anawl33pjx"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/f990ff61-c538-476f-9f8c-0e9691a4ee55/nuget/v3/flat2/avalonia.controls.colorpicker/11.0.999-cibuild0036218-beta/avalonia.controls.colorpicker.11.0.999-cibuild0036218-beta.nupkg"; }) (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.28"; sha256 = "0d9hyc1zmyvzlb320arwrv12ncp45llq98hibv711b7ibm11dm7c"; })
(fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.999-cibuild0036218-beta"; sha256 = "0qsbmipmnn1yfvs6ahniy0nyllfhdw07cas18icj2kqp8lj8km3a"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/f990ff61-c538-476f-9f8c-0e9691a4ee55/nuget/v3/flat2/avalonia.controls.datagrid/11.0.999-cibuild0036218-beta/avalonia.controls.datagrid.11.0.999-cibuild0036218-beta.nupkg"; }) (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.0"; sha256 = "06wgzhxkivlaxkn8p61wainsprml2g1q4jmvy9fpn64qnfywjdn7"; })
(fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.999-cibuild0036218-beta"; sha256 = "0nrg18aqwibqdik89igvs67217306j27npnmlqqx8izcs0wx9z5x"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/f990ff61-c538-476f-9f8c-0e9691a4ee55/nuget/v3/flat2/avalonia.desktop/11.0.999-cibuild0036218-beta/avalonia.desktop.11.0.999-cibuild0036218-beta.nupkg"; }) (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.0"; sha256 = "0qlcdx4w1pcljgs7sfbn5xmmnqwp2m0fqyswrgz6c8cvjzcfsjsj"; })
(fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.999-cibuild0036218-beta"; sha256 = "1lwd3s19a7jyk78ann8rvxy3gkykg40r1wvqj6dv1353vbyamw2f"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/f990ff61-c538-476f-9f8c-0e9691a4ee55/nuget/v3/flat2/avalonia.diagnostics/11.0.999-cibuild0036218-beta/avalonia.diagnostics.11.0.999-cibuild0036218-beta.nupkg"; }) (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.0"; sha256 = "08y31b357fax7c1ggwhjsfwgaj6zkm2abhpc6amlmk6ci4zn12lf"; })
(fetchNuGet { pname = "Avalonia.Fonts.Inter"; version = "11.0.999-cibuild0036218-beta"; sha256 = "0wsppw75yq0n76d6in0cskqpydi2gsaivz0zy13z2d7himj9cz0f"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/f990ff61-c538-476f-9f8c-0e9691a4ee55/nuget/v3/flat2/avalonia.fonts.inter/11.0.999-cibuild0036218-beta/avalonia.fonts.inter.11.0.999-cibuild0036218-beta.nupkg"; }) (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.0"; sha256 = "134xl19rfswnz75a1mhil9yqy8haqa788rmd1p1kk6ibjbhb3np9"; })
(fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.999-cibuild0036218-beta"; sha256 = "114xibqkrwmmfq3p4xc7q719cgkgzml5cc0wl440c415nk551bj7"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/f990ff61-c538-476f-9f8c-0e9691a4ee55/nuget/v3/flat2/avalonia.freedesktop/11.0.999-cibuild0036218-beta/avalonia.freedesktop.11.0.999-cibuild0036218-beta.nupkg"; }) (fetchNuGet { pname = "Avalonia.Fonts.Inter"; version = "11.0.0"; sha256 = "1vbkk97jhy9qwix25jc875m98cp6vrl86029la55cbky9m1819am"; })
(fetchNuGet { pname = "Avalonia.Native"; version = "11.0.999-cibuild0036218-beta"; sha256 = "1j3h7rhrl341c142i1zvahklr9ayqp4x7j4b4v9y1bvw0jkxrl60"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/f990ff61-c538-476f-9f8c-0e9691a4ee55/nuget/v3/flat2/avalonia.native/11.0.999-cibuild0036218-beta/avalonia.native.11.0.999-cibuild0036218-beta.nupkg"; }) (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.0"; sha256 = "042s8lc83lw6ygcsiza14wlsc09rgzw3ch2qaxkhlp73bh736ps3"; })
(fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.999-cibuild0036218-beta"; sha256 = "0c7j9dks4spfc4vkz334b72h3pk9grc76d7p3q52w89k3ccc80qq"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/f990ff61-c538-476f-9f8c-0e9691a4ee55/nuget/v3/flat2/avalonia.reactiveui/11.0.999-cibuild0036218-beta/avalonia.reactiveui.11.0.999-cibuild0036218-beta.nupkg"; }) (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.0"; sha256 = "1j7wpv81wqwh6zhfzc1f36vb5dp6s2ig45v8km9sp0q6f66zkrsh"; })
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.999-cibuild0036218-beta"; sha256 = "1xyv0z4p7z85ydyylj3dyz428cm37y67c13qh5lrnsr14bsymvl9"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/f990ff61-c538-476f-9f8c-0e9691a4ee55/nuget/v3/flat2/avalonia.remote.protocol/11.0.999-cibuild0036218-beta/avalonia.remote.protocol.11.0.999-cibuild0036218-beta.nupkg"; }) (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.0"; sha256 = "1fhp6f2aj2bmzlcj0s5r9i9rcxwakdg9gvjqvdqaq8s98d0s06qh"; })
(fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.999-cibuild0036218-beta"; sha256 = "107faba83cwfy9q1grgdapwjnw5afgnpi6w176jyi7r26nznq8xr"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/f990ff61-c538-476f-9f8c-0e9691a4ee55/nuget/v3/flat2/avalonia.skia/11.0.999-cibuild0036218-beta/avalonia.skia.11.0.999-cibuild0036218-beta.nupkg"; }) (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0"; sha256 = "1b5031k8slwiz7bncih67fjl6ny234yd4skqxk611l9zp5snjic2"; })
(fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.999-cibuild0036218-beta"; sha256 = "1dki4y2q6k3xkyr102kkh06qvxigh15qmn1s6fkp771qj4kg7j7i"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/f990ff61-c538-476f-9f8c-0e9691a4ee55/nuget/v3/flat2/avalonia.themes.simple/11.0.999-cibuild0036218-beta/avalonia.themes.simple.11.0.999-cibuild0036218-beta.nupkg"; }) (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0"; sha256 = "1ra1kd0kkblppr5zy7rzdbwllggrzvp9lkxblf9mg3y8rnp6fk83"; })
(fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.999-cibuild0036218-beta"; sha256 = "1kp0db6svqgxjphjch6ln27d3n4jv96ha4ff89hn77pqf1xry4c5"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/f990ff61-c538-476f-9f8c-0e9691a4ee55/nuget/v3/flat2/avalonia.win32/11.0.999-cibuild0036218-beta/avalonia.win32.11.0.999-cibuild0036218-beta.nupkg"; }) (fetchNuGet { pname = "Avalonia.Svg"; version = "11.0.0.1"; sha256 = "0a61xg6pcmjy90mmjv42d64av5a7q919qbrhnv6vd1rmm6hxv7zf"; })
(fetchNuGet { pname = "Avalonia.X11"; version = "11.0.999-cibuild0036218-beta"; sha256 = "1ab5qx7pmqq7hpg8m6gdqvqsqn85m20p37va6z8qpg6vyvbmqlbr"; url = "https://pkgs.dev.azure.com/AvaloniaUI/aa84306f-2981-47b9-8206-edb3bed6250d/_packaging/f990ff61-c538-476f-9f8c-0e9691a4ee55/nuget/v3/flat2/avalonia.x11/11.0.999-cibuild0036218-beta/avalonia.x11.11.0.999-cibuild0036218-beta.nupkg"; }) (fetchNuGet { pname = "Avalonia.Svg.Skia"; version = "11.0.0.1"; sha256 = "1bywgrqdqc5wgcsabnhm8yssg78g9lw3p3sza5f8w5vdzmr116ff"; })
(fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.0"; sha256 = "1qw76n78c14xl419yzabahbsrgymm850ql05gd4fh5naq2brksdm"; })
(fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.0"; sha256 = "1djp4m5yin4i2f9sjv4v3syv02fllwbfinzm9h0hm2abc2ccvrm3"; })
(fetchNuGet { pname = "Avalonia.X11"; version = "11.0.0"; sha256 = "1gd4zrjyw3hg3d48ivhxp0ca7ma13dnpr8y1wc7d51ddlrj3c86g"; })
(fetchNuGet { pname = "Castle.Core"; version = "5.1.1"; sha256 = "1caf4878nvjid3cw3rw18p9cn53brfs5x8dkvf82xvcdwc3i0nd1"; }) (fetchNuGet { pname = "Castle.Core"; version = "5.1.1"; sha256 = "1caf4878nvjid3cw3rw18p9cn53brfs5x8dkvf82xvcdwc3i0nd1"; })
(fetchNuGet { pname = "ColorTextBlock.Avalonia"; version = "11.0.0-d1"; sha256 = "1vf5fp11zx21bsakbpf12j6mchafh749cs03w9cifb6ci98jchgh"; }) (fetchNuGet { pname = "ColorTextBlock.Avalonia"; version = "11.0.0-d1"; sha256 = "1vf5fp11zx21bsakbpf12j6mchafh749cs03w9cifb6ci98jchgh"; })
(fetchNuGet { pname = "ColorTextBlock.Avalonia"; version = "11.0.2"; sha256 = "0zvdgpg6r142zhldam5kcpmjpi0qjxsm40cy491gb9ynrj39hrhn"; })
(fetchNuGet { pname = "coverlet.collector"; version = "1.3.0"; sha256 = "0k65d9hag6d59w1ixf4n5ihcphp04vrjmd99x5nhga81w1k9i20y"; }) (fetchNuGet { pname = "coverlet.collector"; version = "1.3.0"; sha256 = "0k65d9hag6d59w1ixf4n5ihcphp04vrjmd99x5nhga81w1k9i20y"; })
(fetchNuGet { pname = "DryIoc.dll"; version = "5.4.1"; sha256 = "1dbaac5pi7mim4qil3lrqcpad9vbn261rznk5rw26kvngzcc65n6"; })
(fetchNuGet { pname = "DryIoc.Microsoft.DependencyInjection"; version = "6.2.0"; sha256 = "0iygbabd73ggzyq1ckbxifrh1kvzwlkr3x32ahamka7pv3982khb"; })
(fetchNuGet { pname = "DynamicData"; version = "7.9.5"; sha256 = "1m9qx8g6na5ka6kd9vhg8gjmxrnkzb6v5cl5yqp1kdjsw4rcwy6x"; }) (fetchNuGet { pname = "DynamicData"; version = "7.9.5"; sha256 = "1m9qx8g6na5ka6kd9vhg8gjmxrnkzb6v5cl5yqp1kdjsw4rcwy6x"; })
(fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; })
(fetchNuGet { pname = "FakeItEasy"; version = "8.0.0-alpha.1.10"; sha256 = "0492cayij2ap7rc9l8rkmmch1rb0jqckaspqxrsy0myldfqc2lpq"; })
(fetchNuGet { pname = "Fizzler"; version = "1.2.1"; sha256 = "1w5jb1d0figbv68dydbnlcsfmqlc3sv9z1zxp7d79dg2dkarc4qm"; })
(fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; sha256 = "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; sha256 = "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; })
(fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.3.1"; sha256 = "0lkhyyz25q82ygnxy26lwy5cl8fvkdc13pcn433xpjj8akzbmgd6"; }) (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.42"; sha256 = "0cvnc1qdfcjbqkh335bv4wp44zisb4hc69lq3zphiyzqfrjisnyb"; })
(fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.2.0"; sha256 = "0nx7nrzbg9gk9skdc9x330cbr5xbsly6z9gzxm46vywf55yp8vaj"; })
(fetchNuGet { pname = "Markdown.Avalonia"; version = "11.0.2"; sha256 = "1nx1f3pqlpffwwpdk8d6bbd27mz2q45k3gkc5dz6m2pfxi0ij6ak"; })
(fetchNuGet { pname = "Markdown.Avalonia.Html"; version = "11.0.2"; sha256 = "1xjz45lg9dcfwcdl0sbfy0145m6bd8y3b6kvwh96fnnj8ks6074q"; })
(fetchNuGet { pname = "Markdown.Avalonia.Svg"; version = "11.0.2"; sha256 = "1s5yazazpmhkc2nizzm46cnfwk7wwdd6gg2lzcs30k813i3621z3"; })
(fetchNuGet { pname = "Markdown.Avalonia.SyntaxHigh"; version = "11.0.2"; sha256 = "0di7r0wiif2lvgr0wlw1lj7b9j85yp1pf5hyhh4n9ciykklkkq0p"; })
(fetchNuGet { pname = "Markdown.Avalonia.Tight"; version = "11.0.0-d1"; sha256 = "0ks9k3wqwvdssiwbcjc4gnrfn1r8x2dbp9amraxkmws5a7vbjdyk"; }) (fetchNuGet { pname = "Markdown.Avalonia.Tight"; version = "11.0.0-d1"; sha256 = "0ks9k3wqwvdssiwbcjc4gnrfn1r8x2dbp9amraxkmws5a7vbjdyk"; })
(fetchNuGet { pname = "Markdown.Avalonia.Tight"; version = "11.0.2"; sha256 = "1mz229r42f1p320xkjl45pdv72lycn9cqk46arycm9km45jgzzgl"; })
(fetchNuGet { pname = "MessageBox.Avalonia"; version = "2.3.1-rc1"; sha256 = "13zvqg95wa5v5b8h8kl63ydpprxqyk6zgzqdh673y005s1y58w4a"; }) (fetchNuGet { pname = "MessageBox.Avalonia"; version = "2.3.1-rc1"; sha256 = "13zvqg95wa5v5b8h8kl63ydpprxqyk6zgzqdh673y005s1y58w4a"; })
(fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; })
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; })
@ -41,6 +56,10 @@
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; sha256 = "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; sha256 = "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"; })
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; })
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; })
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.7.1"; sha256 = "0yqxipj74ax2n76w9ccydppx78ym8m5fda88qnvj4670qjvl0kf8"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.7.1"; sha256 = "0yqxipj74ax2n76w9ccydppx78ym8m5fda88qnvj4670qjvl0kf8"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
@ -52,10 +71,11 @@
(fetchNuGet { pname = "Microsoft.Toolkit.HighPerformance"; version = "7.1.2"; sha256 = "18l950mq0l8s1z771l9p332ni7jryidjh4hi9p37l6p8frcnccxb"; }) (fetchNuGet { pname = "Microsoft.Toolkit.HighPerformance"; version = "7.1.2"; sha256 = "18l950mq0l8s1z771l9p332ni7jryidjh4hi9p37l6p8frcnccxb"; })
(fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
(fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; })
(fetchNuGet { pname = "Moq"; version = "4.18.4"; sha256 = "0x439pcaqg8kv0an4cjbspw8d98gq144yrqwhnnh6xf9qjaris94"; })
(fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; })
(fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; })
(fetchNuGet { pname = "Projektanker.Icons.Avalonia"; version = "6.6.0-rc1.1"; sha256 = "04sac2grc1mbx1rfx29i16k0yrqh29c60njsj2mq8yrs1z2ky9jj"; })
(fetchNuGet { pname = "Projektanker.Icons.Avalonia.FontAwesome"; version = "6.6.0-rc1.1"; sha256 = "1mzdgds62f7apy8gajrpsa6fay89rzfl7f9mf6y573ani7a131xc"; })
(fetchNuGet { pname = "PropertyChanged.SourceGenerator"; version = "1.0.8"; sha256 = "05ygdj1sizcw678vf459hzhz4ynz2s5s206vl99g5gy3d9kaham6"; }) (fetchNuGet { pname = "PropertyChanged.SourceGenerator"; version = "1.0.8"; sha256 = "05ygdj1sizcw678vf459hzhz4ynz2s5s206vl99g5gy3d9kaham6"; })
(fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; sha256 = "1lxkc8yk9glj0w9n5vry2dnwwvh8152ad2c5bivk8aciq64zidyn"; }) (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; sha256 = "1lxkc8yk9glj0w9n5vry2dnwwvh8152ad2c5bivk8aciq64zidyn"; })
(fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; })
@ -99,20 +119,36 @@
(fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; })
(fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; })
(fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; })
(fetchNuGet { pname = "Semi.Avalonia"; version = "11.0.0"; sha256 = "1js7lk05y171y6hrh39ai6ddqn17x08ri2fdpz9iq0ic8iryrvxi"; })
(fetchNuGet { pname = "Serilog"; version = "3.0.1"; sha256 = "1sigmcsy6mvjk2lqlxdxj47f961p1wvc0b8d8nx84hwy7mfikxvi"; })
(fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "7.0.0"; sha256 = "0qbdgjfr534jhrl87fjav46pbbrzj3izw3wd6hbz5gi1lrphmzar"; })
(fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.1.0"; sha256 = "1rpkphmqfh3bv3m7v1zwz88wz4sirj4xqyff9ga0c6bqhblj6wii"; })
(fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; sha256 = "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw"; })
(fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; })
(fetchNuGet { pname = "SerilogAnalyzer"; version = "0.15.0"; sha256 = "0k83cyzl9520q282vp07zb8rs16a56axv7a31l3m5fb1afq2hv9l"; })
(fetchNuGet { pname = "ShimSkiaSharp"; version = "1.0.0.1"; sha256 = "1iza1yvvvz5pfl2vx6fwlb0gj262gwva9fay6pb6kgiv70h7rmcg"; })
(fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; })
(fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.3"; sha256 = "0axz2zfyg0h3zis7rr86ikrm2jbxxy0gqb3bbawpgynf1k0fsi6a"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; sha256 = "1w5njksq3amrrp7fqxw89nv6ar2kgc5yx092i4rxv7hrjbd1aagx"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; sha256 = "1w5njksq3amrrp7fqxw89nv6ar2kgc5yx092i4rxv7hrjbd1aagx"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; })
(fetchNuGet { pname = "Splat"; version = "14.4.1"; sha256 = "03ycyjn2ii44npi015p4rk344xnjgdzz02cf63cmhx2ab8hv6p4b"; }) (fetchNuGet { pname = "Splat"; version = "14.4.1"; sha256 = "03ycyjn2ii44npi015p4rk344xnjgdzz02cf63cmhx2ab8hv6p4b"; })
(fetchNuGet { pname = "Splat"; version = "14.6.37"; sha256 = "1rj2ik4b4mxl2w2d8316a2afyfd23p6ysc5vczsis7bhxcjp1x2h"; }) (fetchNuGet { pname = "Splat"; version = "14.6.37"; sha256 = "1rj2ik4b4mxl2w2d8316a2afyfd23p6ysc5vczsis7bhxcjp1x2h"; })
(fetchNuGet { pname = "Splat"; version = "14.7.1"; sha256 = "1rs8bmwcvzg4yn05zglgk7vbmyi2flyyhjqn62sx1cjkrd9m0cs7"; })
(fetchNuGet { pname = "Splat.Microsoft.Extensions.DependencyInjection"; version = "14.6.37"; sha256 = "1pqb0ij1kmzjx92j5slp579aqshsp499wd8vxbnm58z0ix4a7bn6"; }) (fetchNuGet { pname = "Splat.Microsoft.Extensions.DependencyInjection"; version = "14.6.37"; sha256 = "1pqb0ij1kmzjx92j5slp579aqshsp499wd8vxbnm58z0ix4a7bn6"; })
(fetchNuGet { pname = "Splat.Serilog"; version = "14.7.1"; sha256 = "0xdw92jxarvpan9v8zja2710z2m03yam94qwar8j5axvnqbh8fhj"; })
(fetchNuGet { pname = "Svg.Custom"; version = "1.0.0.1"; sha256 = "00ly1pbm8a7s2k71gz7ikw42l25wfgabdx4bqrzdxysgnfaaa43d"; })
(fetchNuGet { pname = "Svg.Model"; version = "1.0.0.1"; sha256 = "0kyllnbya6zvhv8rg53b3zdndmdz9hak4k204gjzcnhkqsn8dcy6"; })
(fetchNuGet { pname = "Svg.Skia"; version = "1.0.0.1"; sha256 = "1z487pnz12cy6554xl4nifj4y4a2l15yxz5d3rlsc3asb4qs5jvy"; })
(fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; })
(fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; })
(fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; })
(fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; })
(fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "1.6.0"; sha256 = "1pbxzdz3pwqyybzv5ff2b7nrc281bhg7hq34w0fn1w3qfgrbwyw2"; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; })
(fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; })
(fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; })
(fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; })
@ -154,6 +190,7 @@
(fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; })
(fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; })
(fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; })
(fetchNuGet { pname = "System.Reactive.Linq"; version = "5.0.0"; sha256 = "07p05v13yixbxhs84231k5l8jw3nji0j3zcqc6nsbcmh54jpjsrb"; })
(fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; })
(fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; })
(fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; })
@ -174,6 +211,7 @@
(fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; })
(fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; })
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; })
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; })
(fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; })
@ -198,6 +236,8 @@
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; })
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; })
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; })
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; })
(fetchNuGet { pname = "System.Text.Json"; version = "7.0.0"; sha256 = "0scb0lp7wbgcinaa4kqiqs7b8i5nx4ppfad81138jiwd1sl37pyp"; })
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; })
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; })
(fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; })
@ -209,6 +249,7 @@
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; })
(fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; })
(fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; })
(fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; })
(fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; })
(fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; })
(fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; })

2
pkgs/tools/misc/cc2538-bsl/default.nix
View file

@ -5,7 +5,7 @@ python3Packages.buildPythonPackage rec {
version = "unstable-2022-08-03"; version = "unstable-2022-08-03";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub rec { src = fetchFromGitHub {
owner = "JelmerT"; owner = "JelmerT";
repo = pname; repo = pname;
rev = "538ea0deb99530e28fdf1b454e9c9d79d85a3970"; rev = "538ea0deb99530e28fdf1b454e9c9d79d85a3970";

132
pkgs/tools/networking/connman/connman/create-libppp-compat.h.patch Normal file
View file

@ -0,0 +1,132 @@
new file mode 100644
index 000000000..eee1d09d6
--- /dev/null
+++ b/scripts/libppp-compat.h
@@ -0,0 +1,127 @@
+/* Copyright (C) Eivind Naess, eivnaes@yahoo.com */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef __LIBPPP_COMPAT_H__
+#define __LIBPPP_COMPAT_H__
+
+/* Define USE_EAPTLS compile with EAP TLS support against older pppd headers,
+ * pppd >= 2.5.0 use PPP_WITH_EAPTLS and is defined in pppdconf.h */
+#define USE_EAPTLS 1
+
+/* Define INET6 to compile with IPv6 support against older pppd headers,
+ * pppd >= 2.5.0 use PPP_WITH_IPV6CP and is defined in pppdconf.h */
+#define INET6 1
+
+/* PPP < 2.5.0 defines and exports VERSION which overlaps with current package VERSION define.
+ * this silly macro magic is to work around that. */
+#undef VERSION
+#include <pppd/pppd.h>
+
+#ifndef PPPD_VERSION
+#define PPPD_VERSION VERSION
+#endif
+
+#include <pppd/fsm.h>
+#include <pppd/ccp.h>
+#include <pppd/eui64.h>
+#include <pppd/ipcp.h>
+#include <pppd/ipv6cp.h>
+#include <pppd/eap.h>
+#include <pppd/upap.h>
+
+#ifdef HAVE_PPPD_CHAP_H
+#include <pppd/chap.h>
+#endif
+
+#ifdef HAVE_PPPD_CHAP_NEW_H
+#include <pppd/chap-new.h>
+#endif
+
+#ifdef HAVE_PPPD_CHAP_MS_H
+#include <pppd/chap_ms.h>
+#endif
+
+#ifndef PPP_PROTO_CHAP
+#define PPP_PROTO_CHAP 0xc223
+#endif
+
+#ifndef PPP_PROTO_EAP
+#define PPP_PROTO_EAP 0xc227
+#endif
+
+
+#if WITH_PPP_VERSION < PPP_VERSION(2,5,0)
+
+static inline bool
+debug_on (void)
+{
+ return debug;
+}
+
+static inline const char
+*ppp_ipparam (void)
+{
+ return ipparam;
+}
+
+static inline int
+ppp_ifunit (void)
+{
+ return ifunit;
+}
+
+static inline const char *
+ppp_ifname (void)
+{
+ return ifname;
+}
+
+static inline int
+ppp_get_mtu (int idx)
+{
+ return netif_get_mtu(idx);
+}
+
+typedef enum ppp_notify
+{
+ NF_PID_CHANGE,
+ NF_PHASE_CHANGE,
+ NF_EXIT,
+ NF_SIGNALED,
+ NF_IP_UP,
+ NF_IP_DOWN,
+ NF_IPV6_UP,
+ NF_IPV6_DOWN,
+ NF_AUTH_UP,
+ NF_LINK_DOWN,
+ NF_FORK,
+ NF_MAX_NOTIFY
+} ppp_notify_t;
+
+typedef void (ppp_notify_fn) (void *ctx, int arg);
+
+static inline void
+ppp_add_notify (ppp_notify_t type, ppp_notify_fn *func, void *ctx)
+{
+ struct notifier **list[NF_MAX_NOTIFY] = {
+ [NF_PID_CHANGE ] = &pidchange,
+ [NF_PHASE_CHANGE] = &phasechange,
+ [NF_EXIT ] = &exitnotify,
+ [NF_SIGNALED ] = &sigreceived,
+ [NF_IP_UP ] = &ip_up_notifier,
+ [NF_IP_DOWN ] = &ip_down_notifier,
+ [NF_IPV6_UP ] = &ipv6_up_notifier,
+ [NF_IPV6_DOWN ] = &ipv6_down_notifier,
+ [NF_AUTH_UP ] = &auth_up_notifier,
+ [NF_LINK_DOWN ] = &link_down_notifier,
+ [NF_FORK ] = &fork_notifier,
+ };
+
+ struct notifier **notify = list[type];
+ if (notify) {
+ add_notifier(notify, func, ctx);
+ }
+}
+
+#endif /* #if WITH_PPP_VERSION < PPP_VERSION(2,5,0) */
+#endif /* #if__LIBPPP_COMPAT_H__ */

23
pkgs/tools/networking/connman/connman/default.nix
View file

@ -59,28 +59,21 @@ let inherit (lib) optionals; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "connman"; pname = "connman";
version = "1.41"; version = "1.42";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz"; url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz";
sha256 = "sha256-eftA9P3VUwxFqo5ZL7Froj02dPOpjPELiaZXbxmN5Yk="; hash = "sha256-o+a65G/Age8una48qk92Sd6JLD3mIsICg6wMqBQjwqo=";
}; };
patches = [ patches = [
(fetchpatch { # simply the middle section of upstream commit a48864a2e5d2a725dfc6eef567108bc13b43857f
name = "pppd-2.5.0-compat.patch"; # dist tarball is broken, hence this patch as a workaround
url = "https://git.kernel.org/pub/scm/network/connman/connman.git/patch/?id=a48864a2e5d2a725dfc6eef567108bc13b43857f"; ./create-libppp-compat.h.patch
sha256 = "sha256-jB1qL13mceQ1riv3K+oFWw4VC7ohv/CcH9sjxZPXcG4="; ] ++ optionals stdenv.hostPlatform.isMusl [
})
(fetchpatch {
name = "CVE-2023-28488.patch";
url = "https://git.kernel.org/pub/scm/network/connman/connman.git/patch/?id=99e2c16ea1cced34a5dc450d76287a1c3e762138";
sha256 = "sha256-377CmsECji2w/c4bZXR+TxzTB7Lce0yo7KdK1oWfCVY=";
})
] ++ lib.optionals stdenv.hostPlatform.isMusl [
# Fix Musl build by avoiding a Glibc-only API. # Fix Musl build by avoiding a Glibc-only API.
(fetchpatch { (fetchpatch {
url = "https://git.alpinelinux.org/aports/plain/community/connman/libresolv.patch?id=e393ea84386878cbde3cccadd36a30396e357d1e"; url = "https://git.alpinelinux.org/aports/plain/community/connman/libresolv.patch?id=e393ea84386878cbde3cccadd36a30396e357d1e";
sha256 = "1kg2nml7pdxc82h5hgsa3npvzdxy4d2jpz2f93pa97if868i8d43"; hash = "sha256-7Q1bp8rD/gGVYUqnIXqjr9vypR8jlC926p3KYWl9kLw=";
}) })
]; ];
@ -190,7 +183,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "A daemon for managing internet connections"; description = "A daemon for managing internet connections";
homepage = "https://git.kernel.org/pub/scm/network/connman/connman.git/"; homepage = "https://git.kernel.org/pub/scm/network/connman/connman.git/";
maintainers = [ maintainers.matejc ]; maintainers = with maintainers; [ eclairevoyant ];
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.gpl2Only; license = licenses.gpl2Only;
}; };

6
pkgs/tools/text/miller/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "miller"; pname = "miller";
version = "6.8.0"; version = "6.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "johnkerl"; owner = "johnkerl";
repo = "miller"; repo = "miller";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-AgKkB/c7rSgk2jS017vjaLPKdiWJ5y/1K5RM6c9RWQg="; sha256 = "sha256-g2Jnqo3U9acyqohGpcEEogq871qJQTc7k0/oIawAQW8=";
}; };
vendorHash = "sha256-4/BB4RaCXEgtGpBJGtccEAz9diogWTA4BxVLkOOlNMw="; vendorHash = "sha256-/1/FTQL3Ki8QzL+1J4Ah8kwiJyGPd024di/1MC8gtkE=";
subPackages = [ "cmd/mlr" ]; subPackages = [ "cmd/mlr" ];

4
pkgs/top-level/all-packages.nix
View file

@ -11035,9 +11035,7 @@ with pkgs;
netavark = callPackage ../tools/networking/netavark { }; netavark = callPackage ../tools/networking/netavark { };
netcdf = callPackage ../development/libraries/netcdf { netcdf = callPackage ../development/libraries/netcdf { };
hdf5 = hdf5.override { usev110Api = true; };
};
netcdf-mpi = netcdf.override { netcdf-mpi = netcdf.override {
hdf5 = hdf5-mpi.override { usev110Api = true; }; hdf5 = hdf5-mpi.override { usev110Api = true; };