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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-09-12 00:13:53 +00:00
committed by GitHub
parent ab6f1d8369 bcd43fb105
commit cd7da8b1a4
83 changed files with 1850 additions and 1126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/languages-frameworks/python.section.md
+44
View File
@@ -374,6 +374,50 @@ mkPythonMetaPackage {
}
```
#### `mkPythonEditablePackage` function {#mkpythoneditablepackage-function}
When developing Python packages it's common to install packages in [editable mode](https://setuptools.pypa.io/en/latest/userguide/development_mode.html).
Like `mkPythonMetaPackage` this function exists to create an otherwise empty package, but also containing a pointer to an impure location outside the Nix store that can be changed without rebuilding.
The editable root is passed as a string. Normally `.pth` files contains absolute paths to the mutable location. This isn't always ergonomic with Nix, so environment variables are expanded at runtime.
This means that a shell hook setting up something like a `$REPO_ROOT` variable can be used as the relative package root.
As an implementation detail, the [PEP-518](https://peps.python.org/pep-0518/) `build-system` specified won't be used, but instead the editable package will be built using [hatchling](https://pypi.org/project/hatchling/).
The `build-system`'s provided will instead become runtime dependencies of the editable package.
Note that overriding packages deeper in the dependency graph _can_ work, but it's not the primary use case and overriding existing packages can make others break in unexpected ways.
``` nix
{ pkgs ? import <nixpkgs> { } }:
let
pyproject = pkgs.lib.importTOML ./pyproject.toml;
myPython = pkgs.python.override {
self = myPython;
packageOverrides = pyfinal: pyprev: {
# An editable package with a script that loads our mutable location
my-editable = pyfinal.mkPythonEditablePackage {
# Inherit project metadata from pyproject.toml
pname = pyproject.project.name;
inherit (pyproject.project) version;
# The editable root passed as a string
root = "$REPO_ROOT/src"; # Use environment variable expansion at runtime
# Inject a script (other PEP-621 entrypoints are also accepted)
inherit (pyproject.project) scripts;
};
};
};
pythonEnv = testPython.withPackages (ps: [ ps.my-editable ]);
in pkgs.mkShell {
packages = [ pythonEnv ];
}
```
#### `python.buildEnv` function {#python.buildenv-function}
Python environments can be created using the low-level `pkgs.buildEnv` function.
maintainers/maintainer-list.nix
-6
View File
@@ -5813,12 +5813,6 @@
githubId = 8146736;
name = "Florentin Eckl";
};
eclairevoyant = {
email = "contactmeongithubinstead@proton.me";
github = "eclairevoyant";
githubId = 848000;
name = "éclairevoyant";
};
edanaher = {
email = "nixos@edanaher.net";
github = "edanaher";
maintainers/team-list.nix
-1
View File
@@ -942,7 +942,6 @@ with lib.maintainers;
steam = {
members = [
atemu
eclairevoyant
k900
mkg20001
];
nixos/modules/services/monitoring/ups.nix
+10 -6
View File
@@ -5,6 +5,11 @@ let
cfg = config.power.ups;
defaultPort = 3493;
envVars = {
NUT_CONFPATH = "/etc/nut";
NUT_STATEPATH = "/var/lib/nut";
};
nutFormat = {
type = with lib.types; let
@@ -493,7 +498,9 @@ in
})
];
# For interactive use.
environment.systemPackages = [ pkgs.nut ];
environment.variables = envVars;
networking.firewall = lib.mkIf cfg.openFirewall {
allowedTCPPorts =
@@ -517,8 +524,7 @@ in
ExecReload = "${pkgs.nut}/sbin/upsmon -c reload";
LoadCredential = lib.mapAttrsToList (name: monitor: "upsmon_password_${name}:${monitor.passwordFile}") cfg.upsmon.monitor;
};
environment.NUT_CONFPATH = "/etc/nut";
environment.NUT_STATEPATH = "/var/lib/nut";
environment = envVars;
};
systemd.services.upsd = let
@@ -537,8 +543,7 @@ in
ExecReload = "${pkgs.nut}/sbin/upsd -c reload";
LoadCredential = lib.mapAttrsToList (name: user: "upsdusers_password_${name}:${user.passwordFile}") cfg.users;
};
environment.NUT_CONFPATH = "/etc/nut";
environment.NUT_STATEPATH = "/var/lib/nut";
environment = envVars;
restartTriggers = [
config.environment.etc."nut/upsd.conf".source
];
@@ -555,8 +560,7 @@ in
# TODO: replace 'root' by another username.
ExecStart = "${pkgs.nut}/bin/upsdrvctl -u root start";
};
environment.NUT_CONFPATH = "/etc/nut";
environment.NUT_STATEPATH = "/var/lib/nut";
environment = envVars;
restartTriggers = [
config.environment.etc."nut/ups.conf".source
];
nixos/modules/services/system/userborn.nix
+2 -2
View File
@@ -97,14 +97,14 @@ in
# home.
tmpfiles.settings.home-directories = lib.mapAttrs' (
username: opts:
lib.nameValuePair opts.home {
lib.nameValuePair (toString opts.home) {
d = {
mode = opts.homeMode;
user = username;
inherit (opts) group;
};
}
) (lib.filterAttrs (_username: opts: opts.home != "/var/empty") userCfg.users);
) (lib.filterAttrs (_username: opts: opts.createHome && opts.home != "/var/empty") userCfg.users);
services.userborn = {
wantedBy = [ "sysinit.target" ];
nixos/tests/swayfx.nix
+1 -1
View File
@@ -3,7 +3,7 @@ import ./make-test-python.nix (
{
name = "swayfx";
meta = {
maintainers = with lib.maintainers; [ eclairevoyant ];
maintainers = with lib.maintainers; [ ];
};
# testScriptWithTypes:49: error: Cannot call function of unknown type
pkgs/applications/audio/sayonara/default.nix
+8 -2
View File
@@ -22,15 +22,21 @@ let
in
mkDerivation rec {
pname = "sayonara";
version = "1.7.0-stable3";
version = "1.10.0-stable1";
src = fetchFromGitLab {
owner = "luciocarreras";
repo = "sayonara-player";
rev = version;
hash = "sha256-tJ/8tGNkmTwWRCpPy/h85SP/6QDAgcaKWJdM5MSAXJw=";
hash = "sha256-ZcuWe1dsLJS4/nLXSSKB7wzPU9COFyE4vPSwZIo0bgI=";
};
# error: no matching function for call to 'max'
postPatch = ''
substituteInPlace src/Components/Playlist/PlaylistModifiers.cpp \
--replace-fail "std::max" "std::max<MilliSeconds>"
'';
nativeBuildInputs = [ cmake ninja pkg-config qttools ];
buildInputs = [
pkgs/applications/emulators/wine/default.nix
+1 -1
View File
@@ -35,7 +35,7 @@
vulkanSupport ? false,
sdlSupport ? false,
usbSupport ? false,
mingwSupport ? false,
mingwSupport ? stdenv.isDarwin,
waylandSupport ? false,
x11Support ? false,
embedInstallers ? false, # The Mono and Gecko MSI installers
pkgs/applications/misc/merkaartor/default.nix
-79
View File
@@ -1,79 +0,0 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, pkg-config
, qttools
, wrapQtAppsHook
, gdal
, proj
, qtsvg
, qtwebengine
, withGeoimage ? true, exiv2
, withGpsdlib ? (!stdenv.isDarwin), gpsd
, withLibproxy ? false, libproxy
, withZbar ? false, zbar
}:
stdenv.mkDerivation rec {
pname = "merkaartor";
version = "0.19.0";
src = fetchFromGitHub {
owner = "openstreetmap";
repo = "merkaartor";
rev = version;
hash = "sha256-I3QNCXzwhEFa8aOdwl3UJV8MLZ9caN9wuaaVrGFRvbQ=";
};
patches = [
(fetchpatch {
name = "exiv2-0.28.patch";
url = "https://github.com/openstreetmap/merkaartor/commit/1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd.patch";
hash = "sha256-aHjJLKYvqz7V0QwUIg0SbentBe+DaCJusVqy4xRBVWo=";
})
# https://github.com/openstreetmap/merkaartor/pull/290
(fetchpatch {
url = "https://github.com/openstreetmap/merkaartor/commit/7dede77370d89e8e7586f6ed5af225f9b5bde6cf.patch";
hash = "sha256-3oDRPysVNvA50t/b9xOcVQgac3U1lDPrencanl4c6Zk=";
})
];
nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];
buildInputs = [ gdal proj qtsvg qtwebengine ]
++ lib.optional withGeoimage exiv2
++ lib.optional withGpsdlib gpsd
++ lib.optional withLibproxy libproxy
++ lib.optional withZbar zbar;
cmakeFlags = [
(lib.cmakeBool "GEOIMAGE" withGeoimage)
(lib.cmakeBool "GPSD" withGpsdlib)
(lib.cmakeBool "LIBPROXY" withLibproxy)
(lib.cmakeBool "WEBENGINE" true)
(lib.cmakeBool "ZBAR" withZbar)
];
postInstall = ''
# Binary is looking for .qm files in share/merkaartor
mv $out/share/merkaartor/{translations/*.qm,}
rm -r $out/share/merkaartor/translations
'' + lib.optionalString stdenv.isDarwin ''
mkdir -p $out/{Applications,bin}
mv $out/merkaartor.app $out/Applications
# Prevent wrapping, otherwise plugins will not be loaded
chmod -x $out/Applications/merkaartor.app/Contents/plugins/background/*.dylib
makeWrapper $out/{Applications/merkaartor.app/Contents/MacOS,bin}/merkaartor
'';
meta = with lib; {
description = "OpenStreetMap editor";
homepage = "http://merkaartor.be/";
license = licenses.gpl2Plus;
mainProgram = "merkaartor";
maintainers = with maintainers; [ sikmir ];
platforms = platforms.unix;
};
}
pkgs/applications/misc/openbangla-keyboard/default.nix
+1 -1
View File
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
mainProgram = "openbangla-gui";
homepage = "https://openbangla.github.io/";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ eclairevoyant hqurve ];
maintainers = with lib.maintainers; [ hqurve ];
platforms = lib.platforms.linux;
# never built on aarch64-linux since first introduction in nixpkgs
broken = stdenv.isLinux && stdenv.isAarch64;
pkgs/applications/misc/redshift/default.nix
+1 -1
View File
@@ -146,7 +146,7 @@ rec {
+ lib.removePrefix "Redshift" redshift.meta.longDescription;
homepage = "https://gitlab.com/chinstrap/gammastep";
mainProgram = "gammastep";
maintainers = (with lib.maintainers; [ eclairevoyant primeos ]) ++ redshift.meta.maintainers;
maintainers = (with lib.maintainers; [ primeos ]) ++ redshift.meta.maintainers;
};
};
}
pkgs/applications/misc/sunwait/default.nix
+1 -1
View File
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Calculates sunrise or sunset times with civil, nautical, astronomical and custom twilights";
homepage = "https://github.com/risacher/sunwait";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ eclairevoyant ];
maintainers = with lib.maintainers; [ ];
mainProgram = "sunwait";
platforms = lib.platforms.all;
};
pkgs/applications/networking/dropbox/cli.nix
+1 -1
View File
@@ -67,7 +67,7 @@ stdenv.mkDerivation {
description = "Command line client for the dropbox daemon";
license = lib.licenses.gpl3Plus;
mainProgram = "dropbox";
maintainers = with lib.maintainers; [ eclairevoyant ];
maintainers = with lib.maintainers; [ ];
# NOTE: Dropbox itself only works on linux, so this is ok.
platforms = lib.platforms.linux;
};
pkgs/applications/networking/dropbox/default.nix
+1 -1
View File
@@ -82,7 +82,7 @@ buildFHSEnv {
description = "Online stored folders (daemon version)";
homepage = "http://www.dropbox.com/";
license = licenses.unfree;
maintainers = with maintainers; [ eclairevoyant ttuegel ];
maintainers = with maintainers; [ ttuegel ];
platforms = [ "i686-linux" "x86_64-linux" ];
mainProgram = "dropbox";
};
pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix
-1
View File
@@ -264,7 +264,6 @@ stdenv.mkDerivation rec {
lib.licenses.free
];
maintainers = with lib.maintainers; [
eclairevoyant
mic92
equirosa
urandom
pkgs/applications/video/obs-studio/default.nix
+1 -1
View File
@@ -201,7 +201,7 @@ stdenv.mkDerivation (finalAttrs: {
video content, efficiently
'';
homepage = "https://obsproject.com";
maintainers = with maintainers; [ eclairevoyant jb55 materus fpletz ];
maintainers = with maintainers; [ jb55 materus fpletz ];
license = with licenses; [ gpl2Plus ] ++ optional withFdk fraunhofer-fdk;
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
mainProgram = "obs";
pkgs/by-name/an/ansel/package.nix
+1 -1
View File
@@ -179,7 +179,7 @@ stdenv.mkDerivation {
description = "Darktable fork minus the bloat plus some design vision";
homepage = "https://ansel.photos/";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ eclairevoyant ];
maintainers = with lib.maintainers; [ ];
mainProgram = "ansel";
platforms = lib.platforms.linux;
};
pkgs/by-name/an/anyrun/package.nix
+1 -1
View File
@@ -68,7 +68,7 @@ rustPlatform.buildRustPackage rec {
description = "Wayland-native, highly customizable runner";
homepage = "https://github.com/kirottu/anyrun";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ eclairevoyant NotAShelf ];
maintainers = with lib.maintainers; [ NotAShelf ];
mainProgram = "anyrun";
};
}
pkgs/by-name/ba/basedpyright/package.nix
+4 -4
View File
@@ -11,13 +11,13 @@
}:
let
version = "1.17.3";
version = "1.17.4";
src = fetchFromGitHub {
owner = "detachhead";
repo = "basedpyright";
rev = "refs/tags/v${version}";
hash = "sha256-cnhtge0ueveo70cYDpb/+ss5osHbO1Yyv74NrYBYZOM=";
hash = "sha256-7lJUyn7UAY+wdbPXcLFz54m2Jl90EMZ6ieSPWysMoWE=";
};
patchedPackageJSON = runCommand "package.json" { } ''
@@ -47,7 +47,7 @@ let
pname = "pyright-internal";
inherit version src;
sourceRoot = "${src.name}/packages/pyright-internal";
npmDepsHash = "sha256-w6SurZ4EG2QW7paZsWxu0gNXMXxnzQygClOUdLeBKdw=";
npmDepsHash = "sha256-hd85cCpxx0vqtUXDUorHK8I9IbGZiwewI/RxKF/9ZNw=";
dontNpmBuild = true;
# Uncomment this flag when using unreleased peer dependencies
# npmFlags = [ "--legacy-peer-deps" ];
@@ -94,7 +94,7 @@ buildNpmPackage rec {
inherit version src;
sourceRoot = "${src.name}/packages/pyright";
npmDepsHash = "sha256-y7arZsXjJ0LdWpXdSZjc7EBJPN/oWAje4uQDEhkRbDM=";
npmDepsHash = "sha256-UKxFWhgarMdT24rFU5Ev+JoKbT6ByLnZ1CTKd34YrRE=";
postPatch = ''
chmod +w ../../
pkgs/by-name/ch/chezmoi/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
let
argset = {
pname = "chezmoi";
version = "2.52.1";
version = "2.52.2";
src = fetchFromGitHub {
owner = "twpayne";
repo = "chezmoi";
rev = "v${argset.version}";
hash = "sha256-USDZ3tEXXOTNyA6tCJndZiHTDBFg70EFnvxYsrFbgi0=";
hash = "sha256-SSwQQoHCcSVHMEpngpmdTThhwrob5/0TP9nQhOD6+1U=";
};
vendorHash = "sha256-xof2uSVUzWPlMhWU7p9/dlbHnr2/Keu7JpUUvuTB2dM=";
vendorHash = "sha256-t+lw1AtYnCBjJT+/pQZ71xycx4dJggqz08dNonbkP74=";
nativeBuildInputs = [
installShellFiles
pkgs/by-name/ch/chrysalis/package.nix
-1
View File
@@ -45,7 +45,6 @@ appimageTools.wrapType2 {
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [
aw
eclairevoyant
nshalman
];
platforms = [ "x86_64-linux" ];
pkgs/by-name/co/connman/package.nix
+1 -1
View File
@@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://git.kernel.org/pub/scm/network/connman/connman.git/about/";
license = lib.licenses.gpl2Only;
mainProgram = "connmanctl";
maintainers = with lib.maintainers; [ eclairevoyant AndersonTorres ];
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.linux;
};
})
pkgs/by-name/co/converseen/package.nix
+1 -1
View File
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://converseen.fasterland.net/";
changelog = "https://github.com/Faster3ck/Converseen/blob/${finalAttrs.src.rev}/CHANGELOG";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ eclairevoyant ];
maintainers = with lib.maintainers; [ ];
mainProgram = "converseen";
platforms = lib.platforms.all;
};
pkgs/by-name/di/discordchatexporter-cli/package.nix
+1 -1
View File
@@ -39,7 +39,7 @@ buildDotnetModule rec {
homepage = "https://github.com/Tyrrrz/DiscordChatExporter";
license = licenses.gpl3Plus;
changelog = "https://github.com/Tyrrrz/DiscordChatExporter/blob/${version}/Changelog.md";
maintainers = with maintainers; [ eclairevoyant ];
maintainers = with maintainers; [ ];
platforms = [ "x86_64-linux" ];
mainProgram = "discordchatexporter-cli";
};
pkgs/by-name/ew/eww/package.nix
-1
View File
@@ -67,7 +67,6 @@ rustPlatform.buildRustPackage rec {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
coffeeispower
eclairevoyant
figsoda
lom
w-lfchen
pkgs/by-name/fi/fireplace/package.nix
-1
View File
@@ -31,7 +31,6 @@ stdenv.mkDerivation {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
multivac61
eclairevoyant
];
mainProgram = "fireplace";
platforms = lib.platforms.all;
pkgs/by-name/fn/fnott/package.nix
-1
View File
@@ -64,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
license = with lib.licenses; [ mit zlib ];
maintainers = with lib.maintainers; [
jmbaur
eclairevoyant
];
mainProgram = "fnott";
platforms = lib.platforms.linux;
pkgs/by-name/ge/geist-font/package.nix
+1 -1
View File
@@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation rec {
description = "Font family created by Vercel in collaboration with Basement Studio";
homepage = "https://vercel.com/font";
license = lib.licenses.ofl;
maintainers = with lib.maintainers; [ eclairevoyant x0ba ];
maintainers = with lib.maintainers; [ x0ba ];
platforms = lib.platforms.all;
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
};
pkgs/by-name/gf/gfortran48/package.nix
-10
View File
@@ -1,10 +0,0 @@
{ wrapCC, gcc48 }:
wrapCC (
gcc48.cc.override {
name = "gfortran";
langFortran = true;
langCC = false;
langC = false;
profiledCompiler = false;
}
)
pkgs/by-name/ha/hayabusa/package.nix
+1 -1
View File
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage {
description = "Swift rust fetch program";
homepage = "https://github.com/notarin/hayabusa";
license = lib.licenses.cc-by-nc-nd-40;
maintainers = with lib.maintainers; [ eclairevoyant ];
maintainers = with lib.maintainers; [ ];
mainProgram = "hayabusa";
platforms = lib.platforms.linux;
};
pkgs/by-name/jw/jwasm/package.nix
+5
View File
@@ -25,6 +25,10 @@ stdenv.mkDerivation (finalAttrs: {
--replace "/usr/local/bin" "${placeholder "out"}/bin"
'';
preInstall = ''
mkdir -p ${placeholder "out"}/bin
'';
postInstall = ''
install -Dpm644 $src/Html/License.html \
$src/Html/Manual.html \
@@ -36,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/Baron-von-Riedesel/JWasm/";
description = "MASM-compatible x86 assembler";
changelog = "https://github.com/Baron-von-Riedesel/JWasm/releases/tag/${finalAttrs.src.rev}";
mainProgram = "jwasm";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.unix;
pkgs/by-name/li/libgrapheme/package.nix
+5
View File
@@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
hash = "sha256-pou93edr1Vul1kEWzl5CoT3wRcgcCFLemrYIlqoUMSU=";
};
postPatch = ''
substituteInPlace configure \
--replace-fail "uname" "echo ${stdenv.hostPlatform.uname.system}"
'';
depsBuildBuild = [ buildPackages.stdenv.cc ];
makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" "RANLIB:=$(RANLIB)" "BUILD_CC=$(CC_FOR_BUILD)" ];
pkgs/by-name/li/librewolf-bin/package.nix
+1 -1
View File
@@ -27,7 +27,7 @@ appimageTools.wrapType2 {
description = "Fork of Firefox, focused on privacy, security and freedom (upstream AppImage release)";
homepage = "https://librewolf.net";
license = lib.licenses.mpl20;
maintainers = with lib.maintainers; [ eclairevoyant ];
maintainers = with lib.maintainers; [ ];
platforms = [ "x86_64-linux" ];
mainProgram = "librewolf";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
pkgs/by-name/li/lightningcss/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "lightningcss";
version = "1.26.0";
version = "1.27.0";
src = fetchFromGitHub {
owner = "parcel-bundler";
repo = "lightningcss";
rev = "refs/tags/v${version}";
hash = "sha256-ZPqRxHbca8iflWwsDT2/sVbTstWnKVFcExcgrBXgzGc=";
hash = "sha256-YOTFyIDQIdqnrbXtnnY5U32rk9/fZ+1NcSb3slgkxZU=";
};
cargoHash = "sha256-QYrjDJJTJo4BDQOqY1pZn7ph+uuQvbsMbzaAUr4siaE=";
cargoHash = "sha256-nzRvsdW+PfcS1ocg49JtRQ9RmFJ3iz65plH1ToQXSGU=";
patches = [
# Backport fix for build error for lightningcss-napi
pkgs/by-name/me/merkaartor/package.nix
+77
View File
@@ -0,0 +1,77 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
pkg-config,
gdal,
proj,
protobuf,
qt5,
withGeoimage ? true,
exiv2,
withGpsdlib ? (!stdenv.isDarwin),
gpsd,
withLibproxy ? false,
libproxy,
withZbar ? false,
zbar,
}:
stdenv.mkDerivation rec {
pname = "merkaartor";
version = "0.20.0";
src = fetchFromGitHub {
owner = "openstreetmap";
repo = "merkaartor";
rev = version;
hash = "sha256-oxLGhIE1qJ9+GOztD1HvrLGRGVO3gyy7Rc6CyzKTFec=";
};
nativeBuildInputs = [
cmake
pkg-config
qt5.qttools
qt5.wrapQtAppsHook
];
buildInputs =
[
gdal
proj
protobuf
qt5.qtnetworkauth
qt5.qtsvg
qt5.qtwebengine
]
++ lib.optional withGeoimage exiv2
++ lib.optional withGpsdlib gpsd
++ lib.optional withLibproxy libproxy
++ lib.optional withZbar zbar;
cmakeFlags = [
(lib.cmakeBool "GEOIMAGE" withGeoimage)
(lib.cmakeBool "GPSD" withGpsdlib)
(lib.cmakeBool "LIBPROXY" withLibproxy)
(lib.cmakeBool "WEBENGINE" true)
(lib.cmakeBool "ZBAR" withZbar)
];
postInstall = lib.optionalString stdenv.isDarwin ''
mkdir -p $out/{Applications,bin}
mv $out/merkaartor.app $out/Applications
# Prevent wrapping, otherwise plugins will not be loaded
chmod -x $out/Applications/merkaartor.app/Contents/plugins/background/*.dylib
makeWrapper $out/{Applications/merkaartor.app/Contents/MacOS,bin}/merkaartor
'';
meta = {
description = "OpenStreetMap editor";
homepage = "http://merkaartor.be/";
license = lib.licenses.gpl2Plus;
mainProgram = "merkaartor";
maintainers = with lib.maintainers; [ sikmir ];
platforms = lib.platforms.unix;
};
}
pkgs/by-name/no/nomnatong/package.nix
+1 -1
View File
@@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
homepage = "http://nomfoundation.org/nom-tools/Nom-Font";
description = "Hán-Nôm Coded Character Set and Nom Na Tong Regular Reference Font";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ eclairevoyant ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.all;
};
})
pkgs/by-name/ol/ollama/package.nix
+4 -6
View File
@@ -40,13 +40,13 @@ assert builtins.elem acceleration [
let
pname = "ollama";
# don't forget to invalidate all hashes each update
version = "0.3.9";
version = "0.3.10";
src = fetchFromGitHub {
owner = "ollama";
repo = "ollama";
rev = "v${version}";
hash = "sha256-h/IFD7OaiIWNhJywqWG4uOPXExHfcnipr6f9YD1OjNc=";
hash = "sha256-iNjqnhiM0L873BiBPAgI2Y0KEQyCInn2nEihzwLasFU=";
fetchSubmodules = true;
};
@@ -60,11 +60,9 @@ let
(preparePatch "02-clip-log.diff" "sha256-rMWbl3QgrPlhisTeHwD7EnGRJyOhLB4UeS7rqa0tdXM=")
(preparePatch "03-load_exception.diff" "sha256-NJkT/k8Mf8HcEMb0XkaLmyUNKV3T+384JRPnmwDI/sk=")
(preparePatch "04-metal.diff" "sha256-bPBCfoT3EjZPjWKfCzh0pnCUbM/fGTj37yOaQr+QxQ4=")
(preparePatch "05-default-pretokenizer.diff" "sha256-PQ0DgfzycUQ8t6S6/yjsMHHx/nFJ0w8AH6afv5Po89w=")
(preparePatch "06-embeddings.diff" "sha256-lqg2SI0OapD9LCoAG6MJW6HIHXEmCTv7P75rE9yq/Mo=")
(preparePatch "05-default-pretokenizer.diff" "sha256-mxqHnDbiy8yfKFUYryNTj/xay/lx9KDiZAiekFSkxr8=")
(preparePatch "06-embeddings.diff" "sha256-+4yAEAX1JJenOksG2OxDCwiLEoLj1glJQLIgV08BI5Q=")
(preparePatch "07-clip-unicode.diff" "sha256-1qMJoXhDewxsqPbmi+/7xILQfGaybZDyXc5eH0winL8=")
(preparePatch "09-lora.diff" "sha256-tNtI3WHHjBq+PJZGJCBsXHa15dlNJeJm+IiaUbFC0LE=")
(preparePatch "11-phi3-sliding-window.diff" "sha256-VbcR4SLa9UXoh8Jq/bPVBerxfg68JZyWALRs7fz7hEs=")
];
preparePatch =
pkgs/by-name/pa/passt/package.nix
+2 -2
View File
@@ -7,11 +7,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "passt";
version = "2024_07_26.57a21d2";
version = "2024_08_21.1d6142f";
src = fetchurl {
url = "https://passt.top/passt/snapshot/passt-${finalAttrs.version}.tar.gz";
hash = "sha256-UK3Klpo3cp4EH42W16qh5WbZlCxb+ETQtWbpgatL/Dc=";
hash = "sha256-lM4xz60BHInPFsqQlyj2wr0C7WQGa6GrkoRQgfw8id0=";
};
makeFlags = [
pkgs/by-name/pg/pg-gvm/package.nix
+1
View File
@@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
pkg-config
postgresql
];
buildInputs = [
pkgs/by-name/pr/pragtical/package.nix
+3 -3
View File
@@ -20,7 +20,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pragtical";
version = "3.4.2";
version = "3.4.4";
pluginManagerVersion = "1.2.9";
src = fetchFromGitHub {
@@ -39,12 +39,12 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail 'revision = head' 'revision = v${finalAttrs.pluginManagerVersion}'
${lib.getExe meson} subprojects download \
colors plugins ppm
colors widget plugins ppm
find subprojects -type d -name .git -prune -execdir rm -r {} +
'';
hash = "sha256-mYLYRyyKfjTCD8mi1KrQNLqwd8QX1wgpJtpWASQCLQU=";
hash = "sha256-YAIndKTqne4I+wuCrVtfkjdp1rsFF+xyBnl5WcuDyz4=";
};
nativeBuildInputs = [
pkgs/by-name/pr/previewqt/package.nix
+1 -1
View File
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
homepage = "https://photoqt.org/previewqt";
changelog = "https://gitlab.com/lspies/previewqt/-/blob/v${version}/CHANGELOG";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ eclairevoyant ];
maintainers = with lib.maintainers; [ ];
mainProgram = "previewqt";
platforms = lib.platforms.linux;
};
pkgs/by-name/ri/rippkgs/package.nix
+1 -1
View File
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
description = "CLI for indexing and searching packages in Nix expressions";
homepage = "https://github.com/replit/rippkgs";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ eclairevoyant cdmistman ];
maintainers = with lib.maintainers; [ cdmistman ];
mainProgram = "rippkgs";
};
}
pkgs/by-name/sa/salut/package.nix
+1 -1
View File
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec {
description = "Sleek notification daemon for Wayland";
homepage = "https://gitlab.com/snakedye/salut/-/wikis/Home";
license = lib.licenses.mpl20;
maintainers = with lib.maintainers; [ eclairevoyant ];
maintainers = with lib.maintainers; [ ];
mainProgram = "salut";
platforms = lib.platforms.linux;
};
pkgs/by-name/sc/scenefx/package.nix
+1 -1
View File
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Drop-in replacement for the wlroots scene API that allows wayland compositors to render surfaces with eye-candy effects";
homepage = "https://github.com/wlrfx/scenefx";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ eclairevoyant ];
maintainers = with lib.maintainers; [ ];
mainProgram = "scenefx";
pkgConfigModules = [ "scenefx" ];
platforms = lib.platforms.all;
pkgs/by-name/so/sov/package.nix
+1 -1
View File
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/milgra/sov";
license = lib.licenses.gpl3Only;
mainProgram = "sov";
maintainers = with lib.maintainers; [ eclairevoyant ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
})
pkgs/by-name/ss/sshesame/package.nix
+1 -1
View File
@@ -33,7 +33,7 @@ buildGoModule rec {
'';
homepage = "https://github.com/jaksi/sshesame";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ eclairevoyant ];
maintainers = with lib.maintainers; [ ];
mainProgram = "sshesame";
};
}
pkgs/by-name/su/sunpaper/package.nix
+1 -1
View File
@@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
homepage = "https://github.com/hexive/sunpaper";
license = lib.licenses.asl20;
mainProgram = "sunpaper";
maintainers = with lib.maintainers; [ eclairevoyant jevy ];
maintainers = with lib.maintainers; [ jevy ];
platforms = lib.platforms.linux;
};
})
pkgs/by-name/sw/sway-easyfocus/package.nix
+1 -1
View File
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
description = "Tool to help efficiently focus windows in Sway, inspired by i3-easyfocus";
homepage = "https://github.com/edzdez/sway-easyfocus";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ eclairevoyant ];
maintainers = with lib.maintainers; [ ];
mainProgram = "sway-easyfocus";
};
}
pkgs/by-name/sw/swayfx-unwrapped/package.nix
-1
View File
@@ -137,7 +137,6 @@ stdenv.mkDerivation (finalAttrs: {
changelog = "https://github.com/WillPower3309/swayfx/releases/tag/${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
eclairevoyant
ricarch97
];
platforms = lib.platforms.linux;
pkgs/by-name/sw/swipe-guess/package.nix
+1 -1
View File
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
homepage = "https://git.sr.ht/~earboxer/swipeGuess/";
license = lib.licenses.agpl3Only;
mainProgram = "swipeGuess";
maintainers = with lib.maintainers; [ eclairevoyant ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.all;
};
}
pkgs/by-name/we/webcord/package.nix
-1
View File
@@ -85,7 +85,6 @@ buildNpmPackage rec {
license = lib.licenses.mit;
mainProgram = "webcord";
maintainers = with lib.maintainers; [
eclairevoyant
huantian
];
platforms = lib.platforms.linux;
pkgs/development/compilers/gcc/all.nix
+2 -7
View File
@@ -7,7 +7,6 @@
, libcCross
, threadsCross
, noSysDirs
, texinfo5
, cloog_0_18_0, cloog
, lowPrio
, wrapCC
@@ -30,15 +29,11 @@ let
else if atLeast "9" then isl_0_20
else if atLeast "7" then isl_0_17
else if atLeast "6" then (if stdenv.targetPlatform.isRedox then isl_0_17 else isl_0_14)
else if atLeast "4.9" then isl_0_11
else /* "4.8" */ isl_0_14;
} // lib.optionalAttrs (majorMinorVersion == "4.8") {
texinfo = texinfo5; # doesn't validate since 6.1 -> 6.3 bump
else /* "4.9" */ isl_0_11;
} // lib.optionalAttrs (!(atLeast "6")) {
cloog = if stdenv.isDarwin
then null
else if atLeast "4.9" then cloog_0_18_0
else /* 4.8 */ cloog;
else /* 4.9 */ cloog_0_18_0;
} // lib.optionalAttrs (atLeast "6" && !(atLeast "9")) {
# gcc 10 is too strict to cross compile gcc <= 8
stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv;
pkgs/development/compilers/gcc/default.nix
+3 -4
View File
@@ -93,7 +93,6 @@ let
is7 = majorVersion == "7";
is6 = majorVersion == "6";
is49 = majorVersion == "4" && versions.minor version == "9";
is48 = majorVersion == "4" && versions.minor version == "8";
disableBootstrap = atLeast11 && !stdenv.hostPlatform.isDarwin && (atLeast12 -> !profiledCompiler);
@@ -429,8 +428,8 @@ pipe ((callFile ./common/builder.nix {}) ({
passthru = {
inherit langC langCC langObjC langObjCpp langAda langFortran langGo langD langJava version;
isGNU = true;
hardeningUnsupportedFlags = optional is48 "stackprotector"
++ optional (
hardeningUnsupportedFlags =
optional (
(targetPlatform.isAarch64 && !atLeast9) || !atLeast8
) "stackclashprotection"
++ optional (!atLeast11) "zerocallusedregs"
@@ -461,7 +460,7 @@ pipe ((callFile ./common/builder.nix {}) ({
badPlatforms =
# avr-gcc8 is maintained for the `qmk` package
if (is8 && targetPlatform.isAvr) then []
else if !(is48 || is49 || is6) then [ "aarch64-darwin" ]
else if !(is49 || is6) then [ "aarch64-darwin" ]
else platforms.darwin;
} // optionalAttrs is10 {
badPlatforms = if targetPlatform != hostPlatform then [ "aarch64-darwin" ] else [ ];
pkgs/development/compilers/gcc/patches/default.nix
-20
View File
@@ -45,7 +45,6 @@ let
is7 = majorVersion == "7";
is6 = majorVersion == "6";
is49 = majorVersion == "4" && lib.versions.minor version == "9";
is48 = majorVersion == "4" && lib.versions.minor version == "8";
inherit (lib) optionals optional;
in
@@ -346,22 +345,3 @@ in
## gcc 4.8 only ##############################################################################
++ optional (!atLeast49 && hostPlatform.isDarwin) ./gfortran-darwin-NXConstStr.patch
++ optionals is48 [
(fetchpatch {
name = "libc_name_p.diff"; # needed to build with gcc6
url = "https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=ec1cc0263f1";
sha256 = "01jd7pdarh54ki498g6sz64ijl9a1l5f9v8q2696aaxalvh2vwzl";
excludes = [ "gcc/cp/ChangeLog" ];
})
# glibc-2.26
./struct-ucontext-4.8.patch
./sigsegv-not-declared.patch
./res_state-not-declared.patch
# gcc-11 compatibility
(fetchpatch {
name = "gcc4-char-reload.patch";
url = "https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=d57c99458933a21fdf94f508191f145ad8d5ec58";
includes = [ "gcc/reload.h" ];
sha256 = "sha256-66AMP7/ajunGKAN5WJz/yPn42URZ2KN51yPrFdsxEuM=";
})
]
pkgs/development/compilers/gcc/patches/res_state-not-declared.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc
index fe69430..49f5270 100644
--- a/libsanitizer/tsan/tsan_platform_linux.cc
+++ b/libsanitizer/tsan/tsan_platform_linux.cc
@@ -351,7 +351,7 @@ bool IsGlobalVar(uptr addr) {
// closes within glibc. The code is a pure hack.
int ExtractResolvFDs(void *state, int *fds, int nfd) {
int cnt = 0;
- __res_state *statp = (__res_state*)state;
+ struct __res_state *statp = (struct __res_state*)state;
for (int i = 0; i < MAXNS && cnt < nfd; i++) {
if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)
fds[cnt++] = statp->_u._ext.nssocks[i];
pkgs/development/compilers/gcc/patches/sigsegv-not-declared.patch
-13
View File
@@ -1,13 +0,0 @@
error: 'SIGSEGV' was not declared in this scope
diff --git a/libsanitizer/asan/asan_linux.cc b/libsanitizer/asan/asan_linux.cc
index 0692eb1..472f734 100644
--- a/libsanitizer/asan/asan_linux.cc
+++ b/libsanitizer/asan/asan_linux.cc
@@ -26,6 +26,7 @@
#include <sys/types.h>
#include <fcntl.h>
#include <pthread.h>
+#include <signal.h>
#include <stdio.h>
#include <unistd.h>
#include <unwind.h>
pkgs/development/compilers/gcc/patches/struct-ucontext-4.8.patch
-177
View File
@@ -1,177 +0,0 @@
From b685411208e0aaa79190d54faf945763514706b8 Mon Sep 17 00:00:00 2001
From: jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 4 Jul 2017 10:23:57 +0000
Subject: [PATCH] Use ucontext_t not struct ucontext in linux-unwind.h files.
Current glibc no longer gives the ucontext_t type the tag struct
ucontext, to conform with POSIX namespace rules. This requires
various linux-unwind.h files in libgcc, that were previously using
struct ucontext, to be fixed to use ucontext_t instead. This is
similar to the removal of the struct siginfo tag from siginfo_t some
years ago.
This patch changes those files to use ucontext_t instead. As the
standard name that should be unconditionally safe, so this is not
restricted to architectures supported by glibc, or conditioned on the
glibc version.
Tested compilation together with current glibc with glibc's
build-many-glibcs.py.
* config/aarch64/linux-unwind.h (aarch64_fallback_frame_state),
config/alpha/linux-unwind.h (alpha_fallback_frame_state),
config/bfin/linux-unwind.h (bfin_fallback_frame_state),
config/i386/linux-unwind.h (x86_64_fallback_frame_state,
x86_fallback_frame_state), config/m68k/linux-unwind.h (struct
uw_ucontext), config/nios2/linux-unwind.h (struct nios2_ucontext),
config/pa/linux-unwind.h (pa32_fallback_frame_state),
config/sh/linux-unwind.h (sh_fallback_frame_state),
config/tilepro/linux-unwind.h (tile_fallback_frame_state),
config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Use
ucontext_t instead of struct ucontext.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@249957 138bc75d-0d04-0410-961f-82ee72b054a4
---
libgcc/ChangeLog (REMOVED) | 14 ++++++++++++++
libgcc/config/aarch64/linux-unwind.h | 2 +-
libgcc/config/alpha/linux-unwind.h | 2 +-
libgcc/config/bfin/linux-unwind.h | 2 +-
libgcc/config/i386/linux-unwind.h | 4 ++--
libgcc/config/m68k/linux-unwind.h | 2 +-
libgcc/config/nios2/linux-unwind.h | 2 +-
libgcc/config/pa/linux-unwind.h | 2 +-
libgcc/config/sh/linux-unwind.h | 2 +-
libgcc/config/tilepro/linux-unwind.h | 2 +-
libgcc/config/xtensa/linux-unwind.h | 2 +-
11 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h
index 4512efb..06de45a 100644
--- a/libgcc/config/aarch64/linux-unwind.h
+++ b/libgcc/config/aarch64/linux-unwind.h
@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context,
struct rt_sigframe
{
siginfo_t info;
- struct ucontext uc;
+ ucontext_t uc;
};
struct rt_sigframe *rt_;
diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h
index bdbba4a..e84812e 100644
--- a/libgcc/config/alpha/linux-unwind.h
+++ b/libgcc/config/alpha/linux-unwind.h
@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
{
struct rt_sigframe {
siginfo_t info;
- struct ucontext uc;
+ ucontext_t uc;
} *rt_ = context->cfa;
sc = &rt_->uc.uc_mcontext;
}
diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h
index 77b7c23..8bf5e82 100644
--- a/libgcc/config/bfin/linux-unwind.h
+++ b/libgcc/config/bfin/linux-unwind.h
@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context,
void *puc;
char retcode[8];
siginfo_t info;
- struct ucontext uc;
+ ucontext_t uc;
} *rt_ = context->cfa;
/* The void * cast is necessary to avoid an aliasing warning.
diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h
index 540a0a2..29efbe3 100644
--- a/libgcc/config/i386/linux-unwind.h
+++ b/libgcc/config/i386/linux-unwind.h
@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context,
if (*(unsigned char *)(pc+0) == 0x48
&& *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL)
{
- struct ucontext *uc_ = context->cfa;
+ ucontext_t *uc_ = context->cfa;
/* The void * cast is necessary to avoid an aliasing warning.
The aliasing warning is correct, but should not be a problem
because it does not alias anything. */
@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context,
siginfo_t *pinfo;
void *puc;
siginfo_t info;
- struct ucontext uc;
+ ucontext_t uc;
} *rt_ = context->cfa;
/* The void * cast is necessary to avoid an aliasing warning.
The aliasing warning is correct, but should not be a problem
diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h
index 75b7cf7..f964e24 100644
--- a/libgcc/config/m68k/linux-unwind.h
+++ b/libgcc/config/m68k/linux-unwind.h
@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
/* <sys/ucontext.h> is unfortunately broken right now. */
struct uw_ucontext {
unsigned long uc_flags;
- struct ucontext *uc_link;
+ ucontext_t *uc_link;
stack_t uc_stack;
mcontext_t uc_mcontext;
unsigned long uc_filler[80];
diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h
index 9a2657f..e47493d 100644
--- a/libgcc/config/pa/linux-unwind.h
+++ b/libgcc/config/pa/linux-unwind.h
@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context,
struct sigcontext *sc;
struct rt_sigframe {
siginfo_t info;
- struct ucontext uc;
+ ucontext_t uc;
} *frame;
/* rt_sigreturn trampoline:
diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h
index e389cac..0bf43ba 100644
--- a/libgcc/config/sh/linux-unwind.h
+++ b/libgcc/config/sh/linux-unwind.h
@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context,
{
struct rt_sigframe {
siginfo_t info;
- struct ucontext uc;
+ ucontext_t uc;
} *rt_ = context->cfa;
/* The void * cast is necessary to avoid an aliasing warning.
The aliasing warning is correct, but should not be a problem
diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h
index 796e976..75f8890 100644
--- a/libgcc/config/tilepro/linux-unwind.h
+++ b/libgcc/config/tilepro/linux-unwind.h
@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context,
struct rt_sigframe {
unsigned char save_area[C_ABI_SAVE_AREA_SIZE];
siginfo_t info;
- struct ucontext uc;
+ ucontext_t uc;
} *rt_;
/* Return if this is not a signal handler. */
diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h
index 9872492..586a9d4 100644
--- a/libgcc/config/xtensa/linux-unwind.h
+++ b/libgcc/config/xtensa/linux-unwind.h
@@ -67,7 +67,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
struct rt_sigframe {
siginfo_t info;
- struct ucontext uc;
+ ucontext_t uc;
} *rt_;
/* movi a2, __NR_rt_sigreturn; syscall */
--
2.9.3
pkgs/development/compilers/gcc/versions.nix
-2
View File
@@ -10,7 +10,6 @@ let
"7" = "7.5.0";
"6" = "6.5.0";
"4.9"= "4.9.4";
"4.8"= "4.8.5";
};
fromMajorMinor = majorMinorVersion:
@@ -28,7 +27,6 @@ let
"7.5.0" = "0qg6kqc5l72hpnj4vr6l0p69qav0rh4anlkk3y55540zy3klc6dq";
"6.5.0" = "0i89fksfp6wr1xg9l8296aslcymv2idn60ip31wr9s4pwin7kwby";
"4.9.4" = "14l06m7nvcvb0igkbip58x59w3nq6315k6jcz3wr9ch1rn9d44bc";
"4.8.5" = "08yggr18v373a1ihj0rg2vd6psnic42b518xcgp3r9k81xz1xyr2";
}."${version}";
in {
pkgs/development/interpreters/python/editable.nix
+99
View File
@@ -0,0 +1,99 @@
{
buildPythonPackage,
lib,
hatchling,
tomli-w,
}:
{
pname,
version,
# Editable root as string.
# Environment variables will be expanded at runtime using os.path.expandvars.
root,
# Arguments passed on verbatim to buildPythonPackage
derivationArgs ? { },
# Python dependencies
dependencies ? [ ],
optional-dependencies ? { },
# PEP-518 build-system https://peps.python.org/pep-518
build-system ? [ ],
# PEP-621 entry points https://peps.python.org/pep-0621/#entry-points
scripts ? { },
gui-scripts ? { },
entry-points ? { },
passthru ? { },
meta ? { },
}:
# Create a PEP-660 (https://peps.python.org/pep-0660/) editable package pointing to an impure location outside the Nix store.
# The primary use case of this function is to enable local development workflows where the local package is installed into a virtualenv-like environment using withPackages.
assert lib.isString root;
let
# In editable mode build-system's are considered to be runtime dependencies.
dependencies' = dependencies ++ build-system;
pyproject = {
# PEP-621 project table
project = {
name = pname;
inherit
version
scripts
gui-scripts
entry-points
;
dependencies = map lib.getName dependencies';
optional-dependencies = lib.mapAttrs (_: lib.getName) optional-dependencies;
};
# Allow empty package
tool.hatch.build.targets.wheel.bypass-selection = true;
# Include our editable pointer file in build
tool.hatch.build.targets.wheel.force-include."_${pname}.pth" = "_${pname}.pth";
# Build editable package using hatchling
build-system = {
requires = [ "hatchling" ];
build-backend = "hatchling.build";
};
};
in
buildPythonPackage (
{
inherit
pname
version
optional-dependencies
passthru
meta
;
dependencies = dependencies';
pyproject = true;
unpackPhase = ''
python -c "import json, tomli_w; print(tomli_w.dumps(json.load(open('$pyprojectContentsPath'))))" > pyproject.toml
echo 'import os.path, sys; sys.path.insert(0, os.path.expandvars("${root}"))' > _${pname}.pth
'';
build-system = [ hatchling ];
}
// derivationArgs
// {
# Note: Using formats.toml generates another intermediary derivation that needs to be built.
# We inline the same functionality for better UX.
nativeBuildInputs = (derivationArgs.nativeBuildInputs or [ ]) ++ [ tomli-w ];
pyprojectContents = builtins.toJSON pyproject;
passAsFile = [ "pyprojectContents" ];
preferLocalBuild = true;
}
)
pkgs/development/interpreters/python/python-packages-base.nix
+3 -1
View File
@@ -61,6 +61,8 @@ let
removePythonPrefix = lib.removePrefix namePrefix;
mkPythonEditablePackage = callPackage ./editable.nix { };
mkPythonMetaPackage = callPackage ./meta-package.nix { };
# Convert derivation to a Python module.
@@ -99,7 +101,7 @@ in {
inherit buildPythonPackage buildPythonApplication;
inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf;
inherit toPythonModule toPythonApplication;
inherit mkPythonMetaPackage;
inherit mkPythonMetaPackage mkPythonEditablePackage;
python = toPythonModule python;
pkgs/development/interpreters/python/tests.nix
+38 -1
View File
@@ -122,6 +122,43 @@ let
}
);
# Test editable package support
editableTests = let
testPython = python.override {
self = testPython;
packageOverrides = pyfinal: pyprev: {
# An editable package with a script that loads our mutable location
my-editable = pyfinal.mkPythonEditablePackage {
pname = "my-editable";
version = "0.1.0";
root = "$NIX_BUILD_TOP/src"; # Use environment variable expansion at runtime
# Inject a script
scripts = {
my-script = "my_editable.main:main";
};
};
};
};
in {
editable-script = runCommand "editable-test" {
nativeBuildInputs = [ (testPython.withPackages (ps: [ ps.my-editable ])) ];
} ''
mkdir -p src/my_editable
cat > src/my_editable/main.py << EOF
def main():
print("hello mutable")
EOF
test "$(my-script)" == "hello mutable"
test "$(python -c 'import sys; print(sys.path[1])')" == "$NIX_BUILD_TOP/src"
touch $out
'';
};
# Tests to ensure overriding works as expected.
overrideTests = let
extension = self: super: {
@@ -192,4 +229,4 @@ let
'';
};
in lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests // overrideTests // condaTests)
in lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests // overrideTests // condaTests // editableTests)
pkgs/development/libraries/double-conversion/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, cmake }:
{ stdenv, lib, fetchFromGitHub, cmake, enableStatic ? stdenv.hostPlatform.isStatic }:
stdenv.mkDerivation rec {
pname = "double-conversion";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
cmakeFlags = lib.optional (! enableStatic) "-DBUILD_SHARED_LIBS=ON";
# Case sensitivity issue
preConfigure = lib.optionalString stdenv.isDarwin ''
pkgs/development/libraries/gvm-libs/default.nix
+2 -2
View File
@@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "gvm-libs";
version = "22.10.0";
version = "22.11.0";
src = fetchFromGitHub {
owner = "greenbone";
repo = "gvm-libs";
rev = "refs/tags/v${version}";
hash = "sha256-o86bNwoGUw6VLESkaamWXPOfrdbFipJZmQCL6W5+nfk=";
hash = "sha256-VYFAy6VVASNOBLs39qukePYr5pV0IR1qjztv+veNCVc=";
};
postPatch = ''
pkgs/development/python-modules/cf-xarray/default.nix
+4 -7
View File
@@ -1,7 +1,6 @@
{
lib,
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
# build-system
@@ -25,16 +24,14 @@
buildPythonPackage rec {
pname = "cf-xarray";
version = "0.9.4";
version = "0.9.5";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "xarray-contrib";
repo = "cf-xarray";
rev = "refs/tags/v${version}";
hash = "sha256-zio00ki86DZqWtGnVseDR28He4DW1jjKdwfsxRwFDfg=";
hash = "sha256-Rz0E7GBaN/7zb0dqAxo0SJ4Bd+eQuOOv6x1WubIUh6A=";
};
build-system = [
@@ -45,7 +42,7 @@ buildPythonPackage rec {
dependencies = [ xarray ];
passthru.optional-dependencies = {
optional-dependencies = {
all = [
matplotlib
pint
@@ -60,7 +57,7 @@ buildPythonPackage rec {
dask
pytestCheckHook
scipy
] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
] ++ lib.flatten (builtins.attrValues optional-dependencies);
pythonImportsCheck = [ "cf_xarray" ];
pkgs/development/python-modules/polars/Cargo.lock
Generated
+1434 -665
View File
File diff suppressed because it is too large Load Diff
pkgs/development/python-modules/polars/default.nix
+7 -4
View File
@@ -21,7 +21,7 @@ in
buildPythonPackage rec {
pname = "polars";
version = "0.20.15";
version = "1.6.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "pola-rs";
repo = "polars";
rev = "refs/tags/py-${version}";
hash = "sha256-N/VIi0s5unYWqlR5Mpaq9cqXl2ccbzWPuOtE2UbmQw8=";
hash = "sha256-qJTBGGRxMAirgygm7Ke60olO5sTZboZ80JkYI0LZSMk=";
};
# Cargo.lock file is sometimes behind actual release which throws an error,
@@ -40,7 +40,10 @@ buildPythonPackage rec {
#sed -i 's/version = "0.18.0"/version = "${version}"/g' Cargo.lock
'';
cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; };
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes."numpy-0.21.0" = "sha256-u0Z+6L8pXSPaA3cE1sUpY6sCoaU1clXUcj/avnNzmsw=";
};
buildAndTestSubdir = "py-polars";
@@ -53,7 +56,7 @@ buildPythonPackage rec {
# with simd enabled with our stable rust (instead of nightly).
maturinBuildFlags = [
"--no-default-features"
"--features=all"
"--all-features"
];
dontUseCmakeConfigure = true;
pkgs/development/python-modules/publicsuffixlist/default.nix
+2 -2
View File
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "publicsuffixlist";
version = "1.0.2.20240907";
version = "1.0.2.20240911";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-+DzSFzdgGyirt8X+vW7fzofyHOLXbuVySxV+8CZ5ZlQ=";
hash = "sha256-U3gcjBmDGThIFXNw8E6yxEL3sYULfrEdOxgIWzGbhSk=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/pyixapi/default.nix
+18 -8
View File
@@ -1,10 +1,12 @@
{
lib,
buildPythonPackage,
fetchPypi,
fetchFromGitHub,
poetry-core,
requests,
pyjwt,
pythonOlder,
pytestCheckHook,
requests,
}:
buildPythonPackage rec {
@@ -12,24 +14,32 @@ buildPythonPackage rec {
version = "0.2.3";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-qkgPBIYv9xzGa29RiPAU3zNhcyutTUX1Vkmpd9YdeJU=";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "peering-manager";
repo = "pyixapi";
rev = "refs/tags/${version}";
hash = "sha256-IiLjxOtyxGSaItxgEbsF8AER/j4Qe7SP9ZAEPjTiYI4=";
};
nativeBuildInputs = [ poetry-core ];
pythonRelaxDeps = [ "pyjwt" ];
propagatedBuildInputs = [
build-system = [ poetry-core ];
dependencies = [
requests
pyjwt
];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "pyixapi" ];
meta = with lib; {
description = "Python API client library for IX-API";
homepage = "https://github.com/peering-manager/pyixapi/";
changelog = "https://github.com/peering-manager/pyixapi/releases/tag/${version}";
description = "Python API client library for IX-API";
license = licenses.asl20;
maintainers = teams.wdz.members;
};
pkgs/development/python-modules/pyqtwebengine/default.nix
+2 -2
View File
@@ -21,7 +21,7 @@ in
buildPythonPackage (
rec {
pname = "pyqtwebengine";
version = "5.15.6";
version = "5.15.7";
format = "pyproject";
disabled = isPy27;
@@ -29,7 +29,7 @@ buildPythonPackage (
src = fetchPypi {
pname = "PyQtWebEngine";
inherit version;
hash = "sha256-riQe8qYceCk5xYtSwq6lOtmbMPOTTINY1eCm67P9ByE=";
hash = "sha256-8SGsbkovlqwolhm8/Df2Tmg2LySjRlU/XWxC76Qiik0=";
};
postPatch = ''
pkgs/development/python-modules/tempora/default.nix
+14 -14
View File
@@ -1,38 +1,38 @@
{
lib,
buildPythonPackage,
fetchPypi,
freezegun,
fetchFromGitHub,
jaraco-functools,
pytest-freezegun,
pytest-freezer,
pytestCheckHook,
python-dateutil,
pythonOlder,
pytz,
setuptools-scm,
}:
buildPythonPackage rec {
pname = "tempora";
version = "5.6.0";
format = "pyproject";
version = "5.7.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-O/zBLL27uv7KrMuQl/w3VENbnQY9zkMzjk+ofTkQSu0=";
src = fetchFromGitHub {
owner = "jaraco";
repo = "tempora";
rev = "refs/tags/v${version}";
hash = "sha256-M6nWKYvgn4tk2diiTDAYb1uQdP8H1M8yqhsFLJ9H7HU=";
};
nativeBuildInputs = [ setuptools-scm ];
build-system = [ setuptools-scm ];
propagatedBuildInputs = [
dependencies = [
jaraco-functools
pytz
python-dateutil
];
nativeCheckInputs = [
freezegun
pytest-freezegun
pytest-freezer
pytestCheckHook
];
pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1228";
version = "3.0.1229";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-YNGehz2pTTJ6D2sZM95YLZ0Fr/rhcN+IsZT3mQCBgP0=";
hash = "sha256-sFI16249sSnBAEQOTqO/QaVSoF3Fy44X5GaAkYi9ukQ=";
};
build-system = [ setuptools ];
pkgs/development/r-modules/default.nix
+1
View File
@@ -476,6 +476,7 @@ let
RODBC = [ pkgs.libiodbc ];
rpanel = [ pkgs.bwidget ];
Rpoppler = [ pkgs.poppler ];
RPostgres = with pkgs; [ postgresql ];
RPostgreSQL = with pkgs; [ postgresql postgresql ];
RProtoBuf = [ pkgs.protobuf ];
RSclient = [ pkgs.openssl.dev ];
pkgs/development/tools/misc/texinfo/packages.nix
-4
View File
@@ -88,10 +88,6 @@ in
branch = finalAttrs.version;
};
});
texinfo5 = buildTexinfo {
version = "5.2";
hash = "sha256-VHHvaDpkWIp8/vRu8r3T+8vKidhH4QgyYSKT8QXkTto=";
};
texinfo6_5 = buildTexinfo {
version = "6.5";
hash = "sha256-d3dLP0oGwgcFzC7xyASGRCLjz5UjXpZbHwCkbffaX2I=";
pkgs/games/chessx/default.nix
+1 -1
View File
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://chessx.sourceforge.io/";
description = "Browse and analyse chess games";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ eclairevoyant luispedro ];
maintainers = with maintainers; [ luispedro ];
platforms = platforms.linux;
mainProgram = "chessx";
};
pkgs/games/cutechess/default.nix
+1 -1
View File
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "GUI, CLI, and library for playing chess";
homepage = "https://cutechess.com/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ eclairevoyant ];
maintainers = with maintainers; [ ];
platforms = with platforms; (linux ++ windows);
mainProgram = "cutechess";
};
pkgs/servers/http/lighttpd/default.nix
+4 -3
View File
@@ -1,4 +1,5 @@
{ lib, stdenv, buildPackages, fetchurl, pkg-config, pcre2, libxml2, zlib, bzip2, which, file
, autoreconfHook
, openssl
, enableDbi ? false, libdbi
, enableMagnet ? false, lua5_1
@@ -14,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "lighttpd";
version = "1.4.75";
version = "1.4.76";
src = fetchurl {
url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz";
sha256 = "sha256-i3IcqTnTEq+qbvMdy9avtRYe04Wsgo5vzNTFt2vhidY=";
sha256 = "sha256-jL9CluNzz9DO3+nZeHYLWwXFj9xASLTivK8KYayPUBE=";
};
separateDebugInfo = true;
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ pcre2 pcre2.dev libxml2 zlib bzip2 which file openssl ]
++ lib.optional enableDbi libdbi
++ lib.optional enableMagnet lua5_1
pkgs/tools/archivers/7zz/default.nix
+1 -1
View File
@@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
# and CPP/7zip/Compress/Rar* are unfree with the unRAR license restriction
# the unRAR compression code is disabled by default
lib.optionals enableUnfree [ unfree ];
maintainers = with lib.maintainers; [ anna328p eclairevoyant jk peterhoeg ];
maintainers = with lib.maintainers; [ anna328p jk peterhoeg ];
platforms = with lib.platforms; unix ++ windows;
mainProgram = "7zz";
};
pkgs/tools/graphics/grim/default.nix
+1 -1
View File
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/emersion/grim";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ eclairevoyant ];
maintainers = with maintainers; [ ];
mainProgram = "grim";
};
}
pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix
+1 -1
View File
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Vietnamese input method engine support for Fcitx";
homepage = "https://github.com/fcitx/fcitx5-bamboo";
license = lib.licenses.lgpl21Plus;
maintainers = with lib.maintainers; [ eclairevoyant ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
})
pkgs/tools/misc/asciinema/default.nix
+1 -1
View File
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
description = "Terminal session recorder and the best companion of asciinema.org";
homepage = "https://asciinema.org/";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ eclairevoyant ];
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.all;
mainProgram = "asciinema";
};
pkgs/tools/security/ggshield/default.nix
+3 -2
View File
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "ggshield";
version = "1.29.0";
version = "1.31.0";
pyproject = true;
src = fetchFromGitHub {
owner = "GitGuardian";
repo = "ggshield";
rev = "refs/tags/v${version}";
hash = "sha256-x37FRSjhqV7LxD8VFSmVjg/FPlxsa4NEX6y7OEAniF4=";
hash = "sha256-ShczC0DvAO92apkNq5oyYRbkqGdqwl6vaCY1hn8O6so=";
};
pythonRelaxDeps = true;
@@ -70,6 +70,7 @@ python3.pkgs.buildPythonApplication rec {
"test_check_git_dir"
"test_does_not_fail_if_cache"
# Encoding issues
"test_create_files_from_paths"
"test_file_decode_content"
"test_file_is_longer_than_does_not_read_utf8_file"
"test_file_is_longer_using_8bit_codec"
pkgs/top-level/aliases.nix
+3
View File
@@ -509,10 +509,12 @@ mapAliases ({
garage_0_7_3 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10
garmin-plugin = throw "garmin-plugin has been removed, as it is unmaintained upstream and no longer works with modern browsers."; # Added 2024-01-12
garmindev = throw "'garmindev' has been removed as the dependent software 'qlandkartegt' has been removed"; # Added 2023-04-17
gcc48 = throw "'gcc48' has been removed from nixpkgs"; # Added 2024-09-10
gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv; # Added 2024-03-21
gcl_2_6_13_pre = throw "'gcl_2_6_13_pre' has been removed in favor of 'gcl'"; # Added 2024-01-11
geekbench4 = throw "'geekbench4' has been renamed to 'geekbench_4'"; # Added 2023-03-10
geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10
gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10
ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18
go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04
gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06
@@ -1219,6 +1221,7 @@ mapAliases ({
pgtap = postgresqlPackages.pgtap;
plv8 = postgresqlPackages.plv8;
postgis = postgresqlPackages.postgis;
texinfo5 = throw "'texinfo5' has been removed from nixpkgs"; # Added 2024-09-10
timescaledb = postgresqlPackages.timescaledb;
tsearch_extras = postgresqlPackages.tsearch_extras;
pkgs/top-level/all-packages.nix
+4 -5
View File
@@ -8024,7 +8024,9 @@ with pkgs;
ggobi = callPackage ../tools/graphics/ggobi { };
ggshield = callPackage ../tools/security/ggshield { };
ggshield = callPackage ../tools/security/ggshield {
python3 = python311;
};
ghost = callPackage ../tools/security/ghost { };
@@ -15012,7 +15014,7 @@ with pkgs;
};
inherit (callPackage ../development/compilers/gcc/all.nix { inherit noSysDirs; })
gcc48 gcc49 gcc6 gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc13 gcc14;
gcc49 gcc6 gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc13 gcc14;
gcc_latest = gcc14;
@@ -19012,7 +19014,6 @@ with pkgs;
texinfoPackages = callPackages ../development/tools/misc/texinfo/packages.nix { };
inherit (texinfoPackages)
texinfo413
texinfo5 # needed for gcc48
texinfo6_5 # needed for allegro
texinfo6_7 # needed for gpm, iksemel and fwknop
texinfo6
@@ -31623,8 +31624,6 @@ with pkgs;
mercurialFull = mercurial.override { fullBuild = true; };
merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { };
mepo = callPackage ../applications/misc/mepo { };
meshcentral = callPackage ../tools/admin/meshcentral { };