Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-07-23 06:01:09 +00:00 committed by GitHub
commit 5b4db4db1c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
27 changed files with 396 additions and 65 deletions

View File

@ -1764,6 +1764,7 @@ rec {
/**
Get a package output.
If no output is found, fallback to `.out` and then to the default.
The function is idempotent: `getOutput "b" (getOutput "a" p) == getOutput "a" p`.
# Inputs
@ -1779,7 +1780,7 @@ rec {
# Type
```
getOutput :: String -> Derivation -> String
getOutput :: String -> :: Derivation -> Derivation
```
# Examples
@ -1787,7 +1788,7 @@ rec {
## `lib.attrsets.getOutput` usage example
```nix
getOutput "dev" pkgs.openssl
"${getOutput "dev" pkgs.openssl}"
=> "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev"
```
@ -1798,6 +1799,49 @@ rec {
then pkg.${output} or pkg.out or pkg
else pkg;
/**
Get the first of the `outputs` provided by the package, or the default.
This function is alligned with `_overrideFirst()` from the `multiple-outputs.sh` setup hook.
Like `getOutput`, the function is idempotent.
# Inputs
`outputs`
: 1\. Function argument
`pkg`
: 2\. Function argument
# Type
```
getFirstOutput :: [String] -> Derivation -> Derivation
```
# Examples
:::{.example}
## `lib.attrsets.getFirstOutput` usage example
```nix
"${getFirstOutput [ "include" "dev" ] pkgs.openssl}"
=> "/nix/store/00000000000000000000000000000000-openssl-1.0.1r-dev"
```
:::
*/
getFirstOutput =
candidates: pkg:
let
outputs = builtins.filter (name: hasAttr name pkg) candidates;
output = builtins.head outputs;
in
if pkg.outputSpecified or false || outputs == [ ] then
pkg
else
pkg.${output};
/**
Get a package's `bin` output.
If the output does not exist, fallback to `.out` and then to the default.
@ -1811,7 +1855,7 @@ rec {
# Type
```
getBin :: Derivation -> String
getBin :: Derivation -> Derivation
```
# Examples
@ -1819,8 +1863,8 @@ rec {
## `lib.attrsets.getBin` usage example
```nix
getBin pkgs.openssl
=> "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r"
"${getBin pkgs.openssl}"
=> "/nix/store/00000000000000000000000000000000-openssl-1.0.1r"
```
:::
@ -1841,7 +1885,7 @@ rec {
# Type
```
getLib :: Derivation -> String
getLib :: Derivation -> Derivation
```
# Examples
@ -1849,7 +1893,7 @@ rec {
## `lib.attrsets.getLib` usage example
```nix
getLib pkgs.openssl
"${getLib pkgs.openssl}"
=> "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-lib"
```
@ -1857,6 +1901,35 @@ rec {
*/
getLib = getOutput "lib";
/**
Get a package's `static` output.
If the output does not exist, fallback to `.lib`, then to `.out`, and then to the default.
# Inputs
`pkg`
: The package whose `static` output will be retrieved.
# Type
```
getStatic :: Derivation -> Derivation
```
# Examples
:::{.example}
## `lib.attrsets.getStatic` usage example
```nix
"${lib.getStatic pkgs.glibc}"
=> "/nix/store/00000000000000000000000000000000-glibc-2.39-52-static"
```
:::
*/
getStatic = getFirstOutput [ "static" "lib" "out" ];
/**
Get a package's `dev` output.
@ -1871,7 +1944,7 @@ rec {
# Type
```
getDev :: Derivation -> String
getDev :: Derivation -> Derivation
```
# Examples
@ -1879,7 +1952,7 @@ rec {
## `lib.attrsets.getDev` usage example
```nix
getDev pkgs.openssl
"${getDev pkgs.openssl}"
=> "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev"
```
@ -1887,6 +1960,35 @@ rec {
*/
getDev = getOutput "dev";
/**
Get a package's `include` output.
If the output does not exist, fallback to `.dev`, then to `.out`, and then to the default.
# Inputs
`pkg`
: The package whose `include` output will be retrieved.
# Type
```
getInclude :: Derivation -> Derivation
```
# Examples
:::{.example}
## `lib.attrsets.getInclude` usage example
```nix
"${getInclude pkgs.openssl}"
=> "/nix/store/00000000000000000000000000000000-openssl-1.0.1r-dev"
```
:::
*/
getInclude = getFirstOutput [ "include" "dev" "out" ];
/**
Get a package's `man` output.
@ -1901,7 +2003,7 @@ rec {
# Type
```
getMan :: Derivation -> String
getMan :: Derivation -> Derivation
```
# Examples
@ -1909,7 +2011,7 @@ rec {
## `lib.attrsets.getMan` usage example
```nix
getMan pkgs.openssl
"${getMan pkgs.openssl}"
=> "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-man"
```
@ -1929,7 +2031,7 @@ rec {
# Type
```
chooseDevOutputs :: [Derivation] -> [String]
chooseDevOutputs :: [Derivation] -> [Derivation]
```
*/
chooseDevOutputs = builtins.map getDev;

View File

@ -86,8 +86,8 @@ let
mapAttrs' mapAttrsToList attrsToList concatMapAttrs mapAttrsRecursive
mapAttrsRecursiveCond genAttrs isDerivation toDerivation optionalAttrs
zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil
recursiveUpdate matchAttrs mergeAttrsList overrideExisting showAttrPath getOutput
getBin getLib getDev getMan chooseDevOutputs zipWithNames zip
recursiveUpdate matchAttrs mergeAttrsList overrideExisting showAttrPath getOutput getFirstOutput
getBin getLib getStatic getDev getInclude getMan chooseDevOutputs zipWithNames zip
recurseIntoAttrs dontRecurseIntoAttrs cartesianProduct cartesianProductOfSets
mapCartesianProduct updateManyAttrsByPath listToAttrs hasAttr getAttr isAttrs intersectAttrs removeAttrs;
inherit (self.lists) singleton forEach map foldr fold foldl foldl' imap0 imap1

View File

@ -14536,6 +14536,13 @@
githubId = 6391776;
name = "Nikita Voloboev";
};
niklashh = {
email = "niklas.2.halonen@aalto.fi";
github = "xhalo32";
githubId = 15152190;
keys = [ { fingerprint = "AF3B 80CD A027 245B 51FC 6D9B E83A 373D A5AF 5068"; } ];
name = "Niklas Halonen";
};
niklaskorz = {
name = "Niklas Korz";
email = "niklas@niklaskorz.de";
@ -19477,6 +19484,12 @@
githubId = 48666;
name = "Matthew \"strager\" Glazar";
};
strawbee = {
email = "henigingames@gmail.com";
github = "StillToad";
githubId = 57422776;
name = "strawbee";
};
strikerlulu = {
email = "strikerlulu7@gmail.com";
github = "strikerlulu";

View File

@ -62,7 +62,9 @@ stdenv.mkDerivation {
];
# 'g_memdup' is deprecated: Use 'g_memdup2' instead
env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"
# Suppress incompatible function pointer error in clang due to libxml2 2.12 const changes
+ lib.optionalString stdenv.cc.isClang " -Wno-error=incompatible-function-pointer-types";
meta = with lib; {
description = "Buzztrax is a modular music composer for Linux";

View File

@ -1,9 +1,10 @@
{
lib,
melpaBuild,
fetchFromGitHub,
pkg-config,
libffi,
melpaBuild,
pkg-config,
unstableGitUpdater,
}:
melpaBuild {
@ -26,7 +27,10 @@ melpaBuild {
make
'';
passthru.updateScript = unstableGitUpdater { };
meta = {
homepage = "https://github.com/skeeto/elisp-ffi";
description = "Emacs Lisp Foreign Function Interface";
longDescription = ''
This library provides an FFI for Emacs Lisp so that Emacs
@ -35,5 +39,6 @@ melpaBuild {
values on to Emacs.
'';
license = lib.licenses.unlicense;
maintainers = with lib.maintainers; [ AndersonTorres ];
};
}

View File

@ -2,6 +2,7 @@
lib,
fetchFromGitHub,
melpaBuild,
unstableGitUpdater,
}:
melpaBuild {
@ -16,9 +17,12 @@ melpaBuild {
hash = "sha256-lFmdVMXIIXZ9ZohAJw5rhxpTv017qIyzmpuKOWDdeJ4=";
};
passthru.updateScript = unstableGitUpdater { };
meta = {
homepage = "https://github.com/emacsmirror/font-lock-plus";
description = "Enhancements to standard library font-lock.el";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ AndersonTorres ];
};
}

View File

@ -2,11 +2,15 @@
lib,
melpaBuild,
fetchFromGitHub,
gitUpdater,
}:
melpaBuild rec {
pname = "rect-mark";
let
version = "1.4";
in
melpaBuild {
pname = "rect-mark";
inherit version;
src = fetchFromGitHub {
owner = "emacsmirror";
@ -15,9 +19,12 @@ melpaBuild rec {
hash = "sha256-/8T1VTYkKUxlNWXuuS54S5jpl4UxJBbgSuWc17a/VyM=";
};
passthru.updateScript = gitUpdater { };
meta = {
homepage = "http://emacswiki.org/emacs/RectangleMark";
description = "Mark a rectangle of text with highlighting";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ AndersonTorres ];
};
}

View File

@ -13,6 +13,7 @@
melpaBuild,
nav-flash,
porthole,
unstableGitUpdater,
yasnippet,
}:
@ -27,7 +28,9 @@ melpaBuild {
hash = "sha256-/MBB2R9/V0aYZp15e0vx+67ijCPp2iPlgxe262ldmtc=";
};
patches = [ ./0000-add-missing-require.patch ];
patches = [
./0000-add-missing-require.patch
];
packageRequires = [
avy
@ -44,9 +47,12 @@ melpaBuild {
yasnippet
];
passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
meta = {
homepage = "https://github.com/jcaw/voicemacs/";
description = "Set of utilities for controlling Emacs by voice";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ AndersonTorres ];
};
}

