Merge staging-next into staging
This commit is contained in:
commit
e31b8a36d7
|
@ -608,227 +608,6 @@ buildPythonPackage rec {
|
|||
}
|
||||
```
|
||||
|
||||
## `buildRustCrate`: Compiling Rust crates using Nix instead of Cargo {#compiling-rust-crates-using-nix-instead-of-cargo}
|
||||
|
||||
### Simple operation {#simple-operation}
|
||||
|
||||
When run, `cargo build` produces a file called `Cargo.lock`,
|
||||
containing pinned versions of all dependencies. Nixpkgs contains a
|
||||
tool called `carnix` (`nix-env -iA nixos.carnix`), which can be used
|
||||
to turn a `Cargo.lock` into a Nix expression.
|
||||
|
||||
That Nix expression calls `rustc` directly (hence bypassing Cargo),
|
||||
and can be used to compile a crate and all its dependencies. Here is
|
||||
an example for a minimal `hello` crate:
|
||||
|
||||
```ShellSession
|
||||
$ cargo new hello
|
||||
$ cd hello
|
||||
$ cargo build
|
||||
Compiling hello v0.1.0 (file:///tmp/hello)
|
||||
Finished dev [unoptimized + debuginfo] target(s) in 0.20 secs
|
||||
$ carnix -o hello.nix --src ./. Cargo.lock --standalone
|
||||
$ nix-build hello.nix -A hello_0_1_0
|
||||
```
|
||||
|
||||
Now, the file produced by the call to `carnix`, called `hello.nix`, looks like:
|
||||
|
||||
```nix
|
||||
# Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone
|
||||
{ stdenv, buildRustCrate, fetchgit }:
|
||||
let kernel = stdenv.buildPlatform.parsed.kernel.name;
|
||||
# ... (content skipped)
|
||||
in
|
||||
rec {
|
||||
hello = f: hello_0_1_0 { features = hello_0_1_0_features { hello_0_1_0 = f; }; };
|
||||
hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
|
||||
crateName = "hello";
|
||||
version = "0.1.0";
|
||||
authors = [ "pe@pijul.org <pe@pijul.org>" ];
|
||||
src = ./.;
|
||||
inherit dependencies buildDependencies features;
|
||||
};
|
||||
hello_0_1_0 = { features?(hello_0_1_0_features {}) }: hello_0_1_0_ {};
|
||||
hello_0_1_0_features = f: updateFeatures f (rec {
|
||||
hello_0_1_0.default = (f.hello_0_1_0.default or true);
|
||||
}) [ ];
|
||||
}
|
||||
```
|
||||
|
||||
In particular, note that the argument given as `--src` is copied
|
||||
verbatim to the source. If we look at a more complicated
|
||||
dependencies, for instance by adding a single line `libc="*"` to our
|
||||
`Cargo.toml`, we first need to run `cargo build` to update the
|
||||
`Cargo.lock`. Then, `carnix` needs to be run again, and produces the
|
||||
following nix file:
|
||||
|
||||
```nix
|
||||
# Generated by carnix 0.6.5: carnix -o hello.nix --src ./. Cargo.lock --standalone
|
||||
{ stdenv, buildRustCrate, fetchgit }:
|
||||
let kernel = stdenv.buildPlatform.parsed.kernel.name;
|
||||
# ... (content skipped)
|
||||
in
|
||||
rec {
|
||||
hello = f: hello_0_1_0 { features = hello_0_1_0_features { hello_0_1_0 = f; }; };
|
||||
hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
|
||||
crateName = "hello";
|
||||
version = "0.1.0";
|
||||
authors = [ "pe@pijul.org <pe@pijul.org>" ];
|
||||
src = ./.;
|
||||
inherit dependencies buildDependencies features;
|
||||
};
|
||||
libc_0_2_36_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
|
||||
crateName = "libc";
|
||||
version = "0.2.36";
|
||||
authors = [ "The Rust Project Developers" ];
|
||||
sha256 = "01633h4yfqm0s302fm0dlba469bx8y6cs4nqc8bqrmjqxfxn515l";
|
||||
inherit dependencies buildDependencies features;
|
||||
};
|
||||
hello_0_1_0 = { features?(hello_0_1_0_features {}) }: hello_0_1_0_ {
|
||||
dependencies = mapFeatures features ([ libc_0_2_36 ]);
|
||||
};
|
||||
hello_0_1_0_features = f: updateFeatures f (rec {
|
||||
hello_0_1_0.default = (f.hello_0_1_0.default or true);
|
||||
libc_0_2_36.default = true;
|
||||
}) [ libc_0_2_36_features ];
|
||||
libc_0_2_36 = { features?(libc_0_2_36_features {}) }: libc_0_2_36_ {
|
||||
features = mkFeatures (features.libc_0_2_36 or {});
|
||||
};
|
||||
libc_0_2_36_features = f: updateFeatures f (rec {
|
||||
libc_0_2_36.default = (f.libc_0_2_36.default or true);
|
||||
libc_0_2_36.use_std =
|
||||
(f.libc_0_2_36.use_std or false) ||
|
||||
(f.libc_0_2_36.default or false) ||
|
||||
(libc_0_2_36.default or false);
|
||||
}) [];
|
||||
}
|
||||
```
|
||||
|
||||
Here, the `libc` crate has no `src` attribute, so `buildRustCrate`
|
||||
will fetch it from [crates.io](https://crates.io). A `sha256`
|
||||
attribute is still needed for Nix purity.
|
||||
|
||||
### Handling external dependencies {#handling-external-dependencies}
|
||||
|
||||
Some crates require external libraries. For crates from
|
||||
[crates.io](https://crates.io), such libraries can be specified in
|
||||
`defaultCrateOverrides` package in nixpkgs itself.
|
||||
|
||||
Starting from that file, one can add more overrides, to add features
|
||||
or build inputs by overriding the hello crate in a separate file.
|
||||
|
||||
```nix
|
||||
with import <nixpkgs> {};
|
||||
((import ./hello.nix).hello {}).override {
|
||||
crateOverrides = defaultCrateOverrides // {
|
||||
hello = attrs: { buildInputs = [ openssl ]; };
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
Here, `crateOverrides` is expected to be a attribute set, where the
|
||||
key is the crate name without version number and the value a function.
|
||||
The function gets all attributes passed to `buildRustCrate` as first
|
||||
argument and returns a set that contains all attribute that should be
|
||||
overwritten.
|
||||
|
||||
For more complicated cases, such as when parts of the crate's
|
||||
derivation depend on the crate's version, the `attrs` argument of
|
||||
the override above can be read, as in the following example, which
|
||||
patches the derivation:
|
||||
|
||||
```nix
|
||||
with import <nixpkgs> {};
|
||||
((import ./hello.nix).hello {}).override {
|
||||
crateOverrides = defaultCrateOverrides // {
|
||||
hello = attrs: lib.optionalAttrs (lib.versionAtLeast attrs.version "1.0") {
|
||||
postPatch = ''
|
||||
substituteInPlace lib/zoneinfo.rs \
|
||||
--replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
Another situation is when we want to override a nested
|
||||
dependency. This actually works in the exact same way, since the
|
||||
`crateOverrides` parameter is forwarded to the crate's
|
||||
dependencies. For instance, to override the build inputs for crate
|
||||
`libc` in the example above, where `libc` is a dependency of the main
|
||||
crate, we could do:
|
||||
|
||||
```nix
|
||||
with import <nixpkgs> {};
|
||||
((import hello.nix).hello {}).override {
|
||||
crateOverrides = defaultCrateOverrides // {
|
||||
libc = attrs: { buildInputs = []; };
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
### Options and phases configuration {#options-and-phases-configuration}
|
||||
|
||||
Actually, the overrides introduced in the previous section are more
|
||||
general. A number of other parameters can be overridden:
|
||||
|
||||
- The version of `rustc` used to compile the crate:
|
||||
|
||||
```nix
|
||||
(hello {}).override { rust = pkgs.rust; };
|
||||
```
|
||||
|
||||
- Whether to build in release mode or debug mode (release mode by
|
||||
default):
|
||||
|
||||
```nix
|
||||
(hello {}).override { release = false; };
|
||||
```
|
||||
|
||||
- Whether to print the commands sent to `rustc` when building
|
||||
(equivalent to `--verbose` in cargo:
|
||||
|
||||
```nix
|
||||
(hello {}).override { verbose = false; };
|
||||
```
|
||||
|
||||
- Extra arguments to be passed to `rustc`:
|
||||
|
||||
```nix
|
||||
(hello {}).override { extraRustcOpts = "-Z debuginfo=2"; };
|
||||
```
|
||||
|
||||
- Phases, just like in any other derivation, can be specified using
|
||||
the following attributes: `preUnpack`, `postUnpack`, `prePatch`,
|
||||
`patches`, `postPatch`, `preConfigure` (in the case of a Rust crate,
|
||||
this is run before calling the "build" script), `postConfigure`
|
||||
(after the "build" script),`preBuild`, `postBuild`, `preInstall` and
|
||||
`postInstall`. As an example, here is how to create a new module
|
||||
before running the build script:
|
||||
|
||||
```nix
|
||||
(hello {}).override {
|
||||
preConfigure = ''
|
||||
echo "pub const PATH=\"${hi.out}\";" >> src/path.rs"
|
||||
'';
|
||||
};
|
||||
```
|
||||
|
||||
### Features {#features}
|
||||
|
||||
One can also supply features switches. For example, if we want to
|
||||
compile `diesel_cli` only with the `postgres` feature, and no default
|
||||
features, we would write:
|
||||
|
||||
```nix
|
||||
(callPackage ./diesel.nix {}).diesel {
|
||||
default = false;
|
||||
postgres = true;
|
||||
}
|
||||
```
|
||||
|
||||
Where `diesel.nix` is the file generated by Carnix, as explained above.
|
||||
|
||||
## Setting Up `nix-shell` {#setting-up-nix-shell}
|
||||
|
||||
Oftentimes you want to develop code from within `nix-shell`. Unfortunately
|
||||
|
|
|
@ -422,29 +422,29 @@ rec {
|
|||
else if (elemAt l 1) == "elf"
|
||||
then { cpu = elemAt l 0; vendor = "unknown"; kernel = "none"; abi = elemAt l 1; }
|
||||
else { cpu = elemAt l 0; kernel = elemAt l 1; };
|
||||
"3" = # Awkward hacks, beware!
|
||||
if elemAt l 1 == "apple"
|
||||
then { cpu = elemAt l 0; vendor = "apple"; kernel = elemAt l 2; }
|
||||
else if (elemAt l 1 == "linux") || (elemAt l 2 == "gnu")
|
||||
then { cpu = elemAt l 0; kernel = elemAt l 1; abi = elemAt l 2; }
|
||||
else if (elemAt l 2 == "mingw32") # autotools breaks on -gnu for window
|
||||
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; }
|
||||
else if (elemAt l 2 == "wasi")
|
||||
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "wasi"; }
|
||||
else if (elemAt l 2 == "redox")
|
||||
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "redox"; }
|
||||
else if (elemAt l 2 == "mmixware")
|
||||
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "mmixware"; }
|
||||
else if hasPrefix "freebsd" (elemAt l 2)
|
||||
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; }
|
||||
else if hasPrefix "netbsd" (elemAt l 2)
|
||||
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; }
|
||||
else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"])
|
||||
then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 1; abi = elemAt l 2; }
|
||||
else if (elemAt l 2 == "ghcjs")
|
||||
then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 2; }
|
||||
else if hasPrefix "genode" (elemAt l 2)
|
||||
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; }
|
||||
"3" =
|
||||
# cpu-kernel-environment
|
||||
if elemAt l 1 == "linux" ||
|
||||
elem (elemAt l 2) ["eabi" "eabihf" "elf" "gnu"]
|
||||
then {
|
||||
cpu = elemAt l 0;
|
||||
kernel = elemAt l 1;
|
||||
abi = elemAt l 2;
|
||||
vendor = "unknown";
|
||||
}
|
||||
# cpu-vendor-os
|
||||
else if elemAt l 1 == "apple" ||
|
||||
elem (elemAt l 2) [ "wasi" "redox" "mmixware" "ghcjs" "mingw32" ] ||
|
||||
hasPrefix "freebsd" (elemAt l 2) ||
|
||||
hasPrefix "netbsd" (elemAt l 2) ||
|
||||
hasPrefix "genode" (elemAt l 2)
|
||||
then {
|
||||
cpu = elemAt l 0;
|
||||
vendor = elemAt l 1;
|
||||
kernel = if elemAt l 2 == "mingw32"
|
||||
then "windows" # autotools breaks on -gnu for window
|
||||
else elemAt l 2;
|
||||
}
|
||||
else throw "Target specification with 3 components is ambiguous";
|
||||
"4" = { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; };
|
||||
}.${toString (length l)}
|
||||
|
|
|
@ -33,7 +33,13 @@
|
|||
<itemizedlist spacing="compact">
|
||||
<listitem>
|
||||
<para>
|
||||
Create the first release note entry in this section!
|
||||
<literal>carnix</literal> and <literal>cratesIO</literal> has
|
||||
been removed due to being unmaintained, use alternatives such
|
||||
as
|
||||
<link xlink:href="https://github.com/nix-community/naersk">naersk</link>
|
||||
and
|
||||
<link xlink:href="https://github.com/kolloch/crate2nix">crate2nix</link>
|
||||
instead.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
|
|
|
@ -20,7 +20,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
- Create the first release note entry in this section!
|
||||
- `carnix` and `cratesIO` has been removed due to being unmaintained, use alternatives such as [naersk](https://github.com/nix-community/naersk) and [crate2nix](https://github.com/kolloch/crate2nix) instead.
|
||||
|
||||
## Other Notable Changes {#sec-release-23.05-notable-changes}
|
||||
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "limesctl";
|
||||
version = "3.0.3";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sapcc";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2eB+VpMrhzs0Dg+X1sf7TVW7uK/URETUuWO82jQl57k=";
|
||||
sha256 = "sha256-/CYZMuW5/YoZszTOaQZLRhJdZAGGMY+s7vMK01hyMvg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-VKxwdlyQUYmxubl4Y2uKvekuHd62GcGaoPeUBC+lcJU=";
|
||||
vendorSha256 = "sha256-BwhbvCUOOp5ZeY/22kIZ58e+iPH0pVgiNOyoD6O2zPo=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "clusterctl";
|
||||
version = "1.2.5";
|
||||
version = "1.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "cluster-api";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Cmff3tIy60BDO3q5hzPqSLwjc6LzUSpoorJD/yxha9c=";
|
||||
sha256 = "sha256-32Y4HQqODRlYLqDLUOqDwOf4Yp2xpAOPUgz8gU3TaEE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jvadtm8NprVwNf4+GaaANK1u4Y4ccbsTCZxQk21GW7c=";
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubelogin";
|
||||
version = "0.0.23";
|
||||
version = "0.0.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6aYa5C0RMCKrnBl3YNbdMUxGOJYwVZ303PLt5RRBjmw=";
|
||||
sha256 = "sha256-xHMUS08gtfN72sMkGZ+2Cazgkd2HgvHSKqugYg+j1So=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-mjIB0ITf296yDQJP46EI6pLYkZfyU3yzD9iwP0iIXvQ=";
|
||||
|
|
|
@ -30,16 +30,24 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wezterm";
|
||||
version = "20220905-102802-7d4b8249";
|
||||
version = "20221119-145034-49b9839f";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wez";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-Xvi0bluLM4F3BFefIPhkhTF3dmRvP8u+qV70Rz4CGKI=";
|
||||
sha256 = "sha256-1gnP2Dn4nkhxelUsXMay2VGvgvMjkdEKhFK5AAST++s=";
|
||||
};
|
||||
|
||||
# Rust 1.65 does better at enum packing (according to
|
||||
# 40e08fafe2f6e5b0c70d55996a0814d6813442ef), but Nixpkgs doesn't have 1.65
|
||||
# yet (still in staging), so skip these tests for now.
|
||||
checkFlags = [
|
||||
"--skip=escape::action_size"
|
||||
"--skip=surface::line::storage::test::memory_usage"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
echo ${version} > .tag
|
||||
|
||||
|
@ -47,7 +55,7 @@ rustPlatform.buildRustPackage rec {
|
|||
rm -r wezterm-ssh/tests
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-XJAeMDwtLtBzHMU/cb3lZgmcw5F3ifjKzKVmuP85/RY=";
|
||||
cargoSha256 = "sha256-D6/biuLsXaCr0KSiopo9BuAVmniF8opAfDH71C3dtt0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
@ -1,259 +0,0 @@
|
|||
# Generated by carnix 0.9.10: carnix generate-nix
|
||||
{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }:
|
||||
with buildRustCrateHelpers;
|
||||
let inherit (lib.lists) fold;
|
||||
inherit (lib.attrsets) recursiveUpdate;
|
||||
in
|
||||
rec {
|
||||
crates = cratesIO;
|
||||
carnix = crates.crates.carnix."0.10.0" deps;
|
||||
__all = [ (carnix {}) ];
|
||||
deps.aho_corasick."0.6.10" = {
|
||||
memchr = "2.2.0";
|
||||
};
|
||||
deps.ansi_term."0.11.0" = {
|
||||
winapi = "0.3.6";
|
||||
};
|
||||
deps.argon2rs."0.2.5" = {
|
||||
blake2_rfc = "0.2.18";
|
||||
scoped_threadpool = "0.1.9";
|
||||
};
|
||||
deps.arrayvec."0.4.10" = {
|
||||
nodrop = "0.1.13";
|
||||
};
|
||||
deps.atty."0.2.11" = {
|
||||
termion = "1.5.1";
|
||||
libc = "0.2.50";
|
||||
winapi = "0.3.6";
|
||||
};
|
||||
deps.autocfg."0.1.2" = {};
|
||||
deps.backtrace."0.3.14" = {
|
||||
cfg_if = "0.1.7";
|
||||
rustc_demangle = "0.1.13";
|
||||
autocfg = "0.1.2";
|
||||
backtrace_sys = "0.1.28";
|
||||
libc = "0.2.50";
|
||||
winapi = "0.3.6";
|
||||
};
|
||||
deps.backtrace_sys."0.1.28" = {
|
||||
libc = "0.2.50";
|
||||
cc = "1.0.32";
|
||||
};
|
||||
deps.bitflags."1.0.4" = {};
|
||||
deps.blake2_rfc."0.2.18" = {
|
||||
arrayvec = "0.4.10";
|
||||
constant_time_eq = "0.1.3";
|
||||
};
|
||||
deps.carnix."0.10.0" = {
|
||||
clap = "2.32.0";
|
||||
dirs = "1.0.5";
|
||||
env_logger = "0.6.1";
|
||||
failure = "0.1.5";
|
||||
failure_derive = "0.1.5";
|
||||
itertools = "0.8.0";
|
||||
log = "0.4.6";
|
||||
nom = "3.2.1";
|
||||
regex = "1.1.2";
|
||||
serde = "1.0.89";
|
||||
serde_derive = "1.0.89";
|
||||
serde_json = "1.0.39";
|
||||
tempdir = "0.3.7";
|
||||
toml = "0.5.0";
|
||||
url = "1.7.2";
|
||||
};
|
||||
deps.cc."1.0.32" = {};
|
||||
deps.cfg_if."0.1.7" = {};
|
||||
deps.clap."2.32.0" = {
|
||||
atty = "0.2.11";
|
||||
bitflags = "1.0.4";
|
||||
strsim = "0.7.0";
|
||||
textwrap = "0.10.0";
|
||||
unicode_width = "0.1.5";
|
||||
vec_map = "0.8.1";
|
||||
ansi_term = "0.11.0";
|
||||
};
|
||||
deps.cloudabi."0.0.3" = {
|
||||
bitflags = "1.0.4";
|
||||
};
|
||||
deps.constant_time_eq."0.1.3" = {};
|
||||
deps.dirs."1.0.5" = {
|
||||
redox_users = "0.3.0";
|
||||
libc = "0.2.50";
|
||||
winapi = "0.3.6";
|
||||
};
|
||||
deps.either."1.5.1" = {};
|
||||
deps.env_logger."0.6.1" = {
|
||||
atty = "0.2.11";
|
||||
humantime = "1.2.0";
|
||||
log = "0.4.6";
|
||||
regex = "1.1.2";
|
||||
termcolor = "1.0.4";
|
||||
};
|
||||
deps.failure."0.1.5" = {
|
||||
backtrace = "0.3.14";
|
||||
failure_derive = "0.1.5";
|
||||
};
|
||||
deps.failure_derive."0.1.5" = {
|
||||
proc_macro2 = "0.4.27";
|
||||
quote = "0.6.11";
|
||||
syn = "0.15.29";
|
||||
synstructure = "0.10.1";
|
||||
};
|
||||
deps.fuchsia_cprng."0.1.1" = {};
|
||||
deps.humantime."1.2.0" = {
|
||||
quick_error = "1.2.2";
|
||||
};
|
||||
deps.idna."0.1.5" = {
|
||||
matches = "0.1.8";
|
||||
unicode_bidi = "0.3.4";
|
||||
unicode_normalization = "0.1.8";
|
||||
};
|
||||
deps.itertools."0.8.0" = {
|
||||
either = "1.5.1";
|
||||
};
|
||||
deps.itoa."0.4.3" = {};
|
||||
deps.lazy_static."1.3.0" = {};
|
||||
deps.libc."0.2.50" = {};
|
||||
deps.log."0.4.6" = {
|
||||
cfg_if = "0.1.7";
|
||||
};
|
||||
deps.matches."0.1.8" = {};
|
||||
deps.memchr."1.0.2" = {
|
||||
libc = "0.2.50";
|
||||
};
|
||||
deps.memchr."2.2.0" = {};
|
||||
deps.nodrop."0.1.13" = {};
|
||||
deps.nom."3.2.1" = {
|
||||
memchr = "1.0.2";
|
||||
};
|
||||
deps.percent_encoding."1.0.1" = {};
|
||||
deps.proc_macro2."0.4.27" = {
|
||||
unicode_xid = "0.1.0";
|
||||
};
|
||||
deps.quick_error."1.2.2" = {};
|
||||
deps.quote."0.6.11" = {
|
||||
proc_macro2 = "0.4.27";
|
||||
};
|
||||
deps.rand."0.4.6" = {
|
||||
rand_core = "0.3.1";
|
||||
rdrand = "0.4.0";
|
||||
fuchsia_cprng = "0.1.1";
|
||||
libc = "0.2.50";
|
||||
winapi = "0.3.6";
|
||||
};
|
||||
deps.rand_core."0.3.1" = {
|
||||
rand_core = "0.4.0";
|
||||
};
|
||||
deps.rand_core."0.4.0" = {};
|
||||
deps.rand_os."0.1.3" = {
|
||||
rand_core = "0.4.0";
|
||||
rdrand = "0.4.0";
|
||||
cloudabi = "0.0.3";
|
||||
fuchsia_cprng = "0.1.1";
|
||||
libc = "0.2.50";
|
||||
winapi = "0.3.6";
|
||||
};
|
||||
deps.rdrand."0.4.0" = {
|
||||
rand_core = "0.3.1";
|
||||
};
|
||||
deps.redox_syscall."0.1.51" = {};
|
||||
deps.redox_termios."0.1.1" = {
|
||||
redox_syscall = "0.1.51";
|
||||
};
|
||||
deps.redox_users."0.3.0" = {
|
||||
argon2rs = "0.2.5";
|
||||
failure = "0.1.5";
|
||||
rand_os = "0.1.3";
|
||||
redox_syscall = "0.1.51";
|
||||
};
|
||||
deps.regex."1.1.2" = {
|
||||
aho_corasick = "0.6.10";
|
||||
memchr = "2.2.0";
|
||||
regex_syntax = "0.6.5";
|
||||
thread_local = "0.3.6";
|
||||
utf8_ranges = "1.0.2";
|
||||
};
|
||||
deps.regex_syntax."0.6.5" = {
|
||||
ucd_util = "0.1.3";
|
||||
};
|
||||
deps.remove_dir_all."0.5.1" = {
|
||||
winapi = "0.3.6";
|
||||
};
|
||||
deps.rustc_demangle."0.1.13" = {};
|
||||
deps.ryu."0.2.7" = {};
|
||||
deps.scoped_threadpool."0.1.9" = {};
|
||||
deps.serde."1.0.89" = {};
|
||||
deps.serde_derive."1.0.89" = {
|
||||
proc_macro2 = "0.4.27";
|
||||
quote = "0.6.11";
|
||||
syn = "0.15.29";
|
||||
};
|
||||
deps.serde_json."1.0.39" = {
|
||||
itoa = "0.4.3";
|
||||
ryu = "0.2.7";
|
||||
serde = "1.0.89";
|
||||
};
|
||||
deps.smallvec."0.6.9" = {};
|
||||
deps.strsim."0.7.0" = {};
|
||||
deps.syn."0.15.29" = {
|
||||
proc_macro2 = "0.4.27";
|
||||
quote = "0.6.11";
|
||||
unicode_xid = "0.1.0";
|
||||
};
|
||||
deps.synstructure."0.10.1" = {
|
||||
proc_macro2 = "0.4.27";
|
||||
quote = "0.6.11";
|
||||
syn = "0.15.29";
|
||||
unicode_xid = "0.1.0";
|
||||
};
|
||||
deps.tempdir."0.3.7" = {
|
||||
rand = "0.4.6";
|
||||
remove_dir_all = "0.5.1";
|
||||
};
|
||||
deps.termcolor."1.0.4" = {
|
||||
wincolor = "1.0.1";
|
||||
};
|
||||
deps.termion."1.5.1" = {
|
||||
libc = "0.2.50";
|
||||
redox_syscall = "0.1.51";
|
||||
redox_termios = "0.1.1";
|
||||
};
|
||||
deps.textwrap."0.10.0" = {
|
||||
unicode_width = "0.1.5";
|
||||
};
|
||||
deps.thread_local."0.3.6" = {
|
||||
lazy_static = "1.3.0";
|
||||
};
|
||||
deps.toml."0.5.0" = {
|
||||
serde = "1.0.89";
|
||||
};
|
||||
deps.ucd_util."0.1.3" = {};
|
||||
deps.unicode_bidi."0.3.4" = {
|
||||
matches = "0.1.8";
|
||||
};
|
||||
deps.unicode_normalization."0.1.8" = {
|
||||
smallvec = "0.6.9";
|
||||
};
|
||||
deps.unicode_width."0.1.5" = {};
|
||||
deps.unicode_xid."0.1.0" = {};
|
||||
deps.url."1.7.2" = {
|
||||
idna = "0.1.5";
|
||||
matches = "0.1.8";
|
||||
percent_encoding = "1.0.1";
|
||||
};
|
||||
deps.utf8_ranges."1.0.2" = {};
|
||||
deps.vec_map."0.8.1" = {};
|
||||
deps.winapi."0.3.6" = {
|
||||
winapi_i686_pc_windows_gnu = "0.4.0";
|
||||
winapi_x86_64_pc_windows_gnu = "0.4.0";
|
||||
};
|
||||
deps.winapi_i686_pc_windows_gnu."0.4.0" = {};
|
||||
deps.winapi_util."0.1.2" = {
|
||||
winapi = "0.3.6";
|
||||
};
|
||||
deps.winapi_x86_64_pc_windows_gnu."0.4.0" = {};
|
||||
deps.wincolor."1.0.1" = {
|
||||
winapi = "0.3.6";
|
||||
winapi_util = "0.1.2";
|
||||
};
|
||||
}
|
File diff suppressed because it is too large
Load diff
|
@ -3,6 +3,7 @@
|
|||
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
|
||||
, buildLlvmTools # tools, but from the previous stage, for cross
|
||||
, targetLlvmLibraries # libraries, but from the next stage, for cross
|
||||
, targetLlvm
|
||||
# This is the default binutils, but with *this* version of LLD rather
|
||||
# than the default LLVM verion's, if LLD is the choice. We use these for
|
||||
# the `useLLVM` bootstrapping below.
|
||||
|
@ -259,7 +260,7 @@ let
|
|||
};
|
||||
|
||||
openmp = callPackage ./openmp {
|
||||
inherit llvm_meta;
|
||||
inherit llvm_meta targetLlvm;
|
||||
};
|
||||
});
|
||||
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
, fetch
|
||||
, cmake
|
||||
, llvm
|
||||
, targetLlvm
|
||||
, perl
|
||||
, version
|
||||
}:
|
||||
|
@ -15,7 +16,9 @@ stdenv.mkDerivation rec {
|
|||
src = fetch pname "0i4bn84lkpm5w3qkpvwm5z6jdj8fynp7d3bcasa1xyq4is6757yi";
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
buildInputs = [ llvm ];
|
||||
buildInputs = [
|
||||
(if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)
|
||||
];
|
||||
|
||||
meta = llvm_meta // {
|
||||
homepage = "https://openmp.llvm.org/";
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
|
||||
, buildLlvmTools # tools, but from the previous stage, for cross
|
||||
, targetLlvmLibraries # libraries, but from the next stage, for cross
|
||||
, targetLlvm
|
||||
# This is the default binutils, but with *this* version of LLD rather
|
||||
# than the default LLVM verion's, if LLD is the choice. We use these for
|
||||
# the `useLLVM` bootstrapping below.
|
||||
|
@ -274,7 +275,7 @@ let
|
|||
};
|
||||
|
||||
openmp = callPackage ./openmp {
|
||||
inherit llvm_meta;
|
||||
inherit llvm_meta targetLlvm;
|
||||
};
|
||||
});
|
||||
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
, fetchpatch
|
||||
, cmake
|
||||
, llvm
|
||||
, targetLlvm
|
||||
, perl
|
||||
, version
|
||||
}:
|
||||
|
@ -25,7 +26,9 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
buildInputs = [ llvm ];
|
||||
buildInputs = [
|
||||
(if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)
|
||||
];
|
||||
|
||||
meta = llvm_meta // {
|
||||
homepage = "https://openmp.llvm.org/";
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
|
||||
, buildLlvmTools # tools, but from the previous stage, for cross
|
||||
, targetLlvmLibraries # libraries, but from the next stage, for cross
|
||||
, targetLlvm
|
||||
# This is the default binutils, but with *this* version of LLD rather
|
||||
# than the default LLVM verion's, if LLD is the choice. We use these for
|
||||
# the `useLLVM` bootstrapping below.
|
||||
|
@ -267,7 +268,7 @@ let
|
|||
};
|
||||
|
||||
openmp = callPackage ./openmp {
|
||||
inherit llvm_meta;
|
||||
inherit llvm_meta targetLlvm;
|
||||
};
|
||||
});
|
||||
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
, fetch
|
||||
, cmake
|
||||
, llvm
|
||||
, targetLlvm
|
||||
, perl
|
||||
, version
|
||||
}:
|
||||
|
@ -15,7 +16,9 @@ stdenv.mkDerivation rec {
|
|||
src = fetch pname "14dh0r6h2xh747ffgnsl4z08h0ri04azi9vf79cbz7ma1r27kzk0";
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
buildInputs = [ llvm ];
|
||||
buildInputs = [
|
||||
(if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)
|
||||
];
|
||||
|
||||
meta = llvm_meta // {
|
||||
homepage = "https://openmp.llvm.org/";
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
, libxml2, python3, isl, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith
|
||||
, buildLlvmTools # tools, but from the previous stage, for cross
|
||||
, targetLlvmLibraries # libraries, but from the next stage, for cross
|
||||
, targetLlvm
|
||||
# This is the default binutils, but with *this* version of LLD rather
|
||||
# than the default LLVM verion's, if LLD is the choice. We use these for
|
||||
# the `useLLVM` bootstrapping below.
|
||||
|
@ -276,7 +277,7 @@ let
|
|||
};
|
||||
|
||||
openmp = callPackage ./openmp {
|
||||
inherit llvm_meta;
|
||||
inherit llvm_meta targetLlvm;
|
||||
};
|
||||
});
|
||||
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
, src
|
||||
, cmake
|
||||
, llvm
|
||||
, targetLlvm
|
||||
, perl
|
||||
, version
|
||||
}:
|
||||
|
@ -16,7 +17,9 @@ stdenv.mkDerivation rec {
|
|||
sourceRoot = "source/${pname}";
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
buildInputs = [ llvm ];
|
||||
buildInputs = [
|
||||
(if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" # Building the AMDGCN device RTL currently fails
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
, libxml2, python3, isl, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith
|
||||
, buildLlvmTools # tools, but from the previous stage, for cross
|
||||
, targetLlvmLibraries # libraries, but from the next stage, for cross
|
||||
, targetLlvm
|
||||
# This is the default binutils, but with *this* version of LLD rather
|
||||
# than the default LLVM verion's, if LLD is the choice. We use these for
|
||||
# the `useLLVM` bootstrapping below.
|
||||
|
@ -273,7 +274,7 @@ let
|
|||
};
|
||||
|
||||
openmp = callPackage ./openmp {
|
||||
inherit llvm_meta;
|
||||
inherit llvm_meta targetLlvm;
|
||||
};
|
||||
});
|
||||
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
, runCommand
|
||||
, cmake
|
||||
, llvm
|
||||
, targetLlvm
|
||||
, lit
|
||||
, clang-unwrapped
|
||||
, perl
|
||||
|
@ -32,7 +33,9 @@ stdenv.mkDerivation rec {
|
|||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ cmake perl pkg-config lit ];
|
||||
buildInputs = [ llvm ];
|
||||
buildInputs = [
|
||||
(if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)
|
||||
];
|
||||
|
||||
# Unsup:Pass:XFail:Fail
|
||||
# 26:267:16:8
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith
|
||||
, buildLlvmTools # tools, but from the previous stage, for cross
|
||||
, targetLlvmLibraries # libraries, but from the next stage, for cross
|
||||
, targetLlvm
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -121,7 +122,7 @@ let
|
|||
};
|
||||
|
||||
openmp = callPackage ./openmp {
|
||||
inherit llvm_meta;
|
||||
inherit llvm_meta targetLlvm;
|
||||
};
|
||||
});
|
||||
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
, fetch
|
||||
, cmake
|
||||
, llvm
|
||||
, targetLlvm
|
||||
, perl
|
||||
, version
|
||||
}:
|
||||
|
@ -15,7 +16,9 @@ stdenv.mkDerivation {
|
|||
src = fetch "openmp" "0p2n52676wlq6y9q99n5pivq6pvvda1p994r69fxj206ahn59jir";
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
buildInputs = [ llvm ];
|
||||
buildInputs = [
|
||||
(if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)
|
||||
];
|
||||
|
||||
meta = llvm_meta // {
|
||||
homepage = "https://openmp.llvm.org/";
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith
|
||||
, buildLlvmTools # tools, but from the previous stage, for cross
|
||||
, targetLlvmLibraries # libraries, but from the next stage, for cross
|
||||
, targetLlvm
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -122,7 +123,7 @@ let
|
|||
};
|
||||
|
||||
openmp = callPackage ./openmp {
|
||||
inherit llvm_meta;
|
||||
inherit llvm_meta targetLlvm;
|
||||
};
|
||||
});
|
||||
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
, fetch
|
||||
, cmake
|
||||
, llvm
|
||||
, targetLlvm
|
||||
, perl
|
||||
, version
|
||||
}:
|
||||
|
@ -15,7 +16,9 @@ stdenv.mkDerivation {
|
|||
src = fetch "openmp" "0nhwfba9c351r16zgyjyfwdayr98nairky3c2f0b2lc360mwmbv6";
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
buildInputs = [ llvm ];
|
||||
buildInputs = [
|
||||
(if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)
|
||||
];
|
||||
|
||||
meta = llvm_meta // {
|
||||
homepage = "https://openmp.llvm.org/";
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
|
||||
, buildLlvmTools # tools, but from the previous stage, for cross
|
||||
, targetLlvmLibraries # libraries, but from the next stage, for cross
|
||||
, targetLlvm
|
||||
# This is the default binutils, but with *this* version of LLD rather
|
||||
# than the default LLVM verion's, if LLD is the choice. We use these for
|
||||
# the `useLLVM` bootstrapping below.
|
||||
|
@ -268,7 +269,7 @@ let
|
|||
};
|
||||
|
||||
openmp = callPackage ./openmp {
|
||||
inherit llvm_meta;
|
||||
inherit llvm_meta targetLlvm;
|
||||
};
|
||||
});
|
||||
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
, fetch
|
||||
, cmake
|
||||
, llvm
|
||||
, targetLlvm
|
||||
, perl
|
||||
, version
|
||||
}:
|
||||
|
@ -15,7 +16,9 @@ stdenv.mkDerivation {
|
|||
src = fetch "openmp" "1dg53wzsci2kra8lh1y0chh60h2l8h1by93br5spzvzlxshkmrqy";
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
buildInputs = [ llvm ];
|
||||
buildInputs = [
|
||||
(if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)
|
||||
];
|
||||
|
||||
meta = llvm_meta // {
|
||||
homepage = "https://openmp.llvm.org/";
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
|
||||
, buildLlvmTools # tools, but from the previous stage, for cross
|
||||
, targetLlvmLibraries # libraries, but from the next stage, for cross
|
||||
, targetLlvm
|
||||
# This is the default binutils, but with *this* version of LLD rather
|
||||
# than the default LLVM verion's, if LLD is the choice. We use these for
|
||||
# the `useLLVM` bootstrapping below.
|
||||
|
@ -267,7 +268,7 @@ let
|
|||
};
|
||||
|
||||
openmp = callPackage ./openmp {
|
||||
inherit llvm_meta;
|
||||
inherit llvm_meta targetLlvm;
|
||||
};
|
||||
});
|
||||
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
, fetch
|
||||
, cmake
|
||||
, llvm
|
||||
, targetLlvm
|
||||
, perl
|
||||
, version
|
||||
}:
|
||||
|
@ -15,7 +16,9 @@ stdenv.mkDerivation {
|
|||
src = fetch "openmp" "0b3jlxhqbpyd1nqkpxjfggm5d9va5qpyf7d4i5y7n4a1mlydv19y";
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
buildInputs = [ llvm ];
|
||||
buildInputs = [
|
||||
(if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)
|
||||
];
|
||||
|
||||
meta = llvm_meta // {
|
||||
homepage = "https://openmp.llvm.org/";
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
|
||||
, buildLlvmTools # tools, but from the previous stage, for cross
|
||||
, targetLlvmLibraries # libraries, but from the next stage, for cross
|
||||
, targetLlvm
|
||||
# This is the default binutils, but with *this* version of LLD rather
|
||||
# than the default LLVM verion's, if LLD is the choice. We use these for
|
||||
# the `useLLVM` bootstrapping below.
|
||||
|
@ -267,7 +268,7 @@ let
|
|||
};
|
||||
|
||||
openmp = callPackage ./openmp {
|
||||
inherit llvm_meta;
|
||||
inherit llvm_meta targetLlvm;
|
||||
};
|
||||
});
|
||||
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
, fetch
|
||||
, cmake
|
||||
, llvm
|
||||
, targetLlvm
|
||||
, perl
|
||||
, version
|
||||
}:
|
||||
|
@ -15,7 +16,9 @@ stdenv.mkDerivation rec {
|
|||
src = fetch pname "1knafnpp0f7hylx8q20lkd6g1sf0flly572dayc5d5kghh7hd52w";
|
||||
|
||||
nativeBuildInputs = [ cmake perl ];
|
||||
buildInputs = [ llvm ];
|
||||
buildInputs = [
|
||||
(if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)
|
||||
];
|
||||
|
||||
meta = llvm_meta // {
|
||||
homepage = "https://openmp.llvm.org/";
|
||||
|
|
|
@ -31,9 +31,8 @@ in
|
|||
inherit (lib') toTargetArch toTargetOs toRustTarget toRustTargetSpec IsNoStdTarget;
|
||||
|
||||
# This just contains tools for now. But it would conceivably contain
|
||||
# libraries too, say if we picked some default/recommended versions from
|
||||
# `cratesIO` to build by Hydra and/or try to prefer/bias in Cargo.lock for
|
||||
# all vendored Carnix-generated nix.
|
||||
# libraries too, say if we picked some default/recommended versions to build
|
||||
# by Hydra.
|
||||
#
|
||||
# In the end game, rustc, the rust standard library (`core`, `std`, etc.),
|
||||
# and cargo would themselves be built with `buildRustCreate` like
|
||||
|
|
6
pkgs/development/node-packages/node-packages.nix
generated
6
pkgs/development/node-packages/node-packages.nix
generated
|
@ -132025,10 +132025,10 @@ in
|
|||
pnpm = nodeEnv.buildNodePackage {
|
||||
name = "pnpm";
|
||||
packageName = "pnpm";
|
||||
version = "7.14.2";
|
||||
version = "7.17.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/pnpm/-/pnpm-7.14.2.tgz";
|
||||
sha512 = "NSxrIaRW07jFQQ1fPFFOA8eMfuogsMeygOKd3zaFgyJBdo1oh61jl2JjWc+w0XNzWIMG7/v9HK7nP8RTL5NO3g==";
|
||||
url = "https://registry.npmjs.org/pnpm/-/pnpm-7.17.0.tgz";
|
||||
sha512 = "0oy+VI/6r248MzFrr3jBTQ5qxC1wM+wP3YoGcoohPEMk+5LfQBYHsazdu8QDtuigr2jjaDi0hfg/c8k89jxiEA==";
|
||||
};
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "deezer-python";
|
||||
version = "5.7.0";
|
||||
version = "5.8.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "browniebroke";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-E4XNHrAq49F1EHG1mMOJrlsCG9W2KY8swijxHRO9MCc=";
|
||||
hash = "sha256-H/+ESuZ4t9oSL9QIBZWWuRCSRXRv8IuTVNP/g5h7CIE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -53,6 +53,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python wrapper around the Deezer API";
|
||||
homepage = "https://github.com/browniebroke/deezer-python";
|
||||
changelog = "https://github.com/browniebroke/deezer-python/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ synthetica ];
|
||||
};
|
||||
|
|
|
@ -4,26 +4,40 @@
|
|||
, pytest
|
||||
, django
|
||||
, python-fsutil
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-maintenance-mode";
|
||||
version = "0.16.3";
|
||||
version = "0.17.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fabiocaccamo";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-G08xQpLQxnt7JbtIo06z0NlRAMbca3UWbo4aXQR/Wy0=";
|
||||
hash = "sha256-/JMdElJsl7f6THUIvp28XcsoP/5Sa31XzGl3PZFPAH8=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
propagatedBuildInputs = [
|
||||
django
|
||||
python-fsutil
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ django python-fsutil ];
|
||||
checkInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"maintenance_mode"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Shows a 503 error page when maintenance-mode is on";
|
||||
homepage = "https://github.com/fabiocaccamo/django-maintenance-mode";
|
||||
changelog = "https://github.com/fabiocaccamo/django-maintenance-mode/releases/tag/${version}";
|
||||
maintainers = with maintainers; [ mrmebelman ];
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastapi-mail";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -28,13 +28,12 @@ buildPythonPackage rec {
|
|||
owner = "sabuhish";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-RAUxc7spJL1QECAO0uZcCVAR/LaFIxFu61LD4RV9nEI=";
|
||||
hash = "sha256-58j3hb9selJTWitWQT8nkkhRJiPoFr0/mj5viSnnwlA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'fastapi = "^0.75.0"' 'fastapi = "*"' \
|
||||
--replace 'httpx = "^0.22.0"' 'httpx = "*"'
|
||||
--replace 'starlette = "^0.21.0"' 'starlette = "*"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -72,6 +71,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Module for sending emails and attachments";
|
||||
homepage = "https://github.com/sabuhish/fastapi-mail";
|
||||
changelog = "https://github.com/sabuhish/fastapi-mail/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
@ -2,30 +2,32 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, future
|
||||
, python
|
||||
, glibcLocales
|
||||
, lxml
|
||||
, unittestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "junitparser";
|
||||
version = "1.4.1";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gastlygem";
|
||||
owner = "weiwei";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "16xwayr0rbp7xdg7bzmyf8s7al0dhkbmkcnil66ax7r8bznp5lmp";
|
||||
hash = "sha256-rhDP05GSWT4K6Z2ip8C9+e3WbvBJOwP0vctvANBs7cw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ future ];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} test.py
|
||||
'';
|
||||
checkInputs = [ unittestCheckHook lxml glibcLocales ];
|
||||
|
||||
unittestFlagsArray = [ "-v" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A JUnit/xUnit Result XML Parser";
|
||||
description = "Manipulates JUnit/xUnit Result XML files";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://github.com/gastlygem/junitparser";
|
||||
homepage = "https://github.com/weiwei/junitparser";
|
||||
maintainers = with maintainers; [ multun ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "7.4.0";
|
||||
version = "8.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-7b6fF6wVNo4kBJ+s1lxNSl1C2vZjnAmHOtVSmqoiY9Q=";
|
||||
hash = "sha256-2ZWfQI2D2C56qrU0xKYo7fJcKe8v8zFIYHtWYy+KIDw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pick";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "wong2";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-rpUcWMVshlAhprvySqJJjVXpq92ITuhlV+DNwTXSfMc=";
|
||||
hash = "sha256-Py+D03bXnVsIwvYwjl0IMeH33ZPJW5TuJ3tU79MMsCw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -35,6 +35,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Module to create curses-based interactive selection list in the terminal";
|
||||
homepage = "https://github.com/wong2/pick";
|
||||
changelog = "https://github.com/wong2/pick/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, matchpy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
|
@ -9,16 +10,24 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymbolic";
|
||||
version = "2022.1";
|
||||
version = "2022.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-tS9FHdC5gD4D3jMgrzt85XIwcAYcbSMcACFvbaQlkBI=";
|
||||
hash = "sha256-+Cd2lCuzy3Iyn6Hxqito7AnyN9uReMlc/ckqaup87Ik=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/inducer/pymbolic/commit/cb3d999e4788dad3edf053387b6064adf8b08e19.patch";
|
||||
excludes = [ ".github/workflows/ci.yml" ];
|
||||
sha256 = "sha256-P0YjqAo0z0LZMIUTeokwMkfP8vxBXi3TcV4BSFaO1lU=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pytools
|
||||
];
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysnmplib";
|
||||
version = "5.0.19";
|
||||
version = "5.0.20";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "pysnmp";
|
||||
repo = "pysnmp";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-xplQ12LLtTsU1AfEmWDwpbTK9NBxoLIfpF/QzA8Xot0=";
|
||||
hash = "sha256-SrtOn9zETtobT6nMVHLi6hP7VZGBvXvFzoThTi3ITag=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -42,6 +42,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Implementation of v1/v2c/v3 SNMP engine";
|
||||
homepage = "https://github.com/pysnmp/pysnmp";
|
||||
changelog = "https://github.com/pysnmp/pysnmp/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, unittest2
|
||||
, lxml
|
||||
, robotframework
|
||||
, pytestCheckHook
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -16,13 +16,10 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-iugVKUPl6HTTO8K1EbSqAk1fl/fsEPoOcsOnnAgcEas=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
unittest2
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
robotframework
|
||||
lxml
|
||||
six
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "slack-sdk";
|
||||
version = "3.19.3";
|
||||
version = "3.19.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "slackapi";
|
||||
repo = "python-slack-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-iWDKF4FZJPL6wHxVbvj2zlY0sqpBMXki9e7uuysX1o0=";
|
||||
hash = "sha256-cSPua601vQRJ431Sh02CLFtNb7pqbrkJ5ned/NjKM4s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -76,6 +76,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Slack Developer Kit for Python";
|
||||
homepage = "https://slack.dev/python-slack-sdk/";
|
||||
changelog = "https://github.com/slackapi/python-slack-sdk/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "teslajsonpy";
|
||||
version = "3.2.0";
|
||||
version = "3.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "zabuldon";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-6xYMaKYKQkxbdm/vPOvKUxU8vnB+/cSiA6U7g9YPosQ=";
|
||||
hash = "sha256-o3MTmMLSdpOprV6wridKF0SxPfKfIvla00/Z9Y2EePE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -52,6 +52,7 @@ buildPythonPackage rec {
|
|||
packets. It provides support for KNX/IP routing and tunneling devices.
|
||||
'';
|
||||
homepage = "https://github.com/XKNX/xknx";
|
||||
changelog = "https://github.com/XKNX/xknx/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "oh-my-posh";
|
||||
version = "12.16.0";
|
||||
version = "12.17.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jandedobbeleer";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YrrOwTLVgxoriVgVDmn99ORSh04os0q/QnfBXtTtl5g=";
|
||||
sha256 = "sha256-3/spbZhFa9IwScjJqdiwASiojXxuFLW+WXCteOAePOM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU=";
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
, extraGrammars ? { }
|
||||
}:
|
||||
|
||||
# TODO: move to carnix or https://github.com/kolloch/crate2nix
|
||||
let
|
||||
# to update:
|
||||
# 1) change all these hashes
|
||||
|
|
|
@ -25,14 +25,14 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "pip-audit";
|
||||
version = "2.4.5";
|
||||
version = "2.4.6";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trailofbits";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-S3v2utDLZOY7RXOnMQV8Zo7h6vMPyiwlws/EftXFpTM=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-GArssIXq7htxQLitAjkdQYrtH6YDECptRL2iy4TZmy0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -84,6 +84,7 @@ buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
description = "Tool for scanning Python environments for known vulnerabilities";
|
||||
homepage = "https://github.com/trailofbits/pip-audit";
|
||||
changelog = "https://github.com/pypa/pip-audit/releases/tag/v${version}";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-llvm-lines";
|
||||
version = "0.4.20";
|
||||
version = "0.4.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtolnay";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-+0yMA7ccj9OsEG3aUgxG/RMBAFXHf/sMDHf8c/w5O1g=";
|
||||
sha256 = "sha256-N/6tXTY11vTP8XtclZbmvBWnWCB854gXXXZOwXD7FBo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-UWE2spvdD5dmS9RgqMlRQGWr1weU8eMr8gGWAHIyx3s=";
|
||||
cargoSha256 = "sha256-tmJRxMpAF1kSq+OwWFySo5zC3J8yje5nZDqBB0gh8pA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Count the number of lines of LLVM IR across all instantiations of a generic function";
|
||||
|
|
|
@ -35,12 +35,12 @@ stdenv.mkDerivation rec {
|
|||
ninja
|
||||
perl # for kernel-doc
|
||||
pkg-config
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
json_c
|
||||
openssl
|
||||
python3
|
||||
systemd
|
||||
];
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
, libnvme
|
||||
, json_c
|
||||
, zlib
|
||||
, python3
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3.pkgs.nose2
|
||||
python3Packages.nose2
|
||||
];
|
||||
buildInputs = [
|
||||
libnvme
|
||||
|
|
|
@ -11,20 +11,20 @@ in
|
|||
with python3.pkgs;
|
||||
buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.71.0";
|
||||
version = "1.72.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fmEQ1YsIB9xZOQZBojmYkFWPDdOLbNXqfn0szgZmtKg=";
|
||||
hash = "sha256-LkzUrEXC+jonkEpAGIEDQhAKisrKNQB8/elchN/4YMU=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-700LPWyhY95sVjB3chbdmr7AmE1Y55vN6Llszv/APL4=";
|
||||
hash = "sha256-AuQURcVaIoOYG9jh6QhPpXB0akASVWMYe4fA/376cwo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nanomq";
|
||||
version = "0.13.0";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emqx";
|
||||
repo = "nanomq";
|
||||
rev = version;
|
||||
hash = "sha256-fxV/X34yohh/bxOsnoVngBKiwqABQDthLgZxvomC0+g=";
|
||||
hash = "sha256-FJhM1IdS6Ee54JJqJXpvp0OcTJJo2NaB/uP8w3mf/Yw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -0,0 +1,37 @@
|
|||
From 301de689a1f7fae8ee6d0d5bbbe155a351b1b927 Mon Sep 17 00:00:00 2001
|
||||
From: Jade Lovelace <jadel@mercury.com>
|
||||
Date: Wed, 9 Nov 2022 11:02:02 -0800
|
||||
Subject: [PATCH] add NO_REDIS_TEST env-var that disables Redis-requiring tests
|
||||
|
||||
---
|
||||
internal/peer/peers_test.go | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/internal/peer/peers_test.go b/internal/peer/peers_test.go
|
||||
index 5ec7f81..c64b1b4 100644
|
||||
--- a/internal/peer/peers_test.go
|
||||
+++ b/internal/peer/peers_test.go
|
||||
@@ -2,6 +2,7 @@ package peer
|
||||
|
||||
import (
|
||||
"context"
|
||||
+ "os"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
@@ -26,6 +27,12 @@ func TestNewPeers(t *testing.T) {
|
||||
t.Errorf("received %T expected %T", i, &filePeers{})
|
||||
}
|
||||
|
||||
+ // Allow skipping test requiring redis, since Nix builds without redis
|
||||
+ // available
|
||||
+ if os.Getenv("NO_REDIS_TEST") != "" {
|
||||
+ t.Skip("Skipping redis-requiring test");
|
||||
+ }
|
||||
+
|
||||
c = &config.MockConfig{
|
||||
GetPeerListenAddrVal: "0.0.0.0:8081",
|
||||
PeerManagementType: "redis",
|
||||
--
|
||||
2.37.1
|
||||
|
38
pkgs/servers/tracing/honeycomb/refinery/default.nix
Normal file
38
pkgs/servers/tracing/honeycomb/refinery/default.nix
Normal file
|
@ -0,0 +1,38 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "honeycomb-refinery";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "honeycombio";
|
||||
repo = "refinery";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SU9JbyUuBMqPw4XcoF5s8CgBn7+V/rHBAwpXJk373jg=";
|
||||
};
|
||||
|
||||
NO_REDIS_TEST = true;
|
||||
|
||||
patches = [
|
||||
# Allows turning off the one test requiring a Redis service during build.
|
||||
# We could in principle implement that, but it's significant work to little
|
||||
# payoff.
|
||||
./0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch
|
||||
];
|
||||
|
||||
excludedPackages = [ "cmd/test_redimem" ];
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.BuildID=${version}" ];
|
||||
|
||||
vendorHash = "sha256-0M05JGLdmKivRTN8ZdhAm+JtXTlYAC31wFS82g3NenI=";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/honeycomb/refinery";
|
||||
description = "A tail-sampling proxy for OpenTelemetry";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ lf- ];
|
||||
mainProgram = "refinery";
|
||||
};
|
||||
}
|
|
@ -11,8 +11,10 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1rgpsh70manr2dydna9da4x7p8ahii7dgdgwir5fka340n1wrcws";
|
||||
};
|
||||
|
||||
buildInputs = [ python3 ];
|
||||
nativeBuildInputs = [ python3 ];
|
||||
dontBuild = true;
|
||||
strictDeps = true;
|
||||
|
||||
installPhase = ''
|
||||
python ./install.py -d "$out" -p "" -z "$out/share/zsh/site-functions/"
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nix-direnv";
|
||||
version = "2.1.2";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "nix-direnv";
|
||||
rev = version;
|
||||
sha256 = "sha256-6UvOnFmohdhFenpEangbLLEdE0PeessRJjiO0mcydWI=";
|
||||
sha256 = "sha256-htlSwXYmT+baFRhSnEGvNCtcS5qa/VgSXFm5Lavy7eM=";
|
||||
};
|
||||
|
||||
# Substitute instead of wrapping because the resulting file is
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "i2pd";
|
||||
version = "2.43.0";
|
||||
version = "2.44.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PurpleI2P";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-JIO1Zm7me/SX0W7sVHOesERnqvC7jy0Fu1vfKFePFd0=";
|
||||
sha256 = "sha256-9LnT0613z2I9bA0FhcTgINBnXG17ulz6flA13B1Vijs=";
|
||||
};
|
||||
|
||||
buildInputs = [ boost zlib openssl ]
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "yggdrasil";
|
||||
version = "0.4.6";
|
||||
version = "0.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yggdrasil-network";
|
||||
repo = "yggdrasil-go";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JhVwzNwihYLNkpwOmanZP/fOiIpojAR3pCya5zuy3Lc=";
|
||||
sha256 = "sha256-01ciAutRIn4DmqlvDTXhRiuZHTtF8b6js7SUrLOjtAY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-nchscK8HPsZ/i4kjyB1uHNh4lNbs7UALzGLVgxdAcSk=";
|
||||
vendorSha256 = "sha256-hwDi59Yp92eMDqA8OD56nxsKSX2ngxs0lYdmEMLX+Oc=";
|
||||
|
||||
# Change the default location of the management socket on Linux
|
||||
# systems so that the yggdrasil system service unit does not have to
|
||||
|
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "erosmb";
|
||||
version = "0.1.2";
|
||||
version = "0.1.4";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "viktor02";
|
||||
repo = "EroSmb";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-H3ozc1DXBdXlqEg53eVGGTqK6m2eiY+Qtl0Ul3lUByk=";
|
||||
hash = "sha256-ThJwBKpxoTwHP84OlVKH62gQ3kfv83J8HNs5Mizi8Ck=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
@ -41,6 +41,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
description = "SMB network scanner";
|
||||
homepage = "https://github.com/viktor02/EroSmb";
|
||||
changelog = "https://github.com/viktor02/EroSmb/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nmap-formatter";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vdjagilev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Jhjvtk8SDs//eBW+2+yLcIXf/NetfBUrKvzKCj+VyMg=";
|
||||
hash = "sha256-v+qswkG/cbkJujlCMfjYj7y5972G89R/YSmhzHiAMY0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-u36eHSb6YlGJNkgmRDclxTsdkONLKn8J/GKaoCgy+Qk=";
|
||||
|
@ -19,6 +19,7 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
description = "Tool that allows you to convert nmap output";
|
||||
homepage = "https://github.com/vdjagilev/nmap-formatter";
|
||||
changelog = "https://github.com/vdjagilev/nmap-formatter/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
@ -177,6 +177,7 @@ mapAliases ({
|
|||
cask = emacs.pkgs.cask; # Added 2022-11-12
|
||||
cargo-download = throw "cargo-download has been removed from nixpkgs as it is unmaintained, use cargo-clone instead"; # Added 2022-10-11
|
||||
cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead"; # Added 2020-08-20
|
||||
carnix = throw "carnix has been removed, use alternatives such as naersk and crate2nix instead"; # Added 2022-11-22
|
||||
casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken";
|
||||
cassandra_2_1 = throw "cassandra_2_1 has been removed, please use cassandra_3_11 instead"; # Added 2022-10-29
|
||||
cassandra_2_2 = throw "cassandra_2_2 has been removed, please use cassandra_3_11 instead"; # Added 2022-10-29
|
||||
|
@ -195,6 +196,7 @@ mapAliases ({
|
|||
clickshare-csc1 = throw "'clickshare-csc1' has been removed as it requires qt4 which is being removed"; # Added 2022-06-16
|
||||
inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17
|
||||
cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15
|
||||
cratesIO = throw "cratesIO has been removed, use alternatives such as naersk and crate2nix instead"; # Added 2022-11-22
|
||||
creddump = throw "creddump has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01
|
||||
|
||||
# these are for convenience, not for backward compat and shouldn't expire
|
||||
|
|
|
@ -508,6 +508,8 @@ with pkgs;
|
|||
|
||||
hobbes = callPackage ../development/tools/hobbes { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
honeycomb-refinery = callPackage ../servers/tracing/honeycomb/refinery { };
|
||||
|
||||
html5validator = python3Packages.callPackage ../applications/misc/html5validator { };
|
||||
|
||||
buildcatrust = with python3.pkgs; toPythonApplication buildcatrust;
|
||||
|
@ -14664,36 +14666,42 @@ with pkgs;
|
|||
llvmPackages_5 = recurseIntoAttrs (callPackage ../development/compilers/llvm/5 {
|
||||
inherit (stdenvAdapters) overrideCC;
|
||||
buildLlvmTools = buildPackages.llvmPackages_5.tools;
|
||||
targetLlvm = targetPackages.llvmPackages_5.llvm or llvmPackages_5.llvm;
|
||||
targetLlvmLibraries = targetPackages.llvmPackages_5.libraries or llvmPackages_5.libraries;
|
||||
});
|
||||
|
||||
llvmPackages_6 = recurseIntoAttrs (callPackage ../development/compilers/llvm/6 {
|
||||
inherit (stdenvAdapters) overrideCC;
|
||||
buildLlvmTools = buildPackages.llvmPackages_6.tools;
|
||||
targetLlvm = targetPackages.llvmPackages_6.llvm or llvmPackages_6.llvm;
|
||||
targetLlvmLibraries = targetPackages.llvmPackages_6.libraries or llvmPackages_6.libraries;
|
||||
});
|
||||
|
||||
llvmPackages_7 = recurseIntoAttrs (callPackage ../development/compilers/llvm/7 {
|
||||
inherit (stdenvAdapters) overrideCC;
|
||||
buildLlvmTools = buildPackages.llvmPackages_7.tools;
|
||||
targetLlvm = targetPackages.llvmPackages_7.llvm or llvmPackages_7.llvm;
|
||||
targetLlvmLibraries = targetPackages.llvmPackages_7.libraries or llvmPackages_7.libraries;
|
||||
});
|
||||
|
||||
llvmPackages_8 = recurseIntoAttrs (callPackage ../development/compilers/llvm/8 {
|
||||
inherit (stdenvAdapters) overrideCC;
|
||||
buildLlvmTools = buildPackages.llvmPackages_8.tools;
|
||||
targetLlvm = targetPackages.llvmPackages_8.llvm or llvmPackages_8.llvm;
|
||||
targetLlvmLibraries = targetPackages.llvmPackages_8.libraries or llvmPackages_8.libraries;
|
||||
});
|
||||
|
||||
llvmPackages_9 = recurseIntoAttrs (callPackage ../development/compilers/llvm/9 {
|
||||
inherit (stdenvAdapters) overrideCC;
|
||||
buildLlvmTools = buildPackages.llvmPackages_9.tools;
|
||||
targetLlvm = targetPackages.llvmPackages_9.llvm or llvmPackages_9.llvm;
|
||||
targetLlvmLibraries = targetPackages.llvmPackages_9.libraries or llvmPackages_9.libraries;
|
||||
});
|
||||
|
||||
llvmPackages_10 = recurseIntoAttrs (callPackage ../development/compilers/llvm/10 {
|
||||
inherit (stdenvAdapters) overrideCC;
|
||||
buildLlvmTools = buildPackages.llvmPackages_10.tools;
|
||||
targetLlvm = targetPackages.llvmPackages_10.llvm or llvmPackages_10.llvm;
|
||||
targetLlvmLibraries = targetPackages.llvmPackages_10.libraries or llvmPackages_10.libraries;
|
||||
});
|
||||
|
||||
|
@ -14701,6 +14709,7 @@ with pkgs;
|
|||
inherit (stdenvAdapters) overrideCC;
|
||||
buildLlvmTools = buildPackages.llvmPackages_11.tools;
|
||||
targetLlvmLibraries = targetPackages.llvmPackages_11.libraries or llvmPackages_11.libraries;
|
||||
targetLlvm = targetPackages.llvmPackages_11.llvm or llvmPackages_11.llvm;
|
||||
} // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) {
|
||||
stdenv = gcc7Stdenv;
|
||||
}));
|
||||
|
@ -14709,6 +14718,7 @@ with pkgs;
|
|||
inherit (stdenvAdapters) overrideCC;
|
||||
buildLlvmTools = buildPackages.llvmPackages_12.tools;
|
||||
targetLlvmLibraries = targetPackages.llvmPackages_12.libraries or llvmPackages_12.libraries;
|
||||
targetLlvm = targetPackages.llvmPackages_12.llvm or llvmPackages_12.llvm;
|
||||
} // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) {
|
||||
stdenv = gcc7Stdenv;
|
||||
}));
|
||||
|
@ -14717,6 +14727,7 @@ with pkgs;
|
|||
inherit (stdenvAdapters) overrideCC;
|
||||
buildLlvmTools = buildPackages.llvmPackages_13.tools;
|
||||
targetLlvmLibraries = targetPackages.llvmPackages_13.libraries or llvmPackages_13.libraries;
|
||||
targetLlvm = targetPackages.llvmPackages_13.llvm or llvmPackages_13.llvm;
|
||||
} // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) {
|
||||
stdenv = gcc7Stdenv;
|
||||
}));
|
||||
|
@ -14725,6 +14736,7 @@ with pkgs;
|
|||
inherit (stdenvAdapters) overrideCC;
|
||||
buildLlvmTools = buildPackages.llvmPackages_14.tools;
|
||||
targetLlvmLibraries = targetPackages.llvmPackages_14.libraries or llvmPackages_14.libraries;
|
||||
targetLlvm = targetPackages.llvmPackages_14.llvm or llvmPackages_14.llvm;
|
||||
} // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) {
|
||||
stdenv = gcc7Stdenv;
|
||||
}));
|
||||
|
@ -14999,7 +15011,6 @@ with pkgs;
|
|||
|
||||
buildRustCrate = callPackage ../build-support/rust/build-rust-crate { };
|
||||
buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { };
|
||||
cratesIO = callPackage ../build-support/rust/crates-io.nix { };
|
||||
|
||||
cargo-espflash = callPackage ../development/tools/rust/cargo-espflash {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
|
@ -15014,8 +15025,6 @@ with pkgs;
|
|||
inherit (linuxPackages) perf;
|
||||
};
|
||||
|
||||
carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { };
|
||||
|
||||
defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { };
|
||||
|
||||
cargo-about = callPackage ../development/tools/rust/cargo-about { };
|
||||
|
|
Loading…
Reference in a new issue