Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -220,6 +220,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
|
||||
/nixos/modules/services/networking/ntp @thoughtpolice
|
||||
|
||||
# Network
|
||||
/pkgs/tools/networking/octodns @Janik-Haag
|
||||
/pkgs/tools/networking/kea/default.nix @mweinelt
|
||||
/pkgs/tools/networking/babeld/default.nix @mweinelt
|
||||
/nixos/modules/services/networking/babeld.nix @mweinelt
|
||||
|
||||
@@ -92,7 +92,7 @@ jobs:
|
||||
echo "base=$base" >> "$GITHUB_ENV"
|
||||
- uses: cachix/install-nix-action@7ac1ec25491415c381d9b62f0657c7a028df52a7 # v24
|
||||
- name: Fetching the tool
|
||||
run: pkgs/test/nixpkgs-check-by-name/scripts/fetch-tool.sh "$GITHUB_BASE_REF" result
|
||||
run: pkgs/test/nixpkgs-check-by-name/scripts/fetch-pinned-tool.sh result
|
||||
- name: Running nixpkgs-check-by-name
|
||||
run: |
|
||||
if result/bin/nixpkgs-check-by-name --base "$base" .; then
|
||||
|
||||
@@ -19,7 +19,7 @@ jobs:
|
||||
run: |
|
||||
gh api \
|
||||
repos/NixOS/nixpkgs/pulls/${{github.event.number}}/files --paginate \
|
||||
| jq '.[] | select(.status != "removed" and (.filename | endswith(".nix"))) | .filename' \
|
||||
| jq --raw-output '.[] | select(.status != "removed" and (.filename | endswith(".nix"))) | .filename' \
|
||||
> "$HOME/changed_files"
|
||||
if [[ -s "$HOME/changed_files" ]]; then
|
||||
echo "CHANGED_FILES=$HOME/changed_files" > "$GITHUB_ENV"
|
||||
@@ -30,6 +30,8 @@ jobs:
|
||||
ref: refs/pull/${{ github.event.pull_request.number }}/merge
|
||||
if: ${{ env.CHANGED_FILES && env.CHANGED_FILES != '' }}
|
||||
- uses: cachix/install-nix-action@7ac1ec25491415c381d9b62f0657c7a028df52a7 # v24
|
||||
with:
|
||||
nix_path: nixpkgs=channel:nixpkgs-unstable
|
||||
- name: Parse all changed or added nix files
|
||||
run: |
|
||||
ret=0
|
||||
|
||||
@@ -5217,6 +5217,12 @@
|
||||
matrix = "@edrex:matrix.org";
|
||||
name = "Eric Drechsel";
|
||||
};
|
||||
edswordsmith = {
|
||||
email = "eduardo.espadeiro@tecnico.ulisboa.pt";
|
||||
github = "EdSwordsmith";
|
||||
githubId = 22300113;
|
||||
name = "Eduardo Espadeiro";
|
||||
};
|
||||
eduarrrd = {
|
||||
email = "e.bachmakov@gmail.com";
|
||||
github = "eduarrrd";
|
||||
|
||||
@@ -67,8 +67,9 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
|
||||
|
||||
- The legacy and long deprecated systemd target `network-interfaces.target` has been removed. Use `network.target` instead.
|
||||
|
||||
- `mkosi` was updated to v19. Parts of the user interface have changed. Consult the
|
||||
[release notes](https://github.com/systemd/mkosi/releases/tag/v19) for a list of changes.
|
||||
- `mkosi` was updated to v20. Parts of the user interface have changed. Consult the
|
||||
release notes of [v19](https://github.com/systemd/mkosi/releases/tag/v19) and
|
||||
[v20](https://github.com/systemd/mkosi/releases/tag/v20) for a list of changes.
|
||||
|
||||
- `services.nginx` will no longer advertise HTTP/3 availability automatically. This must now be manually added, preferably to each location block.
|
||||
Example:
|
||||
|
||||
@@ -102,6 +102,12 @@ in
|
||||
apply = configuredMaxAttachmentSize: "${toString (configuredMaxAttachmentSize * 1.3)}M";
|
||||
};
|
||||
|
||||
configureNginx = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = lib.mdDoc "Configure nginx as a reverse proxy for roundcube.";
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
@@ -142,26 +148,39 @@ in
|
||||
${cfg.extraConfig}
|
||||
'';
|
||||
|
||||
services.nginx = {
|
||||
services.nginx = lib.mkIf cfg.configureNginx {
|
||||
enable = true;
|
||||
virtualHosts = {
|
||||
${cfg.hostName} = {
|
||||
forceSSL = mkDefault true;
|
||||
enableACME = mkDefault true;
|
||||
root = cfg.package;
|
||||
locations."/" = {
|
||||
root = cfg.package;
|
||||
index = "index.php";
|
||||
priority = 1100;
|
||||
extraConfig = ''
|
||||
location ~* \.php(/|$) {
|
||||
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
||||
fastcgi_pass unix:${fpm.socket};
|
||||
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
fastcgi_param PATH_INFO $fastcgi_path_info;
|
||||
|
||||
include ${config.services.nginx.package}/conf/fastcgi_params;
|
||||
include ${pkgs.nginx}/conf/fastcgi.conf;
|
||||
}
|
||||
add_header Cache-Control 'public, max-age=604800, must-revalidate';
|
||||
'';
|
||||
};
|
||||
locations."~ ^/(SQL|bin|config|logs|temp|vendor)/" = {
|
||||
priority = 3110;
|
||||
extraConfig = ''
|
||||
return 404;
|
||||
'';
|
||||
};
|
||||
locations."~ ^/(CHANGELOG.md|INSTALL|LICENSE|README.md|SECURITY.md|UPGRADING|composer.json|composer.lock)" = {
|
||||
priority = 3120;
|
||||
extraConfig = ''
|
||||
return 404;
|
||||
'';
|
||||
};
|
||||
locations."~* \\.php(/|$)" = {
|
||||
priority = 3130;
|
||||
extraConfig = ''
|
||||
fastcgi_pass unix:${fpm.socket};
|
||||
fastcgi_param PATH_INFO $fastcgi_path_info;
|
||||
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
||||
include ${config.services.nginx.package}/conf/fastcgi.conf;
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
@@ -83,6 +83,9 @@ in
|
||||
}
|
||||
];
|
||||
|
||||
# systemd-repart uses loopback devices for partition creation
|
||||
boot.initrd.availableKernelModules = lib.optional initrdCfg.enable "loop";
|
||||
|
||||
boot.initrd.systemd = lib.mkIf initrdCfg.enable {
|
||||
additionalUpstreamUnits = [
|
||||
"systemd-repart.service"
|
||||
|
||||
@@ -71,7 +71,7 @@ in
|
||||
type = with lib.types; attrsOf format.type;
|
||||
default = { };
|
||||
example = {
|
||||
"10-uki.conf" = {
|
||||
"10-uki" = {
|
||||
Transfer = {
|
||||
ProtectVersion = "%A";
|
||||
};
|
||||
|
||||
@@ -70,7 +70,8 @@ let
|
||||
deviceDependency = dev:
|
||||
# Use systemd service if we manage device creation, else
|
||||
# trust udev when not in a container
|
||||
if (hasAttr dev (filterAttrs (k: v: v.virtual) cfg.interfaces)) ||
|
||||
if (dev == null || dev == "lo") then []
|
||||
else if (hasAttr dev (filterAttrs (k: v: v.virtual) cfg.interfaces)) ||
|
||||
(hasAttr dev cfg.bridges) ||
|
||||
(hasAttr dev cfg.bonds) ||
|
||||
(hasAttr dev cfg.macvlans) ||
|
||||
@@ -78,7 +79,7 @@ let
|
||||
(hasAttr dev cfg.vlans) ||
|
||||
(hasAttr dev cfg.vswitches)
|
||||
then [ "${dev}-netdev.service" ]
|
||||
else optional (dev != null && dev != "lo" && !config.boot.isContainer) (subsystemDevice dev);
|
||||
else optional (!config.boot.isContainer) (subsystemDevice dev);
|
||||
|
||||
hasDefaultGatewaySet = (cfg.defaultGateway != null && cfg.defaultGateway.address != "")
|
||||
|| (cfg.enableIPv6 && cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "");
|
||||
|
||||
Generated
+431
-574
File diff suppressed because it is too large
Load Diff
@@ -16,19 +16,19 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "psst";
|
||||
version = "unstable-2023-05-13";
|
||||
version = "unstable-2024-01-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpochyla";
|
||||
repo = pname;
|
||||
rev = "f94af14aa9fdd3d59cd92849fa7f076103b37a70";
|
||||
hash = "sha256-Cmpdyec1xe7j10LDm+iCaKlBICHkmmbhKz2nDeOFOF8=";
|
||||
rev = "c70ace50e8c50c38dc6c4ea1156de2b50e6e76b5";
|
||||
hash = "sha256-WCtD06fZHdn0kT5SDE7aTUZvQlX9OBSAqHu+qopBzTM=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"cubeb-0.10.3" = "sha256-3eHW+kIJydF6nF0EkB/vglOvksfol+xIKoqFsKg3omI=";
|
||||
"cubeb-0.10.3" = "sha256-gV1KHOhq678E/Rj+u8jX9Fw+TepPwuZdV5y/D+Iby+o=";
|
||||
"druid-0.8.3" = "sha256-hTB9PQf2TAhcLr64VjjQIr18mczwcNogDSRSN5dQULA=";
|
||||
"druid-enums-0.1.0" = "sha256-KJvAgKxicx/g+4QRZq3iHt6MGVQbfOpyN+EhS6CyDZk=";
|
||||
};
|
||||
|
||||
@@ -13,7 +13,7 @@ index 1057827..0000000
|
||||
- let mut fh = fs::File::create(outfile).unwrap();
|
||||
- write!(fh, r#""{}""#, chrono::Local::now()).ok();
|
||||
-
|
||||
- let git_config = gix_config::File::from_git_dir("../.git/").expect("Git Config not found!");
|
||||
- let git_config = gix_config::File::from_git_dir("../.git/".into()).expect("Git Config not found!");
|
||||
- // Get Git's 'Origin' URL
|
||||
- let mut remote_url = git_config
|
||||
- .raw_value("remote", Some("origin".as_ref()), "url")
|
||||
@@ -51,7 +51,7 @@ index fcbd491..2d71ee3 100644
|
||||
-pub const GIT_VERSION: &str = git_version!();
|
||||
-pub const BUILD_TIME: &str = include!(concat!(env!("OUT_DIR"), "/build-time.txt"));
|
||||
-pub const REMOTE_URL: &str = include!(concat!(env!("OUT_DIR"), "/remote-url.txt"));
|
||||
+pub const GIT_VERSION: &str = "f94af14aa9fdd3d59cd92849fa7f076103b37a70";
|
||||
+pub const GIT_VERSION: &str = "c70ace50e8c50c38dc6c4ea1156de2b50e6e76b5";
|
||||
+pub const BUILD_TIME: &str = "1970-01-01 00:00:00";
|
||||
+pub const REMOTE_URL: &str = "https://github.com/jpochyla/psst";
|
||||
|
||||
|
||||
@@ -38,4 +38,4 @@ sed -i -E -e "s#rev = \".*\"#rev = \"$rev\"#" default.nix
|
||||
sed -i -E -e "s#hash = \".*\"#hash = \"$src_hash\"#" default.nix
|
||||
|
||||
# Also update the git hash shown in the UI
|
||||
sed -i -E -e "s#GIT_VERSION = \".*\"#GIT_VERSION = \"$rev\"#" make-build-reproducible.patch
|
||||
sed -i -E -e "s#GIT_VERSION: \&str = \".*\"#GIT_VERSION: \&str = \"$rev\"#" make-build-reproducible.patch
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, wrapQtAppsHook
|
||||
@@ -12,7 +11,7 @@
|
||||
, curl
|
||||
, enet
|
||||
, ffmpeg
|
||||
, fmt_8
|
||||
, fmt_10
|
||||
, gtest
|
||||
, hidapi
|
||||
, libevdev
|
||||
@@ -24,6 +23,7 @@
|
||||
, libXdmcp
|
||||
, libXext
|
||||
, libXrandr
|
||||
, lz4
|
||||
, lzo
|
||||
, mbedtls_2
|
||||
, miniupnpc
|
||||
@@ -57,21 +57,17 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dolphin-emu";
|
||||
version = "5.0-19870";
|
||||
version = "5.0-20347";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolphin-emu";
|
||||
repo = "dolphin";
|
||||
rev = "032c77b462a220016f23c5079e71bb23e0ad2adf";
|
||||
sha256 = "sha256-TgRattksYsMGcbfu4T5mCFO9BkkHRX0NswFxGwZWjEw=";
|
||||
rev = "dc0814ae4622313d513468bdc377ee9c031de199";
|
||||
hash = "sha256-s3mGwXkgdoLLfPEUVyjaqXb+a5KPKC3dhHIyKC2BF1w=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/dolphin-emu/dolphin/commit/c43c9101c07376297abbbbc40ef9a1965a1681cd.diff";
|
||||
sha256 = "sha256-yHlyG86ta76YKrJsyefvFh521dNbQOqiPOpRUVxKuZM=";
|
||||
})
|
||||
# Remove when merged https://github.com/dolphin-emu/dolphin/pull/12070
|
||||
./find-minizip-ng.patch
|
||||
];
|
||||
@@ -99,7 +95,7 @@ stdenv.mkDerivation rec {
|
||||
curl
|
||||
enet
|
||||
ffmpeg
|
||||
fmt_8
|
||||
fmt_10
|
||||
gtest
|
||||
hidapi
|
||||
libiconv
|
||||
@@ -107,6 +103,7 @@ stdenv.mkDerivation rec {
|
||||
libspng
|
||||
libusb1
|
||||
libXdmcp
|
||||
lz4
|
||||
lzo
|
||||
mbedtls_2
|
||||
miniupnpc
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "4.4.6";
|
||||
version = "4.5.0";
|
||||
|
||||
libsecp256k1_name =
|
||||
if stdenv.isLinux then "libsecp256k1.so.{v}"
|
||||
@@ -29,7 +29,7 @@ let
|
||||
owner = "spesmilo";
|
||||
repo = "electrum";
|
||||
rev = version;
|
||||
sha256 = "sha256-nd435CgF0a6JOni/OXcxkciVCR1aQqzfGfDSg1gPQ8Q=";
|
||||
sha256 = "sha256-IEKuHUlH+dg+8w+n7XV7hdDOPOFZ/lpUsIlYldwR44Y=";
|
||||
|
||||
postFetch = ''
|
||||
mv $out ./all
|
||||
@@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
|
||||
sha256 = "sha256-BxxC1xVKToUjgBo4mEeK9Tdhbd/+doHcTTJsXDtaELg=";
|
||||
sha256 = "sha256-s4FH8FtPg4wepU/5XI062dAN9fCYR1xJGwrxftCSKzw=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
@@ -73,6 +73,7 @@ python3.pkgs.buildPythonApplication {
|
||||
requests
|
||||
tlslite-ng
|
||||
certifi
|
||||
jsonpatch
|
||||
# plugins
|
||||
btchip-python
|
||||
ledger-bitcoin
|
||||
|
||||
@@ -2,22 +2,25 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "atmos";
|
||||
version = "1.16.0";
|
||||
version = "1.53.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudposse";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6NUuKU8KQBfHE6fcN3a9lBcUk7p5I9SuY9g+qJxGXmU=";
|
||||
sha256 = "sha256-2T5LCtycTBnJntcKQoJqNwTczWR8bC1SBAqjMN+3Qd4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vZwADD7fi9ZvJby9Ijdeueid8jRfUyyj6Nu4kgkO5Wo=";
|
||||
vendorHash = "sha256-piK9IVwGAidDhBNAEnu9hD7Ng67ZKxZMcNqgOXLCkq0=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ];
|
||||
|
||||
preCheck = ''
|
||||
# Remove tests that depend on a network connection.
|
||||
rm -f pkg/vender/component_vendor_test.go
|
||||
rm -f \
|
||||
pkg/vender/component_vendor_test.go \
|
||||
pkg/atlantis/atlantis_generate_repo_config_test.go \
|
||||
pkg/describe/describe_affected_test.go
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
@@ -37,4 +40,3 @@ buildGoModule rec {
|
||||
maintainers = with maintainers; [ rb ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubevpn";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KubeNetworks";
|
||||
repo = "kubevpn";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-n65z7L82qQE4Xao5W99zIkXGEx2BFM4n/6C1cuTJXsk=";
|
||||
sha256 = "sha256-/WXJmqgfA2hG+1y62uvTMLbPWbamUObfGpgEBUJwgE4=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
+38
-134
@@ -23,15 +23,6 @@ version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
|
||||
|
||||
[[package]]
|
||||
name = "aead"
|
||||
version = "0.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877"
|
||||
dependencies = [
|
||||
"generic-array",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "aead"
|
||||
version = "0.5.2"
|
||||
@@ -42,19 +33,6 @@ dependencies = [
|
||||
"generic-array",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "aes"
|
||||
version = "0.7.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"cipher 0.3.0",
|
||||
"cpufeatures",
|
||||
"ctr 0.8.0",
|
||||
"opaque-debug",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "aes"
|
||||
version = "0.8.3"
|
||||
@@ -62,22 +40,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"cipher 0.4.4",
|
||||
"cipher",
|
||||
"cpufeatures",
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "aes-gcm"
|
||||
version = "0.9.2"
|
||||
version = "0.10.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bc3be92e19a7ef47457b8e6f90707e12b6ac5d20c6f3866584fa3be0787d839f"
|
||||
checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
|
||||
dependencies = [
|
||||
"aead 0.4.3",
|
||||
"aes 0.7.5",
|
||||
"cipher 0.3.0",
|
||||
"ctr 0.7.0",
|
||||
"ghash 0.4.4",
|
||||
"aead",
|
||||
"aes",
|
||||
"cipher",
|
||||
"ctr",
|
||||
"ghash",
|
||||
"subtle",
|
||||
]
|
||||
|
||||
@@ -87,11 +65,11 @@ version = "0.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d"
|
||||
dependencies = [
|
||||
"aead 0.5.2",
|
||||
"aes 0.8.3",
|
||||
"cipher 0.4.4",
|
||||
"ctr 0.9.2",
|
||||
"polyval 0.6.1",
|
||||
"aead",
|
||||
"aes",
|
||||
"cipher",
|
||||
"ctr",
|
||||
"polyval",
|
||||
"subtle",
|
||||
"zeroize",
|
||||
]
|
||||
@@ -420,22 +398,6 @@ dependencies = [
|
||||
"generic-array",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "block-modes"
|
||||
version = "0.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2cb03d1bed155d89dce0f845b7899b18a9a163e148fd004e1c28421a783e2d8e"
|
||||
dependencies = [
|
||||
"block-padding 0.2.1",
|
||||
"cipher 0.3.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "block-padding"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
|
||||
|
||||
[[package]]
|
||||
name = "block-padding"
|
||||
version = "0.3.3"
|
||||
@@ -526,7 +488,7 @@ version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
|
||||
dependencies = [
|
||||
"cipher 0.4.4",
|
||||
"cipher",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -562,7 +524,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"cipher 0.4.4",
|
||||
"cipher",
|
||||
"cpufeatures",
|
||||
]
|
||||
|
||||
@@ -572,9 +534,9 @@ version = "0.10.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
|
||||
dependencies = [
|
||||
"aead 0.5.2",
|
||||
"aead",
|
||||
"chacha20",
|
||||
"cipher 0.4.4",
|
||||
"cipher",
|
||||
"poly1305",
|
||||
"zeroize",
|
||||
]
|
||||
@@ -592,15 +554,6 @@ dependencies = [
|
||||
"windows-targets 0.48.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cipher"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
|
||||
dependencies = [
|
||||
"generic-array",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cipher"
|
||||
version = "0.4.4"
|
||||
@@ -724,31 +677,13 @@ dependencies = [
|
||||
"typenum",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ctr"
|
||||
version = "0.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a232f92a03f37dd7d7dd2adc67166c77e9cd88de5b019b9a9eecfaeaf7bfd481"
|
||||
dependencies = [
|
||||
"cipher 0.3.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ctr"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea"
|
||||
dependencies = [
|
||||
"cipher 0.3.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ctr"
|
||||
version = "0.9.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
|
||||
dependencies = [
|
||||
"cipher 0.4.4",
|
||||
"cipher",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1005,7 +940,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
|
||||
|
||||
[[package]]
|
||||
name = "flare"
|
||||
version = "0.11.1"
|
||||
version = "0.11.2"
|
||||
dependencies = [
|
||||
"ashpd",
|
||||
"async-trait",
|
||||
@@ -1358,16 +1293,6 @@ dependencies = [
|
||||
"temp-dir",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ghash"
|
||||
version = "0.4.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99"
|
||||
dependencies = [
|
||||
"opaque-debug",
|
||||
"polyval 0.5.3",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ghash"
|
||||
version = "0.5.0"
|
||||
@@ -1375,7 +1300,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40"
|
||||
dependencies = [
|
||||
"opaque-debug",
|
||||
"polyval 0.6.1",
|
||||
"polyval",
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
@@ -1889,7 +1814,7 @@ version = "0.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
|
||||
dependencies = [
|
||||
"block-padding 0.3.3",
|
||||
"block-padding",
|
||||
"generic-array",
|
||||
]
|
||||
|
||||
@@ -2048,11 +1973,11 @@ name = "libsignal-protocol"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364"
|
||||
dependencies = [
|
||||
"aes 0.8.3",
|
||||
"aes",
|
||||
"aes-gcm-siv",
|
||||
"arrayref",
|
||||
"async-trait",
|
||||
"ctr 0.9.2",
|
||||
"ctr",
|
||||
"curve25519-dalek",
|
||||
"displaydoc",
|
||||
"hex",
|
||||
@@ -2078,16 +2003,17 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "libsignal-service"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=0a7987e#0a7987e59bbb9fb110e899ac09e8efb6e28bc46d"
|
||||
source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=9d55addebe010f0acbcabdfc02ab41979c1863e0#9d55addebe010f0acbcabdfc02ab41979c1863e0"
|
||||
dependencies = [
|
||||
"aes 0.7.5",
|
||||
"aes",
|
||||
"aes-gcm",
|
||||
"async-trait",
|
||||
"base64 0.13.1",
|
||||
"bincode",
|
||||
"block-modes",
|
||||
"bytes",
|
||||
"cbc",
|
||||
"chrono",
|
||||
"ctr",
|
||||
"derivative",
|
||||
"futures",
|
||||
"hex",
|
||||
@@ -2111,7 +2037,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "libsignal-service-hyper"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=0a7987e#0a7987e59bbb9fb110e899ac09e8efb6e28bc46d"
|
||||
source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=9d55addebe010f0acbcabdfc02ab41979c1863e0#9d55addebe010f0acbcabdfc02ab41979c1863e0"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"async-tungstenite",
|
||||
@@ -2555,10 +2481,10 @@ version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "220729ba847d98e1a9902c05e41dae79ce4a0b913dad68bc540dd3120a8c2b6b"
|
||||
dependencies = [
|
||||
"aes 0.8.3",
|
||||
"aes",
|
||||
"byteorder",
|
||||
"cbc",
|
||||
"cipher 0.4.4",
|
||||
"cipher",
|
||||
"digest",
|
||||
"futures-util",
|
||||
"hkdf",
|
||||
@@ -2809,19 +2735,7 @@ checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
|
||||
dependencies = [
|
||||
"cpufeatures",
|
||||
"opaque-debug",
|
||||
"universal-hash 0.5.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "polyval"
|
||||
version = "0.5.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"cpufeatures",
|
||||
"opaque-debug",
|
||||
"universal-hash 0.4.0",
|
||||
"universal-hash",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2833,7 +2747,7 @@ dependencies = [
|
||||
"cfg-if",
|
||||
"cpufeatures",
|
||||
"opaque-debug",
|
||||
"universal-hash 0.5.1",
|
||||
"universal-hash",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2876,7 +2790,7 @@ checksum = "94e851c7654eed9e68d7d27164c454961a616cf8c203d500607ef22c737b51bb"
|
||||
[[package]]
|
||||
name = "presage"
|
||||
version = "0.6.0-dev"
|
||||
source = "git+https://github.com/Schmiddiii/presage?rev=3a65cd56714975a37fedd9d4e0286c332d55b11a#3a65cd56714975a37fedd9d4e0286c332d55b11a"
|
||||
source = "git+https://github.com/Schmiddiii/presage?rev=e74ea1bcf5acb27853c9eb9c9c2ff3d1d653fdf1#e74ea1bcf5acb27853c9eb9c9c2ff3d1d653fdf1"
|
||||
dependencies = [
|
||||
"base64 0.21.5",
|
||||
"futures",
|
||||
@@ -2896,7 +2810,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "presage-store-cipher"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/Schmiddiii/presage?rev=3a65cd56714975a37fedd9d4e0286c332d55b11a#3a65cd56714975a37fedd9d4e0286c332d55b11a"
|
||||
source = "git+https://github.com/Schmiddiii/presage?rev=e74ea1bcf5acb27853c9eb9c9c2ff3d1d653fdf1#e74ea1bcf5acb27853c9eb9c9c2ff3d1d653fdf1"
|
||||
dependencies = [
|
||||
"blake3",
|
||||
"chacha20poly1305",
|
||||
@@ -2913,7 +2827,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "presage-store-sled"
|
||||
version = "0.6.0-dev"
|
||||
source = "git+https://github.com/Schmiddiii/presage?rev=3a65cd56714975a37fedd9d4e0286c332d55b11a#3a65cd56714975a37fedd9d4e0286c332d55b11a"
|
||||
source = "git+https://github.com/Schmiddiii/presage?rev=e74ea1bcf5acb27853c9eb9c9c2ff3d1d653fdf1#e74ea1bcf5acb27853c9eb9c9c2ff3d1d653fdf1"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"base64 0.12.3",
|
||||
@@ -3520,11 +3434,11 @@ name = "signal-crypto"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/signalapp/libsignal?tag=v0.32.0#72f046fe19a5eac22c7abcf9917956f240759364"
|
||||
dependencies = [
|
||||
"aes 0.8.3",
|
||||
"aes",
|
||||
"cbc",
|
||||
"ctr 0.9.2",
|
||||
"ctr",
|
||||
"displaydoc",
|
||||
"ghash 0.5.0",
|
||||
"ghash",
|
||||
"hmac",
|
||||
"sha1",
|
||||
"sha2",
|
||||
@@ -4052,16 +3966,6 @@ version = "0.2.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
|
||||
|
||||
[[package]]
|
||||
name = "universal-hash"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402"
|
||||
dependencies = [
|
||||
"generic-array",
|
||||
"subtle",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "universal-hash"
|
||||
version = "0.5.1"
|
||||
|
||||
@@ -21,14 +21,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flare";
|
||||
version = "0.11.1";
|
||||
version = "0.11.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.com";
|
||||
owner = "schmiddi-on-mobile";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-c02+nWIklZMD5jqyjmDBL7lffHQ+dOo2ggicd/vItUE=";
|
||||
hash = "sha256-p6G+FbSiBkaF/qlUOPdPdgTqrrKFAOuIaCr6DCv+az4=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
|
||||
outputHashes = {
|
||||
"curve25519-dalek-4.0.0" = "sha256-KUXvYXeVvJEQ/+dydKzXWCZmA2bFa2IosDzaBL6/Si0=";
|
||||
"libsignal-protocol-0.1.0" = "sha256-FCrJO7porlY5FrwZ2c67UPd4tgN7cH2/3DTwfPjihwM=";
|
||||
"libsignal-service-0.1.0" = "sha256-OWLtaxldKgYPP/aJuWezNkNN0990l3RtDWK38R1fL90=";
|
||||
"presage-0.6.0-dev" = "sha256-sd/kvdbrlJnKPSC/0SDXo6Z6Zc5Am0op/t6gprJf91w=";
|
||||
"libsignal-service-0.1.0" = "sha256-Ul1mg+oQ8te364Jc2gOBoiq2udYsw9UBret/O9VU9ec=";
|
||||
"presage-0.6.0-dev" = "sha256-0Z2ySXMZZ4wpyesxOikhra/eN7K3I+ElAh7vAaNSbb0=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
, libdrm
|
||||
, libgcrypt
|
||||
, libkrb5
|
||||
, libnotify
|
||||
, mesa # for libgbm
|
||||
, libGL
|
||||
, nss
|
||||
@@ -88,6 +89,9 @@ stdenv.mkDerivation {
|
||||
ln -s ${libayatana-appindicator}/lib/libayatana-appindicator3.so \
|
||||
$out/opt/QQ/libappindicator3.so
|
||||
|
||||
ln -s ${libnotify}/lib/libnotify.so \
|
||||
$out/opt/QQ/libnotify.so
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "AnyDesk";
|
||||
exec = "${placeholder "out"}/bin/anydesk %u";
|
||||
exec = "anydesk %u";
|
||||
icon = "anydesk";
|
||||
desktopName = "AnyDesk";
|
||||
genericName = description;
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
{ lib
|
||||
, desktop-file-utils
|
||||
, fetchFromGitLab
|
||||
, gobject-introspection
|
||||
, gsound
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, python3
|
||||
, stdenv
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chess-clock";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wwNOop2V84vZO3JV0+VZ+52cKPx8xJg2rLkjfgc/+n4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
gobject-introspection
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gsound
|
||||
gtk4
|
||||
libadwaita
|
||||
(python3.withPackages (ps: with ps; [
|
||||
pygobject3
|
||||
]))
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Time games of over-the-board chess";
|
||||
homepage = "https://gitlab.gnome.org/World/chess-clock";
|
||||
changelog = "https://gitlab.gnome.org/World/chess-clock/-/releases/v${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ michaelgrahamevans ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, stdenv
|
||||
, vala
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clairvoyant";
|
||||
version = "3.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cassidyjames";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-q+yN3FAs1L+GzagOQRK5gw8ptBpHPqWOiCL6aaoWcJo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
vala
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk4
|
||||
libadwaita
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Ask questions and get psychic answers";
|
||||
homepage = "https://github.com/cassidyjames/clairvoyant";
|
||||
changelog = "https://github.com/cassidyjames/clairvoyant/releases/tag/${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ michaelgrahamevans ];
|
||||
mainProgram = "com.github.cassidyjames.clairvoyant";
|
||||
};
|
||||
}
|
||||
@@ -4,6 +4,7 @@
|
||||
, just
|
||||
, pop-icon-theme
|
||||
, hicolor-icon-theme
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cosmic-icons";
|
||||
@@ -31,6 +32,8 @@ stdenvNoCC.mkDerivation rec {
|
||||
|
||||
dontDropIconThemeCache = true;
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "System76 Cosmic icon theme for Linux";
|
||||
homepage = "https://github.com/pop-os/cosmic-icons";
|
||||
|
||||
Generated
+112
@@ -0,0 +1,112 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "equivalent"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
|
||||
|
||||
[[package]]
|
||||
name = "ff2mpv-rust"
|
||||
version = "1.1.0"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_json",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.14.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
|
||||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
version = "2.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
|
||||
dependencies = [
|
||||
"equivalent",
|
||||
"hashbrown",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "1.0.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.76"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.35"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.195"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.195"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.111"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
|
||||
dependencies = [
|
||||
"indexmap",
|
||||
"itoa",
|
||||
"ryu",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.48"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
|
||||
@@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ff2mpv-rust";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ryze312";
|
||||
repo = "ff2mpv-rust";
|
||||
rev = version;
|
||||
hash = "sha256-sofv5uRLNbMT+w+ZDGjtKqBjYJk+UDzUDQrOiWvl5Hs=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib/mozilla/native-messaging-hosts/
|
||||
$out/bin/ff2mpv-rust manifest > $out/lib/mozilla/native-messaging-hosts/ff2mpv.json
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Native messaging host for ff2mpv written in Rust";
|
||||
homepage = "https://github.com/ryze312/ff2mpv-rust";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ arthsmn ];
|
||||
mainProgram = "ff2mpv-rust";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,83 @@
|
||||
{ lib
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, testers
|
||||
, icloudpd
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "icloudpd";
|
||||
version = "1.17.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "icloud-photos-downloader";
|
||||
repo = "icloud_photos_downloader";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GS6GqlZfj5kfjKLImkOTDAgQDGJQHl74uTqbZHVpbac=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
wheel
|
||||
setuptools
|
||||
requests
|
||||
schema
|
||||
click
|
||||
python-dateutil
|
||||
tqdm
|
||||
piexif
|
||||
urllib3
|
||||
six
|
||||
tzlocal
|
||||
pytz
|
||||
certifi
|
||||
keyring
|
||||
keyrings-alt
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
pytestCheckHook
|
||||
mock
|
||||
freezegun
|
||||
vcrpy
|
||||
pytest-timeout
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# touches network
|
||||
"test_autodelete_photos"
|
||||
"test_download_autodelete_photos"
|
||||
"test_retry_delete_after_download_session_error"
|
||||
"test_retry_fail_delete_after_download_session_error"
|
||||
"test_retry_delete_after_download_internal_error"
|
||||
"test_autodelete_photos_dry_run"
|
||||
"test_retry_fail_delete_after_download_internal_error"
|
||||
"test_autodelete_invalid_creation_date"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests = testers.testVersion { package = icloudpd; };
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "setuptools==69.0.2" "setuptools" \
|
||||
--replace "wheel==0.42.0" "wheel"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/icloud-photos-downloader/icloud_photos_downloader";
|
||||
description = "iCloud Photos Downloader";
|
||||
license = licenses.mit;
|
||||
mainProgram = "icloudpd";
|
||||
maintainers = with maintainers; [ anpin Enzime ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchzip
|
||||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "0xproto";
|
||||
version = "1.300";
|
||||
|
||||
src = let
|
||||
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
|
||||
in
|
||||
fetchzip {
|
||||
url = "https://github.com/0xType/0xProto/releases/download/${version}/0xProto_${underscoreVersion}.zip";
|
||||
hash = "sha256-RanIMf9P2lFOF3kJS6jMlh/X6jttofbHSqFUJxWSqKk=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm644 -t $out/share/fonts/opentype/ *.otf
|
||||
install -Dm644 -t $out/share/fonts/truetype/ *.ttf
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free and Open-source font for programming";
|
||||
homepage = "https://github.com/0xType/0xProto";
|
||||
license = licenses.ofl;
|
||||
maintainers = [ maintainers.edswordsmith ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -3,8 +3,11 @@
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, intltool
|
||||
, xfce4-panel
|
||||
, glib
|
||||
, gtk3
|
||||
, libxfce4ui
|
||||
, libxfce4util
|
||||
, xfce4-panel
|
||||
, xfconf
|
||||
, gitUpdater
|
||||
}:
|
||||
@@ -13,11 +16,11 @@ let
|
||||
category = "panel-plugins";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "xfce4-notes-plugin";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-LuRAYELt01KpHhZsg7YNEyIO8E3OP6a54OsTY21jaSk=";
|
||||
sha256 = "sha256-6zgkbesPyJU1+p/5uVPHYs7OIytVhdghD6uau/KCquM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -26,7 +29,10 @@ in stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk3
|
||||
libxfce4ui
|
||||
libxfce4util
|
||||
xfce4-panel
|
||||
xfconf
|
||||
];
|
||||
|
||||
@@ -32,6 +32,7 @@
|
||||
, libuv
|
||||
, libxcrypt
|
||||
, libyaml
|
||||
, luajitPackages
|
||||
, mariadb
|
||||
, magic-enum
|
||||
, mpfr
|
||||
@@ -155,6 +156,13 @@ with prev;
|
||||
*/
|
||||
});
|
||||
|
||||
image-nvim = prev.image-nvim.overrideAttrs (oa: {
|
||||
propagatedBuildInputs = [
|
||||
lua
|
||||
luajitPackages.magick
|
||||
];
|
||||
});
|
||||
|
||||
ldbus = prev.ldbus.overrideAttrs (oa: {
|
||||
extraVariables = {
|
||||
DBUS_DIR = "${dbus.lib}";
|
||||
|
||||
@@ -1,29 +1,34 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, bitstruct
|
||||
, buildPythonPackage
|
||||
, diskcache
|
||||
, fetchFromGitHub
|
||||
, prompt-toolkit
|
||||
, pyparsing
|
||||
, python
|
||||
, pythonOlder
|
||||
, pytest-xdist
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asn1tools";
|
||||
version = "0.166.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eerimoq";
|
||||
repo = "asn1tools";
|
||||
rev = version;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-TWAOML6nsLX3TYqoQ9fcSjrUmC4byXOfczfkmSaSa0k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bitstruct
|
||||
pyparsing
|
||||
@@ -39,17 +44,24 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
] ++ lib.flatten (builtins.attrValues passthru.optional-depdendencies);
|
||||
|
||||
|
||||
pythonImportsCheck = [
|
||||
"asn1tools"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# assert exact error message of pyparsing which changed and no longer matches
|
||||
# https://github.com/eerimoq/asn1tools/issues/167
|
||||
"test_parse_error"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "ASN.1 parsing, encoding and decoding";
|
||||
homepage = "https://github.com/eerimoq/asn1tools";
|
||||
changelog = "https://github.com/eerimoq/asn1tools/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
@@ -18,17 +18,24 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "pyppeteer";
|
||||
version = "1.0.2";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
owner = "pyppeteer";
|
||||
repo = "pyppeteer";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-izMaWtJdkLHMQbyq7o7n46xB8dOHXZ5uO0UXt+twjL4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'pyee = "^8.1.0"' 'pyee = "*"' \
|
||||
--replace 'urllib3 = "^1.25.8"' 'urllib3 = "*"' \
|
||||
--replace 'websockets = "^10.0"' 'websockets = "*"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
@@ -49,12 +56,6 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'pyee = "^8.1.0"' 'pyee = "*"' \
|
||||
--replace 'websockets = "^9.1"' 'websockets = "*"'
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
# Requires network access
|
||||
"tests/test_browser.py"
|
||||
@@ -89,6 +90,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Headless chrome/chromium automation library (unofficial port of puppeteer)";
|
||||
homepage = "https://github.com/pyppeteer/pyppeteer";
|
||||
changelog = "https://github.com/pyppeteer/pyppeteer/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ kmein ];
|
||||
};
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "3.1.60";
|
||||
version = "3.1.62";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = "checkov";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-IJZPyl7HwAKhAhIyF2lv9nJ5P2BDp3K0ggJcwyLFOEs=";
|
||||
hash = "sha256-ZyvcfJbydZad2ID2aVGPuywLslPPkwq3K3OzoO/zW/w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
, libXi
|
||||
, libXrandr
|
||||
, libXrender
|
||||
, libgit2
|
||||
, libglvnd
|
||||
, libuuid
|
||||
, libxcb
|
||||
@@ -91,7 +92,8 @@ preFixup = let
|
||||
|
||||
ln -s $out/lib/libcrypto.so $out/lib/libcrypto.so.1.1
|
||||
ln -s $out/lib/libcairo.so $out/lib/libcairo.so.2
|
||||
ln -s $out/lib/libgit2.so $out/lib/libgit2.so.1.1
|
||||
rm $out/lib/libgit2.so
|
||||
ln -s "${libgit2}/lib/libgit2.so" $out/lib/libgit2.so.1.1
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -94,5 +94,8 @@ stdenvNoCC.mkDerivation rec {
|
||||
];
|
||||
maintainers = with maintainers; [ DAlperin jk thilobillerbeck cdmistman coffeeispower ];
|
||||
platforms = builtins.attrNames passthru.sources;
|
||||
# Broken for Musl at 2024-01-13, tracking issue:
|
||||
# https://github.com/NixOS/nixpkgs/issues/280716
|
||||
broken = stdenvNoCC.hostPlatform.isMusl;
|
||||
};
|
||||
}
|
||||
|
||||
+18
-1
@@ -55,7 +55,24 @@ stdenv.mkDerivation rec {
|
||||
"-L${nvidia-texture-tools.lib}/lib/static"
|
||||
];
|
||||
|
||||
patches = [ ./rootdir_env.patch ];
|
||||
patches = [
|
||||
./rootdir_env.patch
|
||||
|
||||
# Fix build with libxml v2.12
|
||||
# FIXME: Remove with next package update
|
||||
(fetchpatch {
|
||||
name = "libxml-2.12-fix.patch";
|
||||
url = "https://github.com/0ad/0ad/commit/d242631245edb66816ef9960bdb2c61b68e56cec.patch";
|
||||
hash = "sha256-Ik8ThkewB7wyTPTI7Y6k88SqpWUulXK698tevfSBr6I=";
|
||||
})
|
||||
# Fix build with GCC 13
|
||||
# FIXME: Remove with next package update
|
||||
(fetchpatch {
|
||||
name = "gcc-13-fix.patch";
|
||||
url = "https://github.com/0ad/0ad/commit/093e1eb23519ab4a4633a999a555a58e4fd5343e.patch";
|
||||
hash = "sha256-NuWO64narU1JID/F3cj7lJKjo96XR7gSW0w8I3/hhuw=";
|
||||
})
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
# Delete shipped libraries which we don't need.
|
||||
|
||||
@@ -27,12 +27,12 @@ rec {
|
||||
stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest;
|
||||
|
||||
production = generic {
|
||||
version = "535.146.02";
|
||||
sha256_64bit = "sha256-Sf0cyeRFyYspP3xm82vs/hLMwd6WDf/z8dyWujqcv3A=";
|
||||
sha256_aarch64 = "sha256-8G0oNdaVWxIGwVaQSw/cojy4TIAuiUBF3B98BI4hEec=";
|
||||
openSha256 = "sha256-Oyllcy3uYYK912CIusMwjKKHtMgoyOxpZWQQ8hIycuk=";
|
||||
settingsSha256 = "sha256-IrN2NaPrZSN0sCZqYNJ43iCicX3ziwUgyLLSRzp9sHQ=";
|
||||
persistencedSha256 = "sha256-trIddaTgKXszEJunK+t6D+e3HbLDTfAsitdEYRgwRNQ=";
|
||||
version = "535.154.05";
|
||||
sha256_64bit = "sha256-fpUGXKprgt6SYRDxSCemGXLrEsIA6GOinp+0eGbqqJg=";
|
||||
sha256_aarch64 = "sha256-G0/GiObf/BZMkzzET8HQjdIcvCSqB1uhsinro2HLK9k=";
|
||||
openSha256 = "sha256-wvRdHguGLxS0mR06P5Qi++pDJBCF8pJ8hr4T8O6TJIo=";
|
||||
settingsSha256 = "sha256-9wqoDEWY4I7weWW05F4igj1Gj9wjHsREFMztfEmqm10=";
|
||||
persistencedSha256 = "sha256-d0Q3Lk80JqkS1B54Mahu2yY/WocOqFFbZVBh+ToGhaE=";
|
||||
};
|
||||
|
||||
latest = selectHighestVersion production (generic {
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, writeText
|
||||
, substituteAll
|
||||
, meson
|
||||
, pkg-config
|
||||
, ninja
|
||||
@@ -16,11 +17,12 @@
|
||||
, pango
|
||||
, systemd
|
||||
, xorg
|
||||
, fontconfig
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "plymouth";
|
||||
version = "23.360.11";
|
||||
version = "24.004.60";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@@ -29,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "plymouth";
|
||||
repo = "plymouth";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-Uun4KtrbkFCiGq3WpZlZ8NKKCOnM+jcgYa8qoqAYdaw=";
|
||||
hash = "sha256-9JmZCm8bjteJTQrMSJeL4x2CAI6RpKowFUDSCcMS4MM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -37,6 +39,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./dont-create-broken-symlink.patch
|
||||
# add support for loading plugins from /run to assist NixOS module
|
||||
./add-runtime-plugin-path.patch
|
||||
# fix FHS hardcoded paths
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
fcmatch = "${fontconfig}/bin/fc-match";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
diff --git a/src/plugins/controls/label-freetype/plugin.c b/src/plugins/controls/label-freetype/plugin.c
|
||||
index 917b04c0..83f2bec2 100644
|
||||
--- a/src/plugins/controls/label-freetype/plugin.c
|
||||
+++ b/src/plugins/controls/label-freetype/plugin.c
|
||||
@@ -127,7 +127,7 @@ find_default_font_path (void)
|
||||
FILE *fp;
|
||||
static char fc_match_out[PATH_MAX];
|
||||
|
||||
- fp = popen ("/usr/bin/fc-match -f %{file}", "r");
|
||||
+ fp = popen ("@fcmatch@ -f %{file}", "r");
|
||||
if (!fp)
|
||||
return FONT_FALLBACK;
|
||||
|
||||
@@ -144,7 +144,7 @@ find_default_monospace_font_path (void)
|
||||
FILE *fp;
|
||||
static char fc_match_out[PATH_MAX];
|
||||
|
||||
- fp = popen ("/usr/bin/fc-match -f %{file} monospace", "r");
|
||||
+ fp = popen ("@fcmatch@ -f %{file} monospace", "r");
|
||||
if (!fp)
|
||||
return MONOSPACE_FONT_FALLBACK;
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "prometheus-nats-exporter";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nats-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TsFj/iUG/PkGvVVn5RSWwEnHsEIGWMY8iapBHVpzt1c=";
|
||||
sha256 = "sha256-Zg4zmb0tvu7JPv9XS5Qd5o/ClnODSPz36isjUbFM1ec=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-IoguUXHxEeyHb2io41ROgam8+7vD5WKzEWwNh4Dlk1o=";
|
||||
vendorHash = "sha256-VygRE6YviSSIYpMbTEPndR6WUmLAZDwgvuJcwBuizck=";
|
||||
|
||||
preCheck = ''
|
||||
# Fix `insecure algorithm SHA1-RSA` problem
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
# CI-related Scripts
|
||||
|
||||
This directory contains scripts used and related to the CI running the `pkgs/by-name` checks in Nixpkgs. See also the [CI GitHub Action](../../../../.github/workflows/check-by-name.yml).
|
||||
This directory contains scripts and files used and related to the CI running the `pkgs/by-name` checks in Nixpkgs.
|
||||
See also the [CI GitHub Action](../../../../.github/workflows/check-by-name.yml).
|
||||
|
||||
## `./run-local.sh BASE_BRANCH [REPOSITORY]`
|
||||
|
||||
@@ -15,12 +16,18 @@ Arguments:
|
||||
- `BASE_BRANCH`: The base branch to use, e.g. master or release-23.11
|
||||
- `REPOSITORY`: The repository to fetch the base branch from, defaults to https://github.com/NixOS/nixpkgs.git
|
||||
|
||||
## `./fetch-tool.sh BASE_BRANCH OUTPUT_PATH`
|
||||
## `./update-pinned-tool.sh`
|
||||
|
||||
Fetches the Hydra-prebuilt nixpkgs-check-by-name to use from the NixOS channel corresponding to the given base branch.
|
||||
Updates the pinned CI tool in [`./pinned-tool.json`](./pinned-tool.json) to the
|
||||
[latest version from the `nixos-unstable` channel](https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.tests.nixpkgs-check-by-name.x86_64-linux)
|
||||
|
||||
This script is called manually once the CI tooling needs to be updated.
|
||||
|
||||
## `./fetch-pinned-tool.sh OUTPUT_PATH`
|
||||
|
||||
Fetches the pinned tooling specified in [`./pinned-tool.json`](./pinned-tool.json).
|
||||
|
||||
This script is used both by [`./run-local.sh`](#run-local-sh-base-branch-repository) and CI.
|
||||
|
||||
Arguments:
|
||||
- `BASE_BRANCH`: The base branch to use, e.g. master or release-23.11
|
||||
- `OUTPUT_PATH`: The output symlink path for the tool
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
#!/usr/bin/env bash
|
||||
# Try to not use nix-shell here to avoid fetching Nixpkgs,
|
||||
# especially since this is used in CI
|
||||
# The only dependency is `jq`, which in CI is implicitly available
|
||||
# And when run from ./run-local.sh is provided by that parent script
|
||||
|
||||
set -o pipefail -o errexit -o nounset
|
||||
|
||||
trace() { echo >&2 "$@"; }
|
||||
|
||||
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
|
||||
|
||||
pin_file=$SCRIPT_DIR/pinned-tool.json
|
||||
|
||||
if (( $# < 1 )); then
|
||||
trace "Usage: $0 fetch OUTPUT_PATH"
|
||||
trace "OUTPUT_PATH: The output symlink path for the tool"
|
||||
exit 1
|
||||
fi
|
||||
output=$1
|
||||
|
||||
trace "Reading $pin_file.. "
|
||||
rev=$(jq -r .rev "$SCRIPT_DIR"/pinned-tool.json)
|
||||
trace -e "Git revision is \e[34m$rev\e[0m"
|
||||
path=$(jq -r .path "$SCRIPT_DIR"/pinned-tool.json)
|
||||
trace "Tooling path is $path"
|
||||
|
||||
trace -n "Fetching the prebuilt version of nixpkgs-check-by-name.. "
|
||||
nix-store --add-root "$output" -r "$path" >/dev/null
|
||||
realpath "$output"
|
||||
@@ -1,47 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
# Fetches the prebuilt nixpkgs-check-by-name to use from
|
||||
# the NixOS channel corresponding to the given base branch
|
||||
|
||||
set -o pipefail -o errexit -o nounset
|
||||
|
||||
trace() { echo >&2 "$@"; }
|
||||
|
||||
if (( $# < 2 )); then
|
||||
trace "Usage: $0 BASE_BRANCH OUTPUT_PATH"
|
||||
trace "BASE_BRANCH: The base branch to use, e.g. master or release-23.11"
|
||||
trace "OUTPUT_PATH: The output symlink path for the tool"
|
||||
exit 1
|
||||
fi
|
||||
baseBranch=$1
|
||||
output=$2
|
||||
|
||||
trace -n "Determining the channel to use for PR base branch $baseBranch.. "
|
||||
if [[ "$baseBranch" =~ ^(release|staging|staging-next)-([0-9][0-9]\.[0-9][0-9])$ ]]; then
|
||||
# Use the release channel for all PRs to release-XX.YY, staging-XX.YY and staging-next-XX.YY
|
||||
preferredChannel=nixos-${BASH_REMATCH[2]}
|
||||
else
|
||||
# Use the nixos-unstable channel for all other PRs
|
||||
preferredChannel=nixos-unstable
|
||||
fi
|
||||
|
||||
# Check that the channel exists. It doesn't exist for fresh release branches
|
||||
if curl -fSs "https://channels.nixos.org/$preferredChannel"; then
|
||||
channel=$preferredChannel
|
||||
trace "$channel"
|
||||
else
|
||||
# Fall back to nixos-unstable, makes sense for fresh release branches
|
||||
channel=nixos-unstable
|
||||
trace -e "\e[33mWarning: Preferred channel $preferredChannel could not be fetched, using fallback: $channel\e[0m"
|
||||
fi
|
||||
|
||||
trace -n "Fetching latest version of channel $channel.. "
|
||||
# This is probably the easiest way to get Nix to output the path to a downloaded channel!
|
||||
nixpkgs=$(nix-instantiate --find-file nixpkgs -I nixpkgs=channel:"$channel")
|
||||
trace "$nixpkgs"
|
||||
|
||||
# This file only exists in channels
|
||||
trace -e "Git revision of channel $channel is \e[34m$(<"$nixpkgs/.git-revision")\e[0m"
|
||||
|
||||
trace -n "Fetching the prebuilt version of nixpkgs-check-by-name.. "
|
||||
nix-build -o "$output" "$nixpkgs" -A tests.nixpkgs-check-by-name -j 0 >/dev/null
|
||||
realpath "$output" >&2
|
||||
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d",
|
||||
"path": "/nix/store/qlls5ca8q88qpyygg9ddi60gl1nmvpij-nixpkgs-check-by-name"
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p jq
|
||||
|
||||
set -o pipefail -o errexit -o nounset
|
||||
|
||||
@@ -61,7 +62,7 @@ trace -n "Merging base branch into the HEAD commit in $tmp/merged.. "
|
||||
git -C "$tmp/merged" merge -q --no-edit "$baseSha"
|
||||
trace -e "\e[34m$(git -C "$tmp/merged" rev-parse HEAD)\e[0m"
|
||||
|
||||
"$tmp/merged/pkgs/test/nixpkgs-check-by-name/scripts/fetch-tool.sh" "$baseBranch" "$tmp/tool"
|
||||
"$tmp/merged/pkgs/test/nixpkgs-check-by-name/scripts/fetch-pinned-tool.sh" "$tmp/tool"
|
||||
|
||||
trace "Running nixpkgs-check-by-name.."
|
||||
"$tmp/tool/bin/nixpkgs-check-by-name" --base "$tmp/base" "$tmp/merged"
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p jq
|
||||
|
||||
set -o pipefail -o errexit -o nounset
|
||||
|
||||
trace() { echo >&2 "$@"; }
|
||||
|
||||
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
|
||||
|
||||
channel=nixos-unstable
|
||||
pin_file=$SCRIPT_DIR/pinned-tool.json
|
||||
|
||||
trace -n "Fetching latest version of channel $channel.. "
|
||||
# This is probably the easiest way to get Nix to output the path to a downloaded channel!
|
||||
nixpkgs=$(nix-instantiate --find-file nixpkgs -I nixpkgs=channel:"$channel")
|
||||
trace "$nixpkgs"
|
||||
|
||||
# This file only exists in channels
|
||||
rev=$(<"$nixpkgs/.git-revision")
|
||||
trace -e "Git revision of channel $channel is \e[34m$rev\e[0m"
|
||||
|
||||
|
||||
trace -n "Fetching the prebuilt version of nixpkgs-check-by-name.. "
|
||||
path=$(nix-build --no-out-link "$nixpkgs" -A tests.nixpkgs-check-by-name -j 0 | tee /dev/stderr)
|
||||
|
||||
trace "Updating $pin_file"
|
||||
jq -n \
|
||||
--arg rev "$rev" \
|
||||
--arg path "$path" \
|
||||
'$ARGS.named' \
|
||||
> "$pin_file"
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "chezmoi";
|
||||
version = "2.42.3";
|
||||
version = "2.45.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twpayne";
|
||||
repo = "chezmoi";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Hw/yoQzwzyicFXsbNlBjL2S+pC23N+sC0R3dijMP2Gs=";
|
||||
hash = "sha256-h17qbuicwYo2/ygJbhJbLqdcFWgZO/Sz8WQC/Addasc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xBsjK2QCW5I9PGPNZWs3uuiBptV+EHSmAuUEWwvV/C0=";
|
||||
vendorHash = "sha256-NqCNP+oG8+x6vYaV9bDfn8+Q1nbxV3L3vs8L4iYgypU=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, wheel
|
||||
, pytestCheckHook
|
||||
, dnspython
|
||||
, fqdn
|
||||
@@ -31,7 +30,6 @@ buildPythonPackage rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
, pythonOlder
|
||||
, dnspython
|
||||
, setuptools
|
||||
, wheel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -25,7 +24,6 @@ buildPythonPackage rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, octodns
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
, requests-mock
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "octodns-gandi";
|
||||
version = "0.0.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "octodns";
|
||||
repo = "octodns-gandi";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aZUVdCeIbyXBgy8HNf6bZSmjdRzIvQkCEzndKGyuTkw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
octodns
|
||||
requests
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "octodns_gandi" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gandi v5 API provider for octoDNS";
|
||||
homepage = "https://github.com/octodns/octodns-gandi";
|
||||
changelog = "https://github.com/octodns/octodns-gandi/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ onny ];
|
||||
};
|
||||
}
|
||||
@@ -7,7 +7,6 @@
|
||||
, requests
|
||||
, requests-mock
|
||||
, setuptools
|
||||
, wheel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -27,7 +26,6 @@ buildPythonPackage rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
, requests
|
||||
, requests-mock
|
||||
, setuptools
|
||||
, wheel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -26,7 +25,6 @@ buildPythonPackage rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -1,36 +1,38 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
addressable (2.8.1)
|
||||
addressable (2.8.6)
|
||||
public_suffix (>= 2.0.2, < 6.0)
|
||||
base64 (0.2.0)
|
||||
dotenv (2.8.1)
|
||||
faraday (2.7.2)
|
||||
faraday (2.8.1)
|
||||
base64
|
||||
faraday-net_http (>= 2.0, < 3.1)
|
||||
ruby2_keywords (>= 0.0.4)
|
||||
faraday-net_http (3.0.2)
|
||||
licensee (9.16.0)
|
||||
licensee (9.16.1)
|
||||
dotenv (~> 2.0)
|
||||
octokit (>= 4.20, < 7.0)
|
||||
octokit (>= 4.20, < 9.0)
|
||||
reverse_markdown (>= 1, < 3)
|
||||
rugged (>= 0.24, < 2.0)
|
||||
thor (>= 0.19, < 2.0)
|
||||
mini_portile2 (2.8.1)
|
||||
nokogiri (1.13.10)
|
||||
mini_portile2 (~> 2.8.0)
|
||||
mini_portile2 (2.8.5)
|
||||
nokogiri (1.16.0)
|
||||
mini_portile2 (~> 2.8.2)
|
||||
racc (~> 1.4)
|
||||
octokit (6.0.1)
|
||||
octokit (8.0.0)
|
||||
faraday (>= 1, < 3)
|
||||
sawyer (~> 0.9)
|
||||
public_suffix (5.0.1)
|
||||
racc (1.6.2)
|
||||
public_suffix (5.0.4)
|
||||
racc (1.7.3)
|
||||
reverse_markdown (2.1.1)
|
||||
nokogiri
|
||||
ruby2_keywords (0.0.5)
|
||||
rugged (1.5.0.1)
|
||||
rugged (1.7.1)
|
||||
sawyer (0.9.2)
|
||||
addressable (>= 2.3.5)
|
||||
faraday (>= 0.17.3, < 3)
|
||||
thor (1.2.1)
|
||||
thor (1.3.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
@@ -39,4 +41,4 @@ DEPENDENCIES
|
||||
licensee
|
||||
|
||||
BUNDLED WITH
|
||||
2.3.26
|
||||
2.4.22
|
||||
|
||||
@@ -5,10 +5,20 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw";
|
||||
sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.1";
|
||||
version = "2.8.6";
|
||||
};
|
||||
base64 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.0";
|
||||
};
|
||||
dotenv = {
|
||||
groups = ["default"];
|
||||
@@ -21,15 +31,15 @@
|
||||
version = "2.8.1";
|
||||
};
|
||||
faraday = {
|
||||
dependencies = ["faraday-net_http" "ruby2_keywords"];
|
||||
dependencies = ["base64" "faraday-net_http" "ruby2_keywords"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17lacy6n0hsayafvgxgzmngfq2x62b2arbn32bj2yyzmgxwyxhqn";
|
||||
sha256 = "19p45ryrvxff6ggdj4fq76dk7wlkfgrh474c3kwzdsjx3xpdq8x8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.7.2";
|
||||
version = "2.8.1";
|
||||
};
|
||||
faraday-net_http = {
|
||||
groups = ["default"];
|
||||
@@ -47,20 +57,20 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0i4hs0vbgp0w3pdddr37zhydm16af122rmr0w39v3nqrj1ir65kv";
|
||||
sha256 = "05g5w9c4jlfhwn0hfz117s1c7hfdm5yn7cywr4mah7xr41yvbh04";
|
||||
type = "gem";
|
||||
};
|
||||
version = "9.16.0";
|
||||
version = "9.16.1";
|
||||
};
|
||||
mini_portile2 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp";
|
||||
sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.1";
|
||||
version = "2.8.5";
|
||||
};
|
||||
nokogiri = {
|
||||
dependencies = ["mini_portile2" "racc"];
|
||||
@@ -68,10 +78,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk";
|
||||
sha256 = "1l8b0i24h4irivyhwy9xmkjbggw86cxkzkiqdqg0jpcp9qc8h4rl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.13.10";
|
||||
version = "1.16.0";
|
||||
};
|
||||
octokit = {
|
||||
dependencies = ["faraday" "sawyer"];
|
||||
@@ -79,30 +89,30 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0a5iy1v1n8f5ggp6q601mn8dz1n08ffs4gv0zsh5ca68j8dfmpx5";
|
||||
sha256 = "11fhv1a43c51jkgmqf62aypf9yw74lc6ph4qmzsh2bydwwzbwqn3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.0.1";
|
||||
version = "8.0.0";
|
||||
};
|
||||
public_suffix = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35";
|
||||
sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.0.1";
|
||||
version = "5.0.4";
|
||||
};
|
||||
racc = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq";
|
||||
sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.2";
|
||||
version = "1.7.3";
|
||||
};
|
||||
reverse_markdown = {
|
||||
dependencies = ["nokogiri"];
|
||||
@@ -130,10 +140,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "02h1cv73znwfgy61mqmfylcfvwyyp3lddiz3njgivfx234mpz50x";
|
||||
sha256 = "02m9zksfy3dwzhbv56xq2wwmlghca5209hdg895pi2x2d2sbkahi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.0.1";
|
||||
version = "1.7.1";
|
||||
};
|
||||
sawyer = {
|
||||
dependencies = ["addressable" "faraday"];
|
||||
@@ -151,9 +161,9 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi";
|
||||
sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -15,6 +15,11 @@ python3.pkgs.buildPythonApplication rec {
|
||||
hash = "sha256-tnCiI4bte2RSWSkEL2rwFz6WFjfRMMFiEBOvv3QMyos=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Requirements are pinned
|
||||
sed -i 's/==.*//' requirements/base.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
];
|
||||
@@ -68,7 +73,8 @@ python3.pkgs.buildPythonApplication rec {
|
||||
'';
|
||||
homepage = "https://github.com/laramies/theHarvester";
|
||||
changelog = "https://github.com/laramies/theHarvester/releases/tag/${version}";
|
||||
maintainers = with maintainers; [ c0bw3b fab treemo ];
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ c0bw3b fab treemo ];
|
||||
mainProgram = "theHarvester";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -13,20 +13,20 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "mdcat";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "swsnr";
|
||||
repo = "mdcat";
|
||||
rev = "mdcat-${version}";
|
||||
hash = "sha256-b/iLjqNcCUGaGllSXA5eq04mz/I8cbz0pXJ/Dn+yDDo=";
|
||||
hash = "sha256-2ThjIv77kdjHyOpGcQplYZXPdu+cN4oBnyHRGptN7f4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ];
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
|
||||
|
||||
cargoHash = "sha256-RGpqTVafG7YzeUwTj8uU0PsqX2bq3BVg/ci9MVyeH80=";
|
||||
cargoHash = "sha256-y828L8HHkFeem/76yizQWX7DpCGQP+HzJP+pQnxAn70=";
|
||||
|
||||
nativeCheckInputs = [ ansi2html ];
|
||||
# Skip tests that use the network and that include files.
|
||||
@@ -56,6 +56,7 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = with lib; {
|
||||
description = "cat for markdown";
|
||||
homepage = "https://github.com/swsnr/mdcat";
|
||||
changelog = "https://github.com/swsnr/mdcat/releases/tag/mdcat-${version}";
|
||||
license = with licenses; [ mpl20 ];
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
|
||||
@@ -10,6 +10,9 @@
|
||||
, gnutar
|
||||
, util-linux
|
||||
, cpio
|
||||
, bash
|
||||
, coreutils
|
||||
, btrfs-progs
|
||||
|
||||
# Python packages
|
||||
, setuptools
|
||||
@@ -55,7 +58,7 @@ let
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "mkosi";
|
||||
version = "19";
|
||||
version = "20.1";
|
||||
format = "pyproject";
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
@@ -64,7 +67,7 @@ buildPythonApplication rec {
|
||||
owner = "systemd";
|
||||
repo = "mkosi";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KjJM+KZCgUnsaEN2ZorhH0AR5nmiV2h3i7Vb3KdGFtI=";
|
||||
hash = "sha256-gkn5d9ybfrV/QYKSUyzyHAouU++NCEBDT22zFMrEZt8=";
|
||||
};
|
||||
|
||||
# Fix ctypes finding library
|
||||
@@ -88,7 +91,10 @@ buildPythonApplication rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bash
|
||||
btrfs-progs
|
||||
bubblewrap
|
||||
coreutils
|
||||
cpio
|
||||
gnutar
|
||||
kmod
|
||||
|
||||
@@ -847,6 +847,7 @@ with pkgs;
|
||||
|
||||
octodns-providers = recurseIntoAttrs {
|
||||
bind = python3Packages.callPackage ../tools/networking/octodns/providers/bind { };
|
||||
gandi = python3Packages.callPackage ../tools/networking/octodns/providers/gandi { };
|
||||
hetzner = python3Packages.callPackage ../tools/networking/octodns/providers/hetzner { };
|
||||
powerdns = python3Packages.callPackage ../tools/networking/octodns/providers/powerdns { };
|
||||
};
|
||||
@@ -29718,6 +29719,8 @@ with pkgs;
|
||||
|
||||
office-code-pro = callPackage ../data/fonts/office-code-pro { };
|
||||
|
||||
_0xproto = callPackage ../data/fonts/0xproto { };
|
||||
|
||||
oldstandard = callPackage ../data/fonts/oldstandard { };
|
||||
|
||||
oldsindhi = callPackage ../data/fonts/oldsindhi { };
|
||||
|
||||
Reference in New Issue
Block a user