Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
e8e956566c
47 changed files with 1008 additions and 439 deletions
|
|
@ -27,9 +27,9 @@ let
|
|||
# Linux
|
||||
"aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux"
|
||||
"armv7l-linux" "i686-linux" "loongarch64-linux" "m68k-linux" "microblaze-linux"
|
||||
"microblazeel-linux" "mipsel-linux" "mips64el-linux" "powerpc64-linux"
|
||||
"powerpc64le-linux" "riscv32-linux" "riscv64-linux" "s390-linux"
|
||||
"s390x-linux" "x86_64-linux"
|
||||
"microblazeel-linux" "mips-linux" "mips64-linux" "mips64el-linux"
|
||||
"mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv32-linux"
|
||||
"riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux"
|
||||
|
||||
# MMIXware
|
||||
"mmix-mmixware"
|
||||
|
|
|
|||
|
|
@ -91,22 +91,16 @@ rec {
|
|||
} // platforms.fuloong2f_n32;
|
||||
|
||||
# can execute on 32bit chip
|
||||
mips-linux-gnu = { config = "mips-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32;
|
||||
mipsel-linux-gnu = { config = "mipsel-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32;
|
||||
mipsisa32r6-linux-gnu = { config = "mipsisa32r6-unknown-linux-gnu"; } // platforms.gcc_mips32r6_o32;
|
||||
mipsisa32r6el-linux-gnu = { config = "mipsisa32r6el-unknown-linux-gnu"; } // platforms.gcc_mips32r6_o32;
|
||||
mips-linux-gnu = { config = "mips-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32;
|
||||
mipsel-linux-gnu = { config = "mipsel-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32;
|
||||
|
||||
# require 64bit chip (for more registers, 64-bit floating point, 64-bit "long long") but use 32bit pointers
|
||||
mips64-linux-gnuabin32 = { config = "mips64-unknown-linux-gnuabin32"; } // platforms.gcc_mips64r2_n32;
|
||||
mips64el-linux-gnuabin32 = { config = "mips64el-unknown-linux-gnuabin32"; } // platforms.gcc_mips64r2_n32;
|
||||
mipsisa64r6-linux-gnuabin32 = { config = "mipsisa64r6-unknown-linux-gnuabin32"; } // platforms.gcc_mips64r6_n32;
|
||||
mipsisa64r6el-linux-gnuabin32 = { config = "mipsisa64r6el-unknown-linux-gnuabin32"; } // platforms.gcc_mips64r6_n32;
|
||||
mips64-linux-gnuabin32 = { config = "mips64-unknown-linux-gnuabin32"; } // platforms.gcc_mips64r2_n32;
|
||||
mips64el-linux-gnuabin32 = { config = "mips64el-unknown-linux-gnuabin32"; } // platforms.gcc_mips64r2_n32;
|
||||
|
||||
# 64bit pointers
|
||||
mips64-linux-gnuabi64 = { config = "mips64-unknown-linux-gnuabi64"; } // platforms.gcc_mips64r2_64;
|
||||
mips64el-linux-gnuabi64 = { config = "mips64el-unknown-linux-gnuabi64"; } // platforms.gcc_mips64r2_64;
|
||||
mipsisa64r6-linux-gnuabi64 = { config = "mipsisa64r6-unknown-linux-gnuabi64"; } // platforms.gcc_mips64r6_64;
|
||||
mipsisa64r6el-linux-gnuabi64 = { config = "mipsisa64r6el-unknown-linux-gnuabi64"; } // platforms.gcc_mips64r6_64;
|
||||
mips64-linux-gnuabi64 = { config = "mips64-unknown-linux-gnuabi64"; } // platforms.gcc_mips64r2_64;
|
||||
mips64el-linux-gnuabi64 = { config = "mips64el-unknown-linux-gnuabi64"; } // platforms.gcc_mips64r2_64;
|
||||
|
||||
muslpi = raspberryPi // {
|
||||
config = "armv6l-unknown-linux-musleabihf";
|
||||
|
|
|
|||
|
|
@ -91,14 +91,10 @@ rec {
|
|||
microblaze = { bits = 32; significantByte = bigEndian; family = "microblaze"; };
|
||||
microblazeel = { bits = 32; significantByte = littleEndian; family = "microblaze"; };
|
||||
|
||||
mips = { bits = 32; significantByte = bigEndian; family = "mips"; };
|
||||
mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; };
|
||||
mipsisa32r6 = { bits = 32; significantByte = bigEndian; family = "mips"; };
|
||||
mipsisa32r6el = { bits = 32; significantByte = littleEndian; family = "mips"; };
|
||||
mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; };
|
||||
mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; };
|
||||
mipsisa64r6 = { bits = 64; significantByte = bigEndian; family = "mips"; };
|
||||
mipsisa64r6el = { bits = 64; significantByte = littleEndian; family = "mips"; };
|
||||
mips = { bits = 32; significantByte = bigEndian; family = "mips"; };
|
||||
mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; };
|
||||
mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; };
|
||||
mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; };
|
||||
|
||||
mmix = { bits = 64; significantByte = bigEndian; family = "mmix"; };
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ with lib.systems.doubles; lib.runTests {
|
|||
testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-netbsd" "armv6l-none" "armv7a-linux" "armv7a-netbsd" "armv7l-linux" "armv7l-netbsd" "arm-none" "armv7a-darwin" ];
|
||||
testarmv7 = mseteq armv7 [ "armv7a-darwin" "armv7a-linux" "armv7l-linux" "armv7a-netbsd" "armv7l-netbsd" ];
|
||||
testi686 = mseteq i686 [ "i686-linux" "i686-freebsd13" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ];
|
||||
testmips = mseteq mips [ "mips64el-linux" "mipsel-linux" "mipsel-netbsd" ];
|
||||
testmips = mseteq mips [ "mips-linux" "mips64-linux" "mips64el-linux" "mipsel-linux" "mipsel-netbsd" ];
|
||||
testmmix = mseteq mmix [ "mmix-mmixware" ];
|
||||
testpower = mseteq power [ "powerpc-netbsd" "powerpc-none" "powerpc64-linux" "powerpc64le-linux" "powerpcle-none" ];
|
||||
testriscv = mseteq riscv [ "riscv32-linux" "riscv64-linux" "riscv32-netbsd" "riscv64-netbsd" "riscv32-none" "riscv64-none" ];
|
||||
|
|
@ -34,7 +34,7 @@ with lib.systems.doubles; lib.runTests {
|
|||
testredox = mseteq redox [ "x86_64-redox" ];
|
||||
testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
|
||||
testillumos = mseteq illumos [ "x86_64-solaris" ];
|
||||
testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mips64el-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" "m68k-linux" "s390-linux" "s390x-linux" "microblaze-linux" "microblazeel-linux" "loongarch64-linux" ];
|
||||
testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "loongarch64-linux" "m68k-linux" "microblaze-linux" "microblazeel-linux" "mips-linux" "mips64-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux" ];
|
||||
testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "m68k-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ];
|
||||
testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
|
||||
testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];
|
||||
|
|
|
|||
|
|
@ -15969,6 +15969,12 @@
|
|||
github = "TilCreator";
|
||||
githubId = 18621411;
|
||||
};
|
||||
tillkruss = {
|
||||
name = "Till Krüss";
|
||||
email = "till@kruss.io";
|
||||
github = "tillkruss";
|
||||
githubId = 665029;
|
||||
};
|
||||
tilpner = {
|
||||
name = "Till Höppner";
|
||||
email = "nixpkgs@tilpner.com";
|
||||
|
|
|
|||
|
|
@ -293,6 +293,7 @@ with lib.maintainers; {
|
|||
imincik
|
||||
sikmir
|
||||
nh2
|
||||
willcohen
|
||||
];
|
||||
scope = "Maintain geospatial packages.";
|
||||
shortName = "Geospatial";
|
||||
|
|
|
|||
|
|
@ -1,107 +1,199 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
|
||||
cfg = config.services.code-server;
|
||||
defaultUser = "code-server";
|
||||
defaultGroup = defaultUser;
|
||||
|
||||
in {
|
||||
###### interface
|
||||
options = {
|
||||
services.code-server = {
|
||||
enable = mkEnableOption (lib.mdDoc "code-server");
|
||||
enable = lib.mkEnableOption (lib.mdDoc "code-server");
|
||||
|
||||
package = mkOption {
|
||||
default = pkgs.code-server;
|
||||
defaultText = lib.literalExpression "pkgs.code-server";
|
||||
description = lib.mdDoc "Which code-server derivation to use.";
|
||||
type = types.package;
|
||||
};
|
||||
package = lib.mkPackageOptionMD pkgs "code-server" { };
|
||||
|
||||
extraPackages = mkOption {
|
||||
extraPackages = lib.mkOption {
|
||||
default = [ ];
|
||||
description = lib.mdDoc "Packages that are available in the PATH of code-server.";
|
||||
example = "[ pkgs.go ]";
|
||||
type = types.listOf types.package;
|
||||
description = lib.mdDoc ''
|
||||
Additional packages to add to the code-server {env}`PATH`.
|
||||
'';
|
||||
example = lib.literalExpression "[ pkgs.go ]";
|
||||
type = lib.types.listOf lib.types.package;
|
||||
};
|
||||
|
||||
extraEnvironment = mkOption {
|
||||
type = types.attrsOf types.str;
|
||||
description =
|
||||
lib.mdDoc "Additional environment variables to passed to code-server.";
|
||||
extraEnvironment = lib.mkOption {
|
||||
type = lib.types.attrsOf lib.types.str;
|
||||
description = lib.mdDoc ''
|
||||
Additional environment variables to pass to code-server.
|
||||
'';
|
||||
default = { };
|
||||
example = { PKG_CONFIG_PATH = "/run/current-system/sw/lib/pkgconfig"; };
|
||||
};
|
||||
|
||||
extraArguments = mkOption {
|
||||
default = [ "--disable-telemetry" ];
|
||||
description = lib.mdDoc "Additional arguments that passed to code-server";
|
||||
example = ''[ "--verbose" ]'';
|
||||
type = types.listOf types.str;
|
||||
extraArguments = lib.mkOption {
|
||||
default = [ ];
|
||||
description = lib.mdDoc ''
|
||||
Additional arguments to pass to code-server.
|
||||
'';
|
||||
example = lib.literalExpression ''[ "--log=info" ]'';
|
||||
type = lib.types.listOf lib.types.str;
|
||||
};
|
||||
|
||||
host = mkOption {
|
||||
default = "127.0.0.1";
|
||||
description = lib.mdDoc "The host-ip to bind to.";
|
||||
type = types.str;
|
||||
host = lib.mkOption {
|
||||
default = "localhost";
|
||||
description = lib.mdDoc ''
|
||||
The host name or IP address the server should listen to.
|
||||
'';
|
||||
type = lib.types.str;
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
port = lib.mkOption {
|
||||
default = 4444;
|
||||
description = lib.mdDoc "The port where code-server runs.";
|
||||
type = types.port;
|
||||
description = lib.mdDoc ''
|
||||
The port the server should listen to.
|
||||
'';
|
||||
type = lib.types.port;
|
||||
};
|
||||
|
||||
auth = mkOption {
|
||||
auth = lib.mkOption {
|
||||
default = "password";
|
||||
description = lib.mdDoc "The type of authentication to use.";
|
||||
type = types.enum [ "none" "password" ];
|
||||
description = lib.mdDoc ''
|
||||
The type of authentication to use.
|
||||
'';
|
||||
type = lib.types.enum [ "none" "password" ];
|
||||
};
|
||||
|
||||
hashedPassword = mkOption {
|
||||
hashedPassword = lib.mkOption {
|
||||
default = "";
|
||||
description =
|
||||
lib.mdDoc "Create the password with: `echo -n 'thisismypassword' | npx argon2-cli -e`.";
|
||||
type = types.str;
|
||||
description = lib.mdDoc ''
|
||||
Create the password with: `echo -n 'thisismypassword' | npx argon2-cli -e`.
|
||||
'';
|
||||
type = lib.types.str;
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
user = lib.mkOption {
|
||||
default = defaultUser;
|
||||
example = "yourUser";
|
||||
description = lib.mdDoc ''
|
||||
The user to run code-server as.
|
||||
By default, a user named `${defaultUser}` will be created.
|
||||
'';
|
||||
type = types.str;
|
||||
type = lib.types.str;
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
group = lib.mkOption {
|
||||
default = defaultGroup;
|
||||
example = "yourGroup";
|
||||
description = lib.mdDoc ''
|
||||
The group to run code-server under.
|
||||
By default, a group named `${defaultGroup}` will be created.
|
||||
'';
|
||||
type = types.str;
|
||||
type = lib.types.str;
|
||||
};
|
||||
|
||||
extraGroups = mkOption {
|
||||
extraGroups = lib.mkOption {
|
||||
default = [ ];
|
||||
description =
|
||||
lib.mdDoc "An array of additional groups for the `${defaultUser}` user.";
|
||||
description = lib.mdDoc ''
|
||||
An array of additional groups for the `${defaultUser}` user.
|
||||
'';
|
||||
example = [ "docker" ];
|
||||
type = types.listOf types.str;
|
||||
type = lib.types.listOf lib.types.str;
|
||||
};
|
||||
|
||||
socket = lib.mkOption {
|
||||
default = null;
|
||||
example = "/run/code-server/socket";
|
||||
description = lib.mdDoc ''
|
||||
Path to a socket (bind-addr will be ignored).
|
||||
'';
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
};
|
||||
|
||||
socketMode = lib.mkOption {
|
||||
default = null;
|
||||
description = lib.mdDoc ''
|
||||
File mode of the socket.
|
||||
'';
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
};
|
||||
|
||||
userDataDir = lib.mkOption {
|
||||
default = null;
|
||||
description = lib.mdDoc ''
|
||||
Path to the user data directory.
|
||||
'';
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
};
|
||||
|
||||
extensionsDir = lib.mkOption {
|
||||
default = null;
|
||||
description = lib.mdDoc ''
|
||||
Path to the extensions directory.
|
||||
'';
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
};
|
||||
|
||||
proxyDomain = lib.mkOption {
|
||||
default = null;
|
||||
example = "code-server.lan";
|
||||
description = lib.mdDoc ''
|
||||
Domain used for proxying ports.
|
||||
'';
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
};
|
||||
|
||||
disableTelemetry = lib.mkOption {
|
||||
default = false;
|
||||
example = true;
|
||||
description = lib.mdDoc ''
|
||||
Disable telemetry.
|
||||
'';
|
||||
type = lib.types.bool;
|
||||
};
|
||||
|
||||
disableUpdateCheck = lib.mkOption {
|
||||
default = false;
|
||||
example = true;
|
||||
description = lib.mdDoc ''
|
||||
Disable update check.
|
||||
Without this flag, code-server checks every 6 hours against the latest github release and
|
||||
then notifies you once every week that a new release is available.
|
||||
'';
|
||||
type = lib.types.bool;
|
||||
};
|
||||
|
||||
disableFileDownloads = lib.mkOption {
|
||||
default = false;
|
||||
example = true;
|
||||
description = lib.mdDoc ''
|
||||
Disable file downloads from Code.
|
||||
'';
|
||||
type = lib.types.bool;
|
||||
};
|
||||
|
||||
disableWorkspaceTrust = lib.mkOption {
|
||||
default = false;
|
||||
example = true;
|
||||
description = lib.mdDoc ''
|
||||
Disable Workspace Trust feature.
|
||||
'';
|
||||
type = lib.types.bool;
|
||||
};
|
||||
|
||||
disableGettingStartedOverride = lib.mkOption {
|
||||
default = false;
|
||||
example = true;
|
||||
description = lib.mdDoc ''
|
||||
Disable the coder/coder override in the Help: Getting Started page.
|
||||
'';
|
||||
type = lib.types.bool;
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
###### implementation
|
||||
config = mkIf cfg.enable {
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.services.code-server = {
|
||||
description = "VSCode server";
|
||||
description = "Code server";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network-online.target" ];
|
||||
path = cfg.extraPackages;
|
||||
|
|
@ -109,18 +201,37 @@ in {
|
|||
HASHED_PASSWORD = cfg.hashedPassword;
|
||||
} // cfg.extraEnvironment;
|
||||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/code-server --bind-addr ${cfg.host}:${toString cfg.port} --auth ${cfg.auth} " + lib.escapeShellArgs cfg.extraArguments;
|
||||
ExecStart = ''
|
||||
${lib.getExe cfg.package} \
|
||||
--auth=${cfg.auth} \
|
||||
--bind-addr=${cfg.host}:${toString cfg.port} \
|
||||
'' + lib.optionalString (cfg.socket != null) ''
|
||||
--socket=${cfg.socket} \
|
||||
'' + lib.optionalString (cfg.userDataDir != null) ''
|
||||
--user-data-dir=${cfg.userDataDir} \
|
||||
'' + lib.optionalString (cfg.extensionsDir != null) ''
|
||||
--extensions-dir=${cfg.extensionsDir} \
|
||||
'' + lib.optionalString (cfg.disableTelemetry == true) ''
|
||||
--disable-telemetry \
|
||||
'' + lib.optionalString (cfg.disableUpdateCheck == true) ''
|
||||
--disable-update-check \
|
||||
'' + lib.optionalString (cfg.disableFileDownloads == true) ''
|
||||
--disable-file-downloads \
|
||||
'' + lib.optionalString (cfg.disableWorkspaceTrust == true) ''
|
||||
--disable-workspace-trust \
|
||||
'' + lib.optionalString (cfg.disableGettingStartedOverride == true) ''
|
||||
--disable-getting-started-override \
|
||||
'' + lib.escapeShellArgs cfg.extraArguments;
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
RuntimeDirectory = cfg.user;
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
Restart = "on-failure";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
users.users."${cfg.user}" = mkMerge [
|
||||
(mkIf (cfg.user == defaultUser) {
|
||||
users.users."${cfg.user}" = lib.mkMerge [
|
||||
(lib.mkIf (cfg.user == defaultUser) {
|
||||
isNormalUser = true;
|
||||
description = "code-server user";
|
||||
inherit (cfg) group;
|
||||
|
|
@ -131,9 +242,8 @@ in {
|
|||
}
|
||||
];
|
||||
|
||||
users.groups."${defaultGroup}" = mkIf (cfg.group == defaultGroup) { };
|
||||
|
||||
users.groups."${defaultGroup}" = lib.mkIf (cfg.group == defaultGroup) { };
|
||||
};
|
||||
|
||||
meta.maintainers = with maintainers; [ stackshadow ];
|
||||
meta.maintainers = [ lib.maintainers.stackshadow ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -171,6 +171,7 @@ in {
|
|||
cntr = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cntr.nix {};
|
||||
cockpit = handleTest ./cockpit.nix {};
|
||||
cockroachdb = handleTestOn ["x86_64-linux"] ./cockroachdb.nix {};
|
||||
code-server = handleTest ./code-server.nix {};
|
||||
coder = handleTest ./coder.nix {};
|
||||
collectd = handleTest ./collectd.nix {};
|
||||
connman = handleTest ./connman.nix {};
|
||||
|
|
|
|||
22
nixos/tests/code-server.nix
Normal file
22
nixos/tests/code-server.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
import ./make-test-python.nix ({pkgs, lib, ...}:
|
||||
{
|
||||
name = "code-server";
|
||||
|
||||
nodes = {
|
||||
machine = {pkgs, ...}: {
|
||||
services.code-server = {
|
||||
enable = true;
|
||||
auth = "none";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
machine.wait_for_unit("code-server.service")
|
||||
machine.wait_for_open_port(4444)
|
||||
machine.succeed("curl -k --fail http://localhost:4444", timeout=10)
|
||||
'';
|
||||
|
||||
meta.maintainers = [ lib.maintainers.drupol ];
|
||||
})
|
||||
51
pkgs/applications/audio/noson/default.nix
Normal file
51
pkgs/applications/audio/noson/default.nix
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, flac
|
||||
, libpulseaudio
|
||||
, qtbase
|
||||
, qtgraphicaleffects
|
||||
, qtquickcontrols2
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "noson";
|
||||
version = "5.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janbar";
|
||||
repo = "noson-app";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-7RrBfkUCRVzUGl+OT3OuoMlu4D3Sa7RpBefFgmfX1Fs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
flac
|
||||
libpulseaudio
|
||||
qtbase
|
||||
qtgraphicaleffects
|
||||
qtquickcontrols2
|
||||
];
|
||||
|
||||
# wrapQtAppsHook doesn't automatically find noson-gui
|
||||
dontWrapQtApps = true;
|
||||
preFixup = ''
|
||||
wrapQtApp "$out/lib/noson/noson-gui"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "SONOS controller for Linux (and macOS)";
|
||||
homepage = "https://janbar.github.io/noson-app/";
|
||||
mainProgram = "noson-app";
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
license = [ licenses.gpl3Only ];
|
||||
maintainers = with maintainers; [ callahad ];
|
||||
};
|
||||
})
|
||||
|
|
@ -416,6 +416,22 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
ban.spellright = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "ban";
|
||||
name = "spellright";
|
||||
version = "3.0.112";
|
||||
sha256 = "sha256-79Yg4I0OkfG7PaDYnTA8HK8jrSxre4FGriq0Baiq7wA=";
|
||||
};
|
||||
meta = {
|
||||
description = "A Visual Studio Code extension for Spellchecker";
|
||||
changelog = "https://marketplace.visualstudio.com/items/ban.spellright/changelog";
|
||||
homepage = "https://github.com/bartosz-antosik/vscode-spellright";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ onedragon ];
|
||||
};
|
||||
};
|
||||
|
||||
bbenoist.nix = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "Nix";
|
||||
|
|
@ -673,6 +689,30 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
w88975.code-translate = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "code-translate";
|
||||
publisher = "w88975";
|
||||
version = "1.0.20";
|
||||
sha256 = "sha256-blqLK7S+RmEoyr9zktS5/SNC0GeSXnNpbhltyajoAfw=";
|
||||
};
|
||||
meta = {
|
||||
description = "A Visual Studio Code extension to provide purely hover translation";
|
||||
longDescription = ''
|
||||
Code Translate is a purely hover translation extension
|
||||
- Non-intrusive display of translation results: perfectly integrated with VS Code code analysis.
|
||||
- Powerful word splitting capabilities: supports various forms of word splitting such as camel case and underscore.
|
||||
- Rich local vocabulary: includes 3.4+ million offline words, supporting various rare words.
|
||||
- Based on a rich local vocabulary: Code Translate has super-fast query speed, with each word typically queried in less than 10ms.
|
||||
- Multi-platform support: supports both the desktop version and online version of VS Code, and the plugin can be used on both versions.
|
||||
'';
|
||||
homepage = "https://github.com/w88975/code-translate-vscode";
|
||||
changelog = "https://marketplace.visualstudio.com/items/w88975.code-translate/changelog";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ onedragon ];
|
||||
};
|
||||
};
|
||||
|
||||
colejcummins.llvm-syntax-highlighting = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "llvm-syntax-highlighting";
|
||||
|
|
@ -1176,6 +1216,22 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
ExiaHuang.dictionary = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "ExiaHuang";
|
||||
name = "dictionary";
|
||||
version = "0.0.2";
|
||||
sha256 = "sha256-caNcbDTB/F2mdlGpfIfJv13lzY5Wwj7p7r8dAte9+3A=";
|
||||
};
|
||||
meta = {
|
||||
description = "A Visual Studio Code extension of using chinese-english dictonary in right-click menu";
|
||||
homepage = "https://github.com/exiahuang/fanyi-vscode";
|
||||
changelog = "https://marketplace.visualstudio.com/items/ExiaHuang.dictionary/changelog";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ onedragon ];
|
||||
};
|
||||
};
|
||||
|
||||
file-icons.file-icons = buildVscodeMarketplaceExtension {
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/file-icons.file-icons/changelog";
|
||||
|
|
@ -1303,6 +1359,23 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
funkyremi.vscode-google-translate = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "funkyremi";
|
||||
name = "vscode-google-translate";
|
||||
version = "1.4.13";
|
||||
sha256 = "sha256-9Vo6lwqD1eE3zY0Gi9ME/6lPwmwuJ3Iq9StHPvncnM4=";
|
||||
};
|
||||
meta = {
|
||||
description = "A Visual Studio Code extension using google translation to helping you quickly translate text right in your code rocket";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=funkyremi.vscode-google-translate";
|
||||
homepage = "https://github.com/funkyremi/vscode-google-translate.git";
|
||||
changelog = "https://marketplace.visualstudio.com/items/funkyremi.vscode-google-translate/changelog";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ onedragon ];
|
||||
};
|
||||
};
|
||||
|
||||
gencer.html-slim-scss-css-class-completion = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "html-slim-scss-css-class-completion";
|
||||
|
|
@ -1577,6 +1650,26 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
intellsmi.comment-translate = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "intellsmi";
|
||||
name = "comment-translate";
|
||||
version = "2.2.4";
|
||||
sha256 = "sha256-g6mlScxv8opZuqgWtTJ3k0Yo7W7WzIkwB+8lWf6cMiU=";
|
||||
};
|
||||
meta = {
|
||||
description = "A Visual Studio Code extension to translate the comments for computer language";
|
||||
longDescription = ''
|
||||
This plugin uses the Google Translate API to translate comments for the VSCode programming language.
|
||||
'';
|
||||
homepage = "https://github.com/intellism/vscode-comment-translate/blob/HEAD/doc/README.md";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=intellsmi.comment-translate";
|
||||
changelog = "https://marketplace.visualstudio.com/items/intellsmi.comment-translate/changelog";
|
||||
maintainers = with lib.maintainers; [ onedragon ];
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
ionide.ionide-fsharp = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "Ionide-fsharp";
|
||||
|
|
@ -2546,6 +2639,27 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
RoweWilsonFrederiskHolme.wikitext = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "wikitext";
|
||||
publisher = "RoweWilsonFrederiskHolme";
|
||||
version = "3.8.0";
|
||||
sha256 = "30540a85163e797028eec9bc3db1866bbf473e98615bf6ade6d1d672017ebe52";
|
||||
};
|
||||
meta = {
|
||||
description = "Extension that helps users view and write MediaWiki's Wikitext files";
|
||||
longDescription = ''
|
||||
With this extension, you can more easily discover your grammatical problems
|
||||
through the marked and styled text. The plugin is based on MediaWiki's
|
||||
Wikitext standard, but the rules are somewhat stricter, which helps users
|
||||
write text that is easier to read and maintain.
|
||||
'';
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=RoweWilsonFrederiskHolme.wikitext";
|
||||
homepage = "https://github.com/Frederisk/Wikitext-VSCode-Extension";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
};
|
||||
|
||||
rubbersheep.gi = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "gi";
|
||||
|
|
@ -2879,6 +2993,23 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
tailscale.vscode-tailscale = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-tailscale";
|
||||
publisher = "tailscale";
|
||||
version = "0.4.0";
|
||||
sha256 = "sha256-c/BZHKHs2EKd37148dSxEeP1wBXv75HhDqzegmHPjOs=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/tailscale.vscode-tailscale/changelog";
|
||||
description = "VSCode extension to share a port over the internet with Tailscale Funnel";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=Tailscale.vscode-tailscale";
|
||||
homepage = "https://github.com/tailscale-dev/vscode-tailscale";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.drupol ];
|
||||
};
|
||||
};
|
||||
|
||||
takayama.vscode-qq = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "takayama";
|
||||
|
|
@ -3315,6 +3446,27 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
yzhang.dictionary-completion = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "yzhang";
|
||||
name = "dictionary-completion";
|
||||
version = "1.2.2";
|
||||
sha256 = "sha256-dpJcJARRKzRNHfXs/qknud8OQ8xIyeaVnt/EcDq0k4E=";
|
||||
};
|
||||
meta = {
|
||||
description = "A Visual Studio Code extension to help user easyly finish long words ";
|
||||
longDescription = ''
|
||||
Dictionary completion allows user to get a list of keywords, based off of the current word at the cursor.
|
||||
This is useful if you are typing a long word (e.g. acknowledgeable) and don't want to finish typing or don't remember the Spelling
|
||||
'';
|
||||
homepage = "https://github.com/yzhang-gh/vscode-dic-completion#readme";
|
||||
changelog = "https://marketplace.visualstudio.com/items/yzhang.dictionary-completion/changelog";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=yzhang.dictionary-completion";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ onedragon ];
|
||||
};
|
||||
};
|
||||
|
||||
yzhang.markdown-all-in-one = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "markdown-all-in-one";
|
||||
|
|
|
|||
|
|
@ -6,24 +6,33 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grass";
|
||||
version = "8.2.0";
|
||||
version = "8.2.1";
|
||||
|
||||
src = with lib; fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "grass";
|
||||
rev = version;
|
||||
sha256 = "sha256-VK9FCqIwHGmeJe5lk12lpAGcsC1aPRBiI+XjACXjDd4=";
|
||||
hash = "sha256-U3PQd3u9i+9Bc7BSd0gK8Ss+iV9BT1xLBDrKydtl3Qk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config bison flex makeWrapper wrapGAppsHook
|
||||
gdal geos libmysqlclient netcdf pdal
|
||||
gdal # for `gdal-config`
|
||||
geos # for `geos-config`
|
||||
netcdf # for `nc-config`
|
||||
libmysqlclient # for `mysql_config`
|
||||
pdal # for `pdal-config`; remove with next version, see https://github.com/OSGeo/grass/pull/2851
|
||||
] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_2 ]);
|
||||
|
||||
buildInputs = [
|
||||
cairo zlib proj libtiff libpng fftw sqlite
|
||||
readline ffmpeg postgresql blas wxGTK32
|
||||
proj-datumgrid zstd
|
||||
gdal
|
||||
geos
|
||||
netcdf
|
||||
libmysqlclient
|
||||
pdal
|
||||
] ++ lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gerrit";
|
||||
version = "3.7.2";
|
||||
version = "3.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
|
||||
sha256 = "sha256-XB5bplYpid2vxSjm1DCGYsd3d5kUk8PlnhFdCAORX6k=";
|
||||
sha256 = "sha256-wial+K5eUZSJ+asFBLrFoJQOLWLHkl5ot4b4CIsg7Tc=";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
|
|
|
|||
|
|
@ -12,8 +12,10 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-lkjsxGMXOrnu4cUiV/TO7yzd9FzM297MhaFKauqmiHo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libX11 libXinerama libXrandr libXft bison ];
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config bison ];
|
||||
buildInputs = [ libX11 libXinerama libXrandr libXft ];
|
||||
|
||||
prePatch = ''sed -i "s@/usr/local@$out@" Makefile'';
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "spleen";
|
||||
version = "1.9.3";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
|
||||
hash = "sha256-t60e2wKl3a0RfKlPAm64RQtRUE0ugbw6A4deEtTnayU=";
|
||||
hash = "sha256-d4d4s13UhwG4A9skemrIdZFUzl/Dq9XMC225ikS6Wgw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ xorg.mkfontscale ];
|
||||
|
|
|
|||
|
|
@ -4,16 +4,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unifont";
|
||||
version = "15.0.02";
|
||||
version = "15.0.04";
|
||||
|
||||
ttf = fetchurl {
|
||||
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf";
|
||||
hash = "sha256-DvWkQo+ZYWwoCCA69iyDmQtS/Qxwg7b2spLPqiSauL4=";
|
||||
hash = "sha256-kkSbEvWBrvcnBgHDdKJjpSYF6BJDEwmYSxVQbPkQ6so=";
|
||||
};
|
||||
|
||||
pcf = fetchurl {
|
||||
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz";
|
||||
hash = "sha256-01yEB9We5MkeCF6uva0SDTpt+4Ln2TaNh6jkCS66PUE=";
|
||||
hash = "sha256-rdzJuOkXYojgm5VfpshtJuCJYM0/iS+HnWMXEDsLQPg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "unifont_upper";
|
||||
version = "15.0.02";
|
||||
version = "15.0.04";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.ttf";
|
||||
hash = "sha256-Ikd2VotAvktUd083vzZZFLzmXtZi4EGYRJ9eKP4yveE=";
|
||||
hash = "sha256-7iRcyKfGpv2rjVLPRNchxpXwj0KA5jlgDnCfG7byLLI=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bulky";
|
||||
version = "2.7";
|
||||
version = "2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "bulky";
|
||||
rev = version;
|
||||
hash = "sha256-Ps7ql6EAdoljQ6S8D2JxNSh0+jtEVZpnQv3fpvWkQSk=";
|
||||
hash = "sha256-DZjX4xPyA30TTyOX+VyGSY/FWPX2316CYImDWRma9r0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "babashka";
|
||||
version = "1.3.179";
|
||||
version = "1.3.180";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
|
||||
sha256 = "sha256-tF+SqKY7tcJvmOATVwKIZemR2A3eqrbhvSBvr7tcq5U=";
|
||||
sha256 = "sha256-moNFb5jHTK2XJHx9BAeD+BUH4Y6NyypDM0MycqE5Zwk=";
|
||||
};
|
||||
|
||||
graalvmDrv = graalvmCEPackages.graalvm19-ce;
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ mapAliases {
|
|||
"@githubnext/github-copilot-cli" = pkgs.github-copilot-cli; # Added 2023-05-02
|
||||
"@google/clasp" = pkgs.google-clasp; # Added 2023-05-07
|
||||
"@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06
|
||||
eslint_d = pkgs.eslint_d; # Added 2023-05-26
|
||||
manta = pkgs.node-manta; # Added 2023-05-06
|
||||
thelounge = pkgs.thelounge; # Added 2023-05-22
|
||||
triton = pkgs.triton; # Added 2023-05-06
|
||||
|
|
|
|||
|
|
@ -132,7 +132,6 @@
|
|||
, "emojione"
|
||||
, "escape-string-regexp"
|
||||
, "eslint"
|
||||
, "eslint_d"
|
||||
, "esy"
|
||||
, "expo-cli"
|
||||
, "fast-cli"
|
||||
|
|
|
|||
122
pkgs/development/node-packages/node-packages.nix
generated
122
pkgs/development/node-packages/node-packages.nix
generated
|
|
@ -103337,128 +103337,6 @@ in
|
|||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
eslint_d = nodeEnv.buildNodePackage {
|
||||
name = "eslint_d";
|
||||
packageName = "eslint_d";
|
||||
version = "12.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/eslint_d/-/eslint_d-12.2.1.tgz";
|
||||
sha512 = "qOJ9cTi5AaH5bOgEoCkv41DJ637mHgzffbOLojwU4wadwC6qbR+OxVJRvVzH0v2XYmQOvw4eiJK7ivrr5SvzsA==";
|
||||
};
|
||||
dependencies = [
|
||||
sources."@eslint-community/eslint-utils-4.4.0"
|
||||
sources."@eslint-community/regexpp-4.5.1"
|
||||
sources."@eslint/eslintrc-2.0.3"
|
||||
sources."@eslint/js-8.41.0"
|
||||
sources."@humanwhocodes/config-array-0.11.8"
|
||||
sources."@humanwhocodes/module-importer-1.0.1"
|
||||
sources."@humanwhocodes/object-schema-1.2.1"
|
||||
sources."@nodelib/fs.scandir-2.1.5"
|
||||
sources."@nodelib/fs.stat-2.0.5"
|
||||
sources."@nodelib/fs.walk-1.2.8"
|
||||
sources."acorn-8.8.2"
|
||||
sources."acorn-jsx-5.3.2"
|
||||
sources."ajv-6.12.6"
|
||||
sources."ansi-regex-5.0.1"
|
||||
sources."ansi-styles-4.3.0"
|
||||
sources."argparse-2.0.1"
|
||||
sources."balanced-match-1.0.2"
|
||||
sources."brace-expansion-1.1.11"
|
||||
sources."callsites-3.1.0"
|
||||
(sources."chalk-4.1.2" // {
|
||||
dependencies = [
|
||||
sources."supports-color-7.2.0"
|
||||
];
|
||||
})
|
||||
sources."color-convert-2.0.1"
|
||||
sources."color-name-1.1.4"
|
||||
sources."concat-map-0.0.1"
|
||||
sources."core_d-5.0.1"
|
||||
sources."cross-spawn-7.0.3"
|
||||
sources."debug-4.3.4"
|
||||
sources."deep-is-0.1.4"
|
||||
sources."doctrine-3.0.0"
|
||||
sources."escape-string-regexp-4.0.0"
|
||||
sources."eslint-8.41.0"
|
||||
sources."eslint-scope-7.2.0"
|
||||
sources."eslint-visitor-keys-3.4.1"
|
||||
sources."espree-9.5.2"
|
||||
sources."esquery-1.5.0"
|
||||
sources."esrecurse-4.3.0"
|
||||
sources."estraverse-5.3.0"
|
||||
sources."esutils-2.0.3"
|
||||
sources."fast-deep-equal-3.1.3"
|
||||
sources."fast-json-stable-stringify-2.1.0"
|
||||
sources."fast-levenshtein-2.0.6"
|
||||
sources."fastq-1.15.0"
|
||||
sources."file-entry-cache-6.0.1"
|
||||
sources."find-up-5.0.0"
|
||||
sources."flat-cache-3.0.4"
|
||||
sources."flatted-3.2.7"
|
||||
sources."fs.realpath-1.0.0"
|
||||
sources."glob-7.2.3"
|
||||
sources."glob-parent-6.0.2"
|
||||
sources."globals-13.20.0"
|
||||
sources."graphemer-1.4.0"
|
||||
sources."has-flag-4.0.0"
|
||||
sources."ignore-5.2.4"
|
||||
sources."import-fresh-3.3.0"
|
||||
sources."imurmurhash-0.1.4"
|
||||
sources."inflight-1.0.6"
|
||||
sources."inherits-2.0.4"
|
||||
sources."is-extglob-2.1.1"
|
||||
sources."is-glob-4.0.3"
|
||||
sources."is-path-inside-3.0.3"
|
||||
sources."isexe-2.0.0"
|
||||
sources."js-yaml-4.1.0"
|
||||
sources."json-schema-traverse-0.4.1"
|
||||
sources."json-stable-stringify-without-jsonify-1.0.1"
|
||||
sources."levn-0.4.1"
|
||||
sources."locate-path-6.0.0"
|
||||
sources."lodash.merge-4.6.2"
|
||||
sources."minimatch-3.1.2"
|
||||
sources."ms-2.1.2"
|
||||
sources."nanolru-1.0.0"
|
||||
sources."natural-compare-1.4.0"
|
||||
sources."once-1.4.0"
|
||||
sources."optionator-0.9.1"
|
||||
sources."p-limit-3.1.0"
|
||||
sources."p-locate-5.0.0"
|
||||
sources."parent-module-1.0.1"
|
||||
sources."path-exists-4.0.0"
|
||||
sources."path-is-absolute-1.0.1"
|
||||
sources."path-key-3.1.1"
|
||||
sources."prelude-ls-1.2.1"
|
||||
sources."punycode-2.3.0"
|
||||
sources."queue-microtask-1.2.3"
|
||||
sources."resolve-from-4.0.0"
|
||||
sources."reusify-1.0.4"
|
||||
sources."rimraf-3.0.2"
|
||||
sources."run-parallel-1.2.0"
|
||||
sources."shebang-command-2.0.0"
|
||||
sources."shebang-regex-3.0.0"
|
||||
sources."strip-ansi-6.0.1"
|
||||
sources."strip-json-comments-3.1.1"
|
||||
sources."supports-color-8.1.1"
|
||||
sources."text-table-0.2.0"
|
||||
sources."type-check-0.4.0"
|
||||
sources."type-fest-0.20.2"
|
||||
sources."uri-js-4.4.1"
|
||||
sources."which-2.0.2"
|
||||
sources."word-wrap-1.2.3"
|
||||
sources."wrappy-1.0.2"
|
||||
sources."yocto-queue-0.1.0"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "Makes eslint the fastest linter on the planet";
|
||||
homepage = "https://github.com/mantoni/eslint_d.js";
|
||||
license = "MIT";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
esy = nodeEnv.buildNodePackage {
|
||||
name = "esy";
|
||||
packageName = "esy";
|
||||
|
|
|
|||
113
pkgs/development/php-packages/relay/default.nix
Normal file
113
pkgs/development/php-packages/relay/default.nix
Normal file
|
|
@ -0,0 +1,113 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, php
|
||||
, openssl
|
||||
, openssl_1_1
|
||||
, zstd
|
||||
, lz4
|
||||
, autoPatchelfHook
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.6.3";
|
||||
system = stdenv.hostPlatform.system;
|
||||
phpVersion = lib.versions.majorMinor php.version;
|
||||
variation = {
|
||||
"aarch64-darwin" = {
|
||||
platform = "darwin-arm64";
|
||||
hashes = {
|
||||
"8.0" = "00a7pyf9na7hjifkmp2482c7sh086w72zniqgr4cz2rhz7hnqp7p";
|
||||
"8.1" = "0mg6nsllycgjxxinn8s30y9sk06g40vk8blnpx0askjw5zdsf5y7";
|
||||
"8.2" = "0qmcbrj6jaxczv25rdgfjrj9nwq4vb2faw7kzlyxrvvzb5pyn9dm";
|
||||
"8.3" = "1hqjy5y4q3alxvrj7xksaf7vvmz8p51bgzxbvmzdx6jnl63dix33";
|
||||
};
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
platform = "debian-aarch64+libssl3";
|
||||
hashes = {
|
||||
"8.0" = "19zzw4324z096b6bph1686r30i4i2kwmlmmcqmb33lqkr9b9n5ag";
|
||||
"8.1" = "0j6wpwy8d67pqij4v8m2xwydfddzr7nn4c3lyrssp8llbn4ghwpn";
|
||||
"8.2" = "1nbajvi5zk6z8qr32l86p65f1zxv12kald56pg8k7bj4axlj2pmy";
|
||||
"8.3" = "1sn638g2636m6s3lv2cclza9lzmzgqxamcga7jz3ijhn2ja6znbv";
|
||||
};
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
platform = "darwin-x86-64";
|
||||
hashes = {
|
||||
"8.0" = "13q6va9lxgfyx86xw20iqjz4s9r9xms74ywb2hgqrhs5mjnazzz4";
|
||||
"8.1" = "1ncih5bf0jcylpl0nj8hi50kcwb4nl1g0ql359dgg9gp8s1b4hmw";
|
||||
"8.2" = "150difm3vg0g2pl5hb5cci4jzybd7jcd7prjdv3rmwsi91gsydlv";
|
||||
# 8.3 for this platform does not exist
|
||||
};
|
||||
};
|
||||
"x86_64-linux" = {
|
||||
platform = "debian-x86-64+libssl3";
|
||||
hashes = {
|
||||
"8.0" = "1qvd5r591kp7qf9pkymz78s8llzs1vxjwqhwy9rvma21hh6gd8ld";
|
||||
"8.1" = "0fm9ppgx7qaggid134qnl9jkq5h97dac2ax21f1f1d0k8f5blmc2";
|
||||
"8.2" = "0g2yqwfrigf047dqkrvfcj318lvgp38zy522ry484mrgq7iqwvb8";
|
||||
"8.3" = "06mi3yr7k1a9icdljzl76xvrw6xqnvwiavgzx2g487s097mycjp4";
|
||||
};
|
||||
};
|
||||
}.${system} or (throw "Unsupported platform for relay: ${system}");
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
inherit version;
|
||||
pname = "relay";
|
||||
extensionName = "relay";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://builds.r2.relay.so/v${finalAttrs.version}/relay-v${finalAttrs.version}-php"
|
||||
+ phpVersion + "-" + variation.platform + ".tar.gz";
|
||||
sha256 = variation.hashes.${phpVersion} or (throw "Unsupported PHP version for relay ${phpVersion} on ${system}");
|
||||
};
|
||||
nativeBuildInputs = lib.optionals (!stdenv.isDarwin) [
|
||||
autoPatchelfHook
|
||||
];
|
||||
buildInputs = lib.optionals (!stdenv.isDarwin) [
|
||||
openssl
|
||||
zstd
|
||||
lz4
|
||||
];
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib/php/extensions
|
||||
cp relay-pkg.so $out/lib/php/extensions/relay.so
|
||||
chmod +w $out/lib/php/extensions/relay.so
|
||||
'' + (if stdenv.isDarwin then
|
||||
let
|
||||
args = lib.strings.concatMapStrings
|
||||
(v: " -change /Users/administrator/dev/relay-dev/relay-deps/build/arm64/lib/${v.name}"
|
||||
+ " ${lib.strings.makeLibraryPath [ v.value ]}/${v.name}")
|
||||
(with lib.attrsets; [
|
||||
(nameValuePair "libssl.1.1.dylib" openssl_1_1)
|
||||
(nameValuePair "libcrypto.1.1.dylib" openssl_1_1)
|
||||
(nameValuePair "libzstd.1.dylib" zstd)
|
||||
(nameValuePair "liblz4.1.dylib" lz4)
|
||||
]);
|
||||
in
|
||||
# fixDarwinDylibNames can't be used here because we need to completely remap .dylibs, not just add absolute paths
|
||||
''
|
||||
install_name_tool${args} $out/lib/php/extensions/relay.so
|
||||
''
|
||||
else
|
||||
"") + ''
|
||||
# Random UUID that's required by the extension. Can be anything, but must be different from default.
|
||||
sed -i "s/00000000-0000-0000-0000-000000000000/aced680f-30e9-40cc-a868-390ead14ba0c/" $out/lib/php/extensions/relay.so
|
||||
chmod -w $out/lib/php/extensions/relay.so
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Next-generation Redis extension for PHP";
|
||||
changelog = "https://github.com/cachewerk/relay/releases/tag/v${version}";
|
||||
homepage = "https://relay.so/";
|
||||
sourceProvenance = [ sourceTypes.binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ tillkruss ostrolucky ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
};
|
||||
})
|
||||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "awkward-cpp";
|
||||
version = "9";
|
||||
version = "15";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2xyRwh+IuJo5tGF27cZ6CLN/coPBai7VFZ48h0YTxho=";
|
||||
sha256 = "f6c825db2db981f852903d9574a07015c5d53ef8e4630772f18c7f167045aa0d";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "awkward";
|
||||
version = "2.0.8";
|
||||
version = "2.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-MqV8KeE6KuO8HmrFNjeCW70ixChmlhY71Bod7ChKjuU=";
|
||||
sha256 = "653e5b69f1c8e32d1d59445a8414d03f850d327eb933f45aad163f0778861dc2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,13 +1,25 @@
|
|||
{ lib
|
||||
, asn1crypto
|
||||
, buildPythonPackage
|
||||
, dnspython
|
||||
, dsinternals
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, impacket
|
||||
, ldap3
|
||||
, pyasn1
|
||||
, pycryptodome
|
||||
, pyopenssl
|
||||
, pythonOlder
|
||||
, requests_ntlm
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "certipy";
|
||||
buildPythonPackage rec {
|
||||
pname = "certipy-ad";
|
||||
version = "4.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ly4k";
|
||||
repo = "Certipy";
|
||||
|
|
@ -21,11 +33,12 @@ python3.pkgs.buildPythonApplication rec {
|
|||
--replace "pyasn1==0.4.8" "pyasn1"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
propagatedBuildInputs = [
|
||||
asn1crypto
|
||||
dnspython
|
||||
dsinternals
|
||||
impacket
|
||||
pyopenssl
|
||||
ldap3
|
||||
pyasn1
|
||||
pycryptodome
|
||||
|
|
@ -40,7 +53,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to enumerate and abuse misconfigurations in Active Directory Certificate Services";
|
||||
description = "Library and CLI tool to enumerate and abuse misconfigurations in Active Directory Certificate Services";
|
||||
homepage = "https://github.com/ly4k/Certipy";
|
||||
changelog = "https://github.com/ly4k/Certipy/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
|
|
@ -9,8 +9,6 @@
|
|||
, setuptools-rust
|
||||
, openssl
|
||||
, Security
|
||||
, packaging
|
||||
, six
|
||||
, isPyPy
|
||||
, cffi
|
||||
, pkg-config
|
||||
|
|
|
|||
|
|
@ -9,14 +9,11 @@
|
|||
# build-system
|
||||
, pkg-config
|
||||
, pybind11
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
|
||||
# native libraries
|
||||
, ffmpeg-headless
|
||||
, fontconfig
|
||||
, freetype
|
||||
, imagemagick
|
||||
, qhull
|
||||
|
||||
# propagates
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, python
|
||||
, buildPythonPackage
|
||||
, gfortran
|
||||
|
|
|
|||
|
|
@ -8,11 +8,6 @@
|
|||
, numpy
|
||||
, python-dateutil
|
||||
, pytz
|
||||
, scipy
|
||||
, sqlalchemy
|
||||
, tables
|
||||
, xlrd
|
||||
, xlwt
|
||||
# Test inputs
|
||||
, glibcLocales
|
||||
, hypothesis
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "spacy-transformers";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-oNdH0oZNo8XWx+bbzwZs7iXD0Af6zx1k6wBYksgtp4w=";
|
||||
hash = "sha256-hZwgk/rZ/0EAW8VcABjUKQvdYkVPdr3bzzGKroXzB7U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zha-quirks";
|
||||
version = "0.0.99";
|
||||
version = "0.0.100";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "zigpy";
|
||||
repo = "zha-device-handlers";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-09heRXlaqc+qbQj+LKodu6Pq1pgQ5eVZbihOMeO5EWU=";
|
||||
hash = "sha256-EWGsnUnr83YuhEdGJ3YtlYm9VT+aTuUjfganhOeqt7o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
24
pkgs/development/tools/eslint_d/default.nix
Normal file
24
pkgs/development/tools/eslint_d/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ lib, buildNpmPackage, fetchFromGitHub }:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "eslint_d";
|
||||
version = "12.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mantoni";
|
||||
repo = "eslint_d.js";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rups2y07Y3GkvGt/T9lPG0NUoCxddp/P9PAYczZYNIw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-enHppjkX1syANgFmfAX+LlISyN5ltADjojjrvukAI+I=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Makes eslint the fastest linter on the planet";
|
||||
homepage = "github.com/mantoni/eslint_d.js";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.ehllie ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,12 +7,12 @@ let
|
|||
self = stdenv.mkDerivation rec {
|
||||
outputs = [ "out" "icons" ];
|
||||
pname = "alephone";
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = let date = "20230119";
|
||||
url = let date = "20230529";
|
||||
in "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${date}/AlephOne-${date}.tar.bz2";
|
||||
sha256 = "sha256-rC9RfWUolsKjKGsJaGj0PaO+J4HNF/gQhd56XapcMCY=";
|
||||
sha256 = "sha256-UqhZvOMOxU4W0eLRRTQvGXaqTpWD5KIdXULClHW7Iyc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config icoutils ];
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unciv";
|
||||
version = "4.6.14-patch1";
|
||||
version = "4.6.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
|
||||
hash = "sha256-CVwME8lvRjJ0ugps0lcO8FRk8AsFYs8w0oGNAB9TCnM=";
|
||||
hash = "sha256-69JEf5dG3Nf4CLT8eKfeo/8givyyxb9QpQSAZ2dG7TI=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-compute-runtime";
|
||||
version = "23.13.26032.30";
|
||||
version = "23.17.26241.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "compute-runtime";
|
||||
rev = version;
|
||||
sha256 = "sha256-KaU+11lY/chCySao1vLOejDJ9i4yjYWxaz0pzd8lWNY=";
|
||||
sha256 = "sha256-A0gtSM6e+VcfcGG/6zReV2LIXq6tGbWIwDQFlQ2TW28=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper
|
||||
, cacert, moreutils, jq, git, rsync, pkg-config, yarn, python3
|
||||
, esbuild, nodejs_16, node-gyp, libsecret, xorg, ripgrep
|
||||
, AppKit, Cocoa, CoreServices, Security, cctools, xcbuild, quilt }:
|
||||
, AppKit, Cocoa, CoreServices, Security, cctools, xcbuild, quilt, nixosTests }:
|
||||
|
||||
let
|
||||
system = stdenv.hostPlatform.system;
|
||||
|
|
@ -243,6 +243,9 @@ in stdenv.mkDerivation rec {
|
|||
prefetchYarnCache = lib.overrideDerivation yarnCache (d: {
|
||||
outputHash = lib.fakeSha256;
|
||||
});
|
||||
tests = {
|
||||
inherit (nixosTests) code-server;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -107,6 +107,9 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
# set offline mirror to yarn cache we created in previous steps
|
||||
yarn --offline config set yarn-offline-mirror "${yarnCache}"
|
||||
|
||||
# set nodedir, so we can build binaries later
|
||||
npm config set nodedir "${nodejs}"
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
|
|
@ -143,7 +146,7 @@ in stdenv.mkDerivation rec {
|
|||
# rebuild binaries, we use npm here, as yarn does not provide an alternative
|
||||
# that would not attempt to try to reinstall everything and break our
|
||||
# patching attempts
|
||||
npm --prefix ./remote rebuild --build-from-source --nodedir ${nodejs}
|
||||
npm --prefix ./remote rebuild --build-from-source
|
||||
|
||||
# run postinstall scripts after patching
|
||||
find . -path "*node_modules" -prune -o \
|
||||
|
|
|
|||
474
pkgs/servers/search/qdrant/Cargo.lock
generated
474
pkgs/servers/search/qdrant/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -11,20 +11,20 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "qdrant";
|
||||
version = "1.1.3";
|
||||
version = "1.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qdrant";
|
||||
repo = "qdrant";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-CGGJLyhhwQvW9AIzA7Fg85CvPbnuyELR+mmhoc4hJtk=";
|
||||
sha256 = "sha256-1UJZibj7twM/4z9w+ebOI0AVjPZGz7B1BWw0M0pMQ+k=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"quantization-0.1.0" = "sha256-4TY08ScRbL4zVG428BTZu42ocAsPk/8wM+zzI8EFSrs=";
|
||||
"wal-0.1.2" = "sha256-EfCvwgHMfyiId8VjV+yFyNqoIv6fxF8UFcw1s46hF5k=";
|
||||
"quantization-0.1.0" = "sha256-mhiVicQXj8639bX2mGp9XnjTNVFdd6mnk+B1B1f3ywA=";
|
||||
"wal-0.1.2" = "sha256-oZ6xij59eIpCGcFL2Ds6E180l1SGIRMOq7OcLc1TpxY=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,23 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, freeglut, glew, libGL, libGLU, libX11, libXext, mesa
|
||||
, meson, ninja, pkg-config, wayland, wayland-protocols
|
||||
, vulkan-loader, libxkbcommon, libdecor, glslang }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, freeglut
|
||||
, libGL
|
||||
, libGLU
|
||||
, libX11
|
||||
, libXext
|
||||
, mesa
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wayland
|
||||
, wayland-scanner
|
||||
, wayland-protocols
|
||||
, vulkan-loader
|
||||
, libxkbcommon
|
||||
, libdecor
|
||||
, glslang
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mesa-demos";
|
||||
|
|
@ -12,11 +28,33 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-MEaj0mp7BRr3690lel8jv+sWDK1u2VIynN/x6fHtSWs=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
depsBuildBuild = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wayland-scanner
|
||||
glslang
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
freeglut glew libX11 libXext libGL libGLU mesa wayland
|
||||
wayland-protocols vulkan-loader libxkbcommon libdecor glslang
|
||||
] ++ lib.optional (mesa ? osmesa) mesa.osmesa ;
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland ];
|
||||
freeglut
|
||||
libX11
|
||||
libXext
|
||||
libGL
|
||||
libGLU
|
||||
mesa
|
||||
wayland
|
||||
wayland-protocols
|
||||
vulkan-loader
|
||||
libxkbcommon
|
||||
libdecor
|
||||
] ++ lib.optional (mesa ? osmesa) mesa.osmesa;
|
||||
|
||||
mesonFlags = [
|
||||
"-Degl=${if stdenv.isDarwin then "disabled" else "auto"}"
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja ];
|
||||
nativeBuildInputs = [ pkg-config meson ninja glib ];
|
||||
|
||||
buildInputs = [ curl dbus glib json-glib openssl util-linux libnl systemd ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, cmake
|
||||
, buildGo118Module
|
||||
, buildGoModule
|
||||
, makeWrapper
|
||||
, fetchFromGitHub
|
||||
, pythonPackages
|
||||
|
|
@ -35,7 +35,7 @@ let
|
|||
cmakeFlags = ["-DBUILD_DEMO=OFF" "-DDISABLE_PYTHON2=ON"];
|
||||
};
|
||||
|
||||
in buildGo118Module rec {
|
||||
in buildGoModule rec {
|
||||
pname = "datadog-agent";
|
||||
inherit src version;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "v2ray-core";
|
||||
version = "5.6.0";
|
||||
version = "5.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v2fly";
|
||||
repo = "v2ray-core";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4oaxZ+p12HRgA3OVoBYQb9czl+WSHSK1Cc+vYpeeUVM=";
|
||||
hash = "sha256-gdDV5Cd/DjEqSiOF7j5a8QLtdJiFeNCnHoA4XD+yiGA=";
|
||||
};
|
||||
|
||||
# `nix-update` doesn't support `vendorHash` yet.
|
||||
|
|
|
|||
|
|
@ -553,9 +553,7 @@ with pkgs;
|
|||
|
||||
efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { };
|
||||
|
||||
enumer = callPackage ../tools/misc/enumer {
|
||||
buildGoModule = buildGo119Module; # go 1.20 build failure
|
||||
};
|
||||
enumer = callPackage ../tools/misc/enumer { };
|
||||
|
||||
evans = callPackage ../development/tools/evans { };
|
||||
|
||||
|
|
@ -680,6 +678,8 @@ with pkgs;
|
|||
|
||||
erosmb = callPackage ../tools/security/erosmb { };
|
||||
|
||||
eslint_d = callPackage ../development/tools/eslint_d { };
|
||||
|
||||
oauth2c = callPackage ../tools/security/oauth2c { };
|
||||
|
||||
octosuite = callPackage ../tools/security/octosuite { };
|
||||
|
|
@ -1658,9 +1658,7 @@ with pkgs;
|
|||
|
||||
mnc = callPackage ../tools/misc/mnc { };
|
||||
|
||||
mgmt = callPackage ../applications/system/mgmt {
|
||||
buildGoModule = buildGo119Module; # go 1.20 build failure
|
||||
};
|
||||
mgmt = callPackage ../applications/system/mgmt { };
|
||||
|
||||
monica = callPackage ../servers/web-apps/monica { };
|
||||
|
||||
|
|
@ -3199,9 +3197,7 @@ with pkgs;
|
|||
|
||||
botamusique = callPackage ../tools/audio/botamusique { };
|
||||
|
||||
boulder = callPackage ../tools/admin/boulder {
|
||||
buildGoModule = buildGo119Module; # go 1.20 build failure
|
||||
};
|
||||
boulder = callPackage ../tools/admin/boulder { };
|
||||
|
||||
btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { };
|
||||
|
||||
|
|
@ -3228,7 +3224,7 @@ with pkgs;
|
|||
|
||||
certigo = callPackage ../tools/admin/certigo { };
|
||||
|
||||
certipy = callPackage ../tools/security/certipy { };
|
||||
certipy = with python3Packages; toPythonApplication certipy-ad;
|
||||
|
||||
catcli = python3Packages.callPackage ../tools/filesystems/catcli { };
|
||||
|
||||
|
|
@ -31389,6 +31385,8 @@ with pkgs;
|
|||
|
||||
mt32emu-smf2wav = callPackage ../applications/audio/munt/mt32emu-smf2wav.nix { };
|
||||
|
||||
noson = libsForQt5.callPackage ../applications/audio/noson { };
|
||||
|
||||
offpunk = callPackage ../applications/networking/browsers/offpunk { };
|
||||
|
||||
owl-compositor = callPackage ../applications/window-managers/owl { };
|
||||
|
|
@ -35136,7 +35134,7 @@ with pkgs;
|
|||
vscodium-fhsWithPackages = vscodium.fhsWithPackages;
|
||||
|
||||
openvscode-server = callPackage ../servers/openvscode-server {
|
||||
nodejs = nodejs_18;
|
||||
nodejs = nodejs_16;
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security;
|
||||
inherit (darwin) cctools;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -282,6 +282,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
|
||||
redis = callPackage ../development/php-packages/redis { };
|
||||
|
||||
relay = callPackage ../development/php-packages/relay { inherit php; };
|
||||
|
||||
smbclient = callPackage ../development/php-packages/smbclient { };
|
||||
|
||||
snuffleupagus = callPackage ../development/php-packages/snuffleupagus { };
|
||||
|
|
|
|||
|
|
@ -1719,6 +1719,8 @@ self: super: with self; {
|
|||
|
||||
certipy = callPackage ../development/python-modules/certipy { };
|
||||
|
||||
certipy-ad = callPackage ../development/python-modules/certipy-ad { };
|
||||
|
||||
certomancer = callPackage ../development/python-modules/certomancer { };
|
||||
|
||||
certvalidator = callPackage ../development/python-modules/certvalidator { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue