ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-30 01:17:28 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot] 2022-11-23 00:14:18 +00:00 committed by GitHub
commit bc73da29ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
131 changed files with 979 additions and 9061 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

221
doc/languages-frameworks/rust.section.md
View File

@ -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

46
lib/systems/parse.nix
View File

@ -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)}

4
lib/trivial.nix
View File

@ -213,8 +213,8 @@ rec {
# Default value to return if revision can not be determined
default:
let
revisionFile = ./.. + "/.git-revision";
gitRepo = ./.. + "/.git";
revisionFile = "${toString ./..}/.git-revision";
gitRepo = "${toString ./..}/.git";
in if lib.pathIsGitRepo gitRepo
then lib.commitIdFromGitRepo gitRepo
else if lib.pathExists revisionFile then lib.fileContents revisionFile

2
nixos/doc/manual/from_md/installation/installing-from-other-distro.section.xml
View File

@ -211,7 +211,7 @@ $ sudo groupdel nixbld
Generate your NixOS configuration:
</para>
<programlisting>
$ sudo `which nixos-generate-config` --root /
$ sudo `which nixos-generate-config`
</programlisting>
<para>
Note that this will place the generated configuration files in

8
nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
View File

@ -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>

2
nixos/doc/manual/installation/installing-from-other-distro.section.md
View File

@ -148,7 +148,7 @@ The first steps to all these are the same:
Generate your NixOS configuration:
```ShellSession
$ sudo `which nixos-generate-config` --root /
$ sudo `which nixos-generate-config`
```
Note that this will place the generated configuration files in

2
nixos/doc/manual/release-notes/rl-2305.section.md
View File

@ -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}

172
nixos/modules/services/system/dbus.nix
View File

