dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-11-24 00:02:39 +00:00 committed by GitHub
commit 8240687aac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
274 changed files with 623 additions and 404 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/fileset/default.nix
View File

@ -604,6 +604,7 @@ in {
({
name :: String,
type :: String,
hasExt :: String -> Bool,
...
} -> Bool)
-> Path
@ -614,7 +615,7 @@ in {
fileFilter (file: file.name == "default.nix") ./.
# Include all non-Nix files from the current directory
fileFilter (file: ! hasSuffix ".nix" file.name) ./.
fileFilter (file: ! file.hasExt "nix") ./.
# Include all files that start with a "." in the current directory
fileFilter (file: hasPrefix "." file.name) ./.
@ -634,6 +635,12 @@ in {
- `type` (String, one of `"regular"`, `"symlink"` or `"unknown"`): The type of the file.
This matches result of calling [`builtins.readFileType`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-readFileType) on the file's path.
- `hasExt` (String -> Bool): Whether the file has a certain file extension.
`hasExt ext` is true only if `hasSuffix ".${ext}" name`.
This also means that e.g. for a file with name `.gitignore`,
`hasExt "gitignore"` is true.
Other attributes may be added in the future.
*/
predicate:

5
lib/fileset/internal.nix
View File

@ -52,6 +52,7 @@ let
concatStringsSep
substring
stringLength
hasSuffix
;
in
@ -797,9 +798,11 @@ rec {
if
predicate {
inherit name type;
hasExt = ext: hasSuffix ".${ext}" name;
# To ensure forwards compatibility with more arguments being added in the future,
# adding an attribute which can't be deconstructed :)
"lib.fileset.fileFilter: The predicate function passed as the first argument must be able to handle extra attributes for future compatibility. If you're using `{ name, file }:`, use `{ name, file, ... }:` instead." = null;
"lib.fileset.fileFilter: The predicate function passed as the first argument must be able to handle extra attributes for future compatibility. If you're using `{ name, file, hasExt }:`, use `{ name, file, hasExt, ... }:` instead." = null;
}
then
type

35
lib/fileset/tests.sh
View File

@ -847,7 +847,7 @@ checkFileset 'fileFilter (file: abort "this is not needed") ./.'
# The predicate must be able to handle extra attributes
touch a
expectFailure 'toSource { root = ./.; fileset = fileFilter ({ name, type }: true) ./.; }' 'called with unexpected argument '\''"lib.fileset.fileFilter: The predicate function passed as the first argument must be able to handle extra attributes for future compatibility. If you'\''re using `\{ name, file \}:`, use `\{ name, file, ... \}:` instead."'\'
expectFailure 'toSource { root = ./.; fileset = fileFilter ({ name, type, hasExt }: true) ./.; }' 'called with unexpected argument '\''"lib.fileset.fileFilter: The predicate function passed as the first argument must be able to handle extra attributes for future compatibility. If you'\''re using `\{ name, file, hasExt \}:`, use `\{ name, file, hasExt, ... \}:` instead."'\'
rm -rf -- *
# .name is the name, and it works correctly, even recursively
@ -895,6 +895,39 @@ expectEqual \
'toSource { root = ./.; fileset = union ./d/a ./d/b; }'
rm -rf -- *
# Check that .hasExt checks for the file extension
# The empty extension is the same as a file ending with a .
tree=(
[a]=0
[a.]=1
[a.b]=0
[a.b.]=1
[a.b.c]=0
)
checkFileset 'fileFilter (file: file.hasExt "") ./.'
# It can check for the last extension
tree=(
[a]=0
[.a]=1
[.a.]=0
[.b.a]=1
[.b.a.]=0
)
checkFileset 'fileFilter (file: file.hasExt "a") ./.'
# It can check for any extension
tree=(
[a.b.c.d]=1
)
checkFileset 'fileFilter (file:
all file.hasExt [
"b.c.d"
"c.d"
"d"
]
) ./.'
# It's lazy
tree=(
[b]=1

103
nixos/doc/manual/release-notes/rl-2311.section.md
View File

@ -373,11 +373,6 @@
- `networking.networkmanager.firewallBackend` was removed as NixOS is now using iptables-nftables-compat even when using iptables, therefore Networkmanager now uses the nftables backend unconditionally.
- [`lib.lists.foldl'`](https://nixos.org/manual/nixpkgs/stable#function-library-lib.lists.foldl-prime) now always evaluates the initial accumulator argument first.
If you depend on the lazier behavior, consider using [`lib.lists.foldl`](https://nixos.org/manual/nixpkgs/stable#function-library-lib.lists.foldl) or [`builtins.foldl'`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-foldl') instead.
- [`lib.attrsets.foldlAttrs`](https://nixos.org/manual/nixpkgs/stable#function-library-lib.attrsets.foldlAttrs) now always evaluates the initial accumulator argument first.
- `rome` was removed because it is no longer maintained and is succeeded by `biome`.
- The `prometheus-knot-exporter` was migrated to a version maintained by CZ.NIC. Various metric names have changed, so checking existing rules is recommended.
@ -631,3 +626,101 @@ The module update takes care of the new config syntax and the data itself (user
- Docker now defaults to 24, as 20.10 is stopping to receive security updates and bug fixes after [December 10, 2023](https://github.com/moby/moby/discussions/45104).
- There is a new NixOS option when writing NixOS tests `testing.initrdBackdoor`, that enables `backdoor.service` in initrd. Requires `boot.initrd.systemd.enable` to be enabled. Boot will pause in stage 1 at `initrd.target`, and will listen for commands from the `Machine` python interface, just like stage 2 normally does. This enables commands to be sent to test and debug stage 1. Use `machine.switch_root()` to leave stage 1 and proceed to stage 2.
## Nixpkgs library changes {#sec-release-23.11-lib}
### Breaking changes {#sec-release-23.11-lib-breaking}
- [`lib.lists.foldl'`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.lists.foldl-prime)
now always evaluates the initial accumulator argument first.
If you depend on the lazier behavior, consider using [`lib.lists.foldl`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.lists.foldl)
or [`builtins.foldl'`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-foldl') instead.
- [`lib.attrsets.foldlAttrs`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.attrsets.foldlAttrs)
now always evaluates the initial accumulator argument first.
- Now that the internal NixOS transition to Markdown documentation is complete,
`lib.options.literalDocBook` has been removed after deprecation in 22.11.
- `lib.types.string` is now fully deprecated and gives a warning when used.
### Additions and improvements {#sec-release-23.11-lib-additions-improvements}
- [`lib.fileset`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-fileset):
A new sub-library to select local files to use for sources,
designed to be easy and safe to use.
This aims to be a replacement for `lib.sources`-based filtering.
To learn more about it, see [the tutorial](https://nix.dev/tutorials/file-sets).
- [`lib.gvariant`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-gvariant):
A partial and basic implementation of GVariant formatted strings.
See [GVariant Format Strings](https://docs.gtk.org/glib/gvariant-format-strings.html) for details.
:::{.warning}
This API is not considered fully stable and it might therefore
change in backwards incompatible ways without prior notice.
:::
- [`lib.asserts`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-asserts): New function:
[`assertEachOneOf`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.asserts.assertEachOneOf).
- [`lib.attrsets`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-attrsets): New function:
[`attrsToList`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.attrsets.attrsToList).
- [`lib.customisation`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-customisation): New function:
[`makeScopeWithSplicing'`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.customisation.makeScopeWithSplicing-prime).
- [`lib.fixedPoints`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-fixedPoints): Documentation improvements for
[`lib.fixedPoints.fix`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.fixedPoints.fix).
- `lib.generators`: New functions:
[`mkDconfKeyValue`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.generators.mkDconfKeyValue),
[`toDconfINI`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.generators.toDconfINI).
`lib.generators.toKeyValue` now supports the `indent` attribute in its first argument.
- [`lib.lists`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-lists): New functions:
[`findFirstIndex`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.lists.findFirstIndex),
[`hasPrefix`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.lists.hasPrefix),
[`removePrefix`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.lists.removePrefix),
[`commonPrefix`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.lists.commonPrefix),
[`allUnique`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.lists.allUnique).
Documentation improvements for
[`lib.lists.foldl'`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.lists.foldl-prime).
- [`lib.meta`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-meta): Documentation of functions now gets rendered
- [`lib.path`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-path): New functions:
[`hasPrefix`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.path.hasPrefix),
[`removePrefix`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.path.removePrefix),
[`splitRoot`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.path.splitRoot),
[`subpath.components`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.path.subpath.components).
- [`lib.strings`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-strings): New functions:
[`replicate`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.strings.replicate),
[`cmakeOptionType`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.strings.cmakeOptionType),
[`cmakeBool`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.strings.cmakeBool),
[`cmakeFeature`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.strings.cmakeFeature).
- [`lib.trivial`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-trivial): New function:
[`mirrorFunctionArgs`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.trivial.mirrorFunctionArgs).
- `lib.systems`: New function:
[`equals`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.systems.equals).
- [`lib.options`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-options): Improved documentation for
[`mkPackageOption`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.options.mkPackageOption).
[`mkPackageOption`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.options.mkPackageOption).
now also supports the `pkgsText` attribute.
Module system:
- Options in the `options` module argument now have the `declarationPositions` attribute
containing the position where the option was declared:
```
$ nix repl -f '<nixpkgs/nixos>'
[...]
nix-repl> :p options.environment.systemPackages.declarationPositions
[ {
column = 7;
file = "/nix/store/vm9zf9wvfd628cchj0hdij1g4hzjrcz9-source/nixos/modules/config/system-path.nix";
line = 62;
} ]
```
Not to be confused with `definitionsWithLocations`, which is the same but for option _definitions_.
- Improved error message for option declarations missing `mkOption`
### Deprecations {#sec-release-23.11-lib-deprecations}
- `lib.meta.getExe pkg` (also available as `lib.getExe`) now gives a warning if `pkg.meta.mainProgram` is not set,
but it continues to default to the derivation name.
Nixpkgs accepts PRs that set `meta.mainProgram` on packages where it makes sense.
Use `lib.getExe' pkg "some-command"` to avoid the warning and/or select a different executable.

4
pkgs/applications/blockchains/besu/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "besu";
version = "23.10.0";
version = "23.10.2";
src = fetchurl {
url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-PHXzeSv9sIknBbN48Li/wU72zs8div5xHY2Gh+1mh88=";
sha256 = "sha256-JVgYpcYGejiqi1ZdjzKkmhcqdTah03BnO7t19UgmPCw=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/applications/misc/tandoor-recipes/frontend.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchYarnDeps, fixup_yarn_lock, callPackage, nodejs }:
{ stdenv, fetchYarnDeps, prefetch-yarn-deps, callPackage, nodejs }:
let
common = callPackage ./common.nix { };
in
@ -14,7 +14,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [
fixup_yarn_lock
prefetch-yarn-deps
nodejs
nodejs.pkgs.yarn
];
@ -24,7 +24,7 @@ stdenv.mkDerivation {
export HOME=$(mktemp -d)
yarn config --offline set yarn-offline-mirror "$yarnOfflineCache"
fixup_yarn_lock yarn.lock
fixup-yarn-lock yarn.lock
command -v yarn
yarn install --frozen-lockfile --offline --no-progress --non-interactive
patchShebangs node_modules/

8
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View File

@ -1,12 +1,12 @@
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
signal-desktop = {
dir = "Signal";
version = "6.39.0";
hash = "sha256-cG8ZFWpx92haTgMkpMMcFDV0OB7lmU540g9fNj4ofy8=";
version = "6.39.1";
hash = "sha256-dDbUpxXpQg1SoVyYO33Nczqf+WmWDPNE6cmw792wjGY=";
};
signal-desktop-beta = {
dir = "Signal Beta";
version = "6.40.0-beta.1";
hash = "sha256-daXh1Uh2lHw0NA/j7qhQK7nrVljbr/fP2iLjcqnuvns=";
version = "6.40.0-beta.2";
hash = "sha256-pfedkxbZ25DFgz+/N7ZEb9LwKrHuoMM+Zi+Tc21QPsg=";
};
}

5
pkgs/applications/science/logic/lean4/default.nix
View File

@ -48,6 +48,11 @@ stdenv.mkDerivation rec {
"-DUSE_GITHASH=OFF"
];
# Work around https://github.com/NixOS/nixpkgs/issues/166205.
env = lib.optionalAttrs stdenv.cc.isClang {
NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}";
};
meta = with lib; {
description = "Automatic and interactive theorem prover";
homepage = "https://leanprover.github.io/";

4
pkgs/applications/video/kodi/addons/radioparadise/default.nix
View File

@ -3,11 +3,11 @@
buildKodiAddon rec {
pname = "radioparadise";
namespace = "script.radioparadise";
version = "1.0.5";
version = "2.0.0";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/nexus/script.radioparadise/script.radioparadise-${version}.zip";
sha256 = "sha256-/X/8Q741piNHue5i/kgV+UYpBECyGzkFuN+PUzdeQnA=";
sha256 = "sha256-eRCP0XMQHmyDrZ8Y6RGFfxQ1r26/bWbE/PJz4PET7D8=";
};
propagatedBuildInputs = [

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

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, lib, stdenv, cmake
, gccForLibs, preLibcCrossHeaders
, preLibcCrossHeaders
, 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
@ -20,7 +20,6 @@
let
release_version = "10.0.1";
version = release_version; # differentiating these (variables) is important for RCs
targetConfig = stdenv.targetPlatform.config;
fetch = name: sha256: fetchurl {
url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz";
@ -29,21 +28,7 @@ let
clang-tools-extra_src = fetch "clang-tools-extra" "06n1yp638rh24xdxv9v2df0qajxbjz4w59b7dd4ky36drwmpi4yh";
llvm_meta = {
license = lib.licenses.ncsa;
maintainers = lib.teams.llvm.members;
# See llvm/cmake/config-ix.cmake.
platforms =
lib.platforms.aarch64 ++
lib.platforms.arm ++
lib.platforms.mips ++
lib.platforms.power ++
lib.platforms.riscv ++
lib.platforms.s390x ++
lib.platforms.wasi ++
lib.platforms.x86;
};
inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta;
tools = lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; });

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

@ -1,5 +1,4 @@
{ lib, stdenv, llvm_meta, version, fetch, cmake, fetchpatch
, enableShared ? !stdenv.hostPlatform.isStatic
{ lib, stdenv, llvm_meta, version, fetch, cmake, enableShared ? !stdenv.hostPlatform.isStatic
}:
stdenv.mkDerivation rec {

2
pkgs/development/compilers/llvm/11/clang/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, llvm_meta, fetch, fetchpatch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3
{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3
, buildLlvmTools
, fixDarwinDylibNames
, enableManpages ? false

19
pkgs/development/compilers/llvm/11/default.nix
View File

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, lib, stdenv, cmake
, gccForLibs, preLibcCrossHeaders
, preLibcCrossHeaders
, 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
@ -22,7 +22,6 @@ let
candidate = ""; # empty or "rcN"
dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs
targetConfig = stdenv.targetPlatform.config;
fetch = name: sha256: fetchurl {
url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/${name}-${release_version}${candidate}.src.tar.xz";
@ -31,21 +30,7 @@ let
clang-tools-extra_src = fetch "clang-tools-extra" "18n1w1hkv931xzq02b34wglbv6zd6sd0r5kb8piwvag7klj7qw3n";
llvm_meta = {
license = lib.licenses.ncsa;
maintainers = lib.teams.llvm.members;
# See llvm/cmake/config-ix.cmake.
platforms =
lib.platforms.aarch64 ++
lib.platforms.arm ++
lib.platforms.mips ++
lib.platforms.power ++
lib.platforms.riscv ++
lib.platforms.s390x ++
lib.platforms.wasi ++
lib.platforms.x86;
};
inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta;
tools = lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; });

3
pkgs/development/compilers/llvm/11/libunwind/default.nix
View File

@ -1,5 +1,4 @@
{ lib, stdenv, llvm_meta, version, fetch, cmake, fetchpatch
, enableShared ? !stdenv.hostPlatform.isStatic
{ lib, stdenv, llvm_meta, version, fetch, cmake, enableShared ? !stdenv.hostPlatform.isStatic
}:
stdenv.mkDerivation rec {

19
pkgs/development/compilers/llvm/12/default.nix
View File

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, lib, stdenv, cmake
, gccForLibs, preLibcCrossHeaders
, preLibcCrossHeaders
, 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
@ -23,7 +23,6 @@ let
candidate = ""; # empty or "rcN"
dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
version = "${release_version}${dash-candidate}"; # differentiating these (variables) is important for RCs
targetConfig = stdenv.targetPlatform.config;
fetch = name: sha256: fetchurl {
url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/${name}-${release_version}${candidate}.src.tar.xz";
@ -32,21 +31,7 @@ let
clang-tools-extra_src = fetch "clang-tools-extra" "1r9a4fdz9ci58b5z2inwvm4z4cdp6scrivnaw05dggkxz7yrwrb5";
llvm_meta = {
license = lib.licenses.ncsa;
maintainers = lib.teams.llvm.members;
# See llvm/cmake/config-ix.cmake.
platforms =
lib.platforms.aarch64 ++
lib.platforms.arm ++
lib.platforms.mips ++
lib.platforms.power ++
lib.platforms.riscv ++
lib.platforms.s390x ++
lib.platforms.wasi ++
lib.platforms.x86;
};
inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta;
tools = lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; });

72
pkgs/development/compilers/llvm/13/default.nix
View File

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, lib, stdenv, cmake
, gccForLibs, preLibcCrossHeaders
, preLibcCrossHeaders
, 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
@ -16,39 +16,51 @@
then null
else pkgs.bintools
, darwin
# LLVM release information; specify one of these but not both:
, gitRelease ? null
# i.e.:
# {
# version = /* i.e. "15.0.0" */;
# rev = /* commit SHA */;
# rev-version = /* human readable version; i.e. "unstable-2022-26-07" */;
# sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */;
# }
, officialRelease ? { version = "13.0.1"; sha256 = "06dv6h5dmvzdxbif2s8njki6h32796v368dyb5945x8gjj72xh7k"; }
# i.e.:
# {
# version = /* i.e. "15.0.0" */;
# candidate = /* optional; if specified, should be: "rcN" */
# sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */;
# }
# By default, we'll try to fetch a release from `github:llvm/llvm-project`
# corresponding to the `gitRelease` or `officialRelease` specified.
#
# You can provide your own LLVM source by specifying this arg but then it's up
# to you to make sure that the LLVM repo given matches the release configuration
# specified.
, monorepoSrc ? null
}:
assert let
int = a: if a then 1 else 0;
xor = a: b: ((builtins.bitXor (int a) (int b)) == 1);
in
lib.assertMsg
(xor
(gitRelease != null)
(officialRelease != null))
("must specify `gitRelease` or `officialRelease`" +
(lib.optionalString (gitRelease != null) " — not both"));
let
release_version = "13.0.1";
candidate = ""; # empty or "rcN"
dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
rev = ""; # When using a Git commit
rev-version = ""; # When using a Git commit
version = if rev != "" then rev-version else "${release_version}${dash-candidate}";
targetConfig = stdenv.targetPlatform.config;
monorepoSrc' = monorepoSrc;
in let
# Import releaseInfo separately to avoid infinite recursion
inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo;
inherit (releaseInfo) release_version version;
inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc;
src = fetchFromGitHub {
owner = "llvm";
repo = "llvm-project";
rev = if rev != "" then rev else "llvmorg-${version}";
sha256 = "06dv6h5dmvzdxbif2s8njki6h32796v368dyb5945x8gjj72xh7k";
};
llvm_meta = {
license = lib.licenses.ncsa;
maintainers = lib.teams.llvm.members;
# See llvm/cmake/config-ix.cmake.
platforms =
lib.platforms.aarch64 ++
lib.platforms.arm ++
lib.platforms.mips ++
lib.platforms.power ++
lib.platforms.riscv ++
lib.platforms.s390x ++
lib.platforms.wasi ++
lib.platforms.x86;
};
src = monorepoSrc;
tools = lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version src buildLlvmTools; });

72
pkgs/development/compilers/llvm/14/default.nix
View File

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, lib, stdenv, cmake
, gccForLibs, preLibcCrossHeaders
, preLibcCrossHeaders
, libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross
@ -16,40 +16,48 @@
then null
else pkgs.bintools
, darwin
# LLVM release information; specify one of these but not both:
, gitRelease ? null
# i.e.:
# {
# version = /* i.e. "15.0.0" */;
# rev = /* commit SHA */;
# rev-version = /* human readable version; i.e. "unstable-2022-26-07" */;
# sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */;
# }
, officialRelease ? { version = "14.0.6"; sha256 = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE="; }
# i.e.:
# {
# version = /* i.e. "15.0.0" */;
# candidate = /* optional; if specified, should be: "rcN" */
# sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */;
# }
# By default, we'll try to fetch a release from `github:llvm/llvm-project`
# corresponding to the `gitRelease` or `officialRelease` specified.
#
# You can provide your own LLVM source by specifying this arg but then it's up
# to you to make sure that the LLVM repo given matches the release configuration
# specified.
, monorepoSrc ? null
}:
assert let
int = a: if a then 1 else 0;
xor = a: b: ((builtins.bitXor (int a) (int b)) == 1);
in
lib.assertMsg
(xor
(gitRelease != null)
(officialRelease != null))
("must specify `gitRelease` or `officialRelease`" +
(lib.optionalString (gitRelease != null) " — not both"));
let
release_version = "14.0.6";
candidate = ""; # empty or "rcN"
dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
rev = ""; # When using a Git commit
rev-version = ""; # When using a Git commit
version = if rev != "" then rev-version else "${release_version}${dash-candidate}";
targetConfig = stdenv.targetPlatform.config;
monorepoSrc = fetchFromGitHub {
owner = "llvm";
repo = "llvm-project";
rev = if rev != "" then rev else "llvmorg-${version}";
sha256 = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE=";
};
llvm_meta = {
license = lib.licenses.ncsa;
maintainers = lib.teams.llvm.members;
# See llvm/cmake/config-ix.cmake.
platforms =
lib.platforms.aarch64 ++
lib.platforms.arm ++
lib.platforms.m68k ++
lib.platforms.mips ++
lib.platforms.power ++
lib.platforms.riscv ++
lib.platforms.s390x ++
lib.platforms.wasi ++
lib.platforms.x86;
};
monorepoSrc' = monorepoSrc;
in let
# Import releaseInfo separately to avoid infinite recursion
inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo;
inherit (releaseInfo) release_version version;
inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc;
tools = lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 release_version version monorepoSrc buildLlvmTools; });

2
pkgs/development/compilers/llvm/14/llvm/default.nix
View File

@ -25,7 +25,7 @@
# broken for the armv7l builder
, enablePFM ? stdenv.isLinux && !stdenv.hostPlatform.isAarch
, enablePolly ? true
} @args:
}:
let
inherit (lib) optional optionals optionalString;

2
pkgs/development/compilers/llvm/15/compiler-rt/default.nix
View File

@ -9,7 +9,7 @@ let
useLLVM = stdenv.hostPlatform.useLLVM or false;
bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none";
haveLibc = stdenv.cc.libc != null;
inherit (stdenv.hostPlatform) isMusl isGnu;
inherit (stdenv.hostPlatform) isMusl;
baseName = "compiler-rt";

51
pkgs/development/compilers/llvm/15/default.nix
View File

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, lib, stdenv, stdenvNoCC, cmake, ninja
, gccForLibs, preLibcCrossHeaders
{ lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja
, preLibcCrossHeaders
, libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross
@ -54,51 +54,10 @@ in
let
monorepoSrc' = monorepoSrc;
in let
releaseInfo = if gitRelease != null then rec {
original = gitRelease;
release_version = original.version;
version = gitRelease.rev-version;
} else rec {
original = officialRelease;
release_version = original.version;
version = if original ? candidate then
"${release_version}-${original.candidate}"
else
release_version;
};
monorepoSrc = if monorepoSrc' != null then
monorepoSrc'
else let
sha256 = releaseInfo.original.sha256;
rev = if gitRelease != null then
gitRelease.rev
else
"llvmorg-${releaseInfo.version}";
in fetchFromGitHub {
owner = "llvm";
repo = "llvm-project";
inherit rev sha256;
};
# Import releaseInfo separately to avoid infinite recursion
inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo;
inherit (releaseInfo) release_version version;
llvm_meta = {
license = lib.licenses.ncsa;
maintainers = lib.teams.llvm.members;
# See llvm/cmake/config-ix.cmake.
platforms =
lib.platforms.aarch64 ++
lib.platforms.arm ++
lib.platforms.m68k ++
lib.platforms.mips ++
lib.platforms.power ++
lib.platforms.riscv ++
lib.platforms.s390x ++
lib.platforms.wasi ++
lib.platforms.x86;
};
inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc;
tools = lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; });

2
pkgs/development/compilers/llvm/15/llvm/default.nix
View File

@ -30,7 +30,7 @@
# broken for the armv7l builder
&& !stdenv.hostPlatform.isAarch
, enablePolly ? true
} @args:
}:
let
inherit (lib) optional optionals optionalString;

2
pkgs/development/compilers/llvm/16/clang/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, llvm_meta
, monorepoSrc, runCommand
, substituteAll, cmake, ninja, libxml2, libllvm, version, python3
, cmake, ninja, libxml2, libllvm, version, python3
, buildLlvmTools
, fixDarwinDylibNames
, enableManpages ? false

2
pkgs/development/compilers/llvm/16/compiler-rt/default.nix
View File

@ -10,7 +10,7 @@ let
bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none";
haveLibc = stdenv.cc.libc != null;
isDarwinStatic = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic;
inherit (stdenv.hostPlatform) isMusl isGnu;
inherit (stdenv.hostPlatform) isMusl;
baseName = "compiler-rt";

51
pkgs/development/compilers/llvm/16/default.nix
View File

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, lib, stdenv, stdenvNoCC, cmake, ninja
, gccForLibs, preLibcCrossHeaders
{ lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja
, preLibcCrossHeaders
, libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross
@ -54,51 +54,10 @@ in
let
monorepoSrc' = monorepoSrc;
in let
releaseInfo = if gitRelease != null then rec {
original = gitRelease;
release_version = original.version;
version = gitRelease.rev-version;
} else rec {
original = officialRelease;
release_version = original.version;
version = if original ? candidate then
"${release_version}-${original.candidate}"
else
release_version;
};
monorepoSrc = if monorepoSrc' != null then
monorepoSrc'
else let
sha256 = releaseInfo.original.sha256;
rev = if gitRelease != null then
gitRelease.rev
else
"llvmorg-${releaseInfo.version}";
in fetchFromGitHub {
owner = "llvm";
repo = "llvm-project";
inherit rev sha256;
};
# Import releaseInfo separately to avoid infinite recursion
inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo;
inherit (releaseInfo) release_version version;
llvm_meta = {
license = lib.licenses.ncsa;
maintainers = lib.teams.llvm.members;
# See llvm/cmake/config-ix.cmake.
platforms =
lib.platforms.aarch64 ++
lib.platforms.arm ++
lib.platforms.m68k ++
lib.platforms.mips ++
lib.platforms.power ++
lib.platforms.riscv ++
lib.platforms.s390x ++
lib.platforms.wasi ++
lib.platforms.x86;
};
inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc;
tools = lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; });

2
pkgs/development/compilers/llvm/16/libclc/default.nix
View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
'find_program( LLVM_SPIRV llvm-spirv PATHS "${buildPackages.spirv-llvm-translator}/bin" NO_DEFAULT_PATH )'
'' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
substituteInPlace CMakeLists.txt \
--replace 'COMMAND prepare_builtins' 'COMMAND ${buildPackages.libclc.dev}/bin/prepare_builtins'
--replace 'COMMAND prepare_builtins' 'COMMAND ${buildLlvmTools.libclc.dev}/bin/prepare_builtins'
'';
nativeBuildInputs = [ cmake ninja python3 ];

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

@ -2,7 +2,6 @@
, pkgsBuildBuild
, monorepoSrc
, runCommand
, fetchpatch
, cmake
, darwin
, ninja
@ -31,7 +30,7 @@
# broken for the armv7l builder
&& !stdenv.hostPlatform.isAarch
, enablePolly ? true
} @args:
}:
let
inherit (lib) optional optionals optionalString;

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

@ -1,5 +1,4 @@
{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith
{ lowPrio, newScope, pkgs, lib, stdenv, cmake, 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
@ -8,7 +7,6 @@
let
release_version = "6.0.1";
version = release_version; # differentiating these is important for rc's
targetConfig = stdenv.targetPlatform.config;
fetch = name: sha256: fetchurl {
url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz";
@ -17,20 +15,7 @@ let
clang-tools-extra_src = fetch "clang-tools-extra" "1w8ml7fyn4vyxmy59n2qm4r1k1kgwgwkaldp6m45fdv4g0kkfbhd";
llvm_meta = {
license = lib.licenses.ncsa;
maintainers = lib.teams.llvm.members;
# See llvm/cmake/config-ix.cmake.
platforms =
lib.platforms.aarch64 ++
lib.platforms.arm ++
lib.platforms.mips ++
lib.platforms.power ++
lib.platforms.s390x ++
lib.platforms.wasi ++
lib.platforms.x86;
};
inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta;
tools = lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; });

19
pkgs/development/compilers/llvm/7/default.nix
View File

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, lib, stdenv, cmake
, gccForLibs, preLibcCrossHeaders
, preLibcCrossHeaders
, 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
@ -20,7 +20,6 @@
let
release_version = "7.1.0";
version = release_version; # differentiating these is important for rc's
targetConfig = stdenv.targetPlatform.config;
fetch = name: sha256: fetchurl {
url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz";
@ -29,21 +28,7 @@ let
clang-tools-extra_src = fetch "clang-tools-extra" "0lb4kdh7j2fhfz8kd6iv5df7m3pikiryk1vvwsf87spc90n09q0w";
llvm_meta = {
license = lib.licenses.ncsa;
maintainers = lib.teams.llvm.members;
# See llvm/cmake/config-ix.cmake.
platforms =
lib.platforms.aarch64 ++
lib.platforms.arm ++
lib.platforms.mips ++
lib.platforms.power ++
lib.platforms.riscv ++
lib.platforms.s390x ++
lib.platforms.wasi ++
lib.platforms.x86;
};
inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta;
tools = lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; });

19
pkgs/development/compilers/llvm/8/default.nix
View File

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, lib, stdenv, cmake
, gccForLibs, preLibcCrossHeaders
, preLibcCrossHeaders
, 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
@ -20,7 +20,6 @@
let
release_version = "8.0.1";
version = release_version; # differentiating these is important for rc's
targetConfig = stdenv.targetPlatform.config;
fetch = name: sha256: fetchurl {
url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz";
@ -29,21 +28,7 @@ let
clang-tools-extra_src = fetch "clang-tools-extra" "1qf3097bc5ia8p6cpmbx985rjr3yaah5s8fc0nv7pw742yv7jw8q";
llvm_meta = {
license = lib.licenses.ncsa;
maintainers = lib.teams.llvm.members;
# See llvm/cmake/config-ix.cmake.
platforms =
lib.platforms.aarch64 ++
lib.platforms.arm ++
lib.platforms.mips ++
lib.platforms.power ++
lib.platforms.riscv ++
lib.platforms.s390x ++
lib.platforms.wasi ++
lib.platforms.x86;
};
inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta;
tools = lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; });

19
pkgs/development/compilers/llvm/9/default.nix
View File

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, lib, stdenv, cmake
, gccForLibs, preLibcCrossHeaders
, preLibcCrossHeaders
, 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
@ -20,7 +20,6 @@
let
release_version = "9.0.1";
version = release_version; # differentiating these is important for rc's
targetConfig = stdenv.targetPlatform.config;
fetch = name: sha256: fetchurl {
url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz";
@ -29,21 +28,7 @@ let
clang-tools-extra_src = fetch "clang-tools-extra" "01vgzd4k1q93nfs8gyl83mjlc4x0qsgfqw32lacbjzdxg0mdfvxj";
llvm_meta = {
license = lib.licenses.ncsa;
maintainers = lib.teams.llvm.members;
# See llvm/cmake/config-ix.cmake.
platforms =
lib.platforms.aarch64 ++
lib.platforms.arm ++
lib.platforms.mips ++
lib.platforms.power ++
lib.platforms.riscv ++
lib.platforms.s390x ++
lib.platforms.wasi ++
lib.platforms.x86;
};
inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta;
tools = lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; });

3
pkgs/development/compilers/llvm/9/libunwind/default.nix
View File

@ -1,5 +1,4 @@
{ lib, stdenv, llvm_meta, version, fetch, cmake, fetchpatch
, enableShared ? !stdenv.hostPlatform.isStatic
{ lib, stdenv, llvm_meta, version, fetch, cmake, enableShared ? !stdenv.hostPlatform.isStatic
}:
stdenv.mkDerivation rec {

60
pkgs/development/compilers/llvm/common/common-let.nix Normal file
View File

@ -0,0 +1,60 @@
{ lib
, fetchFromGitHub ? null
, release_version ? null
, gitRelease ? null
, officialRelease ? null
, monorepoSrc' ? null
}:
rec {
llvm_meta = {
license = lib.licenses.ncsa;
maintainers = lib.teams.llvm.members;
# See llvm/cmake/config-ix.cmake.
platforms =
lib.platforms.aarch64 ++
lib.platforms.arm ++
lib.platforms.mips ++
lib.platforms.power ++
lib.platforms.s390x ++
lib.platforms.wasi ++
lib.platforms.x86 ++
lib.optionals (lib.versionAtLeast release_version "7") lib.platforms.riscv ++
lib.optionals (lib.versionAtLeast release_version "14") lib.platforms.m68k;
};
releaseInfo =
if gitRelease != null then rec {
original = gitRelease;
release_version = original.version;
version = gitRelease.rev-version;
} else rec {
original = officialRelease;
release_version = original.version;
version =
if original ? candidate then
"${release_version}-${original.candidate}"
else
release_version;
};
monorepoSrc =
if monorepoSrc' != null then
monorepoSrc'
else
let
sha256 = releaseInfo.original.sha256;
rev =
if gitRelease != null then
gitRelease.rev
else
"llvmorg-${releaseInfo.version}";
in
fetchFromGitHub {
owner = "llvm";
repo = "llvm-project";
inherit rev sha256;
};
}

49
pkgs/development/compilers/llvm/git/default.nix
View File

@ -1,5 +1,5 @@
{ lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja
, gccForLibs, preLibcCrossHeaders
, preLibcCrossHeaders
, libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith
, buildLlvmTools # tools, but from the previous stage, for cross
, targetLlvmLibraries # libraries, but from the next stage, for cross
@ -53,51 +53,10 @@ in
let
monorepoSrc' = monorepoSrc;
in let
releaseInfo = if gitRelease != null then rec {
original = gitRelease;
release_version = original.version;
version = gitRelease.rev-version;
} else rec {
original = officialRelease;
release_version = original.version;
version = if original ? candidate then
"${release_version}-${original.candidate}"
else
release_version;
};
monorepoSrc = if monorepoSrc' != null then
monorepoSrc'
else let
sha256 = releaseInfo.original.sha256;
rev = if gitRelease != null then
gitRelease.rev
else
"llvmorg-${releaseInfo.version}";
in fetchFromGitHub {
owner = "llvm";
repo = "llvm-project";
inherit rev sha256;
};
# Import releaseInfo separately to avoid infinite recursion
inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo;
inherit (releaseInfo) release_version version;
llvm_meta = {
license = lib.licenses.ncsa;
maintainers = lib.teams.llvm.members;
# See llvm/cmake/config-ix.cmake.
platforms =
lib.platforms.aarch64 ++
lib.platforms.arm ++
lib.platforms.m68k ++
lib.platforms.mips ++
lib.platforms.power ++
lib.platforms.riscv ++
lib.platforms.s390x ++
lib.platforms.wasi ++
lib.platforms.x86;
};
inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc;
tools = lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; });

2
pkgs/development/compilers/llvm/git/llvm/default.nix
View File

@ -29,7 +29,7 @@
# broken for the armv7l builder
&& !stdenv.hostPlatform.isAarch
, enablePolly ? true
} @args:
}:
let
inherit (lib) optional optionals optionalString;

