Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
0ceaddfbc3
53 changed files with 1877 additions and 1219 deletions
|
|
@ -309,9 +309,10 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
`services.dnsmasq.extraConfig` will be deprecated when NixOS 22.11 reaches
|
||||
end of life.
|
||||
|
||||
- The `dokuwiki` service now takes configuration via the `services.dokuwiki.sites.<name>.settings` attribute set, `extraConfig` is deprecated and will be removed.
|
||||
The `{aclUse,superUser,disableActions}` attributes have been renamed, `pluginsConfig` now also accepts an attribute set of booleans, passing plain PHP is deprecated.
|
||||
Same applies to `acl` which now also accepts structured settings.
|
||||
- The `dokuwiki` service is now configured via `services.dokuwiki.sites.<name>.settings` attribute set; `extraConfig` has been removed.
|
||||
The `{aclUse,superUser,disableActions}` attributes have been renamed accordingly. `pluginsConfig` now only accepts an attribute set of booleans.
|
||||
Passing plain PHP is no longer possible.
|
||||
Same applies to `acl` which now also only accepts structured `settings`.
|
||||
|
||||
- The `zsh` package changes the way to set environment variables on NixOS systems where `programs.zsh.enable` equals `false`. It now sources `/etc/set-environment` when reading the system-level `zshenv` file. Before, it sourced `/etc/profile` when reading the system-level `zprofile` file.
|
||||
|
||||
|
|
|
|||
|
|
@ -85,12 +85,7 @@ sub debug {
|
|||
|
||||
|
||||
# nixpkgs.system
|
||||
my ($status, @systemLines) = runCommand("@nixInstantiate@ --impure --eval --expr builtins.currentSystem");
|
||||
if ($status != 0 || join("", @systemLines) =~ /error/) {
|
||||
die "Failed to retrieve current system type from nix.\n";
|
||||
}
|
||||
chomp(my $system = @systemLines[0]);
|
||||
push @attrs, "nixpkgs.hostPlatform = lib.mkDefault $system;";
|
||||
push @attrs, "nixpkgs.hostPlatform = lib.mkDefault \"@system@\";";
|
||||
|
||||
|
||||
my $cpuinfo = read_file "/proc/cpuinfo";
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ let
|
|||
name = "nixos-generate-config";
|
||||
src = ./nixos-generate-config.pl;
|
||||
perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl";
|
||||
nixInstantiate = "${pkgs.nix}/bin/nix-instantiate";
|
||||
system = pkgs.stdenv.hostPlatform.system;
|
||||
detectvirt = "${config.systemd.package}/bin/systemd-detect-virt";
|
||||
btrfs = "${pkgs.btrfs-progs}/bin/btrfs";
|
||||
inherit (config.system.nixos-generate-config) configuration desktopConfiguration;
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
with lib;
|
||||
|
||||
let
|
||||
inherit (lib.options) showOption showFiles;
|
||||
|
||||
cfg = config.services.dokuwiki;
|
||||
eachSite = cfg.sites;
|
||||
user = "dokuwiki";
|
||||
|
|
@ -63,7 +65,6 @@ let
|
|||
conf_gen = c: map (v: "$conf${v}") (mkPhpAttrVals c);
|
||||
in writePhpFile "local-${hostName}.php" ''
|
||||
${concatStringsSep "\n" (conf_gen cfg.mergedConfig)}
|
||||
${toString cfg.extraConfig}
|
||||
'';
|
||||
|
||||
dokuwikiPluginsLocalConfig = hostName: cfg: let
|
||||
|
|
@ -90,13 +91,13 @@ let
|
|||
|
||||
page = mkOption {
|
||||
type = types.str;
|
||||
description = "Page or namespace to restrict";
|
||||
description = lib.mdDoc "Page or namespace to restrict";
|
||||
example = "start";
|
||||
};
|
||||
|
||||
actor = mkOption {
|
||||
type = types.str;
|
||||
description = "User or group to restrict";
|
||||
description = lib.mdDoc "User or group to restrict";
|
||||
example = "@external";
|
||||
};
|
||||
|
||||
|
|
@ -112,38 +113,69 @@ let
|
|||
in mkOption {
|
||||
type = types.enum ((attrValues available) ++ (attrNames available));
|
||||
apply = x: if isInt x then x else available.${x};
|
||||
description = ''
|
||||
description = lib.mdDoc ''
|
||||
Permission level to restrict the actor(s) to.
|
||||
See <https://www.dokuwiki.org/acl#background_info> for explanation
|
||||
'';
|
||||
example = "read";
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
siteOpts = { config, lib, name, ... }:
|
||||
# The current implementations of `doRename`, `mkRenamedOptionModule` do not provide the full options path when used with submodules.
|
||||
# They would only show `settings.useacl' instead of `services.dokuwiki.sites."site1.local".settings.useacl'
|
||||
# The partial re-implementation of these functions is done to help users in debugging by showing the full path.
|
||||
mkRenamed = from: to: { config, options, name, ... }: let
|
||||
pathPrefix = [ "services" "dokuwiki" "sites" name ];
|
||||
fromPath = pathPrefix ++ from;
|
||||
fromOpt = getAttrFromPath from options;
|
||||
toOp = getAttrsFromPath to config;
|
||||
toPath = pathPrefix ++ to;
|
||||
in {
|
||||
options = setAttrByPath from (mkOption {
|
||||
visible = false;
|
||||
description = lib.mdDoc "Alias of {option}${showOption toPath}";
|
||||
apply = x: builtins.trace "Obsolete option `${showOption fromPath}' is used. It was renamed to ${showOption toPath}" toOp;
|
||||
});
|
||||
config = mkMerge [
|
||||
{
|
||||
warnings = optional fromOpt.isDefined
|
||||
"The option `${showOption fromPath}' defined in ${showFiles fromOpt.files} has been renamed to `${showOption toPath}'.";
|
||||
}
|
||||
(lib.modules.mkAliasAndWrapDefsWithPriority (setAttrByPath to) fromOpt)
|
||||
];
|
||||
};
|
||||
|
||||
siteOpts = { options, config, lib, name, ... }:
|
||||
{
|
||||
imports = [
|
||||
# NOTE: These will sadly not print the absolute argument path but only the name. Related to #96006
|
||||
(mkRenamedOptionModule [ "aclUse" ] [ "settings" "useacl" ] )
|
||||
(mkRenamedOptionModule [ "superUser" ] [ "settings" "superuser" ] )
|
||||
(mkRenamedOptionModule [ "disableActions" ] [ "settings" "disableactions" ] )
|
||||
({ config, options, name, ...}: {
|
||||
config.warnings =
|
||||
(optional (isString config.pluginsConfig) ''
|
||||
Passing plain strings to services.dokuwiki.sites.${name}.pluginsConfig has been deprecated and will not be continue to be supported in the future.
|
||||
Please pass structured settings instead.
|
||||
'')
|
||||
++ (optional (isString config.acl) ''
|
||||
Passing a plain string to services.dokuwiki.sites.${name}.acl has been deprecated and will not continue to be supported in the future.
|
||||
Please pass structured settings instead.
|
||||
'')
|
||||
++ (optional (config.extraConfig != null) ''
|
||||
services.dokuwiki.sites.${name}.extraConfig is deprecated and will be removed in the future.
|
||||
Please pass structured settings to services.dokuwiki.sites.${name}.settings instead.
|
||||
'')
|
||||
;
|
||||
(mkRenamed [ "aclUse" ] [ "settings" "useacl" ])
|
||||
(mkRenamed [ "superUser" ] [ "settings" "superuser" ])
|
||||
(mkRenamed [ "disableActions" ] [ "settings" "disableactions" ])
|
||||
({ config, options, ... }: let
|
||||
showPath = suffix: lib.options.showOption ([ "services" "dokuwiki" "sites" name ] ++ suffix);
|
||||
replaceExtraConfig = "Please use `${showPath ["settings"]}' to pass structured settings instead.";
|
||||
ecOpt = options.extraConfig;
|
||||
ecPath = showPath [ "extraConfig" ];
|
||||
in {
|
||||
options.extraConfig = mkOption {
|
||||
visible = false;
|
||||
apply = x: throw "The option ${ecPath} can no longer be used since it's been removed.\n${replaceExtraConfig}";
|
||||
};
|
||||
config.assertions = [
|
||||
{
|
||||
assertion = !ecOpt.isDefined;
|
||||
message = "The option definition `${ecPath}' in ${showFiles ecOpt.files} no longer has any effect; please remove it.\n${replaceExtraConfig}";
|
||||
}
|
||||
{
|
||||
assertion = config.mergedConfig.useacl -> (config.acl != null || config.aclFile != null);
|
||||
message = "Either ${showPath [ "acl" ]} or ${showPath [ "aclFile" ]} is mandatory if ${showPath [ "settings" "useacl" ]} is true";
|
||||
}
|
||||
{
|
||||
assertion = config.usersFile != null -> config.mergedConfig.useacl != false;
|
||||
message = "${showPath [ "settings" "useacl" ]} is required when ${showPath [ "usersFile" ]} is set (Currently defiend as `${config.usersFile}' in ${showFiles options.usersFile.files}).";
|
||||
}
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
|
|
@ -164,7 +196,7 @@ let
|
|||
};
|
||||
|
||||
acl = mkOption {
|
||||
type = with types; nullOr (oneOf [ lines (listOf (submodule aclOpts)) ]);
|
||||
type = with types; nullOr (listOf (submodule aclOpts));
|
||||
default = null;
|
||||
example = literalExpression ''
|
||||
[
|
||||
|
|
@ -203,7 +235,7 @@ let
|
|||
};
|
||||
|
||||
pluginsConfig = mkOption {
|
||||
type = with types; oneOf [lines (attrsOf bool)];
|
||||
type = with types; attrsOf bool;
|
||||
default = {
|
||||
authad = false;
|
||||
authldap = false;
|
||||
|
|
@ -370,36 +402,21 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
# This Option is deprecated and only kept until sometime before 23.05 for compatibility reasons
|
||||
# FIXME (@e1mo): Actually remember removing this before 23.05.
|
||||
visible = false;
|
||||
type = types.nullOr types.lines;
|
||||
default = null;
|
||||
example = ''
|
||||
$conf['title'] = 'My Wiki';
|
||||
$conf['userewrite'] = 1;
|
||||
'';
|
||||
description = lib.mdDoc ''
|
||||
DokuWiki configuration. Refer to
|
||||
<https://www.dokuwiki.org/config>
|
||||
for details on supported values.
|
||||
|
||||
**Note**: Please pass Structured settings via
|
||||
`services.dokuwiki.sites.${name}.settings` instead.
|
||||
'';
|
||||
};
|
||||
|
||||
# Required for the mkRenamedOptionModule
|
||||
# TODO: Remove me once https://github.com/NixOS/nixpkgs/issues/96006 is fixed
|
||||
# or the aclUse, ... options are removed.
|
||||
# or we don't have any more notes about the removal of extraConfig, ...
|
||||
warnings = mkOption {
|
||||
type = types.listOf types.unspecified;
|
||||
default = [ ];
|
||||
visible = false;
|
||||
internal = true;
|
||||
};
|
||||
|
||||
assertions = mkOption {
|
||||
type = types.listOf types.unspecified;
|
||||
default = [ ];
|
||||
visible = false;
|
||||
internal = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
@ -435,16 +452,7 @@ in
|
|||
|
||||
warnings = flatten (mapAttrsToList (_: cfg: cfg.warnings) eachSite);
|
||||
|
||||
assertions = flatten (mapAttrsToList (hostName: cfg:
|
||||
[{
|
||||
assertion = cfg.mergedConfig.useacl -> (cfg.acl != null || cfg.aclFile != null);
|
||||
message = "Either services.dokuwiki.sites.${hostName}.acl or services.dokuwiki.sites.${hostName}.aclFile is mandatory if settings.useacl is true";
|
||||
}
|
||||
{
|
||||
assertion = cfg.usersFile != null -> cfg.mergedConfig.useacl != false;
|
||||
message = "services.dokuwiki.sites.${hostName}.settings.useacl must must be true if usersFile is not null";
|
||||
}
|
||||
]) eachSite);
|
||||
assertions = flatten (mapAttrsToList (_: cfg: cfg.assertions) eachSite);
|
||||
|
||||
services.phpfpm.pools = mapAttrs' (hostName: cfg: (
|
||||
nameValuePair "dokuwiki-${hostName}" {
|
||||
|
|
|
|||
|
|
@ -156,8 +156,8 @@ in
|
|||
};
|
||||
|
||||
documentation = [
|
||||
"https://join-lemmy.org/docs/en/administration/from_scratch.html"
|
||||
"https://join-lemmy.org/docs"
|
||||
"https://join-lemmy.org/docs/en/admins/from_scratch.html"
|
||||
"https://join-lemmy.org/docs/en/"
|
||||
];
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
|
@ -185,8 +185,8 @@ in
|
|||
};
|
||||
|
||||
documentation = [
|
||||
"https://join-lemmy.org/docs/en/administration/from_scratch.html"
|
||||
"https://join-lemmy.org/docs"
|
||||
"https://join-lemmy.org/docs/en/admins/from_scratch.html"
|
||||
"https://join-lemmy.org/docs/en/"
|
||||
];
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
|
|
|||
|
|
@ -42,13 +42,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "strawberry";
|
||||
version = "1.0.15";
|
||||
version = "1.0.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonaski";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-P7M7UIRFr0pABNhb63pV3TqIdTP8Xox4f0BT2ii9rRE=";
|
||||
hash = "sha256-Z2b3/pIdSmZUO724hkdn78YrVuRiXALbTOUs+KJMjvU=";
|
||||
};
|
||||
|
||||
# the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead
|
||||
|
|
|
|||
1399
pkgs/applications/blockchains/lighthouse/Cargo.lock
generated
1399
pkgs/applications/blockchains/lighthouse/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,26 +1,28 @@
|
|||
{ clang
|
||||
, cmake
|
||||
, CoreFoundation
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, lib
|
||||
, lighthouse
|
||||
, llvmPackages
|
||||
, nix-update-script
|
||||
, nodePackages
|
||||
, perl
|
||||
, pkg-config
|
||||
, postgresql
|
||||
, protobuf
|
||||
, rustPlatform
|
||||
, Security
|
||||
, CoreFoundation
|
||||
, sqlite
|
||||
, stdenv
|
||||
, SystemConfiguration
|
||||
, testers
|
||||
, unzip
|
||||
, nix-update-script
|
||||
, SystemConfiguration
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lighthouse";
|
||||
version = "3.5.1";
|
||||
version = "4.1.0";
|
||||
|
||||
# lighthouse/common/deposit_contract/build.rs
|
||||
depositContractSpecVersion = "0.12.1";
|
||||
|
|
@ -30,15 +32,23 @@ rustPlatform.buildRustPackage rec {
|
|||
owner = "sigp";
|
||||
repo = "lighthouse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oF32s1nfzEZbaNUi5sQSrotcyOSinULj/qrRQWdMXHg=";
|
||||
hash = "sha256-QVAFzV9sao8+eegI7bLfm+pPHyvDFhnADS80+nqqgtE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./use-system-sqlite.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cp ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"amcl-0.3.0" = "sha256-Mj4dXTlGVSleFfuTKgVDQ7S3jANMsdtVE5L90WGxA4U=";
|
||||
"arbitrary-1.2.2" = "sha256-39ZefB5Xok28y8lIdKleILBv4aokY90eMOssxUtU7yA=";
|
||||
"beacon-api-client-0.1.0" = "sha256-vqTC7bKXgliN7qd5LstNM5O6jRnn4aV/paj88Mua+Bc=";
|
||||
"arbitrary-1.3.0" = "sha256-BMxcBfxBRf+Kb0Tz55jtFbwokSeD2GPtB+KV8Wbne0g=";
|
||||
"beacon-api-client-0.1.0" = "sha256-fI8qST6HZrchg7yr/nVtRNrsW3f5ONSX+mGRYW+iiqA=";
|
||||
"ethereum-consensus-0.1.1" = "sha256-aBrZ786Me0BWpnncxQc5MT3r+O0yLQhqGKFBiNTdqSA=";
|
||||
"libmdbx-0.1.4" = "sha256-NMsR/Wl1JIj+YFPyeMMkrJFfoS07iEAKEQawO89a+/Q=";
|
||||
"lmdb-rkv-0.14.0" = "sha256-sxmguwqqcyOlfXOZogVz1OLxfJPo+Q0+UjkROkbbOCk=";
|
||||
|
|
@ -50,11 +60,19 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
buildFeatures = [ "modern" "gnosis" ];
|
||||
|
||||
nativeBuildInputs = [ rustPlatform.bindgenHook cmake perl protobuf ];
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
cmake
|
||||
perl
|
||||
pkg-config
|
||||
protobuf
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
buildInputs = [
|
||||
sqlite
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
CoreFoundation
|
||||
Security
|
||||
SystemConfiguration
|
||||
];
|
||||
|
||||
|
|
@ -79,7 +97,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
checkFeatures = [ ];
|
||||
|
||||
# All of these tests require network access
|
||||
# All of these tests require network access and/or docker
|
||||
cargoTestFlags = [
|
||||
"--workspace"
|
||||
"--exclude beacon_node"
|
||||
|
|
@ -88,6 +106,7 @@ rustPlatform.buildRustPackage rec {
|
|||
"--exclude lighthouse"
|
||||
"--exclude lighthouse_network"
|
||||
"--exclude slashing_protection"
|
||||
"--exclude watch"
|
||||
"--exclude web3signer_tests"
|
||||
];
|
||||
|
||||
|
|
@ -95,6 +114,7 @@ rustPlatform.buildRustPackage rec {
|
|||
checkFlags = [
|
||||
"--skip service::tests::tests::test_dht_persistence"
|
||||
"--skip time::test::test_reinsertion_updates_timeout"
|
||||
|
||||
] ++ lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [
|
||||
"--skip subnet_service::tests::sync_committee_service::same_subscription_with_lower_until_epoch"
|
||||
"--skip subnet_service::tests::sync_committee_service::subscribe_and_unsubscribe"
|
||||
|
|
@ -102,6 +122,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
nativeCheckInputs = [
|
||||
nodePackages.ganache
|
||||
postgresql
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
diff --git a/consensus/types/Cargo.toml b/consensus/types/Cargo.toml
|
||||
index 46b88af66..c8c909234 100644
|
||||
--- a/consensus/types/Cargo.toml
|
||||
+++ b/consensus/types/Cargo.toml
|
||||
@@ -37,7 +37,7 @@ cached_tree_hash = { path = "../cached_tree_hash" }
|
||||
serde_yaml = "0.8.13"
|
||||
tempfile = "3.1.0"
|
||||
derivative = "2.1.1"
|
||||
-rusqlite = { version = "0.28.0", features = ["bundled"], optional = true }
|
||||
+rusqlite = { version = "0.28.0", optional = true }
|
||||
# The arbitrary dependency is enabled by default since Capella to avoid complexity introduced by
|
||||
# `AbstractExecPayload`
|
||||
arbitrary = { version = "1.0", features = ["derive"] }
|
||||
diff --git a/validator_client/slashing_protection/Cargo.toml b/validator_client/slashing_protection/Cargo.toml
|
||||
index 631e54dc4..dec95156b 100644
|
||||
--- a/validator_client/slashing_protection/Cargo.toml
|
||||
+++ b/validator_client/slashing_protection/Cargo.toml
|
||||
@@ -12,7 +12,7 @@ path = "tests/main.rs"
|
||||
[dependencies]
|
||||
tempfile = "3.1.0"
|
||||
types = { path = "../../consensus/types" }
|
||||
-rusqlite = { version = "0.28.0", features = ["bundled"] }
|
||||
+rusqlite = { version = "0.28.0" }
|
||||
r2d2 = "0.8.9"
|
||||
r2d2_sqlite = "0.21.0"
|
||||
serde = "1.0.116"
|
||||
|
|
@ -19,6 +19,9 @@
|
|||
, alejandra
|
||||
, millet
|
||||
, shfmt
|
||||
, autoPatchelfHook
|
||||
, zlib
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -608,8 +611,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "chatgpt-reborn";
|
||||
publisher = "chris-hayes";
|
||||
version = "3.11.2";
|
||||
sha256 = "sha256-YidcekYTgPYlzfmDHHAxywF+bJE8Da3pg/TCumK4Epo=";
|
||||
version = "3.16.1";
|
||||
sha256 = "sha256-RVPA+O0QOtFArWzcuwXMZSpwB3zrPAzVCbEjOzUNH4I=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -804,8 +807,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "composer-php-vscode";
|
||||
publisher = "devsense";
|
||||
version = "1.33.12924";
|
||||
sha256 = "sha256-9Uz8B4qQ57gfETitzRAVEq/Ou/s3jOF/p2EyEDo1jP8=";
|
||||
version = "1.33.13032";
|
||||
sha256 = "sha256-4SL7hPcnxN6Bq0Cclaszk2zlYF1xR2w/8zaJo16OT+U=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.composer-php-vscode/changelog";
|
||||
|
|
@ -818,12 +821,44 @@ let
|
|||
};
|
||||
|
||||
devsense.phptools-vscode = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
mktplcRef = let
|
||||
sources = {
|
||||
"x86_64-linux" = {
|
||||
arch = "linux-x64";
|
||||
sha256 = "sha256-ccMkaXppkgdsN2XtSFaw85xLUCFMDF1z+XidP0KAHCA=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
arch = "darwin-x64";
|
||||
sha256 = "17lsf736jagw2q6dwxvpj2dspiqrlyvmmhv6p6cf81vxijpgmq9d";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
arch = "linux-arm64";
|
||||
sha256 = "1cnfzzpikcsp1l1a8amim0fz5r1pkszn231cfl745ggiksbjyhsp";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
arch = "darwin-arm64";
|
||||
sha256 = "0jli6l9qrssnpm5a3m1g7g1dw2i5bv9wxd0gqg6vda7dwfs2f494";
|
||||
};
|
||||
};
|
||||
in {
|
||||
name = "phptools-vscode";
|
||||
publisher = "devsense";
|
||||
version = "1.33.12924";
|
||||
sha256 = "sha256-ImaGkIe+MTO/utfVh3Giu0+jTSN0mmhgg6LvOod1suE=";
|
||||
};
|
||||
version = "1.33.13032";
|
||||
} // sources.${stdenv.system};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
zlib
|
||||
stdenv.cc.cc.lib
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
chmod +x $out/share/vscode/extensions/devsense.phptools-vscode/out/server/devsense.php.ls
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.phptools-vscode/changelog";
|
||||
description = "A visual studio code extension for full development integration for the PHP language.";
|
||||
|
|
@ -831,6 +866,7 @@ let
|
|||
homepage = "https://github.com/DEVSENSE/phptools-docs";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.drupol ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -838,8 +874,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "profiler-php-vscode";
|
||||
publisher = "devsense";
|
||||
version = "1.33.12924";
|
||||
sha256 = "sha256-6+spMS+oypq8KFW5vsoy0Cmn7RD5L1JQnHSyJAvYhTk=";
|
||||
version = "1.33.13032";
|
||||
sha256 = "sha256-P0lzZkCHtLHJI/gwB+wbrZPR3OOia5VxTMCC2ZQULBg=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.profiler-php-vscode/changelog";
|
||||
|
|
@ -1278,8 +1314,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "chatgpt-vscode";
|
||||
publisher = "genieai";
|
||||
version = "0.0.3";
|
||||
sha256 = "sha256-eSRZ9AdXGqGLQw/jt8JCAsTmkvP0N1g5tFP7s1rBtjM=";
|
||||
version = "0.0.7";
|
||||
sha256 = "sha256-dWp9OYj9OCsNdZiYbgAWWo/OXMjBSlB7sIupdqnQTiU=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -1313,8 +1349,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "github-vscode-theme";
|
||||
publisher = "github";
|
||||
version = "6.3.3";
|
||||
sha256 = "sha256-fN9ljeZlbbSNW9qggLEz5HOLZlPhHmTHNi1VsZo7Uxk=";
|
||||
version = "6.3.4";
|
||||
sha256 = "sha256-JbI0B7jxt/2pNg/hMjAE5pBBa3LbUdi+GF0iEZUDUDM=";
|
||||
};
|
||||
meta = {
|
||||
description = "GitHub theme for VS Code";
|
||||
|
|
@ -1330,8 +1366,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "vscode-github-actions";
|
||||
publisher = "github";
|
||||
version = "0.25.3";
|
||||
sha256 = "sha256-0Ag+xXVt+WBfN+7VmWILYU4RsVs+CBDBpMfUTczDCkI=";
|
||||
version = "0.25.6";
|
||||
sha256 = "sha256-HRj/AQI9E6HDkZ2ok/h/+c9HHq1wVXQPAt5mb/Ij+BI=";
|
||||
};
|
||||
meta = {
|
||||
description = "A Visual Studio Code extension for GitHub Actions workflows and runs for github.com hosted repositories";
|
||||
|
|
@ -2234,8 +2270,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "typst-lsp";
|
||||
publisher = "nvarner";
|
||||
version = "0.3.0";
|
||||
sha256 = "sha256-ek5zXK4ecXwSPMJ4Ihy2l3PMxCdHwJN7dbwZfQVjNG8=";
|
||||
version = "0.4.1";
|
||||
sha256 = "sha256-NZejUb99JDcnqjihLTPkNzVCgpqDkbiwAySbBVZ0esY=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/nvarner.typst-lsp/changelog";
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@
|
|||
|
||||
buildDotnetModule rec {
|
||||
pname = "ryujinx";
|
||||
version = "1.1.700"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
version = "1.1.733"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ryujinx";
|
||||
repo = "Ryujinx";
|
||||
rev = "a1efd87c45027a347e91fd22d42f33c3eed89030";
|
||||
sha256 = "0ng8ph2sdlcrsy4nlyjhff2n0c76nzkakpnks7qrv6ljr911yck1";
|
||||
rev = "9f12e50a546b15533778ed0d8290202af91c10a2";
|
||||
sha256 = "1d1hg2sv0h56a56xnarcfp73df3rbw3iax85g258l6w2kxhkc42a";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
||||
|
|
|
|||
14
pkgs/applications/emulators/ryujinx/deps.nix
generated
14
pkgs/applications/emulators/ryujinx/deps.nix
generated
|
|
@ -20,7 +20,7 @@
|
|||
(fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; })
|
||||
(fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; })
|
||||
(fetchNuGet { pname = "DiscordRichPresence"; version = "1.1.3.18"; sha256 = "0p4bhaggjjfd4gl06yiphqgncxgcq2bws4sjkrw0n2ldf3hgrps3"; })
|
||||
(fetchNuGet { pname = "DynamicData"; version = "7.13.1"; sha256 = "0hy2ba2nkhgp23glkinhfx3v892fkkf4cr9m41daaahnl2r2l8y1"; })
|
||||
(fetchNuGet { pname = "DynamicData"; version = "7.13.5"; sha256 = "088ry176ba314m4hc1vbcxisflqzs7p7vvn8vqzxy3kj1rimgfmf"; })
|
||||
(fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; })
|
||||
(fetchNuGet { pname = "Fizzler"; version = "1.2.1"; sha256 = "1w5jb1d0figbv68dydbnlcsfmqlc3sv9z1zxp7d79dg2dkarc4qm"; })
|
||||
(fetchNuGet { pname = "FluentAvaloniaUI"; version = "1.4.5"; sha256 = "1j5ivy83f13dgn09qrfkq44ijvh0m9rbdx8760g47di70c4lda7j"; })
|
||||
|
|
@ -50,10 +50,10 @@
|
|||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
|
||||
(fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.28.1"; sha256 = "0g5a5w34263psh90mp1403m9bh3pcfw6z29vlzdpllzbifk0licr"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.28.1"; sha256 = "1smsbv400nk4b6x1y9gsk60rlfjmrdvni26d1jnqsxpm1250zdvf"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.28.1"; sha256 = "15bq83wi4h8f1lqinijdqd7vg6n2v77hyza20mjqcp1h3hl2vj43"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.28.1"; sha256 = "0ckpjjdy2rv1z7ivqrkc7z16rcqygxzs0la80g8df68p4xxfa0c5"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.29.0"; sha256 = "06sdjg78764ycaq3bd32daacd9pjsvkihdzrw8d1cnmk3c42kvq3"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.29.0"; sha256 = "0iydfzz4vzzpx24q8mgvc3n289s00inc19x6a0w2v378mx4jkfl0"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.29.0"; sha256 = "04vj5h638ljz2fylr2idgjbfq5lzbw79m5ixcj1ikl4ydl9jhp9p"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.29.0"; sha256 = "05crx7w79m3jxlbnfc2c8i63m5z6h28y04qv6sc84312rzi2yw8c"; })
|
||||
(fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "2.3.2"; sha256 = "115bm7dljchr7c02hiv1r3l21r22wpml1j26fyn2amaflaihpq4l"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.5.0"; sha256 = "00gz2i8kx4mlq1ywj3imvf7wc6qzh0bsnynhw06z0mgyha1a21jy"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
|
||||
|
|
@ -177,7 +177,7 @@
|
|||
(fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; })
|
||||
(fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; })
|
||||
(fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; })
|
||||
(fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.28.1"; sha256 = "0pn9bk0n15136z434x7yxikda5ggwjwka2c7k0qkprnkmk3yifcl"; })
|
||||
(fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.29.0"; sha256 = "09bpj7gginq25fiyq3za5i8wm482qbnx6qhm4dxb95jrl3mmb126"; })
|
||||
(fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; })
|
||||
(fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; })
|
||||
(fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; })
|
||||
|
|
@ -189,7 +189,7 @@
|
|||
(fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
|
||||
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; })
|
||||
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; })
|
||||
(fetchNuGet { pname = "System.Management"; version = "7.0.0"; sha256 = "1x3xwjzkmlcrj6rl6f2y8lkkp1s8xkhwqlpqk9ylpwqz7w3mhis0"; })
|
||||
(fetchNuGet { pname = "System.Management"; version = "7.0.1"; sha256 = "02sca1yg3inkqsh1lsjrv5hn10ijp2rsbgh0k5cvnf5k54d422vj"; })
|
||||
(fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; })
|
||||
(fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; })
|
||||
(fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; })
|
||||
|
|
|
|||
45
pkgs/applications/graphics/figma-agent/default.nix
Normal file
45
pkgs/applications/graphics/figma-agent/default.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, fontconfig
|
||||
, freetype
|
||||
, libclang
|
||||
}:
|
||||
let
|
||||
inherit (rustPlatform) buildRustPackage bindgenHook;
|
||||
|
||||
version = "0.2.7";
|
||||
in
|
||||
buildRustPackage {
|
||||
pname = "figma-agent";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neetly";
|
||||
repo = "figma-agent-linux";
|
||||
rev = version;
|
||||
sha256 = "sha256-Cq1hWNwJLBY9Bb41WFJxnr9fcygFZ8eNsn5cPXmGTyw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Gc94Uk/Ikxjnb541flQL7AeblgU/yS6zQ/187ZGRYco=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
fontconfig
|
||||
freetype
|
||||
bindgenHook
|
||||
];
|
||||
|
||||
LIBCLANG_PATH = "${libclang.lib}/lib";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/neetly/figma-agent-linux";
|
||||
description = "Figma Agent for Linux (a.k.a. Font Helper)";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ercao ];
|
||||
};
|
||||
}
|
||||
|
|
@ -29,7 +29,6 @@ in
|
|||
}).override {
|
||||
crashreporterSupport = false;
|
||||
enableOfficialBranding = false;
|
||||
pgoSupport = false; # Profiling gets stuck and doesn't terminate.
|
||||
}).overrideAttrs (prev: {
|
||||
MOZ_REQUIRE_SIGNING = "";
|
||||
})
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubebuilder";
|
||||
version = "3.9.1";
|
||||
version = "3.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "kubebuilder";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sX+MYMZTRJ3udCtW3yeGBlYpJV35UDQwtcgi7/pXhek=";
|
||||
hash = "sha256-W1FjmhZWBt/ThkSHHGAR4p1Vxal4WOCutlsHIDZeRZM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wxKEywUs5ezeOlIRT2k3C4G0XaX6h1ORt9/G6+FzVic=";
|
||||
vendorHash = "sha256-/Kvn3KwSB/mxgBKM+383QHCnVTOt06ZP3gt7FGqA5aM=";
|
||||
|
||||
subPackages = ["cmd"];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec{
|
||||
pname = "pinniped";
|
||||
version = "0.22.0";
|
||||
version = "0.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "pinniped";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gi6uFJFP3hdHJqH9y7Q8tUGRJECPHxbajU5BJeBcJzo=";
|
||||
sha256 = "sha256-noWNklLRYW0l7fGBnsTQk8v5t+mwKheh0egHxL+YxAE=";
|
||||
};
|
||||
|
||||
subPackages = "cmd/pinniped";
|
||||
|
||||
vendorHash = "sha256-4N8HtBeGeu22Go63dV0WBdbheXylButu+M9vZL7qOcU=";
|
||||
vendorHash = "sha256-P28L+IHZ+To08Y4gdv/VldAoVcMnCPlZDxy7xe5OP8o=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
(if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20230424-1";
|
||||
version = "20230426";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-G3cAXpHixRVp+FOwyWS+3uuKGp5+7AGLE/1TlghAlFA=";
|
||||
hash = "sha256-RpPn3QWsCOW1RIucBp5oqR/zwnfIwG+McqAPwo0f5lM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@ electron, libsecret }:
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tutanota-desktop";
|
||||
version = "3.110.0";
|
||||
version = "3.112.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz";
|
||||
name = "tutanota-desktop-${version}.tar.gz";
|
||||
sha256 = "sha256-ufrhJfYolx/O0/a5AU1nuUpQy0Md6TVgmdhTAi9Appo=";
|
||||
sha256 = "sha256-Kqj6XQkwPU7pmR8JY8f7iMqpOYjvWxS5Yir/YTBPXjM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "git-machete";
|
||||
version = "3.17.0";
|
||||
version = "3.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "virtuslab";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-F+2xbfMsc6izL0f8EjDfGaJs17xDNQn8/k8mvnLYzcM=";
|
||||
hash = "sha256-UpByKN2L0g42ProwHNRxPw6ggxyDVTUZfWRF+TpUVKc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libopenshot";
|
||||
version = "0.3.0";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenShot";
|
||||
repo = "libopenshot";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qe866gFhcbd7yCNXDiZ9Aj0TAiWoJ+r7C5BjtWBKSGA=";
|
||||
sha256 = "sha256-axFGNq+Kg8atlaSlG8EKvxj/FwLfpDR8/e4otmnyosM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
dontDropIconThemeCache = true;
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (!stdenv.hostPlatform.isMusl) ''
|
||||
# remove a tree of dirs with no files within
|
||||
rm -r "$out/share/locale"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@ in
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "kde";
|
||||
version = "0.2.2";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-P5mLLaQzMhG6aHvAj9SizUFQFLjqNKj1T1kQ4dgiacI=";
|
||||
hash = "sha256-w77lzeSisx/PPxctMJKIdRJenq0s8HwR8gLmgNh4SH8=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -23,6 +23,16 @@ stdenv.mkDerivation rec {
|
|||
url = "https://github.com/deniskropp/DirectFB/commit/3a236241bbec3f15b012b6f0dbe94353d8094557.patch";
|
||||
sha256 = "0rj3gv0zlb225sqjz04p4yagy4xacf3210aa8vra8i1f0fv0w4kw";
|
||||
})
|
||||
|
||||
# Fixes for build of `pkgsMusl.directfb`; applied everywhere to prevent patchrot
|
||||
(fetchpatch {
|
||||
url = "https://git.alpinelinux.org/aports/plain/community/directfb/0001-directfb-fix-musl-compile.patch?id=f8158258493fc0c3eb5de2302e40f4bc44ecfb09";
|
||||
sha256 = "sha256-hmwzbaXu30ZkAqUn1NmvtlJkM6ctddKcO4hxh+1LSS4=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://git.alpinelinux.org/aports/plain/community/directfb/0002-Fix-musl-PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP-comp.patch?id=f8158258493fc0c3eb5de2302e40f4bc44ecfb09";
|
||||
sha256 = "sha256-j3+mcP6hV9LKuba1GOdcM1cZfmXuJtRgx4vE484jIns=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -31,6 +41,12 @@ stdenv.mkDerivation rec {
|
|||
# if switching to cmake then a similar substitution has to be done
|
||||
substituteInPlace src/core/Makefile.am \
|
||||
--replace '`date -u "+%Y-%m-%d %H:%M"`' "`date -u \"+%Y-%m-%d %H:%M\" --date="@''${SOURCE_DATE_EPOCH}"`"
|
||||
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
# Specifically patch out two drivers that have build errors with musl libc,
|
||||
# while leaving the rest of the default selection enabled
|
||||
substituteInPlace configure.in \
|
||||
--replace checkfor_lirc={yes,no} \
|
||||
--replace checkfor_matrox={yes,no}
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook perl pkg-config flux ];
|
||||
|
|
@ -53,8 +69,10 @@ stdenv.mkDerivation rec {
|
|||
"--enable-mmx"
|
||||
"--enable-sse"
|
||||
"--with-software"
|
||||
"--with-smooth-scaling"
|
||||
] ++ lib.optional enableX11 "--enable-x11";
|
||||
]
|
||||
++ lib.optional (!stdenv.hostPlatform.isMusl) "--with-smooth-scaling"
|
||||
++ lib.optional enableX11 "--enable-x11"
|
||||
;
|
||||
|
||||
# Disable parallel building as parallel builds fail due to incomplete
|
||||
# depends between autogenerated CoreSlave.h and it's include sites:
|
||||
|
|
@ -83,7 +101,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.lgpl21;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.bjornfor ];
|
||||
broken = stdenv.hostPlatform.isMusl; # Broken at 2022-02-25
|
||||
# See https://github.com/NixOS/nixpkgs/issues/218274
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,13 +23,6 @@ stdenv.mkDerivation rec {
|
|||
url = "https://savannah.gnu.org/patch/download.php?file_id=52179";
|
||||
sha256 = "1v15gxhpi4bgcr12pb3d9c3hiwj0drvc832vic7sham34lhjmcbb";
|
||||
})
|
||||
] ++ lib.optionals stdenv.hostPlatform.isMusl [
|
||||
(fetchpatch {
|
||||
name = "musl-realpath-test.patch";
|
||||
url = "https://git.alpinelinux.org/aports/plain/community/libcdio/disable-broken-test.patch?id=058a8695c12ae13b40c981ee98809352490b6155";
|
||||
includes = [ "test/driver/realpath.c" ];
|
||||
sha256 = "sha256-6j2bjMed2l+TFZ5emjCcozzF/kkGA8FVifJB8U7QceU=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osi";
|
||||
version = "0.108.7";
|
||||
version = "0.108.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coin-or";
|
||||
repo = "Osi";
|
||||
rev = "releases/${version}";
|
||||
hash = "sha256-MTmt/MgsfEAXor2EZXJX05bQg5oOtMaN7oNxGv2PHJg=";
|
||||
hash = "sha256-Wyxeyn49QWzGvW6bMwCp39iLkB1eMQUEpIxUgpLcxgA=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-markup";
|
||||
version = "1.6";
|
||||
version = "1.7";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bartTC";
|
||||
repo = "django-markup";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Hh+3KxFE6sSIqRowyZ1Pz6NmBaTbltZaEhSjFrw760Q=";
|
||||
hash = "sha256-P36DYOcjYAvzhSLe5CwzRaIm/KzrpUh0YZjzcwnSBG8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -60,11 +60,6 @@ buildPythonPackage rec {
|
|||
|
||||
env.DJANGO_SETTINGS_MODULE = "django_markup.tests";
|
||||
|
||||
disabledTests = [
|
||||
# https://github.com/bartTC/django-markup/issues/40
|
||||
"test_rst_with_pygments"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generic Django application to convert text with specific markup to html.";
|
||||
homepage = "https://github.com/bartTC/django-markup";
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "docformatter";
|
||||
version = "1.6.3";
|
||||
version = "1.6.4";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "PyCQA";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-MyrLzEVuNsAZCnRXWDGK7jFAu8woZUSrN6ml1yiadF0=";
|
||||
hash = "sha256-OQNE6Is1Pl0uoAkFYh4M+c8oNWL/uIh4X0hv8X0Qt/g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "lazy-loader";
|
||||
version = "0.1";
|
||||
version = "0.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scientific-python";
|
||||
repo = "lazy_loader";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-zMmDvAyCaTSMOXgCiLQ4Z/9Ro3k0qJxJPLLoNmK/dmE=";
|
||||
hash = "sha256-QiRJt2aR2mY1f9ci/p6jOyMeyrHPqRdh43l4Th5PYf8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zeroconf";
|
||||
version = "0.56.0";
|
||||
version = "0.58.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "jstasiak";
|
||||
repo = "python-zeroconf";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-EglL06umgKjbA7mWuOfss7xemp53XJNOs3eJR5VNWxk=";
|
||||
hash = "sha256-yUf5X124jtUip5hGbZrdbSQzO8WJp9BJ96/QtdMBFvM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jacoco";
|
||||
version = "0.8.9";
|
||||
version = "0.8.10";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://search.maven.org/remotecontent?filepath=org/jacoco/jacoco/${version}/jacoco-${version}.zip";
|
||||
stripRoot = false;
|
||||
sha256 = "sha256-gxe3HoOAj4u6k7hBDe6r9uPj4xSt1wFNPVzhM9YAEMI=";
|
||||
sha256 = "sha256-V8I3DXoeUPNxAe7z/ISGa5UQAyLJN7RKXlD0FOw92Oo=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "seer";
|
||||
version = "1.15";
|
||||
version = "1.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "epasveer";
|
||||
repo = "seer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TktCUO281Cok47qT60DMAO5uUIg1iDH1RKx+fBPezLs=";
|
||||
sha256 = "sha256-lM6w+QwIRYP/2JDx4yynJxhVXt8SouOWgsLGXSwolIw=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "protoc-gen-connect-go";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bufbuild";
|
||||
repo = "connect-go";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fWFSm6jTJZYoqRHER2o+5rcv0B5GwHx6gyK2se7Bi/o=";
|
||||
hash = "sha256-KtyDnBDG67H4r/3s1ehbJhrzeG1LoU2BatWWgfTkAAs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Bh2JCWTaML/QU/sLBsxLKMzzH++K22BTGusfcVW2GBw=";
|
||||
vendorHash = "sha256-yCZ16rmqi8DAwIVuEgCw373bQX+cLhSNbpKutF5L2bc=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/protoc-gen-connect-go"
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-about";
|
||||
version = "0.5.5";
|
||||
version = "0.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmbarkStudios";
|
||||
repo = "cargo-about";
|
||||
rev = version;
|
||||
sha256 = "sha256-OAKTEU4+m9QMW/EMhCrN5HTMSjnPzEU0ISCeauI76SY=";
|
||||
sha256 = "sha256-nlumcRcL5HwRJTNqLJ9+UkSg88HuE96Rg8Tgc+ZcK2M=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-BGopHg4giLVie+z7kjlb9rTvLTovFyJ/emCF4j0Va04=";
|
||||
cargoSha256 = "sha256-Fa1DGXzHDR3EAZyFg0g2aKFynQlC/LL+Tg5LKpOUzmM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
@ -26,7 +26,9 @@ rustPlatform.buildRustPackage rec {
|
|||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
env = {
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cargo plugin to generate list of all licenses for a crate";
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sentry-cli";
|
||||
version = "2.16.1";
|
||||
version = "2.17.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-+b+jTYOgxAu+iLKNW7/dGmrejXuGdBhkQOwiB9uaiNY=";
|
||||
sha256 = "sha256-k5Zw4M1mDo/AIMROvpGyak2UR9GryubgyLmXF5/0JoM=";
|
||||
};
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
cargoHash = "sha256-CHvVnjhbyy2YuRysA6VzWcKOCfbTw4ckAsEES+g0cxQ=";
|
||||
cargoHash = "sha256-uPlJTwm+DRY1t/jqkk0cuE7Gz327qJPnpsaTVnVWIlI=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://docs.sentry.io/cli/";
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@ let
|
|||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "calibre-web";
|
||||
version = "0.6.19";
|
||||
version = "0.6.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janeczku";
|
||||
repo = "calibre-web";
|
||||
rev = version;
|
||||
hash = "sha256-mNYLQ+3u6xRaoZ5oH6HdylFfgz1fq1ZB86AWk9vULWQ=";
|
||||
hash = "sha256-0lArY1aTpO4sgIVDSqClYMGlip92f9hE/L2UouTLK8Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
|
|
@ -38,9 +38,10 @@ python.pkgs.buildPythonApplication rec {
|
|||
flask-login
|
||||
flask_principal
|
||||
flask-wtf
|
||||
flask-limiter
|
||||
iso-639
|
||||
lxml
|
||||
pypdf3
|
||||
pypdf
|
||||
requests
|
||||
sqlalchemy
|
||||
tornado
|
||||
|
|
@ -58,12 +59,6 @@ python.pkgs.buildPythonApplication rec {
|
|||
# and exit. This is gonna be used to configure calibre-web declaratively, as most of its configuration parameters
|
||||
# are stored in the DB.
|
||||
./db-migrations.patch
|
||||
# Handle version 3.0 of flask-babel
|
||||
(fetchpatch {
|
||||
url = "https://github.com/janeczku/calibre-web/commit/94a6931d48d347ae6c07e2b5f0301e8cf97cf53d.patch";
|
||||
excludes = [ "requirements.txt" ];
|
||||
hash = "sha256-0DQ+LbIOOwjBXQh+b1w8dYQ3s+xZ6nFoH5GvgJdBAFI=";
|
||||
})
|
||||
];
|
||||
|
||||
# calibre-web doesn't follow setuptools directory structure. The following is taken from the script
|
||||
|
|
@ -81,12 +76,12 @@ python.pkgs.buildPythonApplication rec {
|
|||
--replace "APScheduler>=3.6.3,<3.10.0" "APScheduler>=3.6.3" \
|
||||
--replace "chardet>=3.0.0,<4.1.0" "chardet>=3.0.0,<6" \
|
||||
--replace "Flask>=1.0.2,<2.1.0" "Flask>=1.0.2" \
|
||||
--replace "Flask-Babel>=0.11.1,<2.1.0" "Flask-Babel>=0.11.1" \
|
||||
--replace "Flask-Babel>=0.11.1,<3.1.0" "Flask-Babel>=0.11.1" \
|
||||
--replace "Flask-Login>=0.3.2,<0.6.2" "Flask-Login>=0.3.2" \
|
||||
--replace "flask-wtf>=0.14.2,<1.1.0" "flask-wtf>=0.14.2" \
|
||||
--replace "lxml>=3.8.0,<4.9.0" "lxml>=3.8.0" \
|
||||
--replace "tornado>=4.1,<6.2" "tornado>=4.1,<7" \
|
||||
--replace "PyPDF3>=1.0.0,<1.0.7" "PyPDF3>=1.0.0" \
|
||||
--replace "PyPDF>=3.0.0,<3.6.0" "PyPDF>=3.0.0" \
|
||||
--replace "requests>=2.11.1,<2.28.0" "requests" \
|
||||
--replace "unidecode>=0.04.19,<1.4.0" "unidecode>=0.04.19" \
|
||||
--replace "werkzeug<2.1.0" ""
|
||||
|
|
|
|||
|
|
@ -34,14 +34,14 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "code-server";
|
||||
version = "4.8.3";
|
||||
version = "4.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coder";
|
||||
repo = "code-server";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1h5ng60wf3gpsydfkv20x30xsw1f5zcvv77l1mzrqz1mhcw93lvz";
|
||||
hash = "sha256-PQp5dji2Ynp+LJRWBka41umwe1/IR76C+at/wyOWGcI=";
|
||||
};
|
||||
|
||||
cloudAgent = buildGoModule rec {
|
||||
|
|
@ -88,7 +88,7 @@ in stdenv.mkDerivation rec {
|
|||
outputHashAlgo = "sha256";
|
||||
|
||||
# to get hash values use nix-build -A code-server.prefetchYarnCache
|
||||
outputHash = "0jzzbmmgv1nfq975mi9ii9l6c4f1wy10fyy117xgm4s6vxana7qn";
|
||||
outputHash = "sha256-4Vr9u3+W/IhbbTc39jyDyDNQODlmdF+M/N8oJn0Z4+w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -101,8 +101,6 @@ in stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
patches = [
|
||||
# remove download of coder-cloud agent
|
||||
./remove-cloud-agent-download.patch
|
||||
# remove git calls from vscode build script
|
||||
./build-vscode-nogit.patch
|
||||
];
|
||||
|
|
@ -129,10 +127,6 @@ in stdenv.mkDerivation rec {
|
|||
# set offline mirror to yarn cache we created in previous steps
|
||||
yarn --offline config set yarn-offline-mirror "${yarnCache}"
|
||||
|
||||
# link coder-cloud agent from nix store
|
||||
mkdir -p lib
|
||||
ln -s "${cloudAgent}/bin/cloud-agent" ./lib/coder-cloud-agent
|
||||
|
||||
# skip unnecessary electron download
|
||||
export ELECTRON_SKIP_BINARY_DOWNLOAD=1
|
||||
|
||||
|
|
@ -221,7 +215,7 @@ in stdenv.mkDerivation rec {
|
|||
yarn build
|
||||
|
||||
# build vscode
|
||||
yarn build:vscode
|
||||
VERSION=${version} yarn build:vscode
|
||||
|
||||
# create release
|
||||
yarn release
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
--- ./ci/build/npm-postinstall.sh
|
||||
+++ ./ci/build/npm-postinstall.sh
|
||||
@@ -102,14 +102,6 @@
|
||||
;;
|
||||
esac
|
||||
|
||||
- mkdir -p ./lib
|
||||
-
|
||||
- if curl -fsSL "https://github.com/coder/cloud-agent/releases/latest/download/cloud-agent-$OS-$ARCH" -o ./lib/coder-cloud-agent; then
|
||||
- chmod +x ./lib/coder-cloud-agent
|
||||
- else
|
||||
- echo "Failed to download cloud agent; --link will not work"
|
||||
- fi
|
||||
-
|
||||
if ! vscode_install; then
|
||||
echo "You may not have the required dependencies to build the native modules."
|
||||
echo "Please see https://github.com/coder/code-server/blob/main/docs/npm.md"
|
||||
|
|
@ -6,11 +6,11 @@
|
|||
let
|
||||
self = stdenv.mkDerivation rec {
|
||||
pname = "mysql";
|
||||
version = "8.0.32";
|
||||
version = "8.0.33";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-Hw2SojeJgkRxbdWB95k1bgc8LaY8Oy5KAeEDLL7VDig=";
|
||||
hash = "sha256-liAC9dkG9C9AsnejnS25OTEkjB8H/49DEsKI5jgD3RI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bison cmake pkg-config ]
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "traefik";
|
||||
version = "2.9.10";
|
||||
version = "2.10.0";
|
||||
|
||||
# Archive with static assets for webui
|
||||
src = fetchzip {
|
||||
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
|
||||
sha256 = "sha256-Mrdlu2SdOiMTkBXeStZaex3bVyw7vfidgOeCmhfB5Tc=";
|
||||
sha256 = "sha256-KeV7JOIbQoCwmulMzKpse7GA+/p5uPRR8UpMYizuGYU=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-11OYVeEuo/Fl6qlRLITzi7qmM2M8puHk5Y0X0sgLius=";
|
||||
vendorSha256 = "sha256-o+xri6vyUbInwmk+hhi6YDRo8ICASMj+ah3nBqQWnO8=";
|
||||
|
||||
subPackages = [ "cmd/traefik" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "auth0-cli";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "auth0";
|
||||
repo = "auth0-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Zrv9Dj4TqMEgnWYNvBUbrPS6Ab23AkCn66hclPKH224=";
|
||||
hash = "sha256-mOG7N7+qmAw+D6Bp0QtyS3oualDD/fffDVCuidLJ+Pw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MGMmWCe2LVIpK7O1e90Nvahbnu5sm9vK/4s0lPPpl1g=";
|
||||
vendorHash = "sha256-8t5qnHaZeZUxdk5DmIfOx86Zk9c9hJuxHjE6upqC638=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "syft";
|
||||
version = "0.76.1";
|
||||
version = "0.79.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PJrGie65XIKJ3HXvBDUFzKgN1EGfjgb+x97eUVwxV8w=";
|
||||
hash = "sha256-IrNOslrH2EN2q/d4m4bFbaIHvOaAjYgVRTDRMZRKefs=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
|
@ -22,7 +22,7 @@ buildGoModule rec {
|
|||
};
|
||||
# hash mismatch with darwin
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-HHYKcsJ1NAGM7/CO+XiCvhfTw4mRZicDqf4/D3Tys+A=";
|
||||
vendorHash = "sha256-QWKcRu781cRkNSToLQvMQ4ViGYd2klBIlLkB7EyaKmI=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -24,11 +24,14 @@
|
|||
, libintl
|
||||
, libiconv
|
||||
, Foundation
|
||||
, bash
|
||||
, python3
|
||||
, argp-standalone
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zbar";
|
||||
version = "0.23.90";
|
||||
version = "0.23.92";
|
||||
|
||||
outputs = [ "out" "lib" "dev" "doc" "man" ];
|
||||
|
||||
|
|
@ -36,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "mchehab";
|
||||
repo = "zbar";
|
||||
rev = version;
|
||||
sha256 = "sha256-FvV7TMc4JbOiRjWLka0IhtpGGqGm5fis7h870OmJw2U=";
|
||||
sha256 = "sha256-VhVrngAX7pXZp+szqv95R6RGAJojp3svdbaRKigGb0w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -66,6 +69,22 @@ stdenv.mkDerivation rec {
|
|||
qtx11extras
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
bash
|
||||
python3
|
||||
];
|
||||
|
||||
checkInputs = lib.optionals stdenv.isDarwin [
|
||||
argp-standalone
|
||||
];
|
||||
|
||||
# Note: postConfigure instead of postPatch in order to include some
|
||||
# autoconf-generated files. The template files for the autogen'd scripts are
|
||||
# not chmod +x, so patchShebangs misses them.
|
||||
postConfigure = ''
|
||||
patchShebangs test
|
||||
'';
|
||||
|
||||
# Disable assertions which include -dev QtBase file paths.
|
||||
env.NIX_CFLAGS_COMPILE = "-DQT_NO_DEBUG";
|
||||
|
||||
|
|
@ -83,6 +102,12 @@ stdenv.mkDerivation rec {
|
|||
"--without-qt"
|
||||
]);
|
||||
|
||||
doCheck = true;
|
||||
|
||||
preCheck = lib.optionalString stdenv.isDarwin ''
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -largp"
|
||||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
dontWrapGApps = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "ntfy-sh";
|
||||
version = "2.3.1";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "binwiederhier";
|
||||
repo = "ntfy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-A3kL/1Q7BFGfzVn4wFrQf9VS+2rOgS4u8o1uEQI2vcw=";
|
||||
sha256 = "sha256-bwYiIeDpZZpfv/HNtB/3acL0dJfegF/4OqWcEV8YGfY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-0bmZmBYEHGIP9vd8O5rz0JyuKUu9VHeb8ErZ6VNsfxQ=";
|
||||
vendorSha256 = "sha256-HHuj3PcIu1wsdcfd04PofoZHjRSgTfWfJcomqH3KXa8=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
933
pkgs/tools/misc/ntfy-sh/node-packages.nix
generated
933
pkgs/tools/misc/ntfy-sh/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,4 +1,13 @@
|
|||
{ lib, stdenv, fetchurl, autoreconfHook, ncurses, libxcrypt, utmp, pam ? null }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, ncurses
|
||||
, libxcrypt
|
||||
, utmp
|
||||
, pam ? null
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "screen";
|
||||
|
|
@ -9,6 +18,15 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1x1hqy4h47i7hk85f779lkwkm7gkq8h8mxwd0znkh5adpf0m4czr";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2023-24626.patch";
|
||||
url = "https://git.savannah.gnu.org/cgit/screen.git/patch/?id=e9ad41bfedb4537a6f0de20f00b27c7739f168f7";
|
||||
stripLen = 1;
|
||||
sha256 = "sha256-NV6Uh4h9AK7kQMHqbxeuhjFEvwQH7OWdu7h8pZCGFog=";
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags= [
|
||||
"--enable-telnet"
|
||||
"--enable-pam"
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "godns";
|
||||
version = "2.9.6";
|
||||
version = "2.9.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TimothyYe";
|
||||
repo = "godns";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-PrjkZxMgj2+jttkXVkn1JoLKGfBOMMbTLimngUDEuX8=";
|
||||
hash = "sha256-In0v3WLxUofVaJ78HNDYWKJCjxk9q1GhDg6X2aGg91I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-y2DRQ4nryUCrGUHmEuJSrYDjJ3X4sAcyWOp6ZKcoSSo=";
|
||||
vendorHash = "sha256-iAU62/0MjzxwuMvIobhIZEqDJUpRqwEabnazH7jBRTE=";
|
||||
|
||||
# Some tests require internet access, broken in sandbox
|
||||
doCheck = false;
|
||||
|
|
|
|||
24
pkgs/tools/networking/wireguard-vanity-address/default.nix
Normal file
24
pkgs/tools/networking/wireguard-vanity-address/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wireguard-vanity-address";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "warner";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SjzcVIQ9HwhP6Y/uCwXGSdZgrYcUQ9kE/Bow8pyOKNo=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
cargoHash = "sha256-0bkyopkssqH0vfaWkFC3dV2o7Q3EuDEOM8JvRB9ekLU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Find Wireguard VPN keypairs with a specific readable string";
|
||||
homepage = "https://github.com/warner/wireguard-vanity-address";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bcc32 ];
|
||||
};
|
||||
}
|
||||
40
pkgs/tools/nix/nix-melt/default.nix
Normal file
40
pkgs/tools/nix/nix-melt/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nix-melt";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nix-melt";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5V9sPbBb9t4B6yiLrYF+hx6YokGDH6+UsVQBhgqxMbY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-yBoaLqynvYC9ebC0zjd2FmSSd53xzn4ralihtCFubAw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
env = {
|
||||
GEN_ARTIFACTS = "artifacts";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
installManPage artifacts/nix-melt.1
|
||||
installShellCompletion artifacts/nix-melt.{bash,fish} --zsh artifacts/_nix-melt
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A ranger-like flake.lock viewer";
|
||||
homepage = "https://github.com/nix-community/nix-melt";
|
||||
changelog = "https://github.com/nix-community/nix-melt/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
let
|
||||
pname = "buttercup-desktop";
|
||||
version = "2.18.2";
|
||||
version = "2.19.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage";
|
||||
sha256 = "sha256-1WLhT94FNZ7be58uov/0vtvB7ET/WNY/tPSIuaW5zfc=";
|
||||
sha256 = "sha256-0CoSgZvRYIGD8Jgk8FNZ7EesOpK5ccHe0LIbZnYyYJ0=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 { inherit pname src version; };
|
||||
|
||||
|
|
|
|||
40
pkgs/tools/security/smbmap/default.nix
Normal file
40
pkgs/tools/security/smbmap/default.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "smbmap";
|
||||
version = "unstable-2023-03-29";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ShawnDEvans";
|
||||
repo = "smbmap";
|
||||
rev = "ce60773320e11b2ecd1ce1b5ab2a62d43d4a4423";
|
||||
hash = "sha256-4DdiICH3B7x8Wr5CcqiuhCHPv6W/5bT5MGdXkyE0OKA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
impacket
|
||||
pyasn1
|
||||
pycrypto
|
||||
configparser
|
||||
termcolor
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"smbmap"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "SMB enumeration tool";
|
||||
homepage = "https://github.com/ShawnDEvans/smbmap";
|
||||
changelog = "https://github.com/ShawnDEvans/smbmap/releases/tag/v${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "LanguageTool";
|
||||
version = "5.9";
|
||||
version = "6.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://www.languagetool.org/download/${pname}-${version}.zip";
|
||||
sha256 = "sha256-x4xGgYeMi7KbD2WGHOd/ixmZ+5EY5g6CLd7/CBYldNQ=";
|
||||
sha256 = "sha256-4icKkcTKwaD3C8doxwdhsro+YIB6MCUj6POjRhg2YJM=";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ jre ];
|
||||
|
|
|
|||
|
|
@ -543,6 +543,8 @@ with pkgs;
|
|||
|
||||
expressvpn = callPackage ../applications/networking/expressvpn { };
|
||||
|
||||
figma-agent = callPackage ../applications/graphics/figma-agent { };
|
||||
|
||||
figma-linux = callPackage ../applications/graphics/figma-linux { };
|
||||
|
||||
firefly-desktop = callPackage ../applications/misc/firefly-desktop { };
|
||||
|
|
@ -1638,6 +1640,8 @@ with pkgs;
|
|||
|
||||
sorted-grep = callPackage ../tools/text/sorted-grep { };
|
||||
|
||||
smbmap = callPackage ../tools/security/smbmap { };
|
||||
|
||||
smbscan = callPackage ../tools/security/smbscan { };
|
||||
|
||||
spectre-cli = callPackage ../tools/security/spectre-cli { };
|
||||
|
|
@ -13494,6 +13498,10 @@ with pkgs;
|
|||
|
||||
wireguard-tools = callPackage ../tools/networking/wireguard-tools { };
|
||||
|
||||
wireguard-vanity-address = callPackage ../tools/networking/wireguard-vanity-address {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
wireproxy = callPackage ../tools/networking/wireproxy { };
|
||||
|
||||
wiringpi = callPackage ../os-specific/linux/wiringpi { };
|
||||
|
|
@ -38861,6 +38869,8 @@ with pkgs;
|
|||
|
||||
nix-linter = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-linter);
|
||||
|
||||
nix-melt = callPackage ../tools/nix/nix-melt { };
|
||||
|
||||
nixos-option = callPackage ../tools/nix/nixos-option { nix = nixVersions.nix_2_3; };
|
||||
|
||||
nix-pin = callPackage ../tools/package-management/nix-pin { };
|
||||
|
|
|
|||
|
|
@ -1623,6 +1623,34 @@ with self; {
|
|||
|
||||
BioExtAlign = callPackage ../development/perl-modules/Bio-Ext-Align { };
|
||||
|
||||
BioDBHTS = buildPerlModule {
|
||||
pname = "Bio-DB-HTS";
|
||||
version = "3.01";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/A/AV/AVULLO/Bio-DB-HTS-3.01.tar.gz";
|
||||
sha256 = "12a6bc1f579513cac8b9167cce4e363655cc8eba26b7d9fe1170dfe95e044f42";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgs.htslib pkgs.zlib ];
|
||||
|
||||
propagatedBuildInputs = [ BioPerl ];
|
||||
htslibStore = toString pkgs.htslib;
|
||||
|
||||
postPatch = ''
|
||||
# -Wl,-rpath not recognized : replaced by -rpath=
|
||||
sed -i 's/Wl,-rpath,/rpath=/' Build.PL
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
export HTSLIB_DIR=${pkgs.htslib}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Perl interface to HTS library for DNA sequencing";
|
||||
license = lib.licenses.asl20;
|
||||
};
|
||||
};
|
||||
|
||||
BioPerl = buildPerlPackage {
|
||||
pname = "BioPerl";
|
||||
version = "1.7.8";
|
||||
|
|
|
|||
Loading…
Reference in a new issue