mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-17 14:19:58 +03:00
Merge remote-tracking branch 'origin/master' into staging-next
fastcdr was moved to by-name Related to: - https://github.com/NixOS/nixpkgs/pull/290836
This commit is contained in:
Fabián Heredia Montiel
commit
db1ee6dfe6
@ -439,14 +439,14 @@ gitGraph
|
||||
|
||||
Here's an overview of the different branches:
|
||||
|
||||
| branch | `master` | `staging` | `staging-next` |
|
||||
| branch | `master` | `staging-next` | `staging` |
|
||||
| --- | --- | --- | --- |
|
||||
| Used for development | ✔️ | ✔️ | ❌ |
|
||||
| Built by Hydra | ✔️ | ❌ | ✔️ |
|
||||
| [Mass rebuilds][mass-rebuild] | ❌ | ✔️ | ⚠️ Only to fix Hydra builds |
|
||||
| Critical security fixes | ✔️ for non-mass-rebuilds | ❌ | ✔️ for mass-rebuilds |
|
||||
| Automatically merged into | `staging-next` | - | `staging` |
|
||||
| Manually merged into | - | `staging-next` | `master` |
|
||||
| Used for development | ✔️ | ❌ | ✔️ |
|
||||
| Built by Hydra | ✔️ | ✔️ | ❌ |
|
||||
| [Mass rebuilds][mass-rebuild] | ❌ | ⚠️ Only to fix Hydra builds | ✔️ |
|
||||
| Critical security fixes | ✔️ for non-mass-rebuilds | ✔️ for mass-rebuilds | ❌ |
|
||||
| Automatically merged into | `staging-next` | `staging` | - |
|
||||
| Manually merged into | - | `master` | `staging-next` |
|
||||
|
||||
The staging workflow is used for all main branches, `master` and `release-YY.MM`, with corresponding names:
|
||||
- `master`/`release-YY.MM`
|
||||
|
||||
@ -1866,12 +1866,6 @@
|
||||
github = "Atry";
|
||||
githubId = 601530;
|
||||
};
|
||||
attila-lendvai = {
|
||||
name = "Attila Lendvai";
|
||||
email = "attila@lendvai.name";
|
||||
github = "attila-lendvai";
|
||||
githubId = 840345;
|
||||
};
|
||||
auchter = {
|
||||
name = "Michael Auchter";
|
||||
email = "a@phire.org";
|
||||
|
||||
@ -900,7 +900,6 @@
|
||||
./services/networking/autossh.nix
|
||||
./services/networking/avahi-daemon.nix
|
||||
./services/networking/babeld.nix
|
||||
./services/networking/bee-clef.nix
|
||||
./services/networking/bee.nix
|
||||
./services/networking/biboumi.nix
|
||||
./services/networking/bind.nix
|
||||
|
||||
@ -1,107 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
# NOTE for now nothing is installed into /etc/bee-clef/. the config files are used as read-only from the nix store.
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.services.bee-clef;
|
||||
in {
|
||||
meta = {
|
||||
maintainers = with maintainers; [ attila-lendvai ];
|
||||
};
|
||||
|
||||
### interface
|
||||
|
||||
options = {
|
||||
services.bee-clef = {
|
||||
enable = mkEnableOption (lib.mdDoc "clef external signer instance for Ethereum Swarm Bee");
|
||||
|
||||
dataDir = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = "/var/lib/bee-clef";
|
||||
description = lib.mdDoc ''
|
||||
Data dir for bee-clef. Beware that some helper scripts may not work when changed!
|
||||
The service itself should work fine, though.
|
||||
'';
|
||||
};
|
||||
|
||||
passwordFile = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = "/var/lib/bee-clef/password";
|
||||
description = lib.mdDoc "Password file for bee-clef.";
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = "bee-clef";
|
||||
description = lib.mdDoc ''
|
||||
User the bee-clef daemon should execute under.
|
||||
'';
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = "bee-clef";
|
||||
description = lib.mdDoc ''
|
||||
Group the bee-clef daemon should execute under.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
# if we ever want to have rules.js under /etc/bee-clef/
|
||||
# environment.etc."bee-clef/rules.js".source = ${pkgs.bee-clef}/rules.js
|
||||
|
||||
systemd.packages = [ pkgs.bee-clef ]; # include the upstream bee-clef.service file
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d '${cfg.dataDir}/' 0750 ${cfg.user} ${cfg.group}"
|
||||
"d '${cfg.dataDir}/keystore' 0700 ${cfg.user} ${cfg.group}"
|
||||
];
|
||||
|
||||
systemd.services.bee-clef = {
|
||||
path = [
|
||||
# these are needed for the ensure-clef-account script
|
||||
pkgs.coreutils
|
||||
pkgs.gnused
|
||||
pkgs.gawk
|
||||
];
|
||||
|
||||
wantedBy = [ "bee.service" "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
ExecStartPre = ''${pkgs.bee-clef}/share/bee-clef/ensure-clef-account "${cfg.dataDir}" "${pkgs.bee-clef}/share/bee-clef/"'';
|
||||
ExecStart = [
|
||||
"" # this hides/overrides what's in the original entry
|
||||
"${pkgs.bee-clef}/share/bee-clef/bee-clef-service start"
|
||||
];
|
||||
ExecStop = [
|
||||
"" # this hides/overrides what's in the original entry
|
||||
"${pkgs.bee-clef}/share/bee-clef/bee-clef-service stop"
|
||||
];
|
||||
Environment = [
|
||||
"CONFIGDIR=${cfg.dataDir}"
|
||||
"PASSWORD_FILE=${cfg.passwordFile}"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
users.users = optionalAttrs (cfg.user == "bee-clef") {
|
||||
bee-clef = {
|
||||
group = cfg.group;
|
||||
home = cfg.dataDir;
|
||||
isSystemUser = true;
|
||||
description = "Daemon user for the bee-clef service";
|
||||
};
|
||||
};
|
||||
|
||||
users.groups = optionalAttrs (cfg.group == "bee-clef") {
|
||||
bee-clef = {};
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -8,7 +8,7 @@ let
|
||||
in {
|
||||
meta = {
|
||||
# doc = ./bee.xml;
|
||||
maintainers = with maintainers; [ attila-lendvai ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
### interface
|
||||
@ -73,13 +73,10 @@ in {
|
||||
}
|
||||
];
|
||||
|
||||
warnings = optional (! config.services.bee-clef.enable) "The bee service requires an external signer. Consider setting `config.services.bee-clef.enable` = true";
|
||||
|
||||
services.bee.settings = {
|
||||
data-dir = lib.mkDefault "/var/lib/bee";
|
||||
password-file = lib.mkDefault "/var/lib/bee/password";
|
||||
clef-signer-enable = lib.mkDefault true;
|
||||
clef-signer-endpoint = lib.mkDefault "/var/lib/bee-clef/clef.ipc";
|
||||
swap-endpoint = lib.mkDefault "https://rpc.slock.it/goerli";
|
||||
};
|
||||
|
||||
@ -90,9 +87,6 @@ in {
|
||||
];
|
||||
|
||||
systemd.services.bee = {
|
||||
requires = optional config.services.bee-clef.enable
|
||||
"bee-clef.service";
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
@ -120,7 +114,6 @@ Bee has SWAP enabled by default and it needs ethereum endpoint to operate.
|
||||
It is recommended to use external signer with bee.
|
||||
Check documentation for more info:
|
||||
- SWAP https://docs.ethswarm.org/docs/installation/manual#swap-bandwidth-incentives
|
||||
- External signer https://docs.ethswarm.org/docs/installation/bee-clef
|
||||
|
||||
After you finish configuration run 'sudo bee-get-addr'."
|
||||
fi
|
||||
@ -133,8 +126,6 @@ After you finish configuration run 'sudo bee-get-addr'."
|
||||
home = cfg.settings.data-dir;
|
||||
isSystemUser = true;
|
||||
description = "Daemon user for Ethereum Swarm Bee";
|
||||
extraGroups = optional config.services.bee-clef.enable
|
||||
config.services.bee-clef.group;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -346,7 +346,7 @@ There are a few naming guidelines:
|
||||
|
||||
- The `pname` attribute _should_ be identical to the upstream package name.
|
||||
|
||||
- The `pname` and the `version` attribute _must not_ contain uppercase letters — e.g., `"mplayer" instead of `"MPlayer"`.
|
||||
- The `pname` and the `version` attribute _must not_ contain uppercase letters — e.g., `"mplayer"` instead of `"MPlayer"`.
|
||||
|
||||
- The `version` attribute _must_ start with a digit e.g., `"0.3.1rc2"`.
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, libuchardet, pkg-config, shntool, flac
|
||||
, opusTools, vorbis-tools, mp3gain, lame, taglib, wavpack, vorbisgain, sox, gtk3
|
||||
, qtbase, qttools, wrapQtAppsHook }:
|
||||
, opusTools, vorbis-tools, mp3gain, lame, taglib, wavpack, vorbisgain
|
||||
, monkeysAudio, sox, gtk3, qtbase, qttools, wrapQtAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flacon";
|
||||
@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
|
||||
mp3gain
|
||||
lame
|
||||
wavpack
|
||||
monkeysAudio
|
||||
vorbisgain
|
||||
sox
|
||||
];
|
||||
|
||||
@ -8,10 +8,13 @@
|
||||
, ffmpeg
|
||||
, fftw
|
||||
, flac
|
||||
, gbenchmark
|
||||
, glibcLocales
|
||||
, gtest
|
||||
, hidapi
|
||||
, lame
|
||||
, libebur128
|
||||
, libdjinterop
|
||||
, libGLU
|
||||
, libid3tag
|
||||
, libkeyfinder
|
||||
@ -26,6 +29,7 @@
|
||||
, libxcb
|
||||
, lilv
|
||||
, lv2
|
||||
, microsoft-gsl
|
||||
, mp4v2
|
||||
, opusfile
|
||||
, pcre
|
||||
@ -52,13 +56,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "mixxx";
|
||||
version = "2.3.6";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mixxxdj";
|
||||
repo = "mixxx";
|
||||
rev = version;
|
||||
hash = "sha256-VdgCsd/7vMFUleOU0ESoZDQ8yhQSsLZADVi4XI76Ouw=";
|
||||
hash = "sha256-JSWUzerm7D6AKq6g/9eRrt3EE2movRdM+VLUg07sLHo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
@ -69,12 +73,15 @@ mkDerivation rec {
|
||||
ffmpeg
|
||||
fftw
|
||||
flac
|
||||
gbenchmark
|
||||
glibcLocales
|
||||
gtest
|
||||
hidapi
|
||||
lame
|
||||
libebur128
|
||||
libGLU
|
||||
libid3tag
|
||||
libdjinterop
|
||||
libkeyfinder
|
||||
libmad
|
||||
libmodplug
|
||||
@ -87,6 +94,7 @@ mkDerivation rec {
|
||||
libxcb
|
||||
lilv
|
||||
lv2
|
||||
microsoft-gsl
|
||||
mp4v2
|
||||
opusfile
|
||||
pcre
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "rust-analyzer",
|
||||
"version": "0.3.1697",
|
||||
"version": "0.3.1850",
|
||||
"dependencies": {
|
||||
"@hpcc-js/wasm": "^2.13.0",
|
||||
"anser": "^2.1.1",
|
||||
@ -9,10 +9,10 @@
|
||||
"vscode-languageclient": "^8.1.0",
|
||||
"@tsconfig/strictest": "^2.0.1",
|
||||
"@types/node": "~16.11.7",
|
||||
"@types/vscode": "~1.75",
|
||||
"@types/vscode": "~1.78.1",
|
||||
"@typescript-eslint/eslint-plugin": "^6.0.0",
|
||||
"@typescript-eslint/parser": "^6.0.0",
|
||||
"@vscode/test-electron": "^2.3.3",
|
||||
"@vscode/test-electron": "^2.3.8",
|
||||
"@vscode/vsce": "^2.19.0",
|
||||
"eslint": "^8.44.0",
|
||||
"eslint-config-prettier": "^8.8.0",
|
||||
|
||||
@ -20,13 +20,13 @@ let
|
||||
# Use the plugin version as in vscode marketplace, updated by update script.
|
||||
inherit (vsix) version;
|
||||
|
||||
releaseTag = "2023-10-16";
|
||||
releaseTag = "2024-02-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rust-analyzer";
|
||||
rev = releaseTag;
|
||||
sha256 = "sha256-PWEdqI+iiHbx4dkIwWHZCGJuTpRfJI3MLSHf3gQEJt4=";
|
||||
sha256 = "sha256-Oj/RPMridKpYt3eRqUIPg9YNrj6npG8THIGuWjsamnE=";
|
||||
};
|
||||
|
||||
build-deps = nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps";
|
||||
@ -39,9 +39,12 @@ let
|
||||
inherit releaseTag;
|
||||
|
||||
nativeBuildInputs = [
|
||||
jq moreutils esbuild
|
||||
jq
|
||||
moreutils
|
||||
esbuild
|
||||
# Required by `keytar`, which is a dependency of `vsce`.
|
||||
pkg-config libsecret
|
||||
pkg-config
|
||||
libsecret
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.AppKit
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
|
||||
@ -15,11 +15,11 @@ let
|
||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0nd9hipz1jhjdv6hrm6q2jpppanh8nmkpy9zpayymy4dwif8a49q";
|
||||
x86_64-darwin = "1fk146dikiy8dab83v4j6jrnzdg8dxnjvwmdddif130jrpxsp875";
|
||||
aarch64-linux = "0zqm8zl3vhisp6rlb2vhc2i0z4rln38858l07r70jr76zxbbs5xv";
|
||||
aarch64-darwin = "0i0bsrygdg2ij3wf0jm9n6fci5zrghnvzdw0p528c08rjgkhrmrb";
|
||||
armv7l-linux = "0h0v5irf23ijn21j4sll2ynj12wclm17bh46s1dlpzy73f4h17jb";
|
||||
x86_64-linux = "0mnblhg4mfj2231v344h7m9gm3pd7v79jarifcpskxh23gry3scy";
|
||||
x86_64-darwin = "0iv5hgf60nmfli0w4h3as41bhmsmp8kiynnsjrxp915v6im3jxxj";
|
||||
aarch64-linux = "01w3x7syi0m1hk2xm80h3vz4grz462c0fqmgvbflcgdib88wlmj7";
|
||||
aarch64-darwin = "0gzha0rp4mdkk23065a17pqjbz3i4p98i4cmfwz476sqssax8sha";
|
||||
armv7l-linux = "05i6x23h6mmaxx2gchb9p928l6mcs69pwxg5mqvi8aq719gr7kd4";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
sourceRoot = lib.optionalString (!stdenv.isDarwin) ".";
|
||||
@ -29,7 +29,7 @@ in
|
||||
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.85.2.24019";
|
||||
version = "1.86.2.24054";
|
||||
pname = "vscodium";
|
||||
|
||||
executableName = "codium";
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
buildDotnetModule rec {
|
||||
pname = "ArchiSteamFarm";
|
||||
# nixpkgs-update: no auto update
|
||||
version = "5.5.2.3";
|
||||
version = "5.5.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JustArchiNET";
|
||||
repo = "ArchiSteamFarm";
|
||||
rev = version;
|
||||
hash = "sha256-8MrVeJ4XVU7WdYv0mbwz64hIGglisb6+vUoicl4/WC0=";
|
||||
hash = "sha256-9ISEIKrAK6UTDM3TPizBRMU+wfiinhnaWmS5CkXpkYo=";
|
||||
};
|
||||
|
||||
dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
|
||||
|
||||
17
pkgs/applications/misc/ArchiSteamFarm/deps.nix
generated
17
pkgs/applications/misc/ArchiSteamFarm/deps.nix
generated
@ -62,7 +62,7 @@
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; })
|
||||
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.8.0"; sha256 = "173wjadp3gan4x2jfjchngnc4ca4mb95h1sbb28jydfkfw0z1zvj"; })
|
||||
(fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.9.0"; sha256 = "1gljgi69k0fz8vy8bn6xlyxabj6q4vls2zza9wz7ng6ix3irm89r"; })
|
||||
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; })
|
||||
@ -72,12 +72,12 @@
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.3.0"; sha256 = "1x183b0gz1vcfiljggrn30g6jvixlwks0lfpl4hl9nnjbpg0fdvq"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.3.0"; sha256 = "03nnqmz0w42wiqgf5y0wkn6w0n3m93q8ihqmrrz7rdh85v06f999"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.3.0"; sha256 = "1b24pf0ippwbdjc3k1wzr13lr1zqlcbymi2hpvfmxmk4i6vzn4mv"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.3.0"; sha256 = "1qdcqcnczaqfd0cii3bcymbc7rvkypm25idxgx7hfc81h9ysh79h"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.3.1"; sha256 = "0dvknvmnzi3jn2kz0fbcb3ilryd75dwyiwqn6cwc6nd5gdz4mdlm"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.3.1"; sha256 = "03pd6b35a5j1qxmcf9552rp43fwddn1z3czyb6wlf1w1f95b5fqb"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.3.1"; sha256 = "0368p59kf6r9dyk511phl65wvk76n8885d2m9812fpj0ifqcdqg8"; })
|
||||
(fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.3.1"; sha256 = "0i8mqrvzx9xi9pg1c92iy6cr756nnc3lr5cdawj0yh1x919wvx59"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.1"; sha256 = "1drbgqdcvbpisjn8mqfgba1pwb6yri80qc4mfvyczqwrcsj5k2ja"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.8.0"; sha256 = "1syvl3g0hbrcgfi9rq6pld8s8hqqww4dflf1lxn59ccddyyx0gmv"; })
|
||||
(fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.9.0"; sha256 = "1lls1fly2gr1n9n1xyl9k33l2v4pwfmylyzkq8v4v5ldnwkl1zdb"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
|
||||
(fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; })
|
||||
(fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.0.0"; sha256 = "1b52s7z01wkg83dpkpyg7girjflm84zr65pacsfwm2hvhb9xa2w6"; })
|
||||
@ -86,8 +86,8 @@
|
||||
(fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.0.0"; sha256 = "1qbf922frk4c0cam57d98f3d5q5226pgrgjm7pfcamwy5whvx5sh"; })
|
||||
(fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.0.0"; sha256 = "0my1fihyh86rckfzbrvl5kdcq34yp0ywl8azs2gx3c27sg4pjrp2"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; sha256 = "0b0i7lmkrcfvim8i3l93gwqvkhhhfzd53fqfnygdqvkg6np0cg7m"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.8.0"; sha256 = "0f5jah93kjkvxwmhwb78lw11m9pkkq9fvf135hpymmmpxqbdh97q"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; sha256 = "1kgsl9w9fganbm9wvlkqgk0ag9hfi58z88rkfybc6kvg78bx89ca"; })
|
||||
(fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.9.0"; sha256 = "19ffh31a1jxzn8j69m1vnk5hyfz3dbxmflq77b8x82zybiilh5nl"; })
|
||||
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; })
|
||||
(fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.2.0"; sha256 = "0n7iw8ppjyps4sg0rfh5pags4wq58yg1g9vnxfwa73z38jws2c10"; })
|
||||
(fetchNuGet { pname = "MSTest.TestFramework"; version = "3.2.0"; sha256 = "0n9aab1cxf8w23dl4yw7rqpi47v7gd02csq3zisc5whsrb9i0xbq"; })
|
||||
@ -102,7 +102,6 @@
|
||||
(fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.8"; sha256 = "1qnz91099f51vk7f5g2ig0041maw5hcbyqllxvj5zj7zkp0qw9b8"; })
|
||||
(fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.8"; sha256 = "05a6bzvdf63lbnn6sj3yfggxcgv96j91kdbcw0ac5hxl58df58r6"; })
|
||||
(fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; })
|
||||
(fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; })
|
||||
(fetchNuGet { pname = "protobuf-net"; version = "3.2.26"; sha256 = "1mcg46xnhgqwjacy6j8kvp3rylpi26wjnmhwv8mh5cwjya9nynqb"; })
|
||||
(fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.26"; sha256 = "1wrr38ygdanf121bkl8b1d4kz1pawm064z69bqf3qbr46h4j575w"; })
|
||||
(fetchNuGet { pname = "SteamKit2"; version = "2.5.0"; sha256 = "06rdagrxqws5yq1nrsd8chv3n9kgrb8rg894vcc40a8w6v27222w"; })
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "asf-ui";
|
||||
version = "b341e7f78f1f73fb3a11a3f3cfbfbed929242606";
|
||||
version = "7406f7126a8351db67aad9f3a0f90c9dc123d80d";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JustArchiNET";
|
||||
@ -10,10 +10,10 @@ buildNpmPackage rec {
|
||||
# updated by the update script
|
||||
# this is always the commit that should be used with asf-ui from the latest asf version
|
||||
rev = version;
|
||||
hash = "sha256-QrHBmLqvnVfHhBC+AF3YZUOx3ZEKA/FjtjXZW7ust8w=";
|
||||
hash = "sha256-yTBJoihDc4z4+a03S56MQORvz/l6aqBDzLEi0UrM1N4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-MmNckugDMNlBs6dNg/JRE+Qf5P8LbwIesul+7Osd16Y=";
|
||||
npmDepsHash = "sha256-S/OwjmfAyEVZfWQ7vqKFctbJRqED0HVJlWEGXrqB1Ys=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, lib
|
||||
, fetchzip
|
||||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, runCommand
|
||||
, appimageTools
|
||||
@ -24,6 +23,13 @@ let
|
||||
}
|
||||
''
|
||||
appimage-exec.sh -x $out ${src}/${pname}-${version}/${pname}
|
||||
|
||||
# JetBrains ship a broken desktop file. Despite registering a custom
|
||||
# scheme handler for jetbrains:// URLs, they never mark the command as
|
||||
# being suitable for passing URLs to. Ergo, the handler never receives
|
||||
# its payload. This causes various things to break, including login.
|
||||
# Reported upstream at: https://youtrack.jetbrains.com/issue/TBX-11478/
|
||||
sed -Ei '/^Exec=/s/( %U)?$/ %U/' $out/jetbrains-toolbox.desktop
|
||||
'';
|
||||
|
||||
appimage = appimageTools.wrapAppImage {
|
||||
@ -31,19 +37,6 @@ let
|
||||
src = appimageContents;
|
||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.targetPkgs pkgs);
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "JetBrains Toolbox";
|
||||
exec = "jetbrains-toolbox";
|
||||
comment = "JetBrains Toolbox";
|
||||
desktopName = "JetBrains Toolbox";
|
||||
type = "Application";
|
||||
icon = "jetbrains-toolbox";
|
||||
terminal = false;
|
||||
categories = [ "Development" ];
|
||||
startupWMClass = "jetbrains-toolbox";
|
||||
startupNotify = false;
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version src appimage;
|
||||
@ -61,7 +54,7 @@ stdenv.mkDerivation {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [ desktopItem ];
|
||||
desktopItems = [ "${appimageContents}/jetbrains-toolbox.desktop" ];
|
||||
|
||||
# Disabling the tests, this seems to be very difficult to test this app.
|
||||
doCheck = false;
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
let
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
pname = "obsidian";
|
||||
version = "1.5.3";
|
||||
version = "1.5.8";
|
||||
appname = "Obsidian";
|
||||
meta = with lib; {
|
||||
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
|
||||
@ -25,7 +25,7 @@ let
|
||||
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
|
||||
hash = if stdenv.isDarwin then "sha256-AXjzQwZxyRaI8mMU2EsNK0fRcXS7UNNBWPXeJzgomlY=" else "sha256-F7nqWOeBGGSmSVNTpcx3lHRejSjNeM2BBqS9tsasTvg=";
|
||||
hash = if stdenv.isDarwin then "sha256-5olNmOLE9AgVUyRY8PylUPGYIMS+KoDG3g2BMCySdyE=" else "sha256-oc2iA2E3ac/uUNv6unzfac5meHqQzmzDVl/M9jNpS/M=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
From 04933c578f51aa1f536991318dc5aede57f81c0d Mon Sep 17 00:00:00 2001
|
||||
From: Attila Lendvai <attila@lendvai.name>
|
||||
Date: Sat, 30 Jan 2021 14:02:02 +0100
|
||||
Subject: [PATCH 1/2] clef-service: accept default CONFIGDIR from the
|
||||
environment
|
||||
|
||||
---
|
||||
packaging/bee-clef-service | 15 ++++++++++-----
|
||||
1 file changed, 10 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/packaging/bee-clef-service b/packaging/bee-clef-service
|
||||
index 10bcd92..34c7edd 100755
|
||||
--- a/packaging/bee-clef-service
|
||||
+++ b/packaging/bee-clef-service
|
||||
@@ -1,16 +1,21 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
start() {
|
||||
- KEYSTORE=/var/lib/bee-clef/keystore
|
||||
- CONFIGDIR=/var/lib/bee-clef
|
||||
+ if [ -z "$CONFIGDIR" ]; then
|
||||
+ CONFIGDIR=/var/lib/bee-clef
|
||||
+ fi
|
||||
+ if [ -z "$PASSWORD_FILE" ]; then
|
||||
+ PASSWORD_FILE=${CONFIGDIR}/password
|
||||
+ fi
|
||||
+ KEYSTORE=${CONFIGDIR}/keystore
|
||||
+ SECRET=$(cat ${PASSWORD_FILE})
|
||||
CHAINID=5
|
||||
- SECRET=$(cat /var/lib/bee-clef/password)
|
||||
# clef with every start sets permissions back to 600
|
||||
- (sleep 4; chmod 660 /var/lib/bee-clef/clef.ipc) &
|
||||
+ (sleep 4; chmod 660 ${CONFIGDIR}/clef.ipc) &
|
||||
( sleep 2; cat << EOF
|
||||
{ "jsonrpc": "2.0", "id":1, "result": { "text":"$SECRET" } }
|
||||
EOF
|
||||
-) | clef --stdio-ui --keystore $KEYSTORE --configdir $CONFIGDIR --chainid $CHAINID --rules /etc/bee-clef/rules.js --nousb --4bytedb-custom /etc/bee-clef/4byte.json --pcscdpath "" --auditlog "" --loglevel 3 --ipcpath /var/lib/bee-clef
|
||||
+) | clef --stdio-ui --keystore $KEYSTORE --configdir $CONFIGDIR --chainid $CHAINID --rules /etc/bee-clef/rules.js --nousb --4bytedb-custom /etc/bee-clef/4byte.json --pcscdpath "" --auditlog "" --loglevel 3 --ipcpath ${CONFIGDIR}
|
||||
}
|
||||
|
||||
stop() {
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 1a1ab986245e8b74648a1a0adb5d1c7019561d18 Mon Sep 17 00:00:00 2001
|
||||
From: Attila Lendvai <attila@lendvai.name>
|
||||
Date: Sat, 30 Jan 2021 15:24:57 +0100
|
||||
Subject: [PATCH 2/2] nix diff for substituteAll
|
||||
|
||||
---
|
||||
packaging/bee-clef-service | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/packaging/bee-clef-service b/packaging/bee-clef-service
|
||||
index 34c7edd..31e9d95 100755
|
||||
--- a/packaging/bee-clef-service
|
||||
+++ b/packaging/bee-clef-service
|
||||
@@ -15,7 +15,7 @@ start() {
|
||||
( sleep 2; cat << EOF
|
||||
{ "jsonrpc": "2.0", "id":1, "result": { "text":"$SECRET" } }
|
||||
EOF
|
||||
-) | clef --stdio-ui --keystore $KEYSTORE --configdir $CONFIGDIR --chainid $CHAINID --rules /etc/bee-clef/rules.js --nousb --4bytedb-custom /etc/bee-clef/4byte.json --pcscdpath "" --auditlog "" --loglevel 3 --ipcpath ${CONFIGDIR}
|
||||
+) | @clefBinary@ --stdio-ui --keystore $KEYSTORE --configdir $CONFIGDIR --chainid $CHAINID --rules @out@/share/bee-clef/rules.js --nousb --4bytedb-custom @out@/share/bee-clef/4byte.json --pcscdpath "" --auditlog "" --loglevel 3 --ipcpath ${CONFIGDIR}
|
||||
}
|
||||
|
||||
stop() {
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
{ version ? "release", stdenv, lib, fetchFromGitHub, go-ethereum }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bee-clef";
|
||||
version = "0.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethersphere";
|
||||
repo = "bee-clef";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "1sfwql0kvnir8b9ggpqcyc0ar995gxgfbhqb1xpfzp6wl0g3g4zz";
|
||||
};
|
||||
|
||||
buildInputs = [ go-ethereum ];
|
||||
|
||||
clefBinary = "${go-ethereum}/bin/clef";
|
||||
|
||||
patches = [
|
||||
./0001-clef-service-accept-default-CONFIGDIR-from-the-envir.patch
|
||||
./0002-nix-diff-for-substituteAll.patch
|
||||
];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin/
|
||||
mkdir -p $out/share/bee-clef/
|
||||
mkdir -p $out/lib/systemd/system/
|
||||
cp packaging/bee-clef.service $out/lib/systemd/system/
|
||||
substituteAll packaging/bee-clef-service $out/share/bee-clef/bee-clef-service
|
||||
substituteAll ${./ensure-clef-account} $out/share/bee-clef/ensure-clef-account
|
||||
substituteAll packaging/bee-clef-keys $out/bin/bee-clef-keys
|
||||
cp packaging/rules.js packaging/4byte.json $out/share/bee-clef/
|
||||
chmod +x $out/bin/bee-clef-keys
|
||||
chmod +x $out/share/bee-clef/bee-clef-service
|
||||
chmod +x $out/share/bee-clef/ensure-clef-account
|
||||
patchShebangs $out/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
# homepage = "https://gateway.ethswarm.org/bzz/docs.swarm.eth/docs/installation/bee-clef/";
|
||||
homepage = "https://docs.ethswarm.org/docs/installation/bee-clef";
|
||||
description = "External signer for Ethereum Swarm Bee";
|
||||
longDescription = ''
|
||||
clef is go-ethereum's external signer.
|
||||
|
||||
bee-clef is a package that starts up a vanilla clef instance as a systemd service,
|
||||
but configured in such a way that is suitable for bee (relaxed security for
|
||||
automated operation).
|
||||
|
||||
This package contains the files necessary to run the bee-clef service.
|
||||
'';
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ attila-lendvai ];
|
||||
platforms = go-ethereum.meta.platforms;
|
||||
};
|
||||
}
|
||||
@ -1,55 +1,34 @@
|
||||
{ version ? "release", lib, fetchFromGitHub, buildGoModule }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
versionSpec = rec {
|
||||
unstable = rec {
|
||||
pname = "bee-unstable";
|
||||
version = "2021-01-30";
|
||||
rev = "824636a2c2629c329ab10275cef6a0b7395343ad";
|
||||
goVersionString = "g" + builtins.substring 0 7 rev; # this seems to be some kind of standard of git describe...
|
||||
sha256 = "0ly1yqjq29arbak8lchdradf39l5bmxpbfir6ljjc7nyqdxz0sxg";
|
||||
vendorHash = "sha256-w5ZijaK8Adt1ZHPMmXqRWq0v0jdprRKRu03rePtZLXA=";
|
||||
};
|
||||
release = rec {
|
||||
pname = "bee";
|
||||
version = "0.5.0";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-3Oy9RhgMPRFjUs3Dj8XUhAqoxx5BTi32OiK4Y8YEG2Q=";
|
||||
vendorHash = "sha256-w5ZijaK8Adt1ZHPMmXqRWq0v0jdprRKRu03rePtZLXA=";
|
||||
};
|
||||
"0.5.0" = release;
|
||||
"0.4.1" = rec {
|
||||
pname = "bee";
|
||||
version = "0.4.1";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "1bmgbav52pcb5p7cgq9756512fzfqhjybyr0dv538plkqx47mpv7";
|
||||
vendorHash = "sha256-UGxiCXWlIfnhRZZBMYcWXFj77pqvJkb5wOllSdQeaUg=";
|
||||
};
|
||||
}.${version};
|
||||
|
||||
in
|
||||
|
||||
buildGoModule {
|
||||
inherit (versionSpec) pname version vendorHash;
|
||||
buildGoModule rec {
|
||||
pname = "bee";
|
||||
version = "1.18.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethersphere";
|
||||
repo = "bee";
|
||||
inherit (versionSpec) rev sha256;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LUOKF1073GmQWG2q4w0cTErSHw7ok5N6PQZ45xpjYx4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UdsF/otjXqS1NY3PkCimRiD93hGntHG3Xhw6avFtHog=";
|
||||
|
||||
subPackages = [ "cmd/bee" ];
|
||||
|
||||
# no symbol table, no debug info, and pass the commit for the version string
|
||||
ldflags = lib.optionals ( lib.hasAttr "goVersionString" versionSpec)
|
||||
[ "-s" "-w" "-X=github.com/ethersphere/bee.commit=${versionSpec.goVersionString}" ];
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/ethersphere/bee.version=${version}"
|
||||
"-X github.com/ethersphere/bee/pkg/api.Version=5.2.0"
|
||||
"-X github.com/ethersphere/bee/pkg/api.DebugVersion=4.1.0"
|
||||
"-X github.com/ethersphere/bee/pkg/p2p/libp2p.reachabilityOverridePublic=false"
|
||||
"-X github.com/ethersphere/bee/pkg/postage/listener.batchFactorOverridePublic=5"
|
||||
];
|
||||
|
||||
# Mimic the bee Makefile: without disabling CGO, two (transitive and
|
||||
# unused) dependencies would fail to compile.
|
||||
preBuild = ''
|
||||
export CGO_ENABLED=0
|
||||
'';
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib/systemd/system
|
||||
@ -65,11 +44,13 @@ buildGoModule {
|
||||
longDescription = ''
|
||||
A decentralised storage and communication system for a sovereign digital society.
|
||||
|
||||
Swarm is a system of peer-to-peer networked nodes that create a decentralised storage and communication service. The system is economically self-sustaining due to a built-in incentive system enforced through smart contracts on the Ethereum blockchain.
|
||||
Swarm is a system of peer-to-peer networked nodes that create a decentralised storage
|
||||
and communication service. The system is economically self-sustaining due to a built-in
|
||||
incentive system enforced through smart contracts on the Ethereum blockchain.
|
||||
|
||||
Bee is a Swarm node implementation, written in Go.
|
||||
'';
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ attila-lendvai ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
set -e
|
||||
|
||||
# NOTE This file is called by the systemd service in its preStart
|
||||
# hook, but it's not Nix specific in any way. Ideally, the same file
|
||||
# should be called from the postinst scripts of the other packages,
|
||||
# but... the world is not ideal.
|
||||
|
||||
# What follows was extracted from, and should be in sync with
|
||||
# https://github.com/ethersphere/bee-clef/tree/master/packaging
|
||||
|
||||
DATA_DIR="$1"
|
||||
CONFIG_DIR="$2"
|
||||
PASSWORD_FILE=${DATA_DIR}/password
|
||||
MASTERSEED=${DATA_DIR}/masterseed.json
|
||||
KEYSTORE=${DATA_DIR}/keystore
|
||||
|
||||
echo "ensure-clef-account $DATA_DIR $CONFIG_DIR"
|
||||
|
||||
if ! test -f ${PASSWORD_FILE}; then
|
||||
< /dev/urandom tr -dc _A-Z-a-z-0-9 2> /dev/null | head -c32 > ${PASSWORD_FILE}
|
||||
chmod 0400 ${PASSWORD_FILE}
|
||||
echo "Initialized ${PASSWORD_FILE} from /dev/urandom"
|
||||
fi
|
||||
|
||||
if ! test -f ${MASTERSEED}; then
|
||||
parse_json() { echo $1|sed -e 's/[{}]/''/g'|sed -e 's/", "/'\",\"'/g'|sed -e 's/" ,"/'\",\"'/g'|sed -e 's/" , "/'\",\"'/g'|sed -e 's/","/'\"---SEPERATOR---\"'/g'|awk -F=':' -v RS='---SEPERATOR---' "\$1~/\"$2\"/ {print}"|sed -e "s/\"$2\"://"|tr -d "\n\t"|sed -e 's/\\"/"/g'|sed -e 's/\\\\/\\/g'|sed -e 's/^[ \t]*//g'|sed -e 's/^"//' -e 's/"$//' ; }
|
||||
SECRET=$(cat ${PASSWORD_FILE})
|
||||
CLEF="@clefBinary@ --configdir ${DATA_DIR} --keystore ${KEYSTORE} --stdio-ui"
|
||||
$CLEF init >/dev/null << EOF
|
||||
$SECRET
|
||||
$SECRET
|
||||
EOF
|
||||
$CLEF newaccount >/dev/null << EOF
|
||||
$SECRET
|
||||
EOF
|
||||
$CLEF setpw 0x$(parse_json $(cat ${KEYSTORE}/*) address) >/dev/null << EOF
|
||||
$SECRET
|
||||
$SECRET
|
||||
$SECRET
|
||||
EOF
|
||||
$CLEF attest $(sha256sum ${CONFIG_DIR}/rules.js | cut -d' ' -f1 | tr -d '\n') >/dev/null << EOF
|
||||
$SECRET
|
||||
EOF
|
||||
echo "Clef data dir initialized"
|
||||
fi
|
||||
@ -2,7 +2,7 @@
|
||||
callPackage ./generic.nix {} rec {
|
||||
pname = "signal-desktop-beta";
|
||||
dir = "Signal Beta";
|
||||
version = "6.48.0-beta.1";
|
||||
version = "7.0.0-beta.1";
|
||||
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
|
||||
hash = "sha256-lDiab7XMXcg0XI4+7DJr5PWBAWes3cnL6oxiLy63eqY=";
|
||||
hash = "sha256-mMwOQVPihko/+ukEsaSu8l2u7obuY6gkTLAhSoWAVLo=";
|
||||
}
|
||||
|
||||
@ -20,12 +20,12 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitea";
|
||||
version = "1.21.5";
|
||||
version = "1.21.6";
|
||||
|
||||
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
|
||||
src = fetchurl {
|
||||
url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz";
|
||||
hash = "sha256-VnJF6CSssQYs8yIKmXvxYHh2CfLiJhuKtjRdqKIQGxw=";
|
||||
hash = "sha256-tixWipiVHugacTzBurdgfiLnKyVDDcqCPlysj2DoWjg=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-vertical-canvas";
|
||||
version = "1.3.1";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Aitum";
|
||||
repo = "obs-vertical-canvas";
|
||||
rev = version;
|
||||
sha256 = "sha256-kJJepKUH/tc6iV/zFDtrAa4bM9Gaqc9M7IItytknkGA=";
|
||||
sha256 = "sha256-80yqyfbSFBDLgGzSC8ktJRHFhbD5REWH0Rwrghcu6KY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -10,27 +10,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fastcdr";
|
||||
version = "2.1.3";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eProsima";
|
||||
repo = "Fast-CDR";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-eSf6LNTVsGEBXjTmTBjjWKBqs68pbnVcw1p2bi1Asgg=";
|
||||
hash = "sha256-hhYNgBLJCTZV/fgHEH7rxlTy+qpShAykxHLbPtPA/Uw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-Do-not-require-wget-and-unzip.patch
|
||||
];
|
||||
|
||||
# Fix doc generation error with doxygen >= 1.10.0
|
||||
# see https://github.com/eProsima/Fast-CDR/issues/193
|
||||
postPatch = ''
|
||||
substituteInPlace ./doxyfile.in --replace \
|
||||
"WARN_AS_ERROR = YES" \
|
||||
"WARN_AS_ERROR = NO"
|
||||
'';
|
||||
|
||||
cmakeFlags = lib.optional (stdenv.hostPlatform.isStatic) "-DBUILD_SHARED_LIBS=OFF"
|
||||
# upstream turns BUILD_TESTING=OFF by default and doesn't honor cmake's default (=ON)
|
||||
++ lib.optional (finalAttrs.finalPackage.doCheck) "-DBUILD_TESTING=ON"
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gickup";
|
||||
version = "0.10.26";
|
||||
version = "0.10.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cooperspencer";
|
||||
repo = "gickup";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-GYYmoGNYiwarMZw1w8tdH8zKl19XQ2R+EaJFK8iacwI=";
|
||||
hash = "sha256-ExSTvIq5u5Zmep/tipAJOHcXMxtESLQlEVMWnD8/rSI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vyDzGho9vcdCmBP7keccp5w3tXWHlSaFoncS1hqnBoc=";
|
||||
vendorHash = "sha256-riRFDhVOMdqwgGd6wowSDNgt8lZPzagCvKPWTHSqm6U=";
|
||||
|
||||
ldflags = ["-X main.version=${version}"];
|
||||
|
||||
|
||||
45
pkgs/by-name/li/libdjinterop/package.nix
Normal file
45
pkgs/by-name/li/libdjinterop/package.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, boost
|
||||
, cmake
|
||||
, ninja
|
||||
, pkg-config
|
||||
, sqlite
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libdjinterop";
|
||||
|
||||
version = "unstable";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xsco";
|
||||
repo = "libdjinterop";
|
||||
rev = "0.20.1";
|
||||
hash = "sha256-/iXSRJVFPWqUTVz7z0BNWCq5LOqdNuTI+wx/34JAZfc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
sqlite
|
||||
zlib
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/xsco/libdjinterop";
|
||||
description = "C++ library for access to DJ record libraries";
|
||||
license = licenses.lgpl3;
|
||||
maintainers = with maintainers; [ benley ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, clipper
|
||||
@ -10,14 +9,11 @@
|
||||
, gdal
|
||||
, ninja
|
||||
, proj
|
||||
, qtimageformats
|
||||
, qtlocation
|
||||
, qtsensors
|
||||
, qttools
|
||||
, qt5
|
||||
, zlib
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "OpenOrienteering-Mapper";
|
||||
version = "0.9.5";
|
||||
|
||||
@ -36,11 +32,19 @@ mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "find_package(ClangTidy" "#find_package(ClangTidy"
|
||||
substituteInPlace packaging/custom_install.cmake.in \
|
||||
--replace "fixup_bundle_portable(" "#fixup_bundle_portable("
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
doxygen
|
||||
ninja
|
||||
qttools
|
||||
qt5.qttools
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -48,35 +52,34 @@ mkDerivation rec {
|
||||
cups
|
||||
gdal
|
||||
proj
|
||||
qtimageformats
|
||||
qtlocation
|
||||
qtsensors
|
||||
qt5.qtimageformats
|
||||
qt5.qtlocation
|
||||
qt5.qtsensors
|
||||
zlib
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# Building the manual and bundling licenses fails
|
||||
# See https://github.com/NixOS/nixpkgs/issues/85306
|
||||
"-DLICENSING_PROVIDER:BOOL=OFF"
|
||||
"-DMapper_MANUAL_QTHELP:BOOL=OFF"
|
||||
(lib.cmakeBool "LICENSING_PROVIDER" false)
|
||||
(lib.cmakeBool "Mapper_MANUAL_QTHELP" false)
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# FindGDAL is broken and always finds /Library/Framework unless this is
|
||||
# specified
|
||||
"-DGDAL_INCLUDE_DIR=${gdal}/include"
|
||||
"-DGDAL_CONFIG=${gdal}/bin/gdal-config"
|
||||
"-DGDAL_LIBRARY=${gdal}/lib/libgdal.dylib"
|
||||
(lib.cmakeFeature "GDAL_INCLUDE_DIR" "${gdal}/include")
|
||||
(lib.cmakeFeature "GDAL_CONFIG" "${gdal}/bin/gdal-config")
|
||||
(lib.cmakeFeature "GDAL_LIBRARY" "${gdal}/lib/libgdal.dylib")
|
||||
# Don't bundle libraries
|
||||
"-DMapper_PACKAGE_PROJ=0"
|
||||
"-DMapper_PACKAGE_QT=0"
|
||||
"-DMapper_PACKAGE_ASSISTANT=0"
|
||||
"-DMapper_PACKAGE_GDAL=0"
|
||||
(lib.cmakeBool "Mapper_PACKAGE_PROJ" false)
|
||||
(lib.cmakeBool "Mapper_PACKAGE_QT" false)
|
||||
(lib.cmakeBool "Mapper_PACKAGE_ASSISTANT" false)
|
||||
(lib.cmakeBool "Mapper_PACKAGE_GDAL" false)
|
||||
];
|
||||
|
||||
postInstall = with stdenv; lib.optionalString isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
mkdir -p $out/{Applications,bin}
|
||||
mv $out/Mapper.app $out/Applications
|
||||
mkdir -p $out/bin
|
||||
ln -s $out/Applications/Mapper.app/Contents/MacOS/Mapper $out/bin/mapper
|
||||
ln -s $out/Applications/Mapper.app/Contents/MacOS/Mapper $out/bin/Mapper
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@ -86,7 +89,6 @@ mkDerivation rec {
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ mpickering sikmir ];
|
||||
platforms = with platforms; unix;
|
||||
broken = stdenv.isDarwin;
|
||||
mainProgram = "Mapper";
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
php.buildComposerProject (finalAttrs: {
|
||||
pname = "phpunit";
|
||||
version = "11.0.2";
|
||||
version = "11.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sebastianbergmann";
|
||||
repo = "phpunit";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-k0ox4/Djpu6DoWGzQdo7wYSZHSeaCtNVuEwK3bhBgQQ=";
|
||||
hash = "sha256-ASeALfqcDUoK2PSl88AJ3UgrLdesuH1o5UNq+ceGbxI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2rG0ERgI5oVW3MuU8yFwgssoWX6zwUwXpro2IVkX7ac=";
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
let
|
||||
pname = "simplex-chat-desktop";
|
||||
version = "5.4.4";
|
||||
version = "5.5.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
|
||||
hash = "sha256-f4P31e099bKBKsavP5f+xBGsqQfM6CYgUtUIOLe+cAE=";
|
||||
hash = "sha256-MD1AbpHlpaMaPlpJmGp0oPbOYPmJEhhIXmexkpCr1wY=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
70
pkgs/by-name/un/units/package.nix
Normal file
70
pkgs/by-name/un/units/package.nix
Normal file
@ -0,0 +1,70 @@
|
||||
{ lib
|
||||
, fetchurl
|
||||
, python3
|
||||
, readline
|
||||
, stdenv
|
||||
, enableCurrenciesUpdater ? true
|
||||
}:
|
||||
|
||||
let
|
||||
pythonEnv = python3.withPackages(p: [
|
||||
p.requests
|
||||
]);
|
||||
in stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "units";
|
||||
version = "2.23";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/units/units-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-2Ve0USRZJcnmFMRRM5dEljDq+SvWK4SVugm741Ghc3A=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "info" "man" ];
|
||||
|
||||
buildInputs = [
|
||||
readline
|
||||
] ++ lib.optionals enableCurrenciesUpdater [
|
||||
pythonEnv
|
||||
];
|
||||
|
||||
prePatch = lib.optionalString enableCurrenciesUpdater ''
|
||||
substituteInPlace units_cur \
|
||||
--replace "#!/usr/bin/env python" ${pythonEnv}/bin/python
|
||||
'';
|
||||
|
||||
postInstall = lib.optionalString enableCurrenciesUpdater ''
|
||||
cp units_cur ${placeholder "out"}/bin/
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.gnu.org/software/units/";
|
||||
description = "Unit conversion tool";
|
||||
longDescription = ''
|
||||
GNU Units converts quantities expressed in various systems of measurement
|
||||
to their equivalents in other systems of measurement. Like many similar
|
||||
programs, it can handle multiplicative scale changes. It can also handle
|
||||
nonlinear conversions such as Fahrenheit to Celsius or wire gauge, and it
|
||||
can convert from and to sums of units, such as converting between meters
|
||||
and feet plus inches.
|
||||
|
||||
Beyond simple unit conversions, GNU Units can be used as a general-purpose
|
||||
scientific calculator that keeps track of units in its calculations. You
|
||||
can form arbitrary complex mathematical expressions of dimensions
|
||||
including sums, products, quotients, powers, and even roots of
|
||||
dimensions. Thus you can ensure accuracy and dimensional consistency when
|
||||
working with long expressions that involve many different units that may
|
||||
combine in complex ways.
|
||||
|
||||
The units are defined in an external data file. You can use the extensive
|
||||
data file that comes with this program, or you can provide your own data
|
||||
file to suit your needs. You can also use your own data file to supplement
|
||||
the standard data file.
|
||||
'';
|
||||
license = with lib.licenses; [ gpl3Plus ];
|
||||
mainProgram = "units";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@ -11,17 +11,17 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "unison-code-manager";
|
||||
version = "0.5.15";
|
||||
version = "0.5.17";
|
||||
|
||||
src = if stdenv.isDarwin then
|
||||
fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz";
|
||||
hash = "sha256-Umpu9WQhg6ln6aBb6bPVUZSax1Zeh6vcYHwmQuFRx2Y=";
|
||||
hash = "sha256-ymnioW+phbwIshs8DZupfe14oPUuunxSsT8rmifh914=";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz";
|
||||
hash = "sha256-cFucBQcyye4F6Vep6O9buENFzqJ96q8/2cVr9NFvHB8=";
|
||||
hash = "sha256-vaK7dKkjCPCfEb9GvkOiJ3jY/Jxb31sf98de3WTMG/A=";
|
||||
};
|
||||
|
||||
# The tarball is just the prebuilt binary, in the archive root.
|
||||
|
||||
@ -1,14 +1,36 @@
|
||||
{ config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkg-config, lzip
|
||||
, perl, gmp, autoconf, automake, libidn2, libiconv
|
||||
{ config
|
||||
, lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, zlib
|
||||
, lzo
|
||||
, libtasn1
|
||||
, nettle
|
||||
, pkg-config
|
||||
, lzip
|
||||
, perl
|
||||
, gmp
|
||||
, autoconf
|
||||
, automake
|
||||
, libidn2
|
||||
, libiconv
|
||||
, texinfo
|
||||
, unbound, dns-root-data, gettext, util-linux
|
||||
, unbound
|
||||
, dns-root-data
|
||||
, gettext
|
||||
, util-linux
|
||||
, cxxBindings ? !stdenv.hostPlatform.isStatic # tries to link libstdc++.so
|
||||
, tpmSupport ? false, trousers, which, nettools, libunistring
|
||||
, withP11-kit ? !stdenv.hostPlatform.isStatic, p11-kit
|
||||
, tpmSupport ? false
|
||||
, trousers
|
||||
, which
|
||||
, nettools
|
||||
, libunistring
|
||||
, withP11-kit ? !stdenv.hostPlatform.isStatic
|
||||
, p11-kit
|
||||
, Security # darwin Security.framework
|
||||
# certificate compression - only zlib now, more possible: zstd, brotli
|
||||
# certificate compression - only zlib now, more possible: zstd, brotli
|
||||
|
||||
# for passthru.tests
|
||||
# for passthru.tests
|
||||
, curlWithGnuTls
|
||||
, emacs
|
||||
, ffmpeg
|
||||
@ -28,7 +50,7 @@ let
|
||||
# XXX: Gnulib's `test-select' fails on FreeBSD:
|
||||
# https://hydra.nixos.org/build/2962084/nixlog/1/raw .
|
||||
doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin
|
||||
&& stdenv.buildPlatform == stdenv.hostPlatform;
|
||||
&& stdenv.buildPlatform == stdenv.hostPlatform;
|
||||
|
||||
inherit (stdenv.hostPlatform) isDarwin;
|
||||
in
|
||||
@ -42,10 +64,12 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-90/FlUsn1Oxt+7Ed6ph4iLWxJCiaNwOvytoO5SD0Fz4=";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
|
||||
outputs = [ "bin" "dev" "out" ]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ "man" "devdoc" ];
|
||||
|
||||
# Not normally useful docs.
|
||||
outputInfo = "devdoc";
|
||||
outputDoc = "devdoc";
|
||||
outputDoc = "devdoc";
|
||||
|
||||
patches = [
|
||||
./nix-ssl-cert-file.patch
|
||||
@ -68,15 +92,17 @@ stdenv.mkDerivation rec {
|
||||
preConfigure = "patchShebangs .";
|
||||
configureFlags =
|
||||
lib.optionals withP11-kit [
|
||||
"--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt"
|
||||
"--with-default-trust-store-pkcs11=pkcs11:"
|
||||
] ++ [
|
||||
"--disable-dependency-tracking"
|
||||
"--enable-fast-install"
|
||||
"--with-unbound-root-key-file=${dns-root-data}/root.key"
|
||||
(lib.withFeature withP11-kit "p11-kit")
|
||||
(lib.enableFeature cxxBindings "cxx")
|
||||
];
|
||||
"--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt"
|
||||
"--with-default-trust-store-pkcs11=pkcs11:"
|
||||
] ++ [
|
||||
"--disable-dependency-tracking"
|
||||
"--enable-fast-install"
|
||||
"--with-unbound-root-key-file=${dns-root-data}/root.key"
|
||||
(lib.withFeature withP11-kit "p11-kit")
|
||||
(lib.enableFeature cxxBindings "cxx")
|
||||
] ++ lib.optionals (stdenv.hostPlatform.isMinGW) [
|
||||
"--disable-doc"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -121,17 +147,17 @@ stdenv.mkDerivation rec {
|
||||
description = "The GNU Transport Layer Security Library";
|
||||
|
||||
longDescription = ''
|
||||
GnuTLS is a project that aims to develop a library which
|
||||
provides a secure layer, over a reliable transport
|
||||
layer. Currently the GnuTLS library implements the proposed standards by
|
||||
the IETF's TLS working group.
|
||||
GnuTLS is a project that aims to develop a library which
|
||||
provides a secure layer, over a reliable transport
|
||||
layer. Currently the GnuTLS library implements the proposed standards by
|
||||
the IETF's TLS working group.
|
||||
|
||||
Quoting from the TLS protocol specification:
|
||||
Quoting from the TLS protocol specification:
|
||||
|
||||
"The TLS protocol provides communications privacy over the
|
||||
Internet. The protocol allows client/server applications to
|
||||
communicate in a way that is designed to prevent eavesdropping,
|
||||
tampering, or message forgery."
|
||||
"The TLS protocol provides communications privacy over the
|
||||
Internet. The protocol allows client/server applications to
|
||||
communicate in a way that is designed to prevent eavesdropping,
|
||||
tampering, or message forgery."
|
||||
'';
|
||||
|
||||
homepage = "https://gnutls.org/";
|
||||
|
||||
5515
pkgs/development/node-packages/node-packages.nix
generated
5515
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloudsmith-api";
|
||||
version = "2.0.7";
|
||||
version = "2.0.9";
|
||||
format = "wheel";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "cloudsmith_api";
|
||||
inherit format version;
|
||||
hash = "sha256-Vw5ifMJ+gwXecYjSe8QKkq+RtrBWxx3B/LdA80ZxuxU=";
|
||||
hash = "sha256-i/1Z4W/cwrrgo3h85OWfz2X3Y7Odz9mJdRuXokuky/Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-iam-logging";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-4O62hAl6uRz74up/AIwq22VSDQDlTwmm8ywKAik4QrQ=";
|
||||
hash = "sha256-qJcZHghAWG04PogbCY2JHsoPEoifHVOzsfUbemo5pi4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -0,0 +1,56 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, google-api-core
|
||||
, google-auth
|
||||
, mock
|
||||
, proto-plus
|
||||
, protobuf
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-netapp";
|
||||
version = "0.3.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-rWsR95I4lXf/xEJ/0HLhTR6V8g46NzmU/PmkAi797rM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
google-api-core
|
||||
google-auth
|
||||
proto-plus
|
||||
protobuf
|
||||
] ++ google-api-core.optional-dependencies.grpc;
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"google.cloud.netapp"
|
||||
"google.cloud.netapp_v1"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Client for NetApp API";
|
||||
homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-netapp";
|
||||
changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-netapp-v${version}/packages/google-cloud-netapp/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,56 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, google-api-core
|
||||
, google-auth
|
||||
, mock
|
||||
, proto-plus
|
||||
, protobuf
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-shell";
|
||||
version = "1.9.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-JLQea7+qWjomlQ1cbYJMou7u1eGwHNKgzqiUIUT0otY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
google-api-core
|
||||
google-auth
|
||||
proto-plus
|
||||
protobuf
|
||||
] ++ google-api-core.optional-dependencies.grpc;
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"google.cloud.shell"
|
||||
"google.cloud.shell_v1"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Client for Cloud Shell";
|
||||
homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-shell";
|
||||
changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-shell-v${version}/packages/google-cloud-shell/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,56 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, google-api-core
|
||||
, google-auth
|
||||
, mock
|
||||
, proto-plus
|
||||
, protobuf
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-vpc-access";
|
||||
version = "1.10.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-KFOyq/vpfNWaFpKJ0AAupVn3XiTP3V95x/5M6LkJtAQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
google-api-core
|
||||
google-auth
|
||||
proto-plus
|
||||
protobuf
|
||||
] ++ google-api-core.optional-dependencies.grpc;
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"google.cloud.vpcaccess"
|
||||
"google.cloud.vpcaccess_v1"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Client for Virtual Private Cloud";
|
||||
homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-vpc-access";
|
||||
changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-vpc-access-v${version}/packages/google-cloud-vpc-access/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,57 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, google-api-core
|
||||
, google-auth
|
||||
, mock
|
||||
, proto-plus
|
||||
, protobuf
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-webrisk";
|
||||
version = "1.14.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-5bRZRPVN6PtAI3yX5ogtxkDeHmz8mSE8ofz8k+VRLkY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
google-api-core
|
||||
google-auth
|
||||
proto-plus
|
||||
protobuf
|
||||
] ++ google-api-core.optional-dependencies.grpc;
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"google.cloud.webrisk"
|
||||
"google.cloud.webrisk_v1"
|
||||
"google.cloud.webrisk_v1beta1"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Client for Web Risk";
|
||||
homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-webrisk";
|
||||
changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-webrisk-v${version}/packages/google-cloud-webrisk/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,55 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, google-api-core
|
||||
, mock
|
||||
, proto-plus
|
||||
, protobuf
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-workflows";
|
||||
version = "1.14.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-L1gL3r+HzywvsbfWk28Rthwm8lqz0S9ekTcWUh8FcLM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
google-api-core
|
||||
proto-plus
|
||||
protobuf
|
||||
] ++ google-api-core.optional-dependencies.grpc;
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"google.cloud.workflows"
|
||||
"google.cloud.workflows_v1"
|
||||
"google.cloud.workflows_v1beta"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Client for Cloud Workflows";
|
||||
homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-workflows";
|
||||
changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-workflows-v${version}/packages/google-cloud-workflows/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,59 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, google-api-core
|
||||
, google-auth
|
||||
, grpc-google-iam-v1
|
||||
, mock
|
||||
, proto-plus
|
||||
, protobuf
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-workstations";
|
||||
version = "0.5.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-N6A+dpgQpVhCTor4FbjPAafyDsgB8pRrJcVGABpJCuE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
google-api-core
|
||||
google-auth
|
||||
grpc-google-iam-v1
|
||||
proto-plus
|
||||
protobuf
|
||||
] ++ google-api-core.optional-dependencies.grpc;
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"google.cloud.workstations"
|
||||
"google.cloud.workstations_v1"
|
||||
"google.cloud.workstations_v1beta"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Client for Cloud Workstations";
|
||||
homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-workstations";
|
||||
changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-workstations-v${version}/packages/google-cloud-workstations/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ledger-bitcoin";
|
||||
version = "0.2.2";
|
||||
version = "0.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "ledger_bitcoin";
|
||||
hash = "sha256-MEZuwIthIOwBkRdR7dEsEznO+GVBeOf7/5xmwNW1SvI=";
|
||||
hash = "sha256-rZzerzOkVWK71brmdRAluGmi+B1usCZ90GKgH1klpNU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oslo-log";
|
||||
version = "5.4.0";
|
||||
version = "5.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "oslo.log";
|
||||
inherit version;
|
||||
hash = "sha256-LrNVtYVw8lgR2nb6gUU7h1x8lEoZoj0sMFtKTf670iM=";
|
||||
hash = "sha256-TO3RZpx94o2OZrZ6X21sb+g5KFNfqHzWm/ZhG1n1Z+c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -359,6 +359,7 @@ let
|
||||
jqr = [ pkgs.jq.dev ];
|
||||
KFKSDS = [ pkgs.gsl ];
|
||||
kza = [ pkgs.fftw.dev ];
|
||||
Libra = [ pkgs.gsl ];
|
||||
LOMAR = [ pkgs.gmp.dev ];
|
||||
lpsymphony = with pkgs; [ pkg-config gfortran gettext ];
|
||||
lwgeom = with pkgs; [ proj geos gdal ];
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bearer";
|
||||
version = "1.37.0";
|
||||
version = "1.39.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bearer";
|
||||
repo = "bearer";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-b4EQAAPYMoL1MP5sVr3Fu0/znWxlVzpeGbghommCpUg=";
|
||||
hash = "sha256-GgdEOTrzaTsSTRW2NUzdxzUxGI1UCIk/6mAoyRysRVc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-jE1DUANd1PgSWbwz/PV1pIMgzvRm0ApaJaLCljMw4ig=";
|
||||
vendorHash = "sha256-fCSgRjsioXyt9mxQoZxyA+F63FAwlmwJAjquR+zAgQg=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/bearer"
|
||||
|
||||
@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "biome";
|
||||
version = "1.4.1";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "biomejs";
|
||||
repo = "biome";
|
||||
rev = "cli/v${version}";
|
||||
hash = "sha256-lzY1Eh1jZixsKi+ObQlhzV4KSV7ZSGPBJtaO9ZiJjEk=";
|
||||
hash = "sha256-70LHsmS01ssD4yCbHfBouV+NyhMIlBbX0jcHFu8aLMw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Hy5UH2VwqboRD+akl1FxBZoXr2+SmVH5Jx0lSAB/P7w=";
|
||||
cargoHash = "sha256-wf6X6aY1O9EABQ6sDNAb3XsVrC0lgUtpgoieiPZ7r3k=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@ -40,7 +40,10 @@ rustPlatform.buildRustPackage rec {
|
||||
];
|
||||
|
||||
cargoBuildFlags = [ "-p=biome_cli" ];
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
cargoTestFlags = cargoBuildFlags ++
|
||||
# skip a broken test from v1.5.3 release
|
||||
# this will be removed on the next version
|
||||
[ "-- --skip=diagnostics::test::termination_diagnostic_size" ];
|
||||
|
||||
env = {
|
||||
BIOME_VERSION = version;
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jenkins";
|
||||
version = "2.426.3";
|
||||
version = "2.440.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://get.jenkins.io/war-stable/${version}/jenkins.war";
|
||||
hash = "sha256-q0OSQ6agfi54/nw0CMWWCfe+O/JolHrCFGV6+Wq60QY=";
|
||||
hash = "sha256-Ck3uMnaGcyl0W8nSU9rYVl+rALTC8G4aItSS1tRkSV0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
@ -69,7 +69,8 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://jenkins.io/";
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ coconnor earldouglas nequissimus ] ++ teams.helsinki-systems.members;
|
||||
maintainers = with maintainers;
|
||||
[ coconnor earldouglas nequissimus ] ++ teams.helsinki-systems.members;
|
||||
changelog = "https://www.jenkins.io/changelog-stable/#v${version}";
|
||||
mainProgram = "jenkins-cli";
|
||||
platforms = platforms.all;
|
||||
|
||||
@ -14,47 +14,47 @@ assert lib.assertMsg (!php.ztsSupport) "blackfire only supports non zts versions
|
||||
let
|
||||
phpMajor = lib.versions.majorMinor php.version;
|
||||
|
||||
version = "1.92.9";
|
||||
version = "1.92.10";
|
||||
|
||||
hashes = {
|
||||
"x86_64-linux" = {
|
||||
system = "amd64";
|
||||
hash = {
|
||||
"8.1" = "sha256-pvJHzqhpKdLyWexqCdynOXIoIkb6WPFogQzzdGSl0Go=";
|
||||
"8.2" = "sha256-M2ihNS2IK0tO+lXXSrJZLguRzyrV8q/45gmK0pfxjuo=";
|
||||
"8.3" = "sha256-v4vt0GkM8pbZ+zJrNqu+h1TM680RpnCQwNDyFFD/vuE=";
|
||||
"8.1" = "sha256-U2vcgqnpz1+pS4aE3usj/ktrbnXw70+xpedx1LkbTvI=";
|
||||
"8.2" = "sha256-rX57nPA6Fduzv5t/lGYnIPXSbW8ddlpQrDDqj3CUzQ0=";
|
||||
"8.3" = "sha256-DXlMHZvGZMdzVRVe7Mv80sGHwUkWcr99hsWl7VnOrb0=";
|
||||
};
|
||||
};
|
||||
"i686-linux" = {
|
||||
system = "i386";
|
||||
hash = {
|
||||
"8.1" = "sha256-+IrL8OGjny+FPLNNj0N0oJGSuUA9nZFBkalW6qbBtbI=";
|
||||
"8.2" = "sha256-z5oFFh+0spuku+nZf9ICL17upLHoA2k6StAmVpKIxyw=";
|
||||
"8.3" = "sha256-1maDNZb92ptbbiIUZxwEBNk6oQPf6f2LVHvsXrpmdQ8=";
|
||||
"8.1" = "sha256-Czua15eOomeIwaVll6THoKWlg2KSoj8TZn/kmpik8no=";
|
||||
"8.2" = "sha256-oFqbLJUD8IlhdM3qT1zZUqPs/eikDJB7UqEc5RdPWGk=";
|
||||
"8.3" = "sha256-/ueCOSPGdLDUQpaPOkiOkk1+xKYAFQoRPVUjrbGjkgI=";
|
||||
};
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
system = "arm64";
|
||||
hash = {
|
||||
"8.1" = "sha256-apIHM85SDtdrNy2zkgue4nLS+IYg0aqO67tjt3iPMvQ=";
|
||||
"8.2" = "sha256-vafJYIXksjQXNOufSNsRCBOkhh9Da1sp0X1JJtH0wNM=";
|
||||
"8.3" = "sha256-JTfFszym+zq4U2V1HOkGB41OR/mt7GotHo1HThjLEV0=";
|
||||
"8.1" = "sha256-F3bxCPvlXnBNXcp1ia47HdEfrronRqftTUQkvV2yeew=";
|
||||
"8.2" = "sha256-dLUfo13RILacTgHhfLvzFOz8OvwO+Nv6L6hQ7XE2o5c=";
|
||||
"8.3" = "sha256-NO6n3euYq0Ind6oxLaSRmj6FkmeWJme+ZcIfumQtEgE=";
|
||||
};
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
system = "arm64";
|
||||
hash = {
|
||||
"8.1" = "sha256-zj4oSpW2ubEdk5n8FjQF4oOWcjMd5V1G5ul8kHj/fyU=";
|
||||
"8.2" = "sha256-aedyASZs4Sy0CEX9Y5qjJnzzcvUdO9eYg9nZXrOcVnI=";
|
||||
"8.3" = "sha256-Sla+W+dz2foTnF3ys4MIcnP0FnSjiyWHfsMW0+Vhkpw=";
|
||||
"8.1" = "sha256-DNkRaUD+/MsK8K1i48LnekooKjYen/SRMcYNgVTxRfU=";
|
||||
"8.2" = "sha256-4MwsaqFozn6ybkjDIj+FUQv42I5YyV7gKXyTmNuLdRg=";
|
||||
"8.3" = "sha256-KZR0oO53S1cdao6JQJKsNGIUk7bqR1xYcJeXUL7RW6g=";
|
||||
};
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
system = "amd64";
|
||||
hash = {
|
||||
"8.1" = "sha256-YorZctBEUgPHnoXtcf8xkn6DfhM1BZnBNpfi5o7y0AM=";
|
||||
"8.2" = "sha256-5zmwJu1Ux5vebFeu1WMHRCKalB/qgm3/G74OPrd7nhc=";
|
||||
"8.3" = "sha256-vm2VK3jPR25ICxiKMqzh9DyzG9EVJ/rX3i7LQMox3gs=";
|
||||
"8.1" = "sha256-6rglM9HYhNdN4kumAOQibYt95oa5imgnfkhYDuC3Iso=";
|
||||
"8.2" = "sha256-+Mi+xWdWYFwrKPL9szo4C0jZn+FMPSmdKiVAiH9MxtY=";
|
||||
"8.3" = "sha256-0CwhF/z0phPYuOSZ0PRTG90DjjXKFKFEtAovCHYtRFw=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -51,6 +51,6 @@ llvmPackages.stdenv.mkDerivation {
|
||||
homepage = "https://github.com/rpav/c2ffi";
|
||||
description = "An LLVM based tool for extracting definitions from C, C++, and Objective C header files for use with foreign function call interfaces";
|
||||
license = licenses.lgpl21Only;
|
||||
maintainers = with maintainers; [ attila-lendvai ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
let
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
pname = "cargo-mobile2";
|
||||
version = "0.10.0";
|
||||
version = "0.10.2";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version;
|
||||
@ -20,14 +20,14 @@ rustPlatform.buildRustPackage {
|
||||
owner = "tauri-apps";
|
||||
repo = pname;
|
||||
rev = "cargo-mobile2-v${version}";
|
||||
hash = "sha256-5Z2ztRe4SBiqR2hQELVXBLtvTLspTbBMIMZab8gQMzo=";
|
||||
hash = "sha256-LRQfntEbY8K1kepgn2Gww1ixWmvKHuw6DPT9j9MG118=";
|
||||
};
|
||||
|
||||
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
|
||||
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
|
||||
# sourceRoot = "${src.name}/tooling/cli";
|
||||
|
||||
cargoHash = "sha256-mOdtIJfnn8neOQIiiYNITlKrG2Qst0Jl4rTI3fo/JdU=";
|
||||
cargoHash = "sha256-yWkyIwZ3KPMhlVajCIAYonFveGFqzB5qBGO5WdzjxNs=";
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p $out/share/
|
||||
|
||||
@ -4,7 +4,7 @@ let
|
||||
# The x86-64-modern may need to be refined further in the future
|
||||
# but stdenv.hostPlatform CPU flags do not currently work on Darwin
|
||||
# https://discourse.nixos.org/t/darwin-system-and-stdenv-hostplatform-features/9745
|
||||
archDarwin = if stdenv.isx86_64 then "x86-64-modern" else "x86-64";
|
||||
archDarwin = if stdenv.isx86_64 then "x86-64-modern" else "apple-silicon";
|
||||
arch = if stdenv.isDarwin then archDarwin else
|
||||
if stdenv.isx86_64 then "x86-64" else
|
||||
if stdenv.isi686 then "x86-32" else
|
||||
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||
much stronger than the best human chess grandmasters.
|
||||
'';
|
||||
maintainers = with maintainers; [ luispedro siraben ];
|
||||
platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"];
|
||||
platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
|
||||
license = licenses.gpl3Only;
|
||||
};
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
let
|
||||
pname = "yabai";
|
||||
version = "6.0.13";
|
||||
version = "6.0.15";
|
||||
|
||||
test-version = testers.testVersion {
|
||||
package = yabai;
|
||||
@ -53,7 +53,7 @@ in
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz";
|
||||
hash = "sha256-71Dw/5wqoHE6HEhGA/CJA2WVgN3EifdyBO0gLFOwfJA=";
|
||||
hash = "sha256-L82N0IaC2OAZVhmu9NALencK78FeCZI2cWJyNkGH2vQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -89,7 +89,7 @@ in
|
||||
owner = "koekeishiya";
|
||||
repo = "yabai";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jt1PwMkhWBWAFYXJ1HxVLwJY9OmNDzlohB5krIsvWfg=";
|
||||
hash = "sha256-buX6FRIXdM5VmYpA80eESDMPf+xeMfJJj0ulyx2g94M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -18,11 +18,11 @@ let
|
||||
'';
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "keycloak";
|
||||
version = "23.0.6";
|
||||
version = "23.0.7";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
|
||||
hash = "sha256-Sw+6UloKSvYjkm7qYROmsZxKk/sky4DKvgupo+S61Q8=";
|
||||
hash = "sha256-9Hx7pX4m60u1UZAqXiafqEPMTvDVNdGLZfsSCktF84Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper jre ];
|
||||
@ -84,7 +84,7 @@ in stdenv.mkDerivation rec {
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
license = licenses.asl20;
|
||||
platforms = jre.meta.platforms;
|
||||
maintainers = with maintainers; [ ngerstle talyz ];
|
||||
maintainers = with maintainers; [ ngerstle talyz nickcao ];
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "opensearch";
|
||||
version = "2.11.1";
|
||||
version = "2.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz";
|
||||
hash = "sha256-km6z+Z9ZLnUY1dweJQrhHRu0XvdmqQIiqN8Ruy7jWpw=";
|
||||
hash = "sha256-t9s633qDzxvG1x+VVATpczzvD+ojnfTiwB/EambMKtA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dolibarr";
|
||||
version = "18.0.5";
|
||||
version = "19.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dolibarr";
|
||||
repo = "dolibarr";
|
||||
rev = version;
|
||||
hash = "sha256-DMy5GrQ6xKwMqJtJv3IW0CuLVq85pDCF9qJBs+1B5H4=";
|
||||
hash = "sha256-Guq3CHdVqGfprXo0O3VriWSfWR/sIgj3Znso1BUeLNY=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
readline,
|
||||
enableCurrenciesUpdater ? true,
|
||||
pythonPackages ? null
|
||||
}:
|
||||
|
||||
assert enableCurrenciesUpdater -> pythonPackages != null;
|
||||
|
||||
let pythonEnv = pythonPackages.python.withPackages(ps: [
|
||||
ps.requests
|
||||
]);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "units";
|
||||
version = "2.22";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/units/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-XRPhIHch/ncm2Qa6HZLcDt2qn8JnWe0i47jRp5MSWEg=";
|
||||
};
|
||||
|
||||
buildInputs = [ readline ]
|
||||
++ lib.optionals enableCurrenciesUpdater [
|
||||
pythonEnv
|
||||
]
|
||||
;
|
||||
prePatch = lib.optionalString enableCurrenciesUpdater ''
|
||||
substituteInPlace units_cur \
|
||||
--replace "#!/usr/bin/env python" ${pythonEnv}/bin/python
|
||||
'';
|
||||
postInstall = ''
|
||||
cp units_cur ${placeholder "out"}/bin/
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unit conversion tool";
|
||||
homepage = "https://www.gnu.org/software/units/";
|
||||
license = [ licenses.gpl3Plus ];
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.vrthra ];
|
||||
};
|
||||
}
|
||||
@ -9,14 +9,14 @@ with python3.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "yutto";
|
||||
version = "2.0.0b33";
|
||||
version = "2.0.0b35";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-TUyjppAHmWCZxifeQeOpFMPBksqLRSYdqgG7NEMVILY=";
|
||||
hash = "sha256-r4Lc5PMkhwLMC6nKArvpf9M4N+eoV6OmZK2uhY6xZxA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -24,12 +24,13 @@ buildPythonApplication rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
httpx
|
||||
aiofiles
|
||||
biliass
|
||||
dict2xml
|
||||
colorama
|
||||
];
|
||||
typing-extensions
|
||||
] ++ (with httpx.optional-dependencies; http2 ++ socks);
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg ]})
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "spire";
|
||||
version = "1.8.7";
|
||||
version = "1.9.0";
|
||||
|
||||
outputs = [ "out" "agent" "server" ];
|
||||
|
||||
@ -10,10 +10,10 @@ buildGoModule rec {
|
||||
owner = "spiffe";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-D6NNG//1rM7EIzawKdMA/8nloqMNAkF75YyFpHvxUkI=";
|
||||
sha256 = "sha256-0gV4s5MsA5+QhDpceRH20/KjPJi5YF4HsN3HF1u7vBo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bSQitqXTY1LMnpGkXAmDiDsMd0xZHrcr/Ms1F6avBKM=";
|
||||
vendorHash = "sha256-X8/R2u7mAJuwfltIZV5NrgbzR0U6Ty092Wlbs3u9oIw=";
|
||||
|
||||
subPackages = [ "cmd/spire-agent" "cmd/spire-server" ];
|
||||
|
||||
|
||||
@ -97,6 +97,8 @@ mapAliases ({
|
||||
bash_5 = bash; # Added 2021-08-20
|
||||
bazel_3 = throw "bazel 3 is past end of life as it is not an lts version"; # Added 2023-02-02
|
||||
bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04
|
||||
bee-unstable = throw "bee-unstable has been removed, use 'bee' instead"; # Added 2024-02-12
|
||||
bee-clef = throw "bee-clef has been removed as the upstream project was archived"; # Added 2024-02-12
|
||||
beignet = throw "beignet was removed as it was never ported from old llvmPackages_6 upstream"; # added 2024-01-08
|
||||
binance = throw "binance has been removed, because it depends on a very outdated and insecure version of electron"; # Added 2023-11-09
|
||||
bird2 = bird; # Added 2022-02-21
|
||||
|
||||
@ -6614,15 +6614,7 @@ with pkgs;
|
||||
|
||||
beanstalkd = callPackage ../servers/beanstalkd { };
|
||||
|
||||
bee = callPackage ../applications/networking/bee/bee.nix {
|
||||
version = "release";
|
||||
};
|
||||
|
||||
bee-unstable = bee.override {
|
||||
version = "unstable";
|
||||
};
|
||||
|
||||
bee-clef = callPackage ../applications/networking/bee/bee-clef.nix { };
|
||||
bee = callPackage ../applications/networking/bee/bee.nix { };
|
||||
|
||||
beetsPackages = lib.recurseIntoAttrs (callPackage ../tools/audio/beets { });
|
||||
inherit (beetsPackages) beets beets-unstable;
|
||||
@ -8637,7 +8629,6 @@ with pkgs;
|
||||
jdk = graalvm-ce;
|
||||
};
|
||||
|
||||
gnucap = callPackage ../applications/science/electronics/gnucap { };
|
||||
gnucap-full = gnucap.withPlugins(p: [ p.verilog ]);
|
||||
|
||||
gnu-cim = callPackage ../development/compilers/gnu-cim { };
|
||||
@ -14715,11 +14706,6 @@ with pkgs;
|
||||
inherit (darwin) cctools;
|
||||
};
|
||||
|
||||
units = callPackage ../tools/misc/units {
|
||||
enableCurrenciesUpdater = true;
|
||||
pythonPackages = python3Packages;
|
||||
};
|
||||
|
||||
unittest-cpp = callPackage ../development/libraries/unittest-cpp { };
|
||||
|
||||
unnaturalscrollwheels = callPackage ../tools/inputmethods/unnaturalscrollwheels { };
|
||||
@ -21055,8 +21041,6 @@ with pkgs;
|
||||
autoreconfHook = buildPackages.autoreconfHook269;
|
||||
};
|
||||
|
||||
fastcdr = callPackage ../development/libraries/fastcdr { };
|
||||
|
||||
fbthrift = darwin.apple_sdk_11_0.callPackage ../development/libraries/fbthrift { };
|
||||
|
||||
fb303 = darwin.apple_sdk_11_0.callPackage ../development/libraries/fb303 { };
|
||||
@ -30073,8 +30057,6 @@ with pkgs;
|
||||
stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
|
||||
};
|
||||
|
||||
openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { };
|
||||
|
||||
qgis-ltr = callPackage ../applications/gis/qgis/ltr.nix { };
|
||||
|
||||
qgis = callPackage ../applications/gis/qgis { };
|
||||
@ -34170,7 +34152,7 @@ with pkgs;
|
||||
wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { };
|
||||
|
||||
obsidian = callPackage ../applications/misc/obsidian {
|
||||
electron = electron_25;
|
||||
electron = electron_28;
|
||||
};
|
||||
|
||||
octoprint = callPackage ../applications/misc/octoprint { };
|
||||
|
||||
@ -4790,6 +4790,8 @@ self: super: with self; {
|
||||
|
||||
google-cloud-monitoring = callPackage ../development/python-modules/google-cloud-monitoring { };
|
||||
|
||||
google-cloud-netapp = callPackage ../development/python-modules/google-cloud-netapp { };
|
||||
|
||||
google-cloud-org-policy = callPackage ../development/python-modules/google-cloud-org-policy { };
|
||||
|
||||
google-cloud-os-config = callPackage ../development/python-modules/google-cloud-os-config { };
|
||||
@ -4806,6 +4808,8 @@ self: super: with self; {
|
||||
|
||||
google-cloud-securitycenter = callPackage ../development/python-modules/google-cloud-securitycenter { };
|
||||
|
||||
google-cloud-shell = callPackage ../development/python-modules/google-cloud-shell { };
|
||||
|
||||
google-cloud-spanner = callPackage ../development/python-modules/google-cloud-spanner { };
|
||||
|
||||
google-cloud-speech = callPackage ../development/python-modules/google-cloud-speech { };
|
||||
@ -4826,8 +4830,16 @@ self: super: with self; {
|
||||
|
||||
google-cloud-vision = callPackage ../development/python-modules/google-cloud-vision { };
|
||||
|
||||
google-cloud-vpc-access = callPackage ../development/python-modules/google-cloud-vpc-access { };
|
||||
|
||||
google-cloud-webrisk = callPackage ../development/python-modules/google-cloud-webrisk { };
|
||||
|
||||
google-cloud-websecurityscanner = callPackage ../development/python-modules/google-cloud-websecurityscanner { };
|
||||
|
||||
google-cloud-workflows = callPackage ../development/python-modules/google-cloud-workflows { };
|
||||
|
||||
google-cloud-workstations = callPackage ../development/python-modules/google-cloud-workstations { };
|
||||
|
||||
google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { };
|
||||
|
||||
google-crc32c = callPackage ../development/python-modules/google-crc32c {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user