15
pkgs/development/interpreters/lua-5/build-luarocks-package.nix
View File

@ -3,6 +3,7 @@
, lua
, wrapLua
, luarocks
, writeTextFile
# Whether the derivation provides a lua module or not.
, luarocksCheckHook
@ -83,7 +84,7 @@ let
__structuredAttrs = true;
env = {
LUAROCKS_CONFIG="$PWD/${luarocks_config}";
LUAROCKS_CONFIG = self.configFile;
} // attrs.env or {};
generatedRockspecFilename = "${rockspecDir}/${pname}-${rockspecVersion}.rockspec";
@ -111,6 +112,12 @@ let
# explicitly inherit this for it to be available as a shell variable in the
# builder
rocksSubdir = "${self.pname}-${self.version}-rocks";
configFile = writeTextFile {
name = pname + "-luarocks-config.lua";
text = self.luarocks_content;
};
luarocks_content = let
externalDepsGenerated = lib.filter (drv: !drv ? luaModule)
(self.nativeBuildInputs ++ self.propagatedBuildInputs ++ self.buildInputs);
@ -131,12 +138,6 @@ let
configurePhase = ''
runHook preConfigure
cat > ${luarocks_config} <<EOF
${self.luarocks_content}
EOF
export LUAROCKS_CONFIG="$PWD/${luarocks_config}";
cat "$LUAROCKS_CONFIG"
''
+ lib.optionalString (self.rockspecFilename == null) ''
rockspecFilename="${self.generatedRockspecFilename}"