View File

@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
patchPhase = ''
substituteInPlace manuskript/ui/welcome.py \
--replace sample-projects $out/share/${pname}/sample-projects
'';
'';
buildPhase = "";
@ -44,19 +44,19 @@ python3Packages.buildPythonApplication rec {
description = "Open-source tool for writers";
homepage = "https://www.theologeek.ch/manuskript";
longDescription = ''
Manuskript is a tool for those writer who like to organize and
plan everything before writing. The snowflake method can help you
grow your idea into a book, by leading you step by step and asking
you questions to go deeper. While writing, keep track of notes
about every characters, plot, event, place in your story.
Manuskript is a tool for those writer who like to organize and
plan everything before writing. The snowflake method can help you
grow your idea into a book, by leading you step by step and asking
you questions to go deeper. While writing, keep track of notes
about every characters, plot, event, place in your story.
Develop complex characters and keep track of all useful infos.
Create intricate plots, linked to your characters, and use them to
outline your story. Organize your ideas about the world your
characters live in.
Develop complex characters and keep track of all useful infos.
Create intricate plots, linked to your characters, and use them to
outline your story. Organize your ideas about the world your
characters live in.
'';
license = lib.licenses.gpl3;
maintainers = [ ];
maintainers = with lib.maintainers; [ strawbee ];
platforms = lib.platforms.unix;
mainProgram = "manuskript";
};

