Merge master into staging-next

This commit is contained in:
github-actions[bot]
2024-12-06 12:05:59 +00:00
committed by GitHub
49 changed files with 246 additions and 824 deletions
+1 -1
View File
@@ -100,7 +100,7 @@ let
length head tail elem elemAt isList;
inherit (self.strings) concatStrings concatMapStrings concatImapStrings
stringLength substring isString replaceStrings
intersperse concatStringsSep concatMapStringsSep
intersperse concatStringsSep concatMapStringsSep concatMapAttrsStringSep
concatImapStringsSep concatLines makeSearchPath makeSearchPathOutput
makeLibraryPath makeIncludePath makeBinPath optionalString
hasInfix hasPrefix hasSuffix stringToCharacters stringAsChars escape
+37
View File
@@ -269,6 +269,43 @@ rec {
f:
list: concatStringsSep sep (lib.imap1 f list);
/**
Like [`concatMapStringsSep`](#function-library-lib.strings.concatMapStringsSep)
but takes an attribute set instead of a list.
# Inputs
`sep`
: Separator to add between item strings
`f`
: Function that takes each key and value and return a string
`attrs`
: Attribute set to map from
# Type
```
concatMapAttrsStringSep :: String -> (String -> Any -> String) -> AttrSet -> String
```
# Examples
:::{.example}
## `lib.strings.concatMapAttrsStringSep` usage example
```nix
concatMapAttrsStringSep "\n" (name: value: "${name}: foo-${value}") { a = "0.1.0"; b = "0.2.0"; }
=> "a: foo-0.1.0\nb: foo-0.2.0"
```
:::
*/
concatMapAttrsStringSep =
sep: f: attrs:
concatStringsSep sep (lib.attrValues (lib.mapAttrs f attrs));
/**
Concatenate a list of strings, adding a newline at the end of each one.
Defined as `concatMapStrings (s: s + "\n")`.
+6
View File
@@ -39,6 +39,7 @@ let
composeManyExtensions
concatLines
concatMapAttrs
concatMapAttrsStringSep
concatMapStrings
concatStrings
concatStringsSep
@@ -328,6 +329,11 @@ runTests {
expected = "a,b,c";
};
testConcatMapAttrsStringSepExamples = {
expr = concatMapAttrsStringSep "\n" (name: value: "${name}: foo-${value}") { a = "0.1.0"; b = "0.2.0"; };
expected = "a: foo-0.1.0\nb: foo-0.2.0";
};
testConcatLines = {
expr = concatLines ["a" "b" "c"];
expected = "a\nb\nc\n";
+6
View File
@@ -21166,6 +21166,12 @@
github = "stasjok";
githubId = 1353637;
};
StayBlue = {
name = "StayBlue";
email = "blue@spook.rip";
github = "StayBlue";
githubId = 23127866;
};
steamwalker = {
email = "steamwalker@xs4all.nl";
github = "steamwalker";
@@ -109,7 +109,7 @@ In addition to numerous new and upgraded packages, this release has the followin
- [Maddy](https://maddy.email/), a free an open source mail server. Available as [services.maddy](#opt-services.maddy.enable).
- [matrix-conduit](https://conduit.rs/), a simple, fast and reliable chat server powered by matrix. Available as [services.matrix-conduit](option.html#opt-services.matrix-conduit.enable).
- [matrix-conduit](https://conduit.rs/), a simple, fast and reliable chat server powered by matrix. Available as [services.matrix-conduit](options.html#opt-services.matrix-conduit.enable).
- [Moosefs](https://moosefs.com), fault tolerant petabyte distributed file system. Available as [moosefs](#opt-services.moosefs.master.enable).
@@ -173,11 +173,11 @@
- [Suricata](https://suricata.io/), a free and open source, mature, fast and robust network threat detection engine. Available as [services.suricata](options.html#opt-services.suricata.enable).
- [Playerctld](https://github.com/altdesktop/playerctl), a daemon to track media player activity. Available as [services.playerctld](option.html#opt-services.playerctld.enable).
- [Playerctld](https://github.com/altdesktop/playerctl), a daemon to track media player activity. Available as [services.playerctld](options.html#opt-services.playerctld.enable).
- [Glance](https://github.com/glanceapp/glance), a self-hosted dashboard that puts all your feeds in one place. Available as [services.glance](option.html#opt-services.glance.enable).
- [Glance](https://github.com/glanceapp/glance), a self-hosted dashboard that puts all your feeds in one place. Available as [services.glance](options.html#opt-services.glance.enable).
- [Apache Tika](https://github.com/apache/tika), a toolkit that detects and extracts metadata and text from over a thousand different file types. Available as [services.tika](option.html#opt-services.tika.enable).
- [Apache Tika](https://github.com/apache/tika), a toolkit that detects and extracts metadata and text from over a thousand different file types. Available as [services.tika](options.html#opt-services.tika.enable).
- [Misskey](https://misskey-hub.net/en/), an interplanetary microblogging platform. Available as [services.misskey](options.html#opt-services.misskey.enable).
@@ -199,7 +199,7 @@
- [ToDesk](https://www.todesk.com/linux.html), a remote desktop application. Available as [services.todesk](#opt-services.todesk.enable).
- [Dependency Track](https://dependencytrack.org/), an intelligent Component Analysis platform that allows organizations to identify and reduce risk in the software supply chain. Available as [services.dependency-track](option.html#opt-services.dependency-track.enable).
- [Dependency Track](https://dependencytrack.org/), an intelligent Component Analysis platform that allows organizations to identify and reduce risk in the software supply chain. Available as [services.dependency-track](options.html#opt-services.dependency-track.enable).
- [Immich](https://github.com/immich-app/immich), a self-hosted photo and video backup solution. Available as [services.immich](#opt-services.immich.enable).
@@ -215,9 +215,9 @@
- [Swapspace](https://github.com/Tookmund/Swapspace), a dynamic swap space manager that turns your unused free space into swap automatically. Available as [services.swapspace](#opt-services.swapspace.enable).
- [Zapret](https://github.com/bol-van/zapret), a DPI bypass tool. Available as [services.zapret](option.html#opt-services.zapret.enable).
- [Zapret](https://github.com/bol-van/zapret), a DPI bypass tool. Available as [services.zapret](options.html#opt-services.zapret.enable).
- [Glances](https://github.com/nicolargo/glances), an open-source system cross-platform monitoring tool. Available as [services.glances](option.html#opt-services.glances).
- [Glances](https://github.com/nicolargo/glances), an open-source system cross-platform monitoring tool. Available as [services.glances](options.html#opt-services.glances).
## Backward Incompatibilities {#sec-release-24.11-incompatibilities}
@@ -23,15 +23,15 @@
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
- [Kimai](https://www.kimai.org/), a web-based multi-user time-tracking application. Available as [services.kimai](option.html#opt-services.kimai).
- [Kimai](https://www.kimai.org/), a web-based multi-user time-tracking application. Available as [services.kimai](options.html#opt-services.kimai).
- [Omnom](https://github.com/asciimoo/omnom), a webpage bookmarking and snapshotting service. Available as [services.omnom](options.html#opt-services.omnom.enable).
- [Traccar](https://www.traccar.org/), a modern GPS Tracking Platform. Available as [services.traccar](#opt-services.traccar.enable).
- [Amazon CloudWatch Agent](https://github.com/aws/amazon-cloudwatch-agent), the official telemetry collector for AWS CloudWatch and AWS X-Ray. Available as [services.amazon-cloudwatch-agent](#opt-services.amazon-cloudwatch-agent.enable).
- [Amazon CloudWatch Agent](https://github.com/aws/amazon-cloudwatch-agent), the official telemetry collector for AWS CloudWatch and AWS X-Ray. Available as [services.amazon-cloudwatch-agent](options.html#opt-services.amazon-cloudwatch-agent.enable).
- [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](#opt-services.agorakit.enable).
- [agorakit](https://github.com/agorakit/agorakit), an organization tool for citizens' collectives. Available with [services.agorakit](options.html#opt-services.agorakit.enable).
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@@ -57,6 +57,8 @@
- `nodePackages.insect` has been removed, as it's deprecated by upstream. The suggested replacement is `numbat`.
- `nodePackages.webpack-dev-server` has been removed, as it should be installed in projects that use it instead.
- The behavior of the `networking.nat.externalIP` and `networking.nat.externalIPv6` options has been changed. `networking.nat.forwardPorts` now only forwards packets destined for the specified IP addresses.
- `nodePackages.meshcommander` has been removed, as the package was deprecated by Intel.
-11
View File
@@ -57,17 +57,6 @@ in
"nmi_watchdog=panic"
"softlockup_panic=1"
];
kernelPatches = [ {
name = "crashdump-config";
patch = null;
extraConfig = ''
CRASH_DUMP y
DEBUG_INFO y
PROC_VMCORE y
LOCKUP_DETECTOR y
HARDLOCKUP_DETECTOR y
'';
} ];
};
};
}
+2 -1
View File
@@ -853,7 +853,8 @@ in
smtpd_tls_cert_file = cfg.sslCert;
smtpd_tls_key_file = cfg.sslKey;
smtpd_tls_security_level = "may";
smtpd_tls_security_level = lib.mkDefault "may";
};
services.postfix.masterConfig = {
+1 -3
View File
@@ -228,7 +228,6 @@ in
ProtectKernelModules = true;
ProtectKernelTunables = true;
ProtectProc = "invisible";
ProcSubset = "pid";
RestrictAddressFamilies = [
"AF_UNIX"
@@ -240,11 +239,10 @@ in
RestrictRealtime = true;
LockPersonality = true;
MemoryDenyWriteExecute = true;
SystemCallFilter = [
"@sandbox"
"@system-service"
"~@privileged"
];
SystemCallArchitectures = "native";
+1 -1
View File
@@ -27,7 +27,7 @@ in
description = ''
Set the Access-Control-Allow-Origin header in the HTTP response,
used for direct (non-proxy) JavaScript-based access from browsers.
`null` to allow access from all sites.
`"*"` to allow access from all sites.
'';
};
@@ -1,39 +0,0 @@
{ lib, stdenv, fetchFromGitHub, poppler, pkg-config, gdk-pixbuf, SDL, gtk2 }:
stdenv.mkDerivation {
pname = "green-pdfviewer";
version = "nightly-2014-04-22";
src = fetchFromGitHub {
owner = "schandinat";
repo = "green";
rev = "0b516aec17915d9742d8e505d2ed383a3bdcea61";
sha256 = "0d0lv33flhgsxhc77kfp2avdz5gvml04r8l1j95yjz2rr096lzlj";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ poppler gdk-pixbuf SDL gtk2 ];
patches = [
./gdk-libs.patch
];
buildPhase = ''
make PREFIX=$out
'';
installPhase = ''
mkdir -p $out/bin $out/share/man1
make install PREFIX=$out MANDIR=$out/share
'';
meta = with lib; {
homepage = "https://github.com/schandinat/green/";
description = "Viewer for PDF files, uses SDL and libpoppler";
platforms = platforms.unix;
license = licenses.gpl3;
maintainers = [ ];
mainProgram = "green";
};
}
@@ -1,55 +0,0 @@
Common subdirectories: green.old/debian and green.new/debian
diff -u green.old/green.h green.new/green.h
--- green.old/green.h 2016-06-12 18:11:56.779434416 -0700
+++ green.new/green.h 2016-06-12 18:14:38.830557379 -0700
@@ -19,7 +19,14 @@
#include <stdbool.h>
-#include "glib/poppler.h"
+#include "poppler.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf/gdk-pixbuf-core.h"
+#include "gdk-pixbuf/gdk-pixbuf-features.h"
+#include "gdk-pixbuf/gdk-pixbuf-enum-types.h"
+
+ #define GREEN_FULLSCREEN 0x0001
+
#define GREEN_FULLSCREEN 0x0001
diff -u green.old/Makefile green.new/Makefile
--- green.old/Makefile 2016-06-12 18:11:56.779434416 -0700
+++ green.new/Makefile 2016-06-12 18:13:09.591974048 -0700
@@ -17,6 +17,12 @@
SDL_CFLAGS := $$(sdl-config --cflags)
SDL_LIBS := $$(sdl-config --libs)
+GDKPIXBUF_CFLAGS := $$(pkg-config gdk-pixbuf-2.0 --cflags)
+GDKPIXBUF_LIBS := $$(pkg-config gdk-pixbuf-2.0 --libs)
+
+GTK_CFLAGS := $$(pkg-config gtk+-2.0 --cflags)
+GTK_LIBS := $$(pkg-config gtk+-2.0 --libs)
+
all: green
@@ -28,13 +34,14 @@
$(INSTALL) green.1 $(MANDIR)/man1/
green: main.o green.o sdl.o
- $(CC) $^ $(POPPLER_LIBS) $(SDL_LIBS) -o $@
+ $(CC) $^ $(POPPLER_LIBS) $(SDL_LIBS) $(GDKPIXBUF_LIBS) $(GTK_LIBS) -o $@
main.o: main.c green.h
- $(CC) $(CONFIG) $(CFLAGS) -c $< $(POPPLER_CFLAGS) -o $@
+ $(CC) $(CONFIG) $(CFLAGS) $(GDKPIXBUF_CFLAGS) -c $< $(POPPLER_CFLAGS) -o $@
green.o: green.c green.h
- $(CC) $(CFLAGS) -c $< $(POPPLER_CFLAGS) -o $@
+ $(CC) $(CFLAGS) -c $< $(POPPLER_CFLAGS) $(GDKPIXBUF_CFLAGS) -o $@
sdl.o: sdl.c green.h
- $(CC) $(CFLAGS) -c $< $(POPPLER_CFLAGS) $(SDL_CFLAGS) -o $@
+ $(CC) $(CFLAGS) -c $< $(POPPLER_CFLAGS) $(SDL_CFLAGS) $(GDKPIXBUF_CFLAGS) $(GTK_CFLAGS) -o $@
+
@@ -102,10 +102,6 @@ in
}@args:
let
concatMapStringAttrsSep =
sep: f: attrs:
lib.concatMapStringsSep sep (name: f name attrs.${name}) (lib.attrNames attrs);
addShellDoubleQuotes = s: lib.escapeShellArg ''"'' + s + lib.escapeShellArg ''"'';
in
(buildGoModule {
@@ -210,7 +206,7 @@ in
patchShebangs --build "$configureScript" makeit e2e scripts mlocal/scripts
# Patching the hard-coded defaultPath by prefixing the packages in defaultPathInputs
${concatMapStringAttrsSep "\n" (fileName: originalDefaultPaths: ''
${lib.concatMapAttrsStringSep "\n" (fileName: originalDefaultPaths: ''
substituteInPlace ${lib.escapeShellArg fileName} \
${
lib.concatMapStringsSep " \\\n " (
+45
View File
@@ -0,0 +1,45 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
udev,
zstd,
stdenv,
}:
rustPlatform.buildRustPackage rec {
pname = "argon";
version = "2.0.21";
src = fetchFromGitHub {
owner = "argon-rbx";
repo = "argon";
rev = "refs/tags/${version}";
hash = "sha256-msKrPLB+38PU7LEw92xEqFy6JxwMjttBaobIOhU7eWw=";
};
cargoHash = "sha256-yXhEgZYtYhrSpwPbL+yi9gaLVVV8sBlF8m3ADUC4kLk=";
nativeBuildInputs = [ pkg-config ];
buildInputs =
[
zstd
]
++ lib.optionals stdenv.hostPlatform.isLinux [
udev
];
env = {
ZSTD_SYS_USE_PKG_CONFIG = true;
};
meta = {
description = "Full featured tool for Roblox development";
homepage = "https://github.com/argon-rbx/argon";
changelog = "https://github.com/argon-rbx/argon/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ StayBlue ];
mainProgram = "argon";
};
}
@@ -1,10 +0,0 @@
--- crack-attack-1.1.14/src/Game.h
+++ crack-attack-1.1.14/src/Game.h
@@ -34,6 +34,7 @@
#include <climits>
#include <cstdlib>
#include <cmath>
+#include <cstring>
#ifdef __MINGW32__
# include <windows.h>
@@ -1,10 +0,0 @@
--- crack-attack-1.1.14/src/Attack.cxx
+++ crack-attack-1.1.14/src/Attack.cxx
@@ -83,6 +83,7 @@
int height = -1, width = -1;
player_name[0] = '\0';
+ glutInit(&argc, argv);
parseCommandLine(argc, argv, mode, port, host_name, player_name, height, width);
run_crack_attack(mode, port, host_name, player_name, height, width);
-37
View File
@@ -1,37 +0,0 @@
{ lib, stdenv, fetchurl, pkg-config, gtk2, libglut, SDL, SDL_mixer, libGLU, libGL, libXi, libXmu }:
stdenv.mkDerivation rec {
pname = "crack-attack";
version = "1.1.14";
src = fetchurl {
url = "mirror://savannah/crack-attack/crack-attack-${version}.tar.gz";
sha256 = "1sakj9a2q05brpd7lkqxi8q30bccycdzd96ns00s6jbxrzjlijkm";
};
patches = [
./crack-attack-1.1.14-gcc43.patch
./crack-attack-1.1.14-glut.patch
];
configureFlags = [
"--enable-sound=yes"
"--prefix=${placeholder "out"}"
"--datadir=${placeholder "out"}/share"
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 libglut SDL SDL_mixer libGLU libGL libXi libXmu ];
hardeningDisable = [ "format" ];
enableParallelBuilding = true;
meta = {
description = "Fast-paced puzzle game inspired by the classic Super NES title Tetris Attack!";
mainProgram = "crack-attack";
homepage = "https://www.nongnu.org/crack-attack/";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
maintainers = [ ];
};
}
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "gh";
version = "2.63.0";
version = "2.63.2";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "refs/tags/v${version}";
hash = "sha256-r60mqFMvgZ39hBjehHrjqDsCzznyQDcXJmqIrn62Jvw=";
hash = "sha256-MxgwnRTIJFpYhZZhyc59ZAzgi6ud7mHpdSIImMlkwtg=";
};
vendorHash = "sha256-vdyArSBBF6ImYbwzAJCWbLihCtJuvxN6ooymwj32ywQ=";
vendorHash = "sha256-UCEtvEpfoyJs5lpoAfMehg5cFQ3XlESRT8XFIwvyYas=";
nativeBuildInputs = [ installShellFiles ];
@@ -1,22 +0,0 @@
{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2 }:
stdenv.mkDerivation rec {
pname = "gtk-engine-bluecurve";
version = "1.0";
src = fetchurl {
url = "https://ftp.gnome.org/pub/gnome/teams/art.gnome.org/archive/themes/gtk2/GTK2-Wonderland-Engine-${version}.tar.bz2";
sha256 = "1nim3lhmbs5mw1hh76d9258c1p923854x2j6i30gmny812c7qjnm";
};
nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ gtk2 ];
meta = {
description = "Original Bluecurve engine from Red Hat's artwork package";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
maintainers = [ ];
};
}
-33
View File
@@ -1,33 +0,0 @@
{ lib, stdenv, fetchurl, ncurses, glib, pkg-config, gtk2, util-linux }:
stdenv.mkDerivation rec {
pname = "latencytop";
version = "0.5";
postPatch = ''
sed -i s,/usr,$out, Makefile
# Fix #171609
substituteInPlace fsync.c --replace /bin/mount ${util-linux}/bin/mount
'';
preInstall = "mkdir -p $out/sbin";
src = fetchurl {
urls = [ "http://latencytop.org/download/latencytop-${version}.tar.gz"
"http://dbg.download.sourcemage.org/mirror/latencytop-0.5.tar.gz" ];
sha256 = "1vq3j9zdab6njly2wp900b3d5244mnxfm88j2bkiinbvxbxp4zwy";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ncurses glib gtk2 ];
meta = {
homepage = "http://latencytop.org";
description = "Tool to show kernel reports on latencies (LATENCYTOP option)";
mainProgram = "latencytop";
license = lib.licenses.gpl2Only;
maintainers = [ ];
platforms = lib.platforms.linux;
};
}
@@ -2,11 +2,11 @@
let
pname = "ledger-live-desktop";
version = "2.89.1";
version = "2.92.1";
src = fetchurl {
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
hash = "sha256-PPoQnXDVf6Q6QPVE41guJL1vu7rW7mZdpRZjRME3Ue8=";
hash = "sha256-X4jJ7vDoU1CyZQm9Grghn6Rv+7OILE79PbN77BUhzG0=";
};
appimageContents = appimageTools.extractType2 {
-64
View File
@@ -1,64 +0,0 @@
{ lib, stdenv, fetchFromGitHub
, libtool, pkg-config, automake, autoconf, intltool
, gobject-introspection, gtk2, gtk-doc
, clutter, clutter-gtk
}:
stdenv.mkDerivation rec {
pname = "libmx";
version = "1.4.7";
src = fetchFromGitHub {
owner = "clutter-project";
repo = "mx";
rev = version;
sha256 = "sha256-+heIPSkg3d22xsU48UOTJ9FPLXC7zLivcnabQOM9aEk=";
};
# remove the following superfluous checks
preConfigure = ''
substituteInPlace "autogen.sh" \
--replace '`which intltoolize`' '"x"' \
--replace '`which gtkdocize`' '"x"' \
--replace '`which autoreconf`' '"x"'
'';
configureFlags = [ "--enable-introspection"
"--without-startup-notification"
"--without-dbus"
"--without-glade"
"--without-clutter-imcontext"
"--without-clutter-gesture"
];
configureScript = "sh autogen.sh";
nativeBuildInputs = [ pkg-config automake autoconf intltool gobject-introspection ];
buildInputs = [
libtool
gtk2 gtk-doc clutter clutter-gtk
];
# patch to resolve GL errors
# source : https://github.com/clutter-project/mx/pull/62
preBuild = ''
sed -i 's/GLushort/gushort/g' mx/mx-deform-texture.c
sed -i 's/GLfloat/gfloat/g' mx/mx-texture-frame.c
'';
meta = with lib; {
homepage = "http://www.clutter-project.org/";
description = "Clutter-based toolkit";
mainProgram = "mx-create-image-cache";
longDescription = ''
Mx is a widget toolkit using Clutter that provides a set of standard
interface elements, including buttons, progress bars, scroll bars and
others. It also implements some standard managers. One other interesting
feature is the possibility setting style properties from a CSS format
file.
'';
license = licenses.lgpl21;
maintainers = [ ];
platforms = with platforms; linux;
};
}
+3 -3
View File
@@ -15,16 +15,16 @@
let
package = buildGoModule rec {
pname = "opentofu";
version = "1.8.6";
version = "1.8.7";
src = fetchFromGitHub {
owner = "opentofu";
repo = "opentofu";
rev = "v${version}";
hash = "sha256-yJCUWRAntye3Dx2a+s/gNVa+XuCQak24TnFjSY+/3zc=";
hash = "sha256-OLXR9aA94KcIsZxk8gOZxZsljMKuymScuYcoj9W5Hj4=";
};
vendorHash = "sha256-MHdEY2nlUGTKybMPran5mTXlAlTFilfrY5K2sMlPe5U=";
vendorHash = "sha256-6M/uqwhNruIPx5srbimKuDJaFiZkyosoZQXWjxa6GxY=";
ldflags = [
"-s"
"-w"
+3 -3
View File
@@ -13,19 +13,19 @@
}:
rustPlatform.buildRustPackage rec {
pname = "radicle-httpd";
version = "0.17.1";
version = "0.18.0";
env.RADICLE_VERSION = version;
# You must update the radicle-explorer source hash when changing this.
src = fetchgit {
url = "https://seed.radicle.xyz/z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git";
rev = "refs/namespaces/z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5/refs/tags/v${version}";
hash = "sha256-AhiIpNVDL4XYIQ89aYu8Cp2nKhIPYCzyrcG5hw9xsmE=";
hash = "sha256-VHfiL0BSJsYS8QgMf+LEa6HvYoc+dxawTcwB4d6sTg8=";
sparseCheckout = [ "radicle-httpd" ];
};
sourceRoot = "${src.name}/radicle-httpd";
cargoHash = "sha256-TwK2QsoKVWYXn4mZEERQCnMOY4F9+wzjLBtvhH69wAs=";
cargoHash = "sha256-LmUZCu10RsuA8Lu3FjWcV8MzjX5FxBCV6+4zG0GEN2c=";
nativeBuildInputs = [
asciidoctor
-23
View File
@@ -1,23 +0,0 @@
{ lib, stdenv, fetchurl, gtk2, pkg-config }:
stdenv.mkDerivation rec {
pname = "rftg";
version = "0.9.4";
src = fetchurl {
url = "http://keldon.net/rftg/rftg-${version}.tar.bz2";
sha256 = "0j2y6ggpwdlvyqhirp010aix2g6aacj3kvggvpwzxhig30x9vgq8";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2.dev ];
meta = {
homepage = "http://keldon.net/rftg/";
description = "Implementation of the card game Race for the Galaxy, including an AI";
license = lib.licenses.gpl2Plus;
maintainers = [ ];
};
}
-38
View File
@@ -1,38 +0,0 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch
, pkg-config, dbus, gdk-pixbuf, glib, libX11, gtk2, librsvg
, dbus-glib, autoreconfHook, wrapGAppsHook3 }:
stdenv.mkDerivation {
pname = "volnoti-unstable";
version = "2013-09-23";
src = fetchFromGitHub {
owner = "davidbrazdil";
repo = "volnoti";
rev = "4af7c8e54ecc499097121909f02ecb42a8a60d24";
sha256 = "155lb7w563dkdkdn4752hl0zjhgnq3j4cvs9z98nb25k1xpmpki7";
};
patches = [
# Fix dbus interface headers. See
# https://github.com/davidbrazdil/volnoti/pull/10
(fetchpatch {
url = "https://github.com/davidbrazdil/volnoti/commit/623ad8ea5c3ac8720d00a2ced4b6163aae38c119.patch";
sha256 = "046zfdjmvhb7jrsgh04vfgi35sgy1zkrhd3bzdby3nvds1wslfam";
})
];
nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook3 ];
buildInputs = [
dbus gdk-pixbuf glib libX11 gtk2 dbus-glib librsvg
];
meta = with lib; {
description = "Lightweight volume notification for Linux";
homepage = "https://github.com/davidbrazdil/volnoti";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = [ ];
};
}
+6 -5
View File
@@ -63,15 +63,15 @@ in
stdenv.mkDerivation rec {
pname = "joypixels";
version = "8.0.0";
version = "9.0.0";
src = assert !acceptLicense -> throwLicense;
with systemSpecific; fetchurl {
name = fontFile;
url = "https://cdn.joypixels.com/distributions/${systemTag}/font/${version}/${fontFile}";
sha256 = {
darwin = "0kj4nck6k91avhan9iy3n8hhk47xr44rd1lzljjx3w2yzw1w9zvv";
}.${kernel.name} or "1bkyclgmvl6ppbdvidc5xr1g6f215slf0glnh5p6fsfbxc5h95bw";
darwin = "sha256-muUxXzz8BePyPsiZocYvM0ebM1H+u84ysN5YUvsMLiU=";
}.${kernel.name} or "sha256-pmGsVgYSK/c5OlhOXhNlRBs/XppMXmsHcZeSmIkuED4=";
};
dontUnpack = true;
@@ -87,8 +87,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Finest emoji you can use legally (formerly EmojiOne)";
longDescription = ''
Updated for 2023! JoyPixels 8.0 includes 3,702 originally crafted icon
designs and is 100% Unicode 15.0 compatible. We offer the largest
Updated for 2024! JoyPixels 9.0 includes 3,820 originally crafted icon
designs and is 100% Unicode 15.1 compatible. We offer the largest
selection of files ranging from png, svg, iconjar, and fonts (sprites
available upon request).
'';
@@ -104,6 +104,7 @@ stdenv.mkDerivation rec {
url = free-license.url;
appendixUrl = appendix.url;
free = false;
redistributable = true;
};
maintainers = with maintainers; [ toonn jtojnar ];
# Not quite accurate since it's a font, not a program, but clearly
@@ -6,7 +6,6 @@
qt5integration,
qt5platform-plugins,
libsForQt5,
dde-qt-dbus-factory,
cmake,
pkg-config,
gtest,
@@ -14,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "deepin-calculator";
version = "5.8.24";
version = "6.5.2";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "sha256-Gv4X1vT3w3kd1FN6BBpUeG2VBz/e+OWLBQyBL7r3BrI=";
hash = "sha256-5igRoyXx71LepvWlS+CDRq0q9BFCDitM+83j3Mt6DxU=";
};
nativeBuildInputs = [
@@ -36,7 +35,6 @@ stdenv.mkDerivation rec {
qt5platform-plugins
libsForQt5.qtbase
libsForQt5.qtsvg
dde-qt-dbus-factory
gtest
];
@@ -44,12 +42,12 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DVERSION=${version}" ];
meta = with lib; {
meta = {
description = "Easy to use calculator for ordinary users";
mainProgram = "deepin-calculator";
homepage = "https://github.com/linuxdeepin/deepin-calculator";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = teams.deepin.members;
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
maintainers = lib.teams.deepin.members;
};
}
+1 -1
View File
@@ -105,13 +105,13 @@ let
#### MISC
deepin-desktop-base = callPackage ./misc/deepin-desktop-base { };
deepin-turbo = callPackage ./misc/deepin-turbo { };
}
// lib.optionalAttrs config.allowAliases {
dde-kwin = throw "The 'deepin.dde-kwin' package was removed as it is outdated and no longer relevant."; # added 2023-09-27
dde-launcher = throw "The 'deepin.dde-launcher' is no longer maintained. Please use 'deepin.dde-launchpad' instead."; # added 2023-11-23
dde-dock = throw "The 'deepin.dde-dock' is no longer maintained. Please use 'deepin.dde-tray-loader' instead."; # added 2024-08-28
deepin-clone = throw "The 'deepin.deepin-clone' package was removed as it is broken and unmaintained."; # added 2024-08-23
deepin-turbo = throw "The 'deepin.deepin-turbo' package was removed as it is outdated and no longer relevant."; # added 2024-12-06
go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31
go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31
go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31
@@ -1,41 +0,0 @@
{
stdenv,
lib,
fetchFromGitHub,
cmake,
pkg-config,
libsForQt5,
dtkwidget,
}:
stdenv.mkDerivation rec {
pname = "deepin-turbo";
version = "0.0.6.3";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "sha256-t6/Ws/Q8DO0zBzrUr/liD61VkxbOv4W4x6VgMWr+Ozk=";
};
nativeBuildInputs = [
cmake
pkg-config
libsForQt5.wrapQtAppsHook
];
buildInputs = [ dtkwidget ];
postPatch = ''
substituteInPlace src/{booster-dtkwidget/CMakeLists.txt,booster-desktop/{CMakeLists.txt,desktop.conf},booster-generic/CMakeLists.txt} --replace "/usr" "$out"
'';
meta = with lib; {
description = "Daemon that helps to launch dtk applications faster";
homepage = "https://github.com/linuxdeepin/deepin-turbo";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = teams.deepin.members;
};
}
@@ -215,6 +215,7 @@ mapAliases {
vue-cli = throw "vue-cli has been removed since upstream no longer recommends using it; consider using create-vue and the new Vite-based tooling instead."; # added 2024-07-12
inherit (pkgs) web-ext; # added 2023-08-20
inherit (pkgs) webpack-cli; # added 2024-12-03
webpack-dev-server = throw "webpack-dev-server has been removed. You should install it in your JS project instead."; # added 2024-12-05
inherit (pkgs) wrangler; # added 2024-07-01
inherit (pkgs) write-good; # added 2023-08-20
inherit (pkgs) yalc; # added 2024-06-29
@@ -223,7 +223,6 @@
, "vscode-json-languageserver"
, "wavedrom-cli"
, "webpack"
, "webpack-dev-server"
, "copy-webpack-plugin"
, "webtorrent-cli"
, "wring"
-354
View File
@@ -6466,33 +6466,6 @@ let
sha512 = "14OGYM3DjEBjUOUaih+bwPgkhFnR8L9TSNSM0oE0L0hjWscTapvClqOgMDJ1ID52qkROCAgKl1d71Vmm4v0Buw==";
};
};
"@jsonjoy.com/base64-1.1.2" = {
name = "_at_jsonjoy.com_slash_base64";
packageName = "@jsonjoy.com/base64";
version = "1.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz";
sha512 = "q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA==";
};
};
"@jsonjoy.com/json-pack-1.1.0" = {
name = "_at_jsonjoy.com_slash_json-pack";
packageName = "@jsonjoy.com/json-pack";
version = "1.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.1.0.tgz";
sha512 = "zlQONA+msXPPwHWZMKFVS78ewFczIll5lXiVPwFPCZUsrOKdxc2AvxU1HoNBmMRhqDZUR9HkC3UOm+6pME6Xsg==";
};
};
"@jsonjoy.com/util-1.3.0" = {
name = "_at_jsonjoy.com_slash_util";
packageName = "@jsonjoy.com/util";
version = "1.3.0";
src = fetchurl {
url = "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.3.0.tgz";
sha512 = "Cebt4Vk7k1xHy87kHY7KSPLT77A7Ev7IfOblyLZhtYEhrdQ6fX4EoLq3xOQ3O/DRMEh2ok5nyC180E+ABS8Wmw==";
};
};
"@kamilkisiela/fast-url-parser-1.1.4" = {
name = "_at_kamilkisiela_slash_fast-url-parser";
packageName = "@kamilkisiela/fast-url-parser";
@@ -82478,333 +82451,6 @@ in
bypassCache = true;
reconstructLock = true;
};
webpack-dev-server = nodeEnv.buildNodePackage {
name = "webpack-dev-server";
packageName = "webpack-dev-server";
version = "5.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.1.0.tgz";
sha512 = "aQpaN81X6tXie1FoOB7xlMfCsN19pSvRAeYUHOdFWOlhpQ/LlbfTqYwwmEDFV0h8GGuqmCmKmT+pxcUV/Nt2gQ==";
};
dependencies = [
sources."@jridgewell/gen-mapping-0.3.5"
sources."@jridgewell/resolve-uri-3.1.2"
sources."@jridgewell/set-array-1.2.1"
sources."@jridgewell/source-map-0.3.6"
sources."@jridgewell/sourcemap-codec-1.5.0"
sources."@jridgewell/trace-mapping-0.3.25"
sources."@jsonjoy.com/base64-1.1.2"
sources."@jsonjoy.com/json-pack-1.1.0"
sources."@jsonjoy.com/util-1.3.0"
sources."@leichtgewicht/ip-codec-2.0.5"
sources."@types/body-parser-1.19.5"
sources."@types/bonjour-3.5.13"
sources."@types/connect-3.4.38"
sources."@types/connect-history-api-fallback-1.5.4"
sources."@types/estree-1.0.6"
sources."@types/express-4.17.21"
sources."@types/express-serve-static-core-4.19.5"
sources."@types/http-errors-2.0.4"
sources."@types/http-proxy-1.17.15"
sources."@types/json-schema-7.0.15"
sources."@types/mime-1.3.5"
sources."@types/node-22.5.5"
sources."@types/node-forge-1.3.11"
sources."@types/qs-6.9.16"
sources."@types/range-parser-1.2.7"
sources."@types/retry-0.12.2"
sources."@types/send-0.17.4"
sources."@types/serve-index-1.9.4"
sources."@types/serve-static-1.15.7"
sources."@types/sockjs-0.3.36"
sources."@types/ws-8.5.12"
sources."@webassemblyjs/ast-1.12.1"
sources."@webassemblyjs/floating-point-hex-parser-1.11.6"
sources."@webassemblyjs/helper-api-error-1.11.6"
sources."@webassemblyjs/helper-buffer-1.12.1"
sources."@webassemblyjs/helper-numbers-1.11.6"
sources."@webassemblyjs/helper-wasm-bytecode-1.11.6"
sources."@webassemblyjs/helper-wasm-section-1.12.1"
sources."@webassemblyjs/ieee754-1.11.6"
sources."@webassemblyjs/leb128-1.11.6"
sources."@webassemblyjs/utf8-1.11.6"
sources."@webassemblyjs/wasm-edit-1.12.1"
sources."@webassemblyjs/wasm-gen-1.12.1"
sources."@webassemblyjs/wasm-opt-1.12.1"
sources."@webassemblyjs/wasm-parser-1.12.1"
sources."@webassemblyjs/wast-printer-1.12.1"
sources."@xtuc/ieee754-1.2.0"
sources."@xtuc/long-4.2.2"
sources."accepts-1.3.8"
sources."acorn-8.12.1"
sources."acorn-import-attributes-1.9.5"
sources."ajv-8.17.1"
sources."ajv-formats-2.1.1"
sources."ajv-keywords-5.1.0"
sources."ansi-html-community-0.0.8"
sources."anymatch-3.1.3"
sources."array-flatten-1.1.1"
sources."batch-0.6.1"
sources."binary-extensions-2.3.0"
(sources."body-parser-1.20.3" // {
dependencies = [
sources."bytes-3.1.2"
];
})
sources."bonjour-service-1.2.1"
sources."braces-3.0.3"
sources."browserslist-4.23.3"
sources."buffer-from-1.1.2"
sources."bufferutil-4.0.8"
sources."bundle-name-4.1.0"
sources."bytes-3.0.0"
sources."call-bind-1.0.7"
sources."caniuse-lite-1.0.30001662"
sources."chokidar-3.6.0"
sources."chrome-trace-event-1.0.4"
sources."colorette-2.0.20"
sources."commander-2.20.3"
sources."compressible-2.0.18"
sources."compression-1.7.4"
sources."connect-history-api-fallback-2.0.0"
(sources."content-disposition-0.5.4" // {
dependencies = [
sources."safe-buffer-5.2.1"
];
})
sources."content-type-1.0.5"
sources."cookie-0.6.0"
sources."cookie-signature-1.0.6"
sources."core-util-is-1.0.3"
sources."debug-2.6.9"
sources."default-browser-5.2.1"
sources."default-browser-id-5.0.0"
sources."define-data-property-1.1.4"
sources."define-lazy-prop-3.0.0"
sources."depd-2.0.0"
sources."destroy-1.2.0"
sources."detect-node-2.1.0"
sources."dns-packet-5.6.1"
sources."ee-first-1.1.1"
sources."electron-to-chromium-1.5.26"
sources."encodeurl-2.0.0"
sources."enhanced-resolve-5.17.1"
sources."es-define-property-1.0.0"
sources."es-errors-1.3.0"
sources."es-module-lexer-1.5.4"
sources."escalade-3.2.0"
sources."escape-html-1.0.3"
sources."eslint-scope-5.1.1"
(sources."esrecurse-4.3.0" // {
dependencies = [
sources."estraverse-5.3.0"
];
})
sources."estraverse-4.3.0"
sources."etag-1.8.1"
sources."eventemitter3-4.0.7"
sources."events-3.3.0"
(sources."express-4.21.0" // {
dependencies = [
sources."safe-buffer-5.2.1"
];
})
sources."fast-deep-equal-3.1.3"
sources."fast-json-stable-stringify-2.1.0"
sources."fast-uri-3.0.1"
sources."faye-websocket-0.11.4"
sources."fill-range-7.1.1"
sources."finalhandler-1.3.1"
sources."follow-redirects-1.15.9"
sources."forwarded-0.2.0"
sources."fresh-0.5.2"
sources."function-bind-1.1.2"
sources."get-intrinsic-1.2.4"
sources."glob-parent-5.1.2"
sources."glob-to-regexp-0.4.1"
sources."gopd-1.0.1"
sources."graceful-fs-4.2.11"
sources."handle-thing-2.0.1"
sources."has-flag-4.0.0"
sources."has-property-descriptors-1.0.2"
sources."has-proto-1.0.3"
sources."has-symbols-1.0.3"
sources."hasown-2.0.2"
(sources."hpack.js-2.1.6" // {
dependencies = [
sources."readable-stream-2.3.8"
];
})
sources."html-entities-2.5.2"
sources."http-deceiver-1.2.7"
sources."http-errors-2.0.0"
sources."http-parser-js-0.5.8"
sources."http-proxy-1.18.1"
sources."http-proxy-middleware-2.0.6"
sources."hyperdyperid-1.2.0"
sources."iconv-lite-0.4.24"
sources."inherits-2.0.4"
sources."ipaddr.js-2.2.0"
sources."is-binary-path-2.1.0"
sources."is-docker-3.0.0"
sources."is-extglob-2.1.1"
sources."is-glob-4.0.3"
sources."is-inside-container-1.0.0"
sources."is-network-error-1.1.0"
sources."is-number-7.0.0"
sources."is-plain-obj-3.0.0"
sources."is-wsl-3.1.0"
sources."isarray-1.0.0"
sources."jest-worker-27.5.1"
sources."json-parse-even-better-errors-2.3.1"
sources."json-schema-traverse-1.0.0"
sources."launch-editor-2.9.1"
sources."loader-runner-4.3.0"
sources."media-typer-0.3.0"
sources."memfs-4.12.0"
sources."merge-descriptors-1.0.3"
sources."merge-stream-2.0.0"
sources."methods-1.1.2"
sources."micromatch-4.0.8"
sources."mime-1.6.0"
sources."mime-db-1.52.0"
sources."mime-types-2.1.35"
sources."minimalistic-assert-1.0.1"
sources."ms-2.0.0"
sources."multicast-dns-7.2.5"
sources."negotiator-0.6.3"
sources."neo-async-2.6.2"
sources."node-forge-1.3.1"
sources."node-gyp-build-4.8.2"
sources."node-releases-2.0.18"
sources."normalize-path-3.0.0"
sources."object-inspect-1.13.2"
sources."obuf-1.1.2"
sources."on-finished-2.4.1"
sources."on-headers-1.0.2"
sources."open-10.1.0"
sources."p-retry-6.2.0"
sources."parseurl-1.3.3"
sources."path-to-regexp-0.1.10"
sources."picocolors-1.1.0"
sources."picomatch-2.3.1"
sources."process-nextick-args-2.0.1"
(sources."proxy-addr-2.0.7" // {
dependencies = [
sources."ipaddr.js-1.9.1"
];
})
sources."punycode-2.3.1"
sources."qs-6.13.0"
sources."randombytes-2.1.0"
sources."range-parser-1.2.1"
(sources."raw-body-2.5.2" // {
dependencies = [
sources."bytes-3.1.2"
];
})
sources."readable-stream-3.6.2"
sources."readdirp-3.6.0"
sources."require-from-string-2.0.2"
sources."requires-port-1.0.0"
sources."retry-0.13.1"
sources."run-applescript-7.0.0"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."schema-utils-4.2.0"
sources."select-hose-2.0.0"
sources."selfsigned-2.4.1"
(sources."send-0.19.0" // {
dependencies = [
sources."encodeurl-1.0.2"
sources."ms-2.1.3"
];
})
sources."serialize-javascript-6.0.2"
(sources."serve-index-1.9.1" // {
dependencies = [
sources."depd-1.1.2"
sources."http-errors-1.6.3"
sources."inherits-2.0.3"
sources."setprototypeof-1.1.0"
sources."statuses-1.5.0"
];
})
sources."serve-static-1.16.2"
sources."set-function-length-1.2.2"
sources."setprototypeof-1.2.0"
sources."shell-quote-1.8.1"
sources."side-channel-1.0.6"
sources."sockjs-0.3.24"
sources."source-map-0.6.1"
sources."source-map-support-0.5.21"
(sources."spdy-4.0.2" // {
dependencies = [
sources."debug-4.3.7"
sources."ms-2.1.3"
];
})
(sources."spdy-transport-3.0.0" // {
dependencies = [
sources."debug-4.3.7"
sources."ms-2.1.3"
];
})
sources."statuses-2.0.1"
sources."string_decoder-1.1.1"
sources."supports-color-8.1.1"
sources."tapable-2.2.1"
sources."terser-5.33.0"
(sources."terser-webpack-plugin-5.3.10" // {
dependencies = [
sources."ajv-6.12.6"
sources."ajv-keywords-3.5.2"
sources."json-schema-traverse-0.4.1"
sources."schema-utils-3.3.0"
];
})
sources."thingies-1.21.0"
sources."thunky-1.1.0"
sources."to-regex-range-5.0.1"
sources."toidentifier-1.0.1"
sources."tree-dump-1.0.2"
sources."tslib-2.7.0"
sources."type-is-1.6.18"
sources."undici-types-6.19.8"
sources."unpipe-1.0.0"
sources."update-browserslist-db-1.1.0"
sources."uri-js-4.4.1"
sources."utf-8-validate-6.0.4"
sources."util-deprecate-1.0.2"
sources."utils-merge-1.0.1"
sources."uuid-8.3.2"
sources."vary-1.1.2"
sources."watchpack-2.4.2"
sources."wbuf-1.7.3"
(sources."webpack-5.94.0" // {
dependencies = [
sources."ajv-6.12.6"
sources."ajv-keywords-3.5.2"
sources."json-schema-traverse-0.4.1"
sources."schema-utils-3.3.0"
];
})
sources."webpack-dev-middleware-7.4.2"
sources."webpack-sources-3.2.3"
sources."websocket-driver-0.7.4"
sources."websocket-extensions-0.1.4"
sources."ws-8.18.0"
];
buildInputs = globalBuildInputs;
meta = {
description = "Serves a webpack app. Updates the browser on changes.";
homepage = "https://github.com/webpack/webpack-dev-server#readme";
license = "MIT";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
copy-webpack-plugin = nodeEnv.buildNodePackage {
name = "copy-webpack-plugin";
packageName = "copy-webpack-plugin";
@@ -0,0 +1,23 @@
{
buildDunePackage,
melange,
reason,
reason-react-ppx,
}:
buildDunePackage {
pname = "reason-react";
inherit (reason-react-ppx) version src;
nativeBuildInputs = [
reason
melange
];
buildInputs = [
reason-react-ppx
melange
];
doCheck = true;
meta = reason-react-ppx.meta // {
description = "Reason bindings for React.js";
};
}
@@ -0,0 +1,31 @@
{
buildDunePackage,
fetchurl,
lib,
ppxlib,
}:
let
version = "0.15.0";
in
buildDunePackage {
pname = "reason-react-ppx";
inherit version;
minimalOCamlVersion = "4.14";
src = fetchurl {
url = "https://github.com/reasonml/reason-react/releases/download/${version}/reason-react-${version}.tbz";
hash = "sha256-+pPJo/b50vp4pAC/ygI1LHB5O0pDJ1xpcQZOdFP8Q80=";
};
buildInputs = [
ppxlib
];
doCheck = false; # Needs to run in reason-react, see default.nix
meta = {
description = "React.js JSX PPX";
homepage = "https://github.com/reasonml/reason-react";
license = lib.licenses.mit;
maintainers = [
lib.maintainers.vog
];
};
}
@@ -6,16 +6,16 @@
php.buildComposerProject2 (finalAttrs: {
pname = "phpstan";
version = "2.0.2";
version = "2.0.3";
src = fetchFromGitHub {
owner = "phpstan";
repo = "phpstan-src";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-sLta3LnGtbJ4CMzQ+GRhI13orBvo4Q/kEtCDWcJRSI4=";
hash = "sha256-jTyKR1sgRdGTEIhQWlAH1/0gbq5dObxXmLiEcp7+I7c=";
};
vendorHash = "sha256-t9KTZUj3FYH9lpQikesZpq180HqQB8hqE0xyneFgbRA=";
vendorHash = "sha256-U4J/uHZjCH8S33RdnStzfWW3RrbOPpX5jMC6FTkBYHE=";
composerStrictValidation = false;
meta = {
@@ -23,7 +23,7 @@ in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "tideways-php";
extensionName = "tideways";
version = "5.14.0";
version = "5.16.2";
src =
finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
@@ -43,15 +43,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
sources = {
"x86_64-linux" = fetchurl {
url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-x86_64.tar.gz";
hash = "sha256-jhTlHkdBqnI+HmEPbawpI0z3tIHUJdTwutLsmA5uBsw=";
hash = "sha256-bSLBk4VWRvErmSqXOEFE0N0K06+NRLmsJ76HegFYah8=";
};
"aarch64-linux" = fetchurl {
url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-arm64.tar.gz";
hash = "sha256-HkYyie3FUIvRwFZ2H/0BuHB+tqrSWSGZYTIAa5HtO6s=";
hash = "sha256-nXTk0DlGSEq0bp4+Hls3+epV6JY4H50D6IO/M3evFpE=";
};
"aarch64-darwin" = fetchurl {
url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-macos-arm.tar.gz";
hash = "sha256-qspHSImQHRVPjcSjeARFBdNgYPD3mOoqktA08X8jGqg=";
hash = "sha256-IqQ0gtLAx8lVBccaDsum81FmkYXHKQ5zf27F2Y+H45g=";
};
};
@@ -3,18 +3,15 @@
buildPythonPackage,
fetchPypi,
msrest,
msrestazure,
azure-common,
azure-mgmt-core,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "azure-mgmt-logic";
version = "10.0.0";
format = "setuptools";
disabled = pythonOlder "3.6";
pyproject = true;
src = fetchPypi {
inherit pname version;
@@ -22,9 +19,10 @@ buildPythonPackage rec {
hash = "sha256-s/pIZPFKqnr0HXeNkl8FHtKbYBb0Y0R2Xs0PSdDwTdY=";
};
propagatedBuildInputs = [
build-system = [ setuptools ];
dependencies = [
msrest
msrestazure
azure-common
azure-mgmt-core
];
@@ -32,12 +30,14 @@ buildPythonPackage rec {
# Module has no tests
doCheck = false;
pythonNamespaces = [ "azure.mgmt" ];
pythonImportsCheck = [ "azure.mgmt.logic" ];
meta = with lib; {
meta = {
description = "This is the Microsoft Azure Logic Apps Management Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
maintainers = with maintainers; [ maxwilson ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ maxwilson ];
};
}
@@ -3,10 +3,9 @@
buildPythonPackage,
fetchPypi,
setuptools,
msrestazure,
azure-common,
azure-mgmt-core,
azure-mgmt-nspkg,
msrest,
}:
buildPythonPackage rec {
@@ -23,10 +22,9 @@ buildPythonPackage rec {
build-system = [ setuptools ];
dependencies = [
msrestazure
msrest
azure-common
azure-mgmt-core
azure-mgmt-nspkg
];
preBuild = ''
@@ -39,10 +37,10 @@ buildPythonPackage rec {
doCheck = false;
pythonImportsCheck = [ "azure.mgmt.relay" ];
meta = with lib; {
meta = {
description = "This is the Microsoft Azure Relay Client Library";
homepage = "https://github.com/Azure/azure-sdk-for-python";
license = licenses.mit;
maintainers = with maintainers; [ maxwilson ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ maxwilson ];
};
}
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "publicsuffixlist";
version = "1.0.2.20241203";
version = "1.0.2.20241205";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-rx0kVdLEFHTVH2TDZBUC8X/BtpUhEK8bpr4Fg8y/IvA=";
hash = "sha256-1h6Zdt9TA/7os/Qe3kK8slJUTmErHhEyXlzW+OsB5Yg=";
};
build-system = [ setuptools ];
@@ -45,8 +45,8 @@ let
options = {
debug = {
# Necessary for BTF
DEBUG_INFO = whenOlder "5.18" yes;
# Necessary for BTF and crashkernel
DEBUG_INFO = yes;
DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT = whenAtLeast "5.18" yes;
# Reduced debug info conflict with BTF and have been enabled in
# aarch64 defconfig since 5.13
@@ -64,7 +64,7 @@ let
RCU_TORTURE_TEST = no;
SCHEDSTATS = yes;
DETECT_HUNG_TASK = yes;
CRASH_DUMP = option no;
CRASH_DUMP = yes;
# Easier debugging of NFS issues.
SUNRPC_DEBUG = yes;
# Provide access to tunables like sched_migration_cost_ns
@@ -85,6 +85,9 @@ let
# Export known printks in debugfs
PRINTK_INDEX = whenAtLeast "5.15" yes;
# Enable crashkernel support
PROC_VMCORE = yes;
};
power-management = {
@@ -1301,6 +1304,13 @@ let
# differently when run under aarch64 kernels compared to when
# it is run under an aarch32 kernel.
COMPAT_ALIGNMENT_FIXUPS = lib.mkIf (stdenv.hostPlatform.system == "aarch64-linux") (whenAtLeast "6.1" yes);
# requirement for CP15_BARRIER_EMULATION
ARMV8_DEPRECATED = lib.mkIf (stdenv.hostPlatform.system == "aarch64-linux") yes;
# emulate a specific armv7 instruction that was removed from armv8
# this instruction is required to build a native armv7 nodejs on an
# aarch64-linux builder, for example
CP15_BARRIER_EMULATION = lib.mkIf (stdenv.hostPlatform.system == "aarch64-linux") yes;
} // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") {
# Required for various hardware features on Chrome OS devices
CHROME_PLATFORMS = yes;
@@ -28,7 +28,7 @@
"hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532"
},
"6.12": {
"version": "6.12.2",
"hash": "sha256:12rx83ryh1i1n79h05zgx1mn60s9fc0p7gh560gpp1ryqw80f7mv"
"version": "6.12.3",
"hash": "sha256:1bnycpkzcd6qdz4m5rx00wvkh9hs50q8c4aa93mg2l3xfz60k668"
}
}
+1 -1
View File
@@ -158,5 +158,5 @@ stdenvNoCC.mkDerivation {
passthru = { inherit tests; };
buildCommand = ''
touch $out
'' + lib.concatStringsSep "\n" (lib.attrValues (lib.mapAttrs (name: t: "([[ ${lib.boolToString t.expr} == ${lib.boolToString t.expected} ]] && echo '${name} success') || (echo '${name} fail' && exit 1)") tests));
'' + lib.concatMapAttrsStringSep "\n" (name: t: "([[ ${lib.boolToString t.expr} == ${lib.boolToString t.expected} ]] && echo '${name} success') || (echo '${name} fail' && exit 1)") tests;
}
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "parallel";
version = "20240922";
version = "20241122";
src = fetchurl {
url = "mirror://gnu/parallel/parallel-${version}.tar.bz2";
hash = "sha256-YyEHFei3xeEp4JjzM8183V/HovMl6OD7ntbtup8ay8Q=";
hash = "sha256-Gp51L0LBfKELwH0KY6LKbtzuUyKC5V0rNL2d0UyXilg=";
};
outputs = [ "out" "man" "doc" ];
+2 -2
View File
@@ -14,11 +14,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "kdiff3";
version = "1.11.4";
version = "1.11.5";
src = fetchurl {
url = "mirror://kde/stable/kdiff3/kdiff3-${finalAttrs.version}.tar.xz";
hash = "sha256-rt573JqpZ1rukP0qNScFLtMbMJGNQuaQelksunzmp8M=";
hash = "sha256-Qg8Ys7lolpigXhAvikFxkEkHTaaPlslL4Y0bgpfutUU=";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ];
+7
View File
@@ -245,6 +245,7 @@ mapAliases {
inherit (libsForQt5.mauiPackages) communicator; # added 2022-05-17
concurrencykit = throw "'concurrencykit' has been renamed to/replaced by 'libck'"; # Converted to throw 2024-10-17
containerpilot = throw "'containerpilot' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-09
crack_attack = throw "'crack_attack' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
crackmapexec = throw "'crackmapexec' has been removed as it was unmaintained. Use 'netexec' instead"; # 2024-08-11
critcl = tclPackages.critcl; # Added 2024-10-02
cudaPackages_10_0 = throw "CUDA 10.0 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
@@ -519,9 +520,11 @@ mapAliases {
graylog-4_0 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09
graylog-4_3 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09
graylog-5_0 = throw "graylog 5.0.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 5.0.x to latest series."; # Added 2024-02-15
green-pdfviewer = throw "'green-pdfviewer' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
gringo = clingo; # added 2022-11-27
grub2_full = grub2; # Added 2022-11-18
gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27
gtk-engine-bluecurve = "'gtk-engine-bluecurve' has been removed as it has been archived upstream."; # Added 2024-12-04
gtk2fontsel = throw "'gtk2fontsel' has been removed due to lack of maintenance upstream. GTK now has a built-in font chooser so it's no longer needed for newer apps"; # Added 2024-10-19
gtkcord4 = dissent; # Added 2024-03-10
gtkperf = throw "'gtkperf' has been removed due to lack of maintenance upstream"; # Added 2024-09-14
@@ -620,6 +623,7 @@ mapAliases {
larynx = piper-tts; # Added 2023-05-09
LASzip = laszip; # Added 2024-06-12
LASzip2 = laszip_2; # Added 2024-06-12
latencytop = throw "'latencytop' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
latinmodern-math = lmmath;
leafpad = throw "'leafpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-10-19
ledger_agent = ledger-agent; # Added 2024-01-07
@@ -648,6 +652,7 @@ mapAliases {
libixp_hg = libixp;
libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17
liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17
libmx = throw "'libmx' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14
libpqxx_6 = throw "libpqxx_6 has been removed, please use libpqxx"; # Added 2024-10-02
libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20
@@ -1107,6 +1112,7 @@ mapAliases {
retroarchBare = retroarch-bare; # Added 2024-11-23
retroarchFull = retroarch-full; # Added 2024-11-23
retroshare06 = retroshare;
rftg = throw "'rftg' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
rigsofrods = rigsofrods-bin; # Added 2023-03-22
ring-daemon = throw "'ring-daemon' has been renamed to/replaced by 'jami-daemon'"; # Converted to throw 2024-10-17
rippled = throw "rippled has been removed as it was broken and had not been updated since 2022"; # Added 2024-11-25
@@ -1347,6 +1353,7 @@ mapAliases {
virtscreen = throw "'virtscreen' has been removed, as it was broken and unmaintained"; # Added 2024-10-17
vkBasalt = vkbasalt; # Added 2022-11-22
vkdt-wayland = vkdt; # Added 2024-04-19
volnoti = throw "'volnoti' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
vuze = throw "'vuze' was removed because it is unmaintained upstream and insecure (CVE-2018-13417). BiglyBT is a maintained fork."; # Added 2024-11-22
inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17
-4
View File
@@ -1852,10 +1852,6 @@ with pkgs;
grc = python3Packages.callPackage ../tools/misc/grc { };
green-pdfviewer = callPackage ../applications/misc/green-pdfviewer {
SDL = SDL_sixel;
};
gremlin-console = callPackage ../applications/misc/gremlin-console {
openjdk = openjdk11;
};
+4
View File
@@ -1651,6 +1651,10 @@ let
reason-native = lib.recurseIntoAttrs (callPackage ../development/ocaml-modules/reason-native { });
reason-react = callPackage ../development/ocaml-modules/reason-react { };
reason-react-ppx = callPackage ../development/ocaml-modules/reason-react/ppx.nix { };
rebez = callPackage ../development/ocaml-modules/rebez { };
reperf = callPackage ../development/ocaml-modules/reperf { };