4
pkgs/development/interpreters/php/8.1.nix
View File

@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "8.1.25";
hash = "sha256-qGqIwYQMG8gyvP0vvsO4oZQsgxTaXf9T8J+cmNDBLoo=";
version = "8.1.26";
hash = "sha256-g73iSchKoaBDqMjQ7qCTRcLK5puXhM3wIin8kW+7nqA=";
});
in

4
pkgs/development/interpreters/php/8.2.nix
View File

@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "8.2.12";
hash = "sha256-cEMl9WsbTBf5+VHh/+9cZOFIiWBT804mJhUsuqLwWJM=";
version = "8.2.13";
hash = "sha256-ZlKfQ7ITEx5rJTxWAr7wXwSUWNISknMPzNY7SKBtZ7o=";
});
in

11
pkgs/development/interpreters/php/8.3.nix
View File

@ -1,13 +1,10 @@
{ callPackage, fetchurl, ... }@_args:
let
base = (callPackage ./generic.nix (_args // {
version = "8.3.0RC6";
phpSrc = fetchurl {
url = "https://downloads.php.net/~eric/php-8.3.0RC6.tar.xz";
hash = "sha256-Hntdz+vEkh7EQgnB4IrnG2sQ5bG2uJW7T3a0RIbHBe0=";
};
}));
base = callPackage ./generic.nix (_args // {
version = "8.3.0";
hash = "sha256-3mfQgz1CsZblpm+hozL0Xilsvo6UcuklayoHHDTcXtY=";
});
in
base.withExtensions ({ all, ... }: with all; ([
bcmath

4
pkgs/development/libraries/gvm-libs/default.nix
View File

@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "gvm-libs";
version = "22.7.2";
version = "22.7.3";
src = fetchFromGitHub {
owner = "greenbone";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-vcCugIohuZg+GhUA7ZgkyhMxN0KSvCFVO/HLOnrNxxA=";
hash = "sha256-Vo+lFUGLeGPKq3aUCiiBcBYu6BZ4KQI5vCtnQyRUUiU=";
};
nativeBuildInputs = [

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

@ -1,4 +1,5 @@
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, future
@ -11,7 +12,6 @@
, pytestCheckHook
, pythonOlder
, setuptools
, stdenv
, typing-extensions
, wrapt
, uptime
@ -19,8 +19,8 @@
buildPythonPackage rec {
pname = "can";
version = "4.2.2";
format = "setuptools";
version = "4.3.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "hardbyte";
repo = "python-can";
rev = "refs/tags/v${version}";
hash = "sha256-MyVGjAy13Ne0PkVufB0JDNEZHhVBzeUYWWlH72ib/pI=";
hash = "sha256-JsYAh5Z6RIX6aWpSuW+VIzJRPf5MfNbBGg36v3CQiLU=";
};
postPatch = ''
@ -36,10 +36,13 @@ buildPythonPackage rec {
--replace " --cov=can --cov-config=tox.ini --cov-report=lcov --cov-report=term" ""
'';
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
msgpack
packaging
setuptools
typing-extensions
wrapt
];

17
pkgs/development/python-modules/mdformat-mkdocs/default.nix
View File

@ -6,20 +6,21 @@
, mdformat-gfm
, mdit-py-plugins
, pythonOlder
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "mdformat-mkdocs";
version = "1.0.6";
format = "pyproject";
version = "1.1.0";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "KyleKing";
repo = pname;
repo = "mdformat-mkdocs";
rev = "refs/tags/v${version}";
hash = "sha256-l4B/DR0pKZG62+sBG+fiux/XeF3ewxb2TYa+Zs1O3kU=";
hash = "sha256-5MCsXCkYnoLEZZoj9WrO/Z3VzTKagoOrMCuTpA4dGAQ=";
};
nativeBuildInputs = [
@ -32,6 +33,10 @@ buildPythonPackage rec {
mdit-py-plugins
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"mdformat_mkdocs"
];
@ -39,7 +44,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "mdformat plugin for MkDocs";
homepage = "https://github.com/KyleKing/mdformat-mkdocs";
changelog = "https://github.com/KyleKing/mdformat-mkdocs/releases/tag/v${version}";
changelog = "https://github.com/KyleKing/mdformat-mkdocs/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ aldoborrero ];
};

4
pkgs/development/tools/misc/global/default.nix
View File

@ -6,11 +6,11 @@ let
pygments = python3Packages.pygments;
in stdenv.mkDerivation rec {
pname = "global";
version = "6.6.10";
version = "6.6.11";
src = fetchurl {
url = "mirror://gnu/global/${pname}-${version}.tar.gz";
hash = "sha256-LdHmqUXpPAE5D7lBpOaU9McbvXVp1kFJwE6Se79NzOg=";
hash = "sha256-BTMxn3jThguBZo366qUHkBVB5d2oz8MNUt/GzpSJ9eM=";
};
nativeBuildInputs = [ libtool makeWrapper ];

4
pkgs/development/tools/parsing/javacc/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "javacc";
version = "7.0.12";
version = "7.0.13";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "${pname}-${version}";
sha256 = "sha256-tDtstF3ivKjG01vOZ8Ga1zTjIZFSTWt5QPY1VQvyFMU=";
sha256 = "sha256-nDJvKIbJc23Tvfn7Zqvt5tDDffNf4KQ0juGQQCZ+i1c=";
};
nativeBuildInputs = [ ant jdk makeWrapper ];

4
pkgs/servers/monitoring/mimir/default.nix
View File

@ -1,13 +1,13 @@
{ lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }:
buildGoModule rec {
pname = "mimir";
version = "2.10.3";
version = "2.10.4";
src = fetchFromGitHub {
rev = "${pname}-${version}";
owner = "grafana";
repo = pname;
hash = "sha256-tVJcvxKcxhSeYyqBsBeG+OrWoD+hTDAoPuIXB72MMkY=";
hash = "sha256-0OFuMWoYgo8qCxWk93wOy45diLb2JIBsoxptLKTeOC4=";
};
vendorHash = null;

4
pkgs/servers/monitoring/riemann/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "riemann";
version = "0.3.9";
version = "0.3.10";
src = fetchurl {
url = "https://github.com/riemann/riemann/releases/download/${version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-w3Uv+RMHhw1/G0wkygfLbazeinZqrbxVL4NFmy1/RgQ=";
sha256 = "sha256-dkIdx+9Rq3paDGHKuwO6RsrQ1u2mvRnncEyOIHqOBRM=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/servers/teleport/generic.nix
View File

@ -14,7 +14,7 @@
, stdenv
, xdg-utils
, yarn
, yarn2nix-moretea
, prefetch-yarn-deps
, nixosTests
, withRdpClient ? true
@ -72,7 +72,7 @@ let
nativeBuildInputs = [
nodejs
yarn
yarn2nix-moretea.fixup_yarn_lock
prefetch-yarn-deps
];
configurePhase = ''
@ -81,7 +81,7 @@ let
buildPhase = ''
yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
fixup_yarn_lock yarn.lock
fixup-yarn-lock yarn.lock
yarn install --offline \
--frozen-lockfile \

1
pkgs/tools/X11/xidlehook/default.nix
View File

@ -44,5 +44,6 @@ rustPlatform.buildRustPackage rec {
maintainers = with maintainers; [ ];
platforms = platforms.unix;
badPlatforms = platforms.darwin;
mainProgram = "xidlehook";
};
}

4
pkgs/tools/audio/asap/default.nix
View File

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "asap";
version = "6.0.0";
version = "6.0.1";
src = fetchzip {
url = "mirror://sourceforge/project/asap/asap/${version}/asap-${version}.tar.gz";
sha256 = "sha256-j7vznFI/Yg1yuRvYDmRSyHDfDN7iFV+b6MK2jdnaz6Q=";
sha256 = "sha256-nTnnRDYOkTmXfXPS1XIHaC2LHFfZz+gVInQ3satuyDM=";
};
outputs = [ "out" "dev" ];

1
pkgs/tools/backup/awsbck/default.nix
View File

@ -30,5 +30,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/beeb/awsbck";
license = with licenses; [ mit asl20 ];
maintainers = with maintainers; [ beeb ];
mainProgram = "awsbck";
};
}

1
pkgs/tools/backup/bdsync/default.nix
View File

@ -36,5 +36,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ jluttine ];
mainProgram = "bdsync";
};
}

