nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 13:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2023-12-08 06:00:55 +00:00
committed by GitHub
parent 728281e1ea 26117abbca
commit 1287e59c06
61 changed files with 14428 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/update-terraform-providers.yml vendored
View File

@@ -60,7 +60,7 @@ jobs:
Check that all providers build with:
```
@ofborg build terraform.full
@ofborg build opentofu.full
```
If there is more than ten commits in the PR `ofborg` won't build it automatically and you will need to use the above command.
branch: terraform-providers-update

7
maintainers/README.md
View File

@@ -165,3 +165,10 @@ team after giving the existing members a few days to respond.
*Important:* If a team says it is a closed group, do not merge additions
to the team without an approval by at least one existing member.
# Maintainer scripts
Various utility scripts, which are mainly useful for nixpkgs maintainers,
are available under `./scripts/`. See its [README](./scripts/README.md)
for further information.

17
maintainers/maintainer-list.nix
View File

@@ -26,8 +26,10 @@
- `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/<userhandle>`,
- `keys` is a list of your PGP/GPG key fingerprints.
Specifying a GitHub account ensures that you automatically get a review request on
pull requests that modify a package for which you are a maintainer.
Specifying a GitHub account ensures that you automatically:
- get invited to the @NixOS/nixpkgs-maintainers team ;
- once you are part of the @NixOS org, OfBorg will request you review
pull requests that modify a package for which you are a maintainer.
`handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient.
@@ -6834,6 +6836,12 @@
githubId = 6893840;
name = "Yacine Hmito";
};
gracicot = {
email = "gracicot42@gmail.com";
github = "gracicot";
githubId = 2906673;
name = "Guillaume Racicot";
};
graham33 = {
email = "graham@grahambennett.org";
github = "graham33";
@@ -6939,6 +6947,11 @@
githubId = 21156405;
name = "GuangTao Zhang";
};
guekka = {
github = "Guekka";
githubId = 39066502;
name = "Guekka";
};
guibert = {
email = "david.guibert@gmail.com";
github = "dguibert";

58
maintainers/scripts/README.md Normal file
View File

@@ -0,0 +1,58 @@
# Maintainer scripts
This folder contains various executable scripts for nixpkgs maintainers,
and supporting data or nixlang files as needed.
These scripts generally aren't a stable interface and may changed or be removed.
What follows is a (very incomplete) overview of available scripts.
## Metadata
### `get-maintainer.sh`
`get-maintainer.sh [selector] value` returns a JSON object describing
a given nixpkgs maintainer, equivalent to `lib.maintainers.${x} // { handle = x; }`.
This allows looking up a maintainer's attrset (including GitHub and Matrix
handles, email address etc.) based on any of their handles, more correctly and
robustly than text search through `maintainers-list.nix`.
```
❯ ./get-maintainer.sh nicoo
{
"email": "nicoo@debian.org",
"github": "nbraud",
"githubId": 1155801,
"keys": [
{
"fingerprint": "E44E 9EA5 4B8E 256A FB73 49D3 EC9D 3708 72BC 7A8C"
}
],
"name": "nicoo",
"handle": "nicoo"
}
❯ ./get-maintainer.sh name 'Silvan Mosberger'
{
"email": "contact@infinisil.com",
"github": "infinisil",
"githubId": 20525370,
"keys": [
{
"fingerprint": "6C2B 55D4 4E04 8266 6B7D DA1A 422E 9EDA E015 7170"
}
],
"matrix": "@infinisil:matrix.org",
"name": "Silvan Mosberger",
"handle": "infinisil"
}
```
The maintainer is designated by a `selector` which must be one of:
- `handle` (default): the maintainer's attribute name in `lib.maintainers`;
- `email`, `name`, `github`, `githubId`, `matrix`, `name`:
attributes of the maintainer's object, matched exactly;
see [`maintainer-list.nix`] for the fields' definition.
[`maintainer-list.nix`]: ../maintainer-list.nix

73
maintainers/scripts/get-maintainer.sh Executable file
View File

