Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
5827446dce
@ -144,5 +144,9 @@ rec {
|
||||
=> "/nix/store/am9ml4f4ywvivxnkiaqwr0hyxka1xjsf-mustache-go-1.3.0/bin/mustache"
|
||||
*/
|
||||
getExe = x:
|
||||
"${lib.getBin x}/bin/${x.meta.mainProgram or (lib.getName x)}";
|
||||
"${lib.getBin x}/bin/${x.meta.mainProgram or (
|
||||
# This could be turned into an error when 23.05 is at end of life
|
||||
lib.warn "getExe: Package ${lib.strings.escapeNixIdentifier x.meta.name or x.pname or x.name} does not have the meta.mainProgram attribute. We'll assume that the main program has the same name for now, but this behavior is deprecated, because it leads to surprising errors when the assumption does not hold. If the package has a main program, please set `meta.mainProgram` in its definition to make this warning go away. Otherwise, if the package does not have a main program, or if you don't control its definition, specify the full path to the program, such as \"\${lib.getBin foo}/bin/bar\"."
|
||||
lib.getName x
|
||||
)}";
|
||||
}
|
||||
|
||||
@ -69,6 +69,28 @@ checkConfigOutput '^"one two"$' config.result ./shorthand-meta.nix
|
||||
|
||||
checkConfigOutput '^true$' config.result ./test-mergeAttrDefinitionsWithPrio.nix
|
||||
|
||||
# Check that a module argument is passed, also when a default is available
|
||||
# (but not needed)
|
||||
#
|
||||
# When the default is needed, we currently fail to do what the users expect, as
|
||||
# we pass our own argument anyway, even if it *turns out* not to exist.
|
||||
#
|
||||
# The reason for this is that we don't know at invocation time what is in the
|
||||
# _module.args option. That value is only available *after* all modules have been
|
||||
# invoked.
|
||||
#
|
||||
# Hypothetically, Nix could help support this by giving access to the default
|
||||
# values, through a new built-in function.
|
||||
# However the default values are allowed to depend on other arguments, so those
|
||||
# would have to be passed in somehow, making this not just a getter but
|
||||
# something more complicated.
|
||||
#
|
||||
# At that point we have to wonder whether the extra complexity is worth the cost.
|
||||
# Another - subjective - reason not to support it is that default values
|
||||
# contradict the notion that an option has a single value, where _module.args
|
||||
# is the option.
|
||||
checkConfigOutput '^true$' config.result ./module-argument-default.nix
|
||||
|
||||
# types.pathInStore
|
||||
checkConfigOutput '".*/store/0lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv"' config.pathInStore.ok1 ./types.nix
|
||||
checkConfigOutput '".*/store/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15"' config.pathInStore.ok2 ./types.nix
|
||||
|
||||
9
lib/tests/modules/module-argument-default.nix
Normal file
9
lib/tests/modules/module-argument-default.nix
Normal file
@ -0,0 +1,9 @@
|
||||
{ a ? false, lib, ... }: {
|
||||
options = {
|
||||
result = lib.mkOption {};
|
||||
};
|
||||
config = {
|
||||
_module.args.a = true;
|
||||
result = a;
|
||||
};
|
||||
}
|
||||
@ -10,6 +10,11 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
assertions = [
|
||||
{ assertion = false;
|
||||
message = "The oddjob service was found to be broken without NixOS test or maintainer. Please take ownership of this service.";
|
||||
}
|
||||
];
|
||||
systemd.packages = [ cfg.package ];
|
||||
|
||||
systemd.services.oddjobd = {
|
||||
@ -21,7 +26,7 @@ in
|
||||
serviceConfig = {
|
||||
Type = "dbus";
|
||||
BusName = "org.freedesktop.oddjob";
|
||||
ExecStart = "${lib.getExe cfg.package}/bin/oddjobd";
|
||||
ExecStart = "${lib.getBin cfg.package}/bin/oddjobd";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -122,8 +122,8 @@ in
|
||||
};
|
||||
log_level = lib.mkOption {
|
||||
description = lib.mdDoc "Log level of the server.";
|
||||
default = "default";
|
||||
type = lib.types.enum [ "default" "verbose" "perfbasic" "perffull" ];
|
||||
default = "info";
|
||||
type = lib.types.enum [ "info" "debug" "trace" ];
|
||||
};
|
||||
role = lib.mkOption {
|
||||
description = lib.mdDoc "The role of this server. This affects the replication relationship and thereby available features.";
|
||||
@ -236,17 +236,23 @@ in
|
||||
{
|
||||
StateDirectory = "kanidm";
|
||||
StateDirectoryMode = "0700";
|
||||
RuntimeDirectory = "kanidmd";
|
||||
ExecStart = "${pkgs.kanidm}/bin/kanidmd server -c ${serverConfigFile}";
|
||||
User = "kanidm";
|
||||
Group = "kanidm";
|
||||
|
||||
BindPaths = [
|
||||
# To create the socket
|
||||
"/run/kanidmd:/run/kanidmd"
|
||||
];
|
||||
|
||||
AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
|
||||
CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
|
||||
# This would otherwise override the CAP_NET_BIND_SERVICE capability.
|
||||
PrivateUsers = lib.mkForce false;
|
||||
# Port needs to be exposed to the host network
|
||||
PrivateNetwork = lib.mkForce false;
|
||||
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
|
||||
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
|
||||
TemporaryFileSystem = "/:ro";
|
||||
}
|
||||
];
|
||||
@ -273,6 +279,8 @@ in
|
||||
"-/etc/static/kanidm"
|
||||
"-/etc/ssl"
|
||||
"-/etc/static/ssl"
|
||||
"-/etc/passwd"
|
||||
"-/etc/group"
|
||||
];
|
||||
BindPaths = [
|
||||
# To create the socket
|
||||
@ -327,6 +335,9 @@ in
|
||||
|
||||
# These paths are hardcoded
|
||||
environment.etc = lib.mkMerge [
|
||||
(lib.mkIf cfg.enableServer {
|
||||
"kanidm/server.toml".source = serverConfigFile;
|
||||
})
|
||||
(lib.mkIf options.services.kanidm.clientSettings.isDefined {
|
||||
"kanidm/config".source = clientConfigFile;
|
||||
})
|
||||
|
||||
@ -147,14 +147,6 @@ with lib;
|
||||
defaultText = lib.literalExpression ''if config.proxmox.qemuConf.bios == "seabios" then "legacy" else "efi"'';
|
||||
example = "hybrid";
|
||||
};
|
||||
additionalSpace = mkOption {
|
||||
type = types.str;
|
||||
default = "512M";
|
||||
description = lib.mdDoc ''
|
||||
Additional disk space to be added to the image.
|
||||
Defaults to 512M (Megabytes), Suffix can also be specified with `G` (gigabyte) or `K` (kilobyte).
|
||||
'';
|
||||
};
|
||||
filenameSuffix = mkOption {
|
||||
type = types.str;
|
||||
default = config.proxmox.qemuConf.name;
|
||||
@ -205,7 +197,7 @@ with lib;
|
||||
];
|
||||
system.build.VMA = import ../../lib/make-disk-image.nix {
|
||||
name = "proxmox-${cfg.filenameSuffix}";
|
||||
inherit (cfg) partitionTableType additionalSpace;
|
||||
inherit (cfg) partitionTableType;
|
||||
postVM = let
|
||||
# Build qemu with PVE's patch that adds support for the VMA format
|
||||
vma = (pkgs.qemu_kvm.override {
|
||||
|
||||
@ -67,9 +67,10 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
||||
''
|
||||
start_all()
|
||||
server.wait_for_unit("kanidm.service")
|
||||
client.wait_for_unit("network-online.target")
|
||||
|
||||
with subtest("Test HTTP interface"):
|
||||
server.wait_until_succeeds("curl -sf https://${serverDomain} | grep Kanidm")
|
||||
server.wait_until_succeeds("curl -Lsf https://${serverDomain} | grep Kanidm")
|
||||
|
||||
with subtest("Test LDAP interface"):
|
||||
server.succeed("ldapsearch -H ldaps://${serverDomain}:636 -b '${ldapBaseDN}' -x '(name=test)'")
|
||||
@ -80,15 +81,11 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
||||
client.succeed("kanidm logout")
|
||||
|
||||
with subtest("Recover idm_admin account"):
|
||||
# Must stop the server for account recovery or else kanidmd fails with
|
||||
# "unable to lock kanidm exclusive lock at /var/lib/kanidm/kanidm.db.klock".
|
||||
server.succeed("systemctl stop kanidm")
|
||||
idm_admin_password = server.succeed("su - kanidm -c 'kanidmd recover-account -c ${serverConfigFile} idm_admin 2>&1 | rg -o \'[A-Za-z0-9]{48}\' '").strip().removeprefix("'").removesuffix("'")
|
||||
server.succeed("systemctl start kanidm")
|
||||
|
||||
with subtest("Test unixd connection"):
|
||||
client.wait_for_unit("kanidm-unixd.service")
|
||||
# TODO: client.wait_for_file("/run/kanidm-unixd/sock")
|
||||
client.wait_for_file("/run/kanidm-unixd/sock")
|
||||
client.wait_until_succeeds("kanidm-unix status | grep working!")
|
||||
|
||||
with subtest("Test user creation"):
|
||||
|
||||
@ -75,5 +75,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ aske ];
|
||||
platforms = platforms.all;
|
||||
mainProgram = "espeak-ng";
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "btcpayserver";
|
||||
version = "1.11.0";
|
||||
version = "1.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kTX/VBEdyyfw0G0x3GnqvqJ9GvRoqYuVHdihTAbhHg0=";
|
||||
sha256 = "sha256-fKw1RKylpbejzSTO3Ti2toJiSwqtmNC1e2XDAYa9L/0=";
|
||||
};
|
||||
|
||||
projectFile = "BTCPayServer/BTCPayServer.csproj";
|
||||
|
||||
@ -31,5 +31,6 @@ rustPlatform.buildRustPackage rec {
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ fufexan ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "regreet";
|
||||
};
|
||||
}
|
||||
|
||||
@ -575,8 +575,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-fish";
|
||||
publisher = "bmalehorn";
|
||||
version = "1.0.33";
|
||||
sha256 = "sha256-ZQlG+HrjU4DFfpyiY8o0/ayDms6MGEObW8pV1Lmr5/Y=";
|
||||
version = "1.0.35";
|
||||
sha256 = "sha256-V51Qe6M1CMm9fLOSFEwqeZiC8tWCbVH0AzkLe7kR2vY=";
|
||||
};
|
||||
meta.license = lib.licenses.mit;
|
||||
};
|
||||
@ -1161,8 +1161,8 @@ let
|
||||
# semver scheme, contrary to preview versions which are listed on
|
||||
# the VSCode Marketplace and use a calver scheme. We should avoid
|
||||
# using preview versions, because they expire after two weeks.
|
||||
version = "13.4.0";
|
||||
sha256 = "sha256-CYI62sWPlJNRP2KIkg4vQutIMC6gaCxtTVoOWZIS8Lw=";
|
||||
version = "14.1.1";
|
||||
sha256 = "sha256-eSN48IudpHYzT4u+S4b2I2pyEPyOwBCSL49awT/mzEE=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
|
||||
@ -1319,8 +1319,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "prettier-vscode";
|
||||
publisher = "esbenp";
|
||||
version = "9.19.0";
|
||||
sha256 = "sha256-ymIlBzCcssj+J8hHOokVWUpxKTEkzkhNr80uCblhkFs=";
|
||||
version = "10.1.0";
|
||||
sha256 = "sha256-SQuf15Jq84MKBVqK6UviK04uo7gQw9yuw/WEBEXcQAc=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog";
|
||||
@ -1640,8 +1640,8 @@ let
|
||||
# the VSCode Marketplace and use a calver scheme. We should avoid
|
||||
# using preview versions, because they can require insider versions
|
||||
# of VS Code
|
||||
version = "0.66.0";
|
||||
sha256 = "sha256-rhAFNX+/BoKkQeFlVdoHzA8UmZeQofq7+UPooWleYVw=";
|
||||
version = "0.68.1";
|
||||
sha256 = "sha256-d60ZxWQLZa2skOB3Iv9K04aGNZA1d1A82N7zRaxAzlI=";
|
||||
};
|
||||
meta = { license = lib.licenses.mit; };
|
||||
};
|
||||
@ -1742,8 +1742,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "todo-tree";
|
||||
publisher = "Gruntfuggly";
|
||||
version = "0.0.224";
|
||||
sha256 = "sha256-ObFmzAaOlbtWC31JRYR/1y+JK1h22SVDPPRWWqPzrQs=";
|
||||
version = "0.0.226";
|
||||
sha256 = "sha256-Fj9cw+VJ2jkTGUclB1TLvURhzQsaryFQs/+f2RZOLHs=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
@ -1967,8 +1967,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "nix-ide";
|
||||
publisher = "jnoortheen";
|
||||
version = "0.2.1";
|
||||
sha256 = "sha256-yC4ybThMFA2ncGhp8BYD7IrwYiDU3226hewsRvJYKy4=";
|
||||
version = "0.2.2";
|
||||
sha256 = "sha256-jwOM+6LnHyCkvhOTVSTUZvgx77jAg6hFCCpBqY8AxIg=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog";
|
||||
@ -2779,8 +2779,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "material-icon-theme";
|
||||
publisher = "PKief";
|
||||
version = "4.25.0";
|
||||
sha256 = "sha256-/lD3i7ZdF/XOi7RduS3HIYHFXhkoW2+PJW249gQxcyk=";
|
||||
version = "4.29.0";
|
||||
sha256 = "sha256-YqleqYSpZuhGFGkNo3FRLjiglxX+iUCJl69CRCY/oWM=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
@ -3314,8 +3314,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "even-better-toml";
|
||||
publisher = "tamasfe";
|
||||
version = "0.19.0";
|
||||
sha256 = "sha256-MqSQarNThbEf1wHDTf1yA46JMhWJN46b08c7tV6+1nU=";
|
||||
version = "0.19.2";
|
||||
sha256 = "sha256-JKj6noi2dTe02PxX/kS117ZhW8u7Bhj4QowZQiJKP2E=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
@ -3450,8 +3450,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "sort-lines";
|
||||
publisher = "Tyriar";
|
||||
version = "1.9.1";
|
||||
sha256 = "0dds99j6awdxb0ipm15g543a5b6f0hr00q9rz961n0zkyawgdlcb";
|
||||
version = "1.10.2";
|
||||
sha256 = "sha256-AI16YBmmfZ3k7OyUrh4wujhu7ptqAwfI5jBbAc6MhDk=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "rust-analyzer",
|
||||
"version": "0.3.1426",
|
||||
"version": "0.3.1607",
|
||||
"dependencies": {
|
||||
"anser": "^2.1.1",
|
||||
"d3": "^7.6.1",
|
||||
|
||||
@ -20,13 +20,13 @@ let
|
||||
# Use the plugin version as in vscode marketplace, updated by update script.
|
||||
inherit (vsix) version;
|
||||
|
||||
releaseTag = "2023-03-06";
|
||||
releaseTag = "2023-07-31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rust-analyzer";
|
||||
rev = releaseTag;
|
||||
sha256 = "sha256-Njlus+vY3N++qWE0JXrGjwcXY2QDFuOV/7NruBBMETY=";
|
||||
sha256 = "sha256-PWEdqI+iiHbx4dkIwWHZCGJuTpRfJI3MLSHf3gQEJt4=";
|
||||
};
|
||||
|
||||
build-deps = nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps";
|
||||
@ -88,3 +88,4 @@ vscode-utils.buildVscodeExtension {
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -227,5 +227,6 @@ in stdenv.mkDerivation {
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ zhaofengli ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "darling";
|
||||
};
|
||||
}
|
||||
|
||||
78
pkgs/applications/emulators/tamatool/default.nix
Normal file
78
pkgs/applications/emulators/tamatool/default.nix
Normal file
@ -0,0 +1,78 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, zip
|
||||
, copyDesktopItems
|
||||
, libpng
|
||||
, SDL2
|
||||
, SDL2_image
|
||||
, darwin
|
||||
|
||||
# Optionally bundle a ROM file
|
||||
, rom ? null
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tamatool";
|
||||
version = "0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jcrona";
|
||||
repo = "tamatool";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-VDmpIBuMWg3TwfCf9J6/bi/DaWip6ESAQWvGh2SH+A8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# * Point to the installed rom and res directory
|
||||
# * Tell the user to use --rom instead of telling them to place the rom in the
|
||||
# program directory (it's immutable!)
|
||||
postPatch = ''
|
||||
substituteInPlace src/tamatool.c \
|
||||
--replace '#define RES_PATH' "#define RES_PATH \"$out/share/tamatool/res\" //" \
|
||||
--replace '#define ROM_PATH' "#define ROM_PATH \"$out/share/tamatool/rom.bin\" //" \
|
||||
--replace '#define ROM_NOT_FOUND_MSG' '#define ROM_NOT_FOUND_MSG "You need to use the --rom option!" //'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
zip
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libpng
|
||||
SDL2
|
||||
SDL2_image
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreFoundation
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"-Clinux"
|
||||
"VERSION=${finalAttrs.version}"
|
||||
"CFLAGS+=-I${SDL2.dev}/include/SDL2"
|
||||
"CFLAGS+=-I${SDL2_image}/include/SDL2"
|
||||
"DIST_PATH=$(out)"
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
];
|
||||
|
||||
desktopItems = [ "linux/tamatool.desktop" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm755 linux/tamatool $out/bin/tamatool
|
||||
mkdir -p $out/share/tamatool
|
||||
cp -r res $out/share/tamatool/res
|
||||
install -Dm644 linux/tamatool.png $out/share/icons/hicolor/128x126/apps/tamatool.png
|
||||
${lib.optionalString (rom != null) "install -Dm677 ${rom} $out/share/tamatool/rom.bin"}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cross-platform Tamagotchi P1 explorer";
|
||||
homepage = "https://github.com/jcrona/tamatool";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
})
|
||||
@ -28,13 +28,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xemu";
|
||||
version = "0.7.104";
|
||||
version = "0.7.110";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xemu-project";
|
||||
repo = "xemu";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Oo8YwCDl2E8wW4NIO2KeGRX3GZ/pDVsnHEzEDXkLkN8=";
|
||||
hash = "sha256-ztYjvQunjskPZUIntzX4GEh0nv0K6knVubYW+QlCCII=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -109,5 +109,6 @@ mkDerivation rec {
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ bjornfor raskin gebner ];
|
||||
mainProgram = "openscad";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, javaPackages, rsync, ffmpeg, batik, gsettings-desktop-schemas, xorg, wrapGAppsHook }:
|
||||
let
|
||||
buildNumber = "1289";
|
||||
buildNumber = "1292";
|
||||
vaqua = fetchurl {
|
||||
name = "VAqua9.jar";
|
||||
url = "https://violetlib.org/release/vaqua/9/VAqua9.jar";
|
||||
@ -40,13 +40,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "processing";
|
||||
version = "4.1.1";
|
||||
version = "4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "processing";
|
||||
repo = "processing4";
|
||||
rev = "processing-${buildNumber}-${version}";
|
||||
sha256 = "sha256-OjTqANxzcW/RrAdqmVYAegrlLPu6w2pjzSyZyvUYIt4=";
|
||||
sha256 = "sha256-wdluhrtliLN4T2dcmwvUWZhOARC3Lst7+hWWwZjafmU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ant unzip makeWrapper wrapGAppsHook ];
|
||||
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildPhase = ''
|
||||
echo "tarring jdk"
|
||||
tar --checkpoint=10000 -czf build/linux/jdk-17.0.5-amd64.tgz ${jdk}
|
||||
tar --checkpoint=10000 -czf build/linux/jdk-17.0.6-amd64.tgz ${jdk}
|
||||
cp ${ant}/lib/ant/lib/{ant.jar,ant-launcher.jar} app/lib/
|
||||
mkdir -p core/library
|
||||
ln -s ${javaPackages.jogl_2_3_2}/share/java/* core/library/
|
||||
|
||||
@ -41,5 +41,6 @@ stdenv.mkDerivation rec {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ anselmschueler ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "tesseract";
|
||||
};
|
||||
}
|
||||
|
||||
@ -17,9 +17,9 @@
|
||||
Hydra). We use these channels for testing and to fix build errors in advance
|
||||
so that `chromium` updates are trivial and can be merged fast.
|
||||
- `google-chrome`, `google-chrome-beta`, `google-chrome-dev`: Updated via
|
||||
Chromium's `upstream-info.json`
|
||||
Chromium's `upstream-info.nix`
|
||||
- `ungoogled-chromium`: @squalus
|
||||
- `chromedriver`: Updated via Chromium's `upstream-info.json` and not built
|
||||
- `chromedriver`: Updated via Chromium's `upstream-info.nix` and not built
|
||||
from source.
|
||||
|
||||
# Upstream links
|
||||
@ -35,9 +35,9 @@
|
||||
# Updating Chromium
|
||||
|
||||
Simply run `./pkgs/applications/networking/browsers/chromium/update.py` to
|
||||
update `upstream-info.json`. After updates it is important to test at least
|
||||
update `upstream-info.nix`. After updates it is important to test at least
|
||||
`nixosTests.chromium` (or basic manual testing) and `google-chrome` (which
|
||||
reuses `upstream-info.json`).
|
||||
reuses `upstream-info.nix`).
|
||||
|
||||
Note: Due to the script downloading many large tarballs it might be
|
||||
necessary to adjust the available tmpfs size (it defaults to 10% of the
|
||||
@ -75,7 +75,7 @@ All updates are considered security critical and should be ported to the stable
|
||||
channel ASAP. When there is a new stable release the old one should receive
|
||||
security updates for roughly one month. After that it is important to mark
|
||||
Chromium as insecure (see 69e4ae56c4b for an example; it is important that the
|
||||
tested job still succeeds and that all browsers that use `upstream-info.json`
|
||||
tested job still succeeds and that all browsers that use `upstream-info.nix`
|
||||
are marked as insecure).
|
||||
|
||||
## Major version updates
|
||||
|
||||
@ -374,7 +374,12 @@ let
|
||||
gn = gnChromium;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
# overwrite `version` with the exact same `version` from the same source,
|
||||
# except it internally points to `upstream-info.nix` for
|
||||
# `builtins.unsafeGetAttrPos`, which is used by ofborg to decide
|
||||
# which maintainers need to be pinged.
|
||||
// builtins.removeAttrs upstream-info (builtins.filter (e: e != "version") (builtins.attrNames upstream-info));
|
||||
|
||||
# Remove some extraAttrs we supplied to the base attributes already.
|
||||
in stdenv.mkDerivation (base // removeAttrs extraAttrs [
|
||||
|
||||
@ -22,11 +22,11 @@ let
|
||||
llvmPackages = llvmPackages_16;
|
||||
stdenv = llvmPackages.stdenv;
|
||||
|
||||
upstream-info = (lib.importJSON ./upstream-info.json).${channel};
|
||||
upstream-info = (import ./upstream-info.nix).${channel};
|
||||
|
||||
# Helper functions for changes that depend on specific versions:
|
||||
warnObsoleteVersionConditional = min-version: result:
|
||||
let ungoogled-version = (lib.importJSON ./upstream-info.json).ungoogled-chromium.version;
|
||||
let ungoogled-version = (import ./upstream-info.nix).ungoogled-chromium.version;
|
||||
in lib.warnIf
|
||||
(lib.versionAtLeast ungoogled-version min-version)
|
||||
"chromium: ungoogled version ${ungoogled-version} is newer than a conditional bounded at ${min-version}. You can safely delete it."
|
||||
@ -71,10 +71,10 @@ let
|
||||
# Use the latest stable Chrome version if necessary:
|
||||
version = if chromium.upstream-info.sha256bin64 != null
|
||||
then chromium.upstream-info.version
|
||||
else (lib.importJSON ./upstream-info.json).stable.version;
|
||||
else (import ./upstream-info.nix).stable.version;
|
||||
sha256 = if chromium.upstream-info.sha256bin64 != null
|
||||
then chromium.upstream-info.sha256bin64
|
||||
else (lib.importJSON ./upstream-info.json).stable.sha256bin64;
|
||||
else (import ./upstream-info.nix).stable.sha256bin64;
|
||||
in fetchurl {
|
||||
urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [
|
||||
"https://dl.google.com/linux/chrome/deb/pool/main/g"
|
||||
@ -139,8 +139,6 @@ let
|
||||
|
||||
sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName;
|
||||
|
||||
version = chromium.browser.version;
|
||||
|
||||
# We want users to be able to enableWideVine without rebuilding all of
|
||||
# chromium, so we have a separate derivation here that copies chromium
|
||||
# and adds the unfree WidevineCdm.
|
||||
@ -157,7 +155,7 @@ let
|
||||
in stdenv.mkDerivation {
|
||||
pname = lib.optionalString ungoogled "ungoogled-"
|
||||
+ "chromium${suffix}";
|
||||
inherit version;
|
||||
inherit (chromium.browser) version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper ed
|
||||
@ -236,3 +234,9 @@ in stdenv.mkDerivation {
|
||||
inherit chromeSrc sandboxExecutableName;
|
||||
};
|
||||
}
|
||||
# the following is a complicated and long-winded variant of
|
||||
# `inherit (chromium.browser) version`, with the added benefit
|
||||
# that it keeps the pointer to upstream-info.nix for
|
||||
# builtins.unsafeGetAttrPos, which is what ofborg uses to
|
||||
# decide which maintainers need to be pinged.
|
||||
// builtins.removeAttrs chromium.browser (builtins.filter (e: e != "version") (builtins.attrNames chromium.browser))
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i python -p python3 nix nix-prefetch-git
|
||||
#! nix-shell -i python -p python3 nix nixfmt nix-prefetch-git
|
||||
|
||||
"""This script automatically updates chromium, google-chrome, chromedriver, and ungoogled-chromium
|
||||
via upstream-info.json."""
|
||||
via upstream-info.nix."""
|
||||
# Usage: ./update.py [--commit]
|
||||
|
||||
import base64
|
||||
@ -23,16 +23,23 @@ RELEASES_URL = 'https://versionhistory.googleapis.com/v1/chrome/platforms/linux/
|
||||
DEB_URL = 'https://dl.google.com/linux/chrome/deb/pool/main/g'
|
||||
BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official'
|
||||
|
||||
JSON_PATH = dirname(abspath(__file__)) + '/upstream-info.json'
|
||||
PIN_PATH = dirname(abspath(__file__)) + '/upstream-info.nix'
|
||||
UNGOOGLED_FLAGS_PATH = dirname(abspath(__file__)) + '/ungoogled-flags.toml'
|
||||
COMMIT_MESSAGE_SCRIPT = dirname(abspath(__file__)) + '/get-commit-message.py'
|
||||
|
||||
|
||||
def load_json(path):
|
||||
"""Loads the given JSON file."""
|
||||
with open(path, 'r') as f:
|
||||
return json.load(f)
|
||||
def load_as_json(path):
|
||||
"""Loads the given nix file as JSON."""
|
||||
out = subprocess.check_output(['nix-instantiate', '--eval', '--strict', '--json', path])
|
||||
return json.loads(out)
|
||||
|
||||
def save_dict_as_nix(path, input):
|
||||
"""Saves the given dict/JSON as nix file."""
|
||||
json_string = json.dumps(input)
|
||||
nix = subprocess.check_output(['nix-instantiate', '--eval', '--expr', '{ json }: builtins.fromJSON json', '--argstr', 'json', json_string])
|
||||
formatted = subprocess.check_output(['nixfmt'], input=nix)
|
||||
with open(path, 'w') as out:
|
||||
out.write(formatted.decode())
|
||||
|
||||
def nix_prefetch_url(url, algo='sha256'):
|
||||
"""Prefetches the content of the given URL."""
|
||||
@ -160,7 +167,7 @@ def print_updates(channels_old, channels_new):
|
||||
|
||||
|
||||
channels = {}
|
||||
last_channels = load_json(JSON_PATH)
|
||||
last_channels = load_as_json(PIN_PATH)
|
||||
|
||||
|
||||
print(f'GET {RELEASES_URL}', file=sys.stderr)
|
||||
@ -225,9 +232,7 @@ if len(sys.argv) == 2 and sys.argv[1] == '--commit':
|
||||
version_new = sorted_channels[channel_name]['version']
|
||||
if LooseVersion(version_old) < LooseVersion(version_new):
|
||||
last_channels[channel_name] = sorted_channels[channel_name]
|
||||
with open(JSON_PATH, 'w') as out:
|
||||
json.dump(last_channels, out, indent=2)
|
||||
out.write('\n')
|
||||
save_dict_as_nix(PIN_PATH, last_channels)
|
||||
attr_name = channel_name_to_attr_name(channel_name)
|
||||
commit_message = f'{attr_name}: {version_old} -> {version_new}'
|
||||
if channel_name == 'stable':
|
||||
@ -238,7 +243,5 @@ if len(sys.argv) == 2 and sys.argv[1] == '--commit':
|
||||
subprocess.run(['git', 'add', JSON_PATH], check=True)
|
||||
subprocess.run(['git', 'commit', '--file=-'], input=commit_message.encode(), check=True)
|
||||
else:
|
||||
with open(JSON_PATH, 'w') as out:
|
||||
json.dump(sorted_channels, out, indent=2)
|
||||
out.write('\n')
|
||||
save_dict_as_nix(PIN_PATH, sorted_channels)
|
||||
print_updates(last_channels, sorted_channels)
|
||||
|
||||
@ -1,64 +0,0 @@
|
||||
{
|
||||
"stable": {
|
||||
"version": "115.0.5790.110",
|
||||
"sha256": "0wgp44qnvmdqf2kk870ndm51rcvar36li2qq632ay4n8gfpbrm79",
|
||||
"sha256bin64": "1w2jl92x78s4vxv4p1imkz7qaq51yvs0wiz2bclbjz0hjlw9akr3",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2023-05-19",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "e9e83d9095d3234adf68f3e2866f25daf766d5c7",
|
||||
"sha256": "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a"
|
||||
}
|
||||
},
|
||||
"chromedriver": {
|
||||
"version": "115.0.5790.98",
|
||||
"sha256_linux": "1797qmb213anvp9lmrkj6wmfdwkdfswmshmk1816zankw5dl883j",
|
||||
"sha256_darwin": "1c41cb7zh13ny4xvpwy7703cnjrkmqxd3n8zpja7n6a38mi8mgsk",
|
||||
"sha256_darwin_aarch64": "1kliszw10jnnlhzi8jrdzjq0r7vfn6ksk1spsh2rfn2hmghccv2d"
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "116.0.5845.50",
|
||||
"sha256": "0r5m2bcrh2zpl2m8wnzyl4afh8s0dh2m2fnfjf50li94694vy4jz",
|
||||
"sha256bin64": "047wsszg4c23vxq93a335iymiqpy7lw5izzz4f0zk1a4sijafd59",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2023-06-09",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "4bd1a77e67958fb7f6739bd4542641646f264e5d",
|
||||
"sha256": "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw"
|
||||
}
|
||||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "117.0.5897.3",
|
||||
"sha256": "0pyf3k58m26lkc6v6mqpwvhyaj6bbyywl4c17cxb5zmzc1zmc5ia",
|
||||
"sha256bin64": "10w5dm68aaffgdq0xqi4ans2w7byisqqld09pz5vpk350gy16fjh",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2023-07-12",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "fae280eabe5d31accc53100137459ece19a7a295",
|
||||
"sha256": "02javy4jsllwl4mxl2zmg964jvzw800w6gbmr5z6jdkip24fw0kj"
|
||||
}
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "115.0.5790.110",
|
||||
"sha256": "0wgp44qnvmdqf2kk870ndm51rcvar36li2qq632ay4n8gfpbrm79",
|
||||
"sha256bin64": "1w2jl92x78s4vxv4p1imkz7qaq51yvs0wiz2bclbjz0hjlw9akr3",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2023-05-19",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "e9e83d9095d3234adf68f3e2866f25daf766d5c7",
|
||||
"sha256": "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "115.0.5790.110-1",
|
||||
"sha256": "1jahy4jl5bnnzl6433hln0dj3b39v5zqd90n8zf7ss45wqrff91b"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,65 @@
|
||||
{
|
||||
beta = {
|
||||
deps = {
|
||||
gn = {
|
||||
rev = "4bd1a77e67958fb7f6739bd4542641646f264e5d";
|
||||
sha256 = "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw";
|
||||
url = "https://gn.googlesource.com/gn";
|
||||
version = "2023-06-09";
|
||||
};
|
||||
};
|
||||
sha256 = "0r5m2bcrh2zpl2m8wnzyl4afh8s0dh2m2fnfjf50li94694vy4jz";
|
||||
sha256bin64 = "047wsszg4c23vxq93a335iymiqpy7lw5izzz4f0zk1a4sijafd59";
|
||||
version = "116.0.5845.50";
|
||||
};
|
||||
dev = {
|
||||
deps = {
|
||||
gn = {
|
||||
rev = "fae280eabe5d31accc53100137459ece19a7a295";
|
||||
sha256 = "02javy4jsllwl4mxl2zmg964jvzw800w6gbmr5z6jdkip24fw0kj";
|
||||
url = "https://gn.googlesource.com/gn";
|
||||
version = "2023-07-12";
|
||||
};
|
||||
};
|
||||
sha256 = "0pyf3k58m26lkc6v6mqpwvhyaj6bbyywl4c17cxb5zmzc1zmc5ia";
|
||||
sha256bin64 = "10w5dm68aaffgdq0xqi4ans2w7byisqqld09pz5vpk350gy16fjh";
|
||||
version = "117.0.5897.3";
|
||||
};
|
||||
stable = {
|
||||
chromedriver = {
|
||||
sha256_darwin = "1c41cb7zh13ny4xvpwy7703cnjrkmqxd3n8zpja7n6a38mi8mgsk";
|
||||
sha256_darwin_aarch64 =
|
||||
"1kliszw10jnnlhzi8jrdzjq0r7vfn6ksk1spsh2rfn2hmghccv2d";
|
||||
sha256_linux = "1797qmb213anvp9lmrkj6wmfdwkdfswmshmk1816zankw5dl883j";
|
||||
version = "115.0.5790.98";
|
||||
};
|
||||
deps = {
|
||||
gn = {
|
||||
rev = "e9e83d9095d3234adf68f3e2866f25daf766d5c7";
|
||||
sha256 = "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a";
|
||||
url = "https://gn.googlesource.com/gn";
|
||||
version = "2023-05-19";
|
||||
};
|
||||
};
|
||||
sha256 = "0wgp44qnvmdqf2kk870ndm51rcvar36li2qq632ay4n8gfpbrm79";
|
||||
sha256bin64 = "1w2jl92x78s4vxv4p1imkz7qaq51yvs0wiz2bclbjz0hjlw9akr3";
|
||||
version = "115.0.5790.110";
|
||||
};
|
||||
ungoogled-chromium = {
|
||||
deps = {
|
||||
gn = {
|
||||
rev = "e9e83d9095d3234adf68f3e2866f25daf766d5c7";
|
||||
sha256 = "0y07c18xskq4mclqiz3a63fz8jicz2kqridnvdhqdf75lhp61f8a";
|
||||
url = "https://gn.googlesource.com/gn";
|
||||
version = "2023-05-19";
|
||||
};
|
||||
ungoogled-patches = {
|
||||
rev = "115.0.5790.110-1";
|
||||
sha256 = "1jahy4jl5bnnzl6433hln0dj3b39v5zqd90n8zf7ss45wqrff91b";
|
||||
};
|
||||
};
|
||||
sha256 = "0wgp44qnvmdqf2kk870ndm51rcvar36li2qq632ay4n8gfpbrm79";
|
||||
sha256bin64 = "1w2jl92x78s4vxv4p1imkz7qaq51yvs0wiz2bclbjz0hjlw9akr3";
|
||||
version = "115.0.5790.110";
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -20,6 +20,7 @@
|
||||
# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
|
||||
maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
|
||||
license = lib.licenses.mpl20;
|
||||
mainProgram = "firefox";
|
||||
};
|
||||
tests = [ nixosTests.firefox ];
|
||||
updateScript = callPackage ./update.nix {
|
||||
@ -46,6 +47,7 @@
|
||||
# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
|
||||
maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
|
||||
license = lib.licenses.mpl20;
|
||||
mainProgram = "firefox";
|
||||
};
|
||||
tests = [ nixosTests.firefox-beta ];
|
||||
updateScript = callPackage ./update.nix {
|
||||
@ -74,6 +76,7 @@
|
||||
# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
|
||||
maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
|
||||
license = lib.licenses.mpl20;
|
||||
mainProgram = "firefox";
|
||||
};
|
||||
tests = [ nixosTests.firefox-devedition ];
|
||||
updateScript = callPackage ./update.nix {
|
||||
@ -104,6 +107,7 @@
|
||||
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
|
||||
# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
|
||||
license = lib.licenses.mpl20;
|
||||
mainProgram = "firefox";
|
||||
};
|
||||
tests = [ nixosTests.firefox-esr-102 ];
|
||||
updateScript = callPackage ./update.nix {
|
||||
@ -132,6 +136,7 @@
|
||||
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
|
||||
# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
|
||||
license = lib.licenses.mpl20;
|
||||
mainProgram = "firefox";
|
||||
};
|
||||
tests = [ nixosTests.firefox-esr-115 ];
|
||||
updateScript = callPackage ./update.nix {
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{
|
||||
"packageVersion": "115.0.2-2",
|
||||
"packageVersion": "116.0-1",
|
||||
"source": {
|
||||
"rev": "115.0.2-2",
|
||||
"sha256": "092fp608lcxrax391xc33dqgbxspkflvmkmhc4jmji2ij3my12jn"
|
||||
"rev": "116.0-1",
|
||||
"sha256": "1nah5a5l5ajyvy8aw4xdpdfs2s3ybfs5jw9c4qj9qczxdp541a66"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "115.0.2",
|
||||
"sha512": "de6ce8a2512e862c69a7d5c557d6168498d0d40e9c4b54b775f81c444e863a64c43130d57b51b360db4224c34b64a93f3ad263441caee713243b97750ec1eb4b"
|
||||
"version": "116.0",
|
||||
"sha512": "4370c65a99bf8796524aca11ea8e99fa4f875176a5805ad49f35ae149080eb54be42e7eae84627e87e17b88b262649e48f3b30b317170ac7c208960200d1005d"
|
||||
}
|
||||
}
|
||||
|
||||
@ -60,5 +60,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3Plus;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with maintainers; [ zendo ];
|
||||
mainProgram = "clash-verge";
|
||||
};
|
||||
}
|
||||
|
||||
@ -18,6 +18,7 @@ let
|
||||
{
|
||||
pythonInterpreter = "${python3.interpreter}";
|
||||
configDirName = lib.toLower binaryName;
|
||||
meta.mainProgram = "disable-breaking-updates.py";
|
||||
} ''
|
||||
mkdir -p $out/bin
|
||||
cp ${./disable-breaking-updates.py} $out/bin/disable-breaking-updates.py
|
||||
|
||||
@ -88,5 +88,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
maintainers = with maintainers; [ winter raitobezarius ];
|
||||
license = licenses.mit;
|
||||
inherit (nodejs.meta) platforms;
|
||||
mainProgram = "thelounge";
|
||||
};
|
||||
})
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
, configText ? ""
|
||||
}:
|
||||
let
|
||||
version = "2303";
|
||||
version = "2306";
|
||||
|
||||
sysArch =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then "x64"
|
||||
@ -39,14 +39,17 @@ let
|
||||
pname = "vmware-horizon-files";
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "https://download3.vmware.com/software/CART24FQ1_LIN_2303_TARBALL/VMware-Horizon-Client-Linux-2303-8.9.0-21435420.tar.gz";
|
||||
sha256 = "a4dcc6afc0be7641e10e922ccbbab0a10adbf8f2a83e4b5372dfba095091fb78";
|
||||
url = "https://download3.vmware.com/software/CART24FQ2_LIN_2306_TARBALL/VMware-Horizon-Client-Linux-2306-8.10.0-21964631.tar.gz";
|
||||
sha256 = "6051f6f1617385b3c211b73ff42dad27e2d22362df6ffd2f3d9f559d0b5743ea";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
installPhase = ''
|
||||
mkdir ext $out
|
||||
mkdir ext
|
||||
find ${sysArch} -type f -print0 | xargs -0n1 tar -Cext --strip-components=1 -xf
|
||||
mv ext/bin ext/lib ext/share "$out"/
|
||||
|
||||
chmod -R u+w ext/usr/lib
|
||||
mv ext/usr $out
|
||||
cp -r ext/bin ext/lib $out/
|
||||
|
||||
# Horizon includes a copy of libstdc++ which is loaded via $LD_LIBRARY_PATH
|
||||
# when it cannot detect a new enough version already present on the system.
|
||||
@ -54,9 +57,6 @@ let
|
||||
# Deleting the bundled library is the simplest way to force it to use our version.
|
||||
rm "$out/lib/vmware/gcc/libstdc++.so.6"
|
||||
|
||||
# This library causes the program to core-dump occasionally. Use ours instead.
|
||||
rm -r $out/lib/vmware/view/crtbora
|
||||
|
||||
# This opensc library is required to support smartcard authentication during the
|
||||
# initial connection to Horizon.
|
||||
mkdir $out/lib/vmware/view/pkcs11
|
||||
@ -76,6 +76,7 @@ let
|
||||
atk
|
||||
cairo
|
||||
dbus
|
||||
file
|
||||
fontconfig
|
||||
freetype
|
||||
gdk-pixbuf
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "treesheets";
|
||||
version = "unstable-2023-07-28";
|
||||
version = "unstable-2023-08-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "treesheets";
|
||||
rev = "e3b52c687fcdb14075d6d04a1c4e9e5ba929ba54";
|
||||
sha256 = "AnhlGbd5TbreFEwP1J5r4EQPAtG+YwJ04v7sclccGYQ=";
|
||||
rev = "4548a14939e4862d1bb61552f5c2f16e7ccef865";
|
||||
sha256 = "BxA0vJrWk3YW7yCK010q5OYub3amJA/uUrgg1/cTGNc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,28 +1,37 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages}:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, llvmPackages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "veryfasttree";
|
||||
version = "4.0.1";
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "veryfasttree";
|
||||
version = "4.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "citiususc";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fv5ovi180Osok5GYJEidjMqmL8gZKUcxrcCQ/00lvi4=";
|
||||
repo = "veryfasttree";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-JMBhSxfGO3qz7Yl4s5r6zWHFefXGzu0ktEJdRUh/Uqg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = lib.optional stdenv.cc.isClang llvmPackages.openmp;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -m755 -D VeryFastTree $out/bin/VeryFastTree
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Speeding up the estimation of phylogenetic trees for large alignments through parallelization and vectorization strategies";
|
||||
license = licenses.gpl3Plus;
|
||||
homepage = "https://github.com/citiususc/veryfasttree";
|
||||
maintainers = with maintainers; [ thyol ];
|
||||
platforms = platforms.all;
|
||||
homepage = "https://github.com/citiususc/veryfasttree";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ thyol ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -1,28 +1,30 @@
|
||||
{ lib, fetchFromGitHub, ocamlPackages, rsync }:
|
||||
{ lib, fetchFromGitHub, ocamlPackages }:
|
||||
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "beluga";
|
||||
version = "1.0";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Beluga-lang";
|
||||
repo = "Beluga";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ziqjfv8jwidl8lj2mid2shhgqhv31dfh5wad2zxjpvf6038ahsw";
|
||||
owner = "Beluga-lang";
|
||||
repo = "Beluga";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-GN4ZOlhs8ktAcCu7iE4lh6HxhTu+KCJJbIvcI4MGcr0=";
|
||||
};
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
buildInputs = with ocamlPackages; [
|
||||
gen sedlex extlib dune-build-info linenoise
|
||||
gen
|
||||
sedlex
|
||||
extlib
|
||||
dune-build-info
|
||||
linenoise
|
||||
omd
|
||||
uri
|
||||
ounit2
|
||||
yojson
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./TEST ./run_harpoon_test.sh
|
||||
'';
|
||||
|
||||
checkPhase = "./TEST";
|
||||
nativeCheckInputs = [ rsync ];
|
||||
doCheck = true;
|
||||
|
||||
postInstall = ''
|
||||
@ -32,9 +34,10 @@ ocamlPackages.buildDunePackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "A functional language for reasoning about formal systems";
|
||||
homepage = "http://complogic.cs.mcgill.ca/beluga/";
|
||||
license = licenses.gpl3Plus;
|
||||
homepage = "https://complogic.cs.mcgill.ca/beluga";
|
||||
changelog = "https://github.com/Beluga-lang/Beluga/releases/tag/v${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.bcdarwin ];
|
||||
platforms = platforms.unix;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -88,5 +88,6 @@ buildGoModule rec {
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ disassembler kolaente ma27 techknowlogick ];
|
||||
broken = stdenv.isDarwin;
|
||||
mainProgram = "gitea";
|
||||
};
|
||||
}
|
||||
|
||||
@ -29,5 +29,6 @@ stdenv.mkDerivation {
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ astro ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
mainProgram = "nvramtool";
|
||||
};
|
||||
}
|
||||
|
||||
@ -44,5 +44,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ primeos ];
|
||||
mainProgram = "cage";
|
||||
};
|
||||
}
|
||||
|
||||
@ -25,13 +25,21 @@ rec {
|
||||
name = last (builtins.split "/" nameOrPath);
|
||||
in
|
||||
|
||||
pkgs.runCommandLocal name (if (types.str.check content) then {
|
||||
inherit content interpreter;
|
||||
passAsFile = [ "content" ];
|
||||
} else {
|
||||
inherit interpreter;
|
||||
contentPath = content;
|
||||
}) ''
|
||||
pkgs.runCommandLocal name (
|
||||
lib.optionalAttrs (nameOrPath == "/bin/${name}") {
|
||||
meta.mainProgram = name;
|
||||
}
|
||||
// (
|
||||
if (types.str.check content) then {
|
||||
inherit content interpreter;
|
||||
passAsFile = [ "content" ];
|
||||
} else {
|
||||
inherit interpreter;
|
||||
contentPath = content;
|
||||
}
|
||||
)
|
||||
)
|
||||
''
|
||||
# On darwin a script cannot be used as an interpreter in a shebang but
|
||||
# there doesn't seem to be a limit to the size of shebang and multiple
|
||||
# arguments to the interpreter are allowed.
|
||||
@ -89,6 +97,8 @@ rec {
|
||||
# https://github.com/NixOS/nixpkgs/issues/154203
|
||||
# https://github.com/NixOS/nixpkgs/issues/148189
|
||||
nativeBuildInputs = [ stdenv.cc.bintools ];
|
||||
} // lib.optionalAttrs (nameOrPath == "/bin/${name}") {
|
||||
meta.mainProgram = name;
|
||||
}) ''
|
||||
${compileScript}
|
||||
${lib.optionalString strip
|
||||
|
||||
36
pkgs/data/themes/catppuccin-sddm-corners/default.nix
Normal file
36
pkgs/data/themes/catppuccin-sddm-corners/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "catppuccin-sddm-corners";
|
||||
version = "unstable-2023-02-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "khaneliman";
|
||||
repo = "catppuccin-sddm-corners";
|
||||
rev = "7b7a86ee9a5a2905e7e6623d2af5922ce890ef79";
|
||||
hash = "sha256-sTnt8RarNXz3RmYfmx4rD+nMlY8rr2n0EN3ntPzOurw=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/share/sddm/themes/"
|
||||
cp -r catppuccin/ "$out/share/sddm/themes/catppuccin-sddm-corners"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Soothing pastel theme for SDDM based on corners theme.";
|
||||
homepage = "https://github.com/khaneliman/sddm-catppuccin-corners";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -73,5 +73,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.gnome.members ++ teams.pantheon.members;
|
||||
mainProgram = "file-roller";
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@ mkCoqDerivation rec {
|
||||
owner = "iris";
|
||||
inherit version;
|
||||
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
||||
{ case = range "8.13" "8.16"; out = "4.0.0"; }
|
||||
{ case = range "8.13" "8.17"; out = "4.0.0"; }
|
||||
{ case = range "8.12" "8.14"; out = "3.5.0"; }
|
||||
{ case = range "8.11" "8.13"; out = "3.4.0"; }
|
||||
{ case = range "8.9" "8.10"; out = "3.3.0"; }
|
||||
|
||||
@ -233,6 +233,7 @@ stdenv.mkDerivation (rec {
|
||||
maintainers = [ maintainers.eelco ];
|
||||
platforms = platforms.all;
|
||||
priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`
|
||||
mainProgram = "perl";
|
||||
};
|
||||
} // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
|
||||
crossVersion = "1.5"; # Jul 03, 2023
|
||||
|
||||
@ -573,5 +573,6 @@ in with passthru; stdenv.mkDerivation {
|
||||
license = licenses.psfl;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ fridh ];
|
||||
mainProgram = "python3";
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kronosnet";
|
||||
version = "1.25";
|
||||
version = "1.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NEmkgKTm+R4lzqjbQTyQ6TDpjoTQtMKiTpzn25HUfYk=";
|
||||
sha256 = "sha256-LkV5bi1kMRP2ofBIe+hbOzbSRStWyr3afnNdZqpVDBA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config doxygen ];
|
||||
|
||||
@ -236,8 +236,8 @@ in {
|
||||
# the permitted insecure version to ensure it gets cached for our users
|
||||
# and backport this to stable release (23.05).
|
||||
openssl_1_1 = common {
|
||||
version = "1.1.1u";
|
||||
sha256 = "sha256-4vjYS1I+7NBse+diaDA3AwD7zBU4a/UULXJ1j2lj68Y=";
|
||||
version = "1.1.1v";
|
||||
sha256 = "sha256-1ml+KHHncjhGBALpNi1H0YOCsV758karpse9eA04prA=";
|
||||
patches = [
|
||||
./1.1/nix-ssl-cert-file.patch
|
||||
|
||||
|
||||
@ -46,5 +46,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "xdg-dbus-proxy";
|
||||
};
|
||||
}
|
||||
|
||||
2
pkgs/development/node-packages/node-packages.nix
generated
2
pkgs/development/node-packages/node-packages.nix
generated
@ -134051,7 +134051,7 @@ in
|
||||
"rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps" = nodeEnv.buildNodePackage {
|
||||
name = "rust-analyzer";
|
||||
packageName = "rust-analyzer";
|
||||
version = "0.3.1426";
|
||||
version = "0.3.1607";
|
||||
src = ../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps;
|
||||
dependencies = [
|
||||
sources."@aashutoshrathi/word-wrap-1.2.6"
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "cohttp";
|
||||
version = "5.1.0";
|
||||
version = "5.3.0";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz";
|
||||
hash = "sha256-mINgeBO7DSsWd84gYjQNUQFqbh8KBZ+S2bYI/iVWMAc=";
|
||||
url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-${version}.tbz";
|
||||
hash = "sha256-s72RxwTl6lEOkkuDqy7eH8RqLM5Eiw+M70iDuaFu7d0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -16,14 +16,13 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "http-mirage-client";
|
||||
version = "0.0.3";
|
||||
version = "0.0.5";
|
||||
|
||||
duneVersion = "3";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/roburio/http-mirage-client/releases/download/v${version}/http-mirage-client-${version}.tbz";
|
||||
hash = "sha256-6PMxZQfPiDTFbj9gOO2tW5FHF0MUP5tOySjkYg+QwGA=";
|
||||
hash = "sha256-w/dMv5QvgglTFj9V4wRoDqK+36YeE0xWLxcAVS0oHz0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dask-awkward";
|
||||
version = "2023.6.3";
|
||||
version = "2023.8.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "dask-contrib";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-2Ejt1fyh8Z81WI+oIFWZxr4M1vfgs6tB4jCCMxBz2Rc=";
|
||||
hash = "sha256-2nF2G6bpwHeMlB0+/DRW4I7W6mK3wfXkuqCSRQusJu4=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -45,5 +45,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/pycqa/flake8";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
mainProgram = "flake8";
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,5 +12,6 @@ buildGoModule {
|
||||
|
||||
meta = common.meta // {
|
||||
description = "Woodpecker Continuous Integration agent";
|
||||
mainProgram = "woodpecker-agent";
|
||||
};
|
||||
}
|
||||
|
||||
@ -22,5 +22,6 @@ buildGoModule {
|
||||
|
||||
meta = common.meta // {
|
||||
description = "Woodpecker Continuous Integration server";
|
||||
mainProgram = "woodpecker-server";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dprint";
|
||||
version = "0.39.1";
|
||||
version = "0.40.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-aJHNVhZ1pWnPErPmFXy2AfZNtGWcYjuGChJ3fGsAOSA=";
|
||||
sha256 = "sha256-leneOdV65aAUGRdVFpPuVnCmu3VmVzZXxOLJ5vspVB8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9uZm0jCl9Bu2GNEa1lphQLzMEOWzkWlb6OESPm14AJ4=";
|
||||
cargoHash = "sha256-C0cgN7G+zQZr+V/iPHh6HXV8DnPaE0bWkbJmbfIMwgk=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
||||
@ -23,5 +23,6 @@ buildGoModule rec {
|
||||
changelog = "https://github.com/evanw/esbuild/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lucus16 marsam undefined-moe ];
|
||||
mainProgram = "esbuild";
|
||||
};
|
||||
}
|
||||
|
||||
@ -29,5 +29,6 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/netlify/esbuild";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ roberth ];
|
||||
mainProgram = "esbuild";
|
||||
};
|
||||
}
|
||||
|
||||
@ -26,5 +26,6 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/mozilla/geckodriver";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ jraygauthier ];
|
||||
mainProgram = "geckodriver";
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,27 +5,30 @@
|
||||
, git
|
||||
, python3
|
||||
, makeWrapper
|
||||
, writeScriptBin
|
||||
, darwin
|
||||
, which
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pylyzer";
|
||||
version = "0.0.37";
|
||||
version = "0.0.39";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mtshiba";
|
||||
repo = "pylyzer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MzcGWOJud8SA6cpTdhms+Hfi0sAqelOr7dgy/k1H+qw=";
|
||||
hash = "sha256-GHrB4FmZWmnkcfr3y4Ulk3TBmVn1Xsixqeni8h9PykY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Xl0YxBmhhFKBzxbO1GXIds3XdSS78/7Z1rOAmLgTYSw=";
|
||||
cargoHash = "sha256-Fe/bD8pIXElYfxYHF6JPVlpHhRrgJMDjEFfnequ00Bo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
git
|
||||
python3
|
||||
makeWrapper
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
(writeScriptBin "diskutil" "")
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -34,5 +34,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
|
||||
mainProgram = "libtool";
|
||||
};
|
||||
}
|
||||
|
||||
@ -68,5 +68,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ ];
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "libtool";
|
||||
};
|
||||
}
|
||||
|
||||
@ -28,5 +28,6 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/XAMPPRocky/tokei";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ gebner lilyball ];
|
||||
mainProgram = "tokei";
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
upstream-info = (lib.importJSON ../../../../applications/networking/browsers/chromium/upstream-info.json).stable.chromedriver;
|
||||
upstream-info = (import ../../../../applications/networking/browsers/chromium/upstream-info.nix).stable.chromedriver;
|
||||
allSpecs = {
|
||||
x86_64-linux = {
|
||||
system = "linux64";
|
||||
@ -73,5 +73,6 @@ in stdenv.mkDerivation rec {
|
||||
# Note from primeos: By updating Chromium I also update Google Chrome and
|
||||
# ChromeDriver.
|
||||
platforms = attrNames allSpecs;
|
||||
mainProgram = "chromedriver";
|
||||
};
|
||||
}
|
||||
|
||||
@ -212,7 +212,7 @@ in makeScopeWithSplicing
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# GNU objcopy produces broken .a libs which won't link into dependers.
|
||||
# Makefiles only invoke `$OBJCOPY -x/-X`, so cctools strip works here.
|
||||
"OBJCOPY=${buildPackages.darwin.cctools}/bin/strip"
|
||||
"OBJCOPY=${buildPackages.darwin.cctools-port}/bin/strip"
|
||||
];
|
||||
RENAME = "-D";
|
||||
|
||||
|
||||
@ -43,5 +43,6 @@ rustPlatform.buildRustPackage rec {
|
||||
description = "A time traveling resource monitor for modern Linux systems";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://github.com/facebookincubator/below";
|
||||
mainProgram = "below";
|
||||
};
|
||||
}
|
||||
|
||||
@ -322,5 +322,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ offline henkery code-asher ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
|
||||
mainProgram = "code-server";
|
||||
};
|
||||
})
|
||||
|
||||
@ -42,5 +42,6 @@ buildGoModule rec {
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ pradeepchhetri vdemeester nh2 techknowlogick];
|
||||
mainProgram = "consul";
|
||||
};
|
||||
}
|
||||
|
||||
@ -30,5 +30,6 @@ buildGoModule rec {
|
||||
changelog = "https://github.com/joohoi/acme-dns/releases/tag/${src.rev}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ emilylange ];
|
||||
mainProgram = "acme-dns";
|
||||
};
|
||||
}
|
||||
|
||||
5427
pkgs/servers/kanidm/Cargo.lock
generated
5427
pkgs/servers/kanidm/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -4,13 +4,13 @@
|
||||
, nixosTests
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, installShellFiles
|
||||
, pkg-config
|
||||
, udev
|
||||
, openssl
|
||||
, sqlite
|
||||
, pam
|
||||
, bashInteractive
|
||||
}:
|
||||
|
||||
let
|
||||
@ -18,45 +18,35 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kanidm";
|
||||
version = "1.1.0-alpha.12";
|
||||
version = "1.1.0-beta.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "f5924443f08e462067937a5dd0e2c19e5e1255da";
|
||||
hash = "sha256-kJUxVrGpczIdOqKQbgRp1xERfKP6C0SDQgWdjtSuvZ8=";
|
||||
# Latest 1.1.0-beta.13 tip
|
||||
rev = "5d1e2f90e6901017ab3ef9b5fbc10e25a5451fd2";
|
||||
hash = "sha256-70yeHVOrCuC+H96UC84kly3CCQ+y1RGzF5K/2FIag/o=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"tracing-forest-0.1.5" = "sha256-L6auSKB4DCnZBZpx7spiikhSOD6i1W3erc3zjn+26Ao=";
|
||||
};
|
||||
};
|
||||
cargoHash = "sha256-Qdc+E5+k9NNE4s6eAnpkam56pc2JJPahkuT4lB328cY=";
|
||||
|
||||
KANIDM_BUILD_PROFILE = "release_nixos_${arch}";
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Bring back x86_64-v1 microarchitecture level
|
||||
name = "cpu-opt-level.patch";
|
||||
url = "https://github.com/kanidm/kanidm/commit/59c6723f7dfb2266eae45c3b2ddd377872a7a113.patch";
|
||||
hash = "sha256-8rVEYitxvdVduQ/+AD/UG3v+mgT/VxkLoxNIXczUfCQ=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch =
|
||||
let
|
||||
format = (formats.toml { }).generate "${KANIDM_BUILD_PROFILE}.toml";
|
||||
profile = {
|
||||
web_ui_pkg_path = "@web_ui_pkg_path@";
|
||||
admin_bind_path = "/run/kanidmd/sock";
|
||||
cpu_flags = if stdenv.isx86_64 then "x86_64_legacy" else "none";
|
||||
default_config_path = "/etc/kanidm/server.toml";
|
||||
default_unix_shell_path = "${lib.getBin bashInteractive}/bin/bash";
|
||||
web_ui_pkg_path = "@web_ui_pkg_path@";
|
||||
};
|
||||
in
|
||||
''
|
||||
cp ${format profile} libs/profiles/${KANIDM_BUILD_PROFILE}.toml
|
||||
substituteInPlace libs/profiles/${KANIDM_BUILD_PROFILE}.toml \
|
||||
--replace '@web_ui_pkg_path@' "$out/ui"
|
||||
--replace '@web_ui_pkg_path@' "${placeholder "out"}/ui"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -92,6 +82,7 @@ rustPlatform.buildRustPackage rec {
|
||||
passthru.tests = { inherit (nixosTests) kanidm; };
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/kanidm/kanidm/releases/tag/v${version}";
|
||||
description = "A simple, secure and fast identity management platform";
|
||||
homepage = "https://github.com/kanidm/kanidm";
|
||||
license = licenses.mpl20;
|
||||
|
||||
@ -110,5 +110,6 @@ in rustPlatform.buildRustPackage (commonDerivationAttrs // {
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ emilylange bendlas ];
|
||||
mainProgram = "lldap";
|
||||
};
|
||||
})
|
||||
|
||||
@ -73,5 +73,6 @@ buildGoModule rec {
|
||||
homepage = "https://grafana.com/products/cloud";
|
||||
changelog = "https://github.com/grafana/agent/blob/${src.rev}/CHANGELOG.md";
|
||||
maintainers = with lib.maintainers; [ flokli emilylange ];
|
||||
mainProgram = "grafana-agent";
|
||||
};
|
||||
}
|
||||
|
||||
@ -219,5 +219,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dguenther ghuntley emilytrau ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
mainProgram = "openvscode-server";
|
||||
};
|
||||
})
|
||||
|
||||
@ -98,5 +98,6 @@ buildGoModule rec {
|
||||
homepage = "https://www.pufferpanel.com/";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ ckie tie ];
|
||||
mainProgram = "pufferpanel";
|
||||
};
|
||||
}
|
||||
|
||||
42
pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix
Normal file
42
pkgs/servers/sql/cockroachdb/cockroachdb-bin.nix
Normal file
@ -0,0 +1,42 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, buildFHSEnv
|
||||
}:
|
||||
|
||||
let
|
||||
version = "23.1.7";
|
||||
name = "cockroachdb";
|
||||
|
||||
# For several reasons building cockroach from source has become
|
||||
# nearly impossible. See https://github.com/NixOS/nixpkgs/pull/152626
|
||||
# Therefore we use the pre-build release binary and wrap it with buildFHSUserEnv to
|
||||
# work on nix.
|
||||
# You can generate the hashes with
|
||||
# nix flake prefetch <url>
|
||||
srcs = {
|
||||
aarch64-linux = fetchzip {
|
||||
url = "https://binaries.cockroachdb.com/cockroach-v${version}.linux-arm64.tgz";
|
||||
hash = "sha256-73qJL3o328NckH6POXv+AUvlAJextb31Vs8NGdc8dwE=";
|
||||
};
|
||||
x86_64-linux = fetchzip {
|
||||
url = "https://binaries.cockroachdb.com/cockroach-v${version}.linux-amd64.tgz";
|
||||
hash = "sha256-FL/zDrl+QstBp54LE9/SbIfSPorneGZSef6dcOQJbSo=";
|
||||
};
|
||||
};
|
||||
src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
in
|
||||
buildFHSEnv {
|
||||
inherit name;
|
||||
|
||||
runScript = "${src}/cockroach";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.cockroachlabs.com";
|
||||
description = "A scalable, survivable, strongly-consistent SQL database";
|
||||
license = licenses.bsl11;
|
||||
platforms = [ "aarch64-linux" "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ rushmorem thoughtpolice neosimsim ];
|
||||
};
|
||||
}
|
||||
@ -73,5 +73,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ misterio77 ];
|
||||
mainProgram = "kavita";
|
||||
};
|
||||
})
|
||||
|
||||
@ -161,6 +161,9 @@ self: super:
|
||||
+ lib.optionalString stdenv.hostPlatform.isStatic ''
|
||||
export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -lXau -lXdmcp"
|
||||
'';
|
||||
meta = attrs.meta // {
|
||||
mainProgram = "xdpyinfo";
|
||||
};
|
||||
});
|
||||
|
||||
xdm = super.xdm.overrideAttrs (attrs: {
|
||||
@ -814,6 +817,7 @@ self: super:
|
||||
--replace '_X_NORETURN' '__attribute__((noreturn))' \
|
||||
--replace 'n_dirs--;' ""
|
||||
'';
|
||||
meta.mainProgram = "lndir";
|
||||
});
|
||||
|
||||
twm = super.twm.overrideAttrs (attrs: {
|
||||
@ -940,6 +944,12 @@ self: super:
|
||||
'';
|
||||
});
|
||||
|
||||
xset = super.xset.overrideAttrs (attrs: {
|
||||
meta = attrs.meta // {
|
||||
mainProgram = "xset";
|
||||
};
|
||||
});
|
||||
|
||||
# convert Type1 vector fonts to OpenType fonts
|
||||
fontbitstreamtype1 = super.fontbitstreamtype1.overrideAttrs (attrs: {
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [ fontforge ];
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fits-cloudctl";
|
||||
version = "0.11.11";
|
||||
version = "0.11.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fi-ts";
|
||||
repo = "cloudctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Jf6QiGn8C3pQ/FQSEc+h06514kNXHpnKVyZ1l+S/uHw=";
|
||||
sha256 = "sha256-S4XouqqIBalXqfznrJ8F2TxU9h+gqObnjRXEQnj67LQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3aoj4G3npO/DYjRu55iP9Y79z3da0edClOJlWuQC//A=";
|
||||
vendorHash = "sha256-Y1F+7bJwsUb09xTSRSdfa6bOPMFCkNBaNurrfB9IPCA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command-line client for FI-TS Finance Cloud Native services";
|
||||
|
||||
@ -40,5 +40,6 @@ stdenv.mkDerivation rec {
|
||||
license = lib.licenses.unfree;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ thoughtpolice roconnor ];
|
||||
mainProgram = "tarsnap";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bdf2psf";
|
||||
version = "1.221";
|
||||
version = "1.222";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
|
||||
sha256 = "XaNAF5+TM1F0qyX/PEwRoiEvO8qmPuMWs+mkWSaHNGg=";
|
||||
sha256 = "sha256-zGd2t2Qtec8Up1SHAizZp8l/fhFpa0Y1UJbB8XanX6Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
|
||||
@ -65,6 +65,7 @@ let
|
||||
nvramtool = generic {
|
||||
pname = "nvramtool";
|
||||
meta.description = "Read and write coreboot parameters and display information from the coreboot table in CMOS/NVRAM";
|
||||
meta.mainProgram = "nvramtool";
|
||||
};
|
||||
superiotool = generic {
|
||||
pname = "superiotool";
|
||||
|
||||
@ -50,5 +50,6 @@ buildGoModule rec {
|
||||
homepage = "https://direnv.net";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.numtide.members;
|
||||
mainProgram = "direnv";
|
||||
};
|
||||
}
|
||||
|
||||
@ -50,5 +50,6 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.all;
|
||||
mainProgram = "file";
|
||||
};
|
||||
}
|
||||
|
||||
@ -57,5 +57,6 @@ rustPlatform.buildRustPackage rec {
|
||||
changelog = "https://github.com/nix-community/nurl/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
mainProgram = "nurl";
|
||||
};
|
||||
}
|
||||
|
||||
35
pkgs/tools/misc/ollama/default.nix
Normal file
35
pkgs/tools/misc/ollama/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ollama";
|
||||
version = "0.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jmorganca";
|
||||
repo = "ollama";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TEifqWVgZjrQcq9eDjfRgUff9vdsO3Fx2hZZJVJZLsU=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
|
||||
Accelerate
|
||||
MetalPerformanceShaders
|
||||
MetalKit
|
||||
]);
|
||||
|
||||
vendorHash = "sha256-KtpEqGXLpwH0NXFjb0F/SUBxP7BLEiEg3NouC0ZQOPs=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Get up and running with large language models locally";
|
||||
homepage = "https://github.com/jmorganca/ollama";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
};
|
||||
}
|
||||
@ -126,5 +126,6 @@ rustPlatform.buildRustPackage {
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ thoughtpolice happysalada ];
|
||||
platforms = with platforms; all;
|
||||
mainProgram = "vector";
|
||||
};
|
||||
}
|
||||
|
||||
@ -60,5 +60,6 @@ stdenvNoCC.mkDerivation rec {
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.artturin ];
|
||||
mainProgram = "xvfb-run";
|
||||
};
|
||||
}
|
||||
|
||||
@ -77,5 +77,6 @@ buildPythonPackage rec {
|
||||
'';
|
||||
license = licenses.unlicense;
|
||||
maintainers = with maintainers; [ mkg20001 SuperSandro2000 marsam ];
|
||||
mainProgram = "yt-dlp";
|
||||
};
|
||||
}
|
||||
|
||||
@ -40,5 +40,6 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/MetaCubeX/Clash.Meta";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ oluceps ];
|
||||
mainProgram = "clash-meta";
|
||||
};
|
||||
}
|
||||
|
||||
@ -40,5 +40,6 @@ buildGoModule rec {
|
||||
changelog = "https://github.com/Dreamacro/clash/releases/tag/v${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ contrun Br1ght0ne ];
|
||||
mainProgram = "clash";
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,17 +9,17 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "dae";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daeuniverse";
|
||||
repo = pname;
|
||||
repo = "dae";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PAdhIhX2hXCgg3NAZR0k8d1I/qQ8Cs8bNT6s6tZ5t4E=";
|
||||
hash = "sha256-Fk3xpQ8xuZMPulMFZb5fnN0Tisk13XRx49vBN5coanQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-DCEvE2ES7GwiXKyD7tRlykqiIaKdmo7TczutPeGurKw=";
|
||||
vendorHash = "sha256-sqcImm5BYTiUnBmcpWWMR1TuV877VE5gZ8Oth8AxjSg=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "frp";
|
||||
version = "0.51.1";
|
||||
version = "0.51.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fatedier";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-B15GyMk4tYbhj4QGpona0CK89WyIkPnH6QMxmd8BS+w=";
|
||||
sha256 = "sha256-uiF27qGHwAg05o9thCxIf6Z2xhMnKzhDgMKTuS6IJ8A=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-JNBQO4rZmtBKIAQAikQDyREQ3Kw1CG6pC9HouJQ5dh4=";
|
||||
vendorHash = "sha256-sqlBgEfIWuDnGsepSZtrgxmG/DoP+Hc4c3nOpo8S/Ks=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "minio-client";
|
||||
version = "2023-07-11T23-30-44Z";
|
||||
version = "2023-07-21T20-44-27Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "mc";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-hCHPDzdMqu36fICiyVhMDHhfOHxBzUl5+YfjnWbrRFk=";
|
||||
sha256 = "sha256-y0+AGDI4zxMgcC65U51/UHW2mo0NNNKc+MQCcFevHmk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-W3FenwPwfEQxJWym6QzqMczWtygPN65Hp4gjj/karMw=";
|
||||
vendorHash = "sha256-6duYIeNkqql9y1Wo+foMe88dmPmHZ625FBTDdKsHnCE=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -87,5 +87,6 @@ buildNpmPackage rec {
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ misterio77 ];
|
||||
platforms = lib.unique (geckodriver.meta.platforms ++ chromedriver.meta.platforms);
|
||||
mainProgram = "sitespeed-io";
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,17 +5,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vegeta";
|
||||
version = "12.10.0";
|
||||
version = "12.11.0";
|
||||
rev = "e04d9c0df8177e8633bff4afe7b39c2f3a9e7dea";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tsenart";
|
||||
repo = "vegeta";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lBJXMI/OVxgi4AqAFKE6cXLBagUZzUTRzvcJBr0Wh/c=";
|
||||
sha256 = "sha256-dqVwz4nc+QDD5M2ajLtnoEnvaka/n6KxqCvRH63Za4g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QWI2T1yJBATgCyGlR2dPbnBLn9KHQgfc30mPdMKzGsQ=";
|
||||
vendorHash = "sha256-Pq8MRfwYhgk5YWEmBisBrV2F7Ztn18MdpRFZ9r/1y7A=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://git.deuxfleurs.fr/Deuxfleurs/wgautomesh";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = [ maintainers.lx ];
|
||||
mainProgram = "wgautomesh";
|
||||
};
|
||||
}
|
||||
|
||||
@ -44,5 +44,6 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/nix-community/harmonia";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ mic92 ];
|
||||
mainProgram = "harmonia";
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "nix-update";
|
||||
version = "0.19.0";
|
||||
version = "0.19.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mic92";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-v58x48la837gbqMaQ6PEl9Ick1NH+Y4okf2yttDzqC4=";
|
||||
hash = "sha256-FyQcsKCHsAB8BmPxeIZdiidaxyNi/5bFA/ilGydDVM0=";
|
||||
};
|
||||
|
||||
makeWrapperArgs = [
|
||||
|
||||
@ -241,6 +241,7 @@ self = stdenv.mkDerivation {
|
||||
maintainers = with maintainers; [ eelco lovesegfault artturin ];
|
||||
platforms = platforms.unix;
|
||||
outputsToInstall = [ "out" ] ++ optional enableDocumentation "man";
|
||||
mainProgram = "nix";
|
||||
};
|
||||
};
|
||||
in self
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user