1
pkgs/tools/backup/conserve/default.nix
View File

@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/sourcefrog/conserve";
license = licenses.gpl2Only;
maintainers = with maintainers; [ happysalada ];
mainProgram = "conserve";
};
}

1
pkgs/tools/cd-dvd/bchunk/default.nix
View File

@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
description = "A program that converts CD images in BIN/CUE format into a set of ISO and CDR tracks";
platforms = platforms.unix;
license = licenses.gpl2;
mainProgram = "bchunk";
};
}

1
pkgs/tools/cd-dvd/bootiso/default.nix
View File

@ -56,5 +56,6 @@ stdenvNoCC.mkDerivation rec {
license = licenses.gpl3;
maintainers = with maintainers; [ muscaln ];
platforms = platforms.all;
mainProgram = "bootiso";
};
}

1
pkgs/tools/cd-dvd/brasero/default.nix
View File

@ -45,5 +45,6 @@ in stdenv.mkDerivation rec {
maintainers = [ maintainers.bdimcheff ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
mainProgram = "brasero";
};
}

1
pkgs/tools/cd-dvd/ccd2iso/default.nix
View File

@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = with maintainers; [ yana ];
platforms = platforms.unix;
mainProgram = "ccd2iso";
};
}

1
pkgs/tools/cd-dvd/cdi2iso/default.nix
View File

