swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse source
This commit is contained in:
github-actions[bot] 2024-03-09 00:11:53 +00:00 committed by GitHub
parent a32bb438c0 6b3b8bb7e7
commit 54e3ad5442
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
463 changed files with 9081 additions and 5589 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
doc/languages-frameworks/javascript.section.md
View file

@ -233,6 +233,37 @@ sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
It returns a derivation with all `package-lock.json` dependencies downloaded into `$out/`, usable as an npm cache.
#### importNpmLock {#javascript-buildNpmPackage-importNpmLock}
`importNpmLock` is a Nix function that requires the following optional arguments:
- `npmRoot`: Path to package directory containing the source tree
- `package`: Parsed contents of `package.json`
- `packageLock`: Parsed contents of `package-lock.json`
- `pname`: Package name
- `version`: Package version
It returns a derivation with a patched `package.json` & `package-lock.json` with all dependencies resolved to Nix store paths.
This function is analogous to using `fetchNpmDeps`, but instead of specifying `hash` it uses metadata from `package.json` & `package-lock.json`.
Note that `npmHooks.npmConfigHook` cannot be used with `importNpmLock`. You will instead need to use `importNpmLock.npmConfigHook`:
```nix
{ buildNpmPackage, importNpmLock }:
buildNpmPackage {
pname = "hello";
version = "0.1.0";
npmDeps = importNpmLock {
npmRoot = ./.;
};
npmConfigHook = importNpmLock.npmConfigHook;
}
```
### corepack {#javascript-corepack}
This package puts the corepack wrappers for pnpm and yarn in your PATH, and they will honor the `packageManager` setting in the `package.json`.

19
maintainers/maintainer-list.nix
View file