@@ -0,0 +1,73 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p jq ncurses
# shellcheck shell=bash
# Get a nixpkgs maintainer's metadata as a JSON object
# see HELP_MESSAGE just below, or README.md.
set -euo pipefail
declare -A SELECTORS=( [handle]= [email]= [github]= [githubId]= [matrix]= [name]= )
HELP_MESSAGE="usage: '$0' [selector] value
examples:
get-maintainer.sh nicoo
get-maintainer.sh githubId 1155801
\`selector\` defaults to 'handle', can be one of:
${!SELECTORS[*]}
"
MAINTAINERS_DIR="$(dirname "$0")/.."
die() {
tput setaf 1 # red
echo "'$0': $*"
tput setaf 0 # back to black
exit 1
}
listAsJSON() {
nix-instantiate --eval --strict --json "${MAINTAINERS_DIR}/maintainer-list.nix"
}
parseArgs() {
[ $# -gt 0 -a $# -lt 3 ] || {
echo "$HELP_MESSAGE"
die "invalid number of arguments (must be 1 or 2)"
}
if [ $# -eq 1 ]; then
selector=handle
else
selector="$1"
shift
fi
[ -z "${SELECTORS[$selector]-n}" ] || {
echo "Valid selectors are:" "${!SELECTORS[@]}" >&2
die "invalid selector '$selector'"
}
value="$1"
shift
}
query() {
# explode { a: A, b: B, ... } into A + {handle: a}, B + {handle: b}, ...
local explode="to_entries[] | .value + { \"handle\": .key }"
# select matching items from the list
# TODO(nicoo): Support approximate matching for `name` ?
local select
case "$selector" in
githubId)
select="select(.${selector} == $value)"
;;
*)
select="select(.${selector} == \"$value\")"
esac
echo "$explode | $select"
}
parseArgs "$@"
listAsJSON | jq -e "$(query)"

5
pkgs/applications/audio/cheesecutter/default.nix
View File

@@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
mkdir -p $out/share/cheesecutter/example_tunes
cp -r tunes/* $out/share/cheesecutter/example_tunes
install -Dm444 arch/fd/ccutter.desktop -t $out/share/applications
for res in $(ls icons | sed -e 's/cc//g' -e 's/.png//g'); do
install -Dm444 icons/cc$res.png $out/share/icons/hicolor/''${res}x''${res}/apps/cheesecutter.png
done
'';
postFixup =

11
pkgs/applications/audio/fmit/default.nix
View File

@@ -36,6 +36,17 @@ mkDerivation rec {
PREFIXSHORTCUT=$out"
'';
postInstall = ''
mkdir -p $out/share/applications
ln -s $out/fmit.desktop $out/share/applications/fmit.desktop
mkdir -p $out/share/icons/hicolor/128x128/apps
ln -s $out/fmit.png $out/share/icons/hicolor/128x128/apps/fmit.png
mkdir -p $out/share/icons/hicolor/scalable/apps
ln -s $out/fmit.svg $out/share/icons/hicolor/scalable/apps/fmit.svg
'';
meta = with lib; {
description = "Free Musical Instrument Tuner";
longDescription = ''

5
pkgs/applications/audio/gspeech/default.nix
View File

@@ -55,6 +55,11 @@ python3.pkgs.buildPythonApplication rec {
librsvg
];
postInstall = ''
install -Dm444 gspeech.desktop -t $out/share/applications
install -Dm444 icons/*.svg -t $out/share/icons/hicolor/scalable/apps
'';
postFixup = ''
wrapProgram $out/bin/gspeech --prefix PATH : ${lib.makeBinPath [ picotts sox ]}
wrapProgram $out/bin/gspeech-cli --prefix PATH : ${lib.makeBinPath [ picotts sox ]}

2
pkgs/applications/audio/in-formant/default.nix
View File

@@ -56,6 +56,8 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
cp in-formant $out/bin
install -Dm444 $src/dist-res/in-formant.desktop -t $out/share/applications
install -Dm444 $src/dist-res/in-formant.png -t $out/share/icons/hicolor/512x512/apps
'';
meta = with lib; {

5
pkgs/applications/audio/praat/default.nix
View File

@@ -47,6 +47,11 @@ stdenv.mkDerivation (finalAttrs: {
runHook preInstall
install -Dt $out/bin praat
install -Dm444 main/praat.desktop -t $out/share/applications
install -Dm444 main/praat-32.ico $out/share/icons/hicolor/32x32/apps/praat.ico
install -Dm444 main/praat-256.ico $out/share/icons/hicolor/256x256/apps/praat.ico
install -Dm444 main/praat-480.png $out/share/icons/hicolor/480x480/apps/praat.png
install -Dm444 main/praat-480.svg $out/share/icons/hicolor/scalable/apps/praat.svg
runHook postInstall
'';

7
pkgs/applications/audio/pt2-clone/default.nix
View File

@@ -20,6 +20,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ SDL2 ] ++ lib.optional stdenv.isLinux alsa-lib;
postInstall = ''
install -Dm444 "$src/release/other/Freedesktop.org Resources/ProTracker 2 clone.desktop" \
-t $out/share/applications
install -Dm444 "$src/release/other/Freedesktop.org Resources/ProTracker 2 clone.png" \
-t $out/share/icons/hicolor/512x512/apps
'';
passthru.tests = {
pt2-clone-opens = nixosTests.pt2-clone;
};

4
pkgs/applications/audio/rubyripper/default.nix
View File

@@ -24,6 +24,10 @@ stdenv.mkDerivation rec {
ruby
];
postInstall = ''
cp -r share $out/
'';
postFixup = ''
wrapProgram $out/bin/rrip_cli \
--prefix PATH : ${lib.makeBinPath [ cddiscid cdparanoia ruby ]}

16
pkgs/applications/editors/emacs/default.nix
View File

@@ -32,6 +32,20 @@ lib.makeScope pkgs.newScope (self:
fetchFromSavannah;
};
emacs28 = callPackage (self.sources.emacs28) inheritedArgs;
emacs28-gtk2 = self.emacs28.override {
withGTK2 = true;
};
emacs28-gtk3 = self.emacs28.override {
withGTK3 = true;
};
emacs28-nox = pkgs.lowPrio (self.emacs28.override {
noGui = true;
});
emacs29 = callPackage (self.sources.emacs29) inheritedArgs;
emacs29-gtk3 = self.emacs29.override {
@@ -46,5 +60,7 @@ lib.makeScope pkgs.newScope (self:
withPgtk = true;
};
emacs28-macport = callPackage (self.sources.emacs28-macport) inheritedArgs;
emacs29-macport = callPackage (self.sources.emacs29-macport) inheritedArgs;
})

16
pkgs/applications/editors/emacs/sources.nix
View File

@@ -67,6 +67,14 @@ let
};
in
{
emacs28 = import ./make-emacs.nix (mkArgs {
pname = "emacs";
version = "28.2";
variant = "mainline";
rev = "28.2";
hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag=";
});
emacs29 = import ./make-emacs.nix (mkArgs {
pname = "emacs";
version = "29.1";
@@ -75,6 +83,14 @@ in
hash = "sha256-3HDCwtOKvkXwSULf3W7YgTz4GV8zvYnh2RrL28qzGKg=";
});
emacs28-macport = import ./make-emacs.nix (mkArgs {
pname = "emacs-mac";
version = "28.2";
variant = "macport";
rev = "emacs-28.2-mac-9.1";
hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE=";
});
emacs29-macport = import ./make-emacs.nix (mkArgs {
pname = "emacs-mac";
version = "29.1";

12
pkgs/applications/editors/vim/plugins/generated.nix
View File

@@ -5626,6 +5626,18 @@ final: prev:
meta.homepage = "https://github.com/mawkler/modicator.nvim/";
};
modus-themes-nvim = buildVimPlugin {
pname = "modus-themes.nvim";
version = "2023-11-07";
src = fetchFromGitHub {
owner = "miikanissi";
repo = "modus-themes.nvim";
rev = "bd5c541f13ee77c6df5d6a5d5c321ab907aa5e11";
sha256 = "1xm691bghn9618czifsrymcxmqjhamk8vj8g790r2bm42lgwcs84";
};
meta.homepage = "https://github.com/miikanissi/modus-themes.nvim/";
};
molokai = buildVimPlugin {
pname = "molokai";
version = "2015-11-11";

1
pkgs/applications/editors/vim/plugins/vim-plugin-names
View File

@@ -470,6 +470,7 @@ https://github.com/jghauser/mkdir.nvim/,main,
https://github.com/jakewvincent/mkdnflow.nvim/,HEAD,
https://github.com/SidOfc/mkdx/,,
https://github.com/mawkler/modicator.nvim/,HEAD,
https://github.com/miikanissi/modus-themes.nvim/,HEAD,
https://github.com/tomasr/molokai/,,
https://github.com/benlubas/molten-nvim/,HEAD,
https://github.com/loctvl842/monokai-pro.nvim/,HEAD,

9
pkgs/applications/graphics/cloudcompare/default.nix
View File

@@ -95,6 +95,15 @@ mkDerivation rec {
dontWrapGApps = true;
postInstall = ''
install -Dm444 $src/snap/gui/{ccViewer,cloudcompare}.png -t $out/share/icons/hicolor/256x256/apps
install -Dm444 $src/snap/gui/{ccViewer,cloudcompare}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/{ccViewer,cloudcompare}.desktop \
--replace 'Exec=cloudcompare.' 'Exec=' \
--replace 'Icon=''${SNAP}/meta/gui/' 'Icon=' \
--replace '.png' ""
'';
# fix file dialogs crashing on non-NixOS (and avoid double wrapping)
preFixup = ''
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")

6
pkgs/applications/graphics/epick/default.nix
View File

@@ -41,6 +41,12 @@ rustPlatform.buildRustPackage rec {
AppKit
];
postInstall = ''
install -Dm444 assets/epick.desktop -t $out/share/applications
install -Dm444 assets/icon.svg $out/share/icons/hicolor/scalable/apps/epick.svg
install -Dm444 assets/icon.png $out/share/icons/hicolor/48x48/apps/epick.png
'';
postFixup = lib.optionalString stdenv.isLinux ''
patchelf $out/bin/epick --add-rpath ${lib.makeLibraryPath [ libGL ]}
'';

8
pkgs/applications/graphics/goxel/default.nix
View File

@@ -21,6 +21,14 @@ stdenv.mkDerivation rec {
installPhase = ''
install -D ./goxel $out/bin/goxel
for res in $(ls data/icons | sed -e 's/icon//g' -e 's/.png//g'); do
install -Dm444 data/icons/icon$res.png $out/share/icons/hicolor/''${res}x''${res}/apps/goxel.png
done
install -Dm444 snap/gui/goxel.desktop -t $out/share/applications
substituteInPlace $out/share/applications/goxel.desktop \
--replace 'Icon=''${SNAP}/icon.png' 'Icon=goxel'
'';
meta = with lib; {

5
pkgs/applications/graphics/oculante/default.nix
View File

@@ -66,6 +66,11 @@ rustPlatform.buildRustPackage rec {
"--skip=bench"
];
postInstall = ''
install -Dm444 $src/res/oculante.png -t $out/share/icons/hicolor/128x128/apps/
install -Dm444 $src/res/oculante.desktop -t $out/share/applications
'';
postFixup = lib.optionalString stdenv.isLinux ''
patchelf $out/bin/oculante --add-rpath ${lib.makeLibraryPath [ libxkbcommon libX11 ]}
'';

9
pkgs/applications/graphics/pizarra/default.nix
View File

@@ -30,6 +30,15 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ gtk3-x11 atk glib librsvg ];
postInstall = ''
install -Dm444 res/icons/tk.categulario.pizarra.svg $out/share/icons/hicolor/scalable/apps/pizarra.svg
install -Dm444 res/pizarra.desktop -t $out/share/applications
substituteInPlace $out/share/applications/pizarra.desktop \
--replace "TryExec=/usr/bin/" "TryExec=" \
--replace "Exec=/usr/bin/" "Exec=" \
--replace "Icon=/usr/share/icons/hicolor/scalable/apps/pizarra.svg" "Icon=pizarra"
'';
meta = with lib; {
description = "A simple blackboard written in GTK";
longDescription = ''

5
pkgs/applications/misc/activate-linux/default.nix
View File

@@ -52,6 +52,11 @@ stdenv.mkDerivation (finalAttrs: {
cp activate-linux $out/bin
cp activate-linux.1 $out/share/man/man1
install -Dm444 res/icon.png $out/share/icons/hicolor/128x128/apps/activate-linux.png
install -Dm444 res/activate-linux.desktop -t $out/share/applications
substituteInPlace $out/share/applications/activate-linux.desktop \
--replace 'Icon=icon' 'Icon=activate-linux'
runHook postInstall
'';

5
pkgs/applications/misc/fluxboxlauncher/default.nix
View File

@@ -46,6 +46,11 @@ python3.pkgs.buildPythonApplication rec {
pygobject3
];
postInstall = ''
install -Dm444 fluxboxlauncher.desktop -t $out/share/applications
install -Dm444 fluxboxlauncher.svg -t $out/share/icons/hicolor/scalable/apps
'';
meta = with lib; {
description = "A Gui editor (gtk) to configure applications launching on a fluxbox session";
homepage = "https://github.com/mothsART/fluxboxlauncher";

3
pkgs/applications/misc/klayout/default.nix
View File

@@ -43,6 +43,9 @@ mkDerivation rec {
postBuild = ''
mkdir $out/bin
mv $out/lib/klayout $out/bin/
install -Dm444 etc/klayout.desktop -t $out/share/applications
install -Dm444 etc/logo.png $out/share/icons/hicolor/256x256/apps/klayout.png
'';
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-parentheses" ];

1
pkgs/applications/misc/llpp/default.nix
View File

@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
install -d $out/bin
install build/llpp $out/bin
install misc/llpp.inotify $out/bin/llpp.inotify
install -Dm444 misc/llpp.desktop -t $out/share/applications
'' + lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/llpp \
--prefix PATH ":" "${xclip}/bin"

5
pkgs/applications/misc/nwg-displays/default.nix
View File

@@ -46,6 +46,11 @@ python310Packages.buildPythonApplication rec {
dontWrapGApps = true;
postInstall = ''
install -Dm444 nwg-displays.svg -t $out/share/icons/hicolor/scalable/apps
install -Dm444 nwg-displays.desktop -t $out/share/applications
'';
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}");
'';

5
pkgs/applications/misc/skytemple/default.nix
View File

@@ -57,6 +57,11 @@ python3Packages.buildPythonApplication rec {
doCheck = false; # there are no tests
postInstall = ''
install -Dm444 org.skytemple.SkyTemple.desktop -t $out/share/applications
install -Dm444 installer/skytemple.ico $out/share/icons/hicolor/256x256/apps/org.skytemple.SkyTemple.ico
'';
meta = with lib; {
homepage = "https://github.com/SkyTemple/skytemple";
description = "ROM hacking tool for Pokémon Mystery Dungeon Explorers of Sky";

5
pkgs/applications/misc/system76-keyboard-configurator/default.nix
View File

@@ -30,6 +30,11 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-S4+cS4m69nqDN2h0vwyO35fFFBEa0Rcxx0XDBfSNLp0=";
postInstall = ''
install -Dm444 linux/com.system76.keyboardconfigurator.desktop -t $out/share/applications
cp -r data/icons $out/share
'';
meta = with lib; {
description = "Keyboard configuration application for System76 keyboards and laptops";
homepage = "https://github.com/pop-os/keyboard-configurator";

4
pkgs/applications/misc/xygrib/default.nix
View File

@@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
wrapQtApp $out/XyGrib/XyGrib
mkdir -p $out/bin
ln -s $out/XyGrib/XyGrib $out/bin/xygrib
install -Dm444 $src/debian/xygrib.png -t $out/share/icons/hicolor/32x32/apps
install -Dm444 $src/debian/xygrib.desktop -t $out/share/applications
substituteInPlace $out/share/applications/xygrib.desktop \
--replace 'Exec=XyGrib' 'Exec=xygrib'
'';
meta = with lib; {

6
pkgs/applications/networking/cluster/opentofu/default.nix
View File

@@ -36,7 +36,7 @@ let
patches = [ ./provider-path-0_15.patch ];
passthru = {
inherit plugins withPlugins;
inherit full plugins withPlugins;
tests = { inherit opentofu_plugins_test; };
};
@@ -60,11 +60,14 @@ let
maintainers = with maintainers; [
gmemstr
nickcao
zowoq
];
mainProgram = "tofu";
};
};
full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p.actualProviders));
opentofu_plugins_test = let
mainTf = writeText "main.tf" ''
terraform {
@@ -108,7 +111,6 @@ let
passthru = {
withPlugins = newplugins:
withPlugins (x: newplugins x ++ actualPlugins);
full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p.actualProviders));
# Expose wrappers around the override* functions of the terraform
# derivation.

2
pkgs/applications/networking/protonmail-bridge/default.nix
View File

@@ -37,6 +37,8 @@ buildGoModule rec {
postInstall = ''
mv $out/bin/Desktop-Bridge $out/bin/protonmail-bridge # The cli is named like that in other distro packages
install -Dm444 dist/proton-bridge.desktop -t $out/share/applications
install -Dm444 dist/bridge.svg $out/share/icons/hicolor/scalable/apps/protonmail-bridge.svg
'';
meta = with lib; {

9
pkgs/applications/networking/rymdport/default.nix
View File

@@ -41,6 +41,15 @@ buildGoModule rec {
IOKit
];
postInstall = ''
for res in $(ls internal/assets/icons | sed -e 's/icon-//g' -e 's/.png//g'); do
install -Dm444 internal/assets/icons/icon-$res.png \
$out/share/icons/hicolor/''${res}x''${res}/apps/io.github.jacalz.rymdport.png
done
install -Dm444 internal/assets/svg/icon.svg $out/share/icons/hicolor/scalable/apps/io.github.jacalz.rymdport.svg
install -Dm444 internal/assets/unix/io.github.jacalz.rymdport.desktop -t $out/share/applications
'';
meta = {
description = "Easy encrypted file, folder, and text sharing between devices";
homepage = "https://github.com/Jacalz/rymdport";

10
pkgs/applications/networking/sniffnet/default.nix
View File

@@ -50,6 +50,16 @@ rustPlatform.buildRustPackage rec {
"--skip=secondary_threads::check_updates::tests::fetch_latest_release_from_github"
];
postInstall = ''
for res in $(ls resources/packaging/linux/graphics | sed -e 's/sniffnet_//g' -e 's/x.*//g'); do
install -Dm444 resources/packaging/linux/graphics/sniffnet_''${res}x''${res}.png \
$out/share/icons/hicolor/''${res}x''${res}/apps/sniffnet.png
done
install -Dm444 resources/packaging/linux/sniffnet.desktop -t $out/share/applications
substituteInPlace $out/share/applications/sniffnet.desktop \
--replace 'Exec=/usr/bin/sniffnet' 'Exec=sniffnet'
'';
postFixup = lib.optionalString stdenv.isLinux ''
patchelf $out/bin/sniffnet \
--add-rpath ${lib.makeLibraryPath [ vulkan-loader xorg.libX11 ]}

2
pkgs/applications/video/cutecapture/default.nix
View File

@@ -35,6 +35,8 @@ stdenv.mkDerivation (finalAttrs: {
postInstall = ''
install -Dm644 -t $out/lib/udev/rules.d 95-{3,}dscapture.rules
install -Dm444 -t $out/share/applications Cute{3,}DSCapture.desktop
install -Dm444 -t $out/share/icons/hicolor/128x128/apps Cute{3,}DSCapture.png
'';
meta = with lib; {

5
pkgs/applications/video/pipe-viewer/default.nix
View File

@@ -67,6 +67,11 @@ buildPerlModule rec {
];
dontWrapGApps = true;
postInstall = ''
cp -r share/* $out/share
'';
postFixup = ''
wrapProgram "$out/bin/pipe-viewer" \
--prefix PATH : "${lib.makeBinPath [ ffmpeg wget youtube-dl yt-dlp ]}"

4
pkgs/by-name/README.md
View File

@@ -99,7 +99,9 @@ There's some limitations as to which packages can be defined using this structur
- Only packages defined using `pkgs.callPackage`.
This excludes packages defined using `pkgs.python3Packages.callPackage ...`.
Instead use the [category hierarchy](../README.md#category-hierarchy) for such attributes.
Instead:
- Either change the package definition to work with `pkgs.callPackage`.
- Or use the [category hierarchy](../README.md#category-hierarchy).
- Only top-level packages.
This excludes packages for other package sets like `pkgs.pythonPackages.*`.

32
pkgs/by-name/cm/cmakerc/package.nix Normal file
View File

@@ -0,0 +1,32 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "cmrc";
version = "2.0.1";
src = fetchFromGitHub {
owner = "vector-of-bool";
repo = "cmrc";
rev = finalAttrs.version;
hash = "sha256-++16WAs2K9BKk8384yaSI/YD1CdtdyXVBIjGhqi4JIk=";
};
installPhase = ''
runHook preInstall
install CMakeRC.cmake -DT $out/share/cmakerc/cmakerc-config.cmake
runHook postInstall
'';
meta = {
description = "A Resource Compiler in a Single CMake Script";
homepage = "https://github.com/vector-of-bool/cmrc";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ guekka ];
platforms = lib.platforms.all;
};
})

4
pkgs/by-name/fr/frankenphp/package.nix
View File

@@ -24,13 +24,13 @@ let
pieBuild = stdenv.hostPlatform.isMusl;
in buildGoModule rec {
pname = "frankenphp";
version = "1.0.0-rc.4";
version = "1.0.0";
src = fetchFromGitHub {
owner = "dunglas";
repo = "frankenphp";
rev = "v${version}";
hash = "sha256-4jNCKHt4eYI1BNaonIdS1Eq2OnJwgrU6qWZoiSpeIYk=";
hash = "sha256-QgLCcZUDjeEdo8ijUXeubRkLI9DDlMctzHlGSjDCZoc=";
};
sourceRoot = "source/caddy";

13752
pkgs/by-name/se/serverless/package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

33
pkgs/by-name/se/serverless/package.nix Normal file
View File

@@ -0,0 +1,33 @@
{ lib
, buildNpmPackage
, fetchFromGitHub
}:
buildNpmPackage rec {
pname = "serverless";
version = "3.38.0";
src = fetchFromGitHub {
owner = "serverless";
repo = "serverless";
rev = "v${version}";
hash = "sha256-DplJRJOdIpZfIvpyPo9VcaXCHVPWB8FwhOH4vISUh3Q=";
};
postPatch = ''
cp ${./package-lock.json} ./package-lock.json
'';
npmDepsHash = "sha256-Vy3GQelssTqsGsvZqIdctsPlxZQkqrhN0p6AY1T2L/k=";
dontNpmBuild = true;
meta = {
changelog = "https://github.com/serverless/serverless/blob/${src.rev}/CHANGELOG.md";
description = "Build applications on AWS Lambda and other next-gen cloud services, that auto-scale and only charge you when they run";
homepage = "https://serverless.com";
license = lib.licenses.mit;
mainProgram = "serverless";
maintainers = with lib.maintainers; [ wolfangaukang ];
};
}

14
pkgs/by-name/vc/vcpkg-tool/change-lock-location.patch Normal file
View File

@@ -0,0 +1,14 @@
diff --git a/src/vcpkg/vcpkgpaths.cpp b/src/vcpkg/vcpkgpaths.cpp
index 3f588c21..e6f2bbed 100644
--- a/src/vcpkg/vcpkgpaths.cpp
+++ b/src/vcpkg/vcpkgpaths.cpp
@@ -579,7 +579,8 @@ namespace vcpkg
if (!args.do_not_take_lock)
{
std::error_code ec;
- const auto vcpkg_root_file = root / ".vcpkg-root";
+ fs.create_directories(Path{"/tmp/vcpkg"}, VCPKG_LINE_INFO);
+ const auto vcpkg_root_file = Path{"/tmp/vcpkg"} / Hash::get_string_sha256(root.c_str());
if (args.wait_for_lock.value_or(false))
{
file_lock_handle = fs.take_exclusive_file_lock(vcpkg_root_file, ec);

73
pkgs/by-name/vc/vcpkg-tool/package.nix Normal file
View File

@@ -0,0 +1,73 @@
{ lib
, stdenv
, fetchFromGitHub
, cacert
, cmake
, cmakerc
, fmt
, git
, gzip
, makeWrapper
, meson
, ninja
, openssh
, python3
, zip
, zstd
, extraRuntimeDeps ? []
}:
stdenv.mkDerivation (finalAttrs: {
pname = "vcpkg-tool";
version = "2023-10-18";
src = fetchFromGitHub {
owner = "microsoft";
repo = "vcpkg-tool";
rev = finalAttrs.version;
hash = "sha256-Hm+GSKov9A6tmN10BHOTVy8aWkLOJNBMOQJNm4HnWuI=";
};
nativeBuildInputs = [
cmake
cmakerc
fmt
ninja
makeWrapper
];
patches = [
./change-lock-location.patch
];
cmakeFlags = [
"-DVCPKG_DEPENDENCY_EXTERNAL_FMT=ON"
"-DVCPKG_DEPENDENCY_CMAKERC=ON"
];
postFixup = let
# These are the most common binaries used by vcpkg
# Extra binaries can be added via overlay when needed
runtimeDeps = [
cacert
cmake
git
gzip
meson
ninja
openssh
python3
zip
zstd
] ++ extraRuntimeDeps;
in ''
wrapProgram $out/bin/vcpkg --prefix PATH ${lib.makeBinPath runtimeDeps}
'';
meta = {
description = "Components of microsoft/vcpkg's binary";
homepage = "https://github.com/microsoft/vcpkg-tool";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ guekka gracicot ];
platforms = lib.platforms.all;
};
})

51
pkgs/by-name/vc/vcpkg/package.nix Normal file
View File

@@ -0,0 +1,51 @@
{ fetchFromGitHub
, stdenvNoCC
, lib
, vcpkg-tool
, writeShellScript
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "vcpkg";
version = "2023.10.19";
src = fetchFromGitHub {
owner = "microsoft";
repo = "vcpkg";
rev = finalAttrs.version;
hash = "sha256-u+4vyOphnowoaZgfkCbzF7Q4tuz2GN1bHylaKw352Lc=";
};
installPhase = let
# vcpkg needs two directories to write to that is independent of installation directory.
# Since vcpkg already creates $HOME/.vcpkg/ we use that to create a root where vcpkg can write into.
vcpkgScript = writeShellScript "vcpkg" ''
vcpkg_writable_path="$HOME/.vcpkg/root/"
VCPKG_ROOT="@out@/share/vcpkg" ${vcpkg-tool}/bin/vcpkg \
--x-downloads-root="$vcpkg_writable_path"/downloads \
--x-buildtrees-root="$vcpkg_writable_path"/buildtrees \
--x-packages-root="$vcpkg_writable_path"/packages \
"$@"
'';
in ''
runHook preInstall
mkdir -p $out/bin $out/share/vcpkg/scripts/buildsystems
cp --preserve=mode -r ./{docs,ports,triplets,scripts,.vcpkg-root,versions,LICENSE.txt} $out/share/vcpkg/
substitute ${vcpkgScript} $out/bin/vcpkg --subst-var-by out $out
chmod +x $out/bin/vcpkg
ln -s $out/bin/vcpkg $out/share/vcpkg/vcpkg
touch $out/share/vcpkg/vcpkg.disable-metrics
runHook postInstall
'';
meta = {
description = "C++ Library Manager";
homepage = "https://vcpkg.io/";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ guekka gracicot ];
platforms = lib.platforms.all;
};
})

2
pkgs/development/libraries/openvino/default.nix
View File

@@ -18,6 +18,7 @@
# runtime
, libusb1
, libxml2
, ocl-icd
, opencv
, protobuf
, pugixml
@@ -134,6 +135,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libusb1
libxml2
ocl-icd
opencv.cxxdev
protobuf
pugixml

1
pkgs/development/node-packages/aliases.nix
View File

@@ -120,6 +120,7 @@ mapAliases {
reveal-md = pkgs.reveal-md; # added 2023-07-31
inherit (pkgs) rtlcss; # added 2023-08-29
s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18
inherit (pkgs) serverless; # Added 2023-11-29
inherit (pkgs) snyk; # Added 2023-08-30
"@squoosh/cli" = throw "@squoosh/cli was removed because it was abandoned upstream"; # added 2023-09-02
ssb-server = throw "ssb-server was removed because it was broken"; # added 2023-08-21

1
pkgs/development/node-packages/node-packages.json
View File

@@ -213,7 +213,6 @@
, "sass"
, "semver"
, "serve"
, "serverless"
, "shout"
, "sloc"
, "smartdc"

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

@@ -91878,711 +91878,6 @@ in
bypassCache = true;
reconstructLock = true;
};
serverless = nodeEnv.buildNodePackage {
name = "serverless";
packageName = "serverless";
version = "3.37.0";
src = fetchurl {
url = "https://registry.npmjs.org/serverless/-/serverless-3.37.0.tgz";
sha512 = "HRYzduFrJTMRVknmoqdmdfZJ0c945h5jhrUf8rTzdBdCoQ2ETMFd6xlHnrAPqsEreR1apAVb0zFSZLwgO7Tigg==";
};
dependencies = [
sources."2-thenable-1.0.0"
(sources."@aws-crypto/crc32-3.0.0" // {
dependencies = [
sources."tslib-1.14.1"
];
})
(sources."@aws-crypto/ie11-detection-3.0.0" // {
dependencies = [
sources."tslib-1.14.1"
];
})
(sources."@aws-crypto/sha256-browser-3.0.0" // {
dependencies = [
sources."tslib-1.14.1"
];
})
(sources."@aws-crypto/sha256-js-3.0.0" // {
dependencies = [
sources."tslib-1.14.1"
];
})
(sources."@aws-crypto/supports-web-crypto-3.0.0" // {
dependencies = [
sources."tslib-1.14.1"
];
})
(sources."@aws-crypto/util-3.0.0" // {
dependencies = [
sources."tslib-1.14.1"
];
})
(sources."@aws-sdk/client-cloudformation-3.454.0" // {
dependencies = [
sources."uuid-8.3.2"
];
})
sources."@aws-sdk/client-sso-3.451.0"
sources."@aws-sdk/client-sts-3.454.0"
sources."@aws-sdk/core-3.451.0"
sources."@aws-sdk/credential-provider-env-3.451.0"
sources."@aws-sdk/credential-provider-ini-3.451.0"
sources."@aws-sdk/credential-provider-node-3.451.0"
sources."@aws-sdk/credential-provider-process-3.451.0"
sources."@aws-sdk/credential-provider-sso-3.451.0"
sources."@aws-sdk/credential-provider-web-identity-3.451.0"
sources."@aws-sdk/middleware-host-header-3.451.0"
sources."@aws-sdk/middleware-logger-3.451.0"
sources."@aws-sdk/middleware-recursion-detection-3.451.0"
sources."@aws-sdk/middleware-sdk-sts-3.451.0"
sources."@aws-sdk/middleware-signing-3.451.0"
sources."@aws-sdk/middleware-user-agent-3.451.0"
sources."@aws-sdk/region-config-resolver-3.451.0"
sources."@aws-sdk/token-providers-3.451.0"
sources."@aws-sdk/types-3.451.0"
sources."@aws-sdk/util-endpoints-3.451.0"
sources."@aws-sdk/util-locate-window-3.310.0"
sources."@aws-sdk/util-user-agent-browser-3.451.0"
sources."@aws-sdk/util-user-agent-node-3.451.0"
sources."@aws-sdk/util-utf8-browser-3.259.0"
sources."@httptoolkit/websocket-stream-6.0.1"
sources."@kwsites/file-exists-1.1.1"
sources."@kwsites/promise-deferred-1.1.1"
sources."@nodelib/fs.scandir-2.1.5"
sources."@nodelib/fs.stat-2.0.5"
sources."@nodelib/fs.walk-1.2.8"
(sources."@serverless/dashboard-plugin-7.2.0" // {
dependencies = [
sources."child-process-ext-3.0.2"
sources."fs-extra-9.1.0"
sources."open-7.4.2"
sources."uuid-8.3.2"
];
})
sources."@serverless/event-mocks-1.1.1"
(sources."@serverless/platform-client-4.5.1" // {
dependencies = [
sources."js-yaml-3.14.1"
];
})
(sources."@serverless/utils-6.15.0" // {
dependencies = [
sources."jwt-decode-3.1.2"
sources."ms-2.1.3"
sources."uuid-8.3.2"
];
})
sources."@sindresorhus/is-4.6.0"
sources."@smithy/abort-controller-2.0.13"
sources."@smithy/config-resolver-2.0.18"
sources."@smithy/credential-provider-imds-2.1.1"
sources."@smithy/eventstream-codec-2.0.13"
sources."@smithy/fetch-http-handler-2.2.6"
sources."@smithy/hash-node-2.0.15"
sources."@smithy/invalid-dependency-2.0.13"
sources."@smithy/is-array-buffer-2.0.0"
sources."@smithy/middleware-content-length-2.0.15"
sources."@smithy/middleware-endpoint-2.2.0"
(sources."@smithy/middleware-retry-2.0.20" // {
dependencies = [
sources."uuid-8.3.2"
];
})
sources."@smithy/middleware-serde-2.0.13"
sources."@smithy/middleware-stack-2.0.7"
sources."@smithy/node-config-provider-2.1.5"
sources."@smithy/node-http-handler-2.1.9"
sources."@smithy/property-provider-2.0.14"
sources."@smithy/protocol-http-3.0.9"
sources."@smithy/querystring-builder-2.0.13"
sources."@smithy/querystring-parser-2.0.13"
sources."@smithy/service-error-classification-2.0.6"
sources."@smithy/shared-ini-file-loader-2.2.4"
sources."@smithy/signature-v4-2.0.15"
sources."@smithy/smithy-client-2.1.15"
sources."@smithy/types-2.5.0"
sources."@smithy/url-parser-2.0.13"
sources."@smithy/util-base64-2.0.1"
sources."@smithy/util-body-length-browser-2.0.0"
sources."@smithy/util-body-length-node-2.1.0"
sources."@smithy/util-buffer-from-2.0.0"
sources."@smithy/util-config-provider-2.0.0"
sources."@smithy/util-defaults-mode-browser-2.0.19"
sources."@smithy/util-defaults-mode-node-2.0.25"
sources."@smithy/util-endpoints-1.0.4"
sources."@smithy/util-hex-encoding-2.0.0"
sources."@smithy/util-middleware-2.0.6"
sources."@smithy/util-retry-2.0.6"
sources."@smithy/util-stream-2.0.20"
sources."@smithy/util-uri-escape-2.0.0"
sources."@smithy/util-utf8-2.0.2"
sources."@smithy/util-waiter-2.0.13"
sources."@szmarczak/http-timer-4.0.6"
sources."@tokenizer/token-0.3.0"
sources."@types/cacheable-request-6.0.3"
sources."@types/http-cache-semantics-4.0.4"
sources."@types/keyv-3.1.4"
sources."@types/lodash-4.14.202"
sources."@types/node-20.9.3"
sources."@types/responselike-1.0.3"
sources."@types/ws-8.5.10"
sources."abort-controller-3.0.0"
sources."adm-zip-0.5.10"
sources."agent-base-6.0.2"
sources."ajv-8.12.0"
sources."ajv-formats-2.1.1"
sources."ansi-escapes-4.3.2"
sources."ansi-regex-5.0.1"
sources."ansi-styles-4.3.0"
sources."anymatch-3.1.3"
(sources."archive-type-4.0.0" // {
dependencies = [
sources."file-type-4.4.0"
];
})
(sources."archiver-5.3.2" // {
dependencies = [
sources."readable-stream-3.6.2"
];
})
sources."archiver-utils-2.1.0"
sources."argparse-1.0.10"
sources."array-union-2.1.0"
sources."asap-2.0.6"
sources."async-3.2.5"
sources."asynckit-0.4.0"
sources."at-least-node-1.0.0"
sources."available-typed-arrays-1.0.5"
sources."aws-crt-1.19.0"
(sources."aws-sdk-2.1500.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."ieee754-1.1.13"
sources."querystring-0.2.0"
sources."uuid-8.0.0"
];
})
sources."axios-1.6.2"
sources."balanced-match-1.0.2"
sources."base64-js-1.5.1"
sources."binary-extensions-2.2.0"
(sources."bl-4.1.0" // {
dependencies = [
sources."buffer-5.7.1"
sources."readable-stream-3.6.2"
];
})
sources."bluebird-3.7.2"
sources."bowser-2.11.0"
sources."brace-expansion-1.1.11"
sources."braces-3.0.2"
sources."buffer-6.0.3"
sources."buffer-alloc-1.2.0"
sources."buffer-alloc-unsafe-1.1.0"
sources."buffer-crc32-0.2.13"
sources."buffer-fill-1.0.0"
sources."buffer-from-1.1.2"
sources."bufferutil-4.0.8"
sources."builtin-modules-3.3.0"
sources."builtins-1.0.3"
sources."cacheable-lookup-5.0.4"
(sources."cacheable-request-7.0.4" // {
dependencies = [
sources."get-stream-5.2.0"
];
})
sources."cachedir-2.4.0"
sources."call-bind-1.0.5"
(sources."chalk-4.1.2" // {
dependencies = [
sources."has-flag-4.0.0"
sources."supports-color-7.2.0"
];
})
sources."chardet-0.7.0"
(sources."child-process-ext-2.1.1" // {
dependencies = [
sources."cross-spawn-6.0.5"
sources."path-key-2.0.1"
sources."semver-5.7.2"
sources."shebang-command-1.2.0"
sources."shebang-regex-1.0.0"
sources."which-1.3.1"
];
})
sources."chokidar-3.5.3"
sources."chownr-2.0.0"
sources."ci-info-3.9.0"
sources."cli-color-2.0.3"
sources."cli-cursor-3.1.0"
sources."cli-progress-footer-2.3.2"
sources."cli-spinners-2.9.1"
(sources."cli-sprintf-format-1.1.1" // {
dependencies = [
sources."supports-color-6.1.0"
];
})
sources."cli-width-3.0.0"
sources."clone-1.0.4"
sources."clone-response-1.0.3"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
sources."combined-stream-1.0.8"
sources."commander-2.20.3"
sources."commist-1.1.0"
sources."component-emitter-1.3.1"
(sources."compress-commons-4.1.2" // {
dependencies = [
sources."readable-stream-3.6.2"
];
})
sources."concat-map-0.0.1"
(sources."concat-stream-2.0.0" // {
dependencies = [
sources."readable-stream-3.6.2"
];
})
sources."content-disposition-0.5.4"
sources."cookiejar-2.1.4"
sources."core-util-is-1.0.3"
sources."crc-32-1.2.2"
(sources."crc32-stream-4.0.3" // {
dependencies = [
sources."readable-stream-3.6.2"
];
})
sources."cross-spawn-7.0.3"
sources."crypto-js-4.2.0"
(sources."d-1.0.1" // {
dependencies = [
sources."type-1.2.0"
];
})
sources."dayjs-1.11.10"
sources."debug-4.3.4"
(sources."decompress-4.2.1" // {
dependencies = [
(sources."make-dir-1.3.0" // {
dependencies = [
sources."pify-3.0.0"
];
})
];
})
(sources."decompress-response-6.0.0" // {
dependencies = [
sources."mimic-response-3.1.0"
];
})
(sources."decompress-tar-4.1.1" // {
dependencies = [
sources."bl-1.2.3"
sources."file-type-5.2.0"
sources."tar-stream-1.6.2"
];
})
(sources."decompress-tarbz2-4.1.1" // {
dependencies = [
sources."file-type-6.2.0"
];
})
(sources."decompress-targz-4.1.1" // {
dependencies = [
sources."file-type-5.2.0"
];
})
(sources."decompress-unzip-4.0.1" // {
dependencies = [
sources."file-type-3.9.0"
sources."get-stream-2.3.1"
];
})
sources."defaults-1.0.4"
sources."defer-to-connect-2.0.1"
sources."deferred-0.7.11"
sources."define-data-property-1.1.1"
sources."define-lazy-prop-2.0.0"
sources."delayed-stream-1.0.0"
sources."dezalgo-1.0.4"
sources."dir-glob-3.0.1"
sources."dotenv-16.3.1"
sources."dotenv-expand-10.0.0"
sources."duplexify-3.7.1"
sources."duration-0.2.2"
sources."emoji-regex-8.0.0"
(sources."encoding-0.1.13" // {
dependencies = [
sources."iconv-lite-0.6.3"
];
})
sources."end-of-stream-1.4.4"
sources."es5-ext-0.10.62"
sources."es6-iterator-2.0.3"
sources."es6-set-0.1.6"
sources."es6-symbol-3.1.3"
sources."es6-weak-map-2.0.3"
sources."escape-string-regexp-1.0.5"
sources."esniff-1.1.0"
sources."esprima-4.0.1"
sources."essentials-1.2.0"
sources."event-emitter-0.3.5"
sources."event-target-shim-5.0.1"
sources."events-1.1.1"
sources."ext-1.7.0"
sources."ext-list-2.2.2"
sources."ext-name-5.0.0"
sources."external-editor-3.1.0"
sources."fast-deep-equal-3.1.3"
sources."fast-glob-3.3.2"
sources."fast-safe-stringify-2.1.1"
sources."fast-xml-parser-4.2.5"
sources."fastest-levenshtein-1.0.16"
sources."fastq-1.15.0"
sources."fd-slicer-1.1.0"
sources."figures-3.2.0"
sources."file-type-16.5.4"
sources."filename-reserved-regex-2.0.0"
sources."filenamify-4.3.0"
sources."filesize-10.1.0"
sources."fill-range-7.0.1"
sources."find-requires-1.0.0"
sources."flat-5.0.2"
sources."follow-redirects-1.15.3"
sources."for-each-0.3.3"
sources."form-data-4.0.0"
sources."formidable-2.1.2"
sources."fs-constants-1.0.0"
sources."fs-extra-10.1.0"
(sources."fs-minipass-2.1.0" // {
dependencies = [
sources."minipass-3.3.6"
];
})
sources."fs.realpath-1.0.0"
sources."fs2-0.3.9"
sources."fsevents-2.3.3"
sources."function-bind-1.1.2"
sources."get-intrinsic-1.2.2"
sources."get-stdin-8.0.0"
sources."get-stream-6.0.1"
sources."glob-7.2.3"
sources."glob-parent-5.1.2"
sources."globby-11.1.0"
sources."gopd-1.0.1"
sources."got-11.8.6"
sources."graceful-fs-4.2.11"
sources."graphlib-2.1.8"
sources."has-flag-3.0.0"
sources."has-property-descriptors-1.0.1"
sources."has-proto-1.0.1"
sources."has-symbols-1.0.3"
sources."has-tostringtag-1.0.0"
sources."hasown-2.0.0"
(sources."help-me-3.0.0" // {
dependencies = [
sources."readable-stream-3.6.2"
];
})
sources."hexoid-1.0.0"
sources."http-cache-semantics-4.1.1"
sources."http2-wrapper-1.0.3"
sources."https-proxy-agent-5.0.1"
sources."iconv-lite-0.4.24"
sources."ieee754-1.2.1"
sources."ignore-5.3.0"
sources."immediate-3.0.6"
sources."imurmurhash-0.1.4"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."inquirer-8.2.6"
sources."is-arguments-1.1.1"
sources."is-binary-path-2.1.0"
sources."is-callable-1.2.7"
sources."is-docker-2.2.1"
sources."is-extglob-2.1.1"
sources."is-fullwidth-code-point-3.0.0"
sources."is-generator-function-1.0.10"
sources."is-glob-4.0.3"
sources."is-interactive-1.0.0"
sources."is-natural-number-4.0.1"
sources."is-number-7.0.0"
sources."is-plain-obj-1.1.0"
sources."is-promise-2.2.2"
sources."is-stream-1.1.0"
sources."is-typed-array-1.1.12"
sources."is-unicode-supported-0.1.0"
sources."is-wsl-2.2.0"
sources."isarray-1.0.0"
sources."isexe-2.0.0"
sources."isomorphic-ws-4.0.1"
sources."jmespath-0.16.0"
sources."js-sdsl-4.3.0"
(sources."js-yaml-4.1.0" // {
dependencies = [
sources."argparse-2.0.1"
];
})
sources."json-buffer-3.0.1"
(sources."json-colorizer-2.2.2" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
sources."supports-color-5.5.0"
];
})
sources."json-cycle-1.5.0"
(sources."json-refs-3.0.15" // {
dependencies = [
sources."commander-4.1.1"
sources."js-yaml-3.14.1"
];
})
sources."json-schema-traverse-1.0.0"
sources."jsonfile-6.1.0"
sources."jszip-3.10.1"
sources."jwt-decode-2.2.0"
sources."keyv-4.5.4"
sources."lazystream-1.0.1"
sources."leven-2.1.0"
sources."lie-3.3.0"
sources."lodash-4.17.21"
sources."lodash.defaults-4.2.0"
sources."lodash.difference-4.5.0"
sources."lodash.flatten-4.4.0"
sources."lodash.get-4.4.2"
sources."lodash.isplainobject-4.0.6"
sources."lodash.union-4.6.0"
sources."log-6.3.1"
sources."log-node-8.0.3"
sources."log-symbols-4.1.0"
sources."lowercase-keys-2.0.0"
sources."lru-cache-6.0.0"
sources."lru-queue-0.1.0"
sources."make-dir-4.0.0"
sources."memoizee-0.4.15"
sources."merge2-1.4.1"
sources."methods-1.1.2"
sources."micromatch-4.0.5"
sources."mime-2.6.0"
sources."mime-db-1.52.0"
sources."mime-types-2.1.35"
sources."mimic-fn-2.1.0"
sources."mimic-response-1.0.1"
sources."minimatch-3.1.2"
sources."minimist-1.2.8"
sources."minipass-5.0.0"
(sources."minizlib-2.1.2" // {
dependencies = [
sources."minipass-3.3.6"
];
})
sources."mkdirp-1.0.4"
(sources."mqtt-4.3.7" // {
dependencies = [
sources."duplexify-4.1.2"
sources."readable-stream-3.6.2"
];
})
sources."mqtt-packet-6.10.0"
sources."ms-2.1.2"
sources."mute-stream-0.0.8"
sources."native-promise-only-0.8.1"
sources."ncjsm-4.3.2"
sources."next-tick-1.1.0"
sources."nice-try-1.0.5"
sources."node-dir-0.1.17"
sources."node-fetch-2.7.0"
sources."node-gyp-build-4.7.0"
sources."normalize-path-3.0.0"
sources."normalize-url-6.1.0"
sources."npm-registry-utilities-1.0.0"
sources."number-allocator-1.0.14"
sources."object-assign-4.1.1"
sources."object-hash-3.0.0"
sources."object-inspect-1.13.1"
sources."once-1.4.0"
sources."onetime-5.1.2"
sources."open-8.4.2"
sources."ora-5.4.1"
sources."os-tmpdir-1.0.2"
sources."p-cancelable-2.1.1"
sources."p-event-4.2.0"
sources."p-finally-1.0.0"
sources."p-timeout-3.2.0"
sources."pako-1.0.11"
sources."path-is-absolute-1.0.1"
sources."path-key-3.1.1"
sources."path-loader-1.0.12"
sources."path-type-4.0.0"
sources."path2-0.1.0"
sources."peek-readable-4.1.0"
sources."pend-1.2.0"
sources."picomatch-2.3.1"
sources."pify-2.3.0"
sources."pinkie-2.0.4"
sources."pinkie-promise-2.0.1"
sources."process-0.11.10"
sources."process-nextick-args-2.0.1"
sources."process-utils-4.0.0"
sources."promise-queue-2.2.5"
sources."proxy-from-env-1.1.0"
sources."pump-3.0.0"
sources."punycode-2.3.1"
sources."qs-6.11.2"
sources."querystring-0.2.1"
sources."queue-microtask-1.2.3"
sources."quick-lru-5.1.1"
(sources."readable-stream-2.3.8" // {
dependencies = [
sources."safe-buffer-5.1.2"
];
})
(sources."readable-web-to-node-stream-3.0.2" // {
dependencies = [
sources."readable-stream-3.6.2"
];
})
(sources."readdir-glob-1.1.3" // {
dependencies = [
sources."brace-expansion-2.0.1"
sources."minimatch-5.1.6"
];
})
sources."readdirp-3.6.0"
sources."reinterval-1.1.0"
sources."require-from-string-2.0.2"
sources."resolve-alpn-1.2.1"
sources."responselike-2.0.1"
sources."restore-cursor-3.1.0"
sources."reusify-1.0.4"
sources."rfdc-1.3.0"
sources."run-async-2.4.1"
sources."run-parallel-1.2.0"
sources."run-parallel-limit-1.1.0"
sources."rxjs-7.8.1"
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
sources."sax-1.2.1"
sources."seek-bzip-1.0.6"
sources."semver-7.5.4"
sources."set-function-length-1.1.1"
sources."setimmediate-1.0.5"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
sources."side-channel-1.0.4"
sources."signal-exit-3.0.7"
sources."simple-git-3.21.0"
sources."slash-3.0.0"
sources."sort-keys-1.1.2"
sources."sort-keys-length-1.0.1"
(sources."split2-3.2.2" // {
dependencies = [
sources."readable-stream-3.6.2"
];
})
sources."sprintf-js-1.0.3"
sources."sprintf-kit-2.0.1"
sources."stream-buffers-3.0.2"
sources."stream-promise-3.2.0"
sources."stream-shift-1.0.1"
sources."string-width-4.2.3"
(sources."string_decoder-1.1.1" // {
dependencies = [
sources."safe-buffer-5.1.2"
];
})
sources."strip-ansi-6.0.1"
sources."strip-dirs-2.1.0"
sources."strip-outer-1.0.1"
sources."strnum-1.0.5"
sources."strtok3-6.3.0"
(sources."superagent-7.1.6" // {
dependencies = [
sources."readable-stream-3.6.2"
];
})
(sources."supports-color-8.1.1" // {
dependencies = [
sources."has-flag-4.0.0"
];
})
sources."tar-6.2.0"
(sources."tar-stream-2.2.0" // {
dependencies = [
sources."readable-stream-3.6.2"
];
})
sources."throat-5.0.0"
sources."through-2.3.8"
sources."timers-ext-0.1.7"
sources."tmp-0.0.33"
sources."to-buffer-1.1.1"
sources."to-regex-range-5.0.1"
sources."token-types-4.2.1"
sources."tr46-0.0.3"
sources."traverse-0.6.7"
sources."trim-repeated-1.0.0"
sources."tslib-2.6.2"
sources."type-2.7.2"
sources."type-fest-0.21.3"
sources."typedarray-0.0.6"
(sources."unbzip2-stream-1.4.3" // {
dependencies = [
sources."buffer-5.7.1"
];
})
sources."undici-types-5.26.5"
sources."uni-global-1.0.0"
sources."universalify-2.0.1"
sources."untildify-4.0.0"
sources."uri-js-4.4.1"
(sources."url-0.10.3" // {
dependencies = [
sources."punycode-1.3.2"
sources."querystring-0.2.0"
];
})
sources."utf-8-validate-5.0.10"
sources."util-0.12.5"
sources."util-deprecate-1.0.2"
sources."uuid-9.0.1"
sources."validate-npm-package-name-3.0.0"
sources."wcwidth-1.0.1"
sources."webidl-conversions-3.0.1"
sources."whatwg-url-5.0.0"
sources."which-2.0.2"
sources."which-typed-array-1.1.13"
sources."wrap-ansi-6.2.0"
sources."wrappy-1.0.2"
sources."write-file-atomic-4.0.2"
sources."ws-7.5.9"
sources."xml2js-0.5.0"
sources."xmlbuilder-11.0.1"
sources."xtend-4.0.2"
sources."yallist-4.0.0"
sources."yaml-ast-parser-0.0.43"
sources."yamljs-0.3.0"
sources."yauzl-2.10.0"
(sources."zip-stream-4.1.1" // {
dependencies = [
sources."archiver-utils-3.0.4"
sources."readable-stream-3.6.2"
];
})
];
buildInputs = globalBuildInputs;
meta = {
description = "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more";
homepage = "https://serverless.com/framework/docs/";
license = "MIT";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
shout = nodeEnv.buildNodePackage {
name = "shout";
packageName = "shout";

6
pkgs/development/ocaml-modules/h2/default.nix
View File

@@ -30,9 +30,6 @@ buildDunePackage rec {
src
;
duneVersion = "3";
minimalOCamlVersion = "4.06";
propagatedBuildInputs = [
angstrom
faraday
@@ -42,8 +39,7 @@ buildDunePackage rec {
httpaf
];
# Tests fail with ≤ 4.07
doCheck = lib.versionAtLeast ocaml.version "4.08";
doCheck = true;
preCheck = ''
ln -s "${http2-frame-test-case}" lib_test/http2-frame-test-case
'';

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

@@ -7,14 +7,13 @@
buildDunePackage rec {
pname = "hpack";
version = "0.10.0";
version = "0.11.0";
src = fetchurl {
url = "https://github.com/anmonteiro/ocaml-h2/releases/download/${version}/h2-${version}.tbz";
hash = "sha256-n9avpVL6HD2KBON2FpnUeuH3HOUDOA29iSmjdcxMRvE=";
hash = "sha256-GdXwazlgDurjzy7ekLpuMkCii8W+F/jl/IBv/WTHgFM=";
};
duneVersion = "3";
minimalOCamlVersion = "4.08";
propagatedBuildInputs = [

4
pkgs/development/ocaml-modules/inotify/default.nix
View File

@@ -4,14 +4,14 @@
}:
buildDunePackage rec {
version = "2.4.1";
version = "2.5";
pname = "inotify";
src = fetchFromGitHub {
owner = "whitequark";
repo = "ocaml-inotify";
rev = "v${version}";
hash = "sha256-2ATFF3HeATjhWgW4dG4jheQ9m1oE8xTQ7mpMT/1Jdp8=";
hash = "sha256-3Ju6l6aF5eJgIZJKO0lQGXjjGDzCdX2fuwyNSAjIyAs=";
};
buildInputs = [ lwt ];

4
pkgs/development/ocaml-modules/iter/default.nix
View File

@@ -4,13 +4,13 @@
buildDunePackage rec {
pname = "iter";
version = "1.7";
version = "1.8";
minimalOCamlVersion = "4.08";
src = fetchurl {
url = "https://github.com/c-cube/iter/releases/download/v${version}/iter-${version}.tbz";
hash = "sha256-vtcSnPMxpBwDve1zsR6cEnUsyu3JELPt2Kwu4OEEtzA=";
hash = "sha256-+HOcoFrpxLqKogwNQZfnRAnytlmhfxJzDUKvH9n0MCM=";
};
doCheck = true;

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

@@ -25,14 +25,14 @@
buildPythonPackage rec {
pname = "datashader";
version = "0.15.2";
version = "0.16.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-lTlSk3kofWnBDpq04LKQDhoWAE1v8G3g2EqmLEgzsbs=";
hash = "sha256-7UwRGVdXjcs/z/ly2VT3dYba/XGnNF/VzQadn7BQ0NE=";
};
propagatedBuildInputs = [

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

@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "benthos";
version = "4.22.0";
version = "4.24.0";
src = fetchFromGitHub {
owner = "benthosdev";
repo = "benthos";
rev = "refs/tags/v${version}";
hash = "sha256-RlwHaLW27Y6yRzlvFLpJhOkPa1dYoX87XxMKecoT/dE=";
hash = "sha256-cZhx/a6bTOMP7JKM7ZnMzUEe5R79TIrVpv+6y/9qR0U=";
};
vendorHash = "sha256-9h7AocnhfYecEQbvesuFwXm+cTSd5lS9kdWjjO0GZP4=";
vendorHash = "sha256-6JEFToCBdfdS9MluApkEOcktWU66PpAD07Y9BKSzGx4=";
doCheck = false;

4
pkgs/games/runelite/default.nix
View File

@@ -11,13 +11,13 @@
maven.buildMavenPackage rec {
pname = "runelite";
version = "2.6.9";
version = "2.6.11";
src = fetchFromGitHub {
owner = "runelite";
repo = "launcher";
rev = version;
hash = "sha256-wU97uiotKZfui0ir7rmO1WLN3G6lTMxqF6vTyrlax1Q=";
hash = "sha256-tu3sEhmFZLMqPiBdPCiNYj5s08hMCo8mXpOCx/BP1EM=";
};
mvnHash = "sha256-iGnoAZcJvaVoACi9ozG/f+A8tjvDuwn22bMRyuUU5Jg=";

6
pkgs/servers/invidious/versions.json
View File

@@ -4,9 +4,9 @@
"sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A="
},
"invidious": {
"rev": "9ce9c543992243737516750bf08f5d073e899715",
"sha256": "sha256-yyNtMvHaN3hNxTafhQivN39NzEylrm+FG7S5DNkCtWU=",
"version": "unstable-2023-11-21"
"rev": "9e8baa35397671aabfc77f6b912c9f1829be52b6",
"sha256": "sha256-Mbdh/YMTOamYLZcQ8afKREMC/wTutVnkx8Q0ON8wovQ=",
"version": "unstable-2023-12-06"
},
"lsquic": {
"sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=",

6
pkgs/tools/games/ajour/default.nix
View File

@@ -70,6 +70,12 @@ in rustPlatform.buildRustPackage rec {
libxkbcommon
];
postInstall = ''
mkdir -p $out/share
cp -r resources/logo $out/share/icons
install -Dm444 resources/linux/ajour.desktop -t $out/share/applications
'';
fixupPhase = ''
patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}:$(patchelf --print-rpath $out/bin/ajour)" $out/bin/ajour
wrapProgram $out/bin/ajour --prefix PATH ":" ${lib.makeBinPath [ zenity kdialog ]}

6
pkgs/tools/networking/nexttrace/default.nix
View File

@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "nexttrace";
version = "1.2.3.1";
version = "1.2.6";
src = fetchFromGitHub {
owner = "nxtrace";
repo = "NTrace-core";
rev = "v${version}";
sha256 = "sha256-uY3Cjemv+iFOrWm7lXzRprIljqHCLWOF6DyDURrH39g=";
sha256 = "sha256-UD6+oFXYk5VWD9MZdE3ECnyYJSe7v88D9gkIAj+e7Bw=";
};
vendorHash = "sha256-sugEN7sKBwEKsfX1MBwOiyH1aq1995HL+Yv7Q8XaPAo=";
vendorHash = "sha256-2lDkNbsAgEMSKK7ODpjJEL0ZM4N1khzGuio1645Xxqo=";
doCheck = false; # Tests require a network connection.

68
pkgs/tools/text/enscript/0001-use-system-getopt.patch Normal file
View File

@@ -0,0 +1,68 @@
From 4c5cbf6db71cf2981fc836ed370c82149748d8ea Mon Sep 17 00:00:00 2001
From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com>
Date: Wed, 6 Dec 2023 22:57:19 +0000
Subject: [PATCH] use system getopt
the file compat/getopt.h also needs to be removed otherwise it will
create conflicts with the system includes
---
compat/Makefile.am | 4 ++--
compat/Makefile.in | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/compat/Makefile.am b/compat/Makefile.am
index aefc06f..23aaf81 100644
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -25,7 +25,7 @@
AUTOMAKE_OPTIONS = no-dependencies
noinst_LIBRARIES = libcompat.a
-libcompat_a_SOURCES = getopt.c getopt1.c xalloc.c regex.c
+libcompat_a_SOURCES = xalloc.c regex.c
libcompat_a_LIBADD = @LIBOBJS@ @ALLOCA@
libcompat_a_DEPENDENCIES = @LIBOBJS@ @ALLOCA@
@@ -34,7 +34,7 @@ libcompat_a_SOURCES_windelta = \
+../w32/getpwd.c \
+../w32/getuid.c
-noinst_HEADERS = getopt.h regex.h xalloc.h
+noinst_HEADERS = regex.h xalloc.h
EXTRA_DIST = ChangeLog.old strerror.c memmove.c memcpy.c strtol.c \
strtoul.c gettext.h
diff --git a/compat/Makefile.in b/compat/Makefile.in
index edfc620..dee05d7 100644
--- a/compat/Makefile.in
+++ b/compat/Makefile.in
@@ -137,7 +137,7 @@ am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
am__v_AR_0 = @echo " AR " $@;
am__v_AR_1 =
libcompat_a_AR = $(AR) $(ARFLAGS)
-am_libcompat_a_OBJECTS = getopt.$(OBJEXT) getopt1.$(OBJEXT) \
+am_libcompat_a_OBJECTS = \
xalloc.$(OBJEXT) regex.$(OBJEXT)
libcompat_a_OBJECTS = $(am_libcompat_a_OBJECTS)
AM_V_P = $(am__v_P_@AM_V@)
@@ -326,7 +326,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = no-dependencies
noinst_LIBRARIES = libcompat.a
-libcompat_a_SOURCES = getopt.c getopt1.c xalloc.c regex.c
+libcompat_a_SOURCES = xalloc.c regex.c
libcompat_a_LIBADD = @LIBOBJS@ @ALLOCA@
libcompat_a_DEPENDENCIES = @LIBOBJS@ @ALLOCA@
libcompat_a_SOURCES_windelta = \
@@ -334,7 +334,7 @@ libcompat_a_SOURCES_windelta = \
+../w32/getpwd.c \
+../w32/getuid.c
-noinst_HEADERS = getopt.h regex.h xalloc.h
+noinst_HEADERS = regex.h xalloc.h
EXTRA_DIST = ChangeLog.old strerror.c memmove.c memcpy.c strtol.c \
strtoul.c gettext.h
--
2.42.0

20
pkgs/tools/text/enscript/default.nix
View File

@@ -9,12 +9,20 @@ stdenv.mkDerivation rec {
sha256 = "1fy0ymvzrrvs889zanxcaxjfcxarm2d3k43c9frmbl1ld7dblmkd";
};
preBuild =
''
# Fix building on Darwin with GCC.
substituteInPlace compat/regex.c --replace \
__private_extern__ '__attribute__ ((visibility ("hidden")))'
'';
patches = [
# fix compile failure on macos. use system getopt like linux
# requires that compat/getopt.h is also removed
# https://savannah.gnu.org/bugs/?64307
./0001-use-system-getopt.patch
];
postPatch = ''
# the delete component of 0001-use-system-getopt.patch
rm compat/getopt.h
# Fix building on Darwin with GCC.
substituteInPlace compat/regex.c --replace \
__private_extern__ '__attribute__ ((visibility ("hidden")))'
'';
buildInputs = [ gettext ];

4
pkgs/top-level/aliases.nix
View File

@@ -221,7 +221,11 @@ mapAliases ({
elixir_ls = elixir-ls; # Added 2023-03-20
# Emacs
emacs28NativeComp = emacs28; # Added 2022-06-08
emacs28Packages = emacs28.pkgs; # Added 2021-10-04
emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04
emacsMacport = emacs-macport; # Added 2023-08-10
emacsNativeComp = emacs28NativeComp; # Added 2022-06-08
emacsPackagesNg = throw "'emacsPackagesNg' has been renamed to/replaced by 'emacs.pkgs'"; # Converted to throw 2023-09-10
emacsPackagesNgFor = throw "'emacsPackagesNgFor' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2023-09-10
emacsWithPackages = emacs.pkgs.withPackages; # Added 2020-12-18

17
pkgs/top-level/all-packages.nix
View File

@@ -822,6 +822,10 @@ with pkgs;
sea-orm-cli = callPackage ../development/tools/sea-orm-cli { };
vcpkg-tool = callPackage ../by-name/vc/vcpkg-tool/package.nix {
fmt = fmt_10;
};
r3ctl = qt5.callPackage ../tools/misc/r3ctl { };
ptouch-print = callPackage ../misc/ptouch-print { };
@@ -31338,17 +31342,22 @@ with pkgs;
em = callPackage ../applications/editors/em { };
inherit (recurseIntoAttrs (darwin.apple_sdk_11_0.callPackage ../applications/editors/emacs { }))
emacs28
emacs28-gtk2
emacs28-gtk3
emacs28-nox
emacs29
emacs29-gtk3
emacs29-nox
emacs29-pgtk
emacs28-macport
emacs29-macport
;
emacs-macport = emacs29-macport;
emacs = emacs29;
emacs-gtk = emacs29-gtk3;
emacs-nox = emacs29-nox;
emacs-macport = emacs28-macport;
emacs = emacs28;
emacs-gtk = emacs28-gtk3;
emacs-nox = emacs28-nox;
emacsPackagesFor = emacs: import ./emacs-packages.nix {
inherit (lib) makeScope makeOverridable dontRecurseIntoAttrs;