@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = with maintainers; [ hrdinka ];
platforms = platforms.all;
mainProgram = "cdi2iso";
};
}

1
pkgs/tools/cd-dvd/cue2pops/default.nix
View File

@ -28,5 +28,6 @@ stdenv.mkDerivation {
homepage = "https://github.com/makefu/cue2pops-linux";
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.all;
mainProgram = "cue2pops";
};
}

1
pkgs/tools/cd-dvd/dvd-vr/default.nix
View File

@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
description = "A utility to identify and optionally copy recordings from a DVD-VR format disc";
license = licenses.gpl2;
maintainers = with maintainers; [ fgaz ];
mainProgram = "dvd-vr";
};
}

1
pkgs/tools/cd-dvd/dvdisaster/default.nix
View File

@ -93,5 +93,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ ];
mainProgram = "dvdisaster";
};
}

1
pkgs/tools/cd-dvd/iat/default.nix
View File

@ -18,5 +18,6 @@ stdenv.mkDerivation (finalAttr: {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ hughobrien ];
platforms = platforms.linux;
mainProgram = "iat";
};
})

1
pkgs/tools/cd-dvd/isolyzer/default.nix
View File

@ -21,5 +21,6 @@ python3.pkgs.buildPythonApplication rec {
description = "Verify size of ISO 9660 image against Volume Descriptor fields";
license = licenses.asl20;
maintainers = with maintainers; [ mkg20001 ];
mainProgram = "isolyzer";
};
}