@ -14,7 +14,7 @@ let
serviceDirectories = cfg.packages;
};
inherit (lib) mkOption types;
inherit (lib) mkOption mkIf mkMerge types;
in
@ -33,6 +33,18 @@ in
'';
};
implementation = mkOption {
type = types.enum [ "dbus" "broker" ];
default = "dbus";
description = lib.mdDoc ''
The implementation to use for the message bus defined by the D-Bus specification.
Can be either the classic dbus daemon or dbus-broker, which aims to provide high
performance and reliability, while keeping compatibility to the D-Bus
reference implementation.
'';
};
packages = mkOption {
type = types.listOf types.path;
default = [ ];
@ -66,66 +78,114 @@ in
};
};
config = lib.mkIf cfg.enable {
environment.systemPackages = [
pkgs.dbus
];
config = mkIf cfg.enable (mkMerge [
{
environment.etc."dbus-1".source = configDir;
environment.etc."dbus-1".source = configDir;
users.users.messagebus = {
uid = config.ids.uids.messagebus;
description = "D-Bus system message bus daemon user";
home = homeDir;
group = "messagebus";
};
users.groups.messagebus.gid = config.ids.gids.messagebus;
systemd.packages = [
pkgs.dbus
];
security.wrappers.dbus-daemon-launch-helper = {
source = "${pkgs.dbus}/libexec/dbus-daemon-launch-helper";
owner = "root";
group = "messagebus";
setuid = true;
setgid = false;
permissions = "u+rx,g+rx,o-rx";
};
services.dbus.packages = [
pkgs.dbus
config.system.path
];
systemd.services.dbus = {
# Don't restart dbus-daemon. Bad things tend to happen if we do.
reloadIfChanged = true;
restartTriggers = [
configDir
environment.pathsToLink = [
"/etc/dbus-1"
"/share/dbus-1"
];
environment = {
LD_LIBRARY_PATH = config.system.nssModules.path;
users.users.messagebus = {
uid = config.ids.uids.messagebus;
description = "D-Bus system message bus daemon user";
home = homeDir;
group = "messagebus";
};
};
systemd.user.services.dbus = {
# Don't restart dbus-daemon. Bad things tend to happen if we do.
reloadIfChanged = true;
restartTriggers = [
configDir
users.groups.messagebus.gid = config.ids.gids.messagebus;
# You still need the dbus reference implementation installed to use dbus-broker
systemd.packages = [
pkgs.dbus
];
};
systemd.user.sockets.dbus.wantedBy = [
"sockets.target"
];
services.dbus.packages = [
pkgs.dbus
config.system.path
];
environment.pathsToLink = [
"/etc/dbus-1"
"/share/dbus-1"
];
};
systemd.user.sockets.dbus.wantedBy = [
"sockets.target"
];
}
(mkIf (cfg.implementation == "dbus") {
environment.systemPackages = [
pkgs.dbus
];
security.wrappers.dbus-daemon-launch-helper = {
source = "${pkgs.dbus}/libexec/dbus-daemon-launch-helper";
owner = "root";
group = "messagebus";
setuid = true;
setgid = false;
permissions = "u+rx,g+rx,o-rx";
};
systemd.services.dbus = {
# Don't restart dbus-daemon. Bad things tend to happen if we do.
reloadIfChanged = true;
restartTriggers = [
configDir
];
environment = {
LD_LIBRARY_PATH = config.system.nssModules.path;
};
};
systemd.user.services.dbus = {
# Don't restart dbus-daemon. Bad things tend to happen if we do.
reloadIfChanged = true;
restartTriggers = [
configDir
];
};
})
(mkIf (cfg.implementation == "broker") {
environment.systemPackages = [
pkgs.dbus-broker
];
systemd.packages = [
pkgs.dbus-broker
];
# Just to be sure we don't restart through the unit alias
systemd.services.dbus.reloadIfChanged = true;
systemd.user.services.dbus.reloadIfChanged = true;
# NixOS Systemd Module doesn't respect 'Install'
# https://github.com/NixOS/nixpkgs/issues/108643
systemd.services.dbus-broker = {
aliases = [
"dbus.service"
];
# Don't restart dbus. Bad things tend to happen if we do.
reloadIfChanged = true;
restartTriggers = [
configDir
];
environment = {
LD_LIBRARY_PATH = config.system.nssModules.path;
};
};
systemd.user.services.dbus-broker = {
aliases = [
"dbus.service"
];
# Don't restart dbus. Bad things tend to happen if we do.
reloadIfChanged = true;
restartTriggers = [
configDir
];
};
})
]);
}

12
pkgs/applications/emulators/cemu/default.nix
View File

@ -28,13 +28,13 @@
stdenv.mkDerivation rec {
pname = "cemu";
version = "2.0-13";
version = "2.0-17";
src = fetchFromGitHub {
owner = "cemu-project";
repo = "Cemu";
rev = "v${version}";
hash = "sha256-0yomEJoXMKZV2PAjINegSvtDB6gbYxQ6XcXA60/ZkEM=";
hash = "sha256-ryFph55o7s3eiqQ8kx5+3Et5S2U9H5i3fmZTc1CaCnA=";
};
patches = [
@ -106,7 +106,13 @@ stdenv.mkDerivation rec {
preFixup = let
libs = [ vulkan-loader ] ++ cubeb.passthru.backendLibs;
in ''
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}")
gappsWrapperArgs+=(
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}"
# Force X11 to be used until Wayland is natively supported
# <https://github.com/cemu-project/Cemu/pull/143>
--set GDK_BACKEND x11
)
'';
meta = with lib; {

2
pkgs/applications/misc/fnott/default.nix
View File

@ -12,7 +12,6 @@
, pixman
, libpng
, wayland
, wlroots
, dbus
, fcft
}:
@ -43,7 +42,6 @@ stdenv.mkDerivation rec {
pixman
libpng
wayland
wlroots
dbus
fcft
];

6
pkgs/applications/misc/limesctl/default.nix
View File

@ -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 = [ "." ];

6
pkgs/applications/misc/toot/default.nix
View File

@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "toot";
version = "0.28.0";
version = "0.29.0";
src = fetchFromGitHub {
owner = "ihabunek";
repo = "toot";
rev = version;
sha256 = "076r6l89gxjwxjpiklidcs8yajn5c2bnqjvbj4wc559iqdqj88lz";
rev = "refs/tags/${version}";
sha256 = "sha256-SrPjotEkP8Z2uYB/4eAJAk3Zmzmr0xET69PmkxQCwFQ=";
};
checkInputs = with python3Packages; [ pytest ];

6
pkgs/applications/misc/tut/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tut";
version = "1.0.17";
version = "1.0.19";
src = fetchFromGitHub {
owner = "RasmusLindroth";
repo = pname;
rev = version;
sha256 = "sha256-XuN1qpcCUX8xAE7tj21g6U3ilhQIeGWlSqMVik5Qc5Q=";
sha256 = "sha256-lT/3KXxrZYOK/oGrlorQUIv8J7tAfME0hRb1bwN+nXA=";
};
vendorSha256 = "sha256-WdhTdF8kdjAg6ztwSwx+smaA0rrLZjE76r4oVJqMtFU=";
vendorSha256 = "sha256-O7tre7eSGlB9mnf/9aNbe/Ji0ecmJyuLuaWKARskCjI=";
meta = with lib; {
description = "A TUI for Mastodon with vim inspired keys";

4
pkgs/applications/networking/cluster/clusterctl/default.nix
View File

@ -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=";

4
pkgs/applications/networking/cluster/kubelogin/default.nix
View File

@ -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=";

6
pkgs/applications/networking/cluster/nomad/1.2.nix
View File

@ -4,7 +4,7 @@
callPackage ./generic.nix {
inherit buildGoModule;
version = "1.2.14";
sha256 = "sha256-BEbRXakMbgE44z1NOGThUuT1FukFUc1cnPkV5PXAY+4=";
vendorSha256 = "sha256-bOJ/qlvY3NHlR9C08vwfVn4Z/bSH15EPs3vvq78JoKs=";
version = "1.2.15";
sha256 = "sha256-p9yRjSapQAhuHv+slUmYI25bUb1N1A7LBiJOdk1++iI=";
vendorSha256 = "sha256-6d3tE337zVAIkzQzAnV2Ya5xwwhuzmKgtPUJcJ9HRto=";
}

6
pkgs/applications/networking/cluster/nomad/1.3.nix
View File

@ -4,7 +4,7 @@
callPackage ./generic.nix {
inherit buildGoModule;
version = "1.3.7";
sha256 = "sha256-hMMR7PdCViZdePXy9aFqTFBxoiuuXqIldXyCGkkr5MA=";
vendorSha256 = "sha256-unw2/E048jzDHj7glXc61UNZIr930UpU9RrXI6DByj4=";
version = "1.3.8";
sha256 = "sha256-hUmDWgGV8HAXew8SpcbhaiaF9VfBN5mk1W7t5lhnZ9I=";
vendorSha256 = "sha256-IfYobyDFriOldJnNfRK0QVKBfttoZZ1iOkt4cBQxd00=";
}

6
pkgs/applications/networking/cluster/nomad/1.4.nix
View File

@ -4,7 +4,7 @@
callPackage ./generic.nix {
inherit buildGoModule;
version = "1.4.2";
sha256 = "sha256-GGLy/6FgMTSZ701F0QGwcw1EFZSUMyPOlokThOTtdJg=";
vendorSha256 = "sha256-dd8rTGcO4GVMRuABwT4HeucZqYKxrgRUkua/bSPLNH0=";
version = "1.4.3";
sha256 = "sha256-GQVfrn9VlzfdIj73W3hBpHcevsXZcb6Uj808HUCZUUg=";
vendorSha256 = "sha256-JQRpsQhq5r/QcgFwtnptmvnjBEhdCFrXFrTKkJioL3A=";
}

28
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@ -441,24 +441,24 @@
"version": "3.19.0"
},
"google": {
"hash": "sha256-qOB4UV53j0Bm0332U1YETzLfyBtGwfXs2hGDAL2BCCk=",
"hash": "sha256-etTMRjQeZoLNpFlKBWa63eowXQC8wDP/O0YdwzbmFK0=",
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.43.1",
"vendorHash": "sha256-Hzl95NLEZlvTBpCGJYzF5rtHWfYe26TwW0pbtqWmxOo=",
"version": "4.43.1"
"rev": "v4.44.0",
"vendorHash": "sha256-X5wjho+hotqi9aZ5ABv3RY0xJj1HFH7IN/HLPKIxi2c=",
"version": "4.44.0"
},
"google-beta": {
"hash": "sha256-nNz9BgTJ8Aj3QZNpT0XK14s44+thDu4EfLvbEB8OFRc=",
"hash": "sha256-AD2ZtjjlmYZYmBA3csjIDH+4g7DTskaLeuBGjqIKpbU=",
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.43.1",
"vendorHash": "sha256-Hzl95NLEZlvTBpCGJYzF5rtHWfYe26TwW0pbtqWmxOo=",
"version": "4.43.1"
"rev": "v4.44.0",
"vendorHash": "sha256-X5wjho+hotqi9aZ5ABv3RY0xJj1HFH7IN/HLPKIxi2c=",
"version": "4.44.0"
},
"googleworkspace": {
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
@ -950,13 +950,13 @@
"version": "1.7.0"
},
"rancher2": {
"hash": "sha256-TqztIk0sHevfv+BpNZJUs1XbwrbzJtcqdafGN5fTVaE=",
"hash": "sha256-DInP+DpCBOsBdlg1tiujlmN20WB5VQbeHgOiabEv9Zc=",
"owner": "rancher",
"provider-source-address": "registry.terraform.io/rancher/rancher2",
"repo": "terraform-provider-rancher2",
"rev": "v1.24.2",
"rev": "v1.25.0",
"vendorHash": "sha256-Ntq4wxXPUGbu4+6X1pBsmQsqfJ/jccTiHDJeHVpWe8Y=",
"version": "1.24.2"
"version": "1.25.0"
},
"random": {
"hash": "sha256-oYtvVK0OOHyLUG6amhkvmr6zlbzy0CKoS3DxztoLbdE=",
@ -1112,13 +1112,13 @@
"version": "0.13.5"
},
"tencentcloud": {
"hash": "sha256-HSZP6O9s6KkvaJK3xpy7uT3sjBlhBYEOu5k7VYW8MdU=",
"hash": "sha256-62G9q/MZtVnKO0ALXX9/pgkHDV6Bfdol4tSVdl0kx3I=",
"owner": "tencentcloudstack",
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.78.12",
"rev": "v1.78.13",
"vendorHash": null,
"version": "1.78.12"
"version": "1.78.13"
},
"tfe": {
"hash": "sha256-ikuLRGm9Z+tt0Zsx7DYKNBrS08rW4DOvVWYpl3wvaeU=",

8
pkgs/applications/networking/irc/senpai/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "senpai";
version = "unstable-2022-11-04";
version = "unstable-2022-11-15";
src = fetchFromSourcehut {
owner = "~taiite";
repo = "senpai";
rev = "3be87831281af1c91a6e406986f317936a0b98bc";
sha256 = "sha256-v8r2q2H4I9FnsIOGv1zkC4xJ5E9cQavfILZ6mnbFbr8=";
rev = "cb0ba0669522ecf8ab0b0c3ccd0f14827eb65832";
sha256 = "sha256-Ny7TAKdh7RFGlrMRVIyCFFLqOanNWK+qGBbh+dVngMs=";
};
vendorSha256 = "sha256-FBpk9TpAD5i3+brsVNWHNHJtZsHmShmWlldQrMs/VGU=";
vendorSha256 = "sha256-dCADJ+k2vWLpgN251/gEyAg6WhPGK2DEWRaAHSHp1aM=";
subPackages = [
"cmd/senpai"

4
pkgs/applications/networking/remote/teamviewer/default.nix
View File

@ -1,5 +1,5 @@
{ mkDerivation, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg-utils, dbus
, qtbase, qtwebkit, qtwebengine, qtx11extras, qtquickcontrols, getconf, glibc
, qtbase, qtwebengine, qtx11extras, qtquickcontrols, getconf, glibc
, libXrandr, libX11, libXext, libXdamage, libXtst, libSM, libXfixes, coreutils
, wrapQtAppsHook
}:
@ -21,7 +21,7 @@ mkDerivation rec {
'';
nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapQtAppsHook ];
buildInputs = [ dbus getconf qtbase qtwebkit qtwebengine qtx11extras libX11 ];
buildInputs = [ dbus getconf qtbase qtwebengine qtx11extras libX11 ];
propagatedBuildInputs = [ qtquickcontrols ];
installPhase = ''

4
pkgs/applications/office/zotero/default.nix
View File

@ -41,12 +41,12 @@
stdenv.mkDerivation rec {
pname = "zotero";
version = "6.0.16";
version = "6.0.18";
src = fetchurl {
url =
"https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
sha256 = "sha256-PqC7PqpRSm/Yt3pK8TuzcrhtfJSeJX6th2xb2n/Bul8=";
sha256 = "sha256-MIBhvhgttqfUO42ipVNXhdKbcN/0YPtFK8Ox8KlafG0=";
};
nativeBuildInputs = [ wrapGAppsHook ];

6
pkgs/applications/science/math/form/default.nix
View File

@ -1,13 +1,13 @@
{ lib, stdenv, fetchurl, gmp, zlib }:
stdenv.mkDerivation {
version = "4.2.1";
version = "4.3.0";
pname = "form";
# This tarball is released by author, it is not downloaded from tag, so can't use fetchFromGitHub
src = fetchurl {
url = "https://github.com/vermaseren/form/releases/download/v4.2.1/form-4.2.1.tar.gz";
sha256 = "0a0smc10gm85vxd85942n5azy88w5qs5avbqrw0lw0yb9injswpj";
url = "https://github.com/vermaseren/form/releases/download/v4.3.0/form-4.3.0.tar.gz";
sha256 = "sha256-sjTg0JX3PssJBM3DsNjYMjqfp/RncKUvsiJnxiSq+/Y=";
};
buildInputs = [ gmp zlib ];

4
pkgs/applications/terminal-emulators/blackbox-terminal/default.nix
View File

@ -26,14 +26,14 @@ let
in
stdenv.mkDerivation rec {
pname = "blackbox";
version = "0.12.1";
version = "0.12.2";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "raggesilver";
repo = "blackbox";
rev = "v${version}";
sha256 = "sha256-BJtRzjNmJzabI30mySTjWXfN81xj+AWpKhIberXf6Io=";
sha256 = "sha256-4/rtviBv5KXheLLExxOvaF0wU87eRKMNxlYCVxuIQgU=";
};
postPatch = ''

14
pkgs/applications/terminal-emulators/wezterm/default.nix
View File

@ -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

6
pkgs/applications/version-management/git-and-tools/git-cliff/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-cliff";
version = "0.9.2";
version = "0.10.0";
src = fetchFromGitHub {
owner = "orhun";
repo = "git-cliff";
rev = "v${version}";
sha256 = "sha256-6OxYIr2ElyB4QHiPV/KAELmKC+qFGpgerhlDPjLvsio=";
sha256 = "sha256-f7nM4airKOTXiYEMksTCm18BN036NQLLwNcKIlhuHWs=";
};
cargoSha256 = "sha256-+C7MXmn3FrhD9UVdRmRZbH/rzleATBT0bdlQUSOae5Y=";
cargoSha256 = "sha256-wjqQAVQ1SCjD24aCwZorUhnfOKM+j9TkB84tLxeaNgo=";
# attempts to run the program on .git in src which is not deterministic
doCheck = false;

259
pkgs/build-support/rust/carnix.nix
View File

@ -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";
};
}

7756
pkgs/build-support/rust/crates-io.nix
View File

File diff suppressed because it is too large Load Diff

46
pkgs/data/documentation/zeal/default.nix
View File

@ -1,16 +1,31 @@
{ lib, fetchFromGitHub, cmake, extra-cmake-modules, pkg-config
, qtbase, qtimageformats, qtwebengine, qtx11extras, mkDerivation
, libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms }:
{ lib
, stdenv
, fetchFromGitHub
, cmake
, extra-cmake-modules
, pkg-config
, qtbase
, qtimageformats
, qtwebengine
, qtx11extras ? null # qt5 only
, libarchive
, libXdmcp
, libpthreadstubs
, wrapQtAppsHook
, xcbutilkeysyms
}:
mkDerivation rec {
let
isQt5 = lib.versions.major qtbase.version == "5";
in stdenv.mkDerivation rec {
pname = "zeal";
version = "0.6.999";
version = "0.6.20221022";
src = fetchFromGitHub {
owner = "zealdocs";
repo = "zeal";
rev = "763edca12ccd6c67e51f10891d1ced8b2510904f";
sha256 = "sha256-1/wQXkRWvpRia8UDvvvmzHinPG8q2Tz9Uoeegej9uC8=";
rev = "7ea03e4bb9754020e902a2989f56f4bc42b85c82";
sha256 = "sha256-BozRLlws56i9P7Qtc5qPZWgJR5yhYqnLQsEdsymt5us=";
};
# we only need this if we are using a version that hasn't been released. We
@ -22,13 +37,18 @@ mkDerivation rec {
-e 's@^project.*@project(Zeal VERSION ${version})@'
'';
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config wrapQtAppsHook ];
buildInputs = [
qtbase qtimageformats qtwebengine qtx11extras
libarchive
libXdmcp libpthreadstubs xcbutilkeysyms
];
buildInputs =
[
qtbase
qtimageformats
qtwebengine
libarchive
libXdmcp
libpthreadstubs
xcbutilkeysyms
] ++ lib.optionals isQt5 [ qtx11extras ];
meta = with lib; {
description = "A simple offline API documentation browser";

3
pkgs/development/compilers/llvm/10/default.nix
View File

@ -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;
};
});

5
pkgs/development/compilers/llvm/10/openmp/default.nix
View File

@ -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
pkgs/development/compilers/llvm/11/default.nix
View File

@ -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
pkgs/development/compilers/llvm/11/openmp/default.nix
View File

@ -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
pkgs/development/compilers/llvm/12/default.nix
View File

@ -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;
};
});

5
pkgs/development/compilers/llvm/12/openmp/default.nix
View File

@ -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
pkgs/development/compilers/llvm/13/default.nix
View File

@ -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;
};
});