@ -4247,6 +4247,12 @@
githubId = 49398;
name = "Daniël de Kok";
};
daniel-fahey = {
name = "Daniel Fahey";
email = "daniel.fahey+nixpkgs@pm.me";
github = "daniel-fahey";
githubId = 7294692;
};
danielfullmer = {
email = "danielrf12@gmail.com";
github = "danielfullmer";
@ -7461,6 +7467,13 @@
githubId = 443978;
name = "Gabriel Volpe";
};
gwg313 = {
email = "gwg313@pm.me";
matrix = "@gwg313:matrix.org";
github = "gwg313";
githubId = 70684146;
name = "Glen Goodwin";
};
gytis-ivaskevicius = {
name = "Gytis Ivaskevicius";
email = "me@gytis.io";
@ -14915,6 +14928,12 @@
githubId = 8641;
name = "Pierre Carrier";
};
pcasaretto = {
email = "pcasaretto@gmail.com";
github = "pcasaretto";
githubId = 817039;
name = "Paulo Casaretto";
};
pedrohlc = {
email = "root@pedrohlc.com";
github = "PedroHLC";

12
maintainers/team-list.nix
View file

@ -928,6 +928,18 @@ with lib.maintainers; {
shortName = "Serokell employees";
};
steam = {
members = [
atemu
eclairevoyant
jonringer
k900
mkg20001
];
scope = "Maintain steam module and packages";
shortName = "Steam";
};
systemd = {
members = [ ];
githubTeams = [

2
nixos/doc/manual/release-notes/rl-2405.section.md
View file

@ -359,6 +359,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- A new hardening flag, `zerocallusedregs` was made available, corresponding to the gcc/clang option `-fzero-call-used-regs=used-gpr`.
- A new hardening flag, `trivialautovarinit` was made available, corresponding to the gcc/clang option `-ftrivial-auto-var-init=pattern`.
- New options were added to the dnsdist module to enable and configure a DNSCrypt endpoint (see `services.dnsdist.dnscrypt.enable`, etc.).
The module can generate the DNSCrypt provider key pair, certificates and also performs their rotation automatically with no downtime.

12
nixos/lib/test-driver/test_driver/logger.py
View file

@ -1,6 +1,3 @@
# mypy: disable-error-code="no-untyped-call"
# drop the above line when mypy is upgraded to include
# https://github.com/python/typeshed/commit/49b717ca52bf0781a538b04c0d76a5513f7119b8
import codecs
import os
import sys
@ -10,6 +7,7 @@ from contextlib import contextmanager
from queue import Empty, Queue
from typing import Any, Dict, Iterator
from xml.sax.saxutils import XMLGenerator
from xml.sax.xmlreader import AttributesImpl
from colorama import Fore, Style
@ -22,7 +20,7 @@ class Logger:
self.queue: "Queue[Dict[str, str]]" = Queue()
self.xml.startDocument()
self.xml.startElement("logfile", attrs={})
self.xml.startElement("logfile", attrs=AttributesImpl({}))
self._print_serial_logs = True
@ -44,7 +42,7 @@ class Logger:
return message
def log_line(self, message: str, attributes: Dict[str, str]) -> None:
self.xml.startElement("line", attributes)
self.xml.startElement("line", attrs=AttributesImpl(attributes))
self.xml.characters(message)
self.xml.endElement("line")
@ -89,8 +87,8 @@ class Logger:
)
)
self.xml.startElement("nest", attrs={})
self.xml.startElement("head", attributes)
self.xml.startElement("nest", attrs=AttributesImpl({}))
self.xml.startElement("head", attrs=AttributesImpl(attributes))
self.xml.characters(message)
self.xml.endElement("head")

5
nixos/modules/config/users-groups.nix
View file

@ -704,6 +704,11 @@ in {
in stringAfter [ "users" ] ''
if [ -e ${lingerDir} ] ; then
cd ${lingerDir}
for user in ${lingerDir}/*; do
if ! id "$user" >/dev/null 2>&1; then
rm --force -- "$user"
fi
done
ls ${lingerDir} | sort | comm -3 -1 ${lingeringUsersFile} - | xargs -r ${pkgs.systemd}/bin/loginctl disable-linger
ls ${lingerDir} | sort | comm -3 -2 ${lingeringUsersFile} - | xargs -r ${pkgs.systemd}/bin/loginctl enable-linger
fi

38
nixos/modules/image/repart-image.nix
View file

@ -3,6 +3,7 @@
{ lib
, runCommand
, runCommandLocal
, python3
, black
, ruff
@ -33,6 +34,7 @@
, seed
, definitionsDirectory
, sectorSize
, mkfsEnv ? {}
}:
let
@ -50,6 +52,11 @@ let
mypy --strict $out
'';
amendedRepartDefinitions = runCommandLocal "amended-repart.d" {} ''
definitions=$(${amendRepartDefinitions} ${partitions} ${definitionsDirectory})
cp -r $definitions $out
'';
fileSystemToolMapping = {
"vfat" = [ dosfstools mtools ];
"ext4" = [ e2fsprogs.bin ];
@ -74,28 +81,39 @@ in
runCommand imageFileBasename
{
__structuredAttrs = true;
nativeBuildInputs = [
systemd
fakeroot
util-linux
compressionPkg
] ++ fileSystemTools;
} ''
amendedRepartDefinitions=$(${amendRepartDefinitions} ${partitions} ${definitionsDirectory})
env = mkfsEnv;
systemdRepartFlags = [
"--dry-run=no"
"--empty=create"
"--size=auto"
"--seed=${seed}"
"--definitions=${amendedRepartDefinitions}"
"--split=${lib.boolToString split}"
"--json=pretty"
] ++ lib.optionals (sectorSize != null) [
"--sector-size=${toString sectorSize}"
];
passthru = {
inherit amendRepartDefinitions amendedRepartDefinitions;
};
} ''
mkdir -p $out
cd $out
echo "Building image with systemd-repart..."
unshare --map-root-user fakeroot systemd-repart \
--dry-run=no \
--empty=create \
--size=auto \
--seed="${seed}" \
--definitions="$amendedRepartDefinitions" \
--split="${lib.boolToString split}" \
--json=pretty \
${lib.optionalString (sectorSize != null) "--sector-size=${toString sectorSize}"} \
''${systemdRepartFlags[@]} \
${imageFileBasename}.raw \
| tee repart-output.json

32
nixos/modules/image/repart.nix
View file

@ -60,6 +60,11 @@ let
};
};
};
mkfsOptionsToEnv = opts: lib.mapAttrs' (fsType: options: {
name = "SYSTEMD_REPART_MKFS_OPTIONS_${lib.toUpper fsType}";
value = builtins.concatStringsSep " " options;
}) opts;
in
{
options.image.repart = {
@ -183,6 +188,29 @@ in
'';
};
mkfsOptions = lib.mkOption {
type = with lib.types; attrsOf (listOf str);
default = {};
example = lib.literalExpression ''
{
vfat = [ "-S 512" "-c" ];
}
'';
description = lib.mdDoc ''
Specify extra options for created file systems. The specified options
are converted to individual environment variables of the format
`SYSTEMD_REPART_MKFS_OPTIONS_<FSTYPE>`.
See [upstream systemd documentation](https://github.com/systemd/systemd/blob/v255/docs/ENVIRONMENT.md?plain=1#L575-L577)
for information about the usage of these environment variables.
The example would produce the following environment variable:
```
SYSTEMD_REPART_MKFS_OPTIONS_VFAT="-S 512 -c"
```
'';
};
};
config = {
@ -239,11 +267,13 @@ in
(lib.mapAttrs (_n: v: { Partition = v.repartConfig; }) finalPartitions);
partitions = pkgs.writeText "partitions.json" (builtins.toJSON finalPartitions);
mkfsEnv = mkfsOptionsToEnv cfg.mkfsOptions;
in
pkgs.callPackage ./repart-image.nix {
systemd = cfg.package;
inherit (cfg) imageFileBasename compression split seed sectorSize;
inherit fileSystems definitionsDirectory partitions;
inherit fileSystems definitionsDirectory partitions mkfsEnv;
};
meta.maintainers = with lib.maintainers; [ nikstur ];

15
nixos/modules/programs/steam.nix
View file

@ -43,6 +43,9 @@ in {
}
'';
apply = steam: steam.override (prev: {
extraEnv = (lib.optionalAttrs (cfg.extraCompatPackages != [ ]) {
STEAM_EXTRA_COMPAT_TOOLS_PATHS = makeBinPath cfg.extraCompatPackages;
}) // (prev.extraEnv or {});
extraLibraries = pkgs: let
prevLibs = if prev ? extraLibraries then prev.extraLibraries pkgs else [ ];
additionalLibs = with config.hardware.opengl;
@ -68,6 +71,16 @@ in {
'';
};
extraCompatPackages = mkOption {
type = types.listOf types.package;
default = [ ];
description = lib.mdDoc ''
Extra packages to be used as compatibility tools for Steam on Linux. Packages will be included
in the `STEAM_EXTRA_COMPAT_TOOLS_PATHS` environmental variable. For more information see
<https://github.com/ValveSoftware/steam-for-linux/issues/6310">.
'';
};
remotePlay.openFirewall = mkOption {
type = types.bool;
default = false;
@ -174,5 +187,5 @@ in {
];
};
meta.maintainers = with maintainers; [ mkg20001 ];
meta.maintainers = teams.steam;
}

2
nixos/modules/services/databases/memcached.nix
View file

@ -37,7 +37,7 @@ in
description = lib.mdDoc "The port to bind to.";
};
enableUnixSocket = mkEnableOption (lib.mdDoc "unix socket at /run/memcached/memcached.sock");
enableUnixSocket = mkEnableOption (lib.mdDoc "Unix Domain Socket at /run/memcached/memcached.sock instead of listening on an IP address and port. The `listen` and `port` options are ignored.");
maxMemory = mkOption {
type = types.ints.unsigned;

149
nixos/modules/services/monitoring/scrutiny.nix
View file

@ -1,5 +1,11 @@
{ config, lib, pkgs, ... }:
let
inherit (lib) maintainers;
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.options) literalExpression mkEnableOption mkOption mkPackageOption;
inherit (lib.types) bool enum nullOr port str submodule;
cfg = config.services.scrutiny;
# Define the settings format used for this program
settingsFormat = pkgs.formats.yaml { };
@ -7,20 +13,16 @@ in
{
options = {
services.scrutiny = {
enable = lib.mkEnableOption "Enables the scrutiny web application.";
enable = mkEnableOption "Scrutiny, a web application for drive monitoring";
package = lib.mkPackageOptionMD pkgs "scrutiny" { };
package = mkPackageOption pkgs "scrutiny" { };
openFirewall = lib.mkOption {
type = lib.types.bool;
default = false;
description = "Open the default ports in the firewall for Scrutiny.";
};
openFirewall = mkEnableOption "opening the default ports in the firewall for Scrutiny";
influxdb.enable = lib.mkOption {
type = lib.types.bool;
influxdb.enable = mkOption {
type = bool;
default = true;
description = lib.mdDoc ''
description = ''
Enables InfluxDB on the host system using the `services.influxdb2` NixOS module
with default options.
@ -29,127 +31,124 @@ in
'';
};
settings = lib.mkOption {
description = lib.mdDoc ''
settings = mkOption {
description = ''
Scrutiny settings to be rendered into the configuration file.
See https://github.com/AnalogJ/scrutiny/blob/master/example.scrutiny.yaml.
'';
default = { };
type = lib.types.submodule {
type = submodule {
freeformType = settingsFormat.type;
options.web.listen.port = lib.mkOption {
type = lib.types.port;
options.web.listen.port = mkOption {
type = port;
default = 8080;
description = lib.mdDoc "Port for web application to listen on.";
description = "Port for web application to listen on.";
};
options.web.listen.host = lib.mkOption {
type = lib.types.str;
options.web.listen.host = mkOption {
type = str;
default = "0.0.0.0";
description = lib.mdDoc "Interface address for web application to bind to.";
description = "Interface address for web application to bind to.";
};
options.web.listen.basepath = lib.mkOption {
type = lib.types.str;
options.web.listen.basepath = mkOption {
type = str;
default = "";
example = "/scrutiny";
description = lib.mdDoc ''
description = ''
If Scrutiny will be behind a path prefixed reverse proxy, you can override this
value to serve Scrutiny on a subpath.
'';
};
options.log.level = lib.mkOption {
type = lib.types.enum [ "INFO" "DEBUG" ];
options.log.level = mkOption {
type = enum [ "INFO" "DEBUG" ];
default = "INFO";
description = lib.mdDoc "Log level for Scrutiny.";
description = "Log level for Scrutiny.";
};
options.web.influxdb.scheme = lib.mkOption {
type = lib.types.str;
options.web.influxdb.scheme = mkOption {
type = str;
default = "http";
description = lib.mdDoc "URL scheme to use when connecting to InfluxDB.";
description = "URL scheme to use when connecting to InfluxDB.";
};
options.web.influxdb.host = lib.mkOption {
type = lib.types.str;
options.web.influxdb.host = mkOption {
type = str;
default = "0.0.0.0";
description = lib.mdDoc "IP or hostname of the InfluxDB instance.";
description = "IP or hostname of the InfluxDB instance.";
};
options.web.influxdb.port = lib.mkOption {
type = lib.types.port;
options.web.influxdb.port = mkOption {
type = port;
default = 8086;
description = lib.mdDoc "The port of the InfluxDB instance.";
description = "The port of the InfluxDB instance.";
};
options.web.influxdb.tls.insecure_skip_verify = lib.mkOption {
type = lib.types.bool;
default = false;
description = lib.mdDoc "Skip TLS verification when connecting to InfluxDB.";
};
options.web.influxdb.tls.insecure_skip_verify = mkEnableOption "skipping TLS verification when connecting to InfluxDB";
options.web.influxdb.token = lib.mkOption {
type = lib.types.nullOr lib.types.str;
options.web.influxdb.token = mkOption {
type = nullOr str;
default = null;
description = lib.mdDoc "Authentication token for connecting to InfluxDB.";
description = "Authentication token for connecting to InfluxDB.";
};
options.web.influxdb.org = lib.mkOption {
type = lib.types.nullOr lib.types.str;
options.web.influxdb.org = mkOption {
type = nullOr str;
default = null;
description = lib.mdDoc "InfluxDB organisation under which to store data.";
description = "InfluxDB organisation under which to store data.";
};
options.web.influxdb.bucket = lib.mkOption {
type = lib.types.nullOr lib.types.str;
options.web.influxdb.bucket = mkOption {
type = nullOr str;
default = null;
description = lib.mdDoc "InfluxDB bucket in which to store data.";
description = "InfluxDB bucket in which to store data.";
};
};
};
collector = {
enable = lib.mkEnableOption "Enables the scrutiny metrics collector.";
enable = mkEnableOption "the Scrutiny metrics collector";
package = lib.mkPackageOptionMD pkgs "scrutiny-collector" { };
package = mkPackageOption pkgs "scrutiny-collector" { };
schedule = lib.mkOption {
type = lib.types.str;
schedule = mkOption {
type = str;
default = "*:0/15";
description = lib.mdDoc ''
description = ''
How often to run the collector in systemd calendar format.
'';
};
settings = lib.mkOption {
description = lib.mdDoc ''
settings = mkOption {
description = ''
Collector settings to be rendered into the collector configuration file.
See https://github.com/AnalogJ/scrutiny/blob/master/example.collector.yaml.
'';
default = { };
type = lib.types.submodule {
type = submodule {
freeformType = settingsFormat.type;
options.host.id = lib.mkOption {
type = lib.types.nullOr lib.types.str;
options.host.id = mkOption {
type = nullOr str;
default = null;
description = lib.mdDoc "Host ID for identifying/labelling groups of disks";
description = "Host ID for identifying/labelling groups of disks";
};
options.api.endpoint = lib.mkOption {
type = lib.types.str;
default = "http://localhost:8080";
description = lib.mdDoc "Scrutiny app API endpoint for sending metrics to.";
options.api.endpoint = mkOption {
type = str;
default = "http://localhost:${toString cfg.settings.web.listen.port}";
defaultText = literalExpression ''"http://localhost:''${config.services.scrutiny.settings.web.listen.port}"'';
description = "Scrutiny app API endpoint for sending metrics to.";
};
options.log.level = lib.mkOption {
type = lib.types.enum [ "INFO" "DEBUG" ];
options.log.level = mkOption {
type = enum [ "INFO" "DEBUG" ];
default = "INFO";
description = lib.mdDoc "Log level for Scrutiny collector.";
description = "Log level for Scrutiny collector.";
};
};
};
@ -157,14 +156,14 @@ in
};
};
config = lib.mkIf (cfg.enable || cfg.collector.enable) {
config = mkIf (cfg.enable || cfg.collector.enable) {
services.influxdb2.enable = cfg.influxdb.enable;
networking.firewall = lib.mkIf cfg.openFirewall {
networking.firewall = mkIf cfg.openFirewall {
allowedTCPPorts = [ cfg.settings.web.listen.port ];
};
services.smartd = lib.mkIf cfg.collector.enable {
services.smartd = mkIf cfg.collector.enable {
enable = true;
extraOptions = [
"-A /var/log/smartd/"
@ -174,7 +173,7 @@ in
systemd = {
services = {
scrutiny = lib.mkIf cfg.enable {
scrutiny = mkIf cfg.enable {
description = "Hard Drive S.M.A.R.T Monitoring, Historical Trends & Real World Failure Thresholds";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
@ -185,14 +184,14 @@ in
};
serviceConfig = {
DynamicUser = true;
ExecStart = "${lib.getExe cfg.package} start --config ${settingsFormat.generate "scrutiny.yaml" cfg.settings}";
ExecStart = "${getExe cfg.package} start --config ${settingsFormat.generate "scrutiny.yaml" cfg.settings}";
Restart = "always";
StateDirectory = "scrutiny";
StateDirectoryMode = "0750";
};
};
scrutiny-collector = lib.mkIf cfg.collector.enable {
scrutiny-collector = mkIf cfg.collector.enable {
description = "Scrutiny Collector Service";
environment = {
COLLECTOR_VERSION = "1";
@ -200,12 +199,12 @@ in
};
serviceConfig = {
Type = "oneshot";
ExecStart = "${lib.getExe cfg.collector.package} run --config ${settingsFormat.generate "scrutiny-collector.yaml" cfg.collector.settings}";
ExecStart = "${getExe cfg.collector.package} run --config ${settingsFormat.generate "scrutiny-collector.yaml" cfg.collector.settings}";
};
};
};
timers = lib.mkIf cfg.collector.enable {
timers = mkIf cfg.collector.enable {
scrutiny-collector = {
timerConfig = {
OnCalendar = cfg.collector.schedule;
@ -217,5 +216,5 @@ in
};
};
meta.maintainers = [ lib.maintainers.jnsgruk ];
meta.maintainers = [ maintainers.jnsgruk ];
}

2
nixos/modules/system/boot/networkd.nix
View file

@ -797,6 +797,7 @@ let
"UseHostname"
"Hostname"
"UseDomains"
"UseGateway"
"UseRoutes"
"UseTimezone"
"ClientIdentifier"
@ -829,6 +830,7 @@ let
(assertValueOneOf "SendHostname" boolValues)
(assertValueOneOf "UseHostname" boolValues)
(assertValueOneOf "UseDomains" (boolValues ++ ["route"]))
(assertValueOneOf "UseGateway" boolValues)
(assertValueOneOf "UseRoutes" boolValues)
(assertValueOneOf "UseTimezone" boolValues)
(assertValueOneOf "ClientIdentifier" ["mac" "duid" "duid-only"])

4
pkgs/applications/audio/ladspa-plugins/default.nix
View file

@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "http://plugin.org.uk/";
description = "LADSPA format audio plugins";
license = licenses.gpl2;
license = licenses.gpl2Only;
maintainers = [ maintainers.magnetophon ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

4
pkgs/applications/audio/mpg123/default.nix
View file

@ -21,11 +21,11 @@ assert withConplay -> !libOnly;
stdenv.mkDerivation rec {
pname = "${lib.optionalString libOnly "lib"}mpg123";
version = "1.32.4";
version = "1.32.5";
src = fetchurl {
url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2";
hash = "sha256-WplmQzj7L3UbZi9A7iWATQydtrV13LXOdBxtxkIkoIo=";
hash = "sha256-r5CM32zbZUS5e8cGp5n3mJTmlGivWIG/RUoOu5Fx7WM=";
};
outputs = [ "out" "dev" "man" ] ++ lib.optional withConplay "conplay";

3
pkgs/applications/audio/radiotray-ng/default.nix
View file

@ -19,7 +19,6 @@
# GStreamer
, glib-networking
, gst_all_1
, libsoup_3
# User-agent info
, lsb-release
# rt2rtng
@ -100,8 +99,6 @@ stdenv.mkDerivation rec {
preFixup = ''
gappsWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ dbus ]})
wrapProgram $out/bin/rt2rtng --prefix PYTHONPATH : $PYTHONPATH
# for GStreamer
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.getLib libsoup_3}/lib")
'';
meta = with lib; {

4
pkgs/applications/editors/ed/sources.nix
View file

@ -23,10 +23,10 @@ in
{
ed = let
pname = "ed";
version = "1.20";
version = "1.20.1";
src = fetchurl {
url = "mirror://gnu/ed/ed-${version}.tar.lz";
hash = "sha256-xgMN7+auFy8Wh5Btc1QFTHWmqRMK8xnU5zxQqRlZxaY=";
hash = "sha256-saRjspehQfmHbEsfzQFHf2Rc3tkhaAkOmjXbKvS6u8o=";
};
in import ./generic.nix {
inherit pname version src meta;

500
pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
View file

File diff suppressed because it is too large Load diff

219
pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
View file

@ -34,10 +34,10 @@
elpaBuild {
pname = "activities";
ename = "activities";
version = "0.4";
version = "0.5.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/activities-0.4.tar";
sha256 = "0mmb7fslirb40n75m8zfib1999yndysm13lyj0mypn9ciy1mvm6l";
url = "https://elpa.gnu.org/packages/activities-0.5.1.tar";
sha256 = "0ng9sgajcpal881s3kavkmz0fc38f2h207hpqj62cf14z7bsk0zk";
};
packageRequires = [ emacs persist ];
meta = {
@ -280,10 +280,10 @@
elpaBuild {
pname = "auctex";
ename = "auctex";
version = "13.3.0";
version = "14.0.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/auctex-13.3.0.tar";
sha256 = "09yc9242xya2by8z72899li7zc9g23bb8j8m30kbvivynmdfhzkf";
url = "https://elpa.gnu.org/packages/auctex-14.0.3.tar";
sha256 = "1xk29nk3r7ilxk2vag3diacamqvlws7mbjk5a0iivz5y6fy7hmjc";
};
packageRequires = [ emacs ];
meta = {
@ -415,10 +415,10 @@
elpaBuild {
pname = "beframe";
ename = "beframe";
version = "1.0.0";
version = "1.0.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/beframe-1.0.0.tar";
sha256 = "0fw0nsdp78x194gkscwfyayq51yfb8r4k0q51ia1rnj43kxmmvr9";
url = "https://elpa.gnu.org/packages/beframe-1.0.1.tar";
sha256 = "0j4ks5i67ck1cid6whvwq564s94xb0q5fchb006wzbniy1inwcna";
};
packageRequires = [ emacs ];
meta = {
@ -430,10 +430,10 @@
elpaBuild {
pname = "bicep-ts-mode";
ename = "bicep-ts-mode";
version = "0.1.1";
version = "0.1.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/bicep-ts-mode-0.1.1.tar";
sha256 = "0yxn9vk8hbsx50ljjy2swn38cxw2nkvkyc6hqw3qxj014vaavxvn";
url = "https://elpa.gnu.org/packages/bicep-ts-mode-0.1.3.tar";
sha256 = "1di4pkk682kl46acdq44d1xykzqnvayhd84rwf71rj3q252di5a6";
};
packageRequires = [];
meta = {
@ -644,10 +644,10 @@
elpaBuild {
pname = "calibre";
ename = "calibre";
version = "1.4.0";
version = "1.4.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/calibre-1.4.0.tar";
sha256 = "1p3sla0j9v1d42z2amwb3hk2gs80ld50nxm1bfi30vdh563cfz4q";
url = "https://elpa.gnu.org/packages/calibre-1.4.1.tar";
sha256 = "1wjz4d2hrhwcd9ljngygacxm28ddgwndp9krz5cxhjz2dkhs1pgb";
};
packageRequires = [ compat emacs ];
meta = {
@ -659,10 +659,10 @@
elpaBuild {
pname = "cape";
ename = "cape";
version = "1.2";
version = "1.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/cape-1.2.tar";
sha256 = "0f18y40ajrkl5kc2r656lvi5vqkz7cpvyz0h6dwbc4dfhsa3cyfs";
url = "https://elpa.gnu.org/packages/cape-1.3.tar";
sha256 = "1178f6js821zcmsc3zrlclnaf4sswgvzs2qazzi975dkcfqcn3vq";
};
packageRequires = [ compat emacs ];
meta = {
@ -922,10 +922,10 @@
elpaBuild {
pname = "consult";
ename = "consult";
version = "1.2";
version = "1.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/consult-1.2.tar";
sha256 = "1dxnr5a1gj1gwmwagl9sd8bq2g9fw0gmldzz2jfg8dj3dw75rk71";
url = "https://elpa.gnu.org/packages/consult-1.3.tar";
sha256 = "1qyqvc4rp0287lidpzhvi669ygjnqmlw8wq0hc0nks2703p283c8";
};
packageRequires = [ compat emacs ];
meta = {
@ -933,6 +933,26 @@
license = lib.licenses.free;
};
}) {};
consult-hoogle = callPackage ({ consult
, elpaBuild
, emacs
, fetchurl
, haskell-mode
, lib }:
elpaBuild {
pname = "consult-hoogle";
ename = "consult-hoogle";
version = "0.1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/consult-hoogle-0.1.1.tar";
sha256 = "1bcl7h5ykcgrsfj27wkv9l9jvbj2bbkh0w9d60663m1bkp0p3y2r";
};
packageRequires = [ consult emacs haskell-mode ];
meta = {
homepage = "https://elpa.gnu.org/packages/consult-hoogle.html";
license = lib.licenses.free;
};
}) {};
consult-recoll = callPackage ({ consult, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "consult-recoll";
@ -1132,10 +1152,10 @@
elpaBuild {
pname = "dape";
ename = "dape";
version = "0.5.0";
version = "0.7.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/dape-0.5.0.tar";
sha256 = "1pgrlgk1wf35afgfcbm256ikixk2r6rbkc05iwsr6x6l9y3h0v3w";
url = "https://elpa.gnu.org/packages/dape-0.7.0.tar";
sha256 = "0fbafwmrs9dlv875vcg1c9gh0hqs1zpnyqxgkdvbrazww7ffn60g";
};
packageRequires = [ emacs jsonrpc ];
meta = {
@ -1192,10 +1212,10 @@
elpaBuild {
pname = "debbugs";
ename = "debbugs";
version = "0.38";
version = "0.40";
src = fetchurl {
url = "https://elpa.gnu.org/packages/debbugs-0.38.tar";
sha256 = "0cl6vcnlyanrl3qzhd31pw9qvij6g88cgifl3mwgw54bbagl9hh6";
url = "https://elpa.gnu.org/packages/debbugs-0.40.tar";
sha256 = "0yfl9gd23xnfk3iwiq26brd7fg9ikhd201lw4awng0rdh0fddxwd";
};
packageRequires = [ emacs soap-client ];
meta = {
@ -1633,10 +1653,10 @@
elpaBuild {
pname = "eev";
ename = "eev";
version = "20240115";
version = "20240205";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eev-20240115.tar";
sha256 = "0vlw88wjgzgl3wsa7k5p03qvj2yipvjsrjcrv8vjlvnm83pszskh";
url = "https://elpa.gnu.org/packages/eev-20240205.tar";
sha256 = "06psmcf3yi7pincsbhjrcrml0wzwgmlv6xy2fbpg1sg8vlibbgi3";
};
packageRequires = [ emacs ];
meta = {
@ -1648,10 +1668,10 @@
elpaBuild {
pname = "ef-themes";
ename = "ef-themes";
version = "1.5.0";
version = "1.5.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ef-themes-1.5.0.tar";
sha256 = "1jckhizsrlnkfrfal9ym214gb10kyfzws7vvmyxnpxn8pspiby4a";
url = "https://elpa.gnu.org/packages/ef-themes-1.5.1.tar";
sha256 = "00qh5b7kx0dlms7drnzj95mvgwfzg5h5m9prkbr8qi4ssx939gdw";
};
packageRequires = [ emacs ];
meta = {
@ -1768,10 +1788,10 @@
elpaBuild {
pname = "ellama";
ename = "ellama";
version = "0.7.4";
version = "0.8.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ellama-0.7.4.tar";
sha256 = "0xpavi6kqrimgxyhpqlp1kkgisswkarm35s1b40938i70cyy3157";
url = "https://elpa.gnu.org/packages/ellama-0.8.7.tar";
sha256 = "0qmd7zrh026rjic26bdp9zinb7vkppdm14inwpwaashqxa5brwi5";
};
packageRequires = [ dash emacs llm spinner ];
meta = {
@ -1992,10 +2012,10 @@
elpaBuild {
pname = "excorporate";
ename = "excorporate";
version = "1.1.1";
version = "1.1.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/excorporate-1.1.1.tar";
sha256 = "06ilfkrlx6ca0qfqq3w1w07kdwak556i1wgf1875py2d5xkg4r90";
url = "https://elpa.gnu.org/packages/excorporate-1.1.2.tar";
sha256 = "11w53idm7m20jhmwnj9wiqiv6fzydjrgy2s3mp36barlj3xq0l0z";
};
packageRequires = [
cl-lib
@ -2101,6 +2121,21 @@
license = lib.licenses.free;
};
}) {};
filechooser = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "filechooser";
ename = "filechooser";
version = "0.1.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/filechooser-0.1.2.tar";
sha256 = "0s0mdc851zd2hy8hfpbamiimbh7c788cyz8mxnwzkpmf6jlj6xdw";
};
packageRequires = [ compat emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/filechooser.html";
license = lib.licenses.free;
};
}) {};
filladapt = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "filladapt";
@ -2519,10 +2554,10 @@
elpaBuild {
pname = "greader";
ename = "greader";
version = "0.8.2";
version = "0.9.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/greader-0.8.2.tar";
sha256 = "0cfdx4ybvdklsmxd2n10n8c0niw5k2d4cdnmm98ixadvh56bvflr";
url = "https://elpa.gnu.org/packages/greader-0.9.7.tar";
sha256 = "08q2qfcwyxrnmjbzblgk16xhshhn2314swjs0kr5jrdijdgpfghh";
};
packageRequires = [ emacs ];
meta = {
@ -2691,10 +2726,10 @@
elpaBuild {
pname = "hyperbole";
ename = "hyperbole";
version = "8.0.0";
version = "9.0.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/hyperbole-8.0.0.tar";
sha256 = "171x7jad62xd0n3xgs32dksyhn5abxj1kna0qgm65mm0v73hrv8d";
url = "https://elpa.gnu.org/packages/hyperbole-9.0.0.tar";
sha256 = "07kpyp3ggf4knakn18niy819l184apx4d9vbcwv57j8zyqgn4c3l";
};
packageRequires = [ emacs ];
meta = {
@ -2706,10 +2741,10 @@
elpaBuild {
pname = "ilist";
ename = "ilist";
version = "0.1";
version = "0.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ilist-0.1.tar";
sha256 = "1ihh44276ivgykva805540nkkrqmc61lydv20l99si3amg07q9bh";
url = "https://elpa.gnu.org/packages/ilist-0.3.tar";
sha256 = "1gg77fnk2ky5z5153axszs43a9npb1xg56ik23rz45xl9hg7v8as";
};
packageRequires = [];
meta = {
@ -2921,10 +2956,10 @@
elpaBuild {
pname = "jinx";
ename = "jinx";
version = "1.2";
version = "1.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/jinx-1.2.tar";
sha256 = "027r05123bmqwy4h9x8mlxn1m65jv759jqf1rh6gs92bi29slwy8";
url = "https://elpa.gnu.org/packages/jinx-1.3.tar";
sha256 = "0xlfw1sw92qf8bwpw9qnjhkz4ax6n7kcl72ypqm3swmj92jbgsg7";
};
packageRequires = [ compat emacs ];
meta = {
@ -3121,10 +3156,10 @@
elpaBuild {
pname = "lex";
ename = "lex";
version = "1.1";
version = "1.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/lex-1.1.tar";
sha256 = "1i6ri3k2b2nginhnmwy67mdpv5p75jkxjfwbf42wymza8fxzwbb7";
url = "https://elpa.gnu.org/packages/lex-1.2.tar";
sha256 = "03g5lm6gyh4k8l4iccdl9z0qinr46fkpqlwdw0gdfj9d0b782mbs";
};
packageRequires = [];
meta = {
@ -3151,10 +3186,10 @@
elpaBuild {
pname = "llm";
ename = "llm";
version = "0.9.0";
version = "0.9.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/llm-0.9.0.tar";
sha256 = "16sin4l2wgwvzx0a4bjksv2g93ayfcamvjfan6hmflfmc0sd5s7v";
url = "https://elpa.gnu.org/packages/llm-0.9.1.tar";
sha256 = "0vib0zl41fsacc5d79f1l52j2vxnbqc37471b86cxw9rha0clr8m";
};
packageRequires = [ emacs ];
meta = {
@ -3466,10 +3501,10 @@
elpaBuild {
pname = "mmm-mode";
ename = "mmm-mode";
version = "0.5.10";
version = "0.5.11";
src = fetchurl {
url = "https://elpa.gnu.org/packages/mmm-mode-0.5.10.tar";
sha256 = "1ny9gm87qah4qy0iphw2nlhz2pfc87hzzsv58lrxl18gr69qhndi";
url = "https://elpa.gnu.org/packages/mmm-mode-0.5.11.tar";
sha256 = "07pda4bvvcmdwkwh8dnfqgvhkdni2wjgps1094kn1j5c9j254741";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -3880,10 +3915,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "9.6.17";
version = "9.6.19";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-9.6.17.tar";
sha256 = "1gnm9hja2p93l0h5dz86035jh37wkngw7kk4bpgbzjlv74wih1jb";
url = "https://elpa.gnu.org/packages/org-9.6.19.tar";
sha256 = "0ibgw0i7nsn589k0ynifwdp1f3ia6p8369myhjqgmwy392cwrcxg";
};
packageRequires = [ emacs ];
meta = {
@ -3921,6 +3956,21 @@
license = lib.licenses.free;
};
}) {};
org-jami-bot = callPackage ({ elpaBuild, emacs, fetchurl, jami-bot, lib }:
elpaBuild {
pname = "org-jami-bot";
ename = "org-jami-bot";
version = "0.0.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-jami-bot-0.0.5.tar";
sha256 = "0nh0sp1l8hn568n6j11nkl42rm6b3gbjwi3lsf6vanr0lzvrl58r";
};
packageRequires = [ emacs jami-bot ];
meta = {
homepage = "https://elpa.gnu.org/packages/org-jami-bot.html";
license = lib.licenses.free;
};
}) {};
org-modern = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "org-modern";
@ -4071,16 +4121,16 @@
license = lib.licenses.free;
};
}) {};
pabbrev = callPackage ({ elpaBuild, fetchurl, lib }:
pabbrev = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "pabbrev";
ename = "pabbrev";
version = "4.2.2";
version = "4.3.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/pabbrev-4.2.2.tar";
sha256 = "0iydz8yz866krxv1qv32k88w4464xpymh0wxgrxv6nvniwvhvd0s";
url = "https://elpa.gnu.org/packages/pabbrev-4.3.0.tar";
sha256 = "0a54ld80s0r9zrc2kd861p4ii3jzqhxykzcnvi64fhxxg3x2aggx";
};
packageRequires = [];
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/pabbrev.html";
license = lib.licenses.free;
@ -4120,10 +4170,10 @@
elpaBuild {
pname = "parser-generator";
ename = "parser-generator";
version = "0.2.0";
version = "0.2.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/parser-generator-0.2.0.tar";
sha256 = "1pp11qnm09w69vc1sl2629r0ymd2vhnaqj4d4ly1bbwxrwjl2nsv";
url = "https://elpa.gnu.org/packages/parser-generator-0.2.1.tar";
sha256 = "17kqkqz3d29pmn8ydw5kxs2fdgwqh0q31f13hdf1bnw009j24rl9";
};
packageRequires = [ emacs ];
meta = {
@ -4195,10 +4245,10 @@
elpaBuild {
pname = "phps-mode";
ename = "phps-mode";
version = "0.4.47";
version = "0.4.48";
src = fetchurl {
url = "https://elpa.gnu.org/packages/phps-mode-0.4.47.tar";
sha256 = "08zyk00vwi3wrw9shlv1faxcall3xcqlg02hj3yb8cg4071dv922";
url = "https://elpa.gnu.org/packages/phps-mode-0.4.48.tar";
sha256 = "1nm1j0f77afmwhb5cavk60nn4ifnx5qaycdy0c7qj8w3vdhyn3da";
};
packageRequires = [ emacs ];
meta = {
@ -4521,6 +4571,21 @@
license = lib.licenses.free;
};
}) {};
rcirc-sqlite = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "rcirc-sqlite";
ename = "rcirc-sqlite";
version = "0.1.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/rcirc-sqlite-0.1.3.tar";
sha256 = "1pwxkw6dzwbg5g3rxilpp6iy3mzxgpn0mw59i3dcx25hdyizqhip";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/rcirc-sqlite.html";
license = lib.licenses.free;
};
}) {};
realgud = callPackage ({ elpaBuild
, emacs
, fetchurl
@ -5500,10 +5565,10 @@
elpaBuild {
pname = "tempel";
ename = "tempel";
version = "1.0";
version = "1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/tempel-1.0.tar";
sha256 = "0k9802fby7yh5kz6slkfzpyvfa0fvs3hcfni61l2bic8pfrdxwl7";
url = "https://elpa.gnu.org/packages/tempel-1.1.tar";
sha256 = "1780dgyfj569vxzzg8gqky9953fzw8x5kzy2l05vl7my06nyk46i";
};
packageRequires = [ compat emacs ];
meta = {

109
pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
View file

@ -182,6 +182,21 @@
license = lib.licenses.free;
};
}) {};
base32 = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "base32";
ename = "base32";
version = "1.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/base32-1.0.tar";
sha256 = "02n227xwg621zh4na5lx8xh5q6zldq0hwwfzc4wkgfg2jb83n4g8";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/base32.html";
license = lib.licenses.free;
};
}) {};
bash-completion = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "bash-completion";
@ -400,10 +415,10 @@
elpaBuild {
pname = "clojure-ts-mode";
ename = "clojure-ts-mode";
version = "0.2.0";
version = "0.2.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/clojure-ts-mode-0.2.0.tar";
sha256 = "1jb6n84pk2ybrihh1s472q77pmnn288p4bzvhga0sxxqg88ial2p";
url = "https://elpa.nongnu.org/nongnu/clojure-ts-mode-0.2.2.tar";
sha256 = "19dskc53dx183kcb7p5qx41qsjsy1mqi46zrdfc1znl7rdknhvl7";
};
packageRequires = [ emacs ];
meta = {
@ -727,10 +742,10 @@
elpaBuild {
pname = "elpher";
ename = "elpher";
version = "3.5.0";
version = "3.5.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/elpher-3.5.0.tar";
sha256 = "10b4s3anbm4afs5i7rkv9qm5f5y9lzyj9dzajb1x654df4l0m4w4";
url = "https://elpa.nongnu.org/nongnu/elpher-3.5.1.tar";
sha256 = "0687npypihavghz9bjs8f6h10awjgjv5fdd11dmh43p1krhrga2w";
};
packageRequires = [ emacs ];
meta = {
@ -910,10 +925,10 @@
elpaBuild {
pname = "evil-matchit";
ename = "evil-matchit";
version = "3.0.2";
version = "3.0.4";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/evil-matchit-3.0.2.tar";
sha256 = "02sim8hkclkp7lzj3hybjky75lyvf452wc7hmbkx1rjb3cx9j5m5";
url = "https://elpa.nongnu.org/nongnu/evil-matchit-3.0.4.tar";
sha256 = "1bc14r8cl0sd4ygj5didhzh74alzafc6rjk9fm4zgylkbcxal8nl";
};
packageRequires = [ emacs ];
meta = {
@ -1049,6 +1064,21 @@
license = lib.licenses.free;
};
}) {};
flycheck = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "flycheck";
ename = "flycheck";
version = "34.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/flycheck-34.1.tar";
sha256 = "1yyvlhv45gvjmv1rja16j12gv2afiaf4r852mcw3l97h6f40h4x9";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/flycheck.html";
license = lib.licenses.free;
};
}) {};
flymake-guile = callPackage ({ elpaBuild
, emacs
, fetchurl
@ -1662,10 +1692,10 @@
elpaBuild {
pname = "htmlize";
ename = "htmlize";
version = "1.57";
version = "1.56";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/htmlize-1.57.tar";
sha256 = "1k4maqkcicvpl4yxkx6ha98x36ppcfdp2clcdg4fjx945yamx80s";
url = "https://elpa.nongnu.org/nongnu/htmlize-1.56.tar";
sha256 = "1xdy6lbqm75qlywbr08sbjfa20mphylswbjihk1iiblyj8gbp0p6";
};
packageRequires = [];
meta = {
@ -2075,10 +2105,10 @@
elpaBuild {
pname = "meow";
ename = "meow";
version = "1.4.4";
version = "1.4.5";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/meow-1.4.4.tar";
sha256 = "013nmc0jcvwfh6s1l59kld8393ld4sy5icbah9hzd0chj6l72mgh";
url = "https://elpa.nongnu.org/nongnu/meow-1.4.5.tar";
sha256 = "0r1rmhmwgxl7q2rvjf8byc0ass00k3m87sn6sw9chip5cgd5g6gm";
};
packageRequires = [ emacs ];
meta = {
@ -2652,10 +2682,10 @@
elpaBuild {
pname = "racket-mode";
ename = "racket-mode";
version = "1.0.20240130.151349";
version = "1.0.20240219.135847";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240130.151349.tar";
sha256 = "0hbcnr4x1931c95hpgfdny92vk8m688p8yc0ng41yv1safa0w4pl";
url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240219.135847.tar";
sha256 = "06g1ci7kq8fxjh65qwwnh530xvvh6pr9ha52f7xmbjf56iifn1da";
};
packageRequires = [ emacs ];
meta = {
@ -2802,16 +2832,16 @@
license = lib.licenses.free;
};
}) {};
scad-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
scad-mode = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "scad-mode";
ename = "scad-mode";
version = "93.2";
version = "93.3";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/scad-mode-93.2.tar";
sha256 = "0gp7ghmch5wkbby0avmlgj5kajiccbarjrx1szh9r3f3gi1ahawj";
url = "https://elpa.nongnu.org/nongnu/scad-mode-93.3.tar";
sha256 = "0gh2s0hv8i100xsq656vfxy3586162dv1bz9gcj4aha3kk4ar3vk";
};
packageRequires = [ emacs ];
packageRequires = [ compat emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/scad-mode.html";
license = lib.licenses.free;
@ -3213,6 +3243,21 @@
license = lib.licenses.free;
};
}) {};
totp-auth = callPackage ({ base32, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "totp-auth";
ename = "totp-auth";
version = "1.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/totp-auth-1.0.tar";
sha256 = "0j5rr026n57crizrw4q4yi7q6psdw5qzfcby4slkrlz4yg58mpk3";
};
packageRequires = [ base32 emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/totp-auth.html";
license = lib.licenses.free;
};
}) {};
treeview = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "treeview";
@ -3337,10 +3382,10 @@
elpaBuild {
pname = "visual-fill-column";
ename = "visual-fill-column";
version = "2.5.1";
version = "2.6.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.5.1.tar";
sha256 = "1q2cimrcr4knh716cdnhs8nspk08w8x7bsbhx69s9hpzgr7mjq58";
url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.6.0.tar";
sha256 = "1gpjby6g9wq8p25q1a35hr56nfb4sbcdrf0bjxidh1diw5g5saw4";
};
packageRequires = [ emacs ];
meta = {
@ -3352,10 +3397,10 @@
elpaBuild {
pname = "web-mode";
ename = "web-mode";
version = "17.3.17";
version = "17.3.18";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.17.tar";
sha256 = "0a9qsffj2451ccb2gvimkwa0qp9m2n5m70zb6bzjndqgq18n7rfb";
url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.18.tar";
sha256 = "18ylzq12gsayp3cmd8qjdqsnyiymjd95ffqs3xcyva6sl8d41hmy";
};
packageRequires = [ emacs ];
meta = {
@ -3515,10 +3560,10 @@
elpaBuild {
pname = "xah-fly-keys";
ename = "xah-fly-keys";
version = "24.20.20240120121202";
version = "24.21.20240220095736";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.20.20240120121202.tar";
sha256 = "0v3qfn3jqq7jcbpxjajj8q51r71lf3pfmw5gddd38022szrw6ca6";
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.21.20240220095736.tar";
sha256 = "04ra1m9mwhz3zh0776gbzfn4kn0yxgbfbh1hq78r2zxggvpjfikv";
};
packageRequires = [ emacs ];
meta = {

3130
pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
View file

File diff suppressed because it is too large Load diff

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

@ -10773,6 +10773,18 @@ final: prev:
meta.homepage = "https://github.com/tjdevries/train.nvim/";
};
transparent-nvim = buildVimPlugin {
pname = "transparent.nvim";
version = "2023-11-12";
src = fetchFromGitHub {
owner = "xiyaowong";
repo = "transparent.nvim";
rev = "fd35a46f4b7c1b244249266bdcb2da3814f01724";
sha256 = "sha256-wT+7rmp08r0XYGp+MhjJX8dsFTar8+nf10CV9OdkOSk=";
};
meta.homepage = "https://github.com/xiyaowong/transparent.nvim";
};
treesj = buildVimPlugin {
pname = "treesj";
version = "2024-02-09";

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

@ -905,6 +905,7 @@ https://github.com/akinsho/toggleterm.nvim/,,
https://github.com/folke/tokyonight.nvim/,,
https://github.com/markonm/traces.vim/,,
https://github.com/tjdevries/train.nvim/,,
https://github.com/xiyaowong/transparent.nvim/,HEAD,
https://github.com/Wansmer/treesj/,main,
https://github.com/tremor-rs/tremor-vim/,,
https://github.com/cappyzawa/trim.nvim/,,

8
pkgs/applications/editors/vscode/extensions/default.nix
View file

@ -4323,11 +4323,15 @@ let
mktplcRef = {
name = "markdown-all-in-one";
publisher = "yzhang";
version = "3.5.1";
sha256 = "sha256-ZyvkRp0QTjoMEXRGHzp3udGngYcU9EkTCvx8o2CEaBE=";
version = "3.6.2";
sha256 = "1n9d3qh7vypcsfygfr5rif9krhykbmbcgf41mcjwgjrf899f11h4";
};
meta = {
description = "All you need to write Markdown (keyboard shortcuts, table of contents, auto preview and more)";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=yzhang.markdown-all-in-one";
homepage = "https://github.com/yzhang-gh/vscode-markdown";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.raroh73 ];
};
};

16
pkgs/applications/editors/vscode/vscode.nix
View file

@ -30,21 +30,21 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "17fzqq44p7ix4ihkg8nq582njjy96a8zz8vz9hl62hdxxg3llgfg";
x86_64-darwin = "12vbkzv2l02wifcjd7amq583vlv0iqixpa2kf5swhl0arww1viqa";
aarch64-linux = "1myv8zy2cycsmnp8xhjbm2lpcad3hj9zh79ywcinc50yncwj6wdl";
aarch64-darwin = "0vvbwcbxf0fmcfyk2y231qd8lxaj869ap865zps6wcdjqr5wnbdq";
armv7l-linux = "04gy6ls3gnbdcg4998widy9b9h04rx1gzp6iml6pi73li1cmfawz";
x86_64-linux = "1sasd183cf264a8am93ck35b485p5vl2bfzzxzpf65rvcmvhn7fh";
x86_64-darwin = "01nfh5izc53sxfw27i0byn0l6q4qwp7y9zs0g9a3rx3qglm47qr8";
aarch64-linux = "183583xnjv18ksy8bbkjfkxx3zy22anj14hi8bavhgix9bzk3wrb";
aarch64-darwin = "1whjm4z922qq1yh4vliiab777n0la6sc45n2qf7q9pvxjj1f83wj";
armv7l-linux = "171diqiv9yb9c5klihndsgk7qp7y80cc6bq8r4hnw1b834k0ywfp";
}.${system} or throwSystem;
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.86.2";
version = "1.87.1";
pname = "vscode" + lib.optionalString isInsiders "-insiders";
# This is used for VS Code - Remote SSH test
rev = "903b1e9d8990623e3d7da1df3d33db3e42d80eda";
rev = "1e790d77f81672c49be070e04474901747115651";
executableName = "code" + lib.optionalString isInsiders "-insiders";
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@ -68,7 +68,7 @@ in
src = fetchurl {
name = "vscode-server-${rev}.tar.gz";
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
sha256 = "06jv2kzxy7p7y7294c4sq6fk6slwk4gfw6jqh79avnq0riy669gv";
sha256 = "19k2n1zlfvy1dczrslrdzhvpa27nc0mcg2x4bmp5yvvv5bpv3bbd";
};
};

4
pkgs/applications/gis/grass/default.nix
View file

@ -34,13 +34,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "grass";
version = "8.3.1";
version = "8.3.2";
src = fetchFromGitHub {
owner = "OSGeo";
repo = "grass";
rev = finalAttrs.version;
hash = "sha256-SoJq4SuDYImfkM2e991s47vYusrmnrQaXn7p3xwyOOQ=";
hash = "sha256-loeg+7h676d2WdYOMcJFyzeEZcxjBynir6Hz0J/GBns=";
};
nativeBuildInputs = [

5
pkgs/applications/graphics/ImageMagick/default.nix
View file

@ -25,6 +25,7 @@
, libwebpSupport ? !stdenv.hostPlatform.isMinGW, libwebp
, libheifSupport ? true, libheif
, potrace
, coreutils
, curl
, ApplicationServices
, Foundation
@ -64,6 +65,10 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true;
configureFlags = [
# specify delegates explicitly otherwise `convert` will invoke the build
# coreutils for filetypes it doesn't natively support.
"MVDelegate=${lib.getExe' coreutils "mv"}"
"RMDelegate=${lib.getExe' coreutils "rm"}"
"--with-frozenpaths"
(lib.withFeatureAs (arch != null) "gcc-arch" arch)
(lib.withFeature librsvgSupport "rsvg")

4
pkgs/applications/graphics/graphicsmagick/default.nix
View file

@ -1,6 +1,7 @@
{ lib, stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript
, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11
, libwebp, quantumdepth ? 8, fixDarwinDylibNames, nukeReferences
, coreutils
, runCommand
, graphicsmagick # for passthru.tests
}:
@ -19,6 +20,9 @@ stdenv.mkDerivation rec {
];
configureFlags = [
# specify delegates explicitly otherwise `gm` will invoke the build
# coreutils for filetypes it doesn't natively support.
"MVDelegate=${lib.getExe' coreutils "mv"}"
"--enable-shared"
"--with-frozenpaths"
"--with-quantum-depth=${toString quantumdepth}"

68
pkgs/applications/graphics/nomacs/default.nix
View file

@ -1,68 +0,0 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, wrapQtAppsHook
, qtbase
, qttools
, qtsvg
, qtimageformats
, exiv2
, opencv4
, libraw
, libtiff
, quazip
}:
stdenv.mkDerivation rec {
pname = "nomacs";
version = "3.17.2287";
src = fetchFromGitHub {
owner = "nomacs";
repo = "nomacs";
rev = version;
hash = "sha256-OwiMB6O4+WuAt87sRbD1Qby3U7igqgCgddiWs3a4j3k=";
};
setSourceRoot = ''
sourceRoot=$(echo */ImageLounge)
'';
nativeBuildInputs = [cmake
pkg-config
wrapQtAppsHook];
buildInputs = [qtbase
qttools
qtsvg
qtimageformats
exiv2
opencv4
libraw
libtiff
quazip];
cmakeFlags = ["-DENABLE_OPENCV=ON"
"-DENABLE_RAW=ON"
"-DENABLE_TIFF=ON"
"-DENABLE_QUAZIP=ON"
"-DENABLE_TRANSLATIONS=ON"
"-DUSE_SYSTEM_QUAZIP=ON"];
postInstall = lib.optionalString stdenv.isDarwin ''
mkdir -p $out/lib
mv $out/libnomacsCore.dylib $out/lib/libnomacsCore.dylib
'';
meta = with lib; {
homepage = "https://nomacs.org";
description = "Qt-based image viewer";
maintainers = with lib.maintainers; [ mindavi ];
license = licenses.gpl3Plus;
inherit (qtbase.meta) platforms;
};
}

