Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

treewide: use new cargo fetcher part 5 #357266

Closed
wants to merge 19 commits into from
Closed

treewide: use new cargo fetcher part 5 #357266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5a9e7c1
treewide: use new cargo fetcher nixfmt part
Bot-wxt1221 Nov 19, 2024
01590d3
rust-synapse-compress-state: use new cargo fetcher
Bot-wxt1221 Nov 18, 2024
cd6a51c
rustdesk-server: use new cargo fetcher
Bot-wxt1221 Nov 18, 2024
81f0b06
edgedb: use new cargo fetcher
Bot-wxt1221 Nov 18, 2024
7c4b8b5
veilid: use new cargo fetcher
Bot-wxt1221 Nov 18, 2024
0efb91a
tunnelto: use new cargo fetcher
Bot-wxt1221 Nov 18, 2024
c379edd
vector: use new cargo fetcher
Bot-wxt1221 Nov 18, 2024
5e0ff98
asciinema-agg: use new cargo fetcher
Bot-wxt1221 Nov 18, 2024
1acd8a8
freshfetch: use new cargo fetcher
Bot-wxt1221 Nov 18, 2024
7a022ec
zenith: use new cargo fetcher
Bot-wxt1221 Nov 18, 2024
53ec239
gifski: use new cargo fetcher
Bot-wxt1221 Nov 18, 2024
ff39aa1
ajour: use new cargo fetcher
Bot-wxt1221 Nov 18, 2024
35d3788
yabridgectl: use new cargo fetcher
Bot-wxt1221 Nov 18, 2024
990dc3f
ripgrep-all: use new cargo fetcher
Bot-wxt1221 Nov 18, 2024
2e4e4ca
en-croissant: use new cargo fetcher
Bot-wxt1221 Nov 18, 2024
e52e656
lsp-ai: use new cargo fetcher
Bot-wxt1221 Nov 18, 2024
225ba23
lldap: use new cargo fetcher
Bot-wxt1221 Nov 18, 2024
a7c3481
volta: use new cargo fetcher
Bot-wxt1221 Nov 18, 2024
069a8ad
cjdns: use new cargo fetcher
Bot-wxt1221 Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
714 changes: 0 additions & 714 deletions pkgs/by-name/cj/cjdns/Cargo.lock
View file
Open in desktop

This file was deleted.

68 changes: 35 additions & 33 deletions pkgs/by-name/cj/cjdns/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
{ lib
, stdenv
, fetchFromGitHub
, rustPlatform
, nodejs
, which
, python39
, libuv
, util-linux
, nixosTests
, libsodium
, pkg-config
, substituteAll
{
lib,
stdenv,
fetchFromGitHub,
rustPlatform,
nodejs,
which,
python39,
libuv,
util-linux,
nixosTests,
libsodium,
pkg-config,
substituteAll,
}:

rustPlatform.buildRustPackage rec {
Expand All @@ -31,19 +32,17 @@ rustPlatform.buildRustPackage rec {
})
];

cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"libsodium-sys-0.2.6" = "sha256-yr6wh0njbCFZViLROcqSSoRFj7ZAMYG5lo1g0j75SN0=";
};
};
useFetchCargoVendor = true;
cargoHash = "sha256-LJEKjhyAsK6b7mKObX8tNJdKt53iagMD/YLzoY5GVPw=";

nativeBuildInputs = [
which
python39
nodejs
pkg-config
] ++
nativeBuildInputs =
[
which
python39
nodejs
pkg-config
]
++
# for flock
lib.optional stdenv.hostPlatform.isLinux util-linux;

Expand All @@ -53,14 +52,17 @@ rustPlatform.buildRustPackage rec {
];

env.SODIUM_USE_PKG_CONFIG = 1;
env.NIX_CFLAGS_COMPILE = toString ([
"-O2"
"-Wno-error=array-bounds"
"-Wno-error=stringop-overflow"
"-Wno-error=stringop-truncation"
] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [
"-Wno-error=stringop-overread"
]);
env.NIX_CFLAGS_COMPILE = toString (
[
"-O2"
"-Wno-error=array-bounds"
"-Wno-error=stringop-overflow"
"-Wno-error=stringop-truncation"
]
++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [
"-Wno-error=stringop-overread"
]
);

passthru.tests.basic = nixosTests.cjdns;

Expand Down
Loading