5
pkgs/development/compilers/llvm/13/openmp/default.nix
View File

@ -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
pkgs/development/compilers/llvm/14/default.nix
View File

@ -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
pkgs/development/compilers/llvm/14/openmp/default.nix
View File

@ -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

3
pkgs/development/compilers/llvm/5/default.nix
View File

@ -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;
};
});

5
pkgs/development/compilers/llvm/5/openmp/default.nix
View File

@ -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/";

3
pkgs/development/compilers/llvm/6/default.nix
View File

@ -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;
};
});

5
pkgs/development/compilers/llvm/6/openmp/default.nix
View File

@ -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
pkgs/development/compilers/llvm/7/default.nix
View File

@ -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;
};
});

5
pkgs/development/compilers/llvm/7/openmp/default.nix
View File

@ -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
pkgs/development/compilers/llvm/8/default.nix
View File

@ -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;
};
});

5
pkgs/development/compilers/llvm/8/openmp/default.nix
View File

@ -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
pkgs/development/compilers/llvm/9/default.nix
View File

@ -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;
};
});

5
pkgs/development/compilers/llvm/9/openmp/default.nix
View File

@ -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/";

5
pkgs/development/compilers/rust/default.nix
View File

@ -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

4
pkgs/development/compilers/scala/bare.nix
View File