20
pkgs/applications/misc/dialect/default.nix
View file

@ -13,24 +13,33 @@
, gobject-introspection
, gst_all_1
, libsoup_3
, glib-networking
, libadwaita
, nix-update-script
}:
python3.pkgs.buildPythonApplication rec {
pname = "dialect";
version = "2.1.1";
version = "2.2.0";
format = "other";
src = fetchFromGitHub {
owner = "dialect-app";
repo = pname;
repo = "dialect";
rev = version;
fetchSubmodules = true;
hash = "sha256-ytZnolQTOj0dpv+ouN1N7sypr1LxSN/Uhp7qP0ZOTHE=";
hash = "sha256-+0qA+jFYrK3K3mJNvxTvnT/3q4c51H0KgEMjzvV34Zs=";
};
# FIXME: remove in next release
postPatch = ''
substituteInPlace dialect/providers/lingva.py \
--replace-fail 'lingva.ml' 'lingva.dialectapp.org'
substituteInPlace dialect/providers/libretrans.py \
--replace-fail 'libretranslate.de' 'lt.dialectapp.org'
'';
nativeBuildInputs = [
appstream-glib
blueprint-compiler
@ -47,7 +56,9 @@ python3.pkgs.buildPythonApplication rec {
glib
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
libsoup_3
glib-networking
libadwaita
];
@ -55,6 +66,7 @@ python3.pkgs.buildPythonApplication rec {
dbus-python
gtts
pygobject3
beautifulsoup4
];
# Prevent double wrapping, let the Python wrapper use the args in preFixup.
@ -74,7 +86,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
homepage = "https://github.com/dialect-app/dialect";
description = "A translation app for GNOME";
maintainers = with maintainers; [ linsui ];
maintainers = with maintainers; [ aleksana ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
mainProgram = "dialect";

4
pkgs/applications/misc/organicmaps/default.nix
View file

@ -29,13 +29,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "organicmaps";
version = "2024.02.06-11";
version = "2024.03.05-4";
src = fetchFromGitHub {
owner = "organicmaps";
repo = "organicmaps";
rev = "${version}-android";
hash = "sha256-/taXiJvVP2WCg/F6I6WiZuPKl+Mhwvex/1JNXqrs0mA=";
hash = "sha256-vPpf7pZOkVjRlFcGULcxGy4eBLZRmqcINSFiNh8DUHI=";
fetchSubmodules = true;
};

4
pkgs/applications/misc/revanced-cli/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "revanced-cli";
version = "4.4.0";
version = "4.4.1";
src = fetchurl {
url = "https://github.com/revanced/revanced-cli/releases/download/v${version}/revanced-cli-${version}-all.jar";
hash = "sha256-ydP9iPClWNKlbBhsNC1bzqfJYRyit1WsxIgwbQQbgi8=";
hash = "sha256-8uhKbEA3H8GY4ydefkLXAqCZdDIZANs3gZQGYyCUdOM=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/applications/misc/wmenu/default.nix
View file

@ -15,7 +15,7 @@
stdenv.mkDerivation rec {
pname = "wmenu";
version = "0.1.6";
version = "0.1.7";
strictDeps = true;
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
owner = "~adnano";
repo = "wmenu";
rev = version;
hash = "sha256-Xsnf7T39up6E5kzV37sM9j3PpA2eqxItbGt+tOfjsjE=";
hash = "sha256-9do7zL7yaZuqVjastySwjsByo5ja+KUP3590VjIyVnI=";
};
nativeBuildInputs = [ pkg-config meson ninja ];

4
pkgs/applications/networking/browsers/brave/default.nix
View file

@ -94,11 +94,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
version = "1.63.165";
version = "1.63.169";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
hash = "sha256-UyzOV6sUv7WdwN31TIg35HGchrUSXnvzk3Aba/d8dJc=";
hash = "sha256-K8zbsxwKcYuhW7m7ijrAOeHHpC2AhM4Kr2M7SwGlV70=";
};
dontConfigure = true;

6
pkgs/applications/networking/browsers/vivaldi/default.nix
View file

@ -24,7 +24,7 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "6.5.3206.63";
version = "6.6.3271.48";
suffix = {
aarch64-linux = "arm64";
@ -34,8 +34,8 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
hash = {
aarch64-linux = "sha256-MyKTihImCd1/4UwnC/GqyeQcYnJNvKW5UfIIRN45r8E=";
x86_64-linux = "sha256-RbGoOKQyAaNY+y+jCT+r7GI9vymTT9kPDrwl9/bhaNw=";
aarch64-linux = "sha256-NeYyPgIioURSDomwZq7Cc08+A/XnQEk6yEiag7YxQO0=";
x86_64-linux = "sha256-/zBvH0IQZJr8PKWkIznPRxNLMxQoxVOnDrAw+0BWOEM=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};

6
pkgs/applications/networking/cluster/cmctl/default.nix
View file

@ -8,18 +8,18 @@
buildGoModule rec {
pname = "cmctl";
version = "1.14.3";
version = "1.14.4";
src = fetchFromGitHub {
owner = "cert-manager";
repo = "cert-manager";
rev = "v${version}";
hash = "sha256-CPHSWGM8zq+Sg0tqdm9kmIyBFpVf1ot40Ud7Mpe1sNI=";
hash = "sha256-iUXN+8ueCxGsFnwhC2WjrQQSXV7TGUR80xaKqjxcC6o=";
};
sourceRoot = "${src.name}/cmd/ctl";
vendorHash = "sha256-CBX/U9v2ubmPveXUeWbogHDyWVAtU0pyOWAlnRsMs4c=";
vendorHash = "sha256-ViKsqqM6l/tQSGgj8Yt2L57x+eE1Pd3xCVPuWpIjWOQ=";
ldflags = [
"-s"

12
pkgs/applications/networking/cluster/k3s/1_28/versions.nix
View file

@ -1,13 +1,13 @@
{
k3sVersion = "1.28.6+k3s2";
k3sCommit = "c9f49a3b06cd7ebe793f8cc1dcd0293168e743d9";
k3sRepoSha256 = "0vz5976q58v9x6g1qz6kz3xksgf8gm1f727ccckmpbyxbhw75zsa";
k3sVendorHash = "sha256-HG4x3N/F5qCFpLxGrUWPkBHHqY7WBRDWN7DNyAcJwyI=";
k3sVersion = "1.28.7+k3s1";
k3sCommit = "051b14b248655896fdfd7ba6c93db6182cde7431";
k3sRepoSha256 = "1136h9xwg1p26lh3m63a4c55qsahla0d0xvlr09qqbhqiyv7fn0b";
k3sVendorHash = "sha256-FzalTtDleFIN12lvn0k7+nWchr6y/Ztcxs0bs2E4UO0=";
chartVersions = import ./chart-versions.nix;
k3sRootVersion = "0.12.2";
k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";
k3sCNIVersion = "1.3.0-k3s1";
k3sCNISha256 = "0zma9g4wvdnhs9igs03xlx15bk2nq56j73zns9xgqmfiixd9c9av";
k3sCNIVersion = "1.4.0-k3s2";
k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa";
containerdVersion = "1.7.11-k3s2";
containerdSha256 = "0279sil02wz7310xhrgmdbc0r2qibj9lafy0i9k24jdrh74icmib";
criCtlVersion = "1.26.0-rc.0-k3s1";

12
pkgs/applications/networking/cluster/k3s/1_29/versions.nix
View file

@ -1,13 +1,13 @@
{
k3sVersion = "1.29.1+k3s2";
k3sCommit = "57482a1c1bb9c67b5f893418a114edca1004258e";
k3sRepoSha256 = "0pvab3dd6dzgk1zgra4jmdwba5b8xssfjr3mihwq1h0c5bxf1cza";
k3sVendorHash = "sha256-EkRbdUoYpK7M+Wbc2Cf37bOwdwPB6/xLxULO7Bkpt5c=";
k3sVersion = "1.29.2+k3s1";
k3sCommit = "86f102134ed6b1669badd3bfb6420f73e8f015d0";
k3sRepoSha256 = "0gd35ficik92x4svcg4mlw1v6vms7sfw1asmdahh16li4j27wdz5";
k3sVendorHash = "sha256-KG795CA3l+iCdJlYMNTQLmv3YqmtM2juacbsmH7B//M=";
chartVersions = import ./chart-versions.nix;
k3sRootVersion = "0.12.2";
k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k";
k3sCNIVersion = "1.3.0-k3s1";
k3sCNISha256 = "0zma9g4wvdnhs9igs03xlx15bk2nq56j73zns9xgqmfiixd9c9av";
k3sCNIVersion = "1.4.0-k3s2";
k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa";
containerdVersion = "1.7.11-k3s2";
containerdSha256 = "0279sil02wz7310xhrgmdbc0r2qibj9lafy0i9k24jdrh74icmib";
criCtlVersion = "1.29.0-k3s1";

4
pkgs/applications/networking/flexget/default.nix
View file

@ -6,7 +6,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "flexget";
version = "3.11.19";
version = "3.11.21";
pyproject = true;
# Fetch from GitHub in order to use `requirements.in`
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "Flexget";
repo = "Flexget";
rev = "refs/tags/v${version}";
hash = "sha256-XqZPhjuk3f9EbDTu+iX2U6uOXTn3rFdYjQNx5Prte88=";
hash = "sha256-KSOuNH+y7+mCK8XfGxiyn+C1H6g9a/ej96k8KG/EE9k=";
};
postPatch = ''

6
pkgs/applications/networking/instant-messengers/beeper/default.nix
View file

@ -11,11 +11,11 @@
}:
let
pname = "beeper";
version = "3.98.16";
version = "3.99.22";
name = "${pname}-${version}";
src = fetchurl {
url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.98.16-build-240228llcputn9l-x86_64.AppImage";
hash = "sha256-CjtlE/owx7emzGDdOAw6pSlAuNbUspm1YP+kxm6Jrt8=";
url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.99.22-build-240307lufv3wsra-x86_64.AppImage";
hash = "sha256-T3MABc11rWRjCU+4fvbpYDVq4XjSVfEeBrS03ITw8x8=";
};
appimage = appimageTools.wrapType2 {
inherit version pname src;

74
pkgs/applications/networking/instant-messengers/ricochet/default.nix
View file

@ -1,74 +0,0 @@
{ mkDerivation
, lib
, fetchFromGitHub
, pkg-config
, makeDesktopItem
, qtbase
, qttools
, qtmultimedia
, qtquickcontrols
, openssl
, protobuf
, qmake
}:
mkDerivation rec {
pname = "ricochet";
version = "1.1.4";
src = fetchFromGitHub {
owner = "ricochet-im";
repo = "ricochet";
rev = "v${version}";
sha256 = "sha256-CGVTHa0Hqj90WvB6ZbA156DVgzv/R7blsU550y2Ai9c=";
};
desktopItem = makeDesktopItem {
name = "ricochet";
exec = "ricochet";
icon = "ricochet";
desktopName = "Ricochet";
genericName = "Ricochet";
comment = meta.description;
categories = [ "Office" "Email" ];
};
buildInputs = [
qtbase
qttools
qtmultimedia
qtquickcontrols
openssl
protobuf
];
nativeBuildInputs = [ pkg-config qmake ];
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags openssl)"
'';
qmakeFlags = [ "DEFINES+=RICOCHET_NO_PORTABLE" ];
installPhase = ''
mkdir -p $out/bin
cp ricochet $out/bin
mkdir -p $out/share/applications
cp $desktopItem/share/applications"/"* $out/share/applications
mkdir -p $out/share/pixmaps
cp icons/ricochet.png $out/share/pixmaps/ricochet.png
'';
# RCC: Error in 'translation/embedded.qrc': Cannot find file 'ricochet_en.qm'
enableParallelBuilding = false;
meta = with lib; {
description = "Anonymous peer-to-peer instant messaging";
homepage = "https://ricochet.im";
license = licenses.bsd3;
maintainers = [ maintainers.codsl maintainers.jgillich maintainers.np ];
platforms = platforms.linux;
};
}

6
pkgs/applications/networking/netmaker/default.nix
View file

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "netmaker";
version = "0.21.2";
version = "0.23.0";
src = fetchFromGitHub {
owner = "gravitl";
repo = pname;
rev = "v${version}";
hash = "sha256-0KyBRIMXGqg4MdTyN3Kw1rVbZ7ULlfW6M9DSfAUQF8A=";
hash = "sha256-M2DY+C0g8G+DjicMeT3Ojn4GzG7vaE1OHKSy7O6T1Kk=";
};
vendorHash = "sha256-B9r+p9kL/8h5qGmJ2WChnU3qKFf9z76YFqn6M2dXsDg=";
vendorHash = "sha256-SUu0OvHCmlssH9HbAaMbiG0gF/ezxgf1n0HBiB/2PTs=";
inherit subPackages;

4
pkgs/applications/networking/remote/dayon/default.nix
View file

@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dayon";
version = "13.0.2";
version = "14.0.0";
src = fetchFromGitHub {
owner = "RetGal";
repo = "dayon";
rev = "v${finalAttrs.version}";
hash = "sha256-sKA50D+VYjfKzdZAppIGfU5uJqrCrZPEsk9EEMBxu3I=";
hash = "sha256-cUaWfOpR0sNq8cRghZVW9mTVhJ5us12/lzucxetiVkg=";
};
nativeBuildInputs = [

4
pkgs/applications/networking/taler/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, curl, gnunet, jansson, libgcrypt, libmicrohttpd_0_9_74
{ lib, stdenv, fetchgit, curl, gnunet, jansson, libgcrypt, libmicrohttpd
, qrencode, libsodium, libtool, libunistring, pkg-config, postgresql
, autoreconfHook, python39, recutils, wget, jq, gettext, texinfo
}:
@ -36,7 +36,7 @@ let
];
buildInputs = [
libgcrypt
libmicrohttpd_0_9_74
libmicrohttpd
jansson
libsodium
postgresql

4
pkgs/applications/office/qownnotes/default.nix
View file

@ -19,14 +19,14 @@
let
pname = "qownnotes";
appname = "QOwnNotes";
version = "24.2.6";
version = "24.3.0";
in
stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";
hash = "sha256-F0AUY82zPDRpV/mBb6kpAdMIImJ2ICwwfIluxh8Z7As=";
hash = "sha256-NIxRXNawzV6adgf7tCYdn1/Nd2ULodOVGt1QwITpO6Q=";
};
nativeBuildInputs = [

4
pkgs/applications/science/chemistry/jmol/default.nix
View file

@ -25,14 +25,14 @@ let
};
in
stdenv.mkDerivation rec {
version = "16.1.53";
version = "16.1.63";
pname = "jmol";
src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
hash = "sha256-GoNcY9/OzRzC3tqdsoVqeG02EWn+thk0BaoWCWLk3sg=";
hash = "sha256-zUX3msosz0LNQJuEUbFgT32Hw0Wq4CgW1iHMkvReysU=";
};
patchPhase = ''

4
pkgs/applications/science/logic/cvc5/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cvc5";
version = "1.1.1";
version = "1.1.2";
src = fetchFromGitHub {
owner = "cvc5";
repo = "cvc5";
rev = "cvc5-${version}";
hash = "sha256-TU2ZG6/9bXRPozvEVUiSWixImY38iavD3huhSU8DbCw=";
hash = "sha256-v+3/2IUslQOySxFDYgTBWJIDnyjbU2RPdpfLcIkEtgQ=";
};
nativeBuildInputs = [ pkg-config cmake flex ];

4
pkgs/applications/terminal-emulators/xterm/default.nix
View file

@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
pname = "xterm";
version = "389";
version = "390";
src = fetchurl {
urls = [
"ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"
"https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"
];
hash = "sha256-HNV2PZTZNw/tENgE6DGgibKs4OenS29W71oWp2a9574=";
hash = "sha256-dRF8PMUXSgnEJe8QbmlATXL17wXgOl2gCq8VeS1vnA8=";
};
strictDeps = true;

4
pkgs/applications/version-management/commitizen/default.nix
View file

@ -11,7 +11,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "commitizen";
version = "3.16.0";
version = "3.18.0";
format = "pyproject";
disabled = python3.pythonOlder "3.8";
@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "commitizen-tools";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-vd8MtkzI7PPow0Ld0NhwbWOUWgSgecAT/DZK0ocUWCw=";
hash = "sha256-5baSXlC+ADHjisZLy4TVDuZ3kqoLwLS7KxYM9jAAzBI=";
};
pythonRelaxDeps = [

4
pkgs/applications/version-management/git-lfs/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "git-lfs";
version = "3.5.0";
version = "3.5.1";
src = fetchFromGitHub {
owner = "git-lfs";
repo = "git-lfs";
rev = "v${version}";
hash = "sha256-iBv9kUaoyH9yEoCZYGYm+gmdjb797hWftzwkRNDNu3k=";
hash = "sha256-xSLXbAvIoY3c341qi89pTrjBZdXh/bPrweJD2O2gkjY=";
};
vendorHash = "sha256-N8HB2qwBxjzfNucftHxmX2W9srCx62pjmkCWzwiCj/I=";

4
pkgs/applications/version-management/git/default.nix
View file

@ -29,7 +29,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
version = "2.43.1";
version = "2.43.2";
svn = subversionClient.override { perlBindings = perlSupport; };
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
in
@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
hash = "sha256-IjTze0U/+ORnLCGtQNQcxzk8mo3N/mQL7HrFtTWPMNI=";
hash = "sha256-9hLBq8Y1V9UK04SYY/yRCWcBOfyZAeV0Rg7HbgURrbk=";
};
outputs = [ "out" ] ++ lib.optional withManual "doc";

8
pkgs/applications/version-management/gitkraken/default.nix
View file

@ -11,24 +11,24 @@ with lib;
let
pname = "gitkraken";
version = "9.12.0";
version = "9.13.0";
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
srcs = {
x86_64-linux = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
hash = "sha256-g2YcNFKt1/YBmEOH3Z5b0MPMMOWBIvXh+V2fzaGgCgQ=";
hash = "sha256-BBTa/MhfwTZ9YUJSGt8KocPn6f7m+W8G9yJr8I4NAtw=";
};
x86_64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
hash = "sha256-yy7BbtguQj/LVM7ivNTcG97XIImQUMQPKwTVDWGvvnQ=";
hash = "sha256-+1N4U5vV8XdHdtPeanjU38c8fzfY0uV0AA6exEe/FzQ=";
};
aarch64-darwin = fetchzip {
url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
hash = "sha256-ihnTzQC7B0TdHZzXmrwcVSfxKvGoBBTdRq8ZJicaVDI=";
hash = "sha256-kNX8ptDL8vvFDhH3bDU24A2xN1D+tgpzsCj/zIGqctE=";
};
};

6
pkgs/applications/version-management/mercurial/default.nix
View file

@ -23,11 +23,11 @@ let
self = python3Packages.buildPythonApplication rec {
pname = "mercurial${lib.optionalString fullBuild "-full"}";
version = "6.6.2";
version = "6.6.3";
src = fetchurl {
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
sha256 = "sha256-y0lNe+fdwvydMXHIiDCvnAKyHHU+PlET3vrJwDc7S2A=";
hash = "sha256-911qSnWCOht9cTpJZ+yi9Zb0ZuWPxrwG1yZCky/X4wc=";
};
format = "other";
@ -37,7 +37,7 @@ let
cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
inherit src;
name = "mercurial-${version}";
sha256 = "sha256-yOysqMrTWDx/ENcJng8Rm338NI9vpuBGH6Yq8B7+MFg=";
sha256 = "sha256-G5tzwoIGOgpVI35rYXDeelnBgTbAiq7BDcXCHQzqSrs=";
sourceRoot = "mercurial-${version}/rust";
} else null;
cargoRoot = if rustSupport then "rust" else null;

12
pkgs/applications/video/avidemux/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, cmake, pkg-config
{ stdenv, lib, fetchurl, fetchpatch, cmake, pkg-config
, zlib, gettext, libvdpau, libva, libXv, sqlite
, yasm, freetype, fontconfig, fribidi
, makeWrapper, libXext, libGLU, qttools, qtbase, wrapQtAppsHook
@ -37,6 +37,16 @@ stdenv.mkDerivation rec {
./bootstrap_logging.patch
];
postPatch = ''
cp ${fetchpatch {
# Backport fix for binutils-2.41.
name = "binutils-2.41.patch";
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/effadce6c756247ea8bae32dc13bb3e6f464f0eb";
hash = "sha256-s9PcYbt0mFb2wvgMcFL1J+2OS6Sxyd2wYkGzLr2qd9M=";
stripLen = 1;
}} avidemux_core/ffmpeg_package/patches/
'';
nativeBuildInputs =
[ yasm cmake pkg-config makeWrapper ]
++ lib.optional withQT wrapQtAppsHook;

12
pkgs/applications/video/kodi/unwrapped.nix
View file

@ -1,4 +1,6 @@
{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper
{ stdenv, lib, fetchFromGitHub
, fetchpatch
, autoconf, automake, libtool, makeWrapper
, pkg-config, cmake, yasm, python3Packages
, libxcrypt, libgcrypt, libgpg-error, libunistring
, boost, avahi, lame
@ -63,6 +65,14 @@ let
rev = "${version}-${rel}-Alpha1";
sha256 = "sha256-EQHmmWnDw+/udKYq7Nrf00nL7I5XWUtmzdauDryfTII=";
};
patches = [
# Backport fix for binutils-2.41.
(fetchpatch {
name = "binutils-2.41.patch";
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/effadce6c756247ea8bae32dc13bb3e6f464f0eb";
hash = "sha256-vlBUMJ1bORQHRNpuzc5iXsTWwS/CN5BmGIA8g7H7mJE=";
})
];
preConfigure = ''
cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} .
sed -i 's/ --cpu=''${CPU}//' CMakeLists.txt

8
pkgs/applications/video/mythtv/default.nix
View file

@ -28,6 +28,14 @@ mkDerivation rec {
stripLen = 1;
hash = "sha256-JfRME00YNNjl6SKs1HBa0wBa/lR/Rt3zbQtWhsC36JM=";
})
# Bachport the build against binutils-2.41
(fetchpatch {
name = "binutils-2.41.patch";
url = "https://github.com/MythTV/mythtv/commit/f9f9bba62ee2743c816cb2b9634b6b4397e5e2e3.patch";
stripLen = 1;
hash = "sha256-IcXgBtfqPZ42inYFe7l8mWvKUV13S/YEQAHcOFaDivI=";
})
];
setSourceRoot = "sourceRoot=$(echo */mythtv)";

25
pkgs/applications/video/shotcut/default.nix
View file

@ -16,17 +16,18 @@
, qtmultimedia
, qtcharts
, cmake
, Cocoa
, gitUpdater
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "shotcut";
version = "24.02.19";
version = "24.02.29";
src = fetchFromGitHub {
owner = "mltframework";
repo = "shotcut";
rev = "v${version}";
hash = "sha256-fjm2gqbuLKj6YyAZGgbfWUd+JOM9/Fhvpfz0E+TaqY0=";
rev = "v${finalAttrs.version}";
hash = "sha256-PHpVquqC0MT7WNoWcdB9WTz4ZiSK4/f4oD5PH1gWBnw=";
};
nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ];
@ -41,11 +42,13 @@ stdenv.mkDerivation rec {
qttools
qtmultimedia
qtcharts
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
Cocoa
];
env.NIX_CFLAGS_COMPILE = "-DSHOTCUT_NOUPGRADE";
cmakeFlags = [
"-DSHOTCUT_VERSION=${version}"
"-DSHOTCUT_VERSION=${finalAttrs.version}"
];
patches = [
@ -55,9 +58,15 @@ stdenv.mkDerivation rec {
qtWrapperArgs = [
"--set FREI0R_PATH ${frei0r}/lib/frei0r-1"
"--set LADSPA_PATH ${ladspaPlugins}/lib/ladspa"
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [jack1 SDL2]}"
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([SDL2] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [jack1])}"
];
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir $out/Applications $out/bin
mv $out/Shotcut.app $out/Applications/Shotcut.app
ln -s $out/Applications/Shotcut.app/Contents/MacOS/Shotcut $out/bin/shotcut
'';
passthru.updateScript = gitUpdater {
rev-prefix = "v";
};
@ -76,7 +85,7 @@ stdenv.mkDerivation rec {
homepage = "https://shotcut.org";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ goibhniu woffs peti ];
platforms = platforms.linux;
platforms = platforms.unix;
mainProgram = "shotcut";
};
}
})

