colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-10-31 18:03:46 +00:00 committed by GitHub
commit 85d6819fff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 2187 additions and 499 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/languages-frameworks/vim.section.md
View File

@ -170,8 +170,8 @@ of precompiled grammars, you can use `nvim-treesitter.withPlugins` function:
start = [
(nvim-treesitter.withPlugins (
plugins: with plugins; [
tree-sitter-nix
tree-sitter-python
nix
python
]
))
];
@ -180,7 +180,7 @@ of precompiled grammars, you can use `nvim-treesitter.withPlugins` function:
})
```
To enable all grammars packaged in nixpkgs, use `(pkgs.vimPlugins.nvim-treesitter.withPlugins (plugins: pkgs.tree-sitter.allGrammars))`.
To enable all grammars packaged in nixpkgs, use `pkgs.vimPlugins.nvim-treesitter.withAllGrammars`.
## Managing plugins with vim-plug {#managing-plugins-with-vim-plug}
@ -203,6 +203,8 @@ Note: this is not possible anymore for Neovim.
Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`.
After running `./update.py`, if nvim-treesitter received an update, also run [`nvim-treesitter/update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py) to update the tree sitter grammars for `nvim-treesitter`.
Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added:
```nix

1374
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix Normal file
View File

File diff suppressed because it is too large Load Diff

38
pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix Normal file
View File

@ -0,0 +1,38 @@
{ lib, callPackage, tree-sitter, nodejs }:
self: super:
let
builtGrammars = callPackage ./generated.nix {
buildGrammar = callPackage ../../../../../development/tools/parsing/tree-sitter/grammar.nix { };
};
allGrammars = lib.filter lib.isDerivation (lib.attrValues builtGrammars);
# Usage:
# pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [ p.c p.java ... ])
# or for all grammars:
# pkgs.vimPlugins.nvim-treesitter.withAllGrammars
withPlugins =
grammarFn: self.nvim-treesitter.overrideAttrs (_: {
postPatch =
let
grammars = tree-sitter.withPlugins (ps: grammarFn (ps // builtGrammars));
in
''
rm -r parser
ln -s ${grammars} parser
'';
});
in
{
passthru = {
inherit builtGrammars allGrammars withPlugins;
tests.builtGrammars = lib.recurseIntoAttrs builtGrammars;
withAllGrammars = withPlugins (_: allGrammars);
};
}

17
pkgs/applications/editors/vim/plugins/nvim-treesitter/update-shell.nix Normal file
View File

@ -0,0 +1,17 @@
{ pkgs ? import ../../../../../.. { } }:
with pkgs;
let
inherit (vimPlugins) nvim-treesitter;
neovim = pkgs.neovim.override {
configure.packages.all.start = [ nvim-treesitter ];
};
in
mkShell {
packages = [ neovim nix-prefetch python3 ];
NVIM_TREESITTER = nvim-treesitter;
}

123
pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py Executable file
View File

@ -0,0 +1,123 @@
#!/usr/bin/env nix-shell
#!nix-shell update-shell.nix -i python
import json
import re
import subprocess
from os import getenv
from os.path import dirname, join
lockfile = json.load(open(join(getenv("NVIM_TREESITTER"), "lockfile.json")))
configs = json.loads(
subprocess.check_output(
[
"nvim",
"--headless",
"-u",
"NONE",
"+lua io.write(vim.json.encode(require('nvim-treesitter.parsers').get_parser_configs()))",
"+quit!",
]
)
)
regex = re.compile("^https?://(github.com|gitlab.com)/(.+?)/(.+?)(.git)?$")
def generate_grammar(item):
lang, lock = item
cfg = configs.get(lang)
if not cfg:
return ""
info = cfg["install_info"]
url = info["url"]
rev = lock["revision"]
generated = f""" {lang} = buildGrammar {{
language = "{lang}";
version = "{rev[:7]}";
source = """
m = regex.fullmatch(url)
cmd = ["nix-prefetch", "--rev", rev]
match m and m.group(1, 2, 3):
case "github.com", owner, repo:
cmd += [
"fetchFromGitHub",
"--owner",
owner,
"--repo",
repo,
]
generated += f"""fetchFromGitHub {{
owner = "{owner}";
repo = "{repo}";"""
case "gitlab.com", owner, repo:
cmd += [
"fetchFromGitLab",
"--owner",
owner,
"--repo",
repo,
]
generated += f"""fetchFromGitLab {{
owner = "{owner}";
repo = "{repo}";"""
case _:
cmd += ["fetchgit", "url"]
generated += f"""fetchgit {{
url = "{url}";"""
if info.get("requires_generate_from_grammar"):
cmd += [
"--arg",
"nativeBuildInputs",
"[ nodejs tree-sitter ]",
"--postFetch",
"pushd $out && tree-sitter generate && popd",
]
generated += """
nativeBuildInputs = [ nodejs tree-sitter ];
postFetch = "pushd $out && tree-sitter generate && popd";"""
hash = subprocess.check_output(cmd, text=True).strip()
generated += f"""
rev = "{rev}";
hash = "{hash}";
}};"""
location = info.get("location")
if location:
generated += f"""
location = "{location}";
"""
generated += """
};
"""
return generated
generated_file = """# generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
{ buildGrammar, fetchFromGitHub, fetchFromGitLab, fetchgit, nodejs, tree-sitter }:
{
"""
for generated in map(generate_grammar, lockfile.items()):
generated_file += generated
generated_file += "}\n"
open(join(dirname(__file__), "generated.nix"), "w").write(generated_file)

22
pkgs/applications/editors/vim/plugins/overrides.nix
View File

@ -67,7 +67,7 @@
, CoreServices
# nvim-treesitter dependencies
, tree-sitter
, callPackage
# sved dependencies
, glib
@ -652,23 +652,9 @@ self: super: {
dependencies = with self; [ plenary-nvim ];
});
# Usage:
# pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ])
# or for all grammars:
# pkgs.vimPlugins.nvim-treesitter.withPlugins (_: tree-sitter.allGrammars)
nvim-treesitter = super.nvim-treesitter.overrideAttrs (old: {
passthru.withPlugins =
grammarFn: self.nvim-treesitter.overrideAttrs (_: {
postPatch =
let
grammars = tree-sitter.withPlugins grammarFn;
in
''
rm -r parser
ln -s ${grammars} parser
'';
});
});
nvim-treesitter = super.nvim-treesitter.overrideAttrs (old:
callPackage ./nvim-treesitter/overrides.nix { } self super
);
octo-nvim = super.octo-nvim.overrideAttrs (old: {
dependencies = with self; [ telescope-nvim plenary-nvim ];

48
pkgs/applications/emulators/mame/default.nix
View File

@ -1,9 +1,11 @@
{ lib
, stdenv
, alsa-lib
, copyDesktopItems
, CoreAudioKit
, expat
, fetchFromGitHub
, fetchurl
, flac
, fontconfig
, ForceFeedback
@ -33,14 +35,11 @@
}:
let
desktopItem = makeDesktopItem {
name = "MAME";
exec = "mame${lib.optionalString stdenv.is64bit "64"}";
desktopName = "MAME";
genericName = "MAME is a multi-purpose emulation framework";
categories = [ "System" "Emulator" ];
# Get icon from Arch Linux package
icon = fetchurl {
url = "https://raw.githubusercontent.com/archlinux/svntogit-community/614b24ef3856cb52b5cafc386b0f77923cbc9156/trunk/mame.svg";
sha256 = "sha256-F8RCyTPXZBdeTOHeUKgMDC3dXXM8rwnDzV5rppesQ/Q=";
};
dest = "$out/opt/mame";
in
stdenv.mkDerivation rec {
@ -54,8 +53,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-im6y/E0pQxruX2kNXZLE3fHq+zXfsstnOoC1QvH4fd4=";
};
hardeningDisable = [ "fortify" ];
makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
"CXX=${stdenv.cc.targetPrefix}c++"
@ -97,7 +94,14 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio libXinerama libXi fontconfig ]
++ lib.optionals stdenv.isDarwin [ libpcap CoreAudioKit ForceFeedback ];
nativeBuildInputs = [ python3 pkg-config which makeWrapper installShellFiles ];
nativeBuildInputs = [
copyDesktopItems
installShellFiles
makeWrapper
pkg-config
python3
which
];
patches = [
# MAME is now generating the PDF documentation on its release script since commit:
@ -116,7 +120,23 @@ stdenv.mkDerivation rec {
--subst-var-by mame ${dest}
'';
desktopItems = [
(makeDesktopItem {
name = "MAME";
desktopName = "MAME";
exec = "mame";
icon = "mame";
type = "Application";
genericName = "MAME is a multi-purpose emulation framework";
comment = "Play vintage games using the MAME emulator";
categories = [ "Game" "Emulator" ];
keywords = [ "Game" "Emulator" "Arcade" ];
})
];
installPhase = ''
runHook preInstall
make -f dist.mak PTR64=${lib.optionalString stdenv.is64bit "1"}
mkdir -p ${dest}
mv build/release/*/Release/mame/* ${dest}
@ -126,11 +146,11 @@ stdenv.mkDerivation rec {
install -Dm755 src/osd/sdl/taputil.sh $out/bin/taputil.sh
installManPage ${dest}/docs/man/*.1 ${dest}/docs/man/*.6
install -Dm644 ${icon} $out/share/icons/hicolor/scalable/apps/mame.svg
mv artwork plugins samples ${dest}
'' + lib.optionalString stdenv.isLinux ''
mkdir -p $out/share
ln -s ${desktopItem}/share/applications $out/share
runHook postInstall
'';
enableParallelBuilding = true;
@ -146,7 +166,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
broken = stdenv.isDarwin;
description = "Is a multi-purpose emulation framework";
homepage = "https://www.mamedev.org/";
license = with licenses; [ bsd3 gpl2Plus ];

9
pkgs/applications/misc/lutris/fhsenv.nix
View File

@ -126,6 +126,15 @@ in buildFHSUserEnv {
ln -sf ${lutris-unwrapped}/share/icons $out/share
'';
# allows for some gui applications to share IPC
# this fixes certain issues where they don't render correctly
unshareIpc = false;
# Some applications such as Natron need access to MIT-SHM or other
# shared memory mechanisms. Unsharing the pid namespace
# breaks the ability for application to reference shared memory.
unsharePid = false;
meta = {
inherit (lutris-unwrapped.meta)
homepage

786
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -3,10 +3,10 @@
rec {
firefox = buildMozillaMach rec {
pname = "firefox";
version = "106.0.2";
version = "106.0.3";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "2aad75c05c3398c19842be46dcde275581344b09f0c65b51a630cef201545996ee00f8020f52a0d7b6416d9ad52cbd5c71b8f1cdf47cd18e4abf1ba21f7cdb93";
sha512 = "226bde9082330abe134d1726cec59b473d4d6839ea55ca20faddb901f032d89eb9d2bd5d887ccd4ba515c6b1a44817420cfee2e9f4f8a79ed46a38287083d28d";
};
# This patch could be applied anywhere (just rebuild, no effect)

6
pkgs/development/compilers/openjdk/11.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, bash, pkg-config, autoconf, cpio, file, which, unzip
, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
, libXcursor, libXrandr, fontconfig, openjdk11-bootstrap
, setJavaClassPath
@ -27,7 +27,7 @@ let
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk11-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
@ -54,6 +54,8 @@ let
"--with-version-pre="
"--enable-unlimited-crypto"
"--with-native-debug-symbols=internal"
"--with-freetype=system"
"--with-harfbuzz=system"
"--with-libjpeg=system"
"--with-giflib=system"
"--with-libpng=system"

6
pkgs/development/compilers/openjdk/12.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
, libXcursor, libXrandr, fontconfig, openjdk11, fetchpatch
, setJavaClassPath
@ -24,7 +24,7 @@ let
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk11
] ++ lib.optionals (!headless && enableGnome2) [
@ -63,6 +63,8 @@ let
"--with-version-pre="
"--enable-unlimited-crypto"
"--with-native-debug-symbols=internal"
"--with-freetype=system"
"--with-harfbuzz=system"
"--with-libjpeg=system"
"--with-giflib=system"
"--with-libpng=system"

6
pkgs/development/compilers/openjdk/13.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch
, setJavaClassPath
@ -24,7 +24,7 @@ let
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
@ -63,6 +63,8 @@ let
"--with-version-pre="
"--enable-unlimited-crypto"
"--with-native-debug-symbols=internal"
"--with-freetype=system"
"--with-harfbuzz=system"
"--with-libjpeg=system"
"--with-giflib=system"
"--with-libpng=system"

6
pkgs/development/compilers/openjdk/14.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
, libXcursor, libXrandr, fontconfig, openjdk14-bootstrap
, setJavaClassPath
@ -24,7 +24,7 @@ let
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
@ -58,6 +58,8 @@ let
"--with-version-pre="
"--enable-unlimited-crypto"
"--with-native-debug-symbols=internal"
"--with-freetype=system"
"--with-harfbuzz=system"
"--with-libjpeg=system"
"--with-giflib=system"
"--with-libpng=system"

6
pkgs/development/compilers/openjdk/15.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
, libXcursor, libXrandr, fontconfig, openjdk15-bootstrap
, setJavaClassPath
@ -24,7 +24,7 @@ let
nativeBuildInputs = [ pkg-config autoconf unzip zip file which ];
buildInputs = [
cpio perl zlib cups freetype alsa-lib libjpeg giflib
cpio perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
@ -58,6 +58,8 @@ let
"--with-version-pre="
"--enable-unlimited-crypto"
"--with-native-debug-symbols=internal"
"--with-freetype=system"
"--with-harfbuzz=system"
"--with-libjpeg=system"
"--with-giflib=system"
"--with-libpng=system"

6
pkgs/development/compilers/openjdk/16.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio
, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib
, file, which, unzip, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib
, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst
, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk16-bootstrap
, setJavaClassPath
@ -28,7 +28,7 @@ let
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk16-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
@ -65,6 +65,8 @@ let
"--with-version-pre="
"--enable-unlimited-crypto"
"--with-native-debug-symbols=internal"
"--with-freetype=system"
"--with-harfbuzz=system"
"--with-libjpeg=system"
"--with-giflib=system"
"--with-libpng=system"

6
pkgs/development/compilers/openjdk/17.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio
, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib
, file, which, unzip, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib
, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst
, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk17-bootstrap
, setJavaClassPath
@ -28,7 +28,7 @@ let
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk17-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
@ -74,6 +74,8 @@ let
"--with-version-pre="
"--enable-unlimited-crypto"
"--with-native-debug-symbols=internal"
"--with-freetype=system"
"--with-harfbuzz=system"
"--with-libjpeg=system"
"--with-giflib=system"
"--with-libpng=system"

6
pkgs/development/compilers/openjdk/18.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio
, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib
, file, which, unzip, zip, perl, cups, freetype, harfbuzz, alsa-lib, libjpeg, giflib
, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst
, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk18-bootstrap
, setJavaClassPath
@ -27,7 +27,7 @@ let
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk18-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
@ -65,6 +65,8 @@ let
"--with-version-pre="
"--enable-unlimited-crypto"
"--with-native-debug-symbols=internal"
"--with-freetype=system"
"--with-harfbuzz=system"
"--with-libjpeg=system"
"--with-giflib=system"
"--with-libpng=system"

7
pkgs/development/libraries/raylib/default.nix
View File

@ -5,6 +5,7 @@
, pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio
, sharedLib ? true
, includeEverything ? true
, raylib-games
}:
stdenv.mkDerivation rec {
@ -19,10 +20,12 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
buildInputs = [
mesa libGLU glfw libX11 libXi libXcursor libXrandr libXinerama
mesa glfw libXi libXcursor libXrandr libXinerama
] ++ lib.optional alsaSupport alsa-lib
++ lib.optional pulseSupport libpulseaudio;
propagatedBuildInputs = [ libGLU libX11 ];
patches = [
# fixes glfw compile error;
@ -48,6 +51,8 @@ stdenv.mkDerivation rec {
${lib.optionalString pulseSupport "patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/libraylib.so.${version}"}
'';
passthru.tests = [ raylib-games ];
meta = with lib; {
description = "A simple and easy-to-use library to enjoy videogames programming";
homepage = "https://www.raylib.com/";

57
pkgs/games/raylib-games/default.nix Normal file
View File

@ -0,0 +1,57 @@
{ lib, stdenv, fetchFromGitHub, raylib }:
stdenv.mkDerivation rec {
pname = "raylib-games";
version = "2022-10-24";
src = fetchFromGitHub {
owner = "raysan5";
repo = pname;
rev = "e00d77cf96ba63472e8316ae95a23c624045dcbe";
hash = "sha256-N9ip8yFUqXmNMKcvQuOyxDI4yF/w1YaoIh0prvS4Xr4=";
};
buildInputs = [ raylib ];
configurePhase = ''
runHook preConfigure
for d in *; do
if [ -d $d/src/resources ]; then
for f in $d/src/*.c $d/src/*.h; do
sed "s|\"resources/|\"$out/resources/$d/|g" -i $f
done
fi
done
runHook postConfigure
'';
buildPhase = ''
runHook preBuild
for d in *; do
if [ -f $d/src/Makefile ]; then
make -C $d/src
fi
done
runHook postBuild
'';
installPhase = ''
runHook preBuild
mkdir -p $out/bin $out/resources
find . -type f -executable -exec cp {} $out/bin \;
for d in *; do
if [ -d "$d/src/resources" ]; then
cp -ar "$d/src/resources" "$out/resources/$d"
fi
done
runHook postBuild
'';
meta = with lib; {
description = "A collection of games made with raylib ";
homepage = "https://www.raylib.com/games.html";
license = licenses.zlib;
maintainers = with maintainers; [ ehmry ];
inherit (raylib.meta) platforms;
};
}

16
pkgs/os-specific/linux/dpdk-kmods/default.nix
View File

@ -1,14 +1,21 @@
{ lib, stdenv, fetchzip, kernel }:
{ lib, stdenv, fetchzip, fetchpatch, kernel }:
stdenv.mkDerivation rec {
pname = "dpdk-kmods";
version = "2021-04-21";
version = "2022-08-29";
src = fetchzip {
url = "https://git.dpdk.org/dpdk-kmods/snapshot/dpdk-kmods-e13d7af77a1bf98757f85c3c4083f6ee6d0d2372.tar.xz";
sha256 = "sha256-8ysWT3X3rIyUAo4/QbkX7cQq5iFeU18/BPsmmWugcIc=";
url = "https://git.dpdk.org/dpdk-kmods/snapshot/dpdk-kmods-4a589f7bed00fc7009c93d430bd214ac7ad2bb6b.tar.xz";
sha256 = "sha256-l9asJuw2nl63I1BxK6udy2pNunRiMJxyoXeg9V5+WgI=";
};
patches = [
(fetchpatch {
url = "https://git.launchpad.net/ubuntu/+source/dpdk-kmods/plain/debian/patches/0001-support-linux-5.18.patch?id=9d628c02c169d8190bc2cb6afd81e4d364c382cd";
sha256 = "sha256-j4kpx1DOnmf5lFxOhaVFNT7prEy1jrJERX2NFaybTPU=";
})
];
hardeningDisable = [ "pic" ];
makeFlags = kernel.makeFlags ++ [
@ -32,6 +39,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Only;
maintainers = [ maintainers.mic92 ];
platforms = platforms.linux;
broken = kernel.kernelAtLeast "5.18";
};
}

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

@ -9,14 +9,14 @@
let
mod = kernel != null;
dpdkVersion = "22.03";
dpdkVersion = "22.07";
in stdenv.mkDerivation rec {
pname = "dpdk";
version = "${dpdkVersion}" + lib.optionalString mod "-${kernel.version}";
src = fetchurl {
url = "https://fast.dpdk.org/rel/dpdk-${dpdkVersion}.tar.xz";
sha256 = "sha256-st5fCLzVcz+Q1NfmwDJRWQja2PyNJnrGolNELZuDp8U=";
sha256 = "sha256-n2Tf3gdf21cIy2Leg4uP+4kVdf7R4dKusma6yj38m+o=";
};
nativeBuildInputs = [
@ -91,6 +91,6 @@ in stdenv.mkDerivation rec {
license = with licenses; [ lgpl21 gpl2 bsd2 ];
platforms = platforms.linux;
maintainers = with maintainers; [ magenbluten orivej mic92 zhaofengli ];
broken = mod && kernel.kernelAtLeast "5.18";
broken = mod && kernel.isHardened;
};
}

40
pkgs/os-specific/linux/kernel/hardened/patches.json
View File

@ -22,22 +22,22 @@
"5.10": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.10.150-hardened1.patch",
"sha256": "0sx7y7027yb05djwvpx44rmz47aybqc8r9j8z8kdiyx521fy5a56",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.150-hardened1/linux-hardened-5.10.150-hardened1.patch"
"name": "linux-hardened-5.10.152-hardened1.patch",
"sha256": "0j5zbmhf1lf9b4xy11h48rl7vcj7jk4bx8phwkk2bvvrapv05r3j",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.152-hardened1/linux-hardened-5.10.152-hardened1.patch"
},
"sha256": "1qfyfhyz0b078qp2m14cxldx0m1mlfx2gdp4dnrbxc3hblybq4sq",
"version": "5.10.150"
"sha256": "19nq2pgy4vmn30nywdvcvsx4vhmndrj97iiclpqakzgblj1mq2zs",
"version": "5.10.152"
},
"5.15": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.15.75-hardened1.patch",
"sha256": "1qyk468v9bvx5jv3h610l1xy86klradb3ayxxmhw57xgh6964gbc",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.75-hardened1/linux-hardened-5.15.75-hardened1.patch"
"name": "linux-hardened-5.15.76-hardened1.patch",
"sha256": "0wrrys0wbjczish6jp3mdcsrqph8bvid27cjfr6r7pvpzw9cwimi",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.76-hardened1/linux-hardened-5.15.76-hardened1.patch"
},
"sha256": "1ijzqkp9mbfvm8ii5rash401b6wqywkql9j2rxdgbk2r6vfmp9nr",
"version": "5.15.75"
"sha256": "0zymcp88654qk896djvc2ngdksvhkzh1ndhfk1dn5qqrqhha01wh",
"version": "5.15.76"
},
"5.19": {
"patch": {
@ -52,21 +52,21 @@
"5.4": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.4.220-hardened1.patch",
"sha256": "04c81ydfwk4zz28sdjlhkil5ymzigkq440w47slnzwxdny8wn5gw",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.220-hardened1/linux-hardened-5.4.220-hardened1.patch"
"name": "linux-hardened-5.4.221-hardened1.patch",
"sha256": "19zp4pn8vbrgcnq1m9wck5ixs7247amwifngzb1630jniqhkrj0n",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.221-hardened1/linux-hardened-5.4.221-hardened1.patch"
},
"sha256": "0mh2p0hxb971mv3jjld5c85cbs85b5nmcq5j9akvq8y2jbai6b4d",
"version": "5.4.220"
"sha256": "02nz9534998s922fdb0kpb09flgjmc7p78x0ypfxrd6pzv0pzcr7",
"version": "5.4.221"
},
"6.0": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.0.5-hardened1.patch",
"sha256": "1iksmyf0n3jx97ssqfw4878gxk9fcdx934rqq1hy6dky5lz67kwl",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.5-hardened1/linux-hardened-6.0.5-hardened1.patch"
"name": "linux-hardened-6.0.6-hardened1.patch",
"sha256": "1p6l1ysxclp10bl3sd5kvzrp29kdqddk6hvy8dxydni1kysvf2j8",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.6-hardened1/linux-hardened-6.0.6-hardened1.patch"
},
"sha256": "13j1c25g48688fbgiw416d7svld7jrc9dyxbz880riak5gr2wcv1",
"version": "6.0.5"
"sha256": "1akzfkwjbxki6r41gcnp5fml389i8ng9bid9c4ysg6w65nphajw6",
"version": "6.0.6"
}
}

4
pkgs/os-specific/linux/kernel/linux-5.10.nix
View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.150";
version = "5.10.152";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1qfyfhyz0b078qp2m14cxldx0m1mlfx2gdp4dnrbxc3hblybq4sq";
sha256 = "19nq2pgy4vmn30nywdvcvsx4vhmndrj97iiclpqakzgblj1mq2zs";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.15.nix
View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.15.75";
version = "5.15.76";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1ijzqkp9mbfvm8ii5rash401b6wqywkql9j2rxdgbk2r6vfmp9nr";
sha256 = "0zymcp88654qk896djvc2ngdksvhkzh1ndhfk1dn5qqrqhha01wh";
};
} // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-5.4.nix
View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.220";
version = "5.4.221";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0mh2p0hxb971mv3jjld5c85cbs85b5nmcq5j9akvq8y2jbai6b4d";
sha256 = "02nz9534998s922fdb0kpb09flgjmc7p78x0ypfxrd6pzv0pzcr7";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-6.0.nix
View File

@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.0.5";
version = "6.0.6";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "13j1c25g48688fbgiw416d7svld7jrc9dyxbz880riak5gr2wcv1";
sha256 = "1akzfkwjbxki6r41gcnp5fml389i8ng9bid9c4ysg6w65nphajw6";
};
} // (args.argsOverride or { }))

6
pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
View File

@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.10.145-rt74"; # updated by ./update-rt.sh
version = "5.10.152-rt75"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "0qdcqmwvc70hfgj8hb8ccwmnvwl41dvdffqrmyg3cyblwprr0ngw";
sha256 = "19nq2pgy4vmn30nywdvcvsx4vhmndrj97iiclpqakzgblj1mq2zs";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "16a2cnvn1azxsw1qjwbygkych0jzkfpmj0kx08jdz3fx3xbmqpr4";
sha256 = "0sg78zrkk7scg6b2xcvdymmhfdrlzcajhzzway5gjdi04x4vy4k0";
};
}; in [ rt-patch ] ++ kernelPatches;

4
pkgs/servers/web-apps/wiki-js/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wiki-js";
version = "2.5.289";
version = "2.5.290";
src = fetchurl {
url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz";
sha256 = "sha256-hHUVHsRRlwFxHriaf7uHsaxRvQmeOKFHvz/taooK4YM=";
sha256 = "sha256-5vr8rD4gGeMoSPAQnIGzKLu63S9Latw5n4Dz0sD81is=";
};
sourceRoot = ".";

7
pkgs/tools/X11/xpra/default.nix
View File

@ -186,9 +186,14 @@ in buildPythonApplication rec {
)
'';
# append module paths to xorg.conf
postInstall = ''
# append module paths to xorg.conf
cat ${xorgModulePaths} >> $out/etc/xpra/xorg.conf
# make application icon visible to desktop environemnts
icon_dir="$out/share/icons/hicolor/64x64/apps"
mkdir -p "$icon_dir"
ln -sr "$out/share/icons/xpra.png" "$icon_dir"
'';
doCheck = false;

6
pkgs/tools/admin/fits-cloudctl/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "fits-cloudctl";
version = "0.10.22";
version = "0.11.1";
src = fetchFromGitHub {
owner = "fi-ts";
repo = "cloudctl";
rev = "v${version}";
sha256 = "sha256-9Vl4FWmKaNWl5QcfFc5KDyLWMRmAEqkBwMqwqhXkjgo=";
sha256 = "sha256-QFmrBxNFzKrlvni2wbxM2tQP7z+QjLi9S7gqkVFWOmU=";
};
vendorSha256 = "sha256-10QeWL3tIcs2E4pK9UAY8C41YYjA3LHlvIbDhWVYATE=";
vendorSha256 = "sha256-aH1WGL7crF9VXHgcVxR0K3dNkV/J0wcBKgS9103dPes=";
meta = with lib; {
description = "Command-line client for FI-TS Finance Cloud Native services";

26
pkgs/tools/misc/frei/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "frei";
version = "0.1.0";
src = fetchFromGitHub {
owner = "alexcoder04";
repo = "frei";
rev = "v${version}";
sha256 = "sha256-9CV6B7fRHXl73uI2JRv3RiaFczLHHBOd7/8UoCAwK6w=";
};
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
meta = with lib; {
description = "Modern replacement for free";
homepage = "https://github.com/alexcoder04/frei";
license = licenses.gpl3Only;
maintainers = with maintainers; [ infinidoge ];
mainProgram = "frei";
};
}

4
pkgs/tools/networking/ooniprobe-cli/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "ooniprobe-cli";
version = "3.16.3";
version = "3.16.4";
src = fetchFromGitHub {
owner = "ooni";
repo = "probe-cli";
rev = "v${version}";
hash = "sha256-LCihFw0WprVmL6t0TLHRY35Uek7catA4fIfp+yox87E=";
hash = "sha256-DXqHJCzRYRiFgDa/OTBxWoWzz8uAZAwE1xCwIm30VDM=";
};
vendorSha256 = "sha256-eH+PfclxqgffM/pzIkdl7x+6Ie6UPyUpWkJ7+G5eN/E=";

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

@ -1583,7 +1583,7 @@ with pkgs;
maiko = callPackage ../applications/emulators/maiko { };
mame = libsForQt514.callPackage ../applications/emulators/mame {
mame = libsForQt5.callPackage ../applications/emulators/mame {
inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback;
};
@ -4018,6 +4018,8 @@ with pkgs;
frawk = callPackage ../tools/text/frawk { };
frei = callPackage ../tools/misc/frei { };
fselect = callPackage ../tools/misc/fselect { };
fsmon = callPackage ../tools/misc/fsmon { };
@ -34440,6 +34442,8 @@ with pkgs;
randtype = callPackage ../games/randtype { };
raylib-games = callPackage ../games/raylib-games { };
redeclipse = callPackage ../games/redeclipse { };
rftg = callPackage ../games/rftg { };

8
pkgs/top-level/python-packages.nix
View File

@ -6075,9 +6075,9 @@ self: super: with self; {
networkx = callPackage ../development/python-modules/networkx { };
neuron-mpi = pkgs.neuron-mpi.override { inherit python; };
neuron-mpi = toPythonModule (pkgs.neuron-mpi.override { inherit python; });
neuron = pkgs.neuron.override { inherit python; };
neuron = toPythonModule (pkgs.neuron.override { inherit python; });
neuronpy = callPackage ../development/python-modules/neuronpy { };
@ -7483,7 +7483,7 @@ self: super: with self; {
pyblake2 = callPackage ../development/python-modules/pyblake2 { };
pyblock = callPackage ../development/python-modules/pyblock { };
pyblock = toPythonModule (callPackage ../development/python-modules/pyblock { });
pybluez = callPackage ../development/python-modules/pybluez {
inherit (pkgs) bluez;
@ -9242,7 +9242,7 @@ self: super: with self; {
inherit (pkgs) udev;
};
pyunbound = callPackage ../tools/networking/unbound/python.nix { };
pyunbound = toPythonModule (callPackage ../tools/networking/unbound/python.nix { });
pyunifi = callPackage ../development/python-modules/pyunifi { };