View File

@ -2,12 +2,14 @@
, stdenv
, fetchurl
, wrapGAppsHook4
, buildPackages
, cargo
, desktop-file-utils
, meson
, ninja
, pkg-config
, rustc
, gettext
, gdk-pixbuf
, glib
, gtk4
@ -25,6 +27,14 @@ stdenv.mkDerivation rec {
hash = "sha256-nWGTYoSa0/fxnD0Mb2132LkeB1oa/gj/oIXBbI+FDw8=";
};
env = lib.optionalAttrs stdenv.isDarwin {
# Set the location to gettext to ensure the nixpkgs one on Darwin instead of the vendored one.
# The vendored gettext does not build with clang 16.
GETTEXT_BIN_DIR = "${lib.getBin buildPackages.gettext}/bin";
GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include";
GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib";
};
nativeBuildInputs = [
cargo
desktop-file-utils

View File

@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec {
description = "Native messaging host for ff2mpv written in Rust";
homepage = "https://github.com/ryze312/ff2mpv-rust";
license = licenses.gpl3Only;
maintainers = with maintainers; [ arthsmn ryze ];
maintainers = with maintainers; [ ryze ];
mainProgram = "ff2mpv-rust";
};
}

View File

@ -387,8 +387,7 @@ let
# See here for some context:
# https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132
++ lib.optional (
stdenv.targetPlatform.isDarwin
&& lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0"
stdenv.targetPlatform.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0"
) (metadata.getVersionFile "lldb/cpu_subtype_arm64e_replacement.patch");
}
// lib.optionalAttrs (lib.versions.major metadata.release_version == "16") {
@ -618,7 +617,13 @@ let
./compiler-rt/armv6-no-ldrexd-strexd.patch
./compiler-rt/armv6-scudo-no-yield.patch
./compiler-rt/armv6-scudo-libatomic.patch
];
]
++ lib.optional (lib.versionAtLeast metadata.release_version "19") (
fetchpatch {
url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch";
hash = "sha256-1CkA+RzI+645uG/QXsmOMKrLAjhVpfLUjNtgZ0QTv1E=";
}
);
in
{
compiler-rt-libc = callPackage ./compiler-rt {

View File

@ -23,9 +23,9 @@ let
"17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag=";
"18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
"19.0.0-git".gitRelease = {
rev = "8da3852f44c64ac4535128741695b9e9d8ee27ef";
rev-version = "19.0.0-unstable-2024-07-14";
sha256 = "sha256-yGmbzueu1kkfGbQaIG+ImnpIS+RwaUl/Gx/+1w6SHRc=";
rev = "d15ada24b1fbbd72776022383a5c557a1a056413";
rev-version = "19.0.0-unstable-2024-07-21";
sha256 = "sha256-ZvsHGgbcSwE0Ko8KjvRzKQLkig6VcQD7/A2XClq+kt0=";
};
} // llvmVersions;

View File

@ -6,6 +6,7 @@
repo = "Coq-Equations";
inherit version;
defaultVersion = lib.switch coq.coq-version [
{ case = "8.20"; out = "1.3.1+8.20"; }
{ case = "8.19"; out = "1.3+8.19"; }
{ case = "8.18"; out = "1.3+8.18"; }
{ case = "8.17"; out = "1.3+8.17"; }
@ -63,6 +64,8 @@
release."1.3+8.18".sha256 = "sha256-8MZO9vWdr8wlAov0lBTYMnde0RuMyhaiM99zp7Zwfao=";
release."1.3+8.19".rev = "v1.3-8.19";
release."1.3+8.19".sha256 = "sha256-roBCWfAHDww2Z2JbV5yMI3+EOfIsv3WvxEcUbBiZBsk=";
release."1.3.1+8.20".rev = "v1.3.1-8.20";
release."1.3.1+8.20".sha256 = "sha256-u8LB1KiACM5zVaoL7dSdHYvZgX7pf30VuqtjLLGuTzc=";
mlPlugin = true;

View File

@ -909,7 +909,7 @@ stdenv.mkDerivation (finalAttrs: {
platforms = platforms.all;
# See https://github.com/NixOS/nixpkgs/pull/295344#issuecomment-1992263658
broken = stdenv.hostPlatform.isMinGW && stdenv.hostPlatform.is64bit;
maintainers = with maintainers; [ atemu arthsmn jopejoe1 ];
maintainers = with maintainers; [ atemu jopejoe1 ];
mainProgram = "ffmpeg";
};
} // lib.optionalAttrs withCudaLLVM {

View File

@ -40,6 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
./4.x-nix_share_path.patch
];
# The 10.12 SDK used by x86_64-darwin requires defining `_POSIX_C_SOURCE` to use `strnlen`.
env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "-D_POSIX_C_SOURCE=200809L";
nativeBuildInputs = [
meson
ninja
@ -113,7 +116,5 @@ stdenv.mkDerivation (finalAttrs: {
platforms = platforms.unix;
license = licenses.lgpl21Plus;
maintainers = teams.gnome.members;
# https://hydra.nixos.org/build/258191535/nixlog/1
broken = stdenv.isDarwin && stdenv.isx86_64;
};
})

View File

@ -58,6 +58,6 @@ buildPythonPackage rec {
generate a variety of reports from them, and provides a web interface.
'';
license = licenses.gpl2Only;
maintainers = with maintainers; [ bhipple ];
maintainers = with maintainers; [ sharzy polarmutex ];
};
}