6
pkgs/applications/virtualization/docker/compose.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-compose";
version = "2.24.6";
version = "2.24.7";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
hash = "sha256-CrQM9fTXGI3uGAk2yk/+enBr9LuMhNFLFBYHT78lNWc=";
hash = "sha256-r7V9ZqUbtK4PG/NfDTbDljP+xaPJBXZSp1rGY/kgUTA=";
};
postPatch = ''
@ -16,7 +16,7 @@ buildGoModule rec {
rm -rf e2e/
'';
vendorHash = "sha256-0YZ36fouuVjj12a7d9F8OkJAmtLIHo0bZhcmOYO5Ki4=";
vendorHash = "sha256-Ec2JRCQvdC2VzkK29GyKS2DTrfHgv4wJc/50fbLVKEY=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];

41
pkgs/applications/virtualization/vmware-workstation/default.nix
View file

@ -32,14 +32,14 @@
let
# macOS - versions
fusionVersion = "13.0.2";
fusionBuild = "21581413";
unlockerVersion = "3.0.4";
fusionVersion = "13.5.1";
fusionBuild = "23298085";
unlockerVersion = "3.0.5";
# macOS - ISOs
darwinIsoSrc = fetchurl {
url = "https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/${fusionVersion}/${fusionBuild}/universal/core/com.vmware.fusion.zip.tar";
sha256 = "sha256-8IaEQn1+e+WtjRX9Aopbi6tVTNt9RVyGrpaARtVH6j0=";
sha256 = "sha256-bn6hoicby2YVj1pZTBzBhabNhKefzVQTm5vIrdTO2K4=";
};
# macOS - Unlocker
@ -47,7 +47,7 @@ let
owner = "paolo-projects";
repo = "unlocker";
rev = "${unlockerVersion}";
sha256 = "sha256-kpvrRiiygfjQni8z+ju9mPBVqy2gs08Wj4cHxE9eorQ=";
sha256 = "sha256-JSEW1gqQuLGRkathlwZU/TnG6dL/xWKW4//SfE+kO0A=";
};
gdbm3 = gdbm.overrideAttrs (old: rec {
@ -71,8 +71,8 @@ let
in
stdenv.mkDerivation rec {
pname = "vmware-workstation";
version = "17.0.2";
build = "21581411";
version = "17.5.1";
build = "23298084";
buildInputs = [
libxslt
@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://download3.vmware.com/software/WKST-${builtins.replaceStrings ["."] [""] version}-LX/VMware-Workstation-Full-${version}-${build}.x86_64.bundle";
sha256 = "sha256-9ONh+uvL4YGNGxbpPX1mWO8P4oKPUpwzTsKKBJNxHMc=";
sha256 = "sha256-qmC3zvKoes77z3x6UkLHsJ17kQrL1a/rxe9mF+UMdJY=";
};
unpackPhase = ''
@ -255,18 +255,16 @@ stdenv.mkDerivation rec {
unpacked="unpacked/vmware-network-editor"
cp -r $unpacked/lib $out/lib/vmware/
## VMware Tools + Virtual Printer
echo "Installing VMware Tools + Virtual Printer"
## VMware Tools
echo "Installing VMware Tools"
mkdir -p $out/lib/vmware/isoimages/
cp unpacked/vmware-tools-linuxPreGlibc25/linuxPreGlibc25.iso \
unpacked/vmware-tools-windows/windows.iso \
unpacked/vmware-tools-winPreVista/winPreVista.iso \
unpacked/vmware-virtual-printer/VirtualPrinter-Linux.iso \
unpacked/vmware-virtual-printer/VirtualPrinter-Windows.iso \
unpacked/vmware-tools-winPre2k/winPre2k.iso \
unpacked/vmware-tools-linux/linux.iso \
cp unpacked/vmware-tools-linux/linux.iso \
unpacked/vmware-tools-linuxPreGlibc25/linuxPreGlibc25.iso \
unpacked/vmware-tools-netware/netware.iso \
unpacked/vmware-tools-solaris/solaris.iso \
unpacked/vmware-tools-winPre2k/winPre2k.iso \
unpacked/vmware-tools-winPreVista/winPreVista.iso \
unpacked/vmware-tools-windows/windows.iso \
$out/lib/vmware/isoimages/
${lib.optionalString enableMacOSGuests ''
@ -281,17 +279,10 @@ stdenv.mkDerivation rec {
echo "Installing VMware Player Application"
unpacked="unpacked/vmware-player-app"
cp -r $unpacked/lib/* $out/lib/vmware/
cp -r $unpacked/etc/* $out/etc/
cp -r $unpacked/share/* $out/share/
cp -r $unpacked/bin/* $out/bin/
cp -r $unpacked/doc/* $out/share/doc/ # Licences
mkdir -p $out/etc/thnuclnt
cp -r $unpacked/extras/.thnumod $out/etc/thnuclnt/
mkdir -p $out/lib/cups/filter
cp -r $unpacked/extras/thnucups $out/lib/cups/filter/
for target in "vmplayer" "vmware-enter-serial" "vmware-setup-helper" "licenseTool" "vmware-mount" "vmware-fuseUI" "vmware-app-control" "vmware-zenity"
do
ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/$target
@ -395,6 +386,6 @@ stdenv.mkDerivation rec {
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ cawilliamson deinferno ];
maintainers = with maintainers; [ cawilliamson deinferno vifino ];
};
}

2
pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh
View file

@ -7,5 +7,5 @@ for p in "${params[@]}"; do
done
if $needsTarget; then
extraBefore+=(-target @defaultTarget@)
extraBefore+=(-target @defaultTarget@ @march@)
fi

6
pkgs/build-support/cc-wrapper/add-hardening.sh
View file

@ -32,7 +32,7 @@ if [[ -n "${hardeningEnableMap[fortify3]-}" ]]; then
fi
if (( "${NIX_DEBUG:-0}" >= 1 )); then
declare -a allHardeningFlags=(fortify fortify3 stackprotector pie pic strictoverflow format zerocallusedregs)
declare -a allHardeningFlags=(fortify fortify3 stackprotector pie pic strictoverflow format trivialautovarinit zerocallusedregs)
declare -A hardeningDisableMap=()
# Determine which flags were effectively disabled so we can report below.
@ -106,6 +106,10 @@ for flag in "${!hardeningEnableMap[@]}"; do
hardeningCFlagsBefore+=('-fno-strict-overflow')
fi
;;
trivialautovarinit)
if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling trivialautovarinit >&2; fi
hardeningCFlagsBefore+=('-ftrivial-auto-var-init=pattern')
;;
format)
if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling format >&2; fi
hardeningCFlagsBefore+=('-Wformat' '-Wformat-security' '-Werror=format-security')

9
pkgs/build-support/cc-wrapper/default.nix
View file

@ -604,8 +604,11 @@ stdenv.mkDerivation {
# Always add -march based on cpu in triple. Sometimes there is a
# discrepency (x86_64 vs. x86-64), so we provide an "arch" arg in
# that case.
#
# For clang, this is handled in add-clang-cc-cflags-before.sh
# TODO: aarch64-darwin has mcpu incompatible with gcc
+ optionalString ((targetPlatform ? gcc.arch) && (isClang || !(stdenv.isDarwin && stdenv.isAarch64)) &&
+ optionalString ((targetPlatform ? gcc.arch) && !isClang && !(stdenv.isDarwin && stdenv.isAarch64) &&
isGccArchSupported targetPlatform.gcc.arch) ''
echo "-march=${targetPlatform.gcc.arch}" >> $out/nix-support/cc-cflags-before
''
@ -694,6 +697,10 @@ stdenv.mkDerivation {
## Needs to go after ^ because the for loop eats \n and makes this file an invalid script
##
+ optionalString isClang ''
# Escape twice: once for this script, once for the one it gets substituted into.
export march=${lib.escapeShellArg
(lib.optionalString (targetPlatform ? gcc.arch)
(lib.escapeShellArg "-march=${targetPlatform.gcc.arch}"))}
export defaultTarget=${targetPlatform.config}
substituteAll ${./add-clang-cc-cflags-before.sh} $out/nix-support/add-local-cc-cflags-before.sh
''

17
pkgs/build-support/node/build-npm-package/default.nix
View file

@ -49,6 +49,12 @@
name = "${name}-npm-deps";
hash = npmDepsHash;
}
# Custom npmConfigHook
, npmConfigHook ? null
# Custom npmBuildHook
, npmBuildHook ? null
# Custom npmInstallHook
, npmInstallHook ? null
, ...
} @ args:
@ -57,14 +63,19 @@ let
npmHooks = buildPackages.npmHooks.override {
inherit nodejs;
};
inherit (npmHooks) npmConfigHook npmBuildHook npmInstallHook;
in
stdenv.mkDerivation (args // {
inherit npmDeps npmBuildScript;
nativeBuildInputs = nativeBuildInputs
++ [ nodejs npmConfigHook npmBuildHook npmInstallHook nodejs.python ]
++ [
nodejs
# Prefer passed hooks
(if npmConfigHook != null then npmConfigHook else npmHooks.npmConfigHook)
(if npmBuildHook != null then npmBuildHook else npmHooks.npmBuildHook)
(if npmInstallHook != null then npmInstallHook else npmHooks.npmInstallHook)
nodejs.python
]
++ lib.optionals stdenv.isDarwin [ darwin.cctools ];
buildInputs = buildInputs ++ [ nodejs ];

134
pkgs/build-support/node/import-npm-lock/default.nix Normal file
View file

@ -0,0 +1,134 @@
{ lib
, fetchurl
, stdenv
, callPackages
, runCommand
}:
let
inherit (builtins) match elemAt toJSON removeAttrs;
inherit (lib) importJSON mapAttrs;
matchGitHubReference = match "github(.com)?:.+";
getName = package: package.name or "unknown";
getVersion = package: package.version or "0.0.0";
# Fetch a module from package-lock.json -> packages
fetchModule =
{ module
, npmRoot ? null
}: (
if module ? "resolved" then
(
let
# Parse scheme from URL
mUrl = match "(.+)://(.+)" module.resolved;
scheme = elemAt mUrl 0;
in
(
if mUrl == null then
(
assert npmRoot != null; {
outPath = npmRoot + "/${module.resolved}";
}
)
else if (scheme == "http" || scheme == "https") then
(
fetchurl {
url = module.resolved;
hash = module.integrity;
}
)
else if lib.hasPrefix "git" module.resolved then
(
builtins.fetchGit {
url = module.resolved;
}
)
else throw "Unsupported URL scheme: ${scheme}"
)
)
else null
);
# Manage node_modules outside of the store with hooks
hooks = callPackages ./hooks { };
in
{
importNpmLock =
{ npmRoot ? null
, package ? importJSON (npmRoot + "/package.json")
, packageLock ? importJSON (npmRoot + "/package-lock.json")
, pname ? getName package
, version ? getVersion package
}:
let
mapLockDependencies =
mapAttrs
(name: version: (
# Substitute the constraint with the version of the dependency from the top-level of package-lock.
if (
# if the version is `latest`
version == "latest"
||
# Or if it's a github reference
matchGitHubReference version != null
) then packageLock'.packages.${"node_modules/${name}"}.version
# But not a regular version constraint
else version
));
packageLock' = packageLock // {
packages =
mapAttrs
(_: module:
let
src = fetchModule {
inherit module npmRoot;
};
in
(removeAttrs module [
"link"
"funding"
]) // lib.optionalAttrs (src != null) {
resolved = "file:${src}";
} // lib.optionalAttrs (module ? dependencies) {
dependencies = mapLockDependencies module.dependencies;
} // lib.optionalAttrs (module ? optionalDependencies) {
optionalDependencies = mapLockDependencies module.optionalDependencies;
})
packageLock.packages;
};
mapPackageDependencies = mapAttrs (name: _: packageLock'.packages.${"node_modules/${name}"}.resolved);
# Substitute dependency references in package.json with Nix store paths
packageJSON' = package // lib.optionalAttrs (package ? dependencies) {
dependencies = mapPackageDependencies package.dependencies;
} // lib.optionalAttrs (package ? devDependencies) {
devDependencies = mapPackageDependencies package.devDependencies;
};
pname = package.name or "unknown";
in
runCommand "${pname}-${version}-sources"
{
inherit pname version;
passAsFile = [ "package" "packageLock" ];
package = toJSON packageJSON';
packageLock = toJSON packageLock';
} ''
mkdir $out
cp "$packagePath" $out/package.json
cp "$packageLockPath" $out/package-lock.json
'';
inherit hooks;
inherit (hooks) npmConfigHook;
__functor = self: self.importNpmLock;
}

52
pkgs/build-support/node/import-npm-lock/hooks/canonicalize-symlinks.js Normal file
View file

@ -0,0 +1,52 @@
#!/usr/bin/env node
const fs = require("fs");
const path = require("path");
// When installing files rewritten to the Nix store with npm
// npm writes the symlinks relative to the build directory.
//
// This makes relocating node_modules tricky when refering to the store.
// This script walks node_modules and canonicalizes symlinks.
async function canonicalize(storePrefix, root) {
console.log(storePrefix, root)
const entries = await fs.promises.readdir(root);
const paths = entries.map((entry) => path.join(root, entry));
const stats = await Promise.all(
paths.map(async (path) => {
return {
path: path,
stat: await fs.promises.lstat(path),
};
})
);
const symlinks = stats.filter((stat) => stat.stat.isSymbolicLink());
const dirs = stats.filter((stat) => stat.stat.isDirectory());
// Canonicalize symlinks to their real path
await Promise.all(
symlinks.map(async (stat) => {
const target = await fs.promises.realpath(stat.path);
if (target.startsWith(storePrefix)) {
await fs.promises.unlink(stat.path);
await fs.promises.symlink(target, stat.path);
}
})
);
// Recurse into directories
await Promise.all(dirs.map((dir) => canonicalize(storePrefix, dir.path)));
}
async function main() {
const args = process.argv.slice(2);
const storePrefix = args[0];
if (fs.existsSync("node_modules")) {
await canonicalize(storePrefix, "node_modules");
}
}
main();

13
pkgs/build-support/node/import-npm-lock/hooks/default.nix Normal file
View file

@ -0,0 +1,13 @@
{ callPackage, lib, makeSetupHook, srcOnly, nodejs }:
{
npmConfigHook = makeSetupHook
{
name = "npm-config-hook";
substitutions = {
nodeSrc = srcOnly nodejs;
nodeGyp = "${nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js";
canonicalizeSymlinksScript = ./canonicalize-symlinks.js;
storePrefix = builtins.storeDir;
};
} ./npm-config-hook.sh;
}

70
pkgs/build-support/node/import-npm-lock/hooks/npm-config-hook.sh Normal file
View file

@ -0,0 +1,70 @@
# shellcheck shell=bash
npmConfigHook() {
echo "Executing npmConfigHook"
if [ -n "${npmRoot-}" ]; then
pushd "$npmRoot"
fi
if [ -z "${npmDeps-}" ]; then
echo "Error: 'npmDeps' should be set when using npmConfigHook."
exit 1
fi
echo "Configuring npm"
export HOME="$TMPDIR"
export npm_config_nodedir="@nodeSrc@"
export npm_config_node_gyp="@nodeGyp@"
npm config set offline true
npm config set progress false
npm config set fund false
echo "Installing patched package.json/package-lock.json"
# Save original package.json/package-lock.json for closure size reductions.
# The patched one contains store paths we don't want at runtime.
mv package.json .package.json.orig
if test -f package-lock.json; then # Not all packages have package-lock.json.
mv package-lock.json .package-lock.json.orig
fi
cp --no-preserve=mode "${npmDeps}/package.json" package.json
cp --no-preserve=mode "${npmDeps}/package-lock.json" package-lock.json
echo "Installing dependencies"
if ! npm install --ignore-scripts $npmInstallFlags "${npmInstallFlagsArray[@]}" $npmFlags "${npmFlagsArray[@]}"; then
echo
echo "ERROR: npm failed to install dependencies"
echo
echo "Here are a few things you can try, depending on the error:"
echo '1. Set `npmFlags = [ "--legacy-peer-deps" ]`'
echo
exit 1
fi
patchShebangs node_modules
npm rebuild $npmRebuildFlags "${npmRebuildFlagsArray[@]}" $npmFlags "${npmFlagsArray[@]}"
patchShebangs node_modules
# Canonicalize symlinks from relative paths to the Nix store.
node @canonicalizeSymlinksScript@ @storePrefix@
# Revert to pre-patched package.json/package-lock.json for closure size reductions
mv .package.json.orig package.json
if test -f ".package-lock.json.orig"; then
mv .package-lock.json.orig package-lock.json
fi
if [ -n "${npmRoot-}" ]; then
popd
fi
echo "Finished npmConfigHook"
}
postConfigureHooks+=(npmConfigHook)

30
pkgs/build-support/rust/rustc-wrapper/default.nix
View file

@ -6,8 +6,27 @@ runCommand "${rustc-unwrapped.pname}-wrapper-${rustc-unwrapped.version}" {
inherit (rustc-unwrapped) outputs;
env = {
prog = "${rustc-unwrapped}/bin/rustc";
sysroot = lib.optionalString (sysroot != null) "--sysroot ${sysroot}";
# Upstream rustc still assumes that musl = static[1]. The fix for
# this is to disable crt-static by default for non-static musl
# targets.
#
# Even though Cargo will build build.rs files for the build platform,
# cross-compiling _from_ musl appears to work fine, so we only need
# to do this when rustc's target platform is dynamically linked musl.
#
# [1]: https://github.com/rust-lang/compiler-team/issues/422
#
# WARNING: using defaultArgs is dangerous, as it will apply to all
# targets used by this compiler (host and target). This means
# that it can't be used to set arguments that should only be
# applied to the target. It's fine to do this for -crt-static,
# because rustc does not support +crt-static host platforms
# anyway.
defaultArgs = lib.optionalString
(with rustc-unwrapped.stdenv.targetPlatform; isMusl && !isStatic)
"-C target-feature=-crt-static";
};
passthru = {
@ -22,9 +41,12 @@ runCommand "${rustc-unwrapped.pname}-wrapper-${rustc-unwrapped.version}" {
} ''
mkdir -p $out/bin
ln -s ${rustc-unwrapped}/bin/* $out/bin
rm $out/bin/rustc
substituteAll ${./rustc-wrapper.sh} $out/bin/rustc
chmod +x $out/bin/rustc
rm $out/bin/{rustc,rustdoc}
prog=${rustc-unwrapped}/bin/rustc extraFlagsVar=NIX_RUSTFLAGS \
substituteAll ${./rustc-wrapper.sh} $out/bin/rustc
prog=${rustc-unwrapped}/bin/rustdoc extraFlagsVar=NIX_RUSTDOCFLAGS \
substituteAll ${./rustc-wrapper.sh} $out/bin/rustdoc
chmod +x $out/bin/{rustc,rustdoc}
${lib.concatMapStrings (output: "ln -s ${rustc-unwrapped.${output}} \$${output}\n")
(lib.remove "out" rustc-unwrapped.outputs)}
''

4
pkgs/build-support/rust/rustc-wrapper/rustc-wrapper.sh
View file

@ -13,8 +13,8 @@ for arg; do
esac
done
extraBefore=("${defaultSysroot[@]}")
extraAfter=($NIX_RUSTFLAGS)
extraBefore=(@defaultArgs@ "${defaultSysroot[@]}")
extraAfter=($@extraFlagsVar@)
# Optionally print debug info.
if (( "${NIX_DEBUG:-0}" >= 1 )); then

17
pkgs/games/lgames/barrage/default.nix → pkgs/by-name/ba/barrage/package.nix
View file

@ -1,16 +1,16 @@
{ lib
, stdenv
, fetchurl
, SDL
, SDL_mixer
, fetchurl
, stdenv
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "barrage";
version = "1.0.7";
src = fetchurl {
url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz";
url = "mirror://sourceforge/lgames/barrage-${finalAttrs.version}.tar.gz";
hash = "sha256-cGYrG7A4Ffh51KyR+UpeWu7A40eqxI8g4LefBIs18kg=";
};
@ -21,12 +21,13 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
meta = with lib; {
meta = {
homepage = "https://lgames.sourceforge.io/Barrage/";
description = "A destructive action game";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
license = with lib.licenses; [ gpl2Plus ];
mainProgram = "barrage";
maintainers = with lib.maintainers; [ AndersonTorres ];
inherit (SDL.meta) platforms;
broken = stdenv.isDarwin;
};
}
})

1
pkgs/by-name/bl/bluez/package.nix
View file

@ -113,7 +113,6 @@ stdenv.mkDerivation (finalAttrs: {
pythonPath = with python3.pkgs; [
dbus-python
pygobject3
recursive-pth-loader
];
in
''

9
pkgs/development/libraries/boehm-gc/default.nix → pkgs/by-name/bo/boehmgc/package.nix
View file

@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.tests = nixVersions;
meta = with lib; {
meta = {
homepage = "https://hboehm.info/gc/";
description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++";
longDescription = ''
@ -76,10 +76,9 @@ stdenv.mkDerivation (finalAttrs: {
Alternatively, the garbage collector may be used as a leak detector for
C or C++ programs, though that is not its primary goal.
'';
# non-copyleft, X11-style license
changelog = "https://github.com/ivmai/bdwgc/blob/v${finalAttrs.version}/ChangeLog";
license = "https://hboehm.info/gc/license.txt";
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.all;
license = "https://hboehm.info/gc/license.txt"; # non-copyleft, X11-style license
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.all;
};
})

11
pkgs/by-name/cm/cmake/package.nix
View file

@ -29,6 +29,7 @@
, buildDocs ? !(isMinimalBuild || (uiToolkits == []))
, darwin
, libsForQt5
, gitUpdater
}:
let
@ -46,11 +47,11 @@ stdenv.mkDerivation (finalAttrs: {
+ lib.optionalString isMinimalBuild "-minimal"
+ lib.optionalString cursesUI "-cursesUI"
+ lib.optionalString qt5UI "-qt5UI";
version = "3.28.2";
version = "3.28.3";
src = fetchurl {
url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz";
hash = "sha256-FGb4ctwcIm83PPj7pCMO0hao8Qi9VLR3tczf2eotEko=";
hash = "sha256-crdXDlyFk95qxKtDO3PqsYxfsyiIBGDIbOMmCBQa1cE=";
};
patches = [
@ -177,6 +178,12 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = false; # fails
passthru.updateScript = gitUpdater {
url = "https://gitlab.kitware.com/cmake/cmake.git";
rev-prefix = "v";
ignoredVersions = "-"; # -rc1 and friends
};
meta = {
homepage = "https://cmake.org/";
description = "Cross-platform, open-source build system generator";

1439
pkgs/by-name/co/cosmic-applibrary/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

38
pkgs/by-name/co/cosmic-applibrary/package.nix
View file

@ -8,36 +8,44 @@
, libxkbcommon
, wayland
}:
rustPlatform.buildRustPackage rec {
pname = "cosmic-applibrary";
version = "unstable-2024-01-03";
version = "0-unstable-2024-02-09";
src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
rev = "889cb6078c05cdf3eb94f19f64db552fa2be32dc";
hash = "sha256-qLAFSHA7YdOWr7ZmLCkQ+aGWb2schANfgdD2BxsrvaE=";
rev = "e214e9867876c96b24568d8a45aaca2936269d9b";
hash = "sha256-fZxDRktiHHmj7X3e5VyJJMO081auOpSMSsBnJdhhtR8=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"accesskit-0.11.0" = "sha256-xVhe6adUb8VmwIKKjHxwCwOo5Y1p3Or3ylcJJdLDrrE=";
"accesskit-0.12.2" = "sha256-ksaYMGT/oug7isQY8/1WD97XDUsX2ShBdabUzxWffYw=";
"atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";
"cosmic-config-0.1.0" = "sha256-WM08/jnB2kAf77FE+0xpBJcVGOHOCcUorifQ/5LXav0=";
"cosmic-client-toolkit-0.1.0" = "sha256-AEgvF7i/OWPdEMi8WUaAg99igBwE/AexhAXHxyeJMdc=";
"glyphon-0.3.0" = "sha256-JGkNIfj1HjOF8kGxqJPNq/JO+NhZD6XrZ4KmkXEP6Xc=";
"smithay-client-toolkit-0.18.0" = "sha256-2WbDKlSGiyVmi7blNBr2Aih9FfF2dq/bny57hoA4BrE=";
"softbuffer-0.3.3" = "sha256-eKYFVr6C1+X6ulidHIu9SP591rJxStxwL9uMiqnXx4k=";
"taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI=";
"cosmic-config-0.1.0" = "sha256-ETNVJ4y7EraAlU9XEZGNNPdyWt1WIURr1dSH6hQ0Pos=";
"cosmic-client-toolkit-0.1.0" = "sha256-vj7Wm1uJ5ULvGNEwKznNhujCZQiuntsWMyKQbIVaO/Q=";
"cosmic-settings-daemon-0.1.0" = "sha256-z/dvRyc3Zc1fAQh2HKk6NI6QSDpNqarqslwszjU+0nc=";
"cosmic-text-0.10.0" = "sha256-C2FHJBESbiyL2BhLb6T+wI9EX+xCyp02Kk6cI46EfDs=";
"glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg=";
"smithay-client-toolkit-0.18.0" = "sha256-2WbDKlSGiyVmi7blNBr2Aih9FfF2dq/bny57hoA4BrE=";
"softbuffer-0.4.1" = "sha256-CACVCnyFgefkpDlll6IeaPWB8a3gbF6BW8MnlkytV8o=";
"switcheroo-control-0.1.0" = "sha256-ztZ5HD1hEOvsUSn94ZbbJ6SY9Jbsm8iGHR70GuAnEaQ=";
"taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI=";
"cosmic-text-0.11.1" = "sha256-lyBl0VAzcKBqLeCPrA28VW6O0MWXazJg1b11YuBR65U=";
"d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4=";
};
};
nativeBuildInputs = [ just pkg-config makeBinaryWrapper ];
buildInputs = [ libxkbcommon wayland ];
nativeBuildInputs = [
just
pkg-config
makeBinaryWrapper
];
buildInputs = [
libxkbcommon
wayland
];
dontUseJustBuild = true;
@ -56,7 +64,7 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
wrapProgram $out/bin/cosmic-app-library \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [wayland]}"
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ wayland ]}"
'';
meta = with lib; {

35
pkgs/by-name/dd/ddsmt/package.nix Normal file
View file

@ -0,0 +1,35 @@
{ lib
, python3Packages
, fetchPypi
}:
let
version = "2.0.3";
in
python3Packages.buildPythonApplication {
pname = "ddsmt";
inherit version;
pyproject = true;
src = fetchPypi {
inherit version;
pname = "ddSMT";
hash = "sha256-nmhEG4sUmgpgRUduVTtwDLGPJVKx+dEaPb+KjFRwV2Q=";
};
nativeBuildInputs = with python3Packages; [
setuptools
];
propagatedBuildInputs = with python3Packages; [
gprof2dot
progressbar
];
meta = {
description = "A delta debugger for SMT benchmarks in SMT-LIB v2";
homepage = "https://ddsmt.readthedocs.io/";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ AndersonTorres ];
};
}

62
pkgs/applications/graphics/digikam/default.nix → pkgs/by-name/di/digikam/package.nix
View file

@ -1,25 +1,9 @@
{ mkDerivation, config, lib, fetchpatch, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
{ stdenv, config, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
# For `digitaglinktree`
, perl, sqlite
, qtbase
, qtxmlpatterns
, qtsvg
, qtwebengine
, qtnetworkauth
, akonadi-contacts
, kcalendarcore
, kconfigwidgets
, kcoreaddons
, kdoctools
, kfilemetadata
, knotifications
, knotifyconfig
, ktextwidgets
, kwidgetsaddons
, kxmlgui
, libsForQt5
, bison
, boost
@ -32,17 +16,13 @@
, lcms2
, lensfun
, libgphoto2
, libkipi
, libksane
, liblqr1
, libqtav
, libusb1
, marble
, libheif
, libGL
, libGLU
, opencv
, pcre
, threadweaver
, x265
, jasper
@ -51,35 +31,29 @@
, hugin
, gnumake
, breeze-icons
, oxygen
, cudaSupport ? config.cudaSupport
, cudaPackages ? {}
}:
mkDerivation rec {
stdenv.mkDerivation rec {
pname = "digikam";
version = "8.1.0";
version = "8.2.0";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}.tar.xz";
hash = "sha256-BQPANORF/0JPGKZxXAp6eb5KXgyCs+vEYaIc7DdFpbM=";
hash = "sha256-L3/LVZsSPtnsrlpa729FYO7l9JIG2dF0beyatsj7OL8=";
};
# Fix build against exiv2 0.28.1
patches = [
(fetchpatch {
url = "https://invent.kde.org/graphics/digikam/-/commit/f5ea91a7f6c1926815ec68f3e0176d6c15b83051.patch";
hash = "sha256-5g2NaKKNKVfgW3dTO/IP/H/nZ0YAIOmdPAumy3NEaNg=";
})
];
strictDeps = true;
depsBuildBuild = [ cmake ];
nativeBuildInputs = [
cmake
doxygen
extra-cmake-modules
kdoctools
libsForQt5.kdoctools
libsForQt5.wrapQtAppsHook
wrapGAppsHook
] ++ lib.optionals cudaSupport (with cudaPackages; [
cuda_nvcc
@ -97,10 +71,8 @@ mkDerivation rec {
lcms2
lensfun
libgphoto2
libkipi
libksane
libheif
liblqr1
libqtav
libusb1
libGL
libGLU
@ -108,6 +80,10 @@ mkDerivation rec {
pcre
x265
jasper
] ++ (with libsForQt5; [
libkipi
libksane
libqtav
qtbase
qtxmlpatterns
@ -130,7 +106,7 @@ mkDerivation rec {
marble
oxygen
threadweaver
] ++ lib.optionals cudaSupport (with cudaPackages; [
]) ++ lib.optionals cudaSupport (with cudaPackages; [
cuda_cudart
]);
@ -140,7 +116,7 @@ mkDerivation rec {
"-DENABLE_MEDIAPLAYER=1"
"-DENABLE_QWEBENGINE=on"
"-DENABLE_APPSTYLES=on"
"-DCMAKE_CXX_FLAGS=-I${libksane}/include/KF5" # fix `#include <ksane_version.h>`
"-DCMAKE_CXX_FLAGS=-I${libsForQt5.libksane}/include/KF5" # fix `#include <ksane_version.h>`
];
dontWrapGApps = true;
@ -148,7 +124,7 @@ mkDerivation rec {
preFixup = ''
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
qtWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]})
qtWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${qtbase.qtPluginPrefix}/${pname})
qtWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${libsForQt5.qtbase.qtPluginPrefix}/${pname})
substituteInPlace $out/bin/digitaglinktree \
--replace "/usr/bin/perl" "${perl}/bin/perl" \
--replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3"

7
pkgs/by-name/gl/glide-media-player/package.nix
View file

@ -14,7 +14,6 @@
, gst_all_1
, glib-networking
, darwin
, libsoup_3
}:
stdenv.mkDerivation rec {
@ -69,12 +68,6 @@ stdenv.mkDerivation rec {
darwin.apple_sdk_11_0.frameworks.IOKit
];
# FIXME: gst-plugins-good missing libsoup breaks streaming
# (https://github.com/nixos/nixpkgs/issues/271960)
preFixup = ''
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsoup_3 ]}")
'';
meta = with lib; {
description = "Linux/macOS media player based on GStreamer and GTK";
homepage = "https://philn.github.io/glide";

6
pkgs/by-name/ho/home-manager/package.nix
View file

@ -16,14 +16,14 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "home-manager";
version = "0-unstable-2024-02-24";
version = "0-unstable-2024-03-06";
src = fetchFromGitHub {
name = "home-manager-source";
owner = "nix-community";
repo = "home-manager";
rev = "4ee704cb13a5a7645436f400b9acc89a67b9c08a";
hash = "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=";
rev = "cf111d1a849ddfc38e9155be029519b0e2329615";
hash = "sha256-+lM4J4JoJeiN8V+3WSWndPHj1pJ9Jc1UMikGbXLqCTk=";
};
nativeBuildInputs = [

6
pkgs/by-name/hy/hyprlang/package.nix
View file

@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hyprlang";
version = "0.4.1";
version = "0.5.0";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprlang";
rev = "v${finalAttrs.version}";
hash = "sha256-upV2PWOoQ5hKbeuMwiJ4RJUa1JDVqzxdr5LL7YJJ/f4=";
hash = "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=";
};
nativeBuildInputs = [
@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
homepage = "https://github.com/hyprwm/hyprlang";
description = "The official implementation library for the hypr config language";
license = licenses.gpl3Plus;
license = licenses.lgpl3Only;
platforms = platforms.linux;
maintainers = with maintainers; [ iogamaster fufexan ];
};

4
pkgs/by-name/ic/icewm/package.nix
View file

@ -41,13 +41,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "icewm";
version = "3.4.5";
version = "3.4.6";
src = fetchFromGitHub {
owner = "ice-wm";
repo = "icewm";
rev = finalAttrs.version;
hash = "sha256-Auuu+hRYVziAF3hXH7XSOyNlDehEKg6QmSJicY+XQLk=";
hash = "sha256-j4o4/Q+WWuVPZM/rij2miC7ApWrBNhzve2TAPEXIU20=";
};
nativeBuildInputs = [

25
pkgs/by-name/ke/kernel-hardening-checker/package.nix Normal file
View file

@ -0,0 +1,25 @@
{ lib
, python3Packages
, fetchFromGitHub
}:
python3Packages.buildPythonApplication rec {
pname = "kernel-hardening-checker";
version = "0.6.6";
src = fetchFromGitHub {
owner = "a13xp0p0v";
repo = pname;
rev = "v${version}";
hash = "sha256-xpVazB9G0cdc0GglGpna80EWHZXfTd5mc5mTvvvoPfE=";
};
meta = with lib; {
description = "A tool for checking the security hardening options of the Linux kernel";
homepage = "https://github.com/a13xp0p0v/kernel-hardening-checker";
license = licenses.gpl3Only;
platforms = platforms.all;
maintainers = with maintainers; [ erdnaxe ];
mainProgram = "kernel-hardening-checker";
};
}

49
pkgs/by-name/lb/lbreakout2/package.nix Normal file
View file

@ -0,0 +1,49 @@
{ lib
, SDL
, SDL_mixer
, fetchpatch
, fetchurl
, libintl
, libpng
, stdenv
, zlib
}:
stdenv.mkDerivation (finalAttrs: {
pname = "lbreakout2";
version = "2.6.5";
src = fetchurl {
url = "mirror://sourceforge/lgames/lbreakout2-${finalAttrs.version}.tar.gz";
hash = "sha256-kQTWF1VT2jRC3GpfxAemaeL1r/Pu3F0wQJ6wA7enjW8=";
};
patches = [
(fetchpatch {
url = "https://sources.debian.org/data/main/l/lbreakout2/2.6.5-2/debian/patches/sdl_fix_pauses.patch";
hash = "sha256-ycsuxfokpOblLky42MwtJowdEp7v5dZRMFIR4id4ZBI=";
})
];
buildInputs = [
SDL
SDL_mixer
libintl
libpng
zlib
];
# With fortify it crashes at runtime:
# *** buffer overflow detected ***: terminated
# Aborted (core dumped)
hardeningDisable = [ "fortify" ];
meta = {
homepage = "http://lgames.sourceforge.net/LBreakout2/";
description = "Breakout clone from the LGames series";
license = with lib.licenses; [ gpl2Plus ];
mainProgram = "lbreakout2";
maintainers = with lib.maintainers; [ AndersonTorres ciil ];
platforms = lib.platforms.unix;
};
})

7
pkgs/games/lgames/lbreakouthd/default.nix → pkgs/by-name/lb/lbreakouthd/package.nix
View file

@ -1,11 +1,11 @@
{ lib
, stdenv
, fetchurl
, directoryListingUpdater
, SDL2
, SDL2_image
, SDL2_mixer
, SDL2_ttf
, directoryListingUpdater
, fetchurl
, stdenv
}:
stdenv.mkDerivation (finalAttrs: {
@ -36,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://lgames.sourceforge.io/LBreakoutHD/";
description = "A widescreen Breakout clone";
license = lib.licenses.gpl2Plus;
mainProgram = "lbreakouthd";
maintainers = with lib.maintainers; [ AndersonTorres ];
inherit (SDL2.meta) platforms;
broken = stdenv.isDarwin;

0
pkgs/development/libraries/libedit/01-cygwin.patch → pkgs/by-name/li/libedit/01-cygwin.patch
View file

56
pkgs/by-name/li/libedit/package.nix Normal file
View file

@ -0,0 +1,56 @@
{ lib
, stdenv
, fetchurl
, ncurses
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libedit";
version = "20230828-3.1";
src = fetchurl {
url = "https://thrysoee.dk/editline/libedit-${finalAttrs.version}.tar.gz";
hash = "sha256-TugYK25WkpDn0fRPD3jayHFrNfZWt2Uo9pnGnJiBTa0=";
};
outputs = [ "out" "dev" "man" ];
patches = [
./01-cygwin.patch
];
propagatedBuildInputs = [
ncurses
];
# GCC automatically include `stdc-predefs.h` while Clang does not do this by
# default. While Musl is ISO 10646 compliant, it does not define
# __STDC_ISO_10646__.
# This definition is in `stdc-predefs.h` -- that's why libedit builds just
# fine with GCC and Musl.
# There is a DR to fix this issue with Clang which is not merged yet.
# https://reviews.llvm.org/D137043
env.NIX_CFLAGS_COMPILE =
lib.optionalString (stdenv.targetPlatform.isMusl && stdenv.cc.isClang)
"-D__STDC_ISO_10646__=201103L";
postFixup = ''
find $out/lib -type f | \
grep '\.\(la\|pc\)''$' | \
xargs sed -i -e 's,-lncurses[a-z]*,-L${ncurses.out}/lib -lncursesw,g'
'';
meta = {
homepage = "http://www.thrysoee.dk/editline/";
description = "A port of the NetBSD Editline library (libedit)";
longDescription = ''
This is an autotool- and libtoolized port of the NetBSD Editline library
(libedit). This Berkeley-style licensed command line editor library
provides generic line editing, history, and tokenization functions,
similar to those found in GNU Readline.
'';
license = with lib.licenses; [ bsd3 ];
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.all;
};
})

4
pkgs/development/libraries/libyang/default.nix → pkgs/by-name/li/libyang/package.nix
View file

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "libyang";
version = "2.1.128";
version = "2.1.148";
src = fetchFromGitHub {
owner = "CESNET";
repo = "libyang";
rev = "v${version}";
sha256 = "sha256-qwEHGUizjsWQZSwQkh7Clevd1OQfj1mse7Q8YiRCMyQ=";
hash = "sha256-uYZJo8lUv6tq0MRRJvbTS/8t1eZNGqcMb5k5sVCwMJM=";
};
nativeBuildInputs = [

23
pkgs/games/lgames/lpairs2/default.nix → pkgs/by-name/lp/lpairs2/package.nix
View file

@ -1,19 +1,19 @@
{ lib
, stdenv
, fetchurl
, SDL2
, SDL2_image
, SDL2_mixer
, SDL2_ttf
, directoryListingUpdater
, fetchurl
, stdenv
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "lpairs2";
version = "2.3";
src = fetchurl {
url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz";
url = "mirror://sourceforge/lgames/lpairs2-${finalAttrs.version}.tar.gz";
hash = "sha256-gw1BNkcztyTuoXRdx5+TBZNJEJNrLCfEUCQ1JzROogA=";
};
@ -25,17 +25,18 @@ stdenv.mkDerivation rec {
];
passthru.updateScript = directoryListingUpdater {
inherit pname version;
inherit (finalAttrs) pname version;
url = "https://lgames.sourceforge.io/LPairs/";
extraRegex = "(?!.*-win(32|64)).*";
};
meta = with lib; {
broken = stdenv.isDarwin;
meta = {
homepage = "http://lgames.sourceforge.net/LPairs/";
description = "Matching the pairs - a typical Memory Game";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
license = with lib.licenses; [ gpl2Plus ];
mainProgram = "lpairs2";
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.unix;
broken = stdenv.isDarwin;
};
}
})

4
pkgs/by-name/lu/lubelogger/package.nix
View file

@ -6,13 +6,13 @@
buildDotnetModule rec {
pname = "lubelogger";
version = "1.2.4";
version = "1.2.5";
src = fetchFromGitHub {
owner = "hargata";
repo = "lubelog";
rev = "v${version}";
hash = "sha256-1U4dCjm3tRb4GANovIR+Ov4B7+o4DS9lVGjwJnXyR/8=";
hash = "sha256-wMsIcmHNNpgfYtQNQX8D7umdAGnlv0v5PIcI4Q5mRos=";
};
projectFile = "CarCareTracker.sln";

8
pkgs/by-name/mo/monophony/package.nix
View file

@ -6,13 +6,12 @@
, gobject-introspection
, yt-dlp
, libadwaita
, libsoup_3
, glib-networking
, nix-update-script
}:
python3Packages.buildPythonApplication rec {
pname = "monophony";
version = "2.6.1";
version = "2.7.0";
format = "other";
sourceRoot = "source/source";
@ -20,7 +19,7 @@ python3Packages.buildPythonApplication rec {
owner = "zehkira";
repo = "monophony";
rev = "v${version}";
hash = "sha256-op6XUfP0EM9P5vT2nM4o+NOHxBcASIl1+6Mp/u9ub3U=";
hash = "sha256-uOmaTkjlfrct8CPqKcTTTqmURVncPZm4fXZYW+yZUf8=";
};
pythonPath = with python3Packages; [
@ -38,7 +37,6 @@ python3Packages.buildPythonApplication rec {
buildInputs = [
libadwaita
# needed for gstreamer https
libsoup_3
glib-networking
] ++ (with gst_all_1; [
gst-plugins-base
@ -53,8 +51,6 @@ python3Packages.buildPythonApplication rec {
gappsWrapperArgs+=(
--prefix PYTHONPATH : "$program_PYTHONPATH"
--prefix PATH : "${lib.makeBinPath [yt-dlp]}"
# needed for gstreamer https
--prefix LD_LIBRARY_PATH : "${lib.getLib libsoup_3}/lib"
)
'';

7
pkgs/by-name/ne/netease-cloud-music-gtk/package.nix
View file

@ -18,7 +18,6 @@
, libadwaita
, glib-networking
, gst_all_1
, libsoup_3
}:
stdenv.mkDerivation rec {
@ -71,12 +70,6 @@ stdenv.mkDerivation rec {
gst-plugins-ugly
]);
# FIXME: gst-plugins-good missing libsoup breaks streaming
# (https://github.com/nixos/nixpkgs/issues/271960)
preFixup = ''
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libsoup_3 ]}")
'';
meta = with lib; {
description = "A Rust + GTK based netease cloud music player";
homepage = "https://github.com/gmg137/netease-cloud-music-gtk";

4
pkgs/by-name/no/nom/package.nix
View file

@ -4,13 +4,13 @@
}:
buildGoModule rec {
pname = "nom";
version = "2.1.3";
version = "2.1.4";
src = fetchFromGitHub {
owner = "guyfedwards";
repo = "nom";
rev = "v${version}";
hash = "sha256-PBhwIyGzWbXRTmp+IvFPqae4cbb6l6nIYcFheYkHlFI=";
hash = "sha256-W0vfYAEQYixbnOQhA59sj2uSAcbqoS/OMiB3TfXsv/Y=";
};
vendorHash = "sha256-fP6yxfIQoVaBC9hYcrCyo3YP3ntEVDbDTwKMO9TdyDI=";

90
pkgs/by-name/no/nomacs/package.nix Normal file
View file

@ -0,0 +1,90 @@
{ lib
, cmake
, exiv2
, fetchFromGitHub
, libraw
, libsForQt5
, libtiff
, opencv4
, pkg-config
, stdenv
}:
stdenv.mkDerivation (finalAttrs: {
pname = "nomacs";
version = "3.17.2295";
src = fetchFromGitHub {
owner = "nomacs";
repo = "nomacs";
rev = finalAttrs.version;
fetchSubmodules = false; # We'll use our own
hash = "sha256-jHr7J0X1v2n/ZK0y3b/XPDISk7e08VWS6nicJU4fKKY=";
};
# Because some unknown reason split outputs is breaking on Darwin
outputs = if stdenv.isDarwin
then [ "out" ]
else [ "out" "man" ];
sourceRoot = "${finalAttrs.src.name}/ImageLounge";
nativeBuildInputs = [
cmake
libsForQt5.wrapQtAppsHook
pkg-config
];
buildInputs = [
exiv2
libraw
libtiff
opencv4
] ++ (with libsForQt5; [
qtbase
qtimageformats
qtsvg
qttools
quazip
]);
cmakeFlags = [
(lib.cmakeBool "ENABLE_OPENCV" true)
(lib.cmakeBool "ENABLE_QUAZIP" true)
(lib.cmakeBool "ENABLE_RAW" true)
(lib.cmakeBool "ENABLE_TIFF" true)
(lib.cmakeBool "ENABLE_TRANSLATIONS" true)
(lib.cmakeBool "USE_SYSTEM_QUAZIP" true)
];
postInstall = lib.optionalString stdenv.isDarwin ''
mkdir -p $out/lib
mv $out/libnomacsCore.dylib $out/lib/libnomacsCore.dylib
'';
meta = {
homepage = "https://nomacs.org";
description = "Qt-based image viewer";
longDescription = ''
nomacs is a free, open source image viewer, which supports multiple
platforms. You can use it for viewing all common image formats including
RAW and psd images.
nomacs features semi-transparent widgets that display additional
information such as thumbnails, metadata or histogram. It is able to
browse images in zip or MS Office files which can be extracted to a
directory. Metadata stored with the image can be displayed and you can add
notes to images. A thumbnail preview of the current folder is included as
well as a file explorer panel which allows switching between
folders. Within a directory you can apply a file filter, so that only
images are displayed whose filenames have a certain string or match a
regular expression. Activating the cache allows for instantly switching
between images.
'';
changelog = "https://github.com/nomacs/nomacs/releases/tag/${finalAttrs.src.rev}";
license = with lib.licenses; [ gpl3Plus ];
mainProgram = "nomacs";
maintainers = with lib.maintainers; [ AndersonTorres mindavi ];
inherit (libsForQt5.qtbase.meta) platforms;
};
})

26
pkgs/by-name/ob/obs-cmd/package.nix Normal file
View file

@ -0,0 +1,26 @@
{ lib
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "obs-cmd";
version = "0.17.4";
src = fetchFromGitHub {
owner = "grigio";
repo = "obs-cmd";
rev = "v${version}";
hash = "sha256-HCvIMIQZKzIkpYL9F9oM4xiE/gOeI+7dMj9QmhetHm4=";
};
cargoHash = "sha256-AQRjZH3WhZXU6NhDSCv4/HWz5un1nFtuzWPYSJA9XaE=";
meta = with lib; {
description = "Minimal CLI to control OBS Studio via obs-websocket";
homepage = "https://github.com/grigio/obs-cmd";
license = licenses.mit;
maintainers = with maintainers; [ ianmjones ];
mainProgram = "obs-cmd";
};
}

15
pkgs/by-name/pi/pixi/package.nix
View file

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "pixi";
version = "0.13.0";
version = "0.15.2";
src = fetchFromGitHub {
owner = "prefix-dev";
repo = "pixi";
rev = "v${version}";
hash = "sha256-4EKJwHXNDUGhwlSSZFoPHdG5WBDoHFAQncG+CpD2sik=";
hash = "sha256-bh8Uu6Q2AND50Qzivc6k1Z8JWudkHC2i4YW1Hxa69SM=";
};
cargoHash = "sha256-s1ODwuYv1x5/iP8yHS5FRk5MacrW81LaXI7/J+qtPNM=";
cargoHash = "sha256-yMIcPwnuN7F2ZrOtJw8T+nxeSzLsYn+iC34bYeWpi/w=";
nativeBuildInputs = [
pkg-config
@ -35,6 +35,13 @@ rustPlatform.buildRustPackage rec {
with darwin.apple_sdk_11_0.frameworks; [ CoreFoundation IOKit SystemConfiguration Security ]
);
# There are some CI failures with Rattler. Tests on Aarch64 has been skipped.
# See https://github.com/prefix-dev/pixi/pull/241.
doCheck = !stdenv.isAarch64;
preCheck = ''
export HOME="$(mktemp -d)"
'';
checkFlags = [
# Skip tests requiring network
@ -49,7 +56,7 @@ rustPlatform.buildRustPackage rec {
];
postInstall = ''
installShellCompletion --cmd pix \
installShellCompletion --cmd pixi \
--bash <($out/bin/pixi completion --shell bash) \
--fish <($out/bin/pixi completion --shell fish) \
--zsh <($out/bin/pixi completion --shell zsh)

33
pkgs/applications/graphics/pqiv/default.nix → pkgs/by-name/pq/pqiv/package.nix
View file

@ -1,20 +1,39 @@
{ lib, stdenv, fetchFromGitHub, pkg-config
, ffmpeg, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler
{
lib,
stdenv,
fetchFromGitHub,
pkg-config,
ffmpeg,
gtk3,
imagemagick,
libarchive,
libspectre,
libwebp,
poppler,
}:
stdenv.mkDerivation (rec {
stdenv.mkDerivation (finalAttrs: {
pname = "pqiv";
version = "2.13";
src = fetchFromGitHub {
owner = "phillipberndt";
repo = "pqiv";
rev = version;
sha256 = "sha256-Jlc6sd9lRWUC1/2GZnJ0EmVRHxCXP8dTZNZEhJBS7oQ=";
rev = finalAttrs.version;
hash = "sha256-Jlc6sd9lRWUC1/2GZnJ0EmVRHxCXP8dTZNZEhJBS7oQ=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ffmpeg gtk3 imagemagick libarchive libspectre libwebp poppler ];
buildInputs = [
ffmpeg
gtk3
imagemagick
libarchive
libspectre
libwebp
poppler
];
prePatch = "patchShebangs .";
@ -22,7 +41,7 @@ stdenv.mkDerivation (rec {
description = "Powerful image viewer with minimal UI";
homepage = "https://www.pberndt.com/Programme/Linux/pqiv";
license = licenses.gpl3Plus;
maintainers = [];
maintainers = with maintainers; [ donovanglover ];
platforms = platforms.linux;
mainProgram = "pqiv";
};

28
pkgs/by-name/pr/pretalx/package.nix
View file

@ -27,18 +27,19 @@ let
};
};
version = "2023.1.3";
version = "2024.1.0";
src = fetchFromGitHub {
owner = "pretalx";
repo = "pretalx";
rev = "v${version}";
hash = "sha256-YxmkjfftNrInIcSkK21wJXiEU6hbdDa1Od8p+HiLprs=";
hash = "sha256-rFOlovybaEZnv5wBx6Dv8bVkP1D+CgYAKRXuNb6hLKQ=";
};
meta = with lib; {
description = "Conference planning tool: CfP, scheduling, speaker management";
homepage = "https://github.com/pretalx/pretalx";
changelog = "https://docs.pretalx.org/en/latest/changelog.html";
license = licenses.asl20;
maintainers = teams.c3d2.members;
platforms = platforms.linux;
@ -50,7 +51,7 @@ let
sourceRoot = "${src.name}/src/pretalx/frontend/schedule-editor";
npmDepsHash = "sha256-4cnBHZ8WpHgp/bbsYYbdtrhuD6ffUAZq9ZjoLpWGfRg=";
npmDepsHash = "sha256-B9R3Nn4tURNxzeyLDHscqHxYOQK9AcmDnyNq3k5WQQs=";
npmBuildScript = "build";
@ -72,22 +73,11 @@ python.pkgs.buildPythonApplication rec {
--replace 'subprocess.check_call(["npm", "run", "build"], cwd=frontend_dir, env=env)' ""
substituteInPlace src/setup.cfg \
--replace "--cov=./" ""
--replace "--cov=./ --cov-report=" ""
'';
nativeBuildInputs = [
gettext
python.pkgs.pythonRelaxDepsHook
];
pythonRelaxDeps = [
"bleach"
"cssutils"
"django-filter"
"django-formtools"
"libsass"
"markdown"
"pillow"
];
propagatedBuildInputs = with python.pkgs; [
@ -174,6 +164,7 @@ python.pkgs.buildPythonApplication rec {
nativeCheckInputs = with python.pkgs; [
faker
freezegun
jsonschema
pytest-django
pytest-mock
pytest-xdist
@ -185,9 +176,16 @@ python.pkgs.buildPythonApplication rec {
# tries to run npm run i18n:extract
"test_common_custom_makemessages_does_not_blow_up"
# Expected to perform X queries or less but Y were done
"test_can_see_schedule"
"test_schedule_export_public"
"test_schedule_frab_json_export"
"test_schedule_frab_xcal_export"
"test_schedule_frab_xml_export"
"test_schedule_frab_xml_export_control_char"
"test_schedule_page_text_list"
"test_schedule_page_text_table"
"test_schedule_page_text_wrong_format"
"test_versioned_schedule_page"
];
passthru = {

6
pkgs/by-name/qu/quicktype/package.nix
View file

@ -2,13 +2,13 @@
buildNpmPackage rec {
pname = "quicktype";
version = "23.0.104"; # version from https://npm.im/quicktype
version = "23.0.105"; # version from https://npm.im/quicktype
src = fetchFromGitHub {
owner = "glideapps";
repo = "quicktype";
rev = "916cd94a9d4fdeab870b6a12f42ad43ebaedf314"; # version not tagged
hash = "sha256-PI9YgFVy7Mlln9+7IAU9vzyvK606PuAJ32st3NDwXIw=";
rev = "0b5924db1d3858d6f4abe5923cce53b2f4e581aa"; # version not tagged
hash = "sha256-JqpTnIhxLxLECqW8DjG1Oig/HOs9PpwmjdfhwE8sJAA=";
};
postPatch = ''

14
pkgs/by-name/sa/satty/package.nix
View file

@ -3,12 +3,12 @@
, fetchFromGitHub
, pkg-config
, wrapGAppsHook4
, cairo
, gdk-pixbuf
, glib
, gtk4
, libadwaita
, pango
, libepoxy
, libGL
, copyDesktopItems
, installShellFiles
}:
@ -16,16 +16,16 @@
rustPlatform.buildRustPackage rec {
pname = "satty";
version = "0.10.0";
version = "0.11.2";
src = fetchFromGitHub {
owner = "gabm";
repo = "Satty";
rev = "v${version}";
hash = "sha256-aE0hQla/FwUAUSVodfQz3s8hdYF6tQSIHl6p5gEtONU=";
hash = "sha256-bUDKRAp3/ByxWRzpoD0qGInxQuEfVIeYJ/pCcAEfH14=";
};
cargoHash = "sha256-vARrc49+T813uCzIlB1tSS3eNyNeeCvC+G+LFYAsYx8=";
cargoHash = "sha256-aH08BJK4uOEUrpoMfVGwGnuzncHHW6w6jjxnk4Xz5zo=";
nativeBuildInputs = [
copyDesktopItems
@ -35,12 +35,12 @@ rustPlatform.buildRustPackage rec {
];
buildInputs = [
cairo
gdk-pixbuf
glib
gtk4
libadwaita
pango
libepoxy
libGL
];
postInstall = ''

6
pkgs/by-name/sc/scdoc/package.nix
View file

@ -6,13 +6,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "scdoc";
version = "1.11.2-unstable-2023-03-08";
version = "1.11.3";
src = fetchFromSourcehut {
owner = "~sircmpwn";
repo = "scdoc";
rev = "afeda241f3f9b2c27e461f32d9c2a704ab82ef61";
hash = "sha256-jIYygjUXP/6o5d9drlZjdr25KjEQx8oy4TaQwQEu8fM=";
rev = finalAttrs.version;
hash = "sha256-MbLDhLn/JY6OcdOz9/mIPAQRp5TZ6IKuQ/FQ/R3wjGc=";
};
outputs = [ "out" "man" "dev" ];

29
pkgs/by-name/se/sesh/package.nix Normal file
View file

@ -0,0 +1,29 @@
{
lib,
fetchFromGitHub,
buildGoModule,
}:
buildGoModule rec {
pname = "sesh";
version = "0.12.0";
src = fetchFromGitHub {
owner = "joshmedeski";
repo = "sesh";
rev = "v${version}";
hash = "sha256-m/EcWh4wfna9PB/NN+MCRUsz5Er0OZ70AAumlKdrm/s=";
};
vendorHash = "sha256-zt1/gE4bVj+3yr9n0kT2FMYMEmiooy3k1lQ77rN6sTk=";
ldflags = [ "-s" "-w" ];
meta = {
description = "Smart session manager for the terminal";
homepage = "https://github.com/joshmedeski/sesh";
changelog = "https://github.com/joshmedeski/sesh/releases/tag/${src.rev}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ gwg313 ];
mainProgram = "sesh";
};
}

Some files were not shown because too many files have changed in this diff Show more