@ -17,7 +17,9 @@ stdenv.mkDerivation rec {
mv * $out
'';
fixupPhase = ''
# Use preFixup instead of fixupPhase
# because we want the default fixupPhase as well
preFixup = ''
bin_files=$(find $out/bin -type f ! -name common)
for f in $bin_files ; do
wrapProgram $f --set JAVA_HOME ${jre} --prefix PATH : '${ncurses.dev}/bin'

64
pkgs/development/libraries/wlroots/0.14.nix
View File

@ -1,64 +0,0 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner
, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman
, libcap, mesa, xorg
, libpng, ffmpeg_4, seatd
, enableXWayland ? true, xwayland ? null
}:
stdenv.mkDerivation rec {
pname = "wlroots";
version = "0.14.1";
src = fetchFromGitHub {
owner = "swaywm";
repo = "wlroots";
rev = version;
sha256 = "1sshp3lvlkl1i670kxhwsb4xzxl8raz6769kqvgmxzcb63ns9ay1";
};
# $out for the library and $examples for the example programs (in examples):
outputs = [ "out" "examples" ];
strictDeps = true;
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
buildInputs = [
libGL wayland wayland-protocols libinput libxkbcommon pixman
xorg.xcbutilwm xorg.libX11 libcap xorg.xcbutilimage xorg.xcbutilerrors mesa
libpng ffmpeg_4 xorg.xcbutilrenderutil seatd
]
++ lib.optional enableXWayland xwayland
;
mesonFlags =
lib.optional (!enableXWayland) "-Dxwayland=disabled"
;
postFixup = ''
# Install ALL example programs to $examples:
# screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle
# screenshot output-layout multi-pointer rotation tablet touch pointer
# simple
mkdir -p $examples/bin
cd ./examples
for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do
cp "$binary" "$examples/bin/wlroots-$binary"
done
'';
meta = with lib; {
description = "A modular Wayland compositor library";
longDescription = ''
Pluggable, composable, unopinionated modules for building a Wayland
compositor; or about 50,000 lines of code you were going to write anyway.
'';
inherit (src.meta) homepage;
changelog = "https://github.com/swaywm/wlroots/releases/tag/${version}";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ primeos synthetica ];
};
}

69
pkgs/development/libraries/wlroots/0.15.nix
View File

@ -1,69 +0,0 @@
{ lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, wayland-scanner
, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman
,libcap, mesa, xorg
, libpng, ffmpeg_4, seatd, vulkan-loader, glslang
, nixosTests
, enableXWayland ? true, xwayland ? null
}:
stdenv.mkDerivation rec {
pname = "wlroots";
version = "0.15.1";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "wlroots";
repo = "wlroots";
rev = version;
sha256 = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM=";
};
# $out for the library and $examples for the example programs (in examples):
outputs = [ "out" "examples" ];
strictDeps = true;
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner glslang ];
buildInputs = [
libGL wayland wayland-protocols libinput libxkbcommon pixman
xorg.xcbutilwm xorg.libX11 libcap xorg.xcbutilimage xorg.xcbutilerrors mesa
libpng ffmpeg_4 xorg.xcbutilrenderutil seatd vulkan-loader
]
++ lib.optional enableXWayland xwayland
;
mesonFlags =
lib.optional (!enableXWayland) "-Dxwayland=disabled"
;
postFixup = ''
# Install ALL example programs to $examples:
# screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle
# screenshot output-layout multi-pointer rotation tablet touch pointer
# simple
mkdir -p $examples/bin
cd ./examples
for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do
cp "$binary" "$examples/bin/wlroots-$binary"
done
'';
# Test via TinyWL (the "minimum viable product" Wayland compositor based on wlroots):
passthru.tests.tinywl = nixosTests.tinywl;
meta = with lib; {
description = "A modular Wayland compositor library";
longDescription = ''
Pluggable, composable, unopinionated modules for building a Wayland
compositor; or about 50,000 lines of code you were going to write anyway.
'';
inherit (src.meta) homepage;
changelog = "https://gitlab.freedesktop.org/wlroots/wlroots/-/tags/${version}";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ primeos synthetica ];
};
}

135
pkgs/development/libraries/wlroots/default.nix Normal file
View File

@ -0,0 +1,135 @@
{ lib
, stdenv
, fetchFromGitLab
, meson
, ninja
, pkg-config
, wayland-scanner
, libGL
, wayland
, wayland-protocols
, libinput
, libxkbcommon
, pixman
, libcap
, mesa
, xorg
, libpng
, ffmpeg_4
, hwdata
, seatd
, vulkan-loader
, glslang
, nixosTests
, enableXWayland ? true
, xwayland ? null
}:
let
generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], extraPatch ? "" }:
stdenv.mkDerivation rec {
pname = "wlroots";
inherit version;
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "wlroots";
repo = "wlroots";
rev = version;
inherit hash;
};
postPatch = extraPatch;
# $out for the library and $examples for the example programs (in examples):
outputs = [ "out" "examples" ];
strictDeps = true;
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]
++ extraNativeBuildInputs;
buildInputs = [
ffmpeg_4
libGL
libcap
libinput
libpng
libxkbcommon
mesa
pixman
seatd
vulkan-loader
wayland
wayland-protocols
xorg.libX11
xorg.xcbutilerrors
xorg.xcbutilimage
xorg.xcbutilrenderutil
xorg.xcbutilwm
]
++ lib.optional enableXWayland xwayland
++ extraBuildInputs;
mesonFlags =
lib.optional (!enableXWayland) "-Dxwayland=disabled"
;
postFixup = ''
# Install ALL example programs to $examples:
# screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle
# screenshot output-layout multi-pointer rotation tablet touch pointer
# simple
mkdir -p $examples/bin
cd ./examples
for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do
cp "$binary" "$examples/bin/wlroots-$binary"
done
'';
# Test via TinyWL (the "minimum viable product" Wayland compositor based on wlroots):
passthru.tests.tinywl = nixosTests.tinywl;
meta = with lib; {
description = "A modular Wayland compositor library";
longDescription = ''
Pluggable, composable, unopinionated modules for building a Wayland
compositor; or about 50,000 lines of code you were going to write anyway.
'';
inherit (src.meta) homepage;
changelog = "https://gitlab.freedesktop.org/wlroots/wlroots/-/tags/${version}";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ primeos synthetica ];
};
};
in
rec {
wlroots_0_14 = generic {
version = "0.14.1";
hash = "sha256-wauk7TCL/V7fxjOZY77KiPbfydIc9gmOiYFOuum4UOs=";
};
wlroots_0_15 = generic {
version = "0.15.1";
hash = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM=";
extraBuildInputs = [ vulkan-loader ];
extraNativeBuildInputs = [ glslang ];
};
wlroots_0_16 = generic {
version = "0.16.0";
hash = "sha256-k7BFx1xvvsdCXNWX0XeZYwv8H/myk4p42i2Y6vjILqM=";
extraBuildInputs = [ vulkan-loader ];
extraNativeBuildInputs = [ glslang ];
extraPatch = ''
substituteInPlace backend/drm/meson.build \
--replace /usr/share/hwdata/ ${hwdata}/share/hwdata/
'';
};
wlroots = wlroots_0_15;
}

6
pkgs/development/node-packages/node-packages.nix generated
View File