View File

@ -0,0 +1,54 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
setuptools,
# dependencies
plasTeX,
plastexshowmore,
plastexdepgraph,
click,
rich,
rich-click,
tomlkit,
jinja2,
gitpython,
}:
buildPythonPackage {
pname = "leanblueprint";
version = "0.0.10";
pyproject = true;
src = fetchFromGitHub {
repo = "leanblueprint";
owner = "PatrickMassot";
rev = "v0.0.10";
hash = "sha256-CUYdxEXgTf2vKDiOoeW4RV6tQ6prFhA4qMc0olZtZBM=";
};
build-system = [ setuptools ];
dependencies = [
plasTeX
plastexshowmore
plastexdepgraph
click
rich
rich-click
tomlkit
jinja2
gitpython
];
pythonImportsCheck = [ "leanblueprint" ];
meta = {
description = "This plasTeX plugin allowing to write blueprints for Lean 4 projects";
homepage = "https://github.com/PatrickMassot/leanblueprint";
maintainers = with lib.maintainers; [ niklashh ];
license = lib.licenses.asl20;
};
}

View File

@ -0,0 +1,42 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
setuptools,
# dependencies
typing-extensions,
pillow,
jinja2,
unidecode,
}:
buildPythonPackage {
pname = "plasTeX";
version = "3.1";
pyproject = true;
src = fetchFromGitHub {
repo = "plastex";
owner = "plastex";
rev = "193747318f7ebadd19eaaa1e9996da42a31a2697"; # The same as what is published on PyPi for version 3.1. See <https://github.com/plastex/plastex/issues/386>
hash = "sha256-Muuin7n0aPOZwlUaB32pONy5eyIjtPNb4On5gC9wOcQ=";
};
build-system = [ setuptools ];
dependencies = [
typing-extensions
pillow
jinja2
unidecode
];
meta = {
description = "plasTeX is a Python package to convert LaTeX markup to DOM";
homepage = "https://plastex.github.io/plastex/";
maintainers = with lib.maintainers; [ niklashh ];
license = lib.licenses.asl20;
};
}