1
pkgs/tools/cd-dvd/lsdvd/default.nix
View File

@ -16,5 +16,6 @@ stdenv.mkDerivation rec {
description = "Display information about audio, video, and subtitle tracks on a DVD";
license = licenses.gpl2;
platforms = platforms.linux;
mainProgram = "lsdvd";
};
}

1
pkgs/tools/cd-dvd/mdf2iso/default.nix
View File

@ -16,5 +16,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = [ maintainers.oxij ];
mainProgram = "mdf2iso";
};
}

1
pkgs/tools/cd-dvd/mkcue/default.nix
View File

@ -17,5 +17,6 @@ stdenv.mkDerivation rec {
license = licenses.lgpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ pSub ];
mainProgram = "mkcue";
};
}

1
pkgs/tools/cd-dvd/nrg2iso/default.nix
View File

@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
homepage = "http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html";
license = licenses.gpl2;
platforms = platforms.all;
mainProgram = "nrg2iso";
};
}

1
pkgs/tools/cd-dvd/sacd/default.nix
View File

@ -39,5 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
license = licenses.gpl3;
maintainers = [ maintainers.doronbehar ];
platforms = [ "x86_64-linux" ];
mainProgram = "sacd";
};
})

1
pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix
View File

@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ ericdallo ];
homepage = "https://github.com/nwoltman/srt-to-vtt-cl";
platforms = platforms.unix;
mainProgram = "srt-vtt";
};
}