@ -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 = {

5
pkgs/development/ocaml-modules/phylogenetics/default.nix
View File

@ -40,6 +40,11 @@ buildDunePackage rec {
printbox-text
];
checkPhase = ''
runHook preCheck
dune build @app/fulltest
runHook postCheck
'';
doCheck = true;
meta = with lib; {

5
pkgs/development/python-modules/adafruit-platformdetect/default.nix
View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
version = "3.33.0";
version = "3.34.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
hash = "sha256-Fj+LUTovZm6t0YRCa8QtoTBal+PefCvTIl9OeBoac6U=";
hash = "sha256-3eOYkzeEKC5xTUt5RF5Sm4TKZREu4YiXBrrD3c0Z8+0=";
};
nativeBuildInputs = [
@ -32,6 +32,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Platform detection for use by Adafruit libraries";
homepage = "https://github.com/adafruit/Adafruit_Python_PlatformDetect";
changelog = "https://github.com/adafruit/Adafruit_Python_PlatformDetect/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

7
pkgs/development/python-modules/aiomusiccast/default.nix
View File

@ -9,16 +9,16 @@
buildPythonPackage rec {
pname = "aiomusiccast";
version = "0.14.5";
version = "0.14.6";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "vigonotion";
repo = "aiomusiccast";
rev = "refs/tags/${version}";
hash = "sha256-YssBrG4sFtQtrzKU/O/tWEVL9eq8dpszejY/1So5Mec=";
hash = "sha256-eQBVenB/WIqksohWtCU/3o3TGWMavPjJahlg0yus4aE=";
};
postPatch = ''
@ -45,6 +45,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Companion library for musiccast devices intended for the Home Assistant integration";
homepage = "https://github.com/vigonotion/aiomusiccast";
changelog = "https://github.com/vigonotion/aiomusiccast/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};

8
pkgs/development/python-modules/arcam-fmj/default.nix
View File

@ -12,15 +12,16 @@
buildPythonPackage rec {
pname = "arcam-fmj";
version = "0.12.0";
version = "1.0.1";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "elupus";
repo = "arcam_fmj";
rev = version;
sha256 = "sha256-YkoABsOLEl1gSCRgZr0lLZGzicr3N5KRNLDjfuQhy2U=";
rev = "refs/tags/${version}";
hash = "sha256-Lmz701qdqFlXro279AdNx+P1o3Q/Om63jKvy854ogto=";
};
propagatedBuildInputs = [
@ -45,6 +46,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library for speaking to Arcam receivers";
homepage = "https://github.com/elupus/arcam_fmj";
changelog = "https://github.com/elupus/arcam_fmj/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
};

4
pkgs/development/python-modules/bellows/default.nix
View File

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "bellows";
version = "0.34.3";
version = "0.34.4";
format = "setuptools";
src = fetchFromGitHub {
owner = "zigpy";
repo = "bellows";
rev = "refs/tags/${version}";
sha256 = "sha256-7jaXNz7i+kF64T+5/QWKGpxHCkg/M9U2hbWrVB2tjH8=";
sha256 = "sha256-JUI2jUUc2i+/6mRYNhmuAOmAS4nCzMZwyM8ug0pOFfc=";
};
propagatedBuildInputs = [

5
pkgs/development/python-modules/broadlink/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "broadlink";
version = "0.18.2";
version = "0.18.3";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-2ktLSJ1Nsdry8dvWmY/BbhHApTYQMvSjCsNKX3PkocU=";
hash = "sha256-3+WKuMbH79v2i4wurObKQZowCmFbVsxlQp3aSk+eelg=";
};
propagatedBuildInputs = [
@ -31,6 +31,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python API for controlling Broadlink IR controllers";
homepage = "https://github.com/mjg59/python-broadlink";
changelog = "https://github.com/mjg59/python-broadlink/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

2
pkgs/development/python-modules/cherrypy/default.nix
View File

@ -102,7 +102,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Object-oriented HTTP framework";
homepage = "https://www.cherrypy.org";
homepage = "https://cherrypy.dev/";
license = licenses.bsd3;
maintainers = with maintainers; [ ];
};

35
pkgs/development/python-modules/cssselect/default.nix
View File

@ -1,17 +1,42 @@
{ lib, buildPythonPackage, fetchPypi }:
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, setuptools
, pytestCheckHook
, lxml
}:
buildPythonPackage rec {
pname = "cssselect";
version = "1.1.0";
version = "1.2.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc";
sha256 = "666b19839cfaddb9ce9d36bfe4c969132c647b92fc9088c4e23f786b30f1b3dc";
};
# AttributeError: 'module' object has no attribute 'tests'
doCheck = false;
nativeBuildInputs = [
setuptools
];
checkInputs = [
pytestCheckHook
lxml
];
pythonImportsCheck = [
"cssselect"
];
meta = with lib; {
description = "CSS Selectors for Python";
homepage = "https://cssselect.readthedocs.io/";
changelog = "https://github.com/scrapy/cssselect/v${version}//CHANGES";
license = licenses.bsd3;
maintainers = with maintainers; [ ];
};
}

4
pkgs/development/python-modules/debian/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "python-debian";
version = "0.1.48";
version = "0.1.49";
format = "setuptools";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
hash = "sha256-YtUFR9BqVjjOHF6A19cB3fFpY7QHr89b3IPH3k25T3w=";
hash = "sha256-jPZ3ow28tL56mVNsF+ETCKgnpNIgKNxZpn9sbdPw9Yw=";
};
propagatedBuildInputs = [

5
pkgs/development/python-modules/deezer-python/default.nix
View File

@ -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 ];
};

22
pkgs/development/python-modules/django-maintenance-mode/default.nix
View File

@ -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;
};

8
pkgs/development/python-modules/fastapi-mail/default.nix
View File

@ -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 ];
};

38
pkgs/development/python-modules/h5py/default.nix
View File

@ -1,6 +1,17 @@
{ lib, fetchPypi, isPy27, buildPythonPackage, pythonOlder
, numpy, hdf5, cython, six, pkgconfig, unittest2
, mpi4py ? null, openssh, pytestCheckHook, cached-property }:
{ lib
, fetchPypi
, buildPythonPackage
, pythonOlder
, setuptools
, numpy
, hdf5
, cython
, pkgconfig
, mpi4py ? null
, openssh
, pytestCheckHook
, cached-property
}:
assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi;
@ -10,7 +21,9 @@ let
in buildPythonPackage rec {
version = "3.7.0";
pname = "h5py";
disabled = isPy27;
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
@ -35,16 +48,23 @@ in buildPythonPackage rec {
preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else "";
# tests now require pytest-mpi, which isn't available and difficult to package
doCheck = false;
checkInputs = lib.optional isPy27 unittest2 ++ [ pytestCheckHook openssh ];
nativeBuildInputs = [ pkgconfig cython ];
nativeBuildInputs = [
cython
pkgconfig
setuptools
];
buildInputs = [ hdf5 ]
++ lib.optional mpiSupport mpi;
propagatedBuildInputs = [ numpy six]
propagatedBuildInputs = [ numpy ]
++ lib.optionals mpiSupport [ mpi4py openssh ]
++ lib.optionals (pythonOlder "3.8") [ cached-property ];
# tests now require pytest-mpi, which isn't available and difficult to package
doCheck = false;
checkInputs = [ pytestCheckHook openssh ];
pythonImportsCheck = [ "h5py" ];
meta = with lib; {

20
pkgs/development/python-modules/junitparser/default.nix
View File

@ -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 ];
};
}

4
pkgs/development/python-modules/peaqevcore/default.nix
View File

@ -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 = ''

4
pkgs/development/python-modules/pebble/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pebble";
version = "5.0.2";
version = "5.0.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Pebble";
inherit version;
hash = "sha256-nFjAPq+SDDEodETG/vOdxTuurJ3iIerRBPXJtI6L1Yc=";
hash = "sha256-vc/Z6n4K7biVsgQXfBnm1lQ9mWL040AuurIXUASGPag=";
};
checkInputs = [

5
pkgs/development/python-modules/pick/default.nix
View File

@ -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 ];
};

9
pkgs/development/python-modules/pychromecast/default.nix
View File

