Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
e2801b1fcf
@ -30,13 +30,15 @@ let
|
||||
})
|
||||
({ options, ... }: {
|
||||
key = "nodes.nix-pkgs";
|
||||
config = mkIf (!options.nixpkgs.pkgs.isDefined) {
|
||||
# Ensure we do not use aliases. Ideally this is only set
|
||||
# when the test framework is used by Nixpkgs NixOS tests.
|
||||
nixpkgs.config.allowAliases = false;
|
||||
# TODO: switch to nixpkgs.hostPlatform and make sure containers-imperative test still evaluates.
|
||||
nixpkgs.system = hostPkgs.stdenv.hostPlatform.system;
|
||||
};
|
||||
config = optionalAttrs (!config.node.pkgsReadOnly) (
|
||||
mkIf (!options.nixpkgs.pkgs.isDefined) {
|
||||
# Ensure we do not use aliases. Ideally this is only set
|
||||
# when the test framework is used by Nixpkgs NixOS tests.
|
||||
nixpkgs.config.allowAliases = false;
|
||||
# TODO: switch to nixpkgs.hostPlatform and make sure containers-imperative test still evaluates.
|
||||
nixpkgs.system = hostPkgs.stdenv.hostPlatform.system;
|
||||
}
|
||||
);
|
||||
})
|
||||
testModuleArgs.config.extraBaseModules
|
||||
];
|
||||
|
||||
@ -154,5 +154,5 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ erictapen bbenno joscha ];
|
||||
meta.maintainers = with lib.maintainers; [ erictapen bbenno ];
|
||||
}
|
||||
|
||||
@ -192,7 +192,7 @@ in {
|
||||
# orangefs daemon will run as user
|
||||
users.users.orangefs = {
|
||||
isSystemUser = true;
|
||||
group = "orangfs";
|
||||
group = "orangefs";
|
||||
};
|
||||
users.groups.orangefs = {};
|
||||
|
||||
|
||||
@ -331,7 +331,6 @@ in {
|
||||
graylog = handleTest ./graylog.nix {};
|
||||
grocy = handleTest ./grocy.nix {};
|
||||
grub = handleTest ./grub.nix {};
|
||||
guacamole-client = handleTest ./guacamole-client.nix {};
|
||||
guacamole-server = handleTest ./guacamole-server.nix {};
|
||||
gvisor = handleTest ./gvisor.nix {};
|
||||
hadoop = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop; };
|
||||
|
||||
@ -14,8 +14,8 @@ import ./make-test-python.nix
|
||||
profiles.user.databases = [
|
||||
{
|
||||
settings = {
|
||||
"test/not/locked" = mkInt32 1;
|
||||
"test/is/locked" = "locked";
|
||||
"test/not".locked = mkInt32 1;
|
||||
"test/is".locked = "locked";
|
||||
};
|
||||
locks = [
|
||||
"/test/is/locked"
|
||||
|
||||
@ -28,7 +28,7 @@ import ./make-test-python.nix ({ pkgs, ... } : {
|
||||
};
|
||||
};
|
||||
boot.extraModulePackages =
|
||||
optional (versionOlder config.boot.kernelPackages.kernel.version "5.6")
|
||||
pkgs.lib.optional (pkgs.lib.versionOlder config.boot.kernelPackages.kernel.version "5.6")
|
||||
config.boot.kernelPackages.wireguard;
|
||||
boot.kernelModules = [ "wireguard" ];
|
||||
};
|
||||
|
||||
@ -8,7 +8,7 @@ in
|
||||
meta.maintainers = [ lib.maintainers.ratsclub ];
|
||||
|
||||
nodes = {
|
||||
server = { config, pkgs }: {
|
||||
server = { config, pkgs, ... }: {
|
||||
services.legit = {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
||||
@ -44,14 +44,22 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
||||
};
|
||||
services.grafana = {
|
||||
enable = true;
|
||||
security = {
|
||||
adminUser = "admin";
|
||||
adminPassword = "admin";
|
||||
};
|
||||
addr = "localhost";
|
||||
port = 3000;
|
||||
extraOptions = {
|
||||
DATABASE_URL = "sqlite3:///var/lib/grafana/data/grafana.db?cache=private&mode=rwc&_journal_mode=WAL";
|
||||
settings = {
|
||||
security = {
|
||||
admin_user = "admin";
|
||||
admin_password = "admin";
|
||||
};
|
||||
|
||||
server = {
|
||||
http_addr = "localhost";
|
||||
http_port = 3000;
|
||||
};
|
||||
|
||||
database = {
|
||||
type = "sqlite3";
|
||||
path = "/var/lib/grafana/data/grafana.db";
|
||||
wal = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
users.users.foo = {
|
||||
|
||||
@ -8,8 +8,8 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
lxd-image-metadata = lxd-image.lxdMeta.${pkgs.stdenv.hostPlatform.system};
|
||||
lxd-image-rootfs = lxd-image.lxdImage.${pkgs.stdenv.hostPlatform.system};
|
||||
lxd-image-metadata = lxd-image.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system};
|
||||
lxd-image-rootfs = lxd-image.lxdContainerImage.${pkgs.stdenv.hostPlatform.system};
|
||||
|
||||
in {
|
||||
name = "lxd-image-server";
|
||||
|
||||
@ -27,7 +27,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
||||
in {
|
||||
name = "mongodb";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ bluescreen303 offline cstrahan rvl phile314 ];
|
||||
maintainers = [ bluescreen303 offline rvl phile314 ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
|
||||
@ -36,7 +36,7 @@ in
|
||||
machine.succeed("echo 'SELECT address FROM etc_hosts LIMIT 1;' | osqueryi | tee /dev/console | grep -q '127.0.0.1'")
|
||||
|
||||
# osquery binaries respect configuration from the Nix config option.
|
||||
machine.succeed("echo 'SELECT value FROM osquery_flags WHERE name = \"utc\";' | osqueryi | tee /dev/console | grep -q ${boolToString utc}")
|
||||
machine.succeed("echo 'SELECT value FROM osquery_flags WHERE name = \"utc\";' | osqueryi | tee /dev/console | grep -q ${lib.boolToString utc}")
|
||||
|
||||
# osquery binaries respect configuration from the Nix flags option.
|
||||
machine.succeed("echo 'SELECT value FROM osquery_flags WHERE name = \"config_refresh\";' | osqueryi | tee /dev/console | grep -q ${config_refresh}")
|
||||
|
||||
@ -17,7 +17,7 @@ let
|
||||
|
||||
# Returns an attributeset of users who are not system users.
|
||||
normalUsers = config:
|
||||
filterAttrs (name: user: user.isNormalUser) config.users.users;
|
||||
lib.filterAttrs (name: user: user.isNormalUser) config.users.users;
|
||||
|
||||
# Returns true if a user is a member of the given group
|
||||
isMemberOf =
|
||||
@ -26,7 +26,7 @@ let
|
||||
groupName:
|
||||
# users.users attrset
|
||||
user:
|
||||
any (x: x == user.name) config.users.groups.${groupName}.members;
|
||||
lib.any (x: x == user.name) config.users.groups.${groupName}.members;
|
||||
|
||||
# Generates a valid SFTPGo user configuration for a given user
|
||||
# Will be converted to JSON and loaded on application startup.
|
||||
@ -52,7 +52,7 @@ let
|
||||
# inside the dataprovider they will be automatically created.
|
||||
# You have to create the folder on the filesystem yourself
|
||||
virtual_folders =
|
||||
lib.optional (lib.isMemberOf config sharedFolderName user) {
|
||||
lib.optional (isMemberOf config sharedFolderName user) {
|
||||
name = sharedFolderName;
|
||||
mapped_path = "${config.services.sftpgo.dataDir}/${sharedFolderName}";
|
||||
virtual_path = "/${sharedFolderName}";
|
||||
@ -63,7 +63,7 @@ let
|
||||
lib.recursiveUpdate {
|
||||
"/" = [ "list" ]; # read-only top level directory
|
||||
"/private" = [ "*" ]; # private subdirectory, not shared with others
|
||||
} (lib.optionalAttrs (lib.isMemberOf config "shared" user) {
|
||||
} (lib.optionalAttrs (isMemberOf config "shared" user) {
|
||||
"/shared" = [ "*" ];
|
||||
});
|
||||
|
||||
@ -89,7 +89,7 @@ let
|
||||
# of users and folders to import to SFTPGo.
|
||||
loadDataJson = config: pkgs.writeText "users-and-folders.json" (builtins.toJSON {
|
||||
users =
|
||||
lib.mapAttrsToList (name: user: lib.generateUserAttrSet config user) (normalUsers config);
|
||||
lib.mapAttrsToList (name: user: generateUserAttrSet config user) (normalUsers config);
|
||||
|
||||
folders = [
|
||||
{
|
||||
@ -144,7 +144,7 @@ in
|
||||
{
|
||||
name = "sftpgo";
|
||||
|
||||
meta.maintainers = with maintainers; [ yayayayaka ];
|
||||
meta.maintainers = with lib.maintainers; [ yayayayaka ];
|
||||
|
||||
nodes = {
|
||||
server = { nodes, ... }: {
|
||||
@ -228,7 +228,7 @@ in
|
||||
# Created shared folder directories
|
||||
"d ${statePath}/${sharedFolderName} 2770 ${sftpgoUser} ${sharedFolderName} -"
|
||||
]
|
||||
++ mapAttrsToList (name: user:
|
||||
++ lib.mapAttrsToList (name: user:
|
||||
# Create private user directories
|
||||
''
|
||||
d ${statePath}/users/${user.name} 0700 ${sftpgoUser} ${sftpgoGroup} -
|
||||
@ -273,12 +273,12 @@ in
|
||||
networking.firewall.allowedTCPPorts = [ 22 80 ];
|
||||
services.sftpgo = {
|
||||
settings = {
|
||||
sftpd.bindings = mkForce [{
|
||||
sftpd.bindings = lib.mkForce [{
|
||||
address = "";
|
||||
port = 22;
|
||||
}];
|
||||
|
||||
httpd.bindings = mkForce [{
|
||||
httpd.bindings = lib.mkForce [{
|
||||
address = "";
|
||||
port = 80;
|
||||
}];
|
||||
|
||||
@ -43,6 +43,10 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
mv $GOPATH/tracee-integration $out/bin/
|
||||
'';
|
||||
doInstallCheck = false;
|
||||
|
||||
meta = oa.meta // {
|
||||
outputsToInstall = [];
|
||||
};
|
||||
}))
|
||||
];
|
||||
};
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubelogin";
|
||||
version = "0.0.31";
|
||||
version = "0.0.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yIRiIZKq+Q10Uo/9qEToeMHMipA5rApkxIRr/IJ0yfY=";
|
||||
sha256 = "sha256-pMen6ZL1S0xr5+h7gVBMG4XjlZUifIiqHvjKgg8AY5c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XHSVLATWKklg1jWL4Lnaey7hCkYHAk/cNyUgQZ6WIq0=";
|
||||
vendorHash = "sha256-pNOCagxOcxhELSWO1GfbxGmopYXIgKD00XdZdVgawrc=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=${version}"
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tf-summarize";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dineshba";
|
||||
repo = "tf-summarize";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-d8DIVPQkuEvDCO0wKl+aK1jSu6MJCpTxQrgKYcFnzjA=";
|
||||
hash = "sha256-1sYWOvSWxoS0R6M1HxJ6yyBSa/LY3b9G8mF3NMofFhM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cnybdZth7qlP2BHK8uvLCoqJtggMIkvaL2+YugiUZRE=";
|
||||
vendorHash = "sha256-YdfZt8SHBJHk5VUC8Em97EzX79EV4hxvo0B05npBA2U=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -11,11 +11,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "iterm2";
|
||||
version = "3.4.20";
|
||||
version = "3.4.21";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip";
|
||||
hash = "sha256-RXBv3RXd2Kq8k7rbOE3HPEf6vI64VZCo1IX03gDy7l0=";
|
||||
hash = "sha256-hx2d08U4AeRCLtSV3QBcnRu1QS0RblLx/LUH6HHdQvw=";
|
||||
};
|
||||
|
||||
dontFixup = true;
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
, libvterm-neovim
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "a4term";
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "a4";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rpmohn";
|
||||
repo = "a4";
|
||||
rev = "v${version}";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-AX5psz9+bLdFFeDR55TIrAWDAkhDygw6289OgIfOJTg=";
|
||||
};
|
||||
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
libvterm-neovim
|
||||
];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
installFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
meta = {
|
||||
description = "A dynamic terminal window manager";
|
||||
@ -31,4 +31,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "a4";
|
||||
};
|
||||
}
|
||||
})
|
||||
@ -1,25 +1,25 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
audioSupport ? true,
|
||||
darwin,
|
||||
alsa-lib,
|
||||
pkg-config
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, audioSupport ? true
|
||||
, darwin
|
||||
, alsa-lib
|
||||
}:
|
||||
rustPlatform.buildRustPackage {
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "uiua";
|
||||
version = "unstable-2023-09-28";
|
||||
version = "0.0.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uiua-lang";
|
||||
repo = "uiua";
|
||||
rev = "9b8c65332396f521f170b0ed3ce104b7a8bcf7c0";
|
||||
hash = "sha256-+pleCEEwgRj+p+k9oKIvbsGUWC49qByV/juv76ZdBcc=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-CMuCl4idoO5qIpXdkXBbglsZQBWVT8w9azbn2rRxviA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-L8TCMe6eHS3QRy6HuTc1WvMfzsDhKx9YYupAkNeBwpk=";
|
||||
cargoHash = "sha256-BLP9OGTnksM9NscfhtVWxE0/CqZgkqqlIMgRclCzEzs=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isDarwin [
|
||||
rustPlatform.bindgenHook
|
||||
@ -37,8 +37,6 @@ rustPlatform.buildRustPackage {
|
||||
|
||||
buildFeatures = lib.optional audioSupport "audio";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A stack-oriented array programming language with a focus on simplicity, beauty, and tacit code";
|
||||
longDescription = ''
|
||||
@ -49,6 +47,6 @@ rustPlatform.buildRustPackage {
|
||||
homepage = "https://www.uiua.org/";
|
||||
license = licenses.mit;
|
||||
mainProgram = "uiua";
|
||||
maintainers = with maintainers; [ cafkafk ];
|
||||
maintainers = with maintainers; [ cafkafk tomasajt ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
makePackage =
|
||||
makeSuperOTC =
|
||||
{ family
|
||||
, description
|
||||
, rev
|
||||
@ -13,9 +13,10 @@ let
|
||||
, zip ? ""
|
||||
, prefix ? ""
|
||||
}:
|
||||
let Family =
|
||||
lib.toUpper (lib.substring 0 1 family) +
|
||||
lib.substring 1 (lib.stringLength family) family;
|
||||
let
|
||||
Family =
|
||||
lib.toUpper (lib.substring 0 1 family) +
|
||||
lib.substring 1 (lib.stringLength family) family;
|
||||
in
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "source-han-${family}";
|
||||
@ -49,9 +50,36 @@ let
|
||||
maintainers = with lib.maintainers; [ taku0 emily ];
|
||||
};
|
||||
};
|
||||
|
||||
makeVariable =
|
||||
{ family
|
||||
, version
|
||||
, hash
|
||||
, format
|
||||
}:
|
||||
let
|
||||
Family =
|
||||
lib.toUpper (lib.substring 0 1 family) +
|
||||
lib.substring 1 (lib.stringLength family) family;
|
||||
in
|
||||
fetchurl {
|
||||
pname = "source-han-${family}-vf-${format}";
|
||||
inherit version hash;
|
||||
url = "https://raw.githubusercontent.com/adobe-fonts/source-han-${family}/${version}R/Variable/OTC/SourceHan${Family}-VF.${format}.ttc";
|
||||
recursiveHash = true;
|
||||
downloadToTemp = true;
|
||||
postFetch = "install -Dm444 $downloadedFile $out/share/fonts/variable/SourceHan${Family}-VF.${format}.ttc";
|
||||
|
||||
meta = {
|
||||
description = "An open source Pan-CJK ${Family} typeface";
|
||||
homepage = "https://github.com/adobe-fonts/source-han-${family}";
|
||||
license = lib.licenses.ofl;
|
||||
maintainers = with lib.maintainers; [ taku0 emily ];
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
sans = makePackage {
|
||||
sans = makeSuperOTC {
|
||||
family = "sans";
|
||||
description = "sans-serif";
|
||||
rev = "2.004R";
|
||||
@ -59,7 +87,7 @@ in
|
||||
zip = ".zip";
|
||||
};
|
||||
|
||||
serif = makePackage {
|
||||
serif = makeSuperOTC {
|
||||
family = "serif";
|
||||
description = "serif";
|
||||
rev = "2.001R";
|
||||
@ -68,10 +96,38 @@ in
|
||||
prefix = "01_";
|
||||
};
|
||||
|
||||
mono = makePackage {
|
||||
mono = makeSuperOTC {
|
||||
family = "mono";
|
||||
description = "monospaced";
|
||||
rev = "1.002";
|
||||
hash = "sha256-DBkkSN6QhI8R64M2h2iDqaNtxluJZeSJYAz8x6ZzWME=";
|
||||
};
|
||||
|
||||
sans-vf-otf = makeVariable {
|
||||
family = "sans";
|
||||
version = "2.004";
|
||||
hash = "sha256-V7PE09c7h4RDS8Ij4PSI36Gy+LM+PVDi73Rcs+4DfHo=";
|
||||
format = "otf";
|
||||
};
|
||||
|
||||
sans-vf-ttf = makeVariable {
|
||||
family = "sans";
|
||||
version = "2.004";
|
||||
hash = "sha256-mXTG/d30gUxzxkJpaH4vOawRXMSxxTXlHCvHEsfGqbc=";
|
||||
format = "ttf";
|
||||
};
|
||||
|
||||
serif-vf-otf = makeVariable {
|
||||
family = "serif";
|
||||
version = "2.002";
|
||||
hash = "sha256-8sD4bU6w7HBm4vBuPAjcjpxN2rtEJugAw+X0bAOcmjA=";
|
||||
format = "otf";
|
||||
};
|
||||
|
||||
serif-vf-ttf = makeVariable {
|
||||
family = "serif";
|
||||
version = "2.002";
|
||||
hash = "sha256-dmTZFRsD55WCOg2+sqd8bkmTSnSNn5xUYf0PgzIvzww=";
|
||||
format = "ttf";
|
||||
};
|
||||
}
|
||||
|
||||
54
pkgs/development/libraries/fbjni/default.nix
Normal file
54
pkgs/development/libraries/fbjni/default.nix
Normal file
@ -0,0 +1,54 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, fetchpatch
|
||||
, jdk_headless
|
||||
, gtest
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fbjni";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebookincubator";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-97KqfFWtR3VJe2s0D60L3dsIDm4kMa0hpkKoZSAEoVY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Part of https://github.com/facebookincubator/fbjni/pull/76
|
||||
# fix cmake file installation directory
|
||||
(fetchpatch {
|
||||
url = "https://github.com/facebookincubator/fbjni/commit/ab02e60b5da28647bfcc864b0bb1b9a90504cdb1.patch";
|
||||
sha256 = "sha256-/h6kosulRH/ZAU2u0zRSaNDK39jsnFt9TaSxyBllZqM=";
|
||||
})
|
||||
# install headers
|
||||
(fetchpatch {
|
||||
url = "https://github.com/facebookincubator/fbjni/commit/74e125caa9a815244f1e6bd08eaba57d015378b4.patch";
|
||||
sha256 = "sha256-hQS35D69GD3ewV4zzPG+LO7jk7ncCj2CYDbLJ6SnpqE=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
jdk_headless
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtest
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DJAVA_HOME=${jdk_headless.passthru.home}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A library designed to simplify the usage of the Java Native Interface";
|
||||
homepage = "https://github.com/facebookincubator/fbjni";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jonringer ];
|
||||
};
|
||||
}
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "graphene-hardened-malloc";
|
||||
version = "11";
|
||||
version = "12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GrapheneOS";
|
||||
repo = "hardened_malloc";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-BbjL0W12QXFmGCzFrFYY6CZZeFbUt0elCGhM+mbL/IU=";
|
||||
sha256 = "sha256-ujwzr4njNsf/VTyEq7zKHWxoivU3feavSTx+MLIj1ZM=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "marisa-trie";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2KaDAfAjpyTrN5qqGxD4ip4aRYzIpBtSfGJQeFm0pNI=";
|
||||
hash = "sha256-W/Q+0M82r0V4/nsDTPlfUyQ5dmUWaA5L1gNyNhHr1Ws=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
39
pkgs/development/python-modules/sqids/default.nix
Normal file
39
pkgs/development/python-modules/sqids/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqids";
|
||||
version = "0.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-qAY41kOp0m+mua/4bvVwuDW5p0EpwY675Ux3W1JsqbE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "sqids" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://sqids.org/python";
|
||||
description = "A library that lets you generate short YouTube-looking IDs from numbers";
|
||||
license = with licenses; mit;
|
||||
maintainers = with maintainers; [ panicgh ];
|
||||
};
|
||||
}
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zodbpickle";
|
||||
version = "3.0.1";
|
||||
version = "3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Dwl1vdSnYVMg50rysLi+R2PHPPi/fEISq3IEQonndJg=";
|
||||
hash = "sha256-uewy5wbHuAi3mlOnrZZgkRfpQoN3K0AO52VSEHqrzBE=";
|
||||
};
|
||||
|
||||
# fails..
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "oh-my-posh";
|
||||
version = "18.7.0";
|
||||
version = "18.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jandedobbeleer";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-dnaKcyDy4TdlTPl0hCUCshW6aFMLUUFwVskv1jiO0fk=";
|
||||
hash = "sha256-gNSG4jGGkvLyitqO4o44tv/nRGzOcX5haLUFdj/PqBM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GHOWcZqZmjL+EptcuCwbj0WSWKmhbsxpZFvHhlmsbxU=";
|
||||
vendorHash = "sha256-ia5uglahH4btHYqeG3yyStOoM1ALxm/lQ+pyc0oxIwE=";
|
||||
|
||||
sourceRoot = "${src.name}/src";
|
||||
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rtthost";
|
||||
version = "0.20.0";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-h/D2LW8tQ2WfVrP+HOLs3Gg7HS2Rd0zXBxbnxvEeiWk=";
|
||||
hash = "sha256-Vp2TXKDr6Mu4CD6RlHjTL04FIShzKXwNZmu0PIqx1FY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-cEzp33y1wuOrKHJBdAPxWUc1ANpT7Sg1MZmaCno1WKA=";
|
||||
cargoHash = "sha256-XRxijak3kBMYCx9u39OWvqz3tjnKipjcV3DPEUBYrvQ=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ];
|
||||
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ lib, fetchFromGitHub, buildGoModule }:
|
||||
buildGoModule rec {
|
||||
pname = "vmagent";
|
||||
version = "1.93.0";
|
||||
version = "1.93.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VictoriaMetrics";
|
||||
repo = "VictoriaMetrics";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NkpMGsNz4knt5QY6B9sPJ3GcXEgPNyNgAsNBs9F2GOQ=";
|
||||
sha256 = "sha256-AC3tQAgGHKl86MakfSWnFMX1Lr5r7RwZfomXtp5/oBs=";
|
||||
};
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ];
|
||||
|
||||
@ -38,6 +38,5 @@ buildGoModule rec {
|
||||
license = licenses.asl20;
|
||||
homepage = "https://grafana.com/oss/tempo/";
|
||||
maintainers = with maintainers; [ willibutz ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, semgrep
|
||||
}:
|
||||
let
|
||||
version = "0.1.4";
|
||||
version = "0.1.7";
|
||||
in
|
||||
python3.pkgs.buildPythonApplication {
|
||||
pname = "open-interpreter";
|
||||
@ -14,7 +15,7 @@ python3.pkgs.buildPythonApplication {
|
||||
owner = "KillianLucas";
|
||||
repo = "open-interpreter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3a4pRV8o+NBZGgOuXng97KjRVU8xVqBp+B9sXsCqHtk=";
|
||||
hash = "sha256-U+GKvlFY9vkjXaPI0H5RsoMFLlLq1+IuSy/cOj/LNSw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -31,11 +32,15 @@ python3.pkgs.buildPythonApplication {
|
||||
openai
|
||||
# pyreadline3 # this is a windows deps
|
||||
python-dotenv
|
||||
pyyaml
|
||||
rich
|
||||
six
|
||||
tiktoken
|
||||
tokentrim
|
||||
wget
|
||||
yaspin
|
||||
] ++ [
|
||||
semgrep
|
||||
];
|
||||
|
||||
# the import check phase fails trying to do a network request to openai
|
||||
@ -48,5 +53,6 @@ python3.pkgs.buildPythonApplication {
|
||||
license = licenses.mit;
|
||||
changelog = "https://github.com/KillianLucas/open-interpreter/releases/tag/v${version}";
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
mainProgram = "interpreter";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,19 +2,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rot8";
|
||||
version = "0.1.5";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "efernau";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-i+VLVA/XKZiFPEeFHR3CpZKi8CWA/tiaZJerciqQHJ0=";
|
||||
hash = "sha256-dHx3vFY0ztyTIlzUi22TYphPD5hvgfHrWaaeoGxnvW0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Zz3RK79pMBn9JcpOVHf8vrvQzOJuV7anm136HcTBhJE=";
|
||||
cargoHash = "sha256-KDg6Ggnm6Cl/1fXqNcc7/jRFJ6KTLVGveJ6Fs3NLlHE=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "screen rotation daemon for X11 and sway";
|
||||
description = "screen rotation daemon for X11 and wlroots";
|
||||
homepage = "https://github.com/efernau/rot8";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.smona ];
|
||||
|
||||
@ -10,23 +10,24 @@
|
||||
, openssl
|
||||
, direnv
|
||||
, Security
|
||||
, SystemConfiguration
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rtx";
|
||||
version = "2023.9.0";
|
||||
version = "2023.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jdxcode";
|
||||
repo = "rtx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TH2JC+Cjw+ed1O33QKGq+lonIKlu6pHuY1jtrZh/FMM=";
|
||||
hash = "sha256-E0jBTnfp8asLC2V8TtYSCh6fTxqkFwCMZjsjjBKEN0s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-zJVCzVgwU9lR3E61w+71eUd7Au9LmJcbHtgLvzTj7r4=";
|
||||
cargoHash = "sha256-n/GxC5wDfhPboynFu8S1f9+kNDVmcKoSHaT96khyi2Q=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs --build ./test/data/plugins/**/bin/* ./src/fake_asdf.rs ./src/cli/reshim.rs
|
||||
|
||||
@ -39,12 +39,22 @@ buildGoModule rec {
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
# Tests currently fail on darwin because of a test in nsc which
|
||||
# expects command output to contain a specific path. However
|
||||
# the test strips table formatting from the command output in a naive way
|
||||
# that removes all the table characters, including '-'.
|
||||
# The nix build directory looks something like:
|
||||
# /private/tmp/nix-build-nsc-2.8.1.drv-0/nsc_test2000598938/keys
|
||||
# Then the `-` are removed from the path unintentionally and the test fails.
|
||||
# This should be fixed upstream to avoid mangling the path when
|
||||
# removing the table decorations from the command output.
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = {
|
||||
description = "A tool for creating NATS account and user access configurations";
|
||||
homepage = "https://github.com/nats-io/nsc";
|
||||
license = with lib.licenses; [ asl20 ];
|
||||
maintainers = with lib.maintainers; [ cbrewster ];
|
||||
mainProgram = "nsc";
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,9 +1,5 @@
|
||||
{ lib, python3, fetchFromGitHub, glibcLocales, docker-compose_1, git }:
|
||||
{ lib, python3, fetchFromGitHub, glibcLocales, git }:
|
||||
let
|
||||
docker_compose = changeVersion (with localPython.pkgs; docker-compose_1.override {
|
||||
inherit colorama pyyaml six dockerpty docker jsonschema requests websocket-client paramiko;
|
||||
}).overridePythonAttrs "1.25.5" "sha256-ei622Bc/30COUF5vfUl6wLd3OIcZVCvp5JoO/Ud6UMY=";
|
||||
|
||||
changeVersion = overrideFunc: version: hash: overrideFunc (oldAttrs: rec {
|
||||
inherit version;
|
||||
src = oldAttrs.src.override {
|
||||
@ -11,26 +7,23 @@ let
|
||||
};
|
||||
});
|
||||
|
||||
localPython = python3.override
|
||||
{
|
||||
self = localPython;
|
||||
packageOverrides = self: super: {
|
||||
cement = changeVersion super.cement.overridePythonAttrs "2.8.2" "sha256-h2XtBSwGHXTk0Bia3cM9Jo3lRMohmyWdeXdB9yXkItI=";
|
||||
wcwidth = changeVersion super.wcwidth.overridePythonAttrs "0.1.9" "sha256-7nOGKGKhVr93/5KwkDT8SCXdOvnPgbxbNgZo1CXzxfE=";
|
||||
semantic-version = changeVersion super.semantic-version.overridePythonAttrs "2.8.5" "sha256-0sst4FWHYpNGebmhBOguynr0SMn0l00fPuzP9lHfilQ=";
|
||||
};
|
||||
localPython = python3.override {
|
||||
self = localPython;
|
||||
packageOverrides = self: super: {
|
||||
cement = changeVersion super.cement.overridePythonAttrs "2.8.2" "sha256-h2XtBSwGHXTk0Bia3cM9Jo3lRMohmyWdeXdB9yXkItI=";
|
||||
};
|
||||
};
|
||||
in
|
||||
with localPython.pkgs; buildPythonApplication rec {
|
||||
pname = "awsebcli";
|
||||
version = "3.20.9";
|
||||
version = "3.20.10";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-elastic-beanstalk-cli";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-tnBDEeR+SCHb9UT3pTO7ISm4TVICvVfrV5cfz/60YQY=";
|
||||
hash = "sha256-4JZx0iTMyrPHbuS3zlhpiWnenAQO5eSBJbPHUizLhYo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -60,7 +53,6 @@ with localPython.pkgs; buildPythonApplication rec {
|
||||
tabulate
|
||||
termcolor
|
||||
websocket-client
|
||||
docker_compose
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -55,6 +55,7 @@ mapAliases ({
|
||||
|
||||
### A ###
|
||||
|
||||
a4term = a4; # Added 2023-10-06
|
||||
airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19
|
||||
alertmanager-bot = throw "alertmanager-bot is broken and has been archived by upstream" ; # Added 2023-07-28
|
||||
alsaLib = alsa-lib; # Added 2021-06-09
|
||||
|
||||
@ -7657,8 +7657,6 @@ with pkgs;
|
||||
|
||||
dvtm-unstable = callPackage ../tools/misc/dvtm/unstable.nix { };
|
||||
|
||||
a4term = callPackage ../tools/misc/a4term { };
|
||||
|
||||
erofs-utils = callPackage ../tools/filesystems/erofs-utils { };
|
||||
|
||||
e2tools = callPackage ../tools/filesystems/e2tools { };
|
||||
@ -8251,6 +8249,8 @@ with pkgs;
|
||||
|
||||
fbcat = callPackage ../tools/misc/fbcat { };
|
||||
|
||||
fbjni = callPackage ../development/libraries/fbjni { };
|
||||
|
||||
fbv = callPackage ../tools/graphics/fbv { };
|
||||
|
||||
fbvnc = callPackage ../tools/admin/fbvnc { };
|
||||
@ -18469,7 +18469,7 @@ with pkgs;
|
||||
asdf-vm = callPackage ../tools/misc/asdf-vm { };
|
||||
|
||||
rtx = callPackage ../tools/misc/rtx {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
|
||||
};
|
||||
|
||||
### DEVELOPMENT / TOOLS
|
||||
@ -30221,6 +30221,10 @@ with pkgs;
|
||||
source-han-sans = sourceHanPackages.sans;
|
||||
source-han-serif = sourceHanPackages.serif;
|
||||
source-han-mono = sourceHanPackages.mono;
|
||||
source-han-sans-vf-otf = sourceHanPackages.sans-vf-otf;
|
||||
source-han-sans-vf-ttf = sourceHanPackages.sans-vf-ttf;
|
||||
source-han-serif-vf-otf = sourceHanPackages.serif-vf-otf;
|
||||
source-han-serif-vf-ttf = sourceHanPackages.serif-vf-ttf;
|
||||
|
||||
spleen = callPackage ../data/fonts/spleen { };
|
||||
|
||||
|
||||
@ -13213,6 +13213,8 @@ self: super: with self; {
|
||||
|
||||
spyse-python = callPackage ../development/python-modules/spyse-python { };
|
||||
|
||||
sqids = callPackage ../development/python-modules/sqids { };
|
||||
|
||||
sqlalchemy = callPackage ../development/python-modules/sqlalchemy { };
|
||||
|
||||
sqlalchemy-citext = callPackage ../development/python-modules/sqlalchemy-citext { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user