dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot] 2024-08-21 00:14:19 +00:00 committed by GitHub
commit 5d0ae7495b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
344 changed files with 5456 additions and 3426 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/check-nix-format.yml vendored
View File

@ -83,7 +83,7 @@ jobs:
if (( "${#unformattedFiles[@]}" > 0 )); then
echo "Some new/changed Nix files are not properly formatted"
echo "Please run the following in \`nix-shell\`:"
echo "Please go to the Nixpkgs root directory, run \`nix-shell\`, then:"
echo "nixfmt ${unformattedFiles[*]@Q}"
exit 1
fi

22
maintainers/maintainer-list.nix
View File

@ -2708,6 +2708,14 @@
githubId = 5700358;
name = "Thomas Blank";
};
bleetube = {
email = "git@blee.tube";
matrix = "@blee:satstack.cloud";
name = "Brian Lee";
github = "bleetube";
githubId = 77934086;
keys = [ { fingerprint = "4CA3 48F6 8FE1 1777 8EDA 3860 B9A2 C1B0 25EC 2C55"; } ];
};
blinry = {
name = "blinry";
email = "mail@blinry.org";
@ -3429,6 +3437,12 @@
githubId = 977929;
name = "Cody Allen";
};
Celibistrial = {
email = "ryan80222@gmail.com";
github = "Celibistrial";
githubId = 82810795;
name = "Gaurav Choudhury";
};
centromere = {
email = "nix@centromere.net";
github = "centromere";
@ -5640,7 +5654,7 @@
matrix = "@e1mo:chaos.jetzt";
github = "e1mo";
githubId = 61651268;
name = "Moritz Fromm";
name = "Nina Fromm";
keys = [ { fingerprint = "67BE E563 43B6 420D 550E DF2A 6D61 7FD0 A85B AADA"; } ];
};
eadwu = {
@ -7677,6 +7691,12 @@
githubId = 1621335;
name = "Andrew Trachenko";
};
gordon-bp = {
email = "gordy@hanakano.com";
github = "Gordon-BP";
githubId = 77560236;
name = "Gordon Clark";
};
gotcha = {
email = "gotcha@bubblenet.be";
github = "gotcha";

4
nixos/doc/manual/release-notes/rl-2411.section.md
View File

@ -73,6 +73,8 @@
- [Playerctld](https://github.com/altdesktop/playerctl), a daemon to track media player activity. Available as [services.playerctld](option.html#opt-services.playerctld).
- [MenhirLib](https://gitlab.inria.fr/fpottier/menhir/-/tree/master/coq-menhirlib) A support library for verified Coq parsers produced by Menhir.
- [Glance](https://github.com/glanceapp/glance), a self-hosted dashboard that puts all your feeds in one place. Available as [services.glance](option.html#opt-services.glance).
- [Apache Tika](https://github.com/apache/tika), a toolkit that detects and extracts metadata and text from over a thousand different file types. Available as [services.tika](option.html#opt-services.tika).
@ -322,6 +324,8 @@
- The `services.trust-dns` module has been renamed to `services.hickory-dns`.
- The `lsh` package and the `services.lshd` module have been removed as they had no maintainer in Nixpkgs and hadn’t seen an upstream release in over a decade. It is recommended to migrate to `openssh` and `services.openssh`.
## Other Notable Changes {#sec-release-24.11-notable-changes}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

1
nixos/modules/module-list.nix
View File

@ -1209,7 +1209,6 @@
./services/networking/spacecookie.nix
./services/networking/spiped.nix
./services/networking/squid.nix
./services/networking/ssh/lshd.nix
./services/networking/ssh/sshd.nix
./services/networking/sslh.nix
./services/networking/strongswan-swanctl/module.nix

1
nixos/modules/rename.nix
View File

@ -70,6 +70,7 @@ in
(mkRemovedOptionModule [ "services" "hydron" ] "The `services.hydron` module has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability.")
(mkRemovedOptionModule [ "services" "ihatemoney" ] "The ihatemoney module has been removed for lack of downstream maintainer")
(mkRemovedOptionModule [ "services" "kippo" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "lshd" ] "The corresponding package was removed from nixpkgs as it had no maintainer in Nixpkgs and hasn't seen an upstream release in over a decades.")
(mkRemovedOptionModule [ "services" "mailpile" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "mathics" ] "The Mathics module has been removed")

3
nixos/modules/services/monitoring/ups.nix
View File

@ -560,6 +560,9 @@ in
};
environment.NUT_CONFPATH = "/etc/nut";
environment.NUT_STATEPATH = "/var/lib/nut";
restartTriggers = [
config.environment.etc."nut/ups.conf".source
];
};
environment.etc = {

187
nixos/modules/services/networking/ssh/lshd.nix
View File

@ -1,187 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
let
inherit (pkgs) lsh;
cfg = config.services.lshd;
in
{
###### interface
options = {
services.lshd = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether to enable the GNU lshd SSH2 daemon, which allows
secure remote login.
'';
};
portNumber = mkOption {
default = 22;
type = types.port;
description = ''
The port on which to listen for connections.
'';
};
interfaces = mkOption {
default = [];
type = types.listOf types.str;
description = ''
List of network interfaces where listening for connections.
When providing the empty list, `[]`, lshd listens on all
network interfaces.
'';
example = [ "localhost" "1.2.3.4:443" ];
};
hostKey = mkOption {
default = "/etc/lsh/host-key";
type = types.str;
description = ''
Path to the server's private key. Note that this key must
have been created, e.g., using "lsh-keygen --server |
lsh-writekey --server", so that you can run lshd.
'';
};
syslog = mkOption {
type = types.bool;
default = true;
description = "Whether to enable syslog output.";
};
passwordAuthentication = mkOption {
type = types.bool;
default = true;
description = "Whether to enable password authentication.";
};
publicKeyAuthentication = mkOption {
type = types.bool;
default = true;
description = "Whether to enable public key authentication.";
};
rootLogin = mkOption {
type = types.bool;
default = false;
description = "Whether to enable remote root login.";
};
loginShell = mkOption {
default = null;
type = types.nullOr types.str;
description = ''
If non-null, override the default login shell with the
specified value.
'';
example = "/nix/store/xyz-bash-10.0/bin/bash10";
};
srpKeyExchange = mkOption {
default = false;
type = types.bool;
description = ''
Whether to enable SRP key exchange and user authentication.
'';
};
tcpForwarding = mkOption {
type = types.bool;
default = true;
description = "Whether to enable TCP/IP forwarding.";
};
x11Forwarding = mkOption {
type = types.bool;
default = true;
description = "Whether to enable X11 forwarding.";
};
subsystems = mkOption {
type = types.listOf types.path;
description = ''
List of subsystem-path pairs, where the head of the pair
denotes the subsystem name, and the tail denotes the path to
an executable implementing it.
'';
};
};
};
###### implementation
config = mkIf cfg.enable {
services.lshd.subsystems = [ ["sftp" "${pkgs.lsh}/sbin/sftp-server"] ];
systemd.services.lshd = {
description = "GNU lshd SSH2 daemon";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
environment = {
LD_LIBRARY_PATH = config.system.nssModules.path;
};
preStart = ''
test -d /etc/lsh || mkdir -m 0755 -p /etc/lsh
test -d /var/spool/lsh || mkdir -m 0755 -p /var/spool/lsh
if ! test -f /var/spool/lsh/yarrow-seed-file
then
# XXX: It would be nice to provide feedback to the
# user when this fails, so that they can retry it
# manually.
${lsh}/bin/lsh-make-seed --sloppy \
-o /var/spool/lsh/yarrow-seed-file
fi
if ! test -f "${cfg.hostKey}"
then
${lsh}/bin/lsh-keygen --server | \
${lsh}/bin/lsh-writekey --server -o "${cfg.hostKey}"
fi
'';
script = with cfg; ''
${lsh}/sbin/lshd --daemonic \
--password-helper="${lsh}/sbin/lsh-pam-checkpw" \
-p ${toString portNumber} \
${optionalString (interfaces != []) (concatStrings (map (i: "--interface=\"${i}\"") interfaces))} \
-h "${hostKey}" \
${optionalString (!syslog) "--no-syslog" } \
${if passwordAuthentication then "--password" else "--no-password" } \
${if publicKeyAuthentication then "--publickey" else "--no-publickey" } \
${if rootLogin then "--root-login" else "--no-root-login" } \
${optionalString (loginShell != null) "--login-shell=\"${loginShell}\"" } \
${if srpKeyExchange then "--srp-keyexchange" else "--no-srp-keyexchange" } \
${if !tcpForwarding then "--no-tcpip-forward" else "--tcpip-forward"} \
${if x11Forwarding then "--x11-forward" else "--no-x11-forward" } \
--subsystems=${concatStringsSep ","
(map (pair: (head pair) + "=" +
(head (tail pair)))
subsystems)}
'';
};
security.pam.services.lshd = {};
};
}

2
nixos/tests/all-tests.nix
View File

@ -827,7 +827,7 @@ in {
qgis = handleTest ./qgis.nix { qgisPackage = pkgs.qgis; };
qgis-ltr = handleTest ./qgis.nix { qgisPackage = pkgs.qgis-ltr; };
qownnotes = handleTest ./qownnotes.nix {};
qtile = handleTestOn ["x86_64-linux" "aarch64-linux"] ./qtile.nix {};
qtile = handleTestOn ["x86_64-linux" "aarch64-linux"] ./qtile/default.nix {};
quake3 = handleTest ./quake3.nix {};
quicktun = handleTest ./quicktun.nix {};
quickwit = handleTest ./quickwit.nix {};

19
nixos/tests/qtile/add-widget.patch Normal file
View File

@ -0,0 +1,19 @@
--- a/config.py 2024-05-31 14:49:23.852287845 +0200
+++ b/config.py 2024-05-31 14:51:00.935182266 +0200
@@ -29,6 +29,8 @@
from libqtile.lazy import lazy
from libqtile.utils import guess_terminal
+from qtile_extras import widget
+
mod = "mod4"
terminal = guess_terminal()
@@ -162,6 +164,7 @@
# NB Systray is incompatible with Wayland, consider using StatusNotifier instead
# widget.StatusNotifier(),
widget.Systray(),
+ widget.AnalogueClock(),
widget.Clock(format="%Y-%m-%d %a %I:%M %p"),
widget.QuickExit(),
],

24
nixos/tests/qtile/config.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenvNoCC, fetchurl }:
stdenvNoCC.mkDerivation {
name = "qtile-config";
version = "0.0.1";
src = fetchurl {
url = "https://raw.githubusercontent.com/qtile/qtile/v0.28.1/libqtile/resources/default_config.py";
hash = "sha256-Y5W277CWVNSi4BdgEW/f7Px/MMjnN9W9TDqdOncVwPc=";
};
prePatch = ''
cp $src config.py
'';
patches = [ ./add-widget.patch ];
dontUnpack = true;
dontBuild = true;
installPhase = ''
mkdir -p $out
cp config.py $out/config.py
'';
}

19
nixos/tests/qtile.nix → nixos/tests/qtile/default.nix
View File

@ -1,15 +1,26 @@
import ./make-test-python.nix ({ lib, ...} : {
import ../make-test-python.nix ({ lib, ...} : {
name = "qtile";
meta = {
maintainers = with lib.maintainers; [ sigmanificient ];
};
nodes.machine = { pkgs, lib, ... }: {
imports = [ ./common/x11.nix ./common/user-account.nix ];
nodes.machine = { pkgs, lib, ... }: let
# We create a custom Qtile configuration file that adds a widget from
# qtile-extras to the bar. This ensure that the qtile-extras package
# also works, and that extraPackages behave as expected.
config-deriv = pkgs.callPackage ./config.nix { };
in {
imports = [ ../common/x11.nix ../common/user-account.nix ];
test-support.displayManager.auto.user = "alice";
services.xserver.windowManager.qtile.enable = true;
services.xserver.windowManager.qtile = {
enable = true;
configFile = "${config-deriv}/config.py";
extraPackages = ps: [ ps.qtile-extras ];
};
services.displayManager.defaultSession = lib.mkForce "qtile";
environment.systemPackages = [ pkgs.kitty ];

6
pkgs/applications/backup/ludusavi/default.nix
View File

@ -23,16 +23,16 @@
rustPlatform.buildRustPackage rec {
pname = "ludusavi";
version = "0.24.3";
version = "0.25.0";
src = fetchFromGitHub {
owner = "mtkennerly";
repo = "ludusavi";
rev = "v${version}";
hash = "sha256-FtLLj5uFcKuRTCSsSuyj0XGzFMVWQvVk4dTmBCmzfNs=";
hash = "sha256-GjecssOc5xVni73uNRQ/GaZmIdM9r09I8GpPK+jwoAY=";
};
cargoHash = "sha256-xC6HiXt8cfrDtno9IrOe8SP7WBL79paLI223fjxPsbg=";
cargoHash = "sha256-9QaQjb7bdDl4NWKbV+dfu9BgFU8NO3CZEvKSXujMUtI=";
nativeBuildInputs = [
cmake

4
pkgs/applications/misc/albert/default.nix
View File

@ -21,13 +21,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "albert";
version = "0.25.0";
version = "0.26.0";
src = fetchFromGitHub {
owner = "albertlauncher";
repo = "albert";
rev = "v${finalAttrs.version}";
hash = "sha256-eowsQhaS9RGfsw157HahENuWUWtwkwyPNSFw135MW0c=";
hash = "sha256-OdRx8fev0weXgSMEUhSm7aESN2W3BVnJpgtrlEUo+L0=";
fetchSubmodules = true;
};

4
pkgs/applications/misc/dmenu-rs/default.nix
View File

@ -18,13 +18,13 @@
# See: https://github.com/Shizcow/dmenu-rs#plugins
stdenv.mkDerivation rec {
pname = "dmenu-rs";
version = "5.5.3";
version = "5.5.4";
src = fetchFromGitHub {
owner = "Shizcow";
repo = "dmenu-rs";
rev = version;
hash = "sha256-05Ia+GHeL8PzOwR7H+NEVhKJVMPhlIaQLwGfvwOAl0g=";
hash = "sha256-LdbTvuq1IbzWEoASscIh3j3VAHm+W3UekJNiMHTxSQI=";
};
nativeBuildInputs = [

21
pkgs/applications/misc/dockbarx/default.nix
View File

@ -11,13 +11,13 @@
python3Packages.buildPythonApplication rec {
pname = "dockbarx";
version = "1.0-beta2";
version = "1.0-beta4";
src = fetchFromGitHub {
owner = "xuzhen";
repo = "dockbarx";
rev = version;
sha256 = "sha256-WMRTtprDHUbOOYVHshx7WpBlYshbiDjI12Rw3tQQuPI=";
sha256 = "sha256-J/5KpHptGzgRF1qIGrgjkRR3in5pE0ffkiYVTR3iZKY=";
};
nativeBuildInputs = [
@ -46,23 +46,6 @@ python3Packages.buildPythonApplication rec {
dontWrapGApps = true;
postPatch = ''
substituteInPlace setup.py \
--replace /usr/ "" \
--replace '"/", "usr", "share",' '"share",'
for f in \
dbx_preference \
dockbarx/applets.py \
dockbarx/dockbar.py \
dockbarx/iconfactory.py \
dockbarx/theme.py \
mate_panel_applet/dockbarx_mate_applet
do
substituteInPlace $f --replace /usr/share/ $out/share/
done
'';
postInstall = ''
glib-compile-schemas $out/share/glib-2.0/schemas
'';

4
pkgs/applications/misc/flashprint/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "flashprint";
version = "5.8.4";
version = "5.8.6";
src = fetchurl {
url = "http://www.ishare3d.com/3dapp/public/FlashPrint-5/FlashPrint/flashprint5_${finalAttrs.version}_amd64.deb";
hash = "sha256-Gr76yG3Qz7bnbm5YerHbpb+yzqhw1LthUb4qIH03VQw=";
hash = "sha256-oi/nEdOjhbYf9IZmppfKiEmlNGXdc907LS2x8jUck+M=";
};
nativeBuildInputs = [ dpkg autoPatchelfHook wrapQtAppsHook ];

6
pkgs/applications/misc/lscolors/default.nix
View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "lscolors";
version = "0.18.0";
version = "0.19.0";
src = fetchCrate {
inherit version pname;
hash = "sha256-m9S8fG0c+67/msdWaN8noazEdsdLk1aswUJ+8hkjhxo=";
hash = "sha256-9xYWjpeXg646JEW7faRLE1Au6LRVU6QQ7zfAwmYffT0=";
};
cargoHash = "sha256-6d/v89Yqn9FioWQTb5513kPbO9lnzBxaubfcdCzwUP4=";
cargoHash = "sha256-gtcznStbuYWcBPKZ/hdH15cwRQL0+Q0fZHe+YW5Rek0=";
buildFeatures = [ "nu-ansi-term" ];

10
pkgs/applications/misc/nwg-look/go.mod
View File

@ -1,10 +0,0 @@
module github.com/nwg-piotr/nwg-look
go 1.22
require (
github.com/gotk3/gotk3 v0.6.3
github.com/sirupsen/logrus v1.9.3
)
require golang.org/x/sys v0.17.0 // indirect

4
pkgs/applications/misc/transifex-cli/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "transifex-cli";
version = "1.6.15";
version = "1.6.16";
src = fetchFromGitHub {
owner = "transifex";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-NW3vPjXfusBQKDbH8DnU/LMyOP2qkzArD7RYjJ1IQvM=";
sha256 = "sha256-4TYuWNpw1tc3igKe4ld6pN35W070fekCaxpHGb/ekuY=";
};
vendorHash = "sha256-3gi2ysIb5256CdmtX38oIfeDwNCQojK+YB9aEm8H01Q=";

826
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -5,10 +5,10 @@
{
firefox = buildMozillaMach rec {
pname = "firefox";
version = "129.0.1";
version = "129.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "27c463e8277994c62bab85cf0e2f0cea16a9b272694b61fa56a6b3bd7c70d6481774288386094836a54df54c1b1144d61be67f4f5eac418c05479d452221c027";
sha512 = "f6805a87e5cb4e437583916e3ec1b312dc73eec5fc06ce7a038b13bd7c6827b18cf383c30645d96623ce41675351f3023ec6b9f89d676f1c889994eae79f2c13";
};
extraPatches = [

14
pkgs/applications/networking/browsers/librewolf/src.json
View File

@ -1,15 +1,15 @@
{
"packageVersion": "129.0-1",
"packageVersion": "129.0.1-1",
"source": {
"rev": "129.0-1",
"sha256": "13wb54avaz2jsb5bz2jp3wn5bpraxfnvc2m93djzcacc8fd5fbwp"
"rev": "129.0.1-1",
"sha256": "0pvv3v23q31hdjvqi1f3cqfyjrb8dbrrbfwxj2wacak1g0mzbxf4"
},
"settings": {
"rev": "0d126722d7e10bb7fa81f473450484c778928b39",
"sha256": "00i7j67nlfs8p9y2sylz4z4rylwhs98rd0idjpg0al0zga4jv7im"
"rev": "cbcf862e283669b49ecdf985d2d747eca9f4a794",
"sha256": "0aisg6l8xhk32wp8d9n532zgkk1nr4y4nsvqa9v8943g6vm4abb7"
},
"firefox": {
"version": "129.0",
"sha512": "e406d00dc53c66a1ee6b56e7001efcdd8b323caa3676d66d874d39a99f44ac7cebf4c60d76b5d239ebcf834a75cecabf801a74a1d08a97a66ea5e8ec6c8f7c5b"
"version": "129.0.1",
"sha512": "27c463e8277994c62bab85cf0e2f0cea16a9b272694b61fa56a6b3bd7c70d6481774288386094836a54df54c1b1144d61be67f4f5eac418c05479d452221c027"
}
}

6
pkgs/applications/networking/browsers/palemoon/bin.nix
View File

@ -20,7 +20,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "palemoon-bin";
version = "33.2.1";
version = "33.3.0";
src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: {
in {
gtk3 = fetchzip {
urls = urlRegionVariants "gtk3";
hash = "sha256-GUizOnsjEq2UuRaBgjmsQLHuqnCt/MHFBb8lTHcwJOM=";
hash = "sha256-9JZzwWe40M6nJkzeUqNDPXMfDGBnLRDSLL5kE2sNzCs=";
};
gtk2 = fetchzip {
urls = urlRegionVariants "gtk2";
hash = "sha256-RBEqBJNttuyMpeaC5scSY8Q2meZjgdeS2pppQ1n53uY=";
hash = "sha256-K3PC1EDZeDyJUPhfvqTlqyMM07GmiWlUdYiNnSZuesw=";
};
};

4
pkgs/applications/networking/cluster/arkade/default.nix
View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "arkade";
version = "0.11.19";
version = "0.11.20";
src = fetchFromGitHub {
owner = "alexellis";
repo = "arkade";
rev = version;
hash = "sha256-Vhldn9CMxC/5qPFN+ohydHuMsrHjpBuFkP4khf+OQds=";
hash = "sha256-xjJbO+42PUuRb4vMSKscTf2DEDekSwEF/v2QwKeBtvI=";
};
CGO_ENABLED = 0;

2
pkgs/applications/networking/cluster/k9s/default.nix
View File

@ -19,7 +19,7 @@ buildGoModule rec {
"-X github.com/derailed/k9s/cmd.date=1970-01-01T00:00:00Z"
];
tags = [ "netgo" ];
tags = [ "netcgo" ];
proxyVendor = true;

6
pkgs/applications/networking/cluster/kubectl-gadget/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubectl-gadget";
version = "0.30.0";
version = "0.31.0";
src = fetchFromGitHub {
owner = "inspektor-gadget";
repo = "inspektor-gadget";
rev = "v${version}";
hash = "sha256-cMaOqybXzbAelhSfUal4kgQKwz/dEp/fVQ8SyjaaAZU=";
hash = "sha256-f93PdSA3OGiUUXSQn0aUP3o5xfvjiq/3L3Bz9k4OigI=";
};
vendorHash = "sha256-M2nco2qxutpxKv//o+h2LY0x5Tk6DWxFL383cpGVnkI=";
vendorHash = "sha256-lBfz0tzCWKEAAmpvjB2kUJ3aLjlzAjniIu/1aNE80Xg=";
CGO_ENABLED = 0;

6
pkgs/applications/networking/cluster/kubefirst/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "kubefirst";
version = "2.4.10";
version = "2.4.17";
src = fetchFromGitHub {
owner = "kubefirst";
repo = "kubefirst";
rev = "refs/tags/v${version}";
hash = "sha256-EgJ+ymddMsB37ygREwdF6qmGcgJKPz06//dwwa1pXd0=";
hash = "sha256-wYPrQkoz1rivfnhku3Njj8e/rJc2GuT1HOPyNSada+o=";
};
vendorHash = "sha256-5UdKjxs0f8dHTzWvHpMbYSCcIqTU5aT5anNVk0O94tw=";
vendorHash = "sha256-ymqBSNzgK79IYSZ+WR+0yi01008jIPaRJ7vnnxMDycY=";
ldflags = [
"-s"

8
pkgs/applications/networking/instant-messengers/element/pin.nix
View File

@ -1,9 +1,9 @@
{
"version" = "1.11.74";
"version" = "1.11.75";
"hashes" = {
"desktopSrcHash" = "sha256-RKDwtoad8gP1fAjkg2+6BJj6z8SqYk1ddG7wQ9wI1XQ=";
"desktopSrcHash" = "sha256-bO23E1xG3FfizBBAWh0kCN+5JYbiX5V/wxLlY6ljWVQ=";
"desktopYarnHash" = "0bl78yd7apd5qbsqyhxnwj7lwrjx5820zh22rzgn9jqkcv25jwgw";
"webSrcHash" = "sha256-5Tujhqias3+k4BgQbO8R0toHlKQcAywG2MWBZX1SVOM=";
"webYarnHash" = "06wmzxsc0iijrz017lb40nydb05n8ckmin2rrwiw25bl8ywfw0qr";
"webSrcHash" = "sha256-cDayCoznbmALOiPg9FUYrfdFjzg0NV1NY9/b2KzTvMs=";
"webYarnHash" = "04si1x663z70nxj6nfaq7m2wcd8r4l3vdpirnjhc13wrj1kb8r8x";
};
}

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

@ -63,14 +63,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "telegram-desktop";
version = "5.3.2";
version = "5.4.1";
src = fetchFromGitHub {
owner = "telegramdesktop";
repo = "tdesktop";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-fTXZdos0iIHmgWCKOU+B3tpxzLsUUtqx92Od75OdZH8=";
hash = "sha256-AWu0LH6DH/omcIsgIBHQIg1uCKN9Ly6EVj4U9QxoSlg=";
};
patches = [

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

@ -31,13 +31,13 @@
stdenv.mkDerivation {
pname = "tg_owt";
version = "0-unstable-2024-08-02";
version = "0-unstable-2024-08-04";
src = fetchFromGitHub {
owner = "desktop-app";
repo = "tg_owt";
rev = "c425281150317753d7bc5182c6572abe20f9a784";
sha256 = "sha256-EHQyGE2S2F2UqNl7VDb38pcdv3amm8lGqWZds5ZoHRE=";
rev = "dc17143230b5519f3c1a8da0079e00566bd4c5a8";
sha256 = "sha256-7j7hBIOXEdNJDnDSVUqy234nkTCaeZ9tDAzqvcuaq0o=";
fetchSubmodules = true;
};

2
pkgs/applications/networking/instant-messengers/threema-desktop/default.nix
View File

@ -32,7 +32,7 @@ let
npmBuildScript = "dist";
nativeBuildInputs = [
python3 # Used by gyp
(python3.withPackages (ps: [ ps.setuptools ])) # Used by gyp
];
patches = [

6
pkgs/applications/networking/instant-messengers/webex/default.nix
View File

@ -56,11 +56,11 @@
stdenv.mkDerivation rec {
pname = "webex";
version = "44.5.0.29672";
version = "44.8.0.30404";
src = fetchurl {
url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20240521091053/Webex_ubuntu.7z";
sha256 = "e155c280d15f2db4b5e638f244319dbec938d6de267f2fed1b4ba2b55fbb8a9b";
url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20240806164911/Webex_ubuntu.7z";
sha256 = "770067b495fcc3b376d77de65371f4196d0f1a0d718b84928d24aa6ea752d29b";
};
nativeBuildInputs = [

14
pkgs/applications/networking/instant-messengers/zoom-us/default.nix
View File

@ -48,23 +48,23 @@ let
# and often with different versions. We write them on three lines
# like this (rather than using {}) so that the updater script can
# find where to edit them.
versions.aarch64-darwin = "6.1.6.37851";
versions.x86_64-darwin = "6.1.6.37851";
versions.x86_64-linux = "6.1.6.1013";
versions.aarch64-darwin = "6.1.10.38818";
versions.x86_64-darwin = "6.1.10.38818";
versions.x86_64-linux = "6.1.10.1400";
srcs = {
aarch64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
name = "zoomusInstallerFull.pkg";
hash = "sha256-wsatsfVQElWXMZKZOVeqVBBE7ZRXx54OpA82ZzpymUI=";
hash = "sha256-E8r0bctM5whwEMppzO9hR3W+k+BmrV0gVx+J02KYmuk=";
};
x86_64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
hash = "sha256-BTLEfVFrUQbb+LpGP93hMqGFWhKM3tBdKxDKe8GkhiA=";
hash = "sha256-HMSBV/B/nTkcU8src6Wdz8uZnz455guSAMGm5ha7mIA=";
};
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
hash = "sha256-mvCJft0suOxnwTkWWuH9OYKHwTMWx61ct10P5Q/EVBM=";
hash = "sha256-c3WywWmblz9Wg3RMtovCBcR/mYyaWkmuoCqqGvHBxwo=";
};
};
@ -156,7 +156,7 @@ stdenv.mkDerivation rec {
'' + lib.optionalString stdenv.isLinux ''
# Desktop File
substituteInPlace $out/share/applications/Zoom.desktop \
--replace "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom"
--replace-fail "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom"
for i in aomhost zopen zoom ZoomLauncher; do
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/zoom/$i

6
pkgs/applications/networking/seaweedfs/default.nix
View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "seaweedfs";
version = "3.71";
version = "3.72";
src = fetchFromGitHub {
owner = "seaweedfs";
repo = "seaweedfs";
rev = version;
hash = "sha256-urYpcFZtZCEQ6nGcDJ2gq+HYnMcEencVn/jxt0HUl/U=";
hash = "sha256-5ANhRknN8EOUw+Ifsd2zCKDpDeoWJzUuwGMDMkZOwls=";
};
vendorHash = "sha256-2YvIK0wIwCELcaBUZN2SbTngdFO717YY+83NSIzae0w=";
vendorHash = "sha256-3CrWrv8kXnbZUcaI2CG/x7MUWlR14OLbjen5FbljTEI=";
subPackages = [ "weed" ];

6
pkgs/applications/networking/sync/storj-uplink/default.nix
View File

@ -5,18 +5,18 @@
buildGoModule rec {
pname = "storj-uplink";
version = "1.109.2";
version = "1.110.3";
src = fetchFromGitHub {
owner = "storj";
repo = "storj";
rev = "v${version}";
hash = "sha256-IVT3BWyDijhpt+bMn7u2f2JiGc0onAjbajHMzzbVt20=";
hash = "sha256-hVgFr5fnoSZumNkImMIEbKCu7nIAT72bMi3wnsn95tc=";
};
subPackages = [ "cmd/uplink" ];
vendorHash = "sha256-+m7XOpKzg0clbRh2Rpi8JqhLoJLJsA7tT3g6FkmoVc4=";
vendorHash = "sha256-iXOL7YtSXTmLMS3nDvuUy2puWK83gbtVmrzD17C9JxU=";
ldflags = [ "-s" "-w" ];

14
pkgs/applications/science/molecular-dynamics/lammps/default.nix
View File

@ -75,8 +75,9 @@ stdenv.mkDerivation (finalAttrs: {
inherit extraBuildInputs;
};
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" true)
]
++ (builtins.map (p: "-DPKG_${p}=ON") (builtins.attrNames (lib.filterAttrs (n: v: v) packages)))
++ (lib.mapAttrsToList (n: v: lib.cmakeBool "PKG_${n}" v) packages)
++ (lib.mapAttrsToList (n: v: "-D${n}=${v}") extraCmakeFlags)
;
@ -99,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
ln -s $out/share/vim-plugins/lammps $out/share/nvim/site
'';
meta = with lib; {
meta = {
description = "Classical Molecular Dynamics simulation code";
longDescription = ''
LAMMPS is a classical molecular dynamics simulation code designed to
@ -109,13 +110,16 @@ stdenv.mkDerivation (finalAttrs: {
under the terms of the GNU Public License (GPL).
'';
homepage = "https://www.lammps.org";
license = licenses.gpl2Only;
platforms = platforms.linux;
license = lib.licenses.gpl2Only;
platforms = lib.platforms.linux;
# compiling lammps with 64 bit support blas and lapack might cause runtime
# segfaults. In anycase both blas and lapack should have the same #bits
# support.
broken = (blas.isILP64 && lapack.isILP64);
maintainers = [ maintainers.costrouc maintainers.doronbehar ];
maintainers = with lib.maintainers; [
costrouc
doronbehar
];
mainProgram = "lmp";
};
})

14
pkgs/applications/version-management/gitlab/data.json
View File

@ -1,15 +1,15 @@
{
"version": "17.2.0",
"repo_hash": "0g3g0nwxwv0h7i49qlv1835n9gh0cw8hikms62jl89nv1ca833yr",
"yarn_hash": "119acrb27gpmh4m6vk917y4djfm9319jnys0mrqj183diw8j3zcn",
"version": "17.2.2",
"repo_hash": "1gk29bwd6vzikjg28p30wgdq9a46l4qbnac5r0h2mwih1sm8hlbc",
"yarn_hash": "10y540bxwaz355p9r4q34199aibadrd5p4d9ck2y3n6735k0hm74",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v17.2.0-ee",
"rev": "v17.2.2-ee",
"passthru": {
"GITALY_SERVER_VERSION": "17.2.0",
"GITLAB_PAGES_VERSION": "17.2.0",
"GITALY_SERVER_VERSION": "17.2.2",
"GITLAB_PAGES_VERSION": "17.2.2",
"GITLAB_SHELL_VERSION": "14.37.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.2.0",
"GITLAB_WORKHORSE_VERSION": "17.2.0"
"GITLAB_WORKHORSE_VERSION": "17.2.2"
}
}

4
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@ -6,7 +6,7 @@
}:
let
version = "17.2.0";
version = "17.2.2";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@ -20,7 +20,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
hash = "sha256-thQ8Gufcygt3QEbIcmkroSuAky9kJ7f7hupim87AJdE=";
hash = "sha256-4K0unlvhAnTIiuyRUNm0dXG5sJsxIuo8HkUQvUK7ws4=";
};
vendorHash = "sha256-FqnGVRldhevJgBBvJcvGXzRaYWqSHzZiXIQmCNzJv+4=";

4
pkgs/applications/version-management/gitlab/gitaly/git.nix
View File

@ -9,14 +9,14 @@
stdenv.mkDerivation rec {
pname = "gitaly-git";
version = "2.44.1.gl1";
version = "2.44.2.gl1";
# `src` attribute for nix-update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "git";
rev = "v${version}";
hash = "sha256-1XtzM2dYbt3nsYOm5isgHnolfziyIC9yCTkfLJ95V6Y=";
hash = "sha256-VIffbZZEbGjVW1No8zojSQlX/ciJ2DJnaogNlQtc77o=";
};
# we actually use the gitaly build system

6
pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "gitlab-container-registry";
version = "4.6.0";
version = "4.7.0";
rev = "v${version}-gitlab";
# nixpkgs-update: no auto update
@ -10,10 +10,10 @@ buildGoModule rec {
owner = "gitlab-org";
repo = "container-registry";
inherit rev;
hash = "sha256-rFojpy8xUXhlzBFBYFW3+AjDI5efaNWh+Vi3wsqVebI=";
hash = "sha256-+71mqnXRMq0vE+T6V/JqIhP//zldQOEK7694IB5RSnc=";
};
vendorHash = "sha256-xhy0WSqdlri5bckIeS6CSeyZGf3pBNpLElkvsMm6N48=";
vendorHash = "sha256-h4nLnmsQ52PU3tUbTCUwWN8LbYuSgzaDkqplEZcDAGM=";
postPatch = ''
# Disable flaky inmemory storage driver test

4
pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
View File

@ -2,14 +2,14 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "17.2.0";
version = "17.2.2";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
hash = "sha256-Rw78xDkOf/LDINsWqNGkMSjUXkbgVlSI6PTiZLHo2Wo=";
hash = "sha256-AtLsy2hHxqr3XyTItLfMoTmrUsM707Kme7jE2jAAfyc=";
};
vendorHash = "sha256-yNHeM8MExcLwv2Ga4vtBmPFBt/Rj7Gd4QQYDlnAIo+c=";

2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "17.2.0";
version = "17.2.2";
# nixpkgs-update: no auto update
src = fetchFromGitLab {

2
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
View File

@ -2279,4 +2279,4 @@ DEPENDENCIES
yajl-ruby (~> 1.4.3)
BUNDLED WITH
2.5.11
2.5.16

2
pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
View File

@ -2789,7 +2789,7 @@ src:
version = "1.45.0";
};
google-protobuf = {
groups = ["default"];
groups = ["default" "development" "opentelemetry" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];

6
pkgs/build-support/php/builders/default.nix
View File

@ -6,4 +6,10 @@
mkComposerRepository = callPackage ./v1/build-composer-repository.nix { };
composerHooks = callPackages ./v1/hooks { };
};
v2 = {
buildComposerProject = callPackage ./v2/build-composer-project.nix { };
mkComposerVendor = callPackage ./v2/build-composer-vendor.nix { };
composerHooks = callPackages ./v2/hooks { };
};
}

108
pkgs/build-support/php/builders/v2/build-composer-project.nix Normal file
View File

@ -0,0 +1,108 @@
{
nix-update-script,
stdenvNoCC,
lib,
php,
}:
let
buildComposerProjectOverride =
finalAttrs: previousAttrs:
let
phpDrv = finalAttrs.php or php;
composer = finalAttrs.composer or phpDrv.packages.composer;
in
{
composerLock = previousAttrs.composerLock or null;
composerNoDev = previousAttrs.composerNoDev or true;
composerNoPlugins = previousAttrs.composerNoPlugins or true;
composerNoScripts = previousAttrs.composerNoScripts or true;
composerStrictValidation = previousAttrs.composerStrictValidation or true;
nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [
composer
phpDrv
phpDrv.composerHooks2.composerInstallHook
];
buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ phpDrv ];
patches = previousAttrs.patches or [ ];
strictDeps = previousAttrs.strictDeps or true;
# Should we keep these empty phases?
configurePhase =
previousAttrs.configurePhase or ''
runHook preConfigure
runHook postConfigure
'';
buildPhase =
previousAttrs.buildPhase or ''
runHook preBuild
runHook postBuild
'';
doCheck = previousAttrs.doCheck or true;
checkPhase =
previousAttrs.checkPhase or ''
runHook preCheck
runHook postCheck
'';
installPhase =
previousAttrs.installPhase or ''
runHook preInstall
runHook postInstall
'';
doInstallCheck = previousAttrs.doInstallCheck or false;
installCheckPhase =
previousAttrs.installCheckPhase or ''
runHook preInstallCheck
runHook postInstallCheck
'';
composerVendor =
previousAttrs.composerVendor or (phpDrv.mkComposerVendor {
inherit composer;
inherit (finalAttrs)
patches
pname
src
vendorHash
version
;
composerLock = previousAttrs.composerLock or null;
composerNoDev = previousAttrs.composerNoDev or true;
composerNoPlugins = previousAttrs.composerNoPlugins or true;
composerNoScripts = previousAttrs.composerNoScripts or true;
composerStrictValidation = previousAttrs.composerStrictValidation or true;
});
# Projects providing a lockfile from upstream can be automatically updated.
passthru = previousAttrs.passthru or { } // {
updateScript =
previousAttrs.passthru.updateScript
or (if finalAttrs.composerVendor.composerLock == null then nix-update-script { } else null);
};
env = {
COMPOSER_CACHE_DIR = "/dev/null";
COMPOSER_DISABLE_NETWORK = "1";
COMPOSER_MIRROR_PATH_REPOS = "1";
};
meta = previousAttrs.meta or { } // {
platforms = lib.platforms.all;
};
};
in
args: (stdenvNoCC.mkDerivation args).overrideAttrs buildComposerProjectOverride

103
pkgs/build-support/php/builders/v2/build-composer-vendor.nix Normal file
View File

@ -0,0 +1,103 @@
{
stdenvNoCC,
lib,
php,
}:
let
mkComposerVendorOverride =
/*
We cannot destruct finalAttrs since the attrset below is used to construct it
and Nix currently does not support lazy attribute names.
{
php ? null,
composer ? null,
composerLock ? "composer.lock",
src,
vendorHash,
...
}@finalAttrs:
*/
finalAttrs: previousAttrs:
let
phpDrv = finalAttrs.php or php;
composer = finalAttrs.composer or phpDrv.packages.composer;
in
assert (lib.assertMsg (previousAttrs ? src) "mkComposerVendor expects src argument.");
assert (lib.assertMsg (previousAttrs ? vendorHash) "mkComposerVendor expects vendorHash argument.");
assert (lib.assertMsg (previousAttrs ? version) "mkComposerVendor expects version argument.");
assert (lib.assertMsg (previousAttrs ? pname) "mkComposerVendor expects pname argument.");
{
composerNoDev = previousAttrs.composerNoDev or true;
composerNoPlugins = previousAttrs.composerNoPlugins or true;
composerNoScripts = previousAttrs.composerNoScripts or true;
composerStrictValidation = previousAttrs.composerStrictValidation or true;
name = "${previousAttrs.pname}-${previousAttrs.version}-composer-repository";
# See https://github.com/NixOS/nix/issues/6660
dontPatchShebangs = previousAttrs.dontPatchShebangs or true;
nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [
composer
phpDrv
phpDrv.composerHooks2.composerVendorHook
];
buildInputs = previousAttrs.buildInputs or [ ];
strictDeps = previousAttrs.strictDeps or true;
# Should we keep these empty phases?
configurePhase =
previousAttrs.configurePhase or ''
runHook preConfigure
runHook postConfigure
'';
buildPhase =
previousAttrs.buildPhase or ''
runHook preBuild
runHook postBuild
'';
doCheck = previousAttrs.doCheck or true;
checkPhase =
previousAttrs.checkPhase or ''
runHook preCheck
runHook postCheck
'';
installPhase =
previousAttrs.installPhase or ''
runHook preInstall
runHook postInstall
'';
doInstallCheck = previousAttrs.doInstallCheck or false;
installCheckPhase =
previousAttrs.installCheckPhase or ''
runHook preInstallCheck
runHook postInstallCheck
'';
env = {
COMPOSER_CACHE_DIR = "/dev/null";
COMPOSER_MIRROR_PATH_REPOS = "1";
COMPOSER_HTACCESS_PROTECT = "0";
COMPOSER_DISABLE_NETWORK = "0";
};
outputHashMode = "recursive";
outputHashAlgo =
if (finalAttrs ? vendorHash && finalAttrs.vendorHash != "") then null else "sha256";
outputHash = finalAttrs.vendorHash or "";
};
in
args: (stdenvNoCC.mkDerivation args).overrideAttrs mkComposerVendorOverride

91
pkgs/build-support/php/builders/v2/hooks/composer-install-hook.sh Normal file
View File

@ -0,0 +1,91 @@
declare composerVendor
declare version
declare composerNoDev
declare composerNoPlugins
declare composerNoScripts
preConfigureHooks+=(composerInstallConfigureHook)
preBuildHooks+=(composerInstallBuildHook)
preCheckHooks+=(composerInstallCheckHook)
preInstallHooks+=(composerInstallInstallHook)
source @phpScriptUtils@
composerInstallConfigureHook() {
echo "Executing composerInstallConfigureHook"
setComposeRootVersion
if [[ ! -e "${composerVendor}" ]]; then
echo "No local composer vendor found."
exit 1
fi
install -Dm644 ${composerVendor}/composer.{json,lock} .
if [[ ! -f "composer.lock" ]]; then
composer \
--no-install \
--no-interaction \
--no-progress \
--optimize-autoloader \
${composerNoDev:+--no-dev} \
${composerNoPlugins:+--no-plugins} \
${composerNoScripts:+--no-scripts} \
update
install -Dm644 composer.lock -t $out/
echo
echo -e "\e[31mERROR: No composer.lock found\e[0m"
echo
echo -e '\e[31mNo composer.lock file found, consider adding one to your repository to ensure reproducible builds.\e[0m'
echo -e "\e[31mIn the meantime, a composer.lock file has been generated for you in $out/composer.lock\e[0m"
echo
echo -e '\e[31mTo fix the issue:\e[0m'
echo -e "\e[31m1. Copy the composer.lock file from $out/composer.lock to the project's source:\e[0m"
echo -e "\e[31m cp $out/composer.lock <path>\e[0m"
echo -e '\e[31m2. Add the composerLock attribute, pointing to the copied composer.lock file:\e[0m'
echo -e '\e[31m composerLock = ./composer.lock;\e[0m'
echo
exit 1
fi
chmod +w composer.{json,lock}
echo "Finished composerInstallConfigureHook"
}
composerInstallBuildHook() {
echo "Executing composerInstallBuildHook"
echo "Finished composerInstallBuildHook"
}
composerInstallCheckHook() {
echo "Executing composerInstallCheckHook"
checkComposerValidate
echo "Finished composerInstallCheckHook"
}
composerInstallInstallHook() {
echo "Executing composerInstallInstallHook"
cp -ar ${composerVendor}/* .
# Copy the relevant files only in the store.
mkdir -p "$out"/share/php/"${pname}"
cp -r . "$out"/share/php/"${pname}"/
# Create symlinks for the binaries.
jq -r -c 'try (.bin[] | select(test(".bat$")? | not) )' composer.json | while read -r bin; do
echo -e "\e[32mCreating symlink ${bin}...\e[0m"
mkdir -p "$out"/bin
ln -s "$out"/share/php/"${pname}"/"$bin" "$out"/bin/"$(basename "$bin")"
done
echo "Finished composerInstallInstallHook"
}

91
pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh Normal file
View File

@ -0,0 +1,91 @@
declare composerLock
declare version
declare composerNoDev
declare composerNoPlugins
declare composerNoScripts
declare composerStrictValidation
preConfigureHooks+=(composerVendorConfigureHook)
preBuildHooks+=(composerVendorBuildHook)
preCheckHooks+=(composerVendorCheckHook)
preInstallHooks+=(composerVendorInstallHook)
source @phpScriptUtils@
composerVendorConfigureHook() {
echo "Executing composerVendorConfigureHook"
setComposeRootVersion
if [[ -e "$composerLock" ]]; then
echo -e "\e[32mUsing user provided \`composer.lock\` file from \`$composerLock\`\e[0m"
install -Dm644 $composerLock ./composer.lock
fi
if [[ ! -f "composer.lock" ]]; then
composer \
--no-install \
--no-interaction \
--no-progress \
--optimize-autoloader \
${composerNoDev:+--no-dev} \
${composerNoPlugins:+--no-plugins} \
${composerNoScripts:+--no-scripts} \
update
install -Dm644 composer.lock -t $out/
echo
echo -e "\e[31mERROR: No composer.lock found\e[0m"
echo
echo -e '\e[31mNo composer.lock file found, consider adding one to your repository to ensure reproducible builds.\e[0m'
echo -e "\e[31mIn the meantime, a composer.lock file has been generated for you in $out/composer.lock\e[0m"
echo
echo -e '\e[31mTo fix the issue:\e[0m'
echo -e "\e[31m1. Copy the composer.lock file from $out/composer.lock to the project's source:\e[0m"
echo -e "\e[31m cp $out/composer.lock <path>\e[0m"
echo -e '\e[31m2. Add the composerLock attribute, pointing to the copied composer.lock file:\e[0m'
echo -e '\e[31m composerLock = ./composer.lock;\e[0m'
echo
exit 1
fi
chmod +w composer.{json,lock}
echo "Finished composerVendorConfigureHook"
}
composerVendorBuildHook() {
echo "Executing composerVendorBuildHook"
composer \
--apcu-autoloader \
--apcu-autoloader-prefix="$(jq -r -c 'try ."content-hash"' < composer.lock)" \
--no-interaction \
--no-progress \
--optimize-autoloader \
${composerNoDev:+--no-dev} \
${composerNoPlugins:+--no-plugins} \
${composerNoScripts:+--no-scripts} \
install
echo "Finished composerVendorBuildHook"
}
composerVendorCheckHook() {
echo "Executing composerVendorCheckHook"
checkComposerValidate
echo "Finished composerVendorCheckHook"
}
composerVendorInstallHook() {
echo "Executing composerVendorInstallHook"
mkdir -p $out
cp -ar composer.{json,lock} $(composer config vendor-dir) $out/
echo "Finished composerVendorInstallHook"
}

45
pkgs/build-support/php/builders/v2/hooks/default.nix Normal file
View File

@ -0,0 +1,45 @@
{
lib,
makeSetupHook,
jq,
writeShellApplication,
moreutils,
cacert,
buildPackages,
}:
let
php-script-utils = writeShellApplication {
name = "php-script-utils";
runtimeInputs = [ jq ];
text = builtins.readFile ./php-script-utils.bash;
};
in
{
composerVendorHook = makeSetupHook {
name = "composer-vendor-hook.sh";
propagatedBuildInputs = [
jq
moreutils
cacert
];
substitutions = {
phpScriptUtils = lib.getExe php-script-utils;
};
} ./composer-vendor-hook.sh;
composerInstallHook = makeSetupHook {
name = "composer-install-hook.sh";
propagatedBuildInputs = [
jq
moreutils
cacert
];
substitutions = {
# Specify the stdenv's `diff` by abspath to ensure that the user's build
# inputs do not cause us to find the wrong `diff`.
cmp = "${lib.getBin buildPackages.diffutils}/bin/cmp";
phpScriptUtils = lib.getExe php-script-utils;
};
} ./composer-install-hook.sh;
}

86
pkgs/build-support/php/builders/v2/hooks/php-script-utils.bash Normal file
View File

@ -0,0 +1,86 @@
declare version
declare composerStrictValidation
declare composerGlobal
setComposeRootVersion() {
set +e # Disable exit on error
if [[ -v version ]]; then
echo -e "\e[32mSetting COMPOSER_ROOT_VERSION to $version\e[0m"
export COMPOSER_ROOT_VERSION=$version
fi
set -e
}
checkComposerValidate() {
if [ "1" == "${composerGlobal-}" ]; then
global="global";
else
global="";
fi
command="composer ${global} validate --strict --quiet --no-interaction --no-check-all --no-check-lock"
if ! $command; then
if [ "1" == "${composerStrictValidation-}" ]; then
echo
echo -e "\e[31mERROR: composer files validation failed\e[0m"
echo
echo -e '\e[31mThe validation of the composer.json failed.\e[0m'
echo -e '\e[31mMake sure that the file composer.json is valid.\e[0m'
echo
echo -e '\e[31mTo address the issue efficiently, follow one of these steps:\e[0m'
echo -e '\e[31m 1. File an issue in the project'\''s issue tracker with detailed information, and apply any available remote patches as a temporary solution '\('with fetchpatch'\)'.\e[0m'
echo -e '\e[31m 2. If an immediate fix is needed or if reporting upstream isn'\''t suitable, develop a temporary local patch.\e[0m'
echo
exit 1
else
echo
echo -e "\e[33mWARNING: composer files validation failed\e[0m"
echo
echo -e '\e[33mThe validation of the composer.json failed.\e[0m'
echo -e '\e[33mMake sure that the file composer.json is valid.\e[0m'
echo
echo -e '\e[33mTo address the issue efficiently, follow one of these steps:\e[0m'
echo -e '\e[33m 1. File an issue in the project'\''s issue tracker with detailed information, and apply any available remote patches as a temporary solution with '\('with fetchpatch'\)'.\e[0m'
echo -e '\e[33m 2. If an immediate fix is needed or if reporting upstream isn'\''t suitable, develop a temporary local patch.\e[0m'
echo
echo -e '\e[33mThis check is not blocking, but it is recommended to fix the issue.\e[0m'
echo
fi
fi
command="composer ${global} validate --strict --no-ansi --no-interaction --quiet --no-check-all --check-lock"
if ! $command; then
if [ "1" == "${composerStrictValidation-}" ]; then
echo
echo -e "\e[31mERROR: composer files validation failed\e[0m"
echo
echo -e '\e[31mThe validation of the composer.json and composer.lock failed.\e[0m'
echo -e '\e[31mMake sure that the file composer.lock is consistent with composer.json.\e[0m'
echo
echo -e '\e[31mThis often indicates an issue with the upstream project, which can typically be resolved by reporting the issue to the relevant project maintainers.\e[0m'
echo
echo -e '\e[31mTo address the issue efficiently, follow one of these steps:\e[0m'
echo -e '\e[31m 1. File an issue in the project'\''s issue tracker with detailed information '\('run '\''composer update --lock --no-install'\'' to fix the issue'\)', and apply any available remote patches as a temporary solution with '\('with fetchpatch'\)'.\e[0m'
echo -e '\e[31m 2. If an immediate fix is needed or if reporting upstream isn'\''t suitable, develop a temporary local patch.\e[0m'
echo
exit 1
else
echo
echo -e "\e[33mWARNING: composer files validation failed\e[0m"
echo
echo -e '\e[33mThe validation of the composer.json and composer.lock failed.\e[0m'
echo -e '\e[33mMake sure that the file composer.lock is consistent with composer.json.\e[0m'
echo
echo -e '\e[33mThis often indicates an issue with the upstream project, which can typically be resolved by reporting the issue to the relevant project maintainers.\e[0m'
echo
echo -e '\e[33mTo address the issue efficiently, follow one of these steps:\e[0m'
echo -e '\e[33m 1. File an issue in the project'\''s issue tracker with detailed information '\('run '\''composer update --lock --no-install'\'' to fix the issue'\)', and apply any available remote patches as a temporary solution with '\('with fetchpatch'\)'.\e[0m'
echo -e '\e[33m 2. If an immediate fix is needed or if reporting upstream isn'\''t suitable, develop a temporary local patch.\e[0m'
echo
echo -e '\e[33mThis check is not blocking, but it is recommended to fix the issue.\e[0m'
echo
fi
fi
}

17
pkgs/by-name/_6/_64gram/package.nix
View File

@ -1,13 +1,14 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, telegram-desktop
, nix-update-script
}:
telegram-desktop.overrideAttrs (old: rec {
pname = "64gram";
version = "1.1.31";
version = "1.1.34";
src = fetchFromGitHub {
owner = "TDesktop-x64";
@ -15,9 +16,21 @@ telegram-desktop.overrideAttrs (old: rec {
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-xYCousLXV9TeQjDNiXkEMbTiiuusLc7Ib2xHkMYBD1M=";
hash = "sha256-DbHbhkInZi8B/0fvbCWutN4noEv7MZ+C5Eg7g+89Moo=";
};
patches = (old.patches or []) ++ [
(fetchpatch {
url = "https://github.com/TDesktop-x64/tdesktop/commit/c996ccc1561aed089c8b596f6ab3844335bbf1df.patch";
revert = true;
hash = "sha256-Hz7BXl5z4owe31l9Je3QOXT8FAyKcbsXsKjGfCmXhzE=";
})
];
cmakeFlags = (old.cmakeFlags or []) ++ [
(lib.cmakeBool "disable_autoupdate" true)
];
passthru.updateScript = nix-update-script {};
meta = with lib; {

2
pkgs/by-name/ad/adwaita-icon-theme/package.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
version = "46.0";
src = fetchurl {
url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/adwaita-icon-theme-${version}.tar.xz";
hash = "sha256-S8tTm9ddZNo4XW+gjLqp3erOtqyOgrhbpsQRF79bpk4=";
};

2
pkgs/by-name/al/alp/package.nix
View File

@ -33,7 +33,7 @@ buildGoModule rec {
buildPhase = ''
runHook preBuild
go build -o $GOPATH/bin/${pname} main.go
go build -o $GOPATH/bin/alp main.go
runHook postBuild
'';

2
pkgs/by-name/al/alsa-oss/package.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.1.8";
src = fetchurl {
url = "mirror://alsa/oss-lib/${pname}-${version}.tar.bz2";
url = "mirror://alsa/oss-lib/alsa-oss-${version}.tar.bz2";
sha256 = "13nn6n6wpr2sj1hyqx4r9nb9bwxnhnzw8r2f08p8v13yjbswxbb4";
};

2
pkgs/by-name/al/alsa-plugins/package.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.2.12";
src = fetchurl {
url = "mirror://alsa/plugins/${pname}-${version}.tar.bz2";
url = "mirror://alsa/plugins/alsa-plugins-${version}.tar.bz2";
hash = "sha256-e9ioPTBOji2GoliV2Nyw7wJFqN8y4nGVnNvcavObZvI=";
};

2
pkgs/by-name/al/alsa-ucm-conf/package.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.2.11";
src = fetchurl {
url = "mirror://alsa/lib/${pname}-${version}.tar.bz2";
url = "mirror://alsa/lib/alsa-ucm-conf-${version}.tar.bz2";
hash = "sha256-OHwBzzDioWdte49ysmgc8hmrynDdHsKp4zrdW/P+roE=";
};

2
pkgs/by-name/al/alsa-utils/package.nix
View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
version = "1.2.10";
src = fetchurl {
url = "mirror://alsa/utils/${pname}-${version}.tar.bz2";
url = "mirror://alsa/utils/alsa-utils-${version}.tar.bz2";
sha256 = "sha256-EEti7H8Cp84WynefSBVhbfHMIZM1A3g6kQe1lE+DBjo=";
};
patches = [

2
pkgs/by-name/an/anyrun/package.nix
View File

@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec {
'';
postInstall = ''
install -Dm444 anyrun/res/style.css examples/config.ron -t $out/share/doc/${pname}/examples/
install -Dm444 anyrun/res/style.css examples/config.ron -t $out/share/doc/anyrun/examples/
'';
passthru.updateScript = unstableGitUpdater { };

8
pkgs/by-name/aq/aquamarine/package.nix
View File

@ -19,16 +19,17 @@
udev,
wayland,
wayland-protocols,
wayland-scanner,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "aquamarine";
version = "0.3.1";
version = "0.3.3";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "aquamarine";
rev = "v${finalAttrs.version}";
hash = "sha256-1RYuBS/CQhtyIeXrLDvGWJhuVG1kiQMG+aYaBkoGnEU=";
hash = "sha256-zushuLkBblDZGVo2qbiMTJ51LSkqYJpje/R2dvfec1U=";
};
nativeBuildInputs = [
@ -51,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
udev
wayland
wayland-protocols
wayland-scanner
];
strictDeps = true;
@ -65,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = nix-update-script { };
meta = {
changelog = "https://github.com/hyprwm/aquamarine/releases/tag/${finalAttrs.version}";
changelog = "https://github.com/hyprwm/aquamarine/releases/tag/v${finalAttrs.version}";
description = "A very light linux rendering backend library";
homepage = "https://github.com/hyprwm/aquamarine";
license = lib.licenses.bsd3;

4
pkgs/by-name/as/assemblyscript/package.nix
View File

@ -9,7 +9,7 @@ buildNpmPackage rec {
src = fetchFromGitHub {
owner = "AssemblyScript";
repo = pname;
repo = "assemblyscript";
rev = "v${version}";
sha256 = "sha256-Jhjq+kLRzDesTPHHonImCnuzt1Ay04n7+O9aK4knb5g=";
};
@ -17,7 +17,7 @@ buildNpmPackage rec {
npmDepsHash = "sha256-mWRQPQVprM+9SCYd8M7NMDtiwDjSH5cr4Xlr5VP9eHo=";
meta = with lib; {
homepage = "https://github.com/AssemblyScript/${pname}";
homepage = "https://github.com/AssemblyScript/assemblyscript";
description = "TypeScript-like language for WebAssembly";
license = licenses.asl20;
maintainers = with maintainers; [ lucperkins ];

12
pkgs/by-name/au/audiobookshelf/package.nix
View File

@ -20,13 +20,13 @@ let
src = fetchFromGitHub {
owner = "advplyr";
repo = pname;
repo = "audiobookshelf";
rev = "refs/tags/v${source.version}";
inherit (source) hash;
};
client = buildNpmPackage {
pname = "${pname}-client";
pname = "audiobookshelf-client";
inherit (source) version;
src = runCommand "cp-source" { } ''
@ -74,13 +74,13 @@ buildNpmPackage {
installPhase = ''
mkdir -p $out/opt/client
cp -r index.js server package* node_modules $out/opt/
cp -r ${client}/lib/node_modules/${pname}-client/dist $out/opt/client/dist
cp -r ${client}/lib/node_modules/audiobookshelf-client/dist $out/opt/client/dist
mkdir $out/bin
echo '${wrapper}' > $out/bin/${pname}
echo " exec ${nodejs}/bin/node $out/opt/index.js" >> $out/bin/${pname}
echo '${wrapper}' > $out/bin/audiobookshelf
echo " exec ${nodejs}/bin/node $out/opt/index.js" >> $out/bin/audiobookshelf
chmod +x $out/bin/${pname}
chmod +x $out/bin/audiobookshelf
'';
passthru = {

16
pkgs/by-name/az/azure-cli/extensions-manual.nix
View File

@ -60,6 +60,22 @@
meta.maintainers = with lib.maintainers; [ obreitwi ];
};
ssh = mkAzExtension rec {
pname = "ssh";
version = "2.0.5";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/ssh-${version}-py3-none-any.whl";
sha256 = "80c98b10d7bf1ce4005b7694aedd05c47355456775ba6125308be65fb0fefc93";
description = "SSH into Azure VMs using RBAC and AAD OpenSSH Certificates";
propagatedBuildInputs = (
with python3Packages;
[
oras
oschmod
]
);
meta.maintainers = with lib.maintainers; [ gordon-bp ];
};
storage-preview = mkAzExtension rec {
pname = "storage-preview";
version = "1.0.0b2";

6
pkgs/by-name/b3/b3sum/package.nix
View File

@ -6,14 +6,14 @@
rustPlatform.buildRustPackage rec {
pname = "b3sum";
version = "1.5.3";
version = "1.5.4";
src = fetchCrate {
inherit version pname;
hash = "sha256-wyr5LuFn3yRPJCyNfLT1Vgn6Sz1U4VNo0nppJrqE7IY=";
hash = "sha256-+aC6yyQ9IcdliYqteB/UTMqwGNCWW0LZWYfMxnaPMm0=";
};
cargoHash = "sha256-v2sQKZ0DG08MDLho8fQ8O7fiNu+kxZB1sPNMgF5W2HA=";
cargoHash = "sha256-2E6SU4fMHj0NCIMrn0YNfkllZrFwCLn1wGJfzBPqtKQ=";
meta = {
description = "BLAKE3 cryptographic hash function";

4
pkgs/by-name/ba/baobab/package.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
version = "46.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/baobab/${lib.versions.major version}/baobab-${version}.tar.xz";
hash = "sha256-zk3vXILQVnGlAJ9768+FrJhnXZ2BYNKK2RgbJppy43w=";
};
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
packageName = "baobab";
};
};

6
pkgs/by-name/bc/bcachefs-tools/package.nix
View File

@ -28,13 +28,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bcachefs-tools";
version = "1.9.4";
version = "1.11.0";
src = fetchFromGitHub {
owner = "koverstreet";
repo = "bcachefs-tools";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-qPnlSl1s9QWkODqbrfzIVFLXtDVEmTOihBlDmvHoknY=";
hash = "sha256-L2eIYdQnnmKNI8QWSy8nk4GzJ8jv+qt98gqdzcJH31Q=";
};
nativeBuildInputs = [
@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
cargoDeps = rustPlatform.fetchCargoTarball {
src = finalAttrs.src;
hash = "sha256-ufzxFEgeOaOcZKEPx7kT64Pj2oz6m35exqXQlKxXGb4=";
hash = "sha256-Ol3wKdxKYJWDC/JREOfVSQRNnWVano7qilMRvqrLsgA==";
};
makeFlags = [

6
pkgs/by-name/be/beeper-bridge-manager/package.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "bbctl";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitHub {
owner = "beeper";
repo = "bridge-manager";
rev = "refs/tags/v${version}";
hash = "sha256-xaBLI5Y7PxHbmlwD72AKNrgnz3D+3WVhb2GJr5cmyfs=";
hash = "sha256-MAve7ZNS20XBJ7Qp3mehznli04+MS7RiVWW1txdf19U=";
};
vendorHash = "sha256-VnqihTEGfrLxRfuscrWWBbhZ/tr8BhVnCd+FKblW5gI=";
vendorHash = "sha256-uz4pao8Y/Sb3fffi9d0lbWQEUMohbthA6t6k6PfQz2M=";
meta = {
description = "Tool for running self-hosted bridges with the Beeper Matrix server. ";

2
pkgs/by-name/br/braa/package.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
version = "0.82";
src = fetchzip {
url = "http://s-tech.elsat.net.pl/${pname}/${pname}-${version}.tar.gz";
url = "http://s-tech.elsat.net.pl/braa/braa-${version}.tar.gz";
hash = "sha256-GS3kk432BdGx/sLzzjXvotD9Qn4S3U4XtMmM0fWMhGA=";
};

4
pkgs/by-name/br/brill/package.nix
View File

@ -14,8 +14,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
runHook preInstall
install -Dm644 *.ttf -t $out/share/fonts/truetype
install -Dm644 *agreement.pdf -t $out/share/licenses/${pname}
install -Dm644 *use.pdf -t $out/share/doc/${pname}
install -Dm644 *agreement.pdf -t $out/share/licenses/brill
install -Dm644 *use.pdf -t $out/share/doc/brill
runHook postInstall
'';

4
pkgs/by-name/br/bruno/package.nix
View File

@ -26,13 +26,13 @@ let
in
buildNpmPackage' rec {
pname = "bruno";
version = "1.24.0";
version = "1.25.0";
src = fetchFromGitHub {
owner = "usebruno";
repo = "bruno";
rev = "v${version}";
hash = "sha256-+rnZid+2E3xP6GTHKXki+MeRuoU8gAB34/MVyKu9oEQ=";
hash = "sha256-TXEe0ICrkljxfnvW1wv/e1BB7J6p/KW3JklCvYyjqSs=";
postFetch = ''
${lib.getExe npm-lockfile-fix} $out/package-lock.json

4
pkgs/by-name/bu/buttermanager/package.nix
View File

@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "buttermanager";
version = "2.5.1";
version = "2.5.2";
pyproject = true;
src = fetchFromGitHub {
owner = "egara";
repo = "buttermanager";
rev = version;
hash = "sha256-MLYJt7OMYlTFk8FCAlZJ1RGlFFXKfeAthWGp4JN+PfY=";
hash = "sha256-/U5IVJvYCw/YzBWjQ949YP9uoxsTNRJ5FO7rrI6Cvhs=";
};
propagatedBuildInputs = with python3Packages; [

6
pkgs/by-name/ca/cargo-shear/package.nix
View File

@ -6,7 +6,7 @@
cargo-shear,
}:
let
version = "1.1.1";
version = "1.1.2";
in
rustPlatform.buildRustPackage {
pname = "cargo-shear";
@ -16,10 +16,10 @@ rustPlatform.buildRustPackage {
owner = "Boshen";
repo = "cargo-shear";
rev = "v${version}";
hash = "sha256-4HGI0G3fOzj787fXyUMt4XK4KMtrilOJUw1DqRpUoYY=";
hash = "sha256-JnQrQBx9VuXI0wj1mMLfl15lxC85f1kUBucgC3Q8F0c=";
};
cargoHash = "sha256-sQiWd8onSJMo7+ouCPye7IaGzYp0N3rMC4PZv+/DPt4=";
cargoHash = "sha256-iFcW9REkEolrDDbEwoepUSO79OgUdsLUhSkk12y4yxk=";
# https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23
SHEAR_VERSION = version;

2
pkgs/by-name/ce/centrifugo/package.nix
View File

@ -43,7 +43,7 @@ buildGoModule rec {
inherit (nixosTests) centrifugo;
version = testers.testVersion {
package = centrifugo;
command = "${pname} version";
command = "centrifugo version";
version = "v${version}";
};
};

2
pkgs/by-name/ch/cheese/package.nix
View File

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/cheese/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/cheese/${lib.versions.major version}/cheese-${version}.tar.xz";
sha256 = "XyGFxMmeVN3yuLr2DIKBmVDlSVLhMuhjmHXz7cv49o4=";
};

2
pkgs/by-name/cl/cljfmt/package.nix
View File

@ -11,7 +11,7 @@ buildGraalvmNativeImage rec {
version = "0.12.0";
src = fetchurl {
url = "https://github.com/weavejester/${pname}/releases/download/${version}/${pname}-${version}-standalone.jar";
url = "https://github.com/weavejester/cljfmt/releases/download/${version}/cljfmt-${version}-standalone.jar";
sha256 = "sha256-JdrMsRmTT8U8RZDI2SnQxM5WGMpo1pL2CQ5BqLxcf5M=";
};

2
pkgs/by-name/co/coppwr/package.nix
View File

@ -63,7 +63,7 @@ rustPlatform.buildRustPackage rec {
'';
postFixup = ''
patchelf $out/bin/${pname} \
patchelf $out/bin/coppwr \
--add-rpath ${lib.makeLibraryPath [ libGL libxkbcommon wayland ]}
'';

4
pkgs/by-name/co/cosmic-edit/package.nix
View File

@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
repo = "cosmic-edit";
rev = "epoch-${version}";
hash = "sha256-ZG5Ctyp2crTDS0WxhQqwN4T6WR5qW79HTbICMlOA3P8=";
};
@ -93,7 +93,7 @@ rustPlatform.buildRustPackage rec {
# LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2
postInstall = ''
wrapProgram "$out/bin/${pname}" \
wrapProgram "$out/bin/cosmic-edit" \
--suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr vulkan-loader libxkbcommon wayland

4
pkgs/by-name/co/cosmic-files/package.nix
View File

@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
repo = "cosmic-files";
rev = "epoch-${version}";
hash = "sha256-UwQwZRzOyMvLRRmU2noxGrqblezkR8J2PNMVoyG0M0w=";
};
@ -68,7 +68,7 @@ rustPlatform.buildRustPackage rec {
# LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2
postInstall = ''
wrapProgram "$out/bin/${pname}" \
wrapProgram "$out/bin/cosmic-files" \
--suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 xorg.libXcursor xorg.libXrandr xorg.libXi wayland ]}
'';

4
pkgs/by-name/co/cosmic-store/package.nix
View File

@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
repo = "cosmic-store";
rev = "epoch-${version}";
hash = "sha256-RuqWO2/sqMMd9xMRClAy7cwv7iCTEC15TZ7JLBZ2zwM=";
fetchSubmodules = true;
@ -77,7 +77,7 @@ rustPlatform.buildRustPackage rec {
# LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2
postInstall = ''
wrapProgram "$out/bin/${pname}" \
wrapProgram "$out/bin/cosmic-store" \
--suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
--prefix LD_LIBRARY_PATH : ${
lib.makeLibraryPath [

4
pkgs/by-name/co/cosmic-term/package.nix
View File

@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
repo = "cosmic-term";
rev = "epoch-${version}";
hash = "sha256-dY4QGQXJFL+yjCYRGCg3NfMLMjlEBSEmxHn68PvhCAQ=";
};
@ -95,7 +95,7 @@ rustPlatform.buildRustPackage rec {
# LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2
postInstall = ''
wrapProgram "$out/bin/${pname}" \
wrapProgram "$out/bin/cosmic-term" \
--suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
libxkbcommon

10
pkgs/by-name/cr/crate2nix/package.nix
View File

@ -15,12 +15,12 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "nix-community";
repo = pname;
repo = "crate2nix";
rev = version;
hash = "sha256-esWhRnt7FhiYq0CcIxw9pvH+ybOQmWBfHYMtleaMhBE=";
};
sourceRoot = "${src.name}/${pname}";
sourceRoot = "${src.name}/crate2nix";
cargoHash = "sha256-nQ1VUCFMmpWZWvKFbyJFIZUJ24N9ZPY8JCHWju385NE=";
@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
doCheck = false;
postInstall = ''
wrapProgram $out/bin/${pname} \
wrapProgram $out/bin/crate2nix \
--prefix PATH ":" ${
lib.makeBinPath [
cargo
@ -44,8 +44,8 @@ rustPlatform.buildRustPackage rec {
for shell in bash zsh fish
do
$out/bin/${pname} completions -s $shell
installShellCompletion ${pname}.$shell || installShellCompletion --$shell _${pname}
$out/bin/crate2nix completions -s $shell
installShellCompletion crate2nix.$shell || installShellCompletion --$shell _crate2nix
done
'';

2
pkgs/by-name/cu/cups-kyocera-3500-4500/package.nix
View File

@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
# for lib/cups/filter/kyofilter_pre_H
wrapPythonProgramsIn $out/lib/cups/filter "$propagatedBuildInputs"
install -Dm444 usr/share/doc/kyodialog/copyright $out/share/doc/${pname}/copyright
install -Dm444 usr/share/doc/kyodialog/copyright $out/share/doc/cups-kyocera-3500-4500/copyright
'';
meta = with lib; {

10
pkgs/by-name/db/dbeaver-bin/package.nix
View File

@ -15,7 +15,7 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "dbeaver-bin";
version = "24.1.4";
version = "24.1.5";
src =
let
@ -28,10 +28,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
aarch64-darwin = "macos-aarch64.dmg";
};
hash = selectSystem {
x86_64-linux = "sha256-xO9hQxiEtZJyoO3PQrNPuLPBj8iGF9tvpHkj9Z8oMMc=";
aarch64-linux = "sha256-4dkR0DR/e+gkMytFGNS5gJ/Eo6ih2pacYMR3LdLMv/E=";
x86_64-darwin = "sha256-LUlw7PMP1NpqIJ3qwY3ft+8gsQP8Cu6YqkaiH5Z5qZw=";
aarch64-darwin = "sha256-+7SkO6gv8kn4z9ccY5HIfLjnpsv89MBYil3H2zpQSZs=";
x86_64-linux = "sha256-FdrQDQ+2nsZp44+sARXT89/ZXlkl/OGej1JuezXGgU4=";
aarch64-linux = "sha256-oNP0ntsQ79ckNXuQ3TeVf9ooGzwCq7WXI0TbjTLC5DI=";
x86_64-darwin = "sha256-YcmMZPigykA9vNEF32NzCQWMWPt1GM7VaWGSAZp/1YM=";
aarch64-darwin = "sha256-tz+Ap/YZJbc+obCLqq2b2HgRUORWkaOHVGEEJtwEJXo=";
};
in
fetchurl {

6
pkgs/by-name/db/dbqn/package.nix
View File

@ -48,11 +48,11 @@ stdenv.mkDerivation rec {
'' + (if buildNativeImage then ''
mv dbqn $out/bin
'' else ''
mkdir -p $out/share/${pname}
mv BQN.jar $out/share/${pname}/
mkdir -p $out/share/dbqn
mv BQN.jar $out/share/dbqn/
makeWrapper "${lib.getBin jdk}/bin/java" "$out/bin/dbqn" \
--add-flags "-jar $out/share/${pname}/BQN.jar"
--add-flags "-jar $out/share/dbqn/BQN.jar"
'') + ''
ln -s $out/bin/dbqn $out/bin/bqn

4
pkgs/by-name/dc/dconf-editor/package.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
version = "45.0.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/dconf-editor/${lib.versions.major version}/dconf-editor-${version}.tar.xz";
sha256 = "sha256-EYApdnju2uYhfMUUomOMGH0vHR7ycgy5B5t0DEKZQd0=";
};
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
packageName = "dconf-editor";
};
};

2
pkgs/by-name/de/devhelp/package.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/devhelp-${version}.tar.xz";
sha256 = "Y87u/QU5LgIESIHvHs1yQpNVPaVzW378CCstE/6F3QQ=";
};

2
pkgs/by-name/dm/dmarc-report-converter/package.nix
View File

@ -25,7 +25,7 @@ buildGoModule rec {
];
passthru.tests = {
simple = runCommand "${pname}-test" { } ''
simple = runCommand "dmarc-report-converter-test" { } ''
${dmarc-report-converter}/bin/dmarc-report-converter -h > $out
'';
};

69
pkgs/by-name/ds/dsda-doom/package.nix
View File

@ -1,63 +1,56 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, SDL2
, SDL2_mixer
, SDL2_image
, fluidsynth
, soundfont-fluid
, portmidi
, dumb
, libvorbis
, libmad
, libGLU
, libzip
{
lib,
stdenv,
fetchFromGitHub,
cmake,
SDL2,
SDL2_mixer,
SDL2_image,
fluidsynth,
portmidi,
dumb,
libvorbis,
libmad,
libGLU,
libzip,
alsa-lib,
}:
stdenv.mkDerivation rec {
pname = "dsda-doom";
version = "0.28.0";
version = "0.28.1";
src = fetchFromGitHub {
owner = "kraflab";
repo = "dsda-doom";
rev = "v${version}";
hash = "sha256-4oVQcZ/GOYc9lXMgb3xMXg9ZNB9rYBosbf09cXge6MI=";
hash = "sha256-X2v9eKiIYX4Zi3C1hbUoW4mceRVa6sxpBsP4Npyo4hM=";
};
sourceRoot = "${src.name}/prboom2";
nativeBuildInputs = [
cmake
];
nativeBuildInputs = [ cmake ];
buildInputs = [
SDL2
SDL2_mixer
SDL2_image
fluidsynth
portmidi
alsa-lib
dumb
libvorbis
libmad
fluidsynth
libGLU
libmad
libvorbis
libzip
portmidi
SDL2
SDL2_image
SDL2_mixer
];
# Fixes impure path to soundfont
prePatch = ''
substituteInPlace src/m_misc.c --replace \
"/usr/share/sounds/sf3/default-GM.sf3" \
"${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2"
'';
meta = with lib; {
meta = {
homepage = "https://github.com/kraflab/dsda-doom";
description = "Advanced Doom source port with a focus on speedrunning, successor of PrBoom+";
mainProgram = "dsda-doom";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.Gliczy ];
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ Gliczy ];
};
}

6
pkgs/by-name/en/engage/package.nix
View File

@ -15,7 +15,7 @@ rustPlatform.buildRustPackage {
src = fetchFromGitLab {
domain = "gitlab.computer.surgery";
owner = "charles";
repo = pname;
repo = "engage";
rev = "v${version}";
hash = "sha256-niXh63xTpXSp9Wqwfi8hUBKJSClOUSvB+TPCTaqHfZk=";
};
@ -27,11 +27,11 @@ rustPlatform.buildRustPackage {
];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) (
"installShellCompletion --cmd ${pname} "
"installShellCompletion --cmd engage "
+ builtins.concatStringsSep
" "
(builtins.map
(shell: "--${shell} <($out/bin/${pname} completions ${shell})")
(shell: "--${shell} <($out/bin/engage completions ${shell})")
[
"bash"
"fish"

4
pkgs/by-name/eo/eog/package.nix
View File

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/eog/${lib.versions.major version}/eog-${version}.tar.xz";
sha256 = "sha256-tQ8yHHCsZK97yqW0Rg3GdbPKYP2tOFYW86x7dw4GZv4=";
};
@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
packageName = "eog";
};
};

6
pkgs/by-name/ev/evolution-data-server/package.nix
View File

@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/evolution-data-server-${version}.tar.xz";
hash = "sha256-GzaoOdscjYmAZuGb54uZWTCgovKohvFJ5PZOF1XwZPc=";
};
@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
prePatch = ''
substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch \
--subst-var-by EDS ${glib.makeSchemaPath "$out" "${pname}-${version}"} \
--subst-var-by EDS ${glib.makeSchemaPath "$out" "evolution-data-server-${version}"} \
--subst-var-by GDS ${glib.getSchemaPath gsettings-desktop-schemas}
patches="$patches $PWD/hardcode-gsettings.patch"
'';
@ -149,7 +149,7 @@ stdenv.mkDerivation rec {
'';
postInstall = lib.optionalString stdenv.isDarwin ''
ln -s $out/lib/${pname}/*.dylib $out/lib/
ln -s $out/lib/evolution-data-server/*.dylib $out/lib/
'';
passthru = {

8
pkgs/by-name/fi/find-billy/package.nix
View File

@ -43,10 +43,10 @@ stdenv.mkDerivation rec {
ln -s ${godot3-export-templates}/share/godot/templates $HOME/.local/share/godot
mkdir -p $out/share/find-billy
godot3-headless --export-pack 'Linux/X11' $out/share/${pname}/${pname}.pck
makeWrapper ${godot3}/bin/godot3 $out/bin/${pname} \
godot3-headless --export-pack 'Linux/X11' $out/share/find-billy/find-billy.pck
makeWrapper ${godot3}/bin/godot3 $out/bin/find-billy \
--add-flags "--main-pack" \
--add-flags "$out/share/${pname}/${pname}.pck"
--add-flags "$out/share/find-billy/find-billy.pck"
runHook postBuild
'';
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
runHook preInstall
just build-icons
install -D ${pname}.desktop -t $out/share/applications
install -D find-billy.desktop -t $out/share/applications
runHook postInstall
'';

2
pkgs/by-name/fi/firefly-iii/package.nix
View File

@ -76,7 +76,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
};
postInstall = ''
mv $out/share/php/${pname}/* $out/
mv $out/share/php/firefly-iii/* $out/
rm -R $out/share $out/storage $out/bootstrap/cache $out/node_modules
ln -s ${dataDir}/storage $out/storage
ln -s ${dataDir}/cache $out/bootstrap/cache

2
pkgs/by-name/fu/fuchsia-cursor/package.nix
View File

@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
src = fetchFromGitHub {
owner = "ful1e5";
repo = pname;
repo = "fuchsia-cursor";
rev = "v${version}";
hash = "sha256-WnDtUsjRXT7bMppgwU5BIDqphP69DmPzQM/0qXES5tM=";
};

4
pkgs/by-name/ga/garnet/package.nix
View File

@ -7,13 +7,13 @@
}:
buildDotnetModule rec {
pname = "garnet";
version = "1.0.16";
version = "1.0.18";
src = fetchFromGitHub {
owner = "microsoft";
repo = "garnet";
rev = "v${version}";
hash = "sha256-0c6iJMSB9ThJVookibZL5CoAhrVMtY6oHYn92nN0114=";
hash = "sha256-vKjFUa/f/nsBaBkxwIhtMox2qtbBzy+ipuqFHtLhbr4=";
};
projectFile = "main/GarnetServer/GarnetServer.csproj";

4
pkgs/by-name/ge/geary/package.nix
View File

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
version = "46.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/geary/${lib.versions.major version}/geary-${version}.tar.xz";
sha256 = "r60VEwKBfd8Ji15BbnrH8tXupWejuAu5C9PGKv0TuaE=";
};
@ -142,7 +142,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
packageName = "geary";
};
};

2
pkgs/by-name/gh/ghex/package.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/ghex/${lib.versions.major version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/ghex/${lib.versions.major version}/ghex-${version}.tar.xz";
hash = "sha256-ocRvMCDLNYuDIwJds6U5yX2ZSkxG9wH0jtxjV/f7y9E=";
};

4
pkgs/by-name/gi/gitg/package.nix
View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
version = "44";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gitg/${lib.versions.majorMinor version}/gitg-${version}.tar.xz";
hash = "sha256-NCoxaE2rlnHNNBvT485mWtzuBGDCoIHdxJPNvAMTJTA=";
};
@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
packageName = "gitg";
};
};

2
pkgs/by-name/gl/glasskube/package.nix
View File

@ -51,7 +51,7 @@ in buildGoModule rec {
"-X github.com/glasskube/glasskube/internal/config.Commit=${src.rev}"
];
subPackages = [ "cmd/${pname}" "cmd/package-operator" ];
subPackages = [ "cmd/glasskube" "cmd/package-operator" ];
nativeBuildInputs = [ installShellFiles ];

2
pkgs/by-name/gn/gnome-autoar/package.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/gnome-autoar-${version}.tar.xz";
sha256 = "wK++MzvPPLFEGh9XTMjsexuBl3eRRdTt7uKJb9rPw8I=";
};

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