1
pkgs/tools/cd-dvd/uif2iso/default.nix
View File

@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
homepage = "http://aluigi.org/mytoolz.htm#uif2iso";
license = lib.licenses.gpl1Plus;
platforms = lib.platforms.linux;
mainProgram = "uif2iso";
};
}

1
pkgs/tools/cd-dvd/unetbootin/default.nix
View File

@ -80,5 +80,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ebzzry ];
platforms = platforms.linux;
mainProgram = "unetbootin";
};
}

1
pkgs/tools/cd-dvd/vobcopy/default.nix
View File

@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
maintainers = [ lib.maintainers.bluescreen303 ];
platforms = lib.platforms.all;
mainProgram = "vobcopy";
};
}

1
pkgs/tools/cd-dvd/vobsub2srt/default.nix
View File

@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.ttuegel ];
mainProgram = "vobsub2srt";
};
}

1
pkgs/tools/compression/brotli/default.nix
View File

@ -73,5 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
"libbrotlienc"
];
platforms = platforms.all;
mainProgram = "brotli";
};
})

1
pkgs/tools/compression/bsc/default.nix
View File

@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
# Later commits changed the licence to Apache2 (no release yet, though)
license = with licenses; [ lgpl3Plus ];
platforms = platforms.unix;
mainProgram = "bsc";
};
}