View File

@ -0,0 +1,38 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
setuptools,
# dependencies
pygraphviz,
plasTeX,
}:
buildPythonPackage {
pname = "plastexdepgraph";
version = "0.0.4";
pyproject = true;
src = fetchFromGitHub {
repo = "plastexdepgraph";
owner = "PatrickMassot";
rev = "0.0.4";
hash = "sha256-Q13uYYZe1QgZHS4Nj8ugr+Fmhva98ttJj3AlXTK6XDw=";
};
build-system = [ setuptools ];
dependencies = [
pygraphviz
plasTeX
];
meta = {
description = "plasTeX plugin allowing to build dependency graphs";
homepage = "https://github.com/PatrickMassot/plastexdepgraph";
maintainers = with lib.maintainers; [ niklashh ];
license = lib.licenses.asl20;
};
}

View File

@ -0,0 +1,35 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
setuptools,
# dependencies
plasTeX,
}:
buildPythonPackage {
pname = "plastexshowmore";
version = "0.0.2";
pyproject = true;
src = fetchFromGitHub {
repo = "plastexshowmore";
owner = "PatrickMassot";
rev = "0.0.2";
hash = "sha256-b45VHHEwFA41FaInDteix56O7KYDzyKiRRSl7heHqEA=";
};
build-system = [ setuptools ];
dependencies = [ plasTeX ];
meta = {
description = "PlasTeX plugin for adding navigation buttons";
homepage = "https://github.com/PatrickMassot/plastexshowmore";
maintainers = with lib.maintainers; [ niklashh ];
license = lib.licenses.asl20;
};
}

View File

@ -69,6 +69,9 @@ buildPythonPackage rec {
homepage = "https://github.com/n8henrie/pycookiecheat";
changelog = "https://github.com/n8henrie/pycookiecheat/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
maintainers = with maintainers; [
fab
n8henrie
];
};
}

View File

