nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 01:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-10-30 06:01:43 +00:00 committed by GitHub
commit 54ae567200
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
53 changed files with 6645 additions and 1038 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/languages-frameworks/lua.section.md
View File

@ -134,11 +134,11 @@ The site proposes two types of packages, the `rockspec` and the `src.rock`
Luarocks-based packages are generated in [pkgs/development/lua-modules/generated-packages.nix](https://github.com/NixOS/nixpkgs/tree/master/pkgs/development/lua-modules/generated-packages.nix) from
the whitelist maintainers/scripts/luarocks-packages.csv and updated by running
the script
[maintainers/scripts/update-luarocks-packages](https://github.com/NixOS/nixpkgs/tree/master/maintainers/scripts/update-luarocks-packages):
the package `luarocks-packages-updater`:
```sh
./maintainers/scripts/update-luarocks-packages update
nix-shell -p luarocks-packages-updater --run luarocks-packages-updater
```
[luarocks2nix](https://github.com/nix-community/luarocks) is a tool capable of generating nix derivations from both rockspec and src.rock (and favors the src.rock).

15
maintainers/scripts/pluginupdate.py
View File

@ -468,6 +468,7 @@ class Editor:
"--input-names",
"-i",
dest="input_file",
type=Path,
default=self.default_in,
help="A list of plugins in the form owner/repo",
)
@ -476,6 +477,7 @@ class Editor:
"-o",
dest="outfile",
default=self.default_out,
type=Path,
help="Filename to save generated nix code",
)
common.add_argument(
@ -787,10 +789,17 @@ def update_plugins(editor: Editor, args):
if autocommit:
from datetime import date
editor.nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True)
updated = date.today().strftime('%m-%d-%Y')
commit(editor.nixpkgs_repo, f"{editor.attr_path}: updated the {updated}", [args.outfile])
try:
repo = git.Repo(os.getcwd())
updated = date.today().strftime('%m-%d-%Y')
print(args.outfile)
commit(repo,
f"{editor.attr_path}: updated the {updated}", [args.outfile]
)
except git.InvalidGitRepositoryError as e:
print(f"Not in a git repository: {e}", file=sys.stderr)
sys.exit(1)
if redirects:
update()

13
maintainers/scripts/update-luarocks-shell.nix
View File

@ -1,13 +0,0 @@
{ nixpkgs ? import ../.. { }
}:
with nixpkgs;
let
pyEnv = python3.withPackages(ps: [ ps.gitpython ]);
in
mkShell {
packages = [
pyEnv
luarocks-nix
nix-prefetch-scripts
];
}

11
nixos/doc/manual/release-notes/rl-2311.section.md
View File

@ -162,8 +162,16 @@
- `getent` has been moved from `glibc`'s `bin` output to its own dedicated output, reducing closure size for many dependents. Dependents using the `getent` alias should not be affected; others should move from using `glibc.bin` or `getBin glibc` to `getent` (which also improves compatibility with non-glibc platforms).
- `maintainers/scripts/update-luarocks-packages` is now a proper package
`luarocks-packages-updater` that can be run to maintain out-of-tree luarocks
packages
- The `users.users.<name>.passwordFile` has been renamed to `users.users.<name>.hashedPasswordFile` to avoid possible confusions. The option is in fact the file-based version of `hashedPassword`, not `password`, and expects a file containing the {manpage}`crypt(3)` hash of the user password.
- `chromiumBeta` and `chromiumDev` have been removed due to the lack of maintenance in nixpkgs. Consider using `chromium` instead.
- `google-chrome-beta` and `google-chrome-dev` have been removed due to the lack of maintenance in nixpkgs. Consider using `google-chrome` instead.
- The `services.ananicy.extraRules` option now has the type of `listOf attrs` instead of `string`.
- `buildVimPluginFrom2Nix` has been renamed to `buildVimPlugin`, which now
@ -400,6 +408,9 @@
- The `fonts.fonts` and `fonts.enableDefaultFonts` options have been renamed to `fonts.packages` and `fonts.enableDefaultPackages` respectively.
- The `services.sslh` module has been updated to follow [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md). As such, several options have been moved to the freeform attribute set [services.sslh.settings](#opt-services.sslh.settings), which allows to change any of the settings in {manpage}`sslh(8)`.
In addition, the newly added option [services.sslh.method](#opt-services.sslh.method) allows to switch between the {manpage}`fork(2)`, {manpage}`select(2)` and `libev`-based connection handling method; see the [sslh docs](https://github.com/yrutschle/sslh/blob/master/doc/INSTALL.md#binaries) for a comparison.
- `pkgs.openvpn3` now optionally supports systemd-resolved. `programs.openvpn3` will automatically enable systemd-resolved support if `config.services.resolved.enable` is enabled.
- `services.fail2ban.jails` can now be configured with attribute sets defining settings and filters instead of lines. The stringed options `daemonConfig` and `extraSettings` have respectively been replaced by `daemonSettings` and `jails.DEFAULT.settings` which use attribute sets.

4
nixos/modules/services/blockchain/ethereum/erigon.nix
View File

@ -13,6 +13,8 @@ in {
services.erigon = {
enable = mkEnableOption (lib.mdDoc "Ethereum implementation on the efficiency frontier");
package = mkPackageOptionMD pkgs "erigon" { };
extraArgs = mkOption {
type = types.listOf types.str;
description = lib.mdDoc "Additional arguments passed to Erigon";
@ -92,7 +94,7 @@ in {
serviceConfig = {
LoadCredential = "ERIGON_JWT:${cfg.secretJwtPath}";
ExecStart = "${pkgs.erigon}/bin/erigon --config ${configFile} --authrpc.jwtsecret=%d/ERIGON_JWT ${lib.escapeShellArgs cfg.extraArgs}";
ExecStart = "${cfg.package}/bin/erigon --config ${configFile} --authrpc.jwtsecret=%d/ERIGON_JWT ${lib.escapeShellArgs cfg.extraArgs}";
DynamicUser = true;
Restart = "on-failure";
StateDirectory = "erigon";

187
nixos/modules/services/networking/sslh.nix
View File

@ -5,81 +5,131 @@ with lib;
let
cfg = config.services.sslh;
user = "sslh";
configFile = pkgs.writeText "sslh.conf" ''
verbose: ${boolToString cfg.verbose};
foreground: true;
inetd: false;
numeric: false;
transparent: ${boolToString cfg.transparent};
timeout: "${toString cfg.timeout}";
listen:
(
${
concatMapStringsSep ",\n"
(addr: ''{ host: "${addr}"; port: "${toString cfg.port}"; }'')
cfg.listenAddresses
}
);
${cfg.appendConfig}
'';
defaultAppendConfig = ''
protocols:
(
{ name: "ssh"; service: "ssh"; host: "localhost"; port: "22"; probe: "builtin"; },
{ name: "openvpn"; host: "localhost"; port: "1194"; probe: "builtin"; },
{ name: "xmpp"; host: "localhost"; port: "5222"; probe: "builtin"; },
{ name: "http"; host: "localhost"; port: "80"; probe: "builtin"; },
{ name: "tls"; host: "localhost"; port: "443"; probe: "builtin"; },
{ name: "anyprot"; host: "localhost"; port: "443"; probe: "builtin"; }
);
'';
configFormat = pkgs.formats.libconfig {};
configFile = configFormat.generate "sslh.conf" cfg.settings;
in
{
imports = [
(mkRenamedOptionModule [ "services" "sslh" "listenAddress" ] [ "services" "sslh" "listenAddresses" ])
(mkRenamedOptionModule [ "services" "sslh" "timeout" ] [ "services" "sslh" "settings" "timeout" ])
(mkRenamedOptionModule [ "services" "sslh" "transparent" ] [ "services" "sslh" "settings" "transparent" ])
(mkRemovedOptionModule [ "services" "sslh" "appendConfig" ] "Use services.sslh.settings instead")
(mkChangedOptionModule [ "services" "sslh" "verbose" ] [ "services" "sslh" "settings" "verbose-connections" ]
(config: if config.services.sslh.verbose then 1 else 0))
];
options = {
services.sslh = {
enable = mkEnableOption (lib.mdDoc "sslh");
meta.buildDocsInSandbox = false;
verbose = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc "Verbose logs.";
};
options.services.sslh = {
enable = mkEnableOption (lib.mdDoc "sslh, protocol demultiplexer");
timeout = mkOption {
type = types.int;
default = 2;
description = lib.mdDoc "Timeout in seconds.";
};
method = mkOption {
type = types.enum [ "fork" "select" "ev" ];
default = "fork";
description = lib.mdDoc ''
The method to use for handling connections:
transparent = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc "Will the services behind sslh (Apache, sshd and so on) see the external IP and ports as if the external world connected directly to them";
};
- `fork` forks a new process for each incoming connection. It is
well-tested and very reliable, but incurs the overhead of many
processes.
listenAddresses = mkOption {
type = types.coercedTo types.str singleton (types.listOf types.str);
default = [ "0.0.0.0" "[::]" ];
description = lib.mdDoc "Listening addresses or hostnames.";
};
- `select` uses only one thread, which monitors all connections at once.
It has lower overhead per connection, but if it stops, you'll lose all
connections.
port = mkOption {
type = types.port;
default = 443;
description = lib.mdDoc "Listening port.";
};
- `ev` is implemented using libev, it's similar to `select` but
scales better to a large number of connections.
'';
};
appendConfig = mkOption {
type = types.str;
default = defaultAppendConfig;
description = lib.mdDoc "Verbatim configuration file.";
listenAddresses = mkOption {
type = with types; coercedTo str singleton (listOf str);
default = [ "0.0.0.0" "[::]" ];
description = lib.mdDoc "Listening addresses or hostnames.";
};
port = mkOption {
type = types.port;
default = 443;
description = lib.mdDoc "Listening port.";
};
settings = mkOption {
type = types.submodule {
freeformType = configFormat.type;
options.timeout = mkOption {
type = types.ints.unsigned;
default = 2;
description = lib.mdDoc "Timeout in seconds.";
};
options.transparent = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc ''
Whether the services behind sslh (Apache, sshd and so on) will see the
external IP and ports as if the external world connected directly to
them.
'';
};
options.verbose-connections = mkOption {
type = types.ints.between 0 4;
default = 0;
description = lib.mdDoc ''
Where to log connections information. Possible values are:
0. don't log anything
1. write log to stdout
2. write log to syslog
3. write log to both stdout and syslog
4. write to a log file ({option}`sslh.settings.logfile`)
'';
};
options.numeric = mkOption {
type = types.bool;
default = true;
description = lib.mdDoc ''
Whether to disable reverse DNS lookups, thus keeping IP
address literals in the log.
'';
};
options.protocols = mkOption {
type = types.listOf configFormat.type;
default = [
{ name = "ssh"; host = "localhost"; port = "22"; service= "ssh"; }
{ name = "openvpn"; host = "localhost"; port = "1194"; }
{ name = "xmpp"; host = "localhost"; port = "5222"; }
{ name = "http"; host = "localhost"; port = "80"; }
{ name = "tls"; host = "localhost"; port = "443"; }
{ name = "anyprot"; host = "localhost"; port = "443"; }
];
description = lib.mdDoc ''
List of protocols sslh will probe for and redirect.
Each protocol entry consists of:
- `name`: name of the probe.
- `service`: libwrap service name (see {manpage}`hosts_access(5)`),
- `host`, `port`: where to connect when this probe succeeds,
- `log_level`: to log incoming connections,
- `transparent`: proxy this protocol transparently,
- etc.
See the documentation for all options, including probe-specific ones.
'';
};
};
description = lib.mdDoc "sslh configuration. See {manpage}`sslh(8)` for available settings.";
};
};
@ -96,20 +146,29 @@ in
PermissionsStartOnly = true;
Restart = "always";
RestartSec = "1s";
ExecStart = "${pkgs.sslh}/bin/sslh -F${configFile}";
ExecStart = "${pkgs.sslh}/bin/sslh-${cfg.method} -F${configFile}";
KillMode = "process";
AmbientCapabilities = "CAP_NET_BIND_SERVICE CAP_NET_ADMIN CAP_SETGID CAP_SETUID";
AmbientCapabilities = ["CAP_NET_BIND_SERVICE" "CAP_NET_ADMIN" "CAP_SETGID" "CAP_SETUID"];
PrivateTmp = true;
PrivateDevices = true;
ProtectSystem = "full";
ProtectHome = true;
};
};
services.sslh.settings = {
# Settings defined here are not supposed to be changed: doing so will
# break the module, as such you need `lib.mkForce` to override them.
foreground = true;
inetd = false;
listen = map (addr: { host = addr; port = toString cfg.port; }) cfg.listenAddresses;
};
})
# code from https://github.com/yrutschle/sslh#transparent-proxy-support
# the only difference is using iptables mark 0x2 instead of 0x1 to avoid conflicts with nixos/nat module
(mkIf (cfg.enable && cfg.transparent) {
(mkIf (cfg.enable && cfg.settings.transparent) {
# Set route_localnet = 1 on all interfaces so that ssl can use "localhost" as destination
boot.kernel.sysctl."net.ipv4.conf.default.route_localnet" = 1;
boot.kernel.sysctl."net.ipv4.conf.all.route_localnet" = 1;

50
nixos/modules/tasks/filesystems/bcachefs.nix
View File

@ -52,17 +52,43 @@ let
}
'';
openCommand = name: fs:
let
# we need only unlock one device manually, and cannot pass multiple at once
# remove this adaptation when bcachefs implements mounting by filesystem uuid
# also, implement automatic waiting for the constituent devices when that happens
# bcachefs does not support mounting devices with colons in the path, ergo we don't (see #49671)
firstDevice = head (splitString ":" fs.device);
in
''
tryUnlock ${name} ${firstDevice}
# we need only unlock one device manually, and cannot pass multiple at once
# remove this adaptation when bcachefs implements mounting by filesystem uuid
# also, implement automatic waiting for the constituent devices when that happens
# bcachefs does not support mounting devices with colons in the path, ergo we don't (see #49671)
firstDevice = fs: head (splitString ":" fs.device);
openCommand = name: fs: ''
tryUnlock ${name} ${firstDevice fs}
'';
mkUnits = prefix: name: fs: let
mountUnit = "${utils.escapeSystemdPath (prefix + (lib.removeSuffix "/" fs.mountPoint))}.mount";
device = firstDevice fs;
deviceUnit = "${utils.escapeSystemdPath device}.device";
in {
name = "unlock-bcachefs-${utils.escapeSystemdPath fs.mountPoint}";
value = {
description = "Unlock bcachefs for ${fs.mountPoint}";
requiredBy = [ mountUnit ];
before = [ mountUnit ];
bindsTo = [ deviceUnit ];
after = [ deviceUnit ];
unitConfig.DefaultDependencies = false;
serviceConfig = {
Type = "oneshot";
ExecCondition = "${pkgs.bcachefs-tools}/bin/bcachefs unlock -c \"${device}\"";
Restart = "on-failure";
RestartMode = "direct";
# Ideally, this service would lock the key on stop.
# As is, RemainAfterExit doesn't accomplish anything.
RemainAfterExit = true;
};
script = ''
${config.boot.initrd.systemd.package}/bin/systemd-ask-password --timeout=0 "enter passphrase for ${name}" | exec ${pkgs.bcachefs-tools}/bin/bcachefs unlock "${device}"
'';
};
};
in
@ -75,6 +101,8 @@ in
# use kernel package with bcachefs support until it's in mainline
# TODO replace with requireKernelConfig
boot.kernelPackages = pkgs.linuxPackages_testing_bcachefs;
systemd.services = lib.mapAttrs' (mkUnits "") (lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (!utils.fsNeededForBoot fs)) config.fileSystems);
}
(mkIf ((elem "bcachefs" config.boot.initrd.supportedFilesystems) || (bootFs != {})) {
@ -94,6 +122,8 @@ in
'';
boot.initrd.postDeviceCommands = commonFunctions + concatStrings (mapAttrsToList openCommand bootFs);
boot.initrd.systemd.services = lib.mapAttrs' (mkUnits "/sysroot") bootFs;
})
]);
}

2
nixos/tests/installer-systemd-stage-1.nix
View File

@ -8,6 +8,8 @@
# them when fixed.
inherit (import ./installer.nix { inherit system config pkgs; systemdStage1 = true; })
# bcache
bcachefsSimple
bcachefsEncrypted
btrfsSimple
btrfsSubvolDefault
btrfsSubvolEscape

4
nixos/tests/installer.nix
View File

@ -937,6 +937,10 @@ in {
enableOCR = true;
preBootCommands = ''
machine.start()
# Enter it wrong once
machine.wait_for_text("enter passphrase for ")
machine.send_chars("wrong\n")
# Then enter it right.
machine.wait_for_text("enter passphrase for ")
machine.send_chars("password\n")
'';

18
nixos/tests/sslh.nix
View File

@ -10,21 +10,13 @@ import ./make-test-python.nix {
prefixLength = 64;
}
];
# sslh is really slow when reverse dns does not work
networking.hosts = {
"fe00:aa:bb:cc::2" = [ "server" ];
"fe00:aa:bb:cc::1" = [ "client" ];
};
services.sslh = {
enable = true;
transparent = true;
appendConfig = ''
protocols:
(
{ name: "ssh"; service: "ssh"; host: "localhost"; port: "22"; probe: "builtin"; },
{ name: "http"; host: "localhost"; port: "80"; probe: "builtin"; },
);
'';
settings.transparent = true;
settings.protocols = [
{ name = "ssh"; service = "ssh"; host = "localhost"; port = "22"; probe = "builtin"; }
{ name = "http"; host = "localhost"; port = "80"; probe = "builtin"; }
];
};
services.openssh.enable = true;
users.users.root.openssh.authorizedKeys.keyFiles = [ ./initrd-network-ssh/id_ed25519.pub ];

4
pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
View File

@ -27,11 +27,11 @@
stdenv.mkDerivation rec {
pname = "bitwig-studio";
version = "5.0.9";
version = "5.0.11";
src = fetchurl {
url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
sha256 = "sha256-B6s8FuNvJ3NdU7uZ+AsZkiFf9p6WcLzoZPsfzors1kk=";
sha256 = "sha256-c9bRWVWCC9hLxmko6EHgxgmghrxskJP4PQf3ld2BHoY=";
};
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];

8
pkgs/applications/audio/cmus/default.nix
View File

@ -1,4 +1,4 @@
{ config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkg-config
{ config, lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, pkg-config
, libiconv, CoreAudio, AudioUnit, VideoToolbox
, alsaSupport ? stdenv.isLinux, alsa-lib ? null
@ -101,7 +101,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-Ha0bIh3SYMhA28YXQ//Loaz9J1lTJAzjTx8eK3AqUjM=";
};
patches = [ ./option-debugging.patch ];
patches = [
./option-debugging.patch
# ffmpeg 6 fix https://github.com/cmus/cmus/pull/1254/
(fetchpatch { url = "https://github.com/cmus/cmus/commit/07b368ff1500e1d2957cad61ced982fa10243fbc.patch"; hash = "sha256-5gsz3q8R9FPobHoLj8BQPsa9s4ULEA9w2VQR+gmpmgA="; })
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ncurses ]

9
pkgs/applications/editors/emacs/default.nix
View File

@ -4,7 +4,9 @@ lib.makeScope pkgs.newScope (self:
let
gconf = pkgs.gnome2.GConf;
inherit (self) callPackage;
stdenv = if pkgs.stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv;
stdenv = if pkgs.stdenv.isDarwin
then pkgs.darwin.apple_sdk_11_0.stdenv
else pkgs.stdenv;
inheritedArgs = {
inherit gconf;
inherit stdenv;
@ -16,7 +18,10 @@ lib.makeScope pkgs.newScope (self:
Quartz QuartzCore UniformTypeIdentifiers WebKit;
gnutls =
if pkgs.stdenv.isDarwin
then pkgs.gnutls.override { inherit stdenv; inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security; }
then pkgs.gnutls.override {
inherit stdenv;
inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security;
}
else pkgs.gnutls;
};
in {

283
pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
View File

@ -43,10 +43,10 @@
elpaBuild {
pname = "ada-mode";
ename = "ada-mode";
version = "8.0.5.0.20230208.70712";
version = "8.1.0.0.20231018.91522";
src = fetchurl {
url = "https://elpa.gnu.org/devel/ada-mode-8.0.5.0.20230208.70712.tar";
sha256 = "1957w6fynk345iwhgc4iq7zlda3fi211r7vi5420g761568wp4ca";
url = "https://elpa.gnu.org/devel/ada-mode-8.1.0.0.20231018.91522.tar";
sha256 = "00ywqyvqvynrskyg0wh2acl6a68f0s2r83w3cmsgxd569phlsrqp";
};
packageRequires = [ emacs gnat-compiler uniquify-files wisi ];
meta = {
@ -427,10 +427,10 @@
elpaBuild {
pname = "bbdb";
ename = "bbdb";
version = "3.2.2.2.0.20220705.233849";
version = "3.2.2.4.0.20231023.5901";
src = fetchurl {
url = "https://elpa.gnu.org/devel/bbdb-3.2.2.2.0.20220705.233849.tar";
sha256 = "1041nqxs8sp34zvpahn6x603hx8i2zc65jp6ygd611z7rb2mwd5x";
url = "https://elpa.gnu.org/devel/bbdb-3.2.2.4.0.20231023.5901.tar";
sha256 = "1hvhrbnnhc5hy4szkhsl5fvqlm13kzn5cx4l5sm5pr75xnmcvm08";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -453,17 +453,14 @@
license = lib.licenses.free;
};
}) {};
beframe = callPackage ({ elpaBuild
, emacs
, fetchurl
, lib }:
beframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "beframe";
ename = "beframe";
version = "0.3.0.0.20231017.145435";
version = "0.3.0.0.20231027.55708";
src = fetchurl {
url = "https://elpa.gnu.org/devel/beframe-0.3.0.0.20231017.145435.tar";
sha256 = "1fnflpbnnjzfyccq6jcpwsq9byn7jda8mjhjynjk3l27jmzqd2g2";
url = "https://elpa.gnu.org/devel/beframe-0.3.0.0.20231027.55708.tar";
sha256 = "0hmls2l6wy14hv3sghdha7h9gmqrany77cfiam5j2hqjhy0g6vns";
};
packageRequires = [ emacs ];
meta = {
@ -546,10 +543,10 @@
elpaBuild {
pname = "boxy";
ename = "boxy";
version = "1.1.3.0.20230408.95238";
version = "1.1.3.0.20231024.113314";
src = fetchurl {
url = "https://elpa.gnu.org/devel/boxy-1.1.3.0.20230408.95238.tar";
sha256 = "0hzfrbc20qn9ld51ivkvclphsvc2qqq4ir056d2d9bjxq56zndl6";
url = "https://elpa.gnu.org/devel/boxy-1.1.3.0.20231024.113314.tar";
sha256 = "1b5dkjic7spzbkj78m03z00gh8a9f8yv1kkyhnr4gks81jdr1gsn";
};
packageRequires = [ emacs ];
meta = {
@ -566,10 +563,10 @@
elpaBuild {
pname = "boxy-headings";
ename = "boxy-headings";
version = "2.1.4.0.20221114.84552";
version = "2.1.4.0.20231024.114002";
src = fetchurl {
url = "https://elpa.gnu.org/devel/boxy-headings-2.1.4.0.20221114.84552.tar";
sha256 = "1ximn07ri3wga73alglzlfmqly52v2dbr3y1hp6syv5m3mxk248f";
url = "https://elpa.gnu.org/devel/boxy-headings-2.1.4.0.20231024.114002.tar";
sha256 = "1fan3pdslmwxkdc8lj7svcjllzjqhnhsma1yjpfhi99dv4b8fyns";
};
packageRequires = [ boxy emacs org ];
meta = {
@ -713,10 +710,10 @@
elpaBuild {
pname = "cape";
ename = "cape";
version = "0.17.0.20230930.53703";
version = "0.17.0.20231022.115714";
src = fetchurl {
url = "https://elpa.gnu.org/devel/cape-0.17.0.20230930.53703.tar";
sha256 = "1jfba9fm075bj9si4mn5c63yzc15a6qm5c4swm6bvz1rlcmyq7cz";
url = "https://elpa.gnu.org/devel/cape-0.17.0.20231022.115714.tar";
sha256 = "0bvmrxjd054f14qap6w5052900k4pn33vb7cbc87rvrgdyhh5ixa";
};
packageRequires = [ compat emacs ];
meta = {
@ -915,10 +912,10 @@
elpaBuild {
pname = "company";
ename = "company";
version = "0.10.2.0.20231016.232437";
version = "0.10.2.0.20231023.103313";
src = fetchurl {
url = "https://elpa.gnu.org/devel/company-0.10.2.0.20231016.232437.tar";
sha256 = "16q3wlc1df8rlg67yihn33sshhg0c7lyvsajawf9xq92wqf2f5ik";
url = "https://elpa.gnu.org/devel/company-0.10.2.0.20231023.103313.tar";
sha256 = "1zcap5mv6cn9a2j8axg4yw4iprxkwwyjmw7qahijlk02ycwmwwfn";
};
packageRequires = [ emacs ];
meta = {
@ -1006,10 +1003,10 @@
elpaBuild {
pname = "consult";
ename = "consult";
version = "0.35.0.20231020.193229";
version = "0.35.0.20231023.154305";
src = fetchurl {
url = "https://elpa.gnu.org/devel/consult-0.35.0.20231020.193229.tar";
sha256 = "1k96wpiyyylcmyd7hyi8yv0s5qrzipnkz9jpdwh0j53vy6yd7a7i";
url = "https://elpa.gnu.org/devel/consult-0.35.0.20231023.154305.tar";
sha256 = "1cx8m0llk76z1kawkqg9dq7aws2i2bsgnhr3xvw7chdwvjywghs6";
};
packageRequires = [ compat emacs ];
meta = {
@ -1093,10 +1090,10 @@
elpaBuild {
pname = "counsel";
ename = "counsel";
version = "0.14.0.0.20230619.162538";
version = "0.14.2.0.20231025.232958";
src = fetchurl {
url = "https://elpa.gnu.org/devel/counsel-0.14.0.0.20230619.162538.tar";
sha256 = "0lirnz10p9zyvdhwwqgvc7wasm31syifb2khxdwi4bqqgrmpqvix";
url = "https://elpa.gnu.org/devel/counsel-0.14.2.0.20231025.232958.tar";
sha256 = "0y1lxhsmjazml41sg0if7y9jv1i90ad13grafil6pb4mg4m15v70";
};
packageRequires = [ emacs ivy swiper ];
meta = {
@ -1323,10 +1320,10 @@
elpaBuild {
pname = "denote";
ename = "denote";
version = "2.0.0.0.20231020.121249";
version = "2.0.0.0.20231027.53913";
src = fetchurl {
url = "https://elpa.gnu.org/devel/denote-2.0.0.0.20231020.121249.tar";
sha256 = "130k9ixw0n20zvhyj1b0k1363p8wa7q2klw9g8m9p4b6sslh7w5f";
url = "https://elpa.gnu.org/devel/denote-2.0.0.0.20231027.53913.tar";
sha256 = "044r77y0b7b3svwjin926xkp8xcwkxjpixi0x8nrfzh2krzkkakx";
};
packageRequires = [ emacs ];
meta = {
@ -1566,10 +1563,10 @@
elpaBuild {
pname = "do-at-point";
ename = "do-at-point";
version = "0.1.1.0.20231002.131946";
version = "0.1.1.0.20231027.63811";
src = fetchurl {
url = "https://elpa.gnu.org/devel/do-at-point-0.1.1.0.20231002.131946.tar";
sha256 = "1bqbfb2cj4qb46lximqz3nymdyq6lc5df74cvwksng09226nk9nj";
url = "https://elpa.gnu.org/devel/do-at-point-0.1.1.0.20231027.63811.tar";
sha256 = "0k490g70lv89l87bn79m4bphnkv6vk578qgv1vk64z403wdgvxbv";
};
packageRequires = [ emacs ];
meta = {
@ -1662,10 +1659,10 @@
elpaBuild {
pname = "ebdb";
ename = "ebdb";
version = "0.8.18.0.20231021.161113";
version = "0.8.18.0.20231023.175242";
src = fetchurl {
url = "https://elpa.gnu.org/devel/ebdb-0.8.18.0.20231021.161113.tar";
sha256 = "0p6n69qzl3cpnhpyvfzn0pqmh0wjw2mrd4q4dnj4w4p9103g1z62";
url = "https://elpa.gnu.org/devel/ebdb-0.8.18.0.20231023.175242.tar";
sha256 = "0lxb9isbg6whwcfi8gjmggi4aa4ri6b4mx4xiljzwkmrcv3y5q76";
};
packageRequires = [ emacs seq ];
meta = {
@ -1748,10 +1745,10 @@
elpaBuild {
pname = "ef-themes";
ename = "ef-themes";
version = "1.3.0.0.20231014.41130";
version = "1.4.0.0.20231026.80318";
src = fetchurl {
url = "https://elpa.gnu.org/devel/ef-themes-1.3.0.0.20231014.41130.tar";
sha256 = "0sgyjwwna91mfj1knirx34hc27101lhpsnfw9ncb63790yw4sidd";
url = "https://elpa.gnu.org/devel/ef-themes-1.4.0.0.20231026.80318.tar";
sha256 = "02nx6p5m54gyyw2rjb0msvh3cijnqpm0p5i9l71gykg54rbabwnr";
};
packageRequires = [ emacs ];
meta = {
@ -1884,10 +1881,10 @@
elpaBuild {
pname = "embark";
ename = "embark";
version = "0.23.0.20231007.130222";
version = "0.23.0.20231026.124244";
src = fetchurl {
url = "https://elpa.gnu.org/devel/embark-0.23.0.20231007.130222.tar";
sha256 = "0q15m0zccz3h9w88y3pbdy7g09yn317pyhf880gqpiwpbprd831b";
url = "https://elpa.gnu.org/devel/embark-0.23.0.20231026.124244.tar";
sha256 = "0d73fpxqv243pbj36299nfb4j6w2aqabpn4l3z1gvcpx2x2abbrd";
};
packageRequires = [ compat emacs ];
meta = {
@ -1904,10 +1901,10 @@
elpaBuild {
pname = "embark-consult";
ename = "embark-consult";
version = "0.8.0.20231007.130222";
version = "0.8.0.20231026.124244";
src = fetchurl {
url = "https://elpa.gnu.org/devel/embark-consult-0.8.0.20231007.130222.tar";
sha256 = "11c5r7j7hi5f91pn4dcx8z3i7p3lhrhqpj8jd6g36mwn3scb9m1b";
url = "https://elpa.gnu.org/devel/embark-consult-0.8.0.20231026.124244.tar";
sha256 = "0wd3pdkh0y5x2bd8q6q7bc543s5ks7d8zlxrflk5ywlqaz8xi9g4";
};
packageRequires = [ consult emacs embark ];
meta = {
@ -2027,10 +2024,10 @@
elpaBuild {
pname = "erc";
ename = "erc";
version = "5.6snapshot0.20231020.152406";
version = "5.6snapshot0.20231027.130929";
src = fetchurl {
url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20231020.152406.tar";
sha256 = "18h6jkp051mmixrnfgqnkh0c21qfnpaxzhjnsxxaknp3v17rvm5d";
url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20231027.130929.tar";
sha256 = "1v1r86cpl4jnnds9ljwr71g3xc96b2gvjbcpcvkhjfbf8g58ky40";
};
packageRequires = [ compat emacs ];
meta = {
@ -2260,14 +2257,19 @@
license = lib.licenses.free;
};
}) {};
flymake = callPackage ({ eldoc, elpaBuild, emacs, fetchurl, lib, project }:
flymake = callPackage ({ eldoc
, elpaBuild
, emacs
, fetchurl
, lib
, project }:
elpaBuild {
pname = "flymake";
ename = "flymake";
version = "1.3.6.0.20230924.80727";
version = "1.3.7.0.20231026.132104";
src = fetchurl {
url = "https://elpa.gnu.org/devel/flymake-1.3.6.0.20230924.80727.tar";
sha256 = "0ldy6idm6kvrpx3d08wgalrv17s5vpwxqh339mq8ijv9qz7i39w4";
url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20231026.132104.tar";
sha256 = "0xk42bz63156vnkwxk743ln1w0zjs7yjayy9l2a97mynnzwa0knh";
};
packageRequires = [ eldoc emacs project ];
meta = {
@ -2300,10 +2302,10 @@
elpaBuild {
pname = "fontaine";
ename = "fontaine";
version = "1.0.0.0.20230929.155942";
version = "1.0.0.0.20231026.83630";
src = fetchurl {
url = "https://elpa.gnu.org/devel/fontaine-1.0.0.0.20230929.155942.tar";
sha256 = "1xznn6w38p6riccwbnlqnqysaapssz18kwx0f9j4h07aam8d7kkg";
url = "https://elpa.gnu.org/devel/fontaine-1.0.0.0.20231026.83630.tar";
sha256 = "0y02wj5m1xj7ja57rj42jhdjvzy7rsdk3vkdmaay7y4bh4dd7vnl";
};
packageRequires = [ emacs ];
meta = {
@ -2446,10 +2448,10 @@
elpaBuild {
pname = "gnat-compiler";
ename = "gnat-compiler";
version = "1.0.2.0.20230124.51334";
version = "1.0.3.0.20230915.165808";
src = fetchurl {
url = "https://elpa.gnu.org/devel/gnat-compiler-1.0.2.0.20230124.51334.tar";
sha256 = "0kqzqw2dbsmcmrqkb5rsjmkpznfj1licnbfjbp1ifs0kaf2cigqy";
url = "https://elpa.gnu.org/devel/gnat-compiler-1.0.3.0.20230915.165808.tar";
sha256 = "1za3ihjbramms85r35kz1d3gyyr3kyimd5m7xsmqnrpj3wsrjika";
};
packageRequires = [ emacs wisi ];
meta = {
@ -2585,10 +2587,10 @@
elpaBuild {
pname = "gpr-mode";
ename = "gpr-mode";
version = "1.0.3.0.20230119.135149";
version = "1.0.4.0.20231015.114428";
src = fetchurl {
url = "https://elpa.gnu.org/devel/gpr-mode-1.0.3.0.20230119.135149.tar";
sha256 = "1qd4wdmjlhj325q5qjhdx2l4z1bqpv4giwvsgd29s9k3sh7n8m2h";
url = "https://elpa.gnu.org/devel/gpr-mode-1.0.4.0.20231015.114428.tar";
sha256 = "1y3571ymlrgiq5jxbwlyw43pmfxgq776pajb9hlvyz9l3w195c8g";
};
packageRequires = [ emacs gnat-compiler wisi ];
meta = {
@ -2605,10 +2607,10 @@
elpaBuild {
pname = "gpr-query";
ename = "gpr-query";
version = "1.0.3.0.20230128.112055";
version = "1.0.4.0.20231018.92052";
src = fetchurl {
url = "https://elpa.gnu.org/devel/gpr-query-1.0.3.0.20230128.112055.tar";
sha256 = "0fnq3zdzlcfc54m5ix01ix78drfmzvfiicjp9cvsw78s0sd05p9x";
url = "https://elpa.gnu.org/devel/gpr-query-1.0.4.0.20231018.92052.tar";
sha256 = "1pk14d88vy0ylgcdymp9pclygpn06n25yhy0hsjs0lrd8zr56a49";
};
packageRequires = [ emacs gnat-compiler wisi ];
meta = {
@ -2631,17 +2633,14 @@
license = lib.licenses.free;
};
}) {};
greader = callPackage ({ elpaBuild
, emacs
, fetchurl
, lib }:
greader = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "greader";
ename = "greader";
version = "0.5.0.0.20230927.204955";
version = "0.5.0.0.20231026.5322";
src = fetchurl {
url = "https://elpa.gnu.org/devel/greader-0.5.0.0.20230927.204955.tar";
sha256 = "02kq8r2grdg8y2bjcw01d5wm5mkv4wir4yggs41cmgcwnk3gm1d1";
url = "https://elpa.gnu.org/devel/greader-0.5.0.0.20231026.5322.tar";
sha256 = "0m4d1cr637jsy75ax6y2aqhzjwax7qkidm25k4qiqa69lzbkckid";
};
packageRequires = [ emacs ];
meta = {
@ -2824,10 +2823,10 @@
elpaBuild {
pname = "hyperbole";
ename = "hyperbole";
version = "8.0.1pre0.20231009.215811";
version = "8.0.1pre0.20231022.151646";
src = fetchurl {
url = "https://elpa.gnu.org/devel/hyperbole-8.0.1pre0.20231009.215811.tar";
sha256 = "0dhrjdk3llxv5s5xfd849vqwr6f1fk411klgjn44szkgi9anbqdv";
url = "https://elpa.gnu.org/devel/hyperbole-8.0.1pre0.20231022.151646.tar";
sha256 = "1kr6ayfnq9ah8n8b6k4lxh5napghb90y5sz0g3fs5qjbszcbvxc9";
};
packageRequires = [ emacs ];
meta = {
@ -2923,10 +2922,10 @@
elpaBuild {
pname = "ivy";
ename = "ivy";
version = "0.14.0.0.20230714.75746";
version = "0.14.2.0.20231025.231958";
src = fetchurl {
url = "https://elpa.gnu.org/devel/ivy-0.14.0.0.20230714.75746.tar";
sha256 = "166nysfapnz1b15dmag9hlfx26j0k882k5wmx7fpbm4mdj20y6q0";
url = "https://elpa.gnu.org/devel/ivy-0.14.2.0.20231025.231958.tar";
sha256 = "0r6dyq350djn5vprk0cvj7vh3l0j2vadsxaiq35yv9gjqh20ca88";
};
packageRequires = [ emacs ];
meta = {
@ -2943,10 +2942,10 @@
elpaBuild {
pname = "ivy-avy";
ename = "ivy-avy";
version = "0.14.0.0.20230410.182616";
version = "0.14.2.0.20231025.232243";
src = fetchurl {
url = "https://elpa.gnu.org/devel/ivy-avy-0.14.0.0.20230410.182616.tar";
sha256 = "1s749025jyd5qy5yhxnnd71bj1qcwa6ah0ddl2cs16h9mdbf87qy";
url = "https://elpa.gnu.org/devel/ivy-avy-0.14.2.0.20231025.232243.tar";
sha256 = "1y9v3iv7zj7zc526k336rjq04vlisx8giyax5h0as97r8zc4rpzc";
};
packageRequires = [ avy emacs ivy ];
meta = {
@ -2982,10 +2981,10 @@
elpaBuild {
pname = "ivy-hydra";
ename = "ivy-hydra";
version = "0.14.0.0.20230410.182324";
version = "0.14.2.0.20231025.232457";
src = fetchurl {
url = "https://elpa.gnu.org/devel/ivy-hydra-0.14.0.0.20230410.182324.tar";
sha256 = "10sd554k3qb81am3jvg7l084i031c133a24cgh0g44vjj2s76nra";
url = "https://elpa.gnu.org/devel/ivy-hydra-0.14.2.0.20231025.232457.tar";
sha256 = "15az95s0bv0wc33kqh2h5n92hhn54mhy4lx9m2mm2x83jggdw4yy";
};
packageRequires = [ emacs hydra ivy ];
meta = {
@ -3068,10 +3067,10 @@
elpaBuild {
pname = "jinx";
ename = "jinx";
version = "0.9.0.20231019.170830";
version = "0.9.0.20231026.154650";
src = fetchurl {
url = "https://elpa.gnu.org/devel/jinx-0.9.0.20231019.170830.tar";
sha256 = "13wd7xaa3grslycvykx4yglh669fqrrfpqz6715zifkd3mnl0ik3";
url = "https://elpa.gnu.org/devel/jinx-0.9.0.20231026.154650.tar";
sha256 = "1fck948ay9n64mxqmx7j6fn6hzfn858l0s0gw544in2y617niyh6";
};
packageRequires = [ compat emacs ];
meta = {
@ -3316,10 +3315,10 @@
elpaBuild {
pname = "llm";
ename = "llm";
version = "0.4.0.0.20231018.234129";
version = "0.5.0.0.20231026.5843";
src = fetchurl {
url = "https://elpa.gnu.org/devel/llm-0.4.0.0.20231018.234129.tar";
sha256 = "1zfqyqga38j319hy85pq7fqmma1x2p716z6zvydrnn0npnfnggry";
url = "https://elpa.gnu.org/devel/llm-0.5.0.0.20231026.5843.tar";
sha256 = "0ywmfbis4jrqjg2gc3khgwc9kdbhjh99syag2bk1vzjmwfd2cq89";
};
packageRequires = [ emacs ];
meta = {
@ -3477,10 +3476,10 @@
elpaBuild {
pname = "marginalia";
ename = "marginalia";
version = "1.3.0.20230925.162757";
version = "1.3.0.20231026.181335";
src = fetchurl {
url = "https://elpa.gnu.org/devel/marginalia-1.3.0.20230925.162757.tar";
sha256 = "0g0ccxd2ks2av5lxbz5c3hi86jf10dizvm8ziday1v34lbp4f6hw";
url = "https://elpa.gnu.org/devel/marginalia-1.3.0.20231026.181335.tar";
sha256 = "1q7dbzrdzjwiyq09zbq8wbj673vaj5ss3xyrz3y226wb6jpmzr74";
};
packageRequires = [ compat emacs ];
meta = {
@ -4094,10 +4093,10 @@
elpaBuild {
pname = "orderless";
ename = "orderless";
version = "1.0.0.20230919.235319";
version = "1.0.0.20231025.204425";
src = fetchurl {
url = "https://elpa.gnu.org/devel/orderless-1.0.0.20230919.235319.tar";
sha256 = "0j26253q0f6h016xpgxx6jy36mdi9sm5bvyki7i2374hmcp5lxd8";
url = "https://elpa.gnu.org/devel/orderless-1.0.0.20231025.204425.tar";
sha256 = "1lsfa62hpq6zmk49mnf1434lqv3p472la3aky003xplkvl0xbw7l";
};
packageRequires = [ emacs ];
meta = {
@ -4109,10 +4108,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "9.7pre0.20231021.130825";
version = "9.7pre0.20231027.91944";
src = fetchurl {
url = "https://elpa.gnu.org/devel/org-9.7pre0.20231021.130825.tar";
sha256 = "1vfgzgd7zwcnv55n7v542zn90irwjwsgn7z8kmxqg5cpyw0r2x06";
url = "https://elpa.gnu.org/devel/org-9.7pre0.20231027.91944.tar";
sha256 = "0af65mm22bl6c38abqn39s5rz6i67pbcmhfq6n2hn0a8jgmmppwc";
};
packageRequires = [ emacs ];
meta = {
@ -4205,10 +4204,10 @@
elpaBuild {
pname = "org-real";
ename = "org-real";
version = "1.0.6.0.20221114.84409";
version = "1.0.7.0.20231024.111108";
src = fetchurl {
url = "https://elpa.gnu.org/devel/org-real-1.0.6.0.20221114.84409.tar";
sha256 = "1xmix5ldxxkh249fgyqlp31yndl14gz3ylpcsh6l9hmwqagzg20x";
url = "https://elpa.gnu.org/devel/org-real-1.0.7.0.20231024.111108.tar";
sha256 = "199900lvg5jxfspp1papx0aj88vm6addlyv7zhp8bc2f5a9igg21";
};
packageRequires = [ boxy emacs org ];
meta = {
@ -5072,10 +5071,10 @@
elpaBuild {
pname = "relint";
ename = "relint";
version = "1.24.0.20231005.122642";
version = "1.24.0.20231026.84057";
src = fetchurl {
url = "https://elpa.gnu.org/devel/relint-1.24.0.20231005.122642.tar";
sha256 = "0xlb4i0zj225q8l4a9riagc7qv795bigygmqrlm81ypxqvbm3r5n";
url = "https://elpa.gnu.org/devel/relint-1.24.0.20231026.84057.tar";
sha256 = "0s0gz6w6b04sif8yf83hb7y61jmjvksmslznmzlf8x3rq9p7kwyd";
};
packageRequires = [ emacs xr ];
meta = {
@ -5814,10 +5813,10 @@
elpaBuild {
pname = "swiper";
ename = "swiper";
version = "0.14.0.0.20230410.182739";
version = "0.14.2.0.20231025.232825";
src = fetchurl {
url = "https://elpa.gnu.org/devel/swiper-0.14.0.0.20230410.182739.tar";
sha256 = "10vqxmqdzvr7rg6wg5whzl4w9y4j47m330fx7qgvzi5zw28b69f3";
url = "https://elpa.gnu.org/devel/swiper-0.14.2.0.20231025.232825.tar";
sha256 = "13jvr9xv1i44ky906m4awkakvhrmpxg7x5f9hzbwnfz52wcxx8ix";
};
packageRequires = [ emacs ivy ];
meta = {
@ -6165,16 +6164,17 @@
, elpaBuild
, emacs
, fetchurl
, lib }:
, lib
, seq }:
elpaBuild {
pname = "transient";
ename = "transient";
version = "0.4.3.0.20230919.214625";
version = "0.4.3.0.20231024.181508";
src = fetchurl {
url = "https://elpa.gnu.org/devel/transient-0.4.3.0.20230919.214625.tar";
sha256 = "1b4dlgk6x22mpacd4wiinlh5sjgprhabha7wq7dfcsgv7mqhk5z2";
url = "https://elpa.gnu.org/devel/transient-0.4.3.0.20231024.181508.tar";
sha256 = "0b092m462gndqlyv8lvfikkdqmly2w5dkbbkn405rbmki2r4bggk";
};
packageRequires = [ compat emacs ];
packageRequires = [ compat emacs seq ];
meta = {
homepage = "https://elpa.gnu.org/packages/transient.html";
license = lib.licenses.free;
@ -6347,10 +6347,10 @@
elpaBuild {
pname = "urgrep";
ename = "urgrep";
version = "0.3.0snapshot0.20230831.195518";
version = "0.3.0snapshot0.20231026.224925";
src = fetchurl {
url = "https://elpa.gnu.org/devel/urgrep-0.3.0snapshot0.20230831.195518.tar";
sha256 = "1qhvspbzbnl1jcqhixfbrqg9jxmc495gv95vhiadm3dpqhxfcn81";
url = "https://elpa.gnu.org/devel/urgrep-0.3.0snapshot0.20231026.224925.tar";
sha256 = "07akrg4z177xjway75bl7281ic78j8sl818jd52nmxhx4wxys9mv";
};
packageRequires = [ compat emacs project ];
meta = {
@ -6367,10 +6367,10 @@
elpaBuild {
pname = "url-http-ntlm";
ename = "url-http-ntlm";
version = "2.0.4.0.20231015.130736";
version = "2.0.5.0.20231024.31412";
src = fetchurl {
url = "https://elpa.gnu.org/devel/url-http-ntlm-2.0.4.0.20231015.130736.tar";
sha256 = "0gpkr7m2kwnz7pmj6y4xn41175jy9vaxsj5f7glzd3w1xklr4hg0";
url = "https://elpa.gnu.org/devel/url-http-ntlm-2.0.5.0.20231024.31412.tar";
sha256 = "0vr04yr4ywxvh7c6s447bsa5v148ny3lvx54bpd60qf5cp92z1zw";
};
packageRequires = [ cl-lib nadvice ntlm ];
meta = {
@ -6418,10 +6418,10 @@
elpaBuild {
pname = "use-package";
ename = "use-package";
version = "2.4.5.0.20231022.75512";
version = "2.4.5.0.20231026.114632";
src = fetchurl {
url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20231022.75512.tar";
sha256 = "0cvsqrbamg9nxcjxqiq6avjyk027dxxzskgnvv0drrlsgcvb3yai";
url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20231026.114632.tar";
sha256 = "0sfs6030s6zngxgsv9wj181brsk6f8avfvl53vr0yspry53z2vpz";
};
packageRequires = [ bind-key emacs ];
meta = {
@ -6855,10 +6855,10 @@
elpaBuild {
pname = "wisi";
ename = "wisi";
version = "4.2.2.0.20230126.2042";
version = "4.3.2.0.20231026.105332";
src = fetchurl {
url = "https://elpa.gnu.org/devel/wisi-4.2.2.0.20230126.2042.tar";
sha256 = "0b70yipm6wmz5034f5l7f78c2bgscm2c8lph75jgd5x1qwzngw47";
url = "https://elpa.gnu.org/devel/wisi-4.3.2.0.20231026.105332.tar";
sha256 = "1jlqvimnjsdvaylfj2hq9k9bllvl74j1g4pd8w4kf3c30n7jyiql";
};
packageRequires = [ emacs seq ];
meta = {
@ -6875,10 +6875,10 @@
elpaBuild {
pname = "wisitoken-grammar-mode";
ename = "wisitoken-grammar-mode";
version = "1.3.0.0.20230125.102656";
version = "1.3.0.0.20231023.83923";
src = fetchurl {
url = "https://elpa.gnu.org/devel/wisitoken-grammar-mode-1.3.0.0.20230125.102656.tar";
sha256 = "1h5pnghxg01f0hgxw7284b4rm5c43r48nbsxj19dcypxrzz3w1qw";
url = "https://elpa.gnu.org/devel/wisitoken-grammar-mode-1.3.0.0.20231023.83923.tar";
sha256 = "17kgrwm1jr1dxaprgay60jmgg5bfhmyrngzy0qfia6zs7w43bscx";
};
packageRequires = [ emacs mmm-mode wisi ];
meta = {
@ -6982,10 +6982,10 @@
elpaBuild {
pname = "xr";
ename = "xr";
version = "1.25.0.20231005.122612";
version = "1.25.0.20231026.84432";
src = fetchurl {
url = "https://elpa.gnu.org/devel/xr-1.25.0.20231005.122612.tar";
sha256 = "0sj2cyxdfykk3gfw3v9d93mzssxiassj5vhzl76sm8dy59z93z4y";
url = "https://elpa.gnu.org/devel/xr-1.25.0.20231026.84432.tar";
sha256 = "0kvkz24z0cb32igj1hv09j0cg2xhwrkafi7zhfb85vwj4kgcd6pj";
};
packageRequires = [ emacs ];
meta = {
@ -6997,10 +6997,10 @@
elpaBuild {
pname = "xref";
ename = "xref";
version = "1.6.3.0.20231009.180303";
version = "1.6.3.0.20231023.205120";
src = fetchurl {
url = "https://elpa.gnu.org/devel/xref-1.6.3.0.20231009.180303.tar";
sha256 = "146bvnaxzfqjbpib8cm7mlq4j2695wh9czwi9lfbx5k8npakjrih";
url = "https://elpa.gnu.org/devel/xref-1.6.3.0.20231023.205120.tar";
sha256 = "1qszzbnn3pdpy7q7i9ir04dnp15rgkm7xnl73pp3wpvbqjwwgmd3";
};
packageRequires = [ emacs ];
meta = {
@ -7028,17 +7028,18 @@
}) {};
yasnippet = callPackage ({ cl-lib ? null
, elpaBuild
, emacs
, fetchurl
, lib }:
elpaBuild {
pname = "yasnippet";
ename = "yasnippet";
version = "0.14.0.0.20230912.111325";
version = "0.14.0.0.20230914.100037";
src = fetchurl {
url = "https://elpa.gnu.org/devel/yasnippet-0.14.0.0.20230912.111325.tar";
sha256 = "0k9h33dgxhg20cg2wwxmhxl5yzyh2g4kims15l0rgs2ag496qn5a";
url = "https://elpa.gnu.org/devel/yasnippet-0.14.0.0.20230914.100037.tar";
sha256 = "0kqv0scxkxxczxc1fxmpv0lgddp92j600s972xwb681a0vq2ssz6";
};
packageRequires = [ cl-lib ];
packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/yasnippet.html";
license = lib.licenses.free;

99
pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
View File

@ -40,10 +40,10 @@
elpaBuild {
pname = "ada-mode";
ename = "ada-mode";
version = "8.0.5";
version = "8.1.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ada-mode-8.0.5.tar";
sha256 = "00baypl9bv2z42d6z2k531ai25yw2aj1dcv4pi1jhcp19c9kjg4l";
url = "https://elpa.gnu.org/packages/ada-mode-8.1.0.tar";
sha256 = "1nfqm173gbk6483xgdkmxp5nb8biihq1623058gbl0dfwn0p9njh";
};
packageRequires = [ emacs gnat-compiler uniquify-files wisi ];
meta = {
@ -370,10 +370,10 @@
elpaBuild {
pname = "bbdb";
ename = "bbdb";
version = "3.2.2.2";
version = "3.2.2.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/bbdb-3.2.2.2.tar";
sha256 = "0bf20r5xhxln6z4qp8zrlln0303dkci2ydsr74pxcj08aqgk5xxf";
url = "https://elpa.gnu.org/packages/bbdb-3.2.2.4.tar";
sha256 = "13i8ggknc29sny16rq126q0ssz26m3fam0zpdhlsm05pa8dydd7p";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -952,10 +952,10 @@
elpaBuild {
pname = "counsel";
ename = "counsel";
version = "0.14.0";
version = "0.14.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/counsel-0.14.0.tar";
sha256 = "03n1qk66dcbh9xlnlzpwkb441c2xdpfc7bzx4i2szw0xh4a6g5sj";
url = "https://elpa.gnu.org/packages/counsel-0.14.2.tar";
sha256 = "13119alyzr2xipk3jra3iawplqkqgvv0gdcm4yd527z592b0s7f0";
};
packageRequires = [ emacs ivy swiper ];
meta = {
@ -1543,10 +1543,10 @@
elpaBuild {
pname = "ef-themes";
ename = "ef-themes";
version = "1.3.0";
version = "1.4.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ef-themes-1.3.0.tar";
sha256 = "1cchc1cfp2y32d736r4523gjzvg4rd1nqddxsjsk5kialz06alms";
url = "https://elpa.gnu.org/packages/ef-themes-1.4.0.tar";
sha256 = "0pp72bi9s7vyxyyy7dc0vql4k6hqzd1gg3a2i4wi09awdak85gi6";
};
packageRequires = [ emacs ];
meta = {
@ -2011,10 +2011,10 @@
elpaBuild {
pname = "flymake";
ename = "flymake";
version = "1.3.6";
version = "1.3.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/flymake-1.3.6.tar";
sha256 = "1ihv8gh77849rrdc6qpbpjdw7ikr4biaibw6aggv3hzjf508dzi8";
url = "https://elpa.gnu.org/packages/flymake-1.3.7.tar";
sha256 = "07n72y77q1vqvz1rv36jq1cxdp1brp572plvsi2g6mizif5y531z";
};
packageRequires = [ eldoc emacs project ];
meta = {
@ -2176,10 +2176,10 @@
elpaBuild {
pname = "gnat-compiler";
ename = "gnat-compiler";
version = "1.0.2";
version = "1.0.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/gnat-compiler-1.0.2.tar";
sha256 = "1cwjv1ziw5hjnk493vwwg25bnvy98wcryy0c4gknl1xp5qr2qxdg";
url = "https://elpa.gnu.org/packages/gnat-compiler-1.0.3.tar";
sha256 = "1l5j3br5yrhp3ic0va666ar636hywfd8vssxma3gc858zb9qbzw2";
};
packageRequires = [ emacs wisi ];
meta = {
@ -2308,10 +2308,10 @@
elpaBuild {
pname = "gpr-mode";
ename = "gpr-mode";
version = "1.0.3";
version = "1.0.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/gpr-mode-1.0.3.tar";
sha256 = "0m93szqyh9dd73z2pygvacg42n3siiy8pji3yzg1ynji859bc3b8";
url = "https://elpa.gnu.org/packages/gpr-mode-1.0.4.tar";
sha256 = "1c97m28i6lym07kb05jgssjxj6p9v3v56qrn48xwv55sriqrha4l";
};
packageRequires = [ emacs gnat-compiler wisi ];
meta = {
@ -2328,10 +2328,10 @@
elpaBuild {
pname = "gpr-query";
ename = "gpr-query";
version = "1.0.3";
version = "1.0.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/gpr-query-1.0.3.tar";
sha256 = "13h8hl2g55mbaz95k9jfcvz718rv4vli9wccr3rr7cb7yfvn4c5j";
url = "https://elpa.gnu.org/packages/gpr-query-1.0.4.tar";
sha256 = "0a6wrkjqszqq4d0a1amrp7yx4w2hwjbyy7qxd40k9n1vdp7jbzri";
};
packageRequires = [ emacs gnat-compiler wisi ];
meta = {
@ -2620,10 +2620,10 @@
elpaBuild {
pname = "ivy";
ename = "ivy";
version = "0.14.0";
version = "0.14.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ivy-0.14.0.tar";
sha256 = "1fzl7xcmxjg005g4676ac3jcshgmcmdr81ywmxvjcs8wj71v56jv";
url = "https://elpa.gnu.org/packages/ivy-0.14.2.tar";
sha256 = "1zjksh0jvxyqhzgwmh9i26gaip6c04q400xckh730r2gjs287pjj";
};
packageRequires = [ emacs ];
meta = {
@ -2635,10 +2635,10 @@
elpaBuild {
pname = "ivy-avy";
ename = "ivy-avy";
version = "0.14.0";
version = "0.14.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ivy-avy-0.14.0.tar";
sha256 = "0gjpvjahhkxsakqrcni78v71fsrh3f0jrs55a4kqc5hv6qyn8hk9";
url = "https://elpa.gnu.org/packages/ivy-avy-0.14.2.tar";
sha256 = "0vdrfn2i078567lklhxfhzq2cjplfpawyq2rzpdpww0fzz6fi426";
};
packageRequires = [ avy emacs ivy ];
meta = {
@ -2665,10 +2665,10 @@
elpaBuild {
pname = "ivy-hydra";
ename = "ivy-hydra";
version = "0.14.0";
version = "0.14.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ivy-hydra-0.14.0.tar";
sha256 = "1gsjr2yny9qcj56cb4xy47la11z0lszq0f2qws0yzyh02ng30k1n";
url = "https://elpa.gnu.org/packages/ivy-hydra-0.14.2.tar";
sha256 = "10qav0rvgc5bnlazjiwnv9dlk6hivl4acif0zq2f0qqgld9nh528";
};
packageRequires = [ emacs hydra ivy ];
meta = {
@ -2975,10 +2975,10 @@
elpaBuild {
pname = "llm";
ename = "llm";
version = "0.4.0";
version = "0.5.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/llm-0.4.0.tar";
sha256 = "0jq1q9gmm3nbdsycca2qkjpf04qpp9j615z6l41plmfv7bc0p0x6";
url = "https://elpa.gnu.org/packages/llm-0.5.0.tar";
sha256 = "07n32hfzyjzj7vjy5l7rxaldpa4hyjwharkizs2gzz66lg83wix8";
};
packageRequires = [ emacs ];
meta = {
@ -3779,10 +3779,10 @@
elpaBuild {
pname = "org-real";
ename = "org-real";
version = "1.0.6";
version = "1.0.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-real-1.0.6.tar";
sha256 = "1qfzmmv3c1yc14v502x0438pxh2bcwli1r3xmcxibhb7h6p9mr3k";
url = "https://elpa.gnu.org/packages/org-real-1.0.7.tar";
sha256 = "16isfsaxmgxiqfqx4lcsqlxazxjgxakr0k9pgpam13bqqqkq3cmp";
};
packageRequires = [ boxy emacs org ];
meta = {
@ -5169,10 +5169,10 @@
elpaBuild {
pname = "swiper";
ename = "swiper";
version = "0.14.0";
version = "0.14.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/swiper-0.14.0.tar";
sha256 = "1p2qil6gj4y8y3ydqs8pbxn8j16q9r42nnc2f61c30hws504pkms";
url = "https://elpa.gnu.org/packages/swiper-0.14.2.tar";
sha256 = "1x6jnc0nrk68kww12gq6w8nss6ny76xz0fgxf57550bbipx9pa8m";
};
packageRequires = [ emacs ivy ];
meta = {
@ -5643,16 +5643,17 @@
, elpaBuild
, fetchurl
, lib
, nadvice
, ntlm ? null }:
elpaBuild {
pname = "url-http-ntlm";
ename = "url-http-ntlm";
version = "2.0.4";
version = "2.0.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/url-http-ntlm-2.0.4.el";
sha256 = "1cakq2ykraci7d1gl8rnpv4f2f5ffyaidhqb1282g7i72adwmb98";
url = "https://elpa.gnu.org/packages/url-http-ntlm-2.0.5.tar";
sha256 = "0bpjif0c4yzz75v59wsv7hilkpj2gv4kyc0rdk8h3d9hvmlq7791";
};
packageRequires = [ cl-lib ntlm ];
packageRequires = [ cl-lib nadvice ntlm ];
meta = {
homepage = "https://elpa.gnu.org/packages/url-http-ntlm.html";
license = lib.licenses.free;
@ -6097,10 +6098,10 @@
elpaBuild {
pname = "wisi";
ename = "wisi";
version = "4.2.2";
version = "4.3.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/wisi-4.2.2.tar";
sha256 = "041np2xssm4iv75wmwds25fwx0p2y3j6ph0j0pxmgcj9p028mbka";
url = "https://elpa.gnu.org/packages/wisi-4.3.2.tar";
sha256 = "0y3wh0wvxqw7ig2bfrha4zs03993aqcpdp9pald20nady6sqri37";
};
packageRequires = [ emacs seq ];
meta = {

24
pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
View File

@ -361,10 +361,10 @@
elpaBuild {
pname = "cider";
ename = "cider";
version = "1.8.3";
version = "1.9.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/cider-1.8.3.tar";
sha256 = "0c77rlpyda4x05fj3d10cpww0pkbsjcbrvwcwy4gh74c9m9xmq1d";
url = "https://elpa.nongnu.org/nongnu/cider-1.9.0.tar";
sha256 = "08vc1v4gzh1njvqhg10c07wq28r2s9qq3y7i4b5clrzgy9l872cw";
};
packageRequires = [
clojure-mode
@ -3001,10 +3001,10 @@
elpaBuild {
pname = "sweeprolog";
ename = "sweeprolog";
version = "0.25.5";
version = "0.26.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.25.5.tar";
sha256 = "1gxy68a26h65rzf8815iifcnr67rpw69ll14d4cbq9qsxvrmy50h";
url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.26.0.tar";
sha256 = "0pgxz3ckw3qjzqyn6vr8k8y1gdiybsm47ik8j62ybsnqs7ivs208";
};
packageRequires = [ compat emacs ];
meta = {
@ -3307,10 +3307,10 @@
elpaBuild {
pname = "web-mode";
ename = "web-mode";
version = "17.3.14";
version = "17.3.15";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.14.tar";
sha256 = "1a13lra62vqcxr31ivx1r68wj1d59hkbrfxxmy8f7afm1v4aqbz2";
url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.15.tar";
sha256 = "028p034793pkkwgaqgc3zw23ji39ss5gma5g8fhml6v8pc4ri2w8";
};
packageRequires = [ emacs ];
meta = {
@ -3470,10 +3470,10 @@
elpaBuild {
pname = "xah-fly-keys";
ename = "xah-fly-keys";
version = "24.13.20231009115302";
version = "24.13.20231025112537";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.13.20231009115302.tar";
sha256 = "0k530ihjjwcvl24f815nk9jqfnbhzb95xlfm8721dlsbrsmsaiwc";
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.13.20231025112537.tar";
sha256 = "1h7z9g3307w0cg361md8mbhsia2534ncqihdfsasg5qhw9184sib";
};
packageRequires = [ emacs ];
meta = {

1319
pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
View File

File diff suppressed because it is too large Load Diff

0
pkgs/applications/editors/emacs/generic.nix → pkgs/applications/editors/emacs/make-emacs.nix
View File

8
pkgs/applications/editors/emacs/sources.nix
View File

@ -67,7 +67,7 @@ let
};
in
{
emacs28 = import ./generic.nix (mkArgs {
emacs28 = import ./make-emacs.nix (mkArgs {
pname = "emacs";
version = "28.2";
variant = "mainline";
@ -75,7 +75,7 @@ in
hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag=";
});
emacs29 = import ./generic.nix (mkArgs {
emacs29 = import ./make-emacs.nix (mkArgs {
pname = "emacs";
version = "29.1";
variant = "mainline";
@ -83,7 +83,7 @@ in
hash = "sha256-3HDCwtOKvkXwSULf3W7YgTz4GV8zvYnh2RrL28qzGKg=";
});
emacs28-macport = import ./generic.nix (mkArgs {
emacs28-macport = import ./make-emacs.nix (mkArgs {
pname = "emacs-mac";
version = "28.2";
variant = "macport";
@ -91,7 +91,7 @@ in
hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE=";
});
emacs29-macport = import ./generic.nix (mkArgs {
emacs29-macport = import ./make-emacs.nix (mkArgs {
pname = "emacs-mac";
version = "29.1";
variant = "macport";

6
pkgs/applications/file-managers/walk/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "walk";
version = "1.6.2";
version = "1.7.0";
src = fetchFromGitHub {
owner = "antonmedv";
repo = "walk";
rev = "v${version}";
hash = "sha256-Wo8i0nPAuzADLXlsEho9TSSbNh3d13iNsXXx5onPnIs=";
hash = "sha256-hif62WAyJyFHpJoP3ph7gJk1QkEL7qkcv/BJuoXkwFU=";
};
vendorHash = "sha256-AmgCyq+N+EMdpIUCe6Lzd8bDXHsbOzclsHPp+H5ROMc=";
vendorHash = "sha256-e292ke0JiFEopLSozb+FkpwzSuhpIs/PdWOYuNI2M2o=";
meta = with lib; {
description = "Terminal file manager";

1
pkgs/applications/misc/gimoji/default.nix
View File

@ -26,6 +26,7 @@ rustPlatform.buildRustPackage rec {
description = "Easily add emojis to your git commit messages";
homepage = "https://github.com/zeenix/gimoji";
license = licenses.mit;
mainProgram = "gimoji";
maintainers = with maintainers; [ a-kenji ];
};
}

8
pkgs/applications/networking/browsers/chromium/update.py
View File

@ -151,10 +151,6 @@ def channel_name_to_attr_name(channel_name):
"""Maps a channel name to the corresponding main Nixpkgs attribute name."""
if channel_name == 'stable':
return 'chromium'
if channel_name == 'beta':
return 'chromiumBeta'
if channel_name == 'dev':
return 'chromiumDev'
if channel_name == 'ungoogled-chromium':
return 'ungoogled-chromium'
print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr)
@ -206,6 +202,10 @@ with urlopen(RELEASES_URL) as resp:
if channel_name in channels:
continue
# We only look for channels that are listed in our version pin file.
if channel_name not in last_channels:
continue
# If we're back at the last release we used, we don't need to
# keep going -- there's no new version available, and we can
# just reuse the info from last time.

26
pkgs/applications/networking/browsers/chromium/upstream-info.nix
View File

@ -1,30 +1,4 @@
{
beta = {
deps = {
gn = {
rev = "811d332bd90551342c5cbd39e133aa276022d7f8";
hash = "sha256-WCq+PNkWxWpssUOQyQbAZ5l6k+hg+qGMsoaMG0Ybj0o=";
url = "https://gn.googlesource.com/gn";
version = "2023-08-01";
};
};
hash = "sha256-spzY2u5Wk52BrKCk9aQOEp/gbppaGVLCQxXa+3JuajA=";
hash_deb_amd64 = "sha256-eTeEeNa4JuCW81+SUAyrKi3S0/TJNTAoTktWQ0JsgYc=";
version = "117.0.5938.22";
};
dev = {
deps = {
gn = {
rev = "cc56a0f98bb34accd5323316e0292575ff17a5d4";
hash = "sha256-SwlET5h5xtDlQvlt8wbG73ZfUWJr4hlWc+uQsBH5x9M=";
url = "https://gn.googlesource.com/gn";
version = "2023-08-10";
};
};
hash = "sha256-W0fZuvv9jz03ibQqB6MG45aw2zPklfxoFzZzr+kRuJk=";
hash_deb_amd64 = "sha256-XWxRFLFxBqnvKcoB5HErwVbtHCGYRteLeTv44zVMwIc=";
version = "118.0.5966.0";
};
stable = {
chromedriver = {
hash_darwin = "sha256-ugsxRhIPtDD7Y4/PsIc8Apqrtyo4uiVKoLmtRvQaJ3k=";

4
pkgs/applications/networking/cluster/bosh-cli/default.nix
View File

@ -8,13 +8,13 @@
buildGoModule rec {
pname = "bosh-cli";
version = "7.4.0";
version = "7.4.1";
src = fetchFromGitHub {
owner = "cloudfoundry";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Hxak76S3+i5G81Xv4wdFvR/+vg5Eh86YjeqRzNUmfh4=";
sha256 = "sha256-T8fPD0i15U/PzDOAVP0sifLYFHr76jD1o7q+nn+N0cY=";
};
vendorHash = null;

41
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
View File

@ -1,6 +1,8 @@
{ lib
, fetchFromGitHub
, fetchurl
, fetchpatch
, fetchpatch2
, callPackage
, pkg-config
, cmake
@ -26,6 +28,7 @@
, libopus
, alsa-lib
, libpulseaudio
, perlPackages
, pipewire
, range-v3
, tl-expected
@ -55,6 +58,7 @@
, libpsl
, brotli
, microsoft-gsl
, mm-common
, rlottie
, stdenv
, nix-update-script
@ -73,17 +77,41 @@ let
cxxStandard = "20";
};
};
glibmm = glibmm_2_68.overrideAttrs (attrs: {
version = "2.78.0";
src = fetchurl {
url = "mirror://gnome/sources/glibmm/2.78/glibmm-2.78.0.tar.xz";
hash = "sha256-XS6HJWSZbwKgbYu6w2d+fDlK+LAN0VJq69R6+EKj71A=";
};
patches = [
# Revert "Glib, Gio: Add new API from glib 2.77.0"
(fetchpatch2 {
url = "https://github.com/GNOME/glibmm/commit/5b9032c0298cbb49c3ed90d5f71f2636751fa638.patch";
revert = true;
hash = "sha256-UzrzIOnXh9pxuTDQsp6mnunDNNtc86hE9tCe1NgKsyo=";
})
];
mesonFlags = [
"-Dmaintainer-mode=true"
"-Dbuild-documentation=false"
];
nativeBuildInputs = attrs.nativeBuildInputs ++ [
mm-common
perlPackages.perl
perlPackages.XMLParser
];
});
in
stdenv.mkDerivation rec {
pname = "telegram-desktop";
version = "4.8.4";
version = "4.11.1";
src = fetchFromGitHub {
owner = "telegramdesktop";
repo = "tdesktop";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-DRVFngQ4geJx2/7pT1VJzkcBZnVGgDvcGGUr9r38gSU=";
hash = "sha256-tWUdSFr93plCuQkA8SE+GZeAyZcYPUoFd0sIOyEuobs=";
};
patches = [
@ -94,13 +122,6 @@ stdenv.mkDerivation rec {
url = "https://salsa.debian.org/debian/telegram-desktop/-/raw/09b363ed5a4fcd8ecc3282b9bfede5fbb83f97ef/debian/patches/Disable-register-custom-scheme.patch";
hash = "sha256-B8X5lnSpwwdp1HlvyXJWQPybEN+plOwimdV5gW6aY2Y=";
})
# lib_base: Add missing include for Qt 6.6
(fetchpatch {
url = "https://github.com/desktop-app/lib_base/commit/5ca91dbb811c84591780236abc31431e313faf39.patch";
stripLen = 1;
extraPrefix = "Telegram/lib_base/";
hash = "sha256-eZkyMnPaAmUFYXiCmPhLRTw2Xdx0lylY+UVOckCsiaA=";
})
];
postPatch = ''
@ -150,7 +171,7 @@ stdenv.mkDerivation rec {
range-v3
tl-expected
hunspell
glibmm_2_68
glibmm
webkitgtk_6_0
jemalloc
rnnoise

6
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
View File

@ -9,13 +9,13 @@
stdenv.mkDerivation {
pname = "tg_owt";
version = "unstable-2023-08-15";
version = "unstable-2023-10-17";
src = fetchFromGitHub {
owner = "desktop-app";
repo = "tg_owt";
rev = "0532942ac6176a66ef184fb728a4cbb02958fc0b";
sha256 = "sha256-FcRXxu0Nc8qHQl8PoA92MeuhpV+vgl658uILEpmDy3A=";
rev = "be153adaa363b2b13242466ad5b7b87f61301639";
sha256 = "sha256-/hZNMV+IG00YzxH66Gh/BW9JdGFfsfnM93eD6oB3tlI=";
fetchSubmodules = true;
};

6
pkgs/applications/version-management/git-cliff/default.nix
View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-cliff";
version = "1.3.1";
version = "1.4.0";
src = fetchFromGitHub {
owner = "orhun";
repo = "git-cliff";
rev = "v${version}";
hash = "sha256-DzlCy8Y3OW3FiXO45wuUh3t87Za2jWQ4rnztZGRySYA=";
hash = "sha256-OK2eoWlqlpf/X8EGMnWTv9Gs5FkYvW5rmQDB/Mkbp60=";
};
cargoHash = "sha256-+XyZqxjiOAIyc+FmnexIdV1RMzc+iqmo8nPahzUo43E=";
cargoHash = "sha256-gtkpZKOaG5p79uJ9cbbGdiOX57bDFTf2/Bd8+WToJrw=";
# attempts to run the program on .git in src which is not deterministic
doCheck = false;

13
pkgs/by-name/my/mystmd/package.nix
View File

@ -1,17 +1,17 @@
{ lib, buildNpmPackage, fetchFromGitHub }:
{ lib, buildNpmPackage, fetchFromGitHub, mystmd, testers }:
buildNpmPackage rec {
pname = "mystmd";
version = "1.1.22";
version = "1.1.23";
src = fetchFromGitHub {
owner = "executablebooks";
repo = "mystmd";
rev = "mystmd@${version}";
hash = "sha256-jx/UCC/Cl5kqAbMzeikTmrx9xWS02OCp3rn0pvtIAPY=";
hash = "sha256-+zgAm3v7XcNhhVOFueRqJijteQqMCZmE33hDyR4d5bA=";
};
npmDepsHash = "sha256-1qQ19iB7N+KvO1uUdEMU1iN91FMQs4wzfTCdv6wfn30=";
npmDepsHash = "sha256-8brgDSV0BBggYUnizV+24RQMXxPd6HUBDYrw9fJtL+M=";
dontNpmInstall = true;
@ -23,6 +23,11 @@ buildNpmPackage rec {
runHook postInstall
'';
passthru.tests.version = testers.testVersion {
package = mystmd;
version = "v${version}";
};
meta = with lib; {
description = "Command line tools for working with MyST Markdown";
homepage = "https://github.com/executablebooks/mystmd";

5198
pkgs/by-name/sv/svix-server/Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

54
pkgs/by-name/sv/svix-server/package.nix Normal file
View File

@ -0,0 +1,54 @@
{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, protobuf, stdenv
, darwin }:
rustPlatform.buildRustPackage rec {
pname = "svix-server";
version = "1.13.0";
src = fetchFromGitHub {
owner = "svix";
repo = "svix-webhooks";
rev = "v${version}";
hash = "sha256-6758ej7bTvwZPWifl239rQMazM8uw+Y4+3EbjE8XsTg=";
};
sourceRoot = "source/server";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"aide-0.10.0" = "sha256-hUUer5D6OA4F0Co3JgygY3g89cKIChFest67ABIX+4M=";
"hyper-0.14.23" = "sha256-7MBCAjKYCdDbqCmYg3eYE74h7K7yTjfVoo0sjxr4g/s=";
};
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
openssl
protobuf
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
];
# needed for internal protobuf c wrapper library
PROTOC = "${protobuf}/bin/protoc";
PROTOC_INCLUDE = "${protobuf}/include";
OPENSSL_NO_VENDOR = 1;
# disable tests because they require postgres and redis to be running
doCheck = false;
meta = with lib; {
mainProgram = "svix-server";
description = "The enterprise-ready webhooks service";
homepage = "https://github.com/svix/svix-webhooks";
changelog =
"https://github.com/svix/svix-webhooks/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ techknowlogick ];
};
}

18
pkgs/desktops/xfce/core/xfconf/default.nix
View File

@ -1,4 +1,10 @@
{ lib, mkXfceDerivation, libxfce4util, gobject-introspection, vala }:
{ lib
, mkXfceDerivation
, fetchpatch
, libxfce4util
, gobject-introspection
, vala
}:
mkXfceDerivation {
category = "xfce";
@ -7,6 +13,16 @@ mkXfceDerivation {
sha256 = "sha256-FVNkcwOS4feMocx3vYhuWNs1EkXDrM1FaKkMhIOuPHI=";
patches = [
# fixes a segfault, can likely be removed with 4.18.3,
# see https://gitlab.xfce.org/xfce/xfconf/-/issues/35#note_81151
(fetchpatch {
name = "cache-fix-uncached-value.patch";
url = "https://gitlab.xfce.org/xfce/xfconf/-/commit/03f7ff961fd46c9141aba624a278e19de0bf3211.diff";
hash = "sha256-n9Wvt7NfKMxs2AcjUWgs4vZgzLUG9jyEVTZxINko4h8=";
})
];
nativeBuildInputs = [ gobject-introspection vala ];
buildInputs = [ libxfce4util ];

4
pkgs/development/libraries/enchant/2.x.nix
View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "enchant";
version = "2.6.1";
version = "2.6.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
hash = "sha256-8k4SRpE3rh0DFAu5AypHpZR8NvTR4vErkpBhAF6xUnk=";
hash = "sha256-ZoanKOVudg+N7gmiLw+1O0bunb59ZM+eW7NaZYv/fh0=";
};
nativeBuildInputs = [

18
pkgs/development/libraries/libepoxy/default.nix
View File

@ -31,6 +31,15 @@ stdenv.mkDerivation rec {
''
+ lib.optionalString stdenv.isDarwin ''
substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1"
''
# cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?)
+ lib.optionalString stdenv.isDarwin ''
substituteInPlace test/meson.build \
--replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," ""
''
+ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
substituteInPlace test/meson.build \
--replace "[ 'cgl_core', [ 'cgl_core.c' ] ]," ""
'';
outputs = [ "out" "dev" ];
@ -55,15 +64,6 @@ stdenv.mkDerivation rec {
env.NIX_CFLAGS_COMPILE = lib.optionalString (x11Support && !stdenv.isDarwin) ''-DLIBGL_PATH="${lib.getLib libGL}/lib"'';
# cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?)
preCheck = lib.optionalString stdenv.isDarwin ''
substituteInPlace ../test/meson.build \
--replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," ""
'' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
substituteInPlace ../test/meson.build \
--replace "[ 'cgl_core', [ 'cgl_core.c' ] ]," ""
'';
doCheck = true;
meta = with lib; {

6
pkgs/development/libraries/libhugetlbfs/default.nix
View File

@ -40,10 +40,14 @@ stdenv.mkDerivation rec {
installTargets = [ "install" "install-docs" ];
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64);
description = "library and utilities for Linux hugepages";
maintainers = with maintainers; [ qyliss ];
license = licenses.lgpl21Plus;
platforms = platforms.linux;
badPlatforms = flatten [
systems.inspect.platformPatterns.isStatic
systems.inspect.patterns.isMusl
systems.inspect.patterns.isAarch64
];
};
}

12
pkgs/development/libraries/mm-common/default.nix
View File

@ -1,5 +1,7 @@
{ lib, stdenv
{ lib
, stdenv
, fetchurl
, bash
, gnome
, meson
, python3
@ -15,12 +17,20 @@ stdenv.mkDerivation rec {
sha256 = "cFxtKfQRaim95ONs/BsEbJK274xtrk6uyFAYdH5tpao=";
};
strictDeps = true;
nativeBuildInputs = [
meson
python3
ninja
];
# for shebangs
buildInputs = [
python3
bash
];
passthru = {
updateScript = gnome.updateScript {
packageName = pname;

4
pkgs/development/libraries/physics/clhep/default.nix
View File

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "clhep";
version = "2.4.6.4";
version = "2.4.7.1";
src = fetchurl {
url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz";
hash = "sha256-SciTMPGQPvcH08XXnBanxabyyQ/CkOIDTuODSAlInlc=";
hash = "sha256-HIMEp3cqxrmRlfEwA3jG4930rQfIXWSgRQVlKruKVfk=";
};
prePatch = ''

49
pkgs/development/lua-modules/updater/default.nix Normal file
View File

@ -0,0 +1,49 @@
{ buildPythonApplication
, nix
, makeWrapper
, python3Packages
, lib
# , nix-prefetch-git
, nix-prefetch-scripts
, luarocks-nix
}:
let
path = lib.makeBinPath [ nix nix-prefetch-scripts luarocks-nix ];
in
buildPythonApplication {
pname = "luarocks-packages-updater";
version = "0.1";
format = "other";
nativeBuildInputs = [
makeWrapper
python3Packages.wrapPython
];
propagatedBuildInputs = [
python3Packages.gitpython
];
dontUnpack = true;
installPhase =
''
mkdir -p $out/bin $out/lib
cp ${./updater.py} $out/bin/luarocks-packages-updater
cp ${../../../../maintainers/scripts/pluginupdate.py} $out/lib/pluginupdate.py
# wrap python scripts
makeWrapperArgs+=( --prefix PATH : "${path}" --prefix PYTHONPATH : "$out/lib" )
wrapPythonProgramsIn "$out"
'';
shellHook = ''
export PYTHONPATH="maintainers/scripts:$PYTHONPATH"
export PATH="${path}:$PATH"
'';
meta.mainProgram = "luarocks-packages-updater";
}

31
maintainers/scripts/update-luarocks-packages → pkgs/development/lua-modules/updater/updater.py
View File

@ -1,6 +1,4 @@
#!/usr/bin/env nix-shell
#!nix-shell update-luarocks-shell.nix -i python3
#!/usr/bin/env python
# format:
# $ nix run nixpkgs#python3Packages.black -- update.py
# type-check:
@ -32,12 +30,9 @@ from pluginupdate import update_plugins, FetchConfig, CleanEnvironment
PKG_LIST = "maintainers/scripts/luarocks-packages.csv"
TMP_FILE = "$(mktemp)"
GENERATED_NIXFILE = "pkgs/development/lua-modules/generated-packages.nix"
LUAROCKS_CONFIG = "maintainers/scripts/luarocks-config.lua"
HEADER = """/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT!
Regenerate it with:
nixpkgs$ ./maintainers/scripts/update-luarocks-packages
Regenerate it with: nix run nixpkgs#update-luarocks-packages
You can customize the generated packages in pkgs/development/lua-modules/overrides.nix
*/
""".format(
@ -76,6 +71,12 @@ class LuaPlugin:
# rename Editor to LangUpdate/ EcosystemUpdater
class LuaEditor(pluginupdate.Editor):
def create_parser(self):
parser = super().create_parser()
parser.set_defaults(proc=1)
return parser
def get_current_plugins(self):
return []
@ -101,9 +102,8 @@ class LuaEditor(pluginupdate.Editor):
with tempfile.NamedTemporaryFile("w+") as f:
f.write(HEADER)
header2 = textwrap.dedent(
# header2 = inspect.cleandoc(
"""
{ stdenv, lib, fetchurl, fetchgit, callPackage, ... }:
{ stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args:
final: prev:
{
"""
@ -165,12 +165,7 @@ def generate_pkg_nix(plug: LuaPlugin):
Our cache key associates "p.name-p.version" to its rockspec
"""
log.debug("Generating nix expression for %s", plug.name)
custom_env = os.environ.copy()
custom_env["LUAROCKS_CONFIG"] = LUAROCKS_CONFIG
# we add --dev else luarocks wont find all the "scm" (=dev) versions of the
# packages
# , "--dev"
cmd = ["luarocks", "nix"]
if plug.maintainers:
@ -201,7 +196,7 @@ def generate_pkg_nix(plug: LuaPlugin):
log.debug("running %s", " ".join(cmd))
output = subprocess.check_output(cmd, env=custom_env, text=True)
output = subprocess.check_output(cmd, text=True)
output = "callPackage(" + output.strip() + ") {};\n\n"
return (plug, output)
@ -211,8 +206,8 @@ def main():
"lua",
ROOT,
"",
default_in=ROOT.joinpath(PKG_LIST),
default_out=ROOT.joinpath(GENERATED_NIXFILE),
default_in=PKG_LIST,
default_out=GENERATED_NIXFILE,
)
editor.run()
@ -220,5 +215,3 @@ def main():
if __name__ == "__main__":
main()
# vim: set ft=python noet fdm=manual fenc=utf-8 ff=unix sts=0 sw=4 ts=4 :

4
pkgs/development/python-modules/rotary-embedding-torch/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "rotary-embedding-torch";
version = "0.3.3";
version = "0.3.5";
pyproject = true;
src = fetchFromGitHub {
owner = "lucidrains";
repo = "rotary-embedding-torch";
rev = version;
hash = "sha256-uTOKdxqbSLRJl0gnz3TvpVwhrfqflAp0wfn6d13+YrM=";
hash = "sha256-dST3eJnOcG2s9tiD/Fb9BvLS6nIpE8RXly92PK/gCC8=";
};
nativeBuildInputs = [

6
pkgs/development/tools/continuous-integration/buildbot/master.nix
View File

@ -31,6 +31,8 @@
, parameterized
, git
, openssh
, setuptools
, pythonRelaxDepsHook
, glibcLocales
, nixosTests
, callPackage
@ -88,6 +90,7 @@ let
autobahn
pyjwt
pyyaml
setuptools
]
# tls
++ twisted.optional-dependencies.tls;
@ -108,8 +111,11 @@ let
git
openssh
glibcLocales
pythonRelaxDepsHook
];
pythonRelaxDeps = [ "Twisted" ];
patches = [
# This patch disables the test that tries to read /etc/os-release which
# is not accessible in sandboxed builds.

4
pkgs/development/tools/language-servers/kotlin-language-server/default.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "kotlin-language-server";
version = "1.3.5";
version = "1.3.7";
src = fetchzip {
url = "https://github.com/fwcd/kotlin-language-server/releases/download/${version}/server.zip";
hash = "sha256-hoZDbhedauW1TK78rX37Gwn/6OWLXZzy8wKsUrbTmKI=";
hash = "sha256-BEQywg3ZU4LtF9trntGbDp64SIWH4y93o/VVMSRP+cc=";
};
dontBuild = true;

6
pkgs/development/tools/rust/cargo-insta/default.nix
View File

@ -5,18 +5,18 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-insta";
version = "1.32.0";
version = "1.33.0";
src = fetchFromGitHub {
owner = "mitsuhiko";
repo = "insta";
rev = "refs/tags/${version}";
hash = "sha256-s6d0q4K2UTG+BWzvH5KOAllzYAkEapEuDoiI9KQW31I=";
hash = "sha256-w/dxIQ7KRrn86PwiE/g5L9Gn8KszPF9u/zlwE/FYDu4=";
};
sourceRoot = "${src.name}/cargo-insta";
cargoHash = "sha256-ZQUzoKE3OGaY22VYiku7GqjGN9jUNx09a0EcgCRzzcM=";
cargoHash = "sha256-mEtmZ+wFo1WI1IMNYsVqSVScFDLdiXBbghH7c0l/3NQ=";
meta = with lib; {
description = "A Cargo subcommand for snapshot testing";

6
pkgs/development/tools/rust/cargo-make/default.nix
View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-make";
version = "0.37.2";
version = "0.37.3";
src = fetchFromGitHub {
owner = "sagiegurari";
repo = "cargo-make";
rev = version;
hash = "sha256-uYMPRbh2stIkNxehPnJPryIo+bGxDG7g+l4bTkEQWoY=";
hash = "sha256-7xWxIvMaoKZ1TVgfdBUDvK8VJzW6alrO8xFvSlMusOY=";
};
cargoHash = "sha256-CXGar3Xp6iBldBGOxjXRBGBwjNh4Kv6SwIkaNKEnkQs=";
cargoHash = "sha256-2I+VZD4KLTtoTIb2NNpfLcFH/lmD6Z/TTPJrr3FcZzI=";
nativeBuildInputs = [ pkg-config ];

6
pkgs/development/tools/rust/cargo-modules/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-modules";
version = "0.9.4";
version = "0.10.2";
src = fetchFromGitHub {
owner = "regexident";
repo = pname;
rev = version;
hash = "sha256-BFASEf9WUVJHsakujjeBBxfxPYlsuzonqFuDLXmLgwc=";
hash = "sha256-71NRaIDWPbhDn6cfYhyZZzO2huQlj1vkKdBV6WJqI9s=";
};
cargoHash = "sha256-FojpC4RMrW0hZ0jvXxznxR6rKDDxrNMPoLoHEscOPEo=";
cargoHash = "sha256-lgqe9pXg/PE9WrXVpSJWYE6FUMGBgUDpEyJ31RSEj5A=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices

2
pkgs/os-specific/linux/nvme-cli/default.nix
View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
libnvme
json_c
zlib
] ++ lib.optionals (!(stdenv.hostPlatform.isStatic || stdenv.hostPlatform.isMusl)) [
] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libhugetlbfs) [
libhugetlbfs
];

1
pkgs/servers/matrix-hebbot/default.nix
View File

@ -39,6 +39,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/haecker-felix/hebbot";
changelog = "https://github.com/haecker-felix/hebbot/releases/tag/v${version}";
license = with licenses; [ agpl3 ];
mainProgram = "hebbot";
maintainers = with maintainers; [ a-kenji ];
};
}

36
pkgs/servers/sql/postgresql/default.nix
View File

@ -37,6 +37,8 @@ let
pname = "postgresql";
stdenv' = if jitSupport then llvmPackages.stdenv else stdenv;
majorVersion = lib.versions.major version;
in stdenv'.mkDerivation (finalAttrs: {
inherit pname version;
@ -110,8 +112,36 @@ let
src = ./locale-binary-path.patch;
locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
})
] ++ lib.optionals stdenv'.hostPlatform.isMusl (
] ++ (let
llvmJITPatches = {
"12" = {
rev = "15ddc9725eb73d97a16652c7c90d993302773544";
hash = "sha256-3dsaN/YTmc9JfIO/eXTr6tUqxMXHih58yhhtCW6Cz4E=";
};
"13" = {
rev = "f28956b239f19858e7c429d3065678ce79c5104b";
hash = "sha256-C31RF6sPYr0iSmGBjKWIq9oPMpLkZ1FIkPGhGANJecU=";
};
"14" = {
rev = "82d9a782a29633a7d2c8c0785e4162a46f93d23b";
hash = "sha256-qDStZ2fQyTnng3sjf502aNLIsqRsa59bpaZLY3cE2BY=";
};
"15" = {
rev = "eed1feb3fee1a558b67b04cbd709f31142f071d5";
hash = "sha256-IflqFi93Pyr/VfgS+jMdI/lYu4ISrgVlInWKueYqpZc=";
};
"16" = {
rev = "74d19ec096dfbda5782e62892de7e86a104f8265";
hash = "sha256-VB1Uc5waS8u5LjtvjLfeZcrHPSxmP2PyRVpMhK9+Xgc=";
};
};
in lib.optional
(jitSupport && llvmJITPatches?${majorVersion})
(fetchpatch {
url = "https://github.com/postgres/postgres/commit/${llvmJITPatches.${majorVersion}.rev}.patch";
inherit (llvmJITPatches.${majorVersion}) hash;
})
) ++ lib.optionals stdenv'.hostPlatform.isMusl (
let
self = {
"12" = {
@ -151,7 +181,7 @@ let
};
};
patchesForVersion = self.${lib.versions.major version} or (throw "no musl patches for postgresql ${version}");
patchesForVersion = self.${majorVersion} or (throw "no musl patches for postgresql ${version}");
in
lib.attrValues patchesForVersion
) ++ lib.optionals stdenv'.isLinux [

16
pkgs/servers/sslh/default.nix
View File

@ -1,22 +1,30 @@
{ lib, stdenv, fetchFromGitHub, libcap, libconfig, perl, tcp_wrappers, pcre2, nixosTests }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, libcap, libev, libconfig, perl, tcp_wrappers, pcre2, nixosTests }:
stdenv.mkDerivation rec {
pname = "sslh";
version = "1.22c";
version = "2.0.0";
src = fetchFromGitHub {
owner = "yrutschle";
repo = pname;
rev = "v${version}";
sha256 = "sha256-A+nUWiOPoz/T5afZUzt5In01e049TgHisTF8P5Vj180=";
hash = "sha256-KfNQWSmAf86AFoInKlNZoiSuSwVLaJVnfo7SjZVY/VU=";
};
postPatch = "patchShebangs *.sh";
buildInputs = [ libcap libconfig perl tcp_wrappers pcre2 ];
buildInputs = [ libcap libev libconfig perl tcp_wrappers pcre2 ];
makeFlags = [ "USELIBCAP=1" "USELIBWRAP=1" ];
postInstall = ''
# install all flavours
install -p sslh-fork "$out/sbin/sslh-fork"
install -p sslh-select "$out/sbin/sslh-select"
install -p sslh-ev "$out/sbin/sslh-ev"
ln -sf sslh-fork "$out/sbin/sslh"
'';
installFlags = [ "PREFIX=$(out)" ];
hardeningDisable = [ "format" ];

6
pkgs/tools/networking/hurl/default.nix
View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "hurl";
version = "4.0.0";
version = "4.1.0";
src = fetchFromGitHub {
owner = "Orange-OpenSource";
repo = pname;
rev = version;
hash = "sha256-ubzcCY3ccjt2VSZNx9+l3M/z4o7wWcE7USAlA9BnQY0=";
hash = "sha256-JsgAdLjDQQkLyLFoZCVG2jZ8vQDaGUPtPmHYAcwADQg";
};
cargoHash = "sha256-C8WeYFaqF748QZkp/CppqJjF3QW1k7OWXycxSoxKPOI=";
cargoHash = "sha256-IE9c57rj8EANyj4KmbyagafJyMovzHOhp0PFCQBzqdA=";
nativeBuildInputs = [
pkg-config

4
pkgs/tools/system/netdata/default.nix
View File

@ -118,6 +118,10 @@ stdenv.mkDerivation rec {
];
postFixup = ''
# remove once https://github.com/netdata/netdata/pull/16300 merged
substituteInPlace $out/bin/netdata-claim.sh \
--replace /bin/echo echo
wrapProgram $out/bin/netdata-claim.sh --prefix PATH : ${lib.makeBinPath [ openssl ]}
wrapProgram $out/libexec/netdata/plugins.d/cgroup-network-helper.sh --prefix PATH : ${lib.makeBinPath [ bash ]}
wrapProgram $out/bin/netdatacli --set NETDATA_PIPENAME /run/netdata/ipc

4
pkgs/top-level/aliases.nix
View File

@ -134,6 +134,8 @@ mapAliases ({
chefdk = throw "chefdk has been removed due to being deprecated upstream by Chef Workstation"; # Added 2023-03-22
chocolateDoom = chocolate-doom; # Added 2023-05-01
chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27
chromiumBeta = throw "'chromiumBeta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18
chromiumDev = throw "'chromiumDev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18
citra = citra-nightly; # added 2022-05-17
clang-ocl = throw "'clang-ocl' has been replaced with 'rocmPackages.clang-ocl'"; # Added 2023-10-08
inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17
@ -317,6 +319,8 @@ mapAliases ({
godot-headless = throw "godot-headless has been renamed to godot3-headless to distinguish from version 4"; # Added 2023-07-16
godot-server = throw "godot-server has been renamed to godot3-server to distinguish from version 4"; # Added 2023-07-16
google-chrome-beta = throw "'google-chrome-beta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18
google-chrome-dev = throw "'google-chrome-dev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18
google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2023-09-10
go-thumbnailer = thud; # Added 2023-09-21
gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10

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

@ -17773,6 +17773,11 @@ with pkgs;
luarocks = luaPackages.luarocks;
luarocks-nix = luaPackages.luarocks-nix;
luarocks-packages-updater = callPackage ../development/lua-modules/updater {
inherit (python3Packages) buildPythonApplication ;
};
luau = callPackage ../development/interpreters/luau { };
lune = callPackage ../development/interpreters/lune { };
@ -30875,10 +30880,6 @@ with pkgs;
chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {});
chromiumBeta = lowPrio (chromium.override { channel = "beta"; });
chromiumDev = lowPrio (chromium.override { channel = "dev"; });
chuck = callPackage ../applications/audio/chuck {
inherit (darwin) DarwinTools;
inherit (darwin.apple_sdk.frameworks) AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel MultitouchSupport;
@ -32279,10 +32280,6 @@ with pkgs;
google-chrome = callPackage ../applications/networking/browsers/google-chrome { };
google-chrome-beta = google-chrome.override { chromium = chromiumBeta; channel = "beta"; };
google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; };
go-graft = callPackage ../applications/networking/go-graft { };
gostatic = callPackage ../applications/misc/gostatic { };

BIN
store.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.2 MiB