@ -2,7 +2,7 @@
, buildPythonPackage
, casttube
, fetchPypi
, isPy3k
, pythonOlder
, protobuf
, requests
, zeroconf
@ -10,15 +10,15 @@
buildPythonPackage rec {
pname = "pychromecast";
version = "12.1.4";
version = "13.0.1";
format = "setuptools";
disabled = !isPy3k;
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "PyChromecast";
inherit version;
sha256 = "sha256-nlfcmFpKBdtb3NXaIZy/bO0lVIygk/jXS8EHs8VU7AA=";
hash = "sha256-IDqvA3r7rKEnY6OpEZKd0lsKinse4A0BDTQ5vTGpglI=";
};
postPatch = ''
@ -43,6 +43,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for Python to communicate with the Google Chromecast";
homepage = "https://github.com/home-assistant-libs/pychromecast";
changelog = "https://github.com/home-assistant-libs/pychromecast/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ abbradar ];
platforms = platforms.unix;

13
pkgs/development/python-modules/pymbolic/default.nix
View File

@ -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
];

5
pkgs/development/python-modules/pysnmplib/default.nix
View File

@ -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 ];
};

7
pkgs/development/python-modules/robotsuite/default.nix
View File

@ -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 = [

5
pkgs/development/python-modules/slack-sdk/default.nix
View File

@ -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 ];
};

11
pkgs/development/python-modules/smbprotocol/default.nix
View File

@ -7,27 +7,25 @@
, pytest-mock
, pytestCheckHook
, pythonOlder
, six
}:
buildPythonPackage rec {
pname = "smbprotocol";
version = "1.9.0";
version = "1.10.1";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "jborean93";
repo = pname;
rev = "v${version}";
sha256 = "sha256-u3brP3WsnoqRy3R0OQQkIbq+avS7nemx9GKpvTq+vxg=";
rev = "refs/tags/v${version}";
hash = "sha256-8T091yF/Hu60aaUr6IDZt2cLxz1sXUbMewSqW1Ch0Vo=";
};
propagatedBuildInputs = [
cryptography
pyspnego
six
];
checkInputs = [
@ -52,6 +50,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python SMBv2 and v3 Client";
homepage = "https://github.com/jborean93/smbprotocol";
changelog = "https://github.com/jborean93/smbprotocol/releases/tag/v${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

4
pkgs/development/python-modules/teslajsonpy/default.nix
View File

@ -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 = [

1
pkgs/development/python-modules/xknx/default.nix
View File

@ -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;

4
pkgs/development/tools/analysis/brakeman/Gemfile.lock
View File

@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
brakeman (5.3.1)
brakeman (5.4.0)
PLATFORMS
ruby
@ -10,4 +10,4 @@ DEPENDENCIES
brakeman
BUNDLED WITH
2.3.20
2.3.25

4
pkgs/development/tools/analysis/brakeman/gemset.nix
View File

@ -4,9 +4,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zr2p0w4ckv65cv3vdwnk9f3yydmjdmw75x7dskx1gqr9j9q3306";
sha256 = "0lcxxlrzgpi9z2mr2v19xda6fdysmn5psa9bsp2rksa915v91fds";
type = "gem";
};
version = "5.3.1";
version = "5.4.0";
};
}

4
pkgs/development/tools/build-managers/bob/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "bob";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "benchkram";
repo = pname;
rev = version;
hash = "sha256-37VhzYxVrt+w1XTDXzKAkJT43TQSyCmX9SAoNnk+o3w=";
hash = "sha256-OuIE3saJxk8IBLPbAxdQ2uJ9oXJ3xBOaeZraw9csy1U=";
};
ldflags = [ "-s" "-w" "-X main.Version=${version}" ];

4
pkgs/development/tools/esbuild/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
version = "0.15.14";
version = "0.15.15";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
sha256 = "sha256-RcXVynR/dHI0Wn9gTQsYVjxqzAfeiI52Ph+hfpM9RhU=";
sha256 = "sha256-vWpm9tbzLZE+rrEHC6mBH+ajMdhdAk9Fwy5MBFG35ss=";
};
vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";

6
pkgs/development/tools/ginkgo/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "ginkgo";
version = "2.5.0";
version = "2.5.1";
src = fetchFromGitHub {
owner = "onsi";
repo = "ginkgo";
rev = "v${version}";
sha256 = "sha256-jZadmIefrK3kSStbG1Q3+R08/lEaBE/yWNSpPFSLW6I=";
sha256 = "sha256-xoZVo+JEOXaME7gE9PuTfNmAyVTgczNuSzA4zYAfUmc=";
};
vendorSha256 = "sha256-ZLDk61J7ci+OR1z3ddAfxeeDmRyTrVMHatc5thuCrl4=";
vendorSha256 = "sha256-a8NZ9Uws6OKfXWUL6oTZKoAG8pTYxxSNkefZtbqwyf4=";
# integration tests expect more file changes
# types tests are missing CodeLocation

4
pkgs/development/tools/oh-my-posh/default.nix
View File

@ -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=";

1
pkgs/development/tools/parsing/tree-sitter/default.nix
View File

@ -23,7 +23,6 @@
, extraGrammars ? { }
}:
# TODO: move to carnix or https://github.com/kolloch/crate2nix
let
# to update:
# 1) change all these hashes

7
pkgs/development/tools/pip-audit/default.nix
View File

@ -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 ];
};

6
pkgs/development/tools/rust/cargo-expand/default.nix
View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
version = "1.0.32";
version = "1.0.35";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
sha256 = "sha256-5zWJsc0OKgQMp0PeCuL99RE/Uj5sudXRMITjoKniPqQ=";
sha256 = "sha256-hJb4FLL3+AMNLL05eQc7Mkhp0KEGxmHg8/ETDoZiLV4=";
};
cargoSha256 = "sha256-/euiu7WNFY89QU1BKFfOAn7k93dZpuwbS6u2A6MDsoM=";
cargoSha256 = "sha256-wKVlmO2/ugAb7vUSIGMz0WGnjEVEsm459DV9FaM28Mk=";
buildInputs = lib.optional stdenv.isDarwin libiconv;

6
pkgs/development/tools/rust/cargo-lambda/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-lambda";
version = "0.11.3";
version = "0.12.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-dEJOoV91DIQL7KPbLQrgCKdCF7ZMSZMHVLq6l1sg4F0=";
sha256 = "sha256-SgA2eKXZIPWbyJkopk8E9rTgkUWl6LWP2dw2fn3H8qc=";
};
cargoSha256 = "sha256-qW4a4VPpPSdt0Z4nRA4/fHpW0cfDxOPQyEAdJidt+0o=";
cargoSha256 = "sha256-rTVc8zzbzLzP0LV8h7IWE1S+ZqDVfnO18iT0CrOrI9A=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];

6
pkgs/development/tools/rust/cargo-llvm-lines/default.nix
View File

@ -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";