1
pkgs/tools/compression/crabz/default.nix
View File

@ -25,5 +25,6 @@ rustPlatform.buildRustPackage rec {
changelog = "https://github.com/sstadick/crabz/blob/v${version}/CHANGELOG.md";
license = with licenses; [ unlicense /* or */ mit ];
maintainers = with maintainers; [ figsoda ];
mainProgram = "crabz";
};
}

1
pkgs/tools/compression/dejsonlz4/default.nix
View File

@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
license = licenses.bsd2;
maintainers = with maintainers; [ mt-caret ];
platforms = platforms.all;
mainProgram = "dejsonlz4";
};
}

1
pkgs/tools/compression/dtrx/default.nix
View File

@ -51,5 +51,6 @@ python3Packages.buildPythonApplication rec {
homepage = "https://github.com/dtrx-py/dtrx";
license = licenses.gpl3Plus;
maintainers = [ ];
mainProgram = "dtrx";
};
}

1
pkgs/tools/compression/efficient-compression-tool/default.nix
View File

@ -35,5 +35,6 @@ stdenv.mkDerivation rec {
license = licenses.asl20;
maintainers = [ maintainers.lunik1 ];
platforms = platforms.linux;
mainProgram = "ect";
};
}

1
pkgs/tools/compression/flips/default.nix
View File

@ -27,5 +27,6 @@ stdenv.mkDerivation {
license = licenses.gpl3Plus;
maintainers = [ maintainers.xfix ];
platforms = platforms.linux;
mainProgram = "flips";
};
}

1
pkgs/tools/compression/hacpack/default.nix
View File

@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Only;
maintainers = [ maintainers.ivar ];
platforms = platforms.linux;
mainProgram = "hacpack";
};
}

1
pkgs/tools/compression/hactool/default.nix
View File

@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
license = licenses.isc;
maintainers = with maintainers; [ ivar ];
platforms = platforms.unix;
mainProgram = "hactool";
};
}

1
pkgs/tools/compression/heatshrink/default.nix
View File

@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
license = licenses.isc;
maintainers = with maintainers; [ fgaz ];
platforms = platforms.all;
mainProgram = "heatshrink";
};
}

1
pkgs/tools/compression/imagelol/default.nix
View File

@ -54,5 +54,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = [ maintainers.ivar ];
platforms = platforms.unix;
mainProgram = "ImageLOL";
};
}

1
pkgs/tools/compression/lzbench/default.nix
View File

@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
description = "In-memory benchmark of open-source LZ77/LZSS/LZMA compressors";
license = licenses.free;
platforms = platforms.all;
mainProgram = "lzbench";
};
}

1
pkgs/tools/compression/lzfse/default.nix
View File

@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
license = licenses.bsd3;
maintainers = with maintainers; [ ];
mainProgram = "lzfse";
};
}

1
pkgs/tools/compression/lzip/default.nix
View File

@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2Plus;
maintainers = with maintainers; [ vlaci ];
platforms = lib.platforms.all;
mainProgram = "lzip";
};
}

1
pkgs/tools/compression/lziprecover/default.nix
View File

@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2Plus;
maintainers = with maintainers; [ vlaci ];
platforms = lib.platforms.all;
mainProgram = "lziprecover";
};
}

1
pkgs/tools/compression/lzop/default.nix
View File

@ -17,5 +17,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ ];
license = licenses.gpl2;
platforms = platforms.unix;
mainProgram = "lzop";
};
}

1
pkgs/tools/compression/mozlz4a/default.nix
View File

@ -34,5 +34,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ kira-bruneau pshirshov raskin ];
platforms = python3.meta.platforms;
homepage = "https://gist.github.com/Tblue/62ff47bef7f894e92ed5";
mainProgram = "mozlz4a";
};
}

1
pkgs/tools/compression/nx2elf/default.nix
View File

@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
license = licenses.unfree; # No license specified upstream
platforms = [ "x86_64-linux" ]; # Should work on Darwin as well, but this is untested. aarch64-linux fails.
maintainers = [ maintainers.ivar ];
mainProgram = "nx2elf";
};
}

1
pkgs/tools/compression/offzip/default.nix
View File

@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2Plus;
maintainers = with maintainers; [ r-burns ];
platforms = platforms.unix;
mainProgram = "offzip";
};
}

1
pkgs/tools/compression/orz/default.nix
View File

@ -35,5 +35,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/richox/orz";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
mainProgram = "orz";
};
}

1
pkgs/tools/compression/ouch/default.nix
View File

@ -41,5 +41,6 @@ rustPlatform.buildRustPackage rec {
changelog = "https://github.com/ouch-org/ouch/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ figsoda psibi ];
mainProgram = "ouch";
};
}

1
pkgs/tools/compression/pbzx/default.nix
View File

@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
license = licenses.gpl3;
maintainers = [ maintainers.matthewbauer ];
mainProgram = "pbzx";
};
}

1
pkgs/tools/compression/pixz/default.nix
View File

@ -47,5 +47,6 @@ stdenv.mkDerivation rec {
license = licenses.bsd2;
maintainers = [ maintainers.raskin ];
platforms = platforms.unix;
mainProgram = "pixz";
};
}

1
pkgs/tools/compression/plzip/default.nix
View File

@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
platforms = platforms.all;
maintainers = with maintainers; [ _360ied ];
mainProgram = "plzip";
};
}

1
pkgs/tools/compression/rzip/default.nix
View File

@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ ];
license = licenses.gpl2Plus;
platforms = platforms.unix;
mainProgram = "rzip";
};
}

1
pkgs/tools/compression/unzrip/default.nix
View File

@ -31,5 +31,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/quininer/unzrip";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
mainProgram = "unzrip";
};
}

1
pkgs/tools/compression/upx/default.nix
View File

@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
description = "The Ultimate Packer for eXecutables";
license = licenses.gpl2Plus;
platforms = platforms.unix;
mainProgram = "upx";
};
}

1
pkgs/tools/compression/xar/default.nix
View File

@ -42,5 +42,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ copumpkin ];
platforms = lib.platforms.all;
mainProgram = "xar";
};
}

1
pkgs/tools/compression/zfp/default.nix
View File

@ -52,5 +52,6 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.spease ];
# 64-bit only
platforms = platforms.aarch64 ++ platforms.x86_64;
mainProgram = "zfp";
};
}

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