Merge master into staging-next

Changed files
+836 -565
doc
lib
maintainers
nixos
modules
config
services
web-apps
tests
pkgs
applications
graphics
shotwell
snapshot
misc
networking
cluster
science
math
qalculate-gtk
qalculate-qt
by-name
al
alephone
alephone-apotheosis-x
alephone-durandal
alephone-eternal
alephone-evil
alephone-infinity
alephone-marathon
alephone-pathways-into-darkness
alephone-pheonix
alephone-red
alephone-rubicon-x
alephone-yuge
sy
syndicate_utils
desktops
gnome
apps
file-roller
gnome-maps
core
gnome-control-center
gnome-shell
gnome-shell-extensions
mutter
nautilus
zenity
development
compilers
libraries
libbacktrace
libqalculate
wxwidgets
php-packages
tools
language-servers
pylyzer
games
alephone
servers
tools
audio
whisper-ctranslate2
misc
ttyplot
package-management
nix-eval-jobs
security
tpm2-tools
volatility
system
gnome-resources
top-level
+10 -6
doc/README.md
···
-
# Contributing to the Nixpkgs manual
+
# Contributing to the Nixpkgs reference manual
-
This directory houses the sources files for the Nixpkgs manual.
+
This directory houses the sources files for the Nixpkgs reference manual.
-
You can find the [rendered documentation for Nixpkgs `unstable` on nixos.org](https://nixos.org/manual/nixpkgs/unstable/).
-
The rendering tool is [nixos-render-docs](../pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs), sometimes abbreviated `nrd`.
+
Going forward, it should only contain [reference](https://nix.dev/contributing/documentation/diataxis#reference) documentation.
+
For tutorials, guides and explanations, contribute to <https://nix.dev/> instead.
-
[Docs for Nixpkgs stable](https://nixos.org/manual/nixpkgs/stable/) are also available.
+
For documentation only relevant for contributors, use Markdown files and code comments in the source code.
-
If you're only getting started with Nix, go to [nixos.org/learn](https://nixos.org/learn).
+
Rendered documentation:
+
- [Unstable (from master)](https://nixos.org/manual/nixpkgs/unstable/)
+
- [Stable (from latest release)](https://nixos.org/manual/nixpkgs/stable/)
+
+
The rendering tool is [nixos-render-docs](../pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs), sometimes abbreviated `nrd`.
## Contributing to this documentation
+15 -2
doc/languages-frameworks/nim.section.md
···
$ nix run -f . nim_lk ./result | jq --sort-keys > pkgs/by-name/tt/ttop/lock.json
```
-
## Lockfile dependency overrides {#nimoverrides}
+
## Overriding Nim packages {#nim-overrides}
+
+
The `buildNimPackage` function generates flags and additional build dependencies from the `lockFile` parameter passed to `buildNimPackage`. Using [`overrideAttrs`](#sec-pkg-overrideAttrs) on the final package will apply after this has already been generated, so this can't be used to override the `lockFile` in a package built with `buildNimPackage`. To be able to override parameters before flags and build dependencies are generated from the `lockFile`, use `overrideNimAttrs` instead with the same syntax as `overrideAttrs`:
+
+
```nix
+
pkgs.nitter.overrideNimAttrs {
+
# using a different source which has different dependencies from the standard package
+
src = pkgs.fetchFromGithub { /* … */ };
+
# new lock file generated from the source
+
lockFile = ./custom-lock.json;
+
}
+
```
+
+
## Lockfile dependency overrides {#nim-lock-overrides}
The `buildNimPackage` function matches the libraries specified by `lockFile` to attrset of override functions that are then applied to the package derivation.
The default overrides are maintained as the top-level `nimOverrides` attrset at `pkgs/top-level/nim-overrides.nix`.
···
- finalAttrs: the final attrset passed by `buildNimPackage` to `stdenv.mkDerivation`.
- prevAttrs: the attrset produced by initial arguments to `buildNimPackage` and any preceding lockfile overlays.
-
### Overriding an Nim library override {#nimoverrides-overrides}
+
### Overriding an Nim library override {#nim-lock-overrides-overrides}
The `nimOverrides` attrset makes it possible to modify overrides in a few different ways.
+1 -1
doc/manual.md.in
···
-
# Nixpkgs Manual {#nixpkgs-manual}
+
# Nixpkgs Reference Manual {#nixpkgs-manual}
## Version @MANUAL_VERSION@
```{=include=} chapters
+9 -5
doc/preface.chapter.md
···
Packages are available for several platforms, and can be used with the Nix
package manager on most GNU/Linux distributions as well as [NixOS](https://nixos.org/nixos).
-
This manual primarily describes how to write packages for the Nix Packages collection
-
(Nixpkgs). Thus it’s mainly for packagers and developers who want to add packages to
-
Nixpkgs. If you like to learn more about the Nix package manager and the Nix
-
expression language, then you are kindly referred to the [Nix manual](https://nixos.org/nix/manual/).
-
The NixOS distribution is documented in the [NixOS manual](https://nixos.org/nixos/manual/).
+
This document is the user [_reference_](https://nix.dev/contributing/documentation/diataxis#reference) manual for Nixpkgs.
+
It describes entire public interface of Nixpkgs in a concise and orderly manner, and all relevant behaviors, with examples and cross-references.
+
+
To discover other kinds of documentation:
+
- [nix.dev](https://nix.dev/): Tutorials and guides for getting things done with Nix
+
- [NixOS **Option Search**](https://search.nixos.org/options) and reference documentation
+
- [Nixpkgs **Package Search**](https://search.nixos.org/packages)
+
- [**NixOS** manual](https://nixos.org/manual/nixos/stable/): Reference documentation for the NixOS Linux distribution
+
- [`CONTRIBUTING.md`](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md): Contributing to Nixpkgs, including this manual
## Overview of Nixpkgs {#overview-of-nixpkgs}
+1 -1
lib/README.md
···
These comments are processed using [nixdoc](https://github.com/nix-community/nixdoc) and [rendered in the Nixpkgs manual](https://nixos.org/manual/nixpkgs/stable/#chap-functions).
The nixdoc README describes the [comment format](https://github.com/nix-community/nixdoc#comment-format).
-
See the [chapter on contributing to the Nixpkgs manual](https://nixos.org/manual/nixpkgs/#chap-contributing) for how to build the manual.
+
See [doc/README.md](../doc/README.md) for how to build the manual.
## Running tests
+6
maintainers/maintainer-list.nix
···
githubId = 454695;
name = "Artur Taranchiev";
};
+
ewuuwe = {
+
email = "ewu.uweq@pm.me";
+
github = "ewuuwe";
+
githubId = 63652646;
+
name = "Xaver Oswald";
+
};
exarkun = {
email = "exarkun@twistedmatrix.com";
github = "exarkun";
+1
nixos/modules/config/no-x-libs.nix
···
mc = super.mc.override { x11Support = false; };
mpv-unwrapped = super.mpv-unwrapped.override { sdl2Support = false; x11Support = false; waylandSupport = false; };
msmtp = super.msmtp.override { withKeyring = false; };
+
mupdf = super.mupdf.override { enableGL = false; enableX11 = false; };
neofetch = super.neofetch.override { x11Support = false; };
networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; };
networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; };
+1 -1
nixos/modules/services/web-apps/nextcloud.nix
···
};
phpOptions = mkOption {
-
type = types.attrsOf types.str;
+
type = with types; attrsOf (oneOf [ str int ]);
defaultText = literalExpression (generators.toPretty { } defaultPHPSettings);
description = lib.mdDoc ''
Options for PHP's php.ini file for nextcloud.
+1 -3
nixos/tests/mobilizon.nix
···
meta.maintainers = with lib.maintainers; [ minijackson erictapen ];
nodes.server =
-
{ pkgs, ... }:
+
{ ... }:
{
services.mobilizon = {
enable = true;
···
};
};
};
-
-
services.postgresql.package = pkgs.postgresql_14;
security.pki.certificateFiles = [ certs.ca.cert ];
+6 -6
pkgs/applications/graphics/shotwell/default.nix
···
# for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling
-
stdenv.mkDerivation rec {
+
stdenv.mkDerivation (finalAttrs: {
pname = "shotwell";
-
version = "0.32.3";
+
version = "0.32.4";
src = fetchurl {
-
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-
sha256 = "sha256-4AD+5bPzYseRFPDs/44is0yaKGW1nkGi2j5NxdLKLDw=";
+
url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz";
+
sha256 = "sha256-3iqUUIRtHOwUxqEDA3X9SeGvJNySCtZIA0QST5zLhW8=";
};
nativeBuildInputs = [
···
passthru = {
updateScript = gnome.updateScript {
-
packageName = pname;
+
packageName = "shotwell";
versionPolicy = "odd-unstable";
};
};
···
maintainers = with maintainers; [];
platforms = platforms.linux;
};
-
}
+
})
+5 -15
pkgs/applications/graphics/snapshot/default.nix
···
{ stdenv
, lib
, fetchurl
-
, fetchpatch
, cargo
, desktop-file-utils
, meson
···
, gnome
}:
-
stdenv.mkDerivation rec {
+
stdenv.mkDerivation (finalAttrs: {
pname = "snapshot";
-
version = "45.0";
+
version = "45.1";
src = fetchurl {
-
url = "mirror://gnome/sources/snapshot/${lib.versions.major version}/snapshot-${version}.tar.xz";
-
hash = "sha256-7keO4JBzGgsIJLZrsXRr2ADcv+h6yDWEmUSa85z822c=";
+
url = "mirror://gnome/sources/snapshot/${lib.versions.major finalAttrs.version}/snapshot-${finalAttrs.version}.tar.xz";
+
hash = "sha256-/kRifa7zrZbBaaLlRhDmZxj4k9cN/SXUDTBskYQ7zjk=";
};
-
-
patches = [
-
# Fix portal requests
-
# https://gitlab.gnome.org/GNOME/snapshot/-/merge_requests/168
-
(fetchpatch {
-
url = "https://gitlab.gnome.org/GNOME/snapshot/-/commit/6aec0f56d6bb994731c1309ac6e2cb822b82067e.patch";
-
hash = "sha256-6tnOhhTQ3Rfl3nCw/rliLKkvZknvZKCQyeMKaTxYmok=";
-
})
-
];
nativeBuildInputs = [
cargo
···
platforms = platforms.unix;
mainProgram = "snapshot";
};
-
}
+
})
+172
pkgs/applications/misc/bambu-studio/default.nix
···
+
{ stdenv
+
, lib
+
, openexr
+
, jemalloc
+
, c-blosc
+
, binutils
+
, fetchFromGitHub
+
, cmake
+
, pkg-config
+
, wrapGAppsHook
+
, boost179
+
, cereal
+
, cgal_5
+
, curl
+
, dbus
+
, eigen
+
, expat
+
, gcc-unwrapped
+
, glew
+
, glfw
+
, glib
+
, glib-networking
+
, gmp
+
, gstreamer
+
, gst-plugins-base
+
, gst-plugins-bad
+
, gtest
+
, gtk3
+
, hicolor-icon-theme
+
, ilmbase
+
, libpng
+
, mesa
+
, mpfr
+
, nlopt
+
, opencascade-occt
+
, openvdb
+
, pcre
+
, qhull
+
, systemd
+
, tbb_2021_8
+
, webkitgtk
+
, wxGTK31
+
, xorg
+
, fetchpatch
+
, withSystemd ? stdenv.isLinux
+
}:
+
let
+
wxGTK31' = wxGTK31.overrideAttrs (old: {
+
configureFlags = old.configureFlags ++ [
+
# Disable noisy debug dialogs
+
"--enable-debug=no"
+
];
+
});
+
openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec {
+
buildInputs = [ openexr boost179 tbb_2021_8 jemalloc c-blosc ilmbase ];
+
});
+
in
+
stdenv.mkDerivation rec {
+
pname = "bambu-studio";
+
version = "01.08.00.62";
+
+
src = fetchFromGitHub {
+
owner = "bambulab";
+
repo = "BambuStudio";
+
rev = "v${version}";
+
hash = "sha256-Rb8YNf+ZQ8+9jAP/ZLze0PfY/liE7Rr2bJX33AENsbg=";
+
};
+
+
nativeBuildInputs = [
+
cmake
+
pkg-config
+
wrapGAppsHook
+
];
+
+
buildInputs = [
+
binutils
+
boost179
+
cereal
+
cgal_5
+
curl
+
dbus
+
eigen
+
expat
+
gcc-unwrapped
+
glew
+
glfw
+
glib
+
glib-networking
+
gmp
+
gstreamer
+
gst-plugins-base
+
gst-plugins-bad
+
gtk3
+
hicolor-icon-theme
+
ilmbase
+
libpng
+
mesa.osmesa
+
mpfr
+
nlopt
+
opencascade-occt
+
openvdb_tbb_2021_8
+
pcre
+
tbb_2021_8
+
webkitgtk
+
wxGTK31'
+
xorg.libX11
+
] ++ lib.optionals withSystemd [
+
systemd
+
] ++ checkInputs;
+
+
patches = [
+
# Fix for webkitgtk linking
+
./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
+
];
+
+
doCheck = true;
+
checkInputs = [ gtest ];
+
+
separateDebugInfo = true;
+
+
# The build system uses custom logic - defined in
+
# cmake/modules/FindNLopt.cmake in the package source - for finding the nlopt
+
# library, which doesn't pick up the package in the nix store. We
+
# additionally need to set the path via the NLOPT environment variable.
+
NLOPT = nlopt;
+
+
# Disable compiler warnings that clutter the build log.
+
# It seems to be a known issue for Eigen:
+
# http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221
+
NIX_CFLAGS_COMPILE = "-Wno-ignored-attributes";
+
+
# prusa-slicer uses dlopen on `libudev.so` at runtime
+
NIX_LDFLAGS = lib.optionalString withSystemd "-ludev";
+
+
# TODO: macOS
+
prePatch = ''
+
# Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx
+
# now seems to be integrated into the main lib.
+
sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake
+
'';
+
+
cmakeFlags = [
+
"-DSLIC3R_STATIC=0"
+
"-DSLIC3R_FHS=1"
+
"-DSLIC3R_GTK=3"
+
+
# BambuStudio-specific
+
"-DBBL_RELEASE_TO_PUBLIC=1"
+
"-DBBL_INTERNAL_TESTING=0"
+
"-DDEP_WX_GTK3=ON"
+
"-DSLIC3R_BUILD_TESTS=0"
+
"-DCMAKE_CXX_FLAGS=-DBOOST_LOG_DYN_LINK"
+
];
+
+
preFixup = ''
+
gappsWrapperArgs+=(
+
--prefix LD_LIBRARY_PATH : "$out/lib"
+
+
# Fixes intermittent crash
+
# The upstream setup links in glew statically
+
--prefix LD_PRELOAD : "${glew.out}/lib/libGLEW.so"
+
)
+
'';
+
+
meta = with lib; {
+
description = "PC Software for BambuLab's 3D printers";
+
homepage = "https://github.com/bambulab/BambuStudio";
+
license = licenses.agpl3;
+
maintainers = with maintainers; [ zhaofengli ];
+
mainProgram = "bambu-studio";
+
};
+
}
+2 -2
pkgs/applications/networking/cluster/werf/default.nix
···
buildGoModule rec {
pname = "werf";
-
version = "1.2.269";
+
version = "1.2.270";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
-
hash = "sha256-LUHENANM+3wGftTVXaQsGykKayzEAIQ3TQ5qM77TJVA=";
+
hash = "sha256-8AF+D/kbRkalUOQmpGamyhq5LEu1Uyxj6NuzWviDKRM=";
};
vendorHash = "sha256-20bPsBRya7Gg7p/hSSnnYLoSHf/fRwk1UrA/KlMT3Jk=";
+3 -2
pkgs/applications/science/math/qalculate-gtk/default.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "qalculate-gtk";
-
version = "4.8.1";
+
version = "4.9.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-gtk";
rev = "v${finalAttrs.version}";
-
sha256 = "sha256-bG0hui5GjHWHny/8Rq5sZGz3s5rYnYlpc+K8I/LwDto=";
+
hash = "sha256-rQxOOxM4TazkDs/H3KEPbdo6WBl0ptyAlZwv8nnGMss=";
};
hardeningDisable = [ "format" ];
···
homepage = "http://qalculate.github.io";
maintainers = with maintainers; [ gebner doronbehar alyaeanyx ];
license = licenses.gpl2Plus;
+
mainProgram = "qalculate-gtk";
platforms = platforms.all;
};
})
+3 -2
pkgs/applications/science/math/qalculate-qt/default.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "qalculate-qt";
-
version = "4.8.1";
+
version = "4.9.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-qt";
rev = "v${finalAttrs.version}";
-
hash = "sha256-hH+orU+5PmPcrhkLKCdsDhVCrD8Mvxp2RPTGSlsUP7Y=";
+
hash = "sha256-Ac8RRxLheaenlR7JqKzfBpPxsq7PHfE9qXFf3Vx4GSg=";
};
nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ];
···
homepage = "http://qalculate.github.io";
maintainers = with maintainers; [ _4825764518 ];
license = licenses.gpl2Plus;
+
mainProgram = "qalculate-qt";
platforms = platforms.unix;
};
})
+135
pkgs/by-name/al/alephone/package.nix
···
+
{ lib
+
, stdenv
+
, fetchurl
+
, alsa-lib
+
, boost
+
, curl
+
, ffmpeg_4
+
, icoutils
+
, libGLU
+
, libmad
+
, libogg
+
, libpng
+
, libsndfile
+
, libvorbis
+
, lua
+
, makeDesktopItem
+
, makeWrapper
+
, miniupnpc
+
, openal
+
, pkg-config
+
, SDL2
+
, SDL2_image
+
, SDL2_net
+
, SDL2_ttf
+
, speex
+
, unzip
+
, zlib
+
, zziplib
+
, alephone
+
}:
+
+
stdenv.mkDerivation (finalAttrs: {
+
outputs = [ "out" "icons" ];
+
pname = "alephone";
+
version = "1.7";
+
+
src = fetchurl {
+
url =
+
let date = "20231125";
+
in "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${date}/AlephOne-${date}.tar.bz2";
+
sha256 = "sha256-qRHmtkzPi6PKeAzoMPdSbboiilG+L2fCXvXXu3vIchs=";
+
};
+
+
nativeBuildInputs = [ pkg-config icoutils ];
+
+
buildInputs = [
+
alsa-lib
+
boost
+
curl
+
ffmpeg_4
+
libGLU
+
libmad
+
libogg
+
libpng
+
libsndfile
+
libvorbis
+
lua
+
miniupnpc
+
openal
+
SDL2
+
SDL2_image
+
SDL2_net
+
SDL2_ttf
+
speex
+
zlib
+
zziplib
+
];
+
+
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
+
makeFlags = [ "AR:=$(AR)" ];
+
+
enableParallelBuilding = true;
+
+
postInstall = ''
+
mkdir $icons
+
icotool -x -i 5 -o $icons Resources/Windows/*.ico
+
pushd $icons
+
for x in *_5_48x48x32.png; do
+
mv $x ''${x%_5_48x48x32.png}.png
+
done
+
popd
+
'';
+
+
meta = {
+
description =
+
"Aleph One is the open source continuation of Bungie’s Marathon 2 game engine";
+
homepage = "https://alephone.lhowon.org/";
+
license = [ lib.licenses.gpl3 ];
+
maintainers = with lib.maintainers; [ ehmry ];
+
platforms = lib.platforms.linux;
+
};
+
+
passthru.makeWrapper =
+
{ pname
+
, desktopName
+
, version
+
, zip
+
, meta
+
, icon ? alephone.icons + "/alephone.png"
+
, ...
+
}@extraArgs:
+
stdenv.mkDerivation ({
+
inherit pname version;
+
+
desktopItem = makeDesktopItem {
+
name = desktopName;
+
exec = pname;
+
genericName = pname;
+
categories = [ "Game" ];
+
comment = meta.description;
+
inherit desktopName icon;
+
};
+
+
src = zip;
+
+
nativeBuildInputs = [ makeWrapper unzip ];
+
+
dontConfigure = true;
+
dontBuild = true;
+
+
installPhase = ''
+
mkdir -p $out/bin $out/data/$pname $out/share/applications
+
cp -a * $out/data/$pname
+
cp $desktopItem/share/applications/* $out/share/applications
+
makeWrapper ${alephone}/bin/alephone $out/bin/$pname \
+
--add-flags $out/data/$pname
+
'';
+
} // extraArgs // {
+
meta = alephone.meta // {
+
license = lib.licenses.free;
+
mainProgram = pname;
+
hydraPlatforms = [ ];
+
} // meta;
+
});
+
})
+75
pkgs/by-name/sy/syndicate_utils/lock.json
···
+
{
+
"depends": [
+
{
+
"method": "fetchzip",
+
"packages": [
+
"hashlib"
+
],
+
"path": "/nix/store/fav82xdbicvlk34nmcbl89zx99lr3mbs-source",
+
"rev": "f9455d4be988e14e3dc7933eb7cc7d7c4820b7ac",
+
"sha256": "1sx6j952lj98629qfgr7ds5aipyw9d6lldcnnqs205wpj4pkcjb3",
+
"srcDir": "",
+
"url": "https://github.com/ehmry/hashlib/archive/f9455d4be988e14e3dc7933eb7cc7d7c4820b7ac.tar.gz"
+
},
+
{
+
"method": "fetchzip",
+
"packages": [
+
"illwill"
+
],
+
"path": "/nix/store/3lmm3z36qn4gz7bfa209zv0pqrpm3di9-source",
+
"ref": "v0.3.2",
+
"rev": "1d12cb36ab7b76c31d2d25fa421013ecb382e625",
+
"sha256": "0f9yncl5gbdja18mrqf5ixrdgrh95k0khda923dm1jd1x1b7ar8z",
+
"srcDir": "",
+
"url": "https://github.com/johnnovak/illwill/archive/1d12cb36ab7b76c31d2d25fa421013ecb382e625.tar.gz"
+
},
+
{
+
"method": "fetchzip",
+
"packages": [
+
"nimcrypto"
+
],
+
"path": "/nix/store/zyr8zwh7vaiycn1s4r8cxwc71f2k5l0h-source",
+
"ref": "traditional-api",
+
"rev": "602c5d20c69c76137201b5d41f788f72afb95aa8",
+
"sha256": "1dmdmgb6b9m5f8dyxk781nnd61dsk3hdxqks7idk9ncnpj9fng65",
+
"srcDir": "",
+
"url": "https://github.com/cheatfate/nimcrypto/archive/602c5d20c69c76137201b5d41f788f72afb95aa8.tar.gz"
+
},
+
{
+
"method": "fetchzip",
+
"packages": [
+
"npeg"
+
],
+
"path": "/nix/store/ffkxmjmigfs7zhhiiqm0iw2c34smyciy-source",
+
"ref": "1.2.1",
+
"rev": "26d62fdc40feb84c6533956dc11d5ee9ea9b6c09",
+
"sha256": "0xpzifjkfp49w76qmaylan8q181bs45anmp46l4bwr3lkrr7bpwh",
+
"srcDir": "src",
+
"url": "https://github.com/zevv/npeg/archive/26d62fdc40feb84c6533956dc11d5ee9ea9b6c09.tar.gz"
+
},
+
{
+
"method": "fetchzip",
+
"packages": [
+
"preserves"
+
],
+
"path": "/nix/store/fmb2yckksz7iv3qdkk5gk1j060kppkq9-source",
+
"ref": "20231102",
+
"rev": "4faeb766dc3945bcfacaa1a836ef6ab29b20ceb0",
+
"sha256": "1a3g5bk1l1h250q3p6sqv6r1lpsplp330qqyp48r0i4a5r0jksq3",
+
"srcDir": "src",
+
"url": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/4faeb766dc3945bcfacaa1a836ef6ab29b20ceb0.tar.gz"
+
},
+
{
+
"method": "fetchzip",
+
"packages": [
+
"syndicate"
+
],
+
"path": "/nix/store/nhpvl223vbzdrlzikw7pgyfxs344w7ma-source",
+
"ref": "20231108",
+
"rev": "095418032180e360ea27ec7fcd63193944b68e2c",
+
"sha256": "09pbml2chzz0v5zpz67fs7raj0mfmg8qrih2vz85xxc51h7ncqvw",
+
"srcDir": "src",
+
"url": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/095418032180e360ea27ec7fcd63193944b68e2c.tar.gz"
+
}
+
]
+
}
+23
pkgs/by-name/sy/syndicate_utils/package.nix
···
+
{ lib, buildNimPackage, fetchFromGitea }:
+
+
buildNimPackage (finalAttrs: {
+
pname = "syndicate_utils";
+
version = "20231130";
+
+
src = fetchFromGitea {
+
domain = "git.syndicate-lang.org";
+
owner = "ehmry";
+
repo = "syndicate_utils";
+
rev = finalAttrs.version;
+
hash = "sha256-a9EjHSrLyWoP4qUQM+fRjZrNavQfT+SUO44pnPK1j/Q=";
+
};
+
+
lockFile = ./lock.json;
+
+
meta = finalAttrs.src.meta // {
+
description = "Utilities for the Syndicated Actor Model";
+
homepage = "https://git.syndicate-lang.org/ehmry/syndicate_utils";
+
maintainers = [ lib.maintainers.ehmry ];
+
license = lib.licenses.unlicense;
+
};
+
})
+5 -5
pkgs/desktops/gnome/apps/file-roller/default.nix
···
, nautilus
}:
-
stdenv.mkDerivation rec {
+
stdenv.mkDerivation (finalAttrs: {
pname = "file-roller";
-
version = "43.0";
+
version = "43.1";
src = fetchurl {
-
url = "mirror://gnome/sources/file-roller/${lib.versions.major version}/file-roller-${version}.tar.xz";
-
sha256 = "KYcp/b252oEywLvGCQdRfWVoWwVhiuBRZzNeZIT1c6E=";
+
url = "mirror://gnome/sources/file-roller/${lib.versions.major finalAttrs.version}/file-roller-${finalAttrs.version}.tar.xz";
+
sha256 = "hJlAI5lyk76zRdl5Pbj18Lu0H6oVXG/7SDKPIDlXrQg=";
};
nativeBuildInputs = [
···
maintainers = teams.gnome.members ++ teams.pantheon.members;
mainProgram = "file-roller";
};
-
}
+
})
+7 -7
pkgs/desktops/gnome/apps/gnome-maps/default.nix
···
, geocode-glib_2
}:
-
stdenv.mkDerivation rec {
+
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-maps";
-
version = "45.1";
+
version = "45.2";
src = fetchurl {
-
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-
hash = "sha256-v2nFDi4ZsV280KDvOCfUAqGVq0ogKbm2LlSr8472334=";
+
url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz";
+
hash = "sha256-6es3CnlxtPhC+qME0xpIXb2P+K7EKnZScvL8GnqAmPI=";
};
doCheck = true;
···
passthru = {
updateScript = gnome.updateScript {
-
packageName = pname;
-
attrPath = "gnome.${pname}";
+
packageName = "gnome-maps";
+
attrPath = "gnome.gnome-maps";
};
};
···
license = licenses.gpl2Plus;
platforms = platforms.unix;
};
-
}
+
})
+7 -7
pkgs/desktops/gnome/core/gnome-control-center/default.nix
···
, xvfb-run
}:
-
stdenv.mkDerivation rec {
+
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-control-center";
-
version = "45.1";
+
version = "45.2";
src = fetchurl {
-
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-
sha256 = "sha256-0obHYnFQ4RKqy7S3uRcX+tjokHYGFHnfxhCy3XRLV3o=";
+
url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz";
+
sha256 = "sha256-DPo8My1u2stz0GxrJv/KEHjob/WerIGbKTHglndT33A=";
};
patches = [
···
passthru = {
updateScript = gnome.updateScript {
-
packageName = pname;
-
attrPath = "gnome.${pname}";
+
packageName = "gnome-control-center";
+
attrPath = "gnome.gnome-control-center";
};
};
···
maintainers = teams.gnome.members;
platforms = platforms.linux;
};
-
}
+
})
+21 -24
pkgs/desktops/gnome/core/gnome-control-center/paths.patch
···
else
gtk_widget_set_sensitive (self->toolbutton_profile_view, FALSE);
diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h
-
index a2376f8a4..98769e08f 100644
+
index feef16580..4b88ef7b1 100644
--- a/panels/datetime/tz.h
+++ b/panels/datetime/tz.h
@@ -27,11 +27,7 @@
···
typedef struct _TzDB TzDB;
typedef struct _TzLocation TzLocation;
diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c
-
index 505b8ee25..62e94009f 100644
+
index ec5a905a5..689fdbebe 100644
--- a/panels/network/connection-editor/net-connection-editor.c
+++ b/panels/network/connection-editor/net-connection-editor.c
-
@@ -267,9 +267,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type)
-
g_autoptr(GError) error = NULL;
+
@@ -377,7 +377,7 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type)
+
GPid child_pid;
+
+
builder = g_strv_builder_new ();
+
- g_strv_builder_add (builder, "nm-connection-editor");
+
+ g_strv_builder_add (builder, "@networkmanagerapplet@/bin/nm-connection-editor");
if (self->is_new_connection) {
-
- cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type);
-
+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --type='%s' --create", type);
-
} else {
-
- cmdline = g_strdup_printf ("nm-connection-editor --edit='%s'",
-
+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit='%s'",
-
nm_connection_get_uuid (self->connection));
-
}
-
+
g_autofree gchar *type_str = NULL;
diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-bluetooth.c
-
index 74dfb0e9a..5f53d1a20 100644
+
index 303f4a8af..e5afc4dff 100644
--- a/panels/network/net-device-bluetooth.c
+++ b/panels/network/net-device-bluetooth.c
-
@@ -90,7 +90,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self)
+
@@ -80,7 +80,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self)
update_off_switch_from_device_state (self->device_off_switch, state, self);
/* set up the Options button */
···
gtk_widget_set_visible (GTK_WIDGET (self->options_button), state != NM_DEVICE_STATE_UNMANAGED && path != NULL);
}
-
@@ -141,7 +141,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self)
+
@@ -131,7 +131,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self)
connection = net_device_get_find_connection (self->client, self->device);
uuid = nm_connection_get_uuid (connection);
···
g_debug ("Launching '%s'\n", cmdline);
if (!g_spawn_command_line_async (cmdline, &error))
g_warning ("Failed to launch nm-connection-editor: %s", error->message);
-
@@ -185,7 +185,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self)
+
@@ -173,7 +173,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self)
gtk_widget_init_template (GTK_WIDGET (self));
···
}
diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c
-
index 34eb86241..50d0a2bed 100644
+
index 166670224..36f720d36 100644
--- a/panels/network/net-device-mobile.c
+++ b/panels/network/net-device-mobile.c
-
@@ -508,7 +508,7 @@ options_button_clicked_cb (NetDeviceMobile *self)
+
@@ -521,7 +521,7 @@ options_button_clicked_cb (NetDeviceMobile *self)
connection = net_device_get_find_connection (self->client, self->device);
uuid = nm_connection_get_uuid (connection);
···
g_debug ("Launching '%s'\n", cmdline);
if (!g_spawn_command_line_async (cmdline, &error))
g_warning ("Failed to launch nm-connection-editor: %s", error->message);
-
@@ -797,7 +797,7 @@ net_device_mobile_init (NetDeviceMobile *self)
+
@@ -810,7 +810,7 @@ net_device_mobile_init (NetDeviceMobile *self)
self->cancellable = g_cancellable_new ();
···
/* Use SNMP to get printer's informations */
diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c
-
index 86f53d4fc..0b052856f 100644
+
index edbc99830..1e1d90141 100644
--- a/panels/user-accounts/run-passwd.c
+++ b/panels/user-accounts/run-passwd.c
-
@@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error)
+
@@ -152,7 +152,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error)
gchar **envp;
-
gint my_stdin, my_stdout, my_stderr;
+
gint my_stdin, my_stdout;
- argv[0] = "/usr/bin/passwd"; /* Is it safe to rely on a hard-coded path? */
+ argv[0] = "/run/wrappers/bin/passwd"; /* Is it safe to rely on a hard-coded path? */
···
envp = g_get_environ ();
diff --git a/panels/user-accounts/user-utils.c b/panels/user-accounts/user-utils.c
-
index 83d4cd091..e8784c722 100644
+
index 5b7bc1f02..13ffe6ca8 100644
--- a/panels/user-accounts/user-utils.c
+++ b/panels/user-accounts/user-utils.c
-
@@ -486,7 +486,7 @@ is_valid_username_async (const gchar *username,
+
@@ -215,7 +215,7 @@ is_valid_username_async (const gchar *username,
* future, so it would be nice to have some official way for this
* instead of relying on the current "--login" implementation.
*/
+7 -7
pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix
···
, substituteAll
}:
-
stdenv.mkDerivation rec {
+
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-shell-extensions";
-
version = "45.1";
+
version = "45.2";
src = fetchurl {
-
url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz";
-
sha256 = "JC4VoMBuggw/2N1q6sGo74Zc5YiC5Zda8dZZNLtNQmE=";
+
url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz";
+
sha256 = "7jL2OHotGK2/96lWaJvHR4ZrSocS1zeQwAKr6uTMqq8=";
};
patches = [
···
passthru = {
updateScript = gnome.updateScript {
-
packageName = pname;
-
attrPath = "gnome.${pname}";
+
packageName = "gnome-shell-extensions";
+
attrPath = "gnome.gnome-shell-extensions";
};
};
···
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
-
}
+
})
+5 -5
pkgs/desktops/gnome/core/gnome-shell/default.nix
···
let
pythonEnv = python3.withPackages (ps: with ps; [ pygobject3 ]);
in
-
stdenv.mkDerivation rec {
+
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-shell";
-
version = "45.1";
+
version = "45.2";
outputs = [ "out" "devdoc" ];
src = fetchurl {
-
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
-
sha256 = "FfykvWEpqLP5kBl/vR7ljXS2QVEK+q8Igqf6NmNPxfI=";
+
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
+
sha256 = "igz7+HKxp2JpbIbhPe/p82dekteVFOup0AC1thHCaiM=";
};
patches = [
···
platforms = platforms.linux;
};
-
}
+
})
+2 -2
pkgs/desktops/gnome/core/mutter/default.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "mutter";
-
version = "45.1";
+
version = "45.2";
outputs = [ "out" "dev" "man" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
-
sha256 = "LNPF77Itt2x5MRyxiJoaqy/rNbSk3QPzgiqreZnaISw=";
+
sha256 = "rz+Ym/IqVg3CSS+44Z+do3zm1xRLPgUZgLDVUFiWANw=";
};
mesonFlags = [
+7 -7
pkgs/desktops/gnome/core/nautilus/default.nix
···
, gobject-introspection
}:
-
stdenv.mkDerivation rec {
+
stdenv.mkDerivation (finalAttrs: {
pname = "nautilus";
-
version = "45.1";
+
version = "45.2.1";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
-
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-
sha256 = "I72qmoVGbFk3qJ2t3QgO0DvMK0notkr2ByBjU73oL+M=";
+
url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz";
+
sha256 = "ul1T3zmhVVYt+XHvXjHoJwdJBdDEjqseskIaEChLmQ0=";
};
patches = [
···
passthru = {
updateScript = gnome.updateScript {
-
packageName = pname;
-
attrPath = "gnome.${pname}";
+
packageName = "nautilus";
+
attrPath = "gnome.nautilus";
};
};
···
platforms = platforms.linux;
maintainers = teams.gnome.members;
};
-
}
+
})
+5 -5
pkgs/desktops/gnome/core/zenity/default.nix
···
, wrapGAppsHook4
}:
-
stdenv.mkDerivation rec {
+
stdenv.mkDerivation (finalAttrs: {
pname = "zenity";
-
version = "3.99.2";
+
version = "4.0.0";
src = fetchurl {
-
url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-
sha256 = "oZR4kGuYi082fl6mOlkh5PmMuCVbugXrXK2LWhikFo8=";
+
url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor finalAttrs.version}/zenity-${finalAttrs.version}.tar.xz";
+
sha256 = "C4yN7xjasFzEm9RkuQyn+UWuUv9eCSQtpwKhXZTT6N0=";
};
nativeBuildInputs = [
···
platforms = platforms.unix;
maintainers = teams.gnome.members;
};
-
}
+
})
+21
pkgs/development/compilers/nim/build-nim-package.nix
···
, nim_builder
, defaultNimVersion ? 2
, nimOverrides
+
, buildNimPackage
}:
let
···
, nativeBuildInputs ? [ ]
, nimFlags ? [ ]
, requiredNimVersion ? defaultNimVersion
+
, passthru ? { }
, ...
}:
(if requiredNimVersion == 1 then {
···
throw
"requiredNimVersion ${toString requiredNimVersion} is not valid") // {
nimFlags = lockFileNimFlags ++ nimFlags;
+
passthru = passthru // {
+
# allow overriding the result of buildNimPackageArgs before this composition is applied
+
# this allows overriding the lockFile for packages built using buildNimPackage
+
# this is adapted from mkDerivationExtensible in stdenv.mkDerivation
+
overrideNimAttrs = f0:
+
let
+
f = self: super:
+
let x = f0 super;
+
in
+
if builtins.isFunction x
+
then f0 self super
+
else x;
+
in
+
buildNimPackage
+
(self:
+
let super = (asFunc ((asFunc buildNimPackageArgs) self)) baseAttrs;
+
in
+
super // (if builtins.isFunction f0 || f0?__functor then f self super else f0));
+
};
};
attrs = postLock // finalOverride postLock;
+1 -1
pkgs/development/libraries/libbacktrace/default.nix
···
(lib.enableFeature enableShared "shared")
];
-
doCheck = stdenv.isLinux;
+
doCheck = stdenv.isLinux && !stdenv.hostPlatform.isMusl;
passthru = {
updateScript = unstableGitUpdater { };
+2 -2
pkgs/development/libraries/libqalculate/default.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "libqalculate";
-
version = "4.8.1";
+
version = "4.9.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "libqalculate";
rev = "v${finalAttrs.version}";
-
sha256 = "sha256-4WqKlwVf4/ixVr98lPFVfNL6EOIfHHfL55xLsYqxkhY=";
+
hash = "sha256-6W65dg2pZeio3ZVgVLQZrz/eReYcPiYf52zjcaRfE8E=";
};
outputs = [ "out" "dev" "doc" ];
+6
pkgs/development/libraries/wxwidgets/wxGTK31.nix
···
{ lib
, stdenv
, fetchFromGitHub
+
, curl
, gst_all_1
, gtk3
, libGL
···
, compat28 ? false
, compat30 ? true
, unicode ? true
+
, withCurl ? false
+
, withPrivateFonts ? false
, withEGL ? true
, withMesa ? !stdenv.isDarwin
, withWebKit ? stdenv.isDarwin
···
libXxf86vm
xorgproto
]
+
++ lib.optional withCurl curl
++ lib.optional withMesa libGLU
++ lib.optional (withWebKit && !stdenv.isDarwin) webkitgtk
++ lib.optional (withWebKit && stdenv.isDarwin) WebKit
···
]
++ lib.optional (!withEGL) "--disable-glcanvasegl"
++ lib.optional unicode "--enable-unicode"
+
++ lib.optional withCurl "--enable-webrequest"
+
++ lib.optional withPrivateFonts "--enable-privatefonts"
++ lib.optional withMesa "--with-opengl"
++ lib.optionals stdenv.isDarwin [
"--with-osx_cocoa"
+5 -5
pkgs/development/php-packages/box/default.nix
···
-
{ lib, php, fetchFromGitHub }:
+
{ lib, php82, fetchFromGitHub }:
-
php.buildComposerProject (finalAttrs: {
+
php82.buildComposerProject (finalAttrs: {
pname = "box";
-
version = "4.5.1";
+
version = "4.6.0";
src = fetchFromGitHub {
owner = "box-project";
repo = "box";
rev = finalAttrs.version;
-
hash = "sha256-3YfnFd8OZ15nQnXOkhNz2FQygElFn+JOrenKUeyTkXA=";
+
hash = "sha256-s3FnpfKWmsLLXwa/xI80NZ1030fB9LcrMVzNWGeFkn4=";
};
-
vendorHash = "sha256-0ul4NLGK+Z+VN1nv4xSGsh2JcJEXeYAYFhxDn7r3kVY=";
+
vendorHash = "sha256-t1DvlcgTSq4n8xVUMcEIfs5ZAq9XIqL3qUqabheVVrs=";
meta = {
changelog = "https://github.com/box-project/box/releases/tag/${finalAttrs.version}";
+4 -4
pkgs/development/tools/language-servers/pylyzer/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "pylyzer";
-
version = "0.0.49";
+
version = "0.0.50";
src = fetchFromGitHub {
owner = "mtshiba";
repo = "pylyzer";
-
rev = "v${version}";
-
hash = "sha256-1BExqeIL6jaonJVB3aRYDDHRw7xdxHoouH5BlooJDW8=";
+
rev = "refs/tags/v${version}";
+
hash = "sha256-w6CXKBbELkPNido0bldMDqoLZbqLd0gKBv576uLAX3Y=";
};
-
cargoHash = "sha256-HBRczmEqqH+lMgnHeP/WpqHD05tkovJmR12hXwCrw8k=";
+
cargoHash = "sha256-/s6ZXvgFXED17CwdmR8lLZDQ3otV334U4Uly90MPV1Y=";
nativeBuildInputs = [
git
pkgs/games/alephone/apotheosis-x/default.nix pkgs/by-name/al/alephone-apotheosis-x/package.nix
-102
pkgs/games/alephone/default.nix
···
-
{ lib, stdenv, fetchurl, alsa-lib, boost, curl, ffmpeg_4, icoutils, libGLU
-
, libmad, libogg, libpng, libsndfile, libvorbis, lua, miniupnpc, pkg-config
-
, SDL2, SDL2_image, SDL2_net, SDL2_ttf, speex, zziplib, zlib, makeWrapper
-
, makeDesktopItem, unzip, alephone }:
-
-
let
-
self = stdenv.mkDerivation rec {
-
outputs = [ "out" "icons" ];
-
pname = "alephone";
-
version = "1.6.2";
-
-
src = fetchurl {
-
url = let date = "20230529";
-
in "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${date}/AlephOne-${date}.tar.bz2";
-
sha256 = "sha256-UqhZvOMOxU4W0eLRRTQvGXaqTpWD5KIdXULClHW7Iyc=";
-
};
-
-
nativeBuildInputs = [ pkg-config icoutils ];
-
-
buildInputs = [
-
alsa-lib
-
boost
-
curl
-
ffmpeg_4
-
libGLU
-
libmad
-
libsndfile
-
libogg
-
libpng
-
libvorbis
-
lua
-
miniupnpc
-
SDL2
-
SDL2_image
-
SDL2_net
-
SDL2_ttf
-
speex
-
zziplib
-
zlib
-
];
-
-
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
-
makeFlags = [ "AR:=$(AR)" ];
-
-
enableParallelBuilding = true;
-
-
postInstall = ''
-
mkdir $icons
-
icotool -x -i 5 -o $icons Resources/Windows/*.ico
-
pushd $icons
-
for x in *_5_48x48x32.png; do
-
mv $x ''${x%_5_48x48x32.png}.png
-
done
-
popd
-
'';
-
-
meta = with lib; {
-
description =
-
"Aleph One is the open source continuation of Bungie’s Marathon 2 game engine";
-
homepage = "https://alephone.lhowon.org/";
-
license = with licenses; [ gpl3 ];
-
maintainers = with maintainers; [ ehmry ];
-
platforms = platforms.linux;
-
};
-
};
-
-
in self // {
-
makeWrapper = { pname, desktopName, version, zip, meta
-
, icon ? alephone.icons + "/alephone.png", ... }@extraArgs:
-
stdenv.mkDerivation ({
-
inherit pname version;
-
-
desktopItem = makeDesktopItem {
-
name = desktopName;
-
exec = pname;
-
genericName = pname;
-
categories = [ "Game" ];
-
comment = meta.description;
-
inherit desktopName icon;
-
};
-
-
src = zip;
-
-
nativeBuildInputs = [ makeWrapper unzip ];
-
-
dontConfigure = true;
-
dontBuild = true;
-
-
installPhase = ''
-
mkdir -p $out/bin $out/data/$pname $out/share/applications
-
cp -a * $out/data/$pname
-
cp $desktopItem/share/applications/* $out/share/applications
-
makeWrapper ${alephone}/bin/alephone $out/bin/$pname \
-
--add-flags $out/data/$pname
-
'';
-
} // extraArgs // {
-
meta = alephone.meta // {
-
license = lib.licenses.free;
-
hydraPlatforms = [ ];
-
} // meta;
-
});
-
}
pkgs/games/alephone/durandal/default.nix pkgs/by-name/al/alephone-durandal/package.nix
pkgs/games/alephone/eternal/default.nix pkgs/by-name/al/alephone-eternal/package.nix
pkgs/games/alephone/evil/default.nix pkgs/by-name/al/alephone-evil/package.nix
pkgs/games/alephone/infinity/default.nix pkgs/by-name/al/alephone-infinity/package.nix
pkgs/games/alephone/marathon/default.nix pkgs/by-name/al/alephone-marathon/package.nix
pkgs/games/alephone/pathways-into-darkness/default.nix pkgs/by-name/al/alephone-pathways-into-darkness/package.nix
pkgs/games/alephone/pheonix/default.nix pkgs/by-name/al/alephone-pheonix/package.nix
pkgs/games/alephone/red/default.nix pkgs/by-name/al/alephone-red/package.nix
pkgs/games/alephone/rubicon-x/default.nix pkgs/by-name/al/alephone-rubicon-x/package.nix
pkgs/games/alephone/yuge/default.nix pkgs/by-name/al/alephone-yuge/package.nix
+16
pkgs/servers/mobilizon/cacerts_get.patch
···
+
diff --git a/config/config.exs b/config/config.exs
+
index d75b2e10a..d46ebffd2 100644
+
--- a/config/config.exs
+
+++ b/config/config.exs
+
@@ -128,7 +128,9 @@ config :mobilizon, Mobilizon.Web.Email.Mailer,
+
tls_options: [
+
verify: :verify_peer,
+
versions: [:"tlsv1.2", :"tlsv1.3"],
+
- cacerts: :public_key.cacerts_get(),
+
+ cacerts: if System.get_env("SSL_CERT_FILE") != nil and :public_key.cacerts_load(System.get_env("SSL_CERT_FILE")) == :ok do
+
+ :public_key.cacerts_get()
+
+ end,
+
server_name_indication: ~c"localhost",
+
depth: 99
+
],
+
+4 -11
pkgs/servers/mobilizon/common.nix
···
-
{ fetchFromGitLab, applyPatches, fetchpatch }: rec {
+
{ fetchFromGitLab, applyPatches }: rec {
pname = "mobilizon";
-
version = "3.2.0";
+
version = "4.0.0";
src = applyPatches {
src = fetchFromGitLab {
···
owner = "framasoft";
repo = pname;
rev = version;
-
sha256 = "sha256-zgHR0taMMMwAoJEJr5s1rmSwJh31+qAfPQW9DSDuC8A=";
+
sha256 = "sha256-PslcIS+HjGTx8UYhb7BG2OgLXfIWHDouuiogA/rq/7M=";
};
patches = [
# See https://framagit.org/framasoft/mobilizon/-/merge_requests/1452
-
(fetchpatch {
-
url = "https://framagit.org/framasoft/mobilizon/-/commit/856d236b141c96705e1211e780e3f0e8950bb48e.patch";
-
sha256 = "sha256-uEPvoTPVWHdg/KPWMG/Ck2qUjC+EUO3hyZnzpFxuoL0=";
-
})
-
(fetchpatch {
-
url = "https://framagit.org/framasoft/mobilizon/-/commit/3936eb4cc5125b838b73adc7e49ca6ce3b2f73ce.patch";
-
sha256 = "sha256-Srq691J1DbG3d26AKYZxkiMg0DfM33o3AllZpCjG2PQ=";
-
})
+
./cacerts_get.patch
];
};
}
+19 -29
pkgs/servers/mobilizon/default.nix
···
mixRelease rec {
inherit (common) pname version src;
-
# See https://github.com/whitfin/cachex/issues/205
-
# This circumvents a startup error for now
-
stripDebug = false;
-
nativeBuildInputs = [ git cmake ];
mixNixDeps = import ./mix.nix {
···
fast_html = prev.fast_html.override {
nativeBuildInputs = [ cmake ];
};
-
ex_cldr = prev.ex_cldr.overrideAttrs (old: rec {
-
version = "2.37.2";
+
ex_cldr = prev.ex_cldr.overrideAttrs (old: {
# We have to use the GitHub sources, as it otherwise tries to download
# the locales at build time.
src = fetchFromGitHub {
owner = "elixir-cldr";
repo = "cldr";
-
rev = "v${version}";
-
sha256 = "sha256-dDOQzLIi3zjb9xPyR7Baul96i9Mb3CFHUA+AWSexrk4=";
+
rev = "v${old.version}";
+
sha256 = assert old.version == "2.37.5";
+
"sha256-T5Qvuo+xPwpgBsqHNZYnTCA4loToeBn1LKTMsDcCdYs=";
};
postInstall = ''
cp $src/priv/cldr/locales/* $out/lib/erlang/lib/ex_cldr-${old.version}/priv/cldr/locales/
···
});
# The remainder are Git dependencies (and their deps) that are not supported by mix2nix currently.
-
web_push_encryption = buildMix {
+
web_push_encryption = buildMix rec {
name = "web_push_encryption";
version = "0.3.1";
src = fetchFromGitHub {
···
};
beamDeps = with final; [ mix_test_watch ex_doc timex ];
};
-
exkismet = buildMix rec {
-
name = "exkismet";
-
version = "0.0.1";
+
rajska = buildMix rec {
+
name = "rajska";
+
version = "1.3.3";
src = fetchFromGitHub {
owner = "tcitworld";
repo = name;
-
rev = "8b5485fde00fafbde20f315bec387a77f7358334";
-
sha256 = "sha256-ttgCWoBKU7VTjZJBhZNtqVF4kN7psBr/qOeR65MbTqw=";
+
rev = "0c036448e261e8be6a512581c592fadf48982d84";
+
sha256 = "sha256-4pfply1vTAIT2Xvm3kONmrCK05xKfXFvcb8EKoSCXBE=";
};
-
beamDeps = with final; [ httpoison ];
+
beamDeps = with final; [ ex_doc credo absinthe excoveralls hammer mock ];
};
-
rajska = buildMix rec {
-
name = "rajska";
-
version = "0.0.1";
+
exkismet = buildMix rec {
+
name = "exkismet";
+
version = "0.0.3";
src = fetchFromGitHub {
owner = "tcitworld";
repo = name;
-
rev = "0c036448e261e8be6a512581c592fadf48982d84";
-
sha256 = "sha256-4pfply1vTAIT2Xvm3kONmrCK05xKfXFvcb8EKoSCXBE=";
+
rev = "8b5485fde00fafbde20f315bec387a77f7358334";
+
sha256 = "sha256-ttgCWoBKU7VTjZJBhZNtqVF4kN7psBr/qOeR65MbTqw=";
};
-
beamDeps = with final; [ httpoison absinthe ];
+
beamDeps = with final; [ httpoison ex_doc credo doctor dialyxir ];
};
});
};
-
-
preConfigure = ''
-
export LANG=C.UTF-8 # fix elixir locale warning
-
'';
# Install the compiled js part
preBuild =
''
-
cp -a "${mobilizon-frontend}/libexec/mobilizon/deps/priv/static" ./priv
+
cp -a "${mobilizon-frontend}/static" ./priv
chmod 770 -R ./priv
'';
···
updateScript = writeShellScriptBin "update.sh" ''
set -eou pipefail
-
SRC=$(nix path-info .#mobilizon.src)
-
${mix2nix}/bin/mix2nix $SRC/mix.lock > pkgs/servers/mobilizon/mix.nix
-
cat $SRC/js/package.json > pkgs/servers/mobilizon/package.json
+
${mix2nix}/bin/mix2nix '${src}/mix.lock' > pkgs/servers/mobilizon/mix.nix
'';
elixirPackage = beamPackages.elixir;
};
+7 -26
pkgs/servers/mobilizon/frontend.nix
···
-
{ lib, callPackage, mkYarnPackage, fetchYarnDeps, imagemagick }:
+
{ lib, callPackage, buildNpmPackage, imagemagick }:
let
common = callPackage ./common.nix { };
in
-
mkYarnPackage rec {
-
src = "${common.src}/js";
+
buildNpmPackage {
+
inherit (common) pname version src;
-
offlineCache = fetchYarnDeps {
-
yarnLock = src + "/yarn.lock";
-
sha256 = "sha256-VkJ6vBt9EFoQVMWMV8FhPJBHcLJDDfOxd+NLb+DZy3U=";
-
};
+
npmDepsHash = "sha256-z/xWumL1wri63cGGMHMBq6WVDe81bp8tILsZa53a7FM=";
-
packageJSON = ./package.json;
+
nativeBuildInputs = [ imagemagick ];
-
# Somehow $out/deps/mobilizon/node_modules ends up only containing nothing
-
# more than a .bin directory otherwise.
-
yarnPostBuild = ''
-
rm -rf $out/deps/mobilizon/node_modules
-
ln -s $out/node_modules $out/deps/mobilizon/node_modules
+
postInstall = ''
+
cp -r priv/static $out/static
'';
-
-
buildPhase = ''
-
runHook preBuild
-
-
yarn run build
-
-
runHook postBuild
-
'';
-
-
doCheck = true;
-
checkPhase = "yarn run test";
-
-
nativeBuildInputs = [ imagemagick ];
meta = with lib; {
description = "Frontend for the Mobilizon server";
+79 -79
pkgs/servers/mobilizon/mix.nix
···
packages = with beamPackages; with self; {
absinthe = buildMix rec {
name = "absinthe";
-
version = "1.7.5";
+
version = "1.7.6";
src = fetchHex {
pkg = "absinthe";
version = "${version}";
-
sha256 = "22a9a38adca26294ad0ee91226168f5d215b401efd770b8a1b8fd9c9b21ec316";
+
sha256 = "e7626951ca5eec627da960615b51009f3a774765406ff02722b1d818f17e5778";
};
beamDeps = [ dataloader decimal nimble_parsec telemetry ];
···
argon2_elixir = buildMix rec {
name = "argon2_elixir";
-
version = "3.2.1";
+
version = "4.0.0";
src = fetchHex {
pkg = "argon2_elixir";
version = "${version}";
-
sha256 = "a813b78217394530b5fcf4c8070feee43df03ffef938d044019169c766315690";
+
sha256 = "f9da27cf060c9ea61b1bd47837a28d7e48a8f6fa13a745e252556c14f9132c7f";
};
beamDeps = [ comeonin elixir_make ];
···
castore = buildMix rec {
name = "castore";
-
version = "1.0.3";
+
version = "1.0.4";
src = fetchHex {
pkg = "castore";
version = "${version}";
-
sha256 = "680ab01ef5d15b161ed6a95449fac5c6b8f60055677a8e79acf01b27baa4390b";
+
sha256 = "9418c1b8144e11656f0be99943db4caf04612e3eaecefb5dae9a2a87565584f8";
};
beamDeps = [];
···
cldr_utils = buildMix rec {
name = "cldr_utils";
-
version = "2.24.1";
+
version = "2.24.2";
src = fetchHex {
pkg = "cldr_utils";
version = "${version}";
-
sha256 = "1820300531b5b849d0bc468e5a87cd64f8f2c5191916f548cbe69b2efc203780";
+
sha256 = "3362b838836a9f0fa309de09a7127e36e67310e797d556db92f71b548832c7cf";
};
beamDeps = [ castore certifi decimal ];
···
credo = buildMix rec {
name = "credo";
-
version = "1.7.0";
+
version = "1.7.1";
src = fetchHex {
pkg = "credo";
version = "${version}";
-
sha256 = "6839fcf63d1f0d1c0f450abc8564a57c43d644077ab96f2934563e68b8a769d7";
+
sha256 = "e9871c6095a4c0381c89b6aa98bc6260a8ba6addccf7f6a53da8849c748a58a2";
};
beamDeps = [ bunt file_system jason ];
···
dialyxir = buildMix rec {
name = "dialyxir";
-
version = "1.4.1";
+
version = "1.4.2";
src = fetchHex {
pkg = "dialyxir";
version = "${version}";
-
sha256 = "84b795d6d7796297cca5a3118444b80c7d94f7ce247d49886e7c291e1ae49801";
+
sha256 = "516603d8067b2fd585319e4b13d3674ad4f314a5902ba8130cd97dc902ce6bbd";
};
beamDeps = [ erlex ];
···
earmark_parser = buildMix rec {
name = "earmark_parser";
-
version = "1.4.33";
+
version = "1.4.38";
src = fetchHex {
pkg = "earmark_parser";
version = "${version}";
-
sha256 = "2d526833729b59b9fdb85785078697c72ac5e5066350663e5be6a1182da61b8f";
+
sha256 = "2cd0907795aaef0c7e8442e376633c5b3bd6edc8dbbdc539b22f095501c1cdb6";
};
beamDeps = [];
···
ecto = buildMix rec {
name = "ecto";
-
version = "3.10.3";
+
version = "3.11.0";
src = fetchHex {
pkg = "ecto";
version = "${version}";
-
sha256 = "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433";
+
sha256 = "7769dad267ef967310d6e988e92d772659b11b09a0c015f101ce0fff81ce1f81";
};
beamDeps = [ decimal jason telemetry ];
···
ecto_sql = buildMix rec {
name = "ecto_sql";
-
version = "3.10.2";
+
version = "3.11.0";
src = fetchHex {
pkg = "ecto_sql";
version = "${version}";
-
sha256 = "68c018debca57cb9235e3889affdaec7a10616a4e3a80c99fa1d01fdafaa9007";
+
sha256 = "77aa3677169f55c2714dda7352d563002d180eb33c0dc29cd36d39c0a1a971f5";
};
beamDeps = [ db_connection ecto postgrex telemetry ];
···
ex_cldr = buildMix rec {
name = "ex_cldr";
-
version = "2.37.2";
+
version = "2.37.5";
src = fetchHex {
pkg = "ex_cldr";
version = "${version}";
-
sha256 = "c8467b1d5080716ace6621703b6656cb2f9545572a54b341da900791a0cf92ba";
+
sha256 = "74ad5ddff791112ce4156382e171a5f5d3766af9d5c4675e0571f081fe136479";
};
beamDeps = [ cldr_utils decimal gettext jason nimble_parsec ];
···
ex_cldr_currencies = buildMix rec {
name = "ex_cldr_currencies";
-
version = "2.15.0";
+
version = "2.15.1";
src = fetchHex {
pkg = "ex_cldr_currencies";
version = "${version}";
-
sha256 = "0521316396c66877a2d636219767560bb2397c583341fcb154ecf9f3000e6ff8";
+
sha256 = "31df8bd37688340f8819bdd770eb17d659652078d34db632b85d4a32864d6a25";
};
beamDeps = [ ex_cldr jason ];
···
ex_cldr_dates_times = buildMix rec {
name = "ex_cldr_dates_times";
-
version = "2.14.0";
+
version = "2.16.0";
src = fetchHex {
pkg = "ex_cldr_dates_times";
version = "${version}";
-
sha256 = "f85a8b00546f6aecc2df7a97f15b9de66662d81578653128699c839f7a40bf94";
+
sha256 = "0f2f250d479cadda4e0ef3a5e3d936ae7ba1a3f1199db6791e284e86203495b1";
};
beamDeps = [ ex_cldr_calendars ex_cldr_numbers jason ];
···
ex_cldr_numbers = buildMix rec {
name = "ex_cldr_numbers";
-
version = "2.32.0";
+
version = "2.32.3";
src = fetchHex {
pkg = "ex_cldr_numbers";
version = "${version}";
-
sha256 = "08c43c26b8605b56b5856bb9277d2a0282f2e29b43c57dfbfd7bf9c28b4a504a";
+
sha256 = "7b626ff1e59a0ec9c3c5db5ce9ca91a6995e2ab56426b71f3cbf67181ea225f5";
};
beamDeps = [ decimal digital_token ex_cldr ex_cldr_currencies jason ];
···
ex_cldr_plugs = buildMix rec {
name = "ex_cldr_plugs";
-
version = "1.3.0";
+
version = "1.3.1";
src = fetchHex {
pkg = "ex_cldr_plugs";
version = "${version}";
-
sha256 = "699a98543ea14a7c849fae768041c40f49aa611aa55866025d227796e4858bff";
+
sha256 = "4f7b4a5fe061734cef7b62ff29118ed6ac72698cdd7bcfc97495db73611fe0fe";
};
beamDeps = [ ex_cldr gettext jason plug ];
···
ex_doc = buildMix rec {
name = "ex_doc";
-
version = "0.30.6";
+
version = "0.30.9";
src = fetchHex {
pkg = "ex_doc";
version = "${version}";
-
sha256 = "bd48f2ddacf4e482c727f9293d9498e0881597eae6ddc3d9562bd7923375109f";
+
sha256 = "d7aaaf21e95dc5cddabf89063327e96867d00013963eadf2c6ad135506a8bc10";
};
beamDeps = [ earmark_parser makeup_elixir makeup_erlang ];
···
excoveralls = buildMix rec {
name = "excoveralls";
-
version = "0.17.1";
+
version = "0.18.0";
src = fetchHex {
pkg = "excoveralls";
version = "${version}";
-
sha256 = "95bc6fda953e84c60f14da4a198880336205464e75383ec0f570180567985ae0";
+
sha256 = "1109bb911f3cb583401760be49c02cbbd16aed66ea9509fc5479335d284da60b";
};
beamDeps = [ castore jason ];
···
expo = buildMix rec {
name = "expo";
-
version = "0.1.0";
+
version = "0.4.1";
src = fetchHex {
pkg = "expo";
version = "${version}";
-
sha256 = "c22c536021c56de058aaeedeabb4744eb5d48137bacf8c29f04d25b6c6bbbf45";
+
sha256 = "2ff7ba7a798c8c543c12550fa0e2cbc81b95d4974c65855d8d15ba7b37a1ce47";
};
beamDeps = [];
···
floki = buildMix rec {
name = "floki";
-
version = "0.34.3";
+
version = "0.35.2";
src = fetchHex {
pkg = "floki";
version = "${version}";
-
sha256 = "9577440eea5b97924b4bf3c7ea55f7b8b6dce589f9b28b096cc294a8dc342341";
+
sha256 = "6b05289a8e9eac475f644f09c2e4ba7e19201fd002b89c28c1293e7bd16773d9";
};
beamDeps = [];
···
gettext = buildMix rec {
name = "gettext";
-
version = "0.20.0";
+
version = "0.23.1";
src = fetchHex {
pkg = "gettext";
version = "${version}";
-
sha256 = "1c03b177435e93a47441d7f681a7040bd2a816ece9e2666d1c9001035121eb3d";
+
sha256 = "19d744a36b809d810d610b57c27b934425859d158ebd56561bc41f7eeb8795db";
};
-
beamDeps = [];
+
beamDeps = [ expo ];
};
guardian = buildMix rec {
name = "guardian";
-
version = "2.3.1";
+
version = "2.3.2";
src = fetchHex {
pkg = "guardian";
version = "${version}";
-
sha256 = "bbe241f9ca1b09fad916ad42d6049d2600bbc688aba5b3c4a6c82592a54274c3";
+
sha256 = "b189ff38cd46a22a8a824866a6867ca8722942347f13c33f7d23126af8821b52";
};
beamDeps = [ jose plug ];
···
guardian_db = buildMix rec {
name = "guardian_db";
-
version = "2.1.0";
+
version = "3.0.0";
src = fetchHex {
pkg = "guardian_db";
version = "${version}";
-
sha256 = "f8e7d543ac92c395f3a7fd5acbe6829faeade57d688f7562e2f0fca8f94a0d70";
+
sha256 = "9c2ec4278efa34f9f1cc6ba795e552d41fdc7ffba5319d67eeb533b89392d183";
};
beamDeps = [ ecto ecto_sql guardian postgrex ];
···
hackney = buildRebar3 rec {
name = "hackney";
-
version = "1.18.2";
+
version = "1.20.1";
src = fetchHex {
pkg = "hackney";
version = "${version}";
-
sha256 = "af94d5c9f97857db257090a4a10e5426ecb6f4918aa5cc666798566ae14b65fd";
+
sha256 = "fe9094e5f1a2a2c0a7d10918fee36bfec0ec2a979994cff8cfe8058cd9af38e3";
};
beamDeps = [ certifi idna metrics mimerl parse_trans ssl_verify_fun unicode_util_compat ];
···
makeup = buildMix rec {
name = "makeup";
-
version = "1.1.0";
+
version = "1.1.1";
src = fetchHex {
pkg = "makeup";
version = "${version}";
-
sha256 = "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6";
+
sha256 = "5dc62fbdd0de44de194898b6710692490be74baa02d9d108bc29f007783b0b48";
};
beamDeps = [ nimble_parsec ];
···
mox = buildMix rec {
name = "mox";
-
version = "1.0.2";
+
version = "1.1.0";
src = fetchHex {
pkg = "mox";
version = "${version}";
-
sha256 = "f9864921b3aaf763c8741b5b8e6f908f44566f1e427b2630e89e9a73b981fef2";
+
sha256 = "d44474c50be02d5b72131070281a5d3895c0e7a95c780e90bc0cfe712f633a13";
};
beamDeps = [];
···
nimble_parsec = buildMix rec {
name = "nimble_parsec";
-
version = "1.3.1";
+
version = "1.4.0";
src = fetchHex {
pkg = "nimble_parsec";
version = "${version}";
-
sha256 = "2682e3c0b2eb58d90c6375fc0cc30bc7be06f365bf72608804fb9cffa5e1b167";
+
sha256 = "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28";
};
beamDeps = [];
···
oban = buildMix rec {
name = "oban";
-
version = "2.15.4";
+
version = "2.16.3";
src = fetchHex {
pkg = "oban";
version = "${version}";
-
sha256 = "5fce611fdfffb13e9148df883116e5201adf1e731eb302cc88cde0588510079c";
+
sha256 = "4d8a7fb62f63cf2f2080c78954425f5fd8916ef57196b7f79b5bc657abb2ac5f";
};
beamDeps = [ ecto_sql jason postgrex telemetry ];
···
phoenix = buildMix rec {
name = "phoenix";
-
version = "1.7.7";
+
version = "1.7.10";
src = fetchHex {
pkg = "phoenix";
version = "${version}";
-
sha256 = "8966e15c395e5e37591b6ed0bd2ae7f48e961f0f60ac4c733f9566b519453085";
+
sha256 = "cf784932e010fd736d656d7fead6a584a4498efefe5b8227e9f383bf15bb79d0";
};
beamDeps = [ castore jason phoenix_pubsub phoenix_template phoenix_view plug plug_cowboy plug_crypto telemetry websock_adapter ];
···
phoenix_ecto = buildMix rec {
name = "phoenix_ecto";
-
version = "4.4.2";
+
version = "4.4.3";
src = fetchHex {
pkg = "phoenix_ecto";
version = "${version}";
-
sha256 = "70242edd4601d50b69273b057ecf7b684644c19ee750989fd555625ae4ce8f5d";
+
sha256 = "d36c401206f3011fefd63d04e8ef626ec8791975d9d107f9a0817d426f61ac07";
};
beamDeps = [ ecto phoenix_html plug ];
···
phoenix_html = buildMix rec {
name = "phoenix_html";
-
version = "3.3.2";
+
version = "3.3.3";
src = fetchHex {
pkg = "phoenix_html";
version = "${version}";
-
sha256 = "44adaf8e667c1c20fb9d284b6b0fa8dc7946ce29e81ce621860aa7e96de9a11d";
+
sha256 = "923ebe6fec6e2e3b3e569dfbdc6560de932cd54b000ada0208b5f45024bdd76c";
};
beamDeps = [ plug ];
···
phoenix_live_view = buildMix rec {
name = "phoenix_live_view";
-
version = "0.19.5";
+
version = "0.20.1";
src = fetchHex {
pkg = "phoenix_live_view";
version = "${version}";
-
sha256 = "b2eaa0dd3cfb9bd7fb949b88217df9f25aed915e986a28ad5c8a0d054e7ca9d3";
+
sha256 = "be494fd1215052729298b0e97d5c2ce8e719c00854b82cd8cf15c1cd7fcf6294";
};
-
beamDeps = [ jason phoenix phoenix_html phoenix_template phoenix_view telemetry ];
+
beamDeps = [ jason phoenix phoenix_html phoenix_template phoenix_view plug telemetry ];
};
phoenix_pubsub = buildMix rec {
···
phoenix_view = buildMix rec {
name = "phoenix_view";
-
version = "2.0.2";
+
version = "2.0.3";
src = fetchHex {
pkg = "phoenix_view";
version = "${version}";
-
sha256 = "a929e7230ea5c7ee0e149ffcf44ce7cf7f4b6d2bfe1752dd7c084cdff152d36f";
+
sha256 = "cd34049af41be2c627df99cd4eaa71fc52a328c0c3d8e7d4aa28f880c30e7f64";
};
beamDeps = [ phoenix_html phoenix_template ];
···
plug = buildMix rec {
name = "plug";
-
version = "1.14.2";
+
version = "1.15.2";
src = fetchHex {
pkg = "plug";
version = "${version}";
-
sha256 = "842fc50187e13cf4ac3b253d47d9474ed6c296a8732752835ce4a86acdf68d13";
+
sha256 = "02731fa0c2dcb03d8d21a1d941bdbbe99c2946c0db098eee31008e04c6283615";
};
beamDeps = [ mime plug_crypto telemetry ];
···
plug_crypto = buildMix rec {
name = "plug_crypto";
-
version = "1.2.5";
+
version = "2.0.0";
src = fetchHex {
pkg = "plug_crypto";
version = "${version}";
-
sha256 = "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842";
+
sha256 = "53695bae57cc4e54566d993eb01074e4d894b65a3766f1c43e2c61a1b0f45ea9";
};
beamDeps = [];
···
swoosh = buildMix rec {
name = "swoosh";
-
version = "1.11.5";
+
version = "1.14.1";
src = fetchHex {
pkg = "swoosh";
version = "${version}";
-
sha256 = "21ee57dcd68d2f56d3bbe11e76d56d142b221bb12b6018c551cc68442b800040";
+
sha256 = "87da72260b4351678f96aec61db5c2acc8a88cda2cf2c4f534eb4c9c461350c7";
};
-
beamDeps = [ cowboy gen_smtp hackney jason mime plug_cowboy telemetry ];
+
beamDeps = [ cowboy gen_smtp hackney jason mime plug plug_cowboy telemetry ];
};
telemetry = buildRebar3 rec {
···
tesla = buildMix rec {
name = "tesla";
-
version = "1.7.0";
+
version = "1.8.0";
src = fetchHex {
pkg = "tesla";
version = "${version}";
-
sha256 = "2e64f01ebfdb026209b47bc651a0e65203fcff4ae79c11efb73c4852b00dc313";
+
sha256 = "10501f360cd926a309501287470372af1a6e1cbed0f43949203a4c13300bc79f";
};
beamDeps = [ castore hackney jason mime telemetry ];
···
tz_world = buildMix rec {
name = "tz_world";
-
version = "1.3.0";
+
version = "1.3.1";
src = fetchHex {
pkg = "tz_world";
version = "${version}";
-
sha256 = "78b565aa0899b48ce34686319119dfdadff07a255ec43fd9ed6e7d60cc8d1390";
+
sha256 = "901ed2b4a4430ecab3765244da4a19e6f19141867c2ab3753924919b87ed2224";
};
beamDeps = [ castore certifi geo jason ];
···
ueberauth_google = buildMix rec {
name = "ueberauth_google";
-
version = "0.10.3";
+
version = "0.12.1";
src = fetchHex {
pkg = "ueberauth_google";
version = "${version}";
-
sha256 = "2462ca9652acc936e0738691869d024e3e262f83ba9f6b4e874b961812290038";
+
sha256 = "7f7deacd679b2b66e3bffb68ecc77aa1b5396a0cbac2941815f253128e458c38";
};
beamDeps = [ oauth2 ueberauth ];
···
websock_adapter = buildMix rec {
name = "websock_adapter";
-
version = "0.5.4";
+
version = "0.5.5";
src = fetchHex {
pkg = "websock_adapter";
version = "${version}";
-
sha256 = "d2c238c79c52cbe223fcdae22ca0bb5007a735b9e933870e241fce66afb4f4ab";
+
sha256 = "4b977ba4a01918acbf77045ff88de7f6972c2a009213c515a445c48f224ffce9";
};
beamDeps = [ plug plug_cowboy websock ];
-140
pkgs/servers/mobilizon/package.json
···
-
{
-
"name": "mobilizon",
-
"version": "3.2.0",
-
"private": true,
-
"scripts": {
-
"dev": "vite",
-
"preview": "vite preview",
-
"build": "yarn run build:assets && yarn run build:pictures",
-
"lint": "eslint --ext .ts,.vue --ignore-path .gitignore --fix src",
-
"format": "prettier . --write",
-
"build:assets": "vite build",
-
"build:pictures": "bash ./scripts/build/pictures.sh",
-
"story:dev": "histoire dev",
-
"story:build": "histoire build",
-
"story:preview": "histoire preview",
-
"test": "vitest",
-
"coverage": "vitest run --coverage",
-
"prepare": "cd ../ && husky install"
-
},
-
"lint-staged": {
-
"**/*.{js,ts,vue}": [
-
"eslint --fix",
-
"prettier --write"
-
]
-
},
-
"dependencies": {
-
"@absinthe/socket": "^0.2.1",
-
"@absinthe/socket-apollo-link": "^0.2.1",
-
"@apollo/client": "^3.3.16",
-
"@oruga-ui/oruga-next": "^0.6.0",
-
"@sentry/tracing": "^7.1",
-
"@sentry/vue": "^7.1",
-
"@tiptap/core": "^2.0.0-beta.41",
-
"@tiptap/extension-blockquote": "^2.0.0-beta.25",
-
"@tiptap/extension-bold": "^2.0.0-beta.24",
-
"@tiptap/extension-bubble-menu": "^2.0.0-beta.9",
-
"@tiptap/extension-bullet-list": "^2.0.0-beta.23",
-
"@tiptap/extension-document": "^2.0.0-beta.15",
-
"@tiptap/extension-dropcursor": "^2.0.0-beta.25",
-
"@tiptap/extension-gapcursor": "^2.0.0-beta.33",
-
"@tiptap/extension-heading": "^2.0.0-beta.23",
-
"@tiptap/extension-history": "^2.0.0-beta.21",
-
"@tiptap/extension-image": "^2.0.0-beta.6",
-
"@tiptap/extension-italic": "^2.0.0-beta.24",
-
"@tiptap/extension-link": "^2.0.0-beta.8",
-
"@tiptap/extension-list-item": "^2.0.0-beta.19",
-
"@tiptap/extension-mention": "^2.0.0-beta.42",
-
"@tiptap/extension-ordered-list": "^2.0.0-beta.24",
-
"@tiptap/extension-paragraph": "^2.0.0-beta.22",
-
"@tiptap/extension-placeholder": "^2.0.0-beta.199",
-
"@tiptap/extension-strike": "^2.0.0-beta.26",
-
"@tiptap/extension-text": "^2.0.0-beta.15",
-
"@tiptap/extension-underline": "^2.0.0-beta.7",
-
"@tiptap/pm": "^2.0.0-beta.220",
-
"@tiptap/suggestion": "^2.0.0-beta.195",
-
"@tiptap/vue-3": "^2.0.0-beta.96",
-
"@vue-a11y/announcer": "^2.1.0",
-
"@vue-a11y/skip-to": "^2.1.2",
-
"@vue-leaflet/vue-leaflet": "^0.10.1",
-
"@vue/apollo-composable": "^4.0.0-beta.9",
-
"@vue/compiler-sfc": "^3.2.37",
-
"@vueuse/core": "^10.0.2",
-
"@vueuse/head": "^1.0",
-
"@vueuse/router": "^10.0.2",
-
"apollo-absinthe-upload-link": "^1.5.0",
-
"autoprefixer": "^10",
-
"blurhash": "^2.0.0",
-
"date-fns": "^2.16.0",
-
"date-fns-tz": "^2.0.0",
-
"floating-vue": "^2.0.0-beta.24",
-
"graphql": "^15.8.0",
-
"graphql-tag": "^2.10.3",
-
"hammerjs": "^2.0.8",
-
"intersection-observer": "^0.12.0",
-
"jwt-decode": "^3.1.2",
-
"leaflet": "^1.4.0",
-
"leaflet.locatecontrol": "^0.79",
-
"leaflet.markercluster": "^1.5.3",
-
"lodash": "^4.17.11",
-
"ngeohash": "^0.6.3",
-
"p-debounce": "^4.0.0",
-
"phoenix": "^1.6",
-
"postcss": "^8",
-
"register-service-worker": "^1.7.2",
-
"sanitize-html": "^2.5.3",
-
"tailwindcss": "^3",
-
"tippy.js": "^6.2.3",
-
"unfetch": "^5.0.0",
-
"vue": "^3.2.37",
-
"vue-i18n": "9",
-
"vue-material-design-icons": "^5.1.2",
-
"vue-matomo": "^4.1.0",
-
"vue-plausible": "^1.3.1",
-
"vue-router": "4",
-
"vue-scrollto": "^2.17.1",
-
"vue-use-route-query": "^1.1.0",
-
"zhyswan-vuedraggable": "^4.1.3"
-
},
-
"devDependencies": {
-
"@histoire/plugin-vue": "^0.17.1",
-
"@playwright/test": "^1.25.1",
-
"@rushstack/eslint-patch": "^1.1.4",
-
"@tailwindcss/forms": "^0.5.2",
-
"@tailwindcss/typography": "^0.5.4",
-
"@types/hammerjs": "^2.0.41",
-
"@types/leaflet": "^1.5.2",
-
"@types/leaflet.locatecontrol": "^0.74",
-
"@types/leaflet.markercluster": "^1.5.1",
-
"@types/lodash": "^4.14.141",
-
"@types/ngeohash": "^0.6.2",
-
"@types/phoenix": "^1.5.2",
-
"@types/sanitize-html": "^2.5.0",
-
"@vitejs/plugin-vue": "^4.0.0",
-
"@vitest/coverage-v8": "^0.34.1",
-
"@vitest/ui": "^0.34.1",
-
"@vue/eslint-config-prettier": "^8.0.0",
-
"@vue/eslint-config-typescript": "^11.0.0",
-
"@vue/test-utils": "^2.0.2",
-
"eslint": "^8.21.0",
-
"eslint-config-prettier": "^9.0.0",
-
"eslint-plugin-import": "^2.20.2",
-
"eslint-plugin-prettier": "^5.0.0",
-
"eslint-plugin-vue": "^9.3.0",
-
"flush-promises": "^1.0.2",
-
"histoire": "^0.17.0",
-
"husky": "^8.0.3",
-
"jsdom": "^22.0.0",
-
"lint-staged": "^14.0.1",
-
"mock-apollo-client": "^1.1.0",
-
"prettier": "^3.0.0",
-
"prettier-eslint": "^15.0.1",
-
"rollup-plugin-visualizer": "^5.7.1",
-
"sass": "^1.34.1",
-
"typescript": "~5.1.3",
-
"vite": "^4.0.4",
-
"vite-plugin-pwa": "^0.16.4",
-
"vitest": "^0.34.1",
-
"vue-i18n-extract": "^2.0.4"
-
}
-
}
+2 -2
pkgs/tools/audio/whisper-ctranslate2/default.nix
···
}:
let
pname = "whisper-ctranslate2";
-
version = "0.3.2";
+
version = "0.3.4";
in
python3.pkgs.buildPythonApplication {
inherit pname version;
···
owner = "Softcatala";
repo = "whisper-ctranslate2";
rev = version;
-
hash = "sha256-9Y9y7DihDnbREaeARCGC7ctwwBAoZPpIWDAOdeDnB6E=";
+
hash = "sha256-6tbCEvoOd97/rWC8XwKUS2FJXaB7PKReCctWRaYqUGU=";
};
propagatedBuildInputs = with python3.pkgs; [
+2 -2
pkgs/tools/misc/ttyplot/default.nix
···
stdenv.mkDerivation rec {
pname = "ttyplot";
-
version = "1.5.1";
+
version = "1.5.2";
src = fetchFromGitHub {
owner = "tenox7";
repo = "ttyplot";
rev = version;
-
sha256 = "sha256-lZLjTmSKxGJhUMELcIPjycpuRR3m9oz/Vh1/FEUzMOQ=";
+
sha256 = "sha256-BYMdGNDl8HUin1Hu4Fqgx305a/tTt1fztqlT2vDeTh8=";
};
buildInputs = [ ncurses ];
+2 -2
pkgs/tools/package-management/nix-eval-jobs/default.nix
···
}:
stdenv.mkDerivation rec {
pname = "nix-eval-jobs";
-
version = "2.18.0";
+
version = "2.19.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = pname;
rev = "v${version}";
-
hash = "sha256-k/yMWbtMHpiNHeR0ihNPV/idOUSRJuhf0RSCodxmOhc=";
+
hash = "sha256-5HtkRw7QERr+cvImFnBOXuR7wFk/BH4Nn6HaiEnBrfk=";
};
buildInputs = [
boost
+2 -2
pkgs/tools/security/tpm2-tools/default.nix
···
stdenv.mkDerivation rec {
pname = "tpm2-tools";
-
version = "5.5";
+
version = "5.6";
src = fetchurl {
url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
-
sha256 = "sha256-H9tJxzBTe/2u0IiISIGmHjv9Eh6VfsC9zu7AJhI2wSM=";
+
sha256 = "sha256-Usi8uq3KCCq/5et+5JZ9LWMthLFndnXy8HG20uwizsM=";
};
patches = [
-25
pkgs/tools/security/volatility/default.nix
···
-
{ lib, fetchFromGitHub, python2Packages }:
-
-
python2Packages.buildPythonApplication rec {
-
pname = "volatility";
-
version = "2.6.1";
-
-
src = fetchFromGitHub {
-
owner = "volatilityfoundation";
-
repo = pname;
-
rev = version;
-
sha256 = "1v92allp3cv3akk71kljcwxr27h1k067dsq7j9h8jnlwk9jxh6rf";
-
};
-
-
doCheck = false;
-
-
propagatedBuildInputs = with python2Packages; [ pycrypto distorm3 pillow ];
-
-
meta = with lib; {
-
homepage = "https://www.volatilityfoundation.org/";
-
description = "Advanced memory forensics framework";
-
maintainers = with maintainers; [ bosu ];
-
license = licenses.gpl2Plus;
-
broken = true;
-
};
-
}
+71
pkgs/tools/system/gnome-resources/default.nix
···
+
{ fetchFromGitHub
+
, stdenv
+
, lib
+
, appstream-glib
+
, cargo
+
, desktop-file-utils
+
, meson
+
, pkg-config
+
, rustPlatform
+
, rustc
+
, glib
+
, wrapGAppsHook4
+
, systemd
+
, polkit
+
, dmidecode
+
, gtk4
+
, libadwaita
+
, ninja
+
}:
+
stdenv.mkDerivation rec {
+
pname = "gnome-resources";
+
version = "1.2.1";
+
+
src = fetchFromGitHub {
+
owner = "nokyan";
+
repo = "resources";
+
rev = "v${version}";
+
hash = "sha256-OVz1vsmOtH/5sEuyl2BfDqG2/9D1HGtHA0FtPntKQT0=";
+
};
+
+
cargoDeps = rustPlatform.fetchCargoTarball {
+
inherit src;
+
hash = "sha256-SkCEA9CKqzy0wSIUj0DG6asIysD7G9i3nJ9jwhwAUqY=";
+
};
+
+
nativeBuildInputs = [
+
pkg-config
+
desktop-file-utils
+
appstream-glib
+
meson
+
ninja
+
rustc
+
cargo
+
rustPlatform.cargoSetupHook
+
wrapGAppsHook4
+
];
+
+
buildInputs = [
+
glib
+
gtk4
+
libadwaita
+
polkit
+
systemd
+
];
+
+
postPatch = ''
+
substituteInPlace src/utils/memory.rs \
+
--replace '"dmidecode"' '"${dmidecode}/bin/dmidecode"'
+
'';
+
+
mesonFlags = [ "-Dprofile=default" ];
+
+
meta = with lib; {
+
homepage = "https://github.com/nokyan/resources";
+
description = "Monitor your system resources and processes";
+
license = licenses.gpl3Plus;
+
mainProgram = "resources";
+
maintainers = with maintainers; [ ewuuwe ];
+
platforms = platforms.linux;
+
};
+
}
+1
pkgs/top-level/aliases.nix
···
varnish72Packages = throw "varnish 7.2 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09
varnish73Packages = throw "varnish 7.3 is EOL. Either use the LTS or upgrade."; # Added 2023-10-09
inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17
+
volatility = throw "'volatility' has been removed, as it was broken and unmaintained"; # Added 2023-12-10
### W ###
waybar-hyprland = throw "waybar-hyprland has been removed: hyprland support is now built into waybar by default."; # Added 2023-08-21
+15 -18
pkgs/top-level/all-packages.nix
···
gnome-randr = callPackage ../tools/wayland/gnome-randr { };
+
gnome-resources = callPackage ../tools/system/gnome-resources { };
+
gnuapl = callPackage ../development/interpreters/gnu-apl { };
gnu-shepherd = callPackage ../misc/gnu-shepherd { };
···
vk-cli = callPackage ../applications/networking/instant-messengers/vk-cli { };
vk-messenger = callPackage ../applications/networking/instant-messengers/vk-messenger { };
-
-
volatility = callPackage ../tools/security/volatility { };
volatility3 = callPackage ../tools/security/volatility3 { };
···
super-slicer-latest = super-slicer.latest;
+
bambu-studio = callPackage ../applications/misc/bambu-studio {
+
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad;
+
+
glew = glew-egl;
+
+
wxGTK31 = wxGTK31.override {
+
withCurl = true;
+
withPrivateFonts = true;
+
withWebKit = true;
+
};
+
};
+
snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { };
robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { };
···
airshipper = callPackage ../games/airshipper { };
airstrike = callPackage ../games/airstrike { };
-
-
alephone = callPackage ../games/alephone { };
-
alephone-apotheosis-x = callPackage ../games/alephone/apotheosis-x { };
-
alephone-durandal = callPackage ../games/alephone/durandal { };
-
alephone-eternal = callPackage ../games/alephone/eternal { };
-
alephone-evil = callPackage ../games/alephone/evil { };
-
alephone-infinity = callPackage ../games/alephone/infinity { };
-
alephone-marathon = callPackage ../games/alephone/marathon { };
-
alephone-pheonix = callPackage ../games/alephone/pheonix { };
-
alephone-red = callPackage ../games/alephone/red { };
-
alephone-rubicon-x = callPackage ../games/alephone/rubicon-x { };
-
alephone-pathways-into-darkness =
-
callPackage ../games/alephone/pathways-into-darkness { };
-
alephone-yuge =
-
callPackage ../games/alephone/yuge { };
alienarena = callPackage ../games/alienarena { };
···
dnadd = callPackage ../tools/nix/dnadd { };
nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs {
-
nix = nixVersions.nix_2_18;
+
nix = nixVersions.nix_2_19;
nix-doc = callPackage ../tools/package-management/nix-doc { };
+8
pkgs/top-level/nim-overrides.nix
···
buildInputs = buildInputs ++ [ getdns ];
};
+
hashlib = lockAttrs:
+
lib.trivial.warnIf
+
(lockAttrs.rev == "84e0247555e4488594975900401baaf5bbbfb531")
+
"the selected version of the hashlib Nim library is hardware specific"
+
# https://github.com/khchen/hashlib/pull/4
+
# remove when fixed upstream
+
(_: _: { });
+
nimraylib_now = lockAttrs: finalAttrs:
{ buildInputs ? [ ], ... }: {
buildInputs = buildInputs ++ [ raylib ];