6
pkgs/development/tools/typos/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "typos";
version = "1.11.1";
version = "1.13.0";
src = fetchFromGitHub {
owner = "crate-ci";
repo = pname;
rev = "v${version}";
hash = "sha256-jQmihZl1mKBHg7HLKAbe9uuL1QM+cF0beFj8htz0IOU=";
hash = "sha256-/+M+yR28mUA3iJ8wJlsL5cNRHn19yypUpG/bcfFtwVQ=";
};
cargoHash = "sha256-bO9QMMJY+gQyV811qXdwiH1oxW+5Q+dZqG/oT35Eze4=";
cargoHash = "sha256-GeEQ00r7GYm4goeCWGXg5m+d3eaM2eBJtuip09a1OV0=";
meta = with lib; {
description = "Source code spell checker";

15
pkgs/games/harmonist/default.nix
View File

@ -1,20 +1,17 @@
{lib, fetchurl, buildGoPackage}:
buildGoPackage rec {
{lib, fetchurl, buildGoModule}:
buildGoModule rec {
pname = "harmonist";
version = "0.4.1";
goPackagePath = "git.tuxfamily.org/harmonist/harmonist.git";
src = fetchurl {
url = "https://download.tuxfamily.org/harmonist/releases/${pname}-${version}.tar.gz";
sha256 = "19abqmzz9nnlnizkskvlkcpahk8lzrl57mgg6dfxn25l55vfznws";
hash = "sha256-mtvvdim0CNtdM+/VU2j+FE2oLpt0Tz1/tNTa9H/FS6U=";
};
goDeps = ./deps.nix;
vendorHash = "sha256-SrvJXTyLtPZ2PyhSZz/gJvuso9r7e5NbGe7EJRf2XlI=";
postInstall = "mv $out/bin/harmonist.git $out/bin/harmonist";
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "A stealth coffee-break roguelike game";
@ -29,6 +26,6 @@ buildGoPackage rec {
homepage = "https://harmonist.tuxfamily.org/";
license = licenses.isc;
platforms = platforms.unix;
maintainers = with maintainers; [];
maintainers = with maintainers; [ aaronjheng ];
};
}

92
pkgs/games/harmonist/deps.nix generated
View File

@ -1,92 +0,0 @@
[
{
goPackagePath = "github.com/mattn/go-runewidth";
fetch = {
type = "git";
url = "https://github.com/mattn/go-runewidth";
rev = "59616a248b91ae20bf3eb93636a24c87d9ce6cea";
sha256 = "0jh9552ppqvkdfni7x623n0x5mbiaqqhjhmr0zkh28x56k4ysii4";
};
}
{
goPackagePath = "github.com/anaseto/gruid";
fetch = {
type = "git";
url = "https://github.com/anaseto/gruid";
rev = "976b3db42d20169cf44eca1406b3cff104a80979";
sha256 = "0rvsavkvg2hziwdh8sjk3n5v92m5mfjb8v9m7ch22maxfwq5kv6y";
};
}
{
goPackagePath = "github.com/anaseto/gruid-tcell";
fetch = {
type = "git";
url = "https://github.com/anaseto/gruid-tcell";
rev = "4878126bb96fa0e529ec22c700d03b030e5c3bf7";
sha256 = "0spm9gqsdan1mvbpypywid00vvl92rii8akhmjdm8l1r9qk7a3i4";
};
}
{
goPackagePath = "github.com/gdamore/tcell";
fetch = {
type = "git";
url = "https://github.com/gdamore/tcell";
rev = "f4d402906fa3d330545365abbf970c048e677b35";
sha256 = "1wcbm5vxrh5s8g4mas32y3n0pjvfmngmc2yrxg1yn4333mh9mgf3";
};
}
{
goPackagePath = "github.com/lucasb-eyer/go-colorful";
fetch = {
type = "git";
url = "https://github.com/lucasb-eyer/go-colorful";
rev = "4d8f45c41ac988423342507a1fb6050239b5a742";
sha256 = "1p2rl5353fi4p3l0bz3dg0lifhxqj8hjyh1b6z1cn286qxwnnnm8";
};
}
{
goPackagePath = "github.com/gdamore/encoding";
fetch = {
type = "git";
url = "https://github.com/gdamore/encoding";
rev = "6289cdc94c00ac4aa177771c5fce7af2f96b626d";
sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9";
};
}
{
goPackagePath = "github.com/rivo/uniseg";
fetch = {
type = "git";
url = "https://github.com/rivo/uniseg";
rev = "75711fccf6a3e85bc74c241e2dddd06a9bc9e53d";
sha256 = "0j7h22vfmjj562vr8gpsyrkrwp1pq9ayh5fylv24skxb467g9f0q";
};
}
{
goPackagePath = "golang.org/x/term/";
fetch = {
type = "git";
url = "https://go.googlesource.com/term";
rev = "6a3ed077a48de71621ad530f9078fffa0bc0ce32";
sha256 = "0xni8n3q2r9f6fk223b2c1702fvqmgz7vk6738asri3fwby583q5";
};
}
{
goPackagePath = "golang.org/x/text/";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "e3aa4adf54f644ca0cb35f1f1fb19b239c40ef04";
sha256 = "03q5kjmp4sfp5yzwb76lyf8cs9qca26vlwry5qgqf8w03rq700hf";
};
}
{
goPackagePath = "golang.org/x/sys/";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "88b6017d06564827ae436c619d52116f470a3611";
sha256 = "14n7b6833lhxjzsgvi14c6c8nfiqqb4r71wvv4z5ksyssi95i3r7";
};
}
]