@ -9,7 +9,7 @@
buildGoModule rec {
pname = "telegraf";
version = "1.31.1";
version = "1.31.2";
subPackages = [ "cmd/telegraf" ];
@ -17,10 +17,10 @@ buildGoModule rec {
owner = "influxdata";
repo = "telegraf";
rev = "v${version}";
hash = "sha256-itZPLiD6XQ6OwXsVrreWM7W268aLc8cz3hqXLdZryAU=";
hash = "sha256-LTo9wWCqjLoA9wjCXhZ6EjvRR/Xp8ByHvq/ytgS8sCo=";
};
vendorHash = "sha256-zhGxla5SQcpwAUzaeG54Sdos3fpJ3zO+ymanLpZtmyg=";
vendorHash = "sha256-spXS1vNRgXBO2xZIyVgsfO5V+SYK8dC6YDA/dGOYt6g=";
proxyVendor = true;
ldflags = [

View File

@ -1328,6 +1328,7 @@ mapAliases ({
slmenu = throw "slmenu has been removed (upstream is gone)"; # Added 2023-04-06
slurm-llnl = slurm; # renamed July 2017
smesh = throw "'smesh' has been removed as it's unmaintained and depends on opencascade-oce, which is also unmaintained"; # Added 2023-09-18
snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # 2024-03-04;
soldat-unstable = opensoldat; # Added 2022-07-02
solr_8 = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16
solr = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16

View File

@ -844,8 +844,6 @@ with pkgs;
tarsum = callPackage ../build-support/docker/tarsum.nix { };
snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # 2024-03-04;
nix-prefetch-docker = callPackage ../build-support/docker/nix-prefetch-docker.nix { };
docker-ls = callPackage ../tools/misc/docker-ls { };
@ -30844,7 +30842,9 @@ with pkgs;
}
);
manuskript = libsForQt5.callPackage ../applications/editors/manuskript { };
manuskript = libsForQt5.callPackage ../applications/editors/manuskript {
python3Packages = python311Packages;
};
metacubexd = callPackage ../by-name/me/metacubexd/package.nix {
pnpm = callPackage ../development/tools/pnpm/generic.nix {

View File

@ -90,8 +90,16 @@ mapAliases ({
case = throw "case has been removed, since it is an unused leaf package with a dependency on the nose test framework"; # added 2024-07-08
cchardet = faust-cchardet; # added 2023-03-02
cepa = throw "cepa has been removed, as onionshare switched back to stem"; # added 2024-05-07
chiabip158 = throw "chiabip158 has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
chiapos = throw "chiapos has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
chiavdf = throw "chiavdf has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
chia-rs = throw "chia-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
class-registry = phx-class-registry; # added 2021-10-05
cld2-cffi = throw "cld2-cffi has been removed, as the last release was in 2016"; # added 2024-05-20
clvm = throw "clvm has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
clvm-rs = throw "clvm-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
clvm-tools = throw "clvm-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
clvm-tools-rs = throw "clvm-tools-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
cntk = throw "cntk has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-10-09
codespell = throw "codespell has been promoted to a top-level attribute name: `pkgs.codespell`"; # Added 2022-10-02
ColanderAlchemy = colanderalchemy; # added 2023-02-19

View File

@ -2167,14 +2167,6 @@ self: super: with self; {
chex = callPackage ../development/python-modules/chex { };
chiabip158 = throw "chiabip158 has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
chiapos = throw "chiapos has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
chiavdf = throw "chiavdf has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
chia-rs = throw "chia-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
chirpstack-api = callPackage ../development/python-modules/chirpstack-api { };
chispa = callPackage ../development/python-modules/chispa { };
@ -2349,14 +2341,6 @@ self: super: with self; {
clustershell = callPackage ../development/python-modules/clustershell { };
clvm = throw "clvm has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
clvm-rs = throw "clvm-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
clvm-tools = throw "clvm-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
clvm-tools-rs = throw "clvm-tools-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
cma = callPackage ../development/python-modules/cma { };
cmaes = callPackage ../development/python-modules/cmaes { };
@ -6752,6 +6736,8 @@ self: super: with self; {
leather = callPackage ../development/python-modules/leather { };
leanblueprint = callPackage ../development/python-modules/leanblueprint { };
leb128 = callPackage ../development/python-modules/leb128 { };
led-ble = callPackage ../development/python-modules/led-ble { };
@ -10456,6 +10442,12 @@ self: super: with self; {
plaster = callPackage ../development/python-modules/plaster { };
plasTeX = callPackage ../development/python-modules/plasTeX { };
plastexdepgraph = callPackage ../development/python-modules/plastexdepgraph { };
plastexshowmore = callPackage ../development/python-modules/plastexshowmore { };
plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy { };
platformdirs = callPackage ../development/python-modules/platformdirs { };