54
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -53,8 +53,6 @@ let
DEBUG_KERNEL = yes;
DEBUG_DEVRES = no;
DYNAMIC_DEBUG = yes;
TIMER_STATS = whenOlder "4.11" yes;
DEBUG_NX_TEST = whenOlder "4.11" no;
DEBUG_STACK_USAGE = no;
DEBUG_STACKOVERFLOW = option no;
RCU_TORTURE_TEST = no;
@ -109,10 +107,10 @@ let
BLK_CGROUP_IOLATENCY = whenAtLeast "4.19" yes;
BLK_CGROUP_IOCOST = whenAtLeast "5.4" yes;
IOSCHED_DEADLINE = whenOlder "5.0" yes; # Removed in 5.0-RC1
MQ_IOSCHED_DEADLINE = whenAtLeast "4.11" yes;
BFQ_GROUP_IOSCHED = whenAtLeast "4.12" yes;
MQ_IOSCHED_KYBER = whenAtLeast "4.12" yes;
IOSCHED_BFQ = whenAtLeast "4.12" module;
MQ_IOSCHED_DEADLINE = yes;
BFQ_GROUP_IOSCHED = yes;
MQ_IOSCHED_KYBER = yes;
IOSCHED_BFQ = module;
};
@ -164,8 +162,8 @@ let
IPV6_MROUTE_MULTIPLE_TABLES = yes;
IPV6_PIMSM_V2 = yes;
IPV6_FOU_TUNNEL = module;
IPV6_SEG6_LWTUNNEL = whenAtLeast "4.10" yes;
IPV6_SEG6_HMAC = whenAtLeast "4.10" yes;
IPV6_SEG6_LWTUNNEL = yes;
IPV6_SEG6_HMAC = yes;
IPV6_SEG6_BPF = whenAtLeast "4.18" yes;
NET_CLS_BPF = module;
NET_ACT_BPF = module;
@ -222,7 +220,7 @@ let
INET_DIAG = mkDefault module;
INET_TCP_DIAG = mkDefault module;
INET_UDP_DIAG = mkDefault module;
INET_RAW_DIAG = whenAtLeast "4.14" (mkDefault module);
INET_RAW_DIAG = mkDefault module;
INET_DIAG_DESTROY = mkDefault yes;
# enable multipath-tcp
@ -231,7 +229,7 @@ let
INET_MPTCP_DIAG = whenAtLeast "5.9" (mkDefault module);
# Kernel TLS
TLS = whenAtLeast "4.13" module;
TLS = module;
TLS_DEVICE = whenAtLeast "4.18" yes;
# infiniband
@ -308,7 +306,7 @@ let
DRM_I915_GVT_KVMGT = whenAtLeast "4.16" module;
} // optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") {
# enable HDMI-CEC on RPi boards
DRM_VC4_HDMI_CEC = whenAtLeast "4.14" yes;
DRM_VC4_HDMI_CEC = yes;
};
sound = {
@ -321,8 +319,6 @@ let
SND_HDA_CODEC_CA0132_DSP = whenOlder "5.7" yes; # Enable DSP firmware loading on Creative Soundblaster Z/Zx/ZxR/Recon
SND_OSSEMUL = yes;
SND_USB_CAIAQ_INPUT = yes;
# Enable PSS mixer (Beethoven ADSP-16 and other compatible)
PSS_MIXER = whenOlder "4.12" yes;
# Enable Sound Open Firmware support
} // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" &&
versionAtLeast version "5.5") {
@ -455,7 +451,6 @@ let
CIFS_UPCALL = yes;
CIFS_ACL = whenOlder "5.3" yes;
CIFS_DFS_UPCALL = yes;
CIFS_SMB2 = whenOlder "4.13" yes;
CEPH_FSCACHE = yes;
CEPH_FS_POSIX_ACL = yes;
@ -467,7 +462,7 @@ let
SQUASHFS_LZO = yes;
SQUASHFS_XZ = yes;
SQUASHFS_LZ4 = yes;
SQUASHFS_ZSTD = whenAtLeast "4.14" yes;
SQUASHFS_ZSTD = yes;
# Native Language Support modules, needed by some filesystems
NLS = yes;
@ -485,12 +480,10 @@ let
};
security = {
FORTIFY_SOURCE = whenAtLeast "4.13" (option yes);
FORTIFY_SOURCE = option yes;
# https://googleprojectzero.blogspot.com/2019/11/bad-binder-android-in-wild-exploit.html
DEBUG_LIST = yes;
# Detect writes to read-only module pages
DEBUG_SET_MODULE_RONX = whenOlder "4.11" (option yes);
HARDENED_USERCOPY = yes;
RANDOMIZE_BASE = option yes;
STRICT_DEVMEM = mkDefault yes; # Filter access to /dev/mem
@ -535,7 +528,6 @@ let
MICROCODE = yes;
MICROCODE_INTEL = yes;
MICROCODE_AMD = yes;
} // optionalAttrs (versionAtLeast version "4.10") {
# Write Back Throttling
# https://lwn.net/Articles/682582/
# https://bugzilla.kernel.org/show_bug.cgi?id=12309#c655
@ -550,7 +542,7 @@ let
CGROUP_DEVICE = yes;
CGROUP_HUGETLB = yes;
CGROUP_PERF = yes;
CGROUP_RDMA = whenAtLeast "4.11" yes;
CGROUP_RDMA = yes;
MEMCG = yes;
MEMCG_SWAP = whenOlder "6.1" yes;
@ -580,8 +572,7 @@ let
FTRACE_SYSCALLS = yes;
SCHED_TRACER = yes;
STACK_TRACER = yes;
UPROBE_EVENT = { optional = true; tristate = whenOlder "4.11" "y";};
UPROBE_EVENTS = { optional = true; tristate = whenAtLeast "4.11" "y";};
UPROBE_EVENTS = option yes;
BPF_SYSCALL = yes;
BPF_UNPRIV_DEFAULT_OFF = whenBetween "5.10" "5.16" yes;
BPF_EVENTS = yes;
@ -596,8 +587,6 @@ let
PARAVIRT_SPINLOCKS = option yes;
KVM_ASYNC_PF = yes;
KVM_COMPAT = whenOlder "4.12" (option yes);
KVM_DEVICE_ASSIGNMENT = whenOlder "4.12" (option yes);
KVM_GENERIC_DIRTYLOG_READ_PROTECT = yes;
KVM_GUEST = yes;
KVM_MMIO = yes;
@ -646,7 +635,6 @@ let
MEDIA_USB_SUPPORT = yes;
MEDIA_ANALOG_TV_SUPPORT = yes;
VIDEO_STK1160_COMMON = module;
VIDEO_STK1160_AC97 = whenOlder "4.11" yes;
};
"9p" = {
@ -762,7 +750,7 @@ let
DRAGONRISE_FF = yes;
GREENASIA_FF = yes;
HOLTEK_FF = yes;
JOYSTICK_PSXPAD_SPI_FF = whenAtLeast "4.14" yes;
JOYSTICK_PSXPAD_SPI_FF = yes;
LOGIG940_FF = yes;
NINTENDO_FF = whenAtLeast "5.16" yes;
PLAYSTATION_FF = whenAtLeast "5.12" yes;
@ -808,16 +796,16 @@ let
BLK_DEV_INTEGRITY = yes;
BLK_SED_OPAL = whenAtLeast "4.14" yes;
BLK_SED_OPAL = yes;
BSD_PROCESS_ACCT_V3 = yes;
SERIAL_DEV_BUS = whenAtLeast "4.11" yes; # enables support for serial devices
SERIAL_DEV_CTRL_TTYPORT = whenAtLeast "4.11" yes; # enables support for TTY serial devices
SERIAL_DEV_BUS = yes; # enables support for serial devices
SERIAL_DEV_CTRL_TTYPORT = yes; # enables support for TTY serial devices
BT_HCIBTUSB_MTK = whenAtLeast "5.3" yes; # MediaTek protocol support
BT_HCIUART_QCA = yes; # Qualcomm Atheros protocol support
BT_HCIUART_SERDEV = whenAtLeast "4.12" yes; # required by BT_HCIUART_QCA
BT_HCIUART_SERDEV = yes; # required by BT_HCIUART_QCA
BT_HCIUART = module; # required for BT devices with serial port interface (QCA6390)
BT_HCIUART_BCSP = option yes;
BT_HCIUART_H4 = option yes; # UART (H4) protocol support
@ -897,8 +885,8 @@ let
SCSI_LOGGING = yes; # SCSI logging facility
SERIAL_8250 = yes; # 8250/16550 and compatible serial support
SLAB_FREELIST_HARDENED = whenAtLeast "4.14" yes;
SLAB_FREELIST_RANDOM = whenAtLeast "4.10" yes;
SLAB_FREELIST_HARDENED = yes;
SLAB_FREELIST_RANDOM = yes;
SLIP_COMPRESSED = yes; # CSLIP compressed headers
SLIP_SMART = yes;
@ -974,7 +962,7 @@ let
NR_CPUS = freeform "384";
} // optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.hostPlatform.system == "aarch64-linux") {
# Enables support for the Allwinner Display Engine 2.0
SUN8I_DE2_CCU = whenAtLeast "4.13" yes;
SUN8I_DE2_CCU = yes;
# See comments on https://github.com/NixOS/nixpkgs/commit/9b67ea9106102d882f53d62890468071900b9647
CRYPTO_AEGIS128_SIMD = whenAtLeast "5.4" no;

2
pkgs/os-specific/linux/libnvme/default.nix
View File

@ -35,12 +35,12 @@ stdenv.mkDerivation rec {
ninja
perl # for kernel-doc
pkg-config
python3
];
buildInputs = [
json_c
openssl
python3
systemd
];

4
pkgs/os-specific/linux/nvme-cli/default.nix
View File

@ -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

6
pkgs/os-specific/linux/zfs/default.nix
View File

@ -235,10 +235,10 @@ in {
# IMPORTANT: Always use a tagged release candidate or commits from the
# zfs-<version>-staging branch, because this is tested by the OpenZFS
# maintainers.
version = "2.1.7-staging-2022-10-27";
rev = "04f1983aab16d378be376768275856bc38be48bd";
version = "2.1.7-staging-2022-11-08";
rev = "0f4ee295ba94803e5833f57481cfdbee5d1160d4";
sha256 = "sha256-6s9Qcw6Qqq7+JU9UPa8DDu2yzhD1OV3piLlYsgEoIhg=";
sha256 = "sha256-AixYjnr8MgST/VxEPY4NdcAvpoKiJ3zrvOai5bJjC/U=";
isUnstable = true;
};

4
pkgs/servers/jackett/default.nix
View File

@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
version = "0.20.2264";
version = "0.20.2271";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "Y1m828STKL4ANuf11oCekvT2ctCRBlT7Blyvvoltdxc=";
sha256 = "Sngvd9OWCB2I0qfYvb7yEGb7HiWuHtc+jU6O5r68mbU=";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";

6
pkgs/servers/klipper/default.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "klipper";
version = "unstable-2022-11-03";
version = "unstable-2022-11-21";
src = fetchFromGitHub {
owner = "KevinOConnor";
repo = "klipper";
rev = "342d3f1414f905fc85ea14a125463ff2df4e9b51";
sha256 = "sha256-w5hvuKrtZUwYfrBWMJD9jntdjWDfDysAiwhQDTc9jb0=";
rev = "c51f169c06921152a2e9c386016660d0bb09f767";
sha256 = "sha256-l5dOj4cKrKdQ0grmbIdXm5dmkrQv6L+NqCMN1i3z3SE=";
};
sourceRoot = "source/klippy";

Some files were not shown because too many files have changed in this diff Show More