gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2024-11-17 00:16:47 +00:00
committed by GitHub
parent dc2fbd51fd 0508740222
commit 86f9d57ca7
43 changed files with 502 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+1 -1
View File
@@ -4507,7 +4507,7 @@
name = "Chris Ostrouchov";
};
cottand = {
email = "nico@dcotta.eu";
email = "nico@dcotta.com";
github = "cottand";
githubId = 45274424;
name = "Nico D'Cotta";
nixos/doc/manual/release-notes/rl-2411.section.md
+1 -1
View File
@@ -235,7 +235,7 @@
- The VirtualBox demo installer appliance has been removed.
Please use the standard installer ISOs instead.
- `grafana` has been updated to version 11.1. This version doesn't support setting `http_addr` to a hostname anymore, an IP address is expected.
- `grafana` has been updated to version 11.3. This version doesn't support setting `http_addr` to a hostname anymore, an IP address is expected.
- `deno` has been updated to Deno 2, which has breaking changes.
See the [migration guide](https://docs.deno.com/runtime/reference/migration_guide/) for details.
nixos/modules/programs/wayland/hyprland.nix
+102 -54
View File
@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.programs.hyprland;
@@ -13,29 +18,53 @@ in
A configuration file will be generated in {file}`~/.config/hypr/hyprland.conf`.
See <https://wiki.hyprland.org> for more information'';
package = lib.mkPackageOption pkgs "hyprland" {
extraDescription = ''
If the package is not overridable with `enableXWayland`, then the module option
{option}`xwayland` will have no effect.
'';
} // {
apply = p: wayland-lib.genFinalPackage p {
enableXWayland = cfg.xwayland.enable;
package =
lib.mkPackageOption pkgs "hyprland" {
extraDescription = ''
If the package is not overridable with `enableXWayland`, then the module option
{option}`xwayland` will have no effect.
'';
}
// {
apply =
p:
wayland-lib.genFinalPackage p {
enableXWayland = cfg.xwayland.enable;
};
};
portalPackage =
lib.mkPackageOption pkgs "xdg-desktop-portal-hyprland" {
extraDescription = ''
If the package is not overridable with `hyprland`, then the Hyprland package
used by the portal may differ from the one set in the module option {option}`package`.
'';
}
// {
apply =
p:
wayland-lib.genFinalPackage p {
hyprland = cfg.package;
};
};
xwayland.enable = lib.mkEnableOption "XWayland" // {
default = true;
};
portalPackage = lib.mkPackageOption pkgs "xdg-desktop-portal-hyprland" {
extraDescription = ''
If the package is not overridable with `hyprland`, then the Hyprland package
used by the portal may differ from the one set in the module option {option}`package`.
'';
} // {
apply = p: wayland-lib.genFinalPackage p {
hyprland = cfg.package;
};
};
withUWSM = lib.mkEnableOption null // {
description = ''
Launch Hyprland with the UWSM (Universal Wayland Session Manager) session manager.
This has improved systemd support and is recommended for most users.
This automatically starts appropiate targets like `graphical-session.target`,
and `wayland-session@Hyprland.target`.
xwayland.enable = lib.mkEnableOption "XWayland" // { default = true; };
::: {.note}
Some changes may need to be made to Hyprland configs depending on your setup, see
[Hyprland wiki](https://wiki.hyprland.org/Useful-Utilities/Systemd-start/#uwsm).
:::
'';
};
systemd.setPath.enable = lib.mkEnableOption null // {
default = lib.versionOlder cfg.package.version "0.41.2";
@@ -49,46 +78,65 @@ in
};
};
config = lib.mkIf cfg.enable (lib.mkMerge [
{
environment.systemPackages = [ cfg.package ];
config = lib.mkIf cfg.enable (
lib.mkMerge [
{
environment.systemPackages = [ cfg.package ];
# To make a Hyprland session available if a display manager like SDDM is enabled:
services.displayManager.sessionPackages = [ cfg.package ];
xdg.portal = {
enable = true;
extraPortals = [ cfg.portalPackage ];
configPackages = lib.mkDefault [ cfg.package ];
};
xdg.portal = {
enable = true;
extraPortals = [ cfg.portalPackage ];
configPackages = lib.mkDefault [ cfg.package ];
};
systemd = lib.mkIf cfg.systemd.setPath.enable {
user.extraConfig = ''
DefaultEnvironment="PATH=/run/wrappers/bin:/etc/profiles/per-user/%u/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:$PATH"
'';
};
}
systemd = lib.mkIf cfg.systemd.setPath.enable {
user.extraConfig = ''
DefaultEnvironment="PATH=/run/wrappers/bin:/etc/profiles/per-user/%u/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:$PATH"
'';
};
}
(lib.mkIf (cfg.withUWSM) {
programs.uwsm.enable = true;
# Configure UWSM to launch Hyprland from a display manager like SDDM
programs.uwsm.waylandCompositors = {
hyprland = {
prettyName = "Hyprland";
comment = "Hyprland compositor managed by UWSM";
binPath = "/run/current-system/sw/bin/Hyprland";
};
};
})
(lib.mkIf (!cfg.withUWSM) {
# To make a vanilla Hyprland session available in DM
services.displayManager.sessionPackages = [ cfg.package ];
})
(import ./wayland-session.nix {
inherit lib pkgs;
enableXWayland = cfg.xwayland.enable;
enableWlrPortal = lib.mkDefault false; # Hyprland has its own portal, wlr is not needed
})
]);
(import ./wayland-session.nix {
inherit lib pkgs;
enableXWayland = cfg.xwayland.enable;
enableWlrPortal = lib.mkDefault false; # Hyprland has its own portal, wlr is not needed
})
]
);
imports = [
(lib.mkRemovedOptionModule
[ "programs" "hyprland" "xwayland" "hidpi" ]
"XWayland patches are deprecated. Refer to https://wiki.hyprland.org/Configuring/XWayland"
)
(lib.mkRemovedOptionModule
[ "programs" "hyprland" "enableNvidiaPatches" ]
"Nvidia patches are no longer needed"
)
(lib.mkRemovedOptionModule
[ "programs" "hyprland" "nvidiaPatches" ]
"Nvidia patches are no longer needed"
)
(lib.mkRemovedOptionModule [
"programs"
"hyprland"
"xwayland"
"hidpi"
] "XWayland patches are deprecated. Refer to https://wiki.hyprland.org/Configuring/XWayland")
(lib.mkRemovedOptionModule [
"programs"
"hyprland"
"enableNvidiaPatches"
] "Nvidia patches are no longer needed")
(lib.mkRemovedOptionModule [
"programs"
"hyprland"
"nvidiaPatches"
] "Nvidia patches are no longer needed")
];
meta.maintainers = with lib.maintainers; [ fufexan ];
nixos/modules/services/databases/postgresql.nix
+27 -20
View File
@@ -2,6 +2,7 @@
let
inherit (lib)
any
attrValues
concatMapStrings
concatStringsSep
@@ -9,6 +10,7 @@ let
elem
escapeShellArgs
filterAttrs
getName
isString
literalExpression
mapAttrs
@@ -31,19 +33,19 @@ let
cfg = config.services.postgresql;
postgresql =
let
# ensure that
# services.postgresql = {
# enableJIT = true;
# package = pkgs.postgresql_<major>;
# };
# works.
base = if cfg.enableJIT then cfg.package.withJIT else cfg.package.withoutJIT;
in
if cfg.extraPlugins == []
then base
else base.withPackages cfg.extraPlugins;
# ensure that
# services.postgresql = {
# enableJIT = true;
# package = pkgs.postgresql_<major>;
# };
# works.
basePackage = if cfg.enableJIT
then cfg.package.withJIT
else cfg.package.withoutJIT;
postgresql = if cfg.extensions == []
then basePackage
else basePackage.withPackages cfg.extensions;
toStr = value:
if true == value then "yes"
@@ -61,6 +63,8 @@ let
groupAccessAvailable = versionAtLeast postgresql.version "11.0";
extensionNames = map getName postgresql.installedExtensions;
extensionInstalled = extension: elem extension extensionNames;
in
{
@@ -69,6 +73,7 @@ in
(mkRenamedOptionModule [ "services" "postgresql" "logLinePrefix" ] [ "services" "postgresql" "settings" "log_line_prefix" ])
(mkRenamedOptionModule [ "services" "postgresql" "port" ] [ "services" "postgresql" "settings" "port" ])
(mkRenamedOptionModule [ "services" "postgresql" "extraPlugins" ] [ "services" "postgresql" "extensions" ])
];
###### interface
@@ -372,12 +377,12 @@ in
'';
};
extraPlugins = mkOption {
extensions = mkOption {
type = with types; coercedTo (listOf path) (path: _ignorePg: path) (functionTo (listOf path));
default = _: [];
example = literalExpression "ps: with ps; [ postgis pg_repack ]";
description = ''
List of PostgreSQL plugins.
List of PostgreSQL extensions to install.
'';
};
@@ -639,7 +644,7 @@ in
PrivateTmp = true;
ProtectHome = true;
ProtectSystem = "strict";
MemoryDenyWriteExecute = lib.mkDefault (cfg.settings.jit == "off");
MemoryDenyWriteExecute = lib.mkDefault (cfg.settings.jit == "off" && (!any extensionInstalled [ "plv8" ]));
NoNewPrivileges = true;
LockPersonality = true;
PrivateDevices = true;
@@ -663,10 +668,12 @@ in
RestrictRealtime = true;
RestrictSUIDSGID = true;
SystemCallArchitectures = "native";
SystemCallFilter = [
"@system-service"
"~@privileged @resources"
];
SystemCallFilter =
[
"@system-service"
"~@privileged @resources"
]
++ lib.optionals (any extensionInstalled [ "plv8" ]) [ "@pkey" ];
UMask = if groupAccessAvailable then "0027" else "0077";
}
(mkIf (cfg.dataDir != "/var/lib/postgresql") {
nixos/modules/services/home-automation/zigbee2mqtt.nix
+1 -3
View File
@@ -76,9 +76,7 @@ in
# Hardening
CapabilityBoundingSet = "";
DeviceAllow = [
config.services.zigbee2mqtt.settings.serial.port
];
DeviceAllow = lib.optionals (lib.hasPrefix "/" cfg.settings.serial.port) [ cfg.settings.serial.port ];
DevicePolicy = "closed";
LockPersonality = true;
MemoryDenyWriteExecute = false;
nixos/modules/services/web-apps/immich.nix
+1 -1
View File
@@ -227,7 +227,7 @@ in
ensureClauses.login = true;
}
];
extraPlugins = ps: with ps; [ pgvecto-rs ];
extensions = ps: with ps; [ pgvecto-rs ];
settings = {
shared_preload_libraries = [ "vectors.so" ];
search_path = "\"$user\", public, vectors";
nixos/modules/services/web-apps/mobilizon.nix
+1 -1
View File
@@ -383,7 +383,7 @@ in
ensureDBOwnership = false;
}
];
extraPlugins = ps: with ps; [ postgis ];
extensions = ps: with ps; [ postgis ];
};
# Nginx config taken from support/nginx/mobilizon-release.conf
nixos/tests/druid/default.nix
+1 -1
View File
@@ -38,7 +38,7 @@ let
tests = {
default = testsForPackage {
druidPackage = pkgs.druid;
hadoopPackage = pkgs.hadoop_3_2;
hadoopPackage = pkgs.hadoop_3_3;
};
};
testsForPackage =
nixos/tests/postgresql/anonymizer.nix
+1 -1
View File
@@ -20,7 +20,7 @@ let
inherit package;
enable = true;
enableJIT = lib.hasInfix "-jit-" package.name;
extraPlugins = ps: [ ps.anonymizer ];
extensions = ps: [ ps.anonymizer ];
settings.shared_preload_libraries = [ "anon" ];
};
};
nixos/tests/postgresql/pgjwt.nix
+1 -1
View File
@@ -24,7 +24,7 @@ let
inherit package;
enable = true;
enableJIT = lib.hasInfix "-jit-" package.name;
extraPlugins =
extensions =
ps: with ps; [
pgjwt
pgtap
nixos/tests/postgresql/pgvecto-rs.nix
+1 -1
View File
@@ -38,7 +38,7 @@ let
inherit package;
enable = true;
enableJIT = lib.hasInfix "-jit-" package.name;
extraPlugins =
extensions =
ps: with ps; [
pgvecto-rs
];
nixos/tests/postgresql/postgresql.nix
+38 -14
View File
@@ -14,22 +14,41 @@ let
postgresql-clauses = makeEnsureTestFor package;
};
test-sql = pkgs.writeText "postgresql-test" ''
CREATE EXTENSION pgcrypto; -- just to check if lib loading works
CREATE TABLE sth (
id int
test-sql =
enablePLv8Test:
pkgs.writeText "postgresql-test" (
''
CREATE EXTENSION pgcrypto; -- just to check if lib loading works
CREATE TABLE sth (
id int
);
INSERT INTO sth (id) VALUES (1);
INSERT INTO sth (id) VALUES (1);
INSERT INTO sth (id) VALUES (1);
INSERT INTO sth (id) VALUES (1);
INSERT INTO sth (id) VALUES (1);
CREATE TABLE xmltest ( doc xml );
INSERT INTO xmltest (doc) VALUES ('<test>ok</test>'); -- check if libxml2 enabled
''
+ lib.optionalString enablePLv8Test ''
-- check if hardening gets relaxed
CREATE EXTENSION plv8;
-- try to trigger the V8 JIT, which requires MemoryDenyWriteExecute
DO $$
let xs = [];
for (let i = 0, n = 400000; i < n; i++) {
xs.push(Math.round(Math.random() * n))
}
console.log(xs.reduce((acc, x) => acc + x, 0));
$$ LANGUAGE plv8;
''
);
INSERT INTO sth (id) VALUES (1);
INSERT INTO sth (id) VALUES (1);
INSERT INTO sth (id) VALUES (1);
INSERT INTO sth (id) VALUES (1);
INSERT INTO sth (id) VALUES (1);
CREATE TABLE xmltest ( doc xml );
INSERT INTO xmltest (doc) VALUES ('<test>ok</test>'); -- check if libxml2 enabled
'';
makeTestForWithBackupAll =
package: backupAll:
let
enablePLv8Check = !package.pkgs.plv8.meta.broken;
in
makeTest {
name = "postgresql${lib.optionalString backupAll "-backup-all"}-${package.name}";
meta = with lib.maintainers; {
@@ -37,12 +56,17 @@ let
};
nodes.machine =
{ ... }:
{ config, ... }:
{
services.postgresql = {
inherit package;
enable = true;
enableJIT = lib.hasInfix "-jit-" package.name;
# plv8 doesn't support postgresql with JIT, so we only run the test
# for the non-jit variant.
# TODO(@Ma27) split this off into its own VM test and move a few other
# extension tests to use postgresqlTestExtension.
extensions = lib.mkIf enablePLv8Check (ps: with ps; [ plv8 ]);
};
services.postgresqlBackup = {
@@ -69,7 +93,7 @@ let
with subtest("Postgresql is available just after unit start"):
machine.succeed(
"cat ${test-sql} | sudo -u postgres psql"
"cat ${test-sql enablePLv8Check} | sudo -u postgres psql"
)
with subtest("Postgresql survives restart (bug #1735)"):
nixos/tests/postgresql/timescaledb.nix
+1 -1
View File
@@ -54,7 +54,7 @@ let
inherit package;
enable = true;
enableJIT = lib.hasInfix "-jit-" package.name;
extraPlugins =
extensions =
ps: with ps; [
timescaledb
timescaledb_toolkit
nixos/tests/postgresql/tsja.nix
+1 -1
View File
@@ -21,7 +21,7 @@ let
inherit package;
enable = true;
enableJIT = lib.hasInfix "-jit-" package.name;
extraPlugins =
extensions =
ps: with ps; [
tsja
];
nixos/tests/postgresql/wal2json.nix
+1 -1
View File
@@ -17,7 +17,7 @@ let
inherit package;
enable = true;
enableJIT = lib.hasInfix "-jit-" package.name;
extraPlugins = with package.pkgs; [ wal2json ];
extensions = with package.pkgs; [ wal2json ];
settings = {
wal_level = "logical";
max_replication_slots = "10";
pkgs/build-support/writers/scripts.nix
+51 -43
View File
@@ -523,15 +523,17 @@ rec {
writeFishBin = name: writeFish "/bin/${name}";
/**
Like writeScript but the first line is a shebang to babashka
writeBabashka takes a name, an attrset with babashka interpreter and linting check (both optional)
and some babashka source code and returns an executable.
Can be called with or without extra arguments.
`pkgs.babashka-unwrapped` is used as default interpreter for small closure size. If dependencies needed, use `pkgs.babashka` instead. Pass empty string to check to disable the default clj-kondo linting.
# Examples
:::{.example}
## `pkgs.writers.writeBabashka` without arguments
## `pkgs.writers.writeBabashka` with empty arguments
```nix
writeBabashka "example" ''
writeBabashka "example" { } ''
(println "hello world")
''
```
@@ -553,55 +555,61 @@ rec {
''
```
:::
*/
writeBabashka =
name: argsOrScript:
if lib.isAttrs argsOrScript && !lib.isDerivation argsOrScript then
makeScriptWriter (
argsOrScript
// {
interpreter = "${lib.getExe pkgs.babashka}";
check = "${lib.getExe pkgs.clj-kondo} --lint";
}
) name
else
makeScriptWriter {
interpreter = "${lib.getExe pkgs.babashka}";
check = "${lib.getExe pkgs.clj-kondo} --lint";
} name argsOrScript;
/**
Like writeScriptBin but the first line is a shebang to babashka
:::{.note}
Babashka needs Java for fetching dependencies. Wrapped babashka contains jdk,
pass wrapped version `pkgs.babashka` to babashka if dependencies are required.
Can be called with or without extra arguments.
# Examples
:::{.example}
## `pkgs.writers.writeBabashkaBin` without arguments
For example:
```nix
writeBabashkaBin "example" ''
(println "hello world")
''
```
:::
:::{.example}
## `pkgs.writers.writeBabashkaBin` with arguments
```nix
writeBabashkaBin "example"
writeBabashka "example"
{
makeWrapperArgs = [
"--prefix" "PATH" ":" "${lib.makeBinPath [ pkgs.hello ]}"
];
babashka = pkgs.babashka;
}
''
(require '[babashka.tasks :as tasks])
(tasks/shell "hello" "-g" "Hello babashka!")
(require '[babashka.deps :as deps])
(deps/add-deps '{:deps {medley/medley {:mvn/version "1.3.0"}}})
(require '[medley.core :as m])
(prn (m/index-by :id [{:id 1} {:id 2}]))
''
```
:::
:::{.note}
Disable clj-kondo linting:
```nix
writeBabashka "example"
{
check = "";
}
''
(println "hello world")
''
:::
```
*/
writeBabashka =
name:
{
makeWrapperArgs ? [ ],
babashka ? pkgs.babashka-unwrapped,
check ? "${lib.getExe pkgs.clj-kondo} --lint",
...
}@args:
makeScriptWriter (
(builtins.removeAttrs args [
"babashka"
])
// {
interpreter = "${lib.getExe babashka}";
}
) name;
/**
writeBabashkaBin takes the same arguments as writeBabashka but outputs a directory
(like writeScriptBin)
*/
writeBabashkaBin = name: writeBabashka "/bin/${name}";
pkgs/build-support/writers/test.nix
+2 -2
View File
@@ -89,7 +89,7 @@ recurseIntoAttrs {
end
'');
babashka = expectSuccessBin (writeBabashkaBin "test-writers-babashka-bin" ''
babashka = expectSuccessBin (writeBabashkaBin "test-writers-babashka-bin" { } ''
(println "success")
'');
@@ -205,7 +205,7 @@ recurseIntoAttrs {
echo "success"
'');
babashka = expectSuccess (writeBabashka "test-writers-babashka" ''
babashka = expectSuccess (writeBabashka "test-writers-babashka" { } ''
(println "success")
'');
pkgs/by-name/ca/cargo-tauri/Cargo.lock
Generated
+1 -1
View File
@@ -8994,7 +8994,7 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "tauri"
version = "2.1.0"
version = "2.1.1"
dependencies = [
"anyhow",
"bytes",
pkgs/by-name/ca/cargo-tauri/package.nix
+2 -4
View File
@@ -9,19 +9,18 @@
nix-update-script,
openssl,
pkg-config,
testers,
webkitgtk_4_1,
}:
rustPlatform.buildRustPackage rec {
pname = "tauri";
version = "2.1.0";
version = "2.1.1";
src = fetchFromGitHub {
owner = "tauri-apps";
repo = "tauri";
rev = "refs/tags/tauri-v${version}";
hash = "sha256-n1rSffVef9G9qtLyheuK5k6anAHsZANSu0C73QDdg2o=";
hash = "sha256-HPmViOowP1xAjDJ89YS0BTjNnKI1P0L777ywkqAhhc4=";
};
cargoLock = {
@@ -49,7 +48,6 @@ rustPlatform.buildRustPackage rec {
tests = {
hook = callPackage ./test-app.nix { };
version = testers.testVersion { package = cargo-tauri; };
};
updateScript = nix-update-script {
pkgs/by-name/ca/cargo-tauri/test-app.nix
+14 -18
View File
@@ -1,37 +1,34 @@
{
lib,
stdenv,
rustPlatform,
cargo-tauri,
darwin,
glib-networking,
libayatana-appindicator,
nodejs,
openssl,
pkg-config,
pnpm_9,
rustPlatform,
webkitgtk_4_1,
wrapGAppsHook4,
}:
rustPlatform.buildRustPackage rec {
let
pnpm = pnpm_9;
in
stdenv.mkDerivation (finalAttrs: {
pname = "test-app";
inherit (cargo-tauri) version src;
cargoLock = {
inherit (cargo-tauri.cargoDeps) lockFile;
outputHashes = {
"schemars_derive-0.8.21" = "sha256-AmxBKZXm2Eb+w8/hLQWTol5f22uP8UqaIh+LVLbS20g=";
};
};
postPatch = ''
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
--replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
'';
pnpmDeps = pnpm_9.fetchDeps {
inherit
inherit (cargo-tauri) cargoDeps;
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs)
pname
version
src
@@ -45,7 +42,9 @@ rustPlatform.buildRustPackage rec {
nodejs
pkg-config
pnpm_9.configHook
pnpm.configHook
rustPlatform.cargoCheckHook
rustPlatform.cargoSetupHook
wrapGAppsHook4
];
@@ -55,9 +54,6 @@ rustPlatform.buildRustPackage rec {
glib-networking
libayatana-appindicator
webkitgtk_4_1
]
++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.WebKit
];
buildAndTestSubdir = "examples/api/src-tauri";
@@ -74,4 +70,4 @@ rustPlatform.buildRustPackage rec {
meta = {
inherit (cargo-tauri.hook.meta) platforms;
};
}
})
pkgs/by-name/dr/druid/package.nix
+4 -8
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
mysql_jdbc,
extensions ? { },
libJars ? [ ],
nixosTests,
@@ -19,16 +20,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "apache-druid";
version = "30.0.0";
version = "31.0.0";
src = fetchurl {
url = "mirror://apache/druid/${finalAttrs.version}/apache-druid-${finalAttrs.version}-bin.tar.gz";
hash = "sha256-mRYorVkNzM94LP53G78eW20N5UsvMP7Lv4rAysmPwXw=";
};
mysqlConnector = fetchurl {
url = "mirror://maven/mysql/mysql-connector-java/5.1.48/mysql-connector-java-5.1.48.jar";
hash = "sha256-VuJsqqOCH1rkr0T5x09mz4uE6gFRatOAPLsOkEm27Kg=";
hash = "sha256-xppAoKNS/qB8WVMwBPxxHbOy5uDGl3IxrCWV1T+YQkE=";
};
dontBuild = true;
@@ -61,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
runHook preInstall
mkdir $out
mv * $out
${optionalString mysqlSupport "cp ${finalAttrs.mysqlConnector} $out/extensions/mysql-metadata-storage"}
${optionalString mysqlSupport "ln -s ${mysql_jdbc}/share/java/mysql-connector-java.jar $out/extensions/mysql-metadata-storage"}
${finalAttrs.loadExtensions}
${finalAttrs.loadJars}
runHook postInstall
pkgs/by-name/ga/gamescope/package.nix
+2 -2
View File
@@ -47,14 +47,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gamescope";
version = "3.15.13";
version = "3.15.14";
src = fetchFromGitHub {
owner = "ValveSoftware";
repo = "gamescope";
rev = "refs/tags/${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-AePYKdDyAtnVkL8/VeWmhJ3ATZnhyVZcU/QtVpCfTQE=";
hash = "sha256-LVwwkISokjSXEYd/SFRtCDDY6P2sr6pQp8Xb8BsrXAw=";
};
patches = [
pkgs/by-name/ko/koruri/package.nix
+31
View File
@@ -0,0 +1,31 @@
{
lib,
fetchFromGitHub,
stdenvNoCC,
}:
stdenvNoCC.mkDerivation rec {
pname = "koruri";
version = "20210720";
src = fetchFromGitHub {
owner = "Koruri";
repo = "Koruri";
rev = version;
hash = "sha256-zL9UtT15mWvsXgGJqbTs6cOsQaoh/0AIAyQ5z7JpTXk=";
};
installPhase = ''
runHook preInstall
install -Dm644 *.ttf -t $out/share/fonts/koruri
runHook postInstall
'';
meta = with lib; {
description = "Japanese TrueType font obtained by mixing M+ FONTS and Open Sans";
homepage = "https://github.com/Koruri/Koruri";
license = licenses.asl20;
maintainers = with maintainers; [ haruki7049 ];
platforms = platforms.all;
};
}
pkgs/by-name/me/metals/package.nix
+2 -2
View File
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "metals";
version = "1.4.0";
version = "1.4.1";
deps = stdenv.mkDerivation {
name = "${pname}-deps-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-mmsCdv3zSwsaA00I5sQVy0V4fl1GytdgjVjs2r6x32Q=";
outputHash = "sha256-CVAPjeTYuv0w57EK/IldJcGz8mTQnyCGAjaUf6La2rU=";
};
nativeBuildInputs = [ makeWrapper setJavaClassPath ];
pkgs/by-name/mi/mimir/package.nix
+2 -2
View File
@@ -1,13 +1,13 @@
{ lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }:
buildGoModule rec {
pname = "mimir";
version = "2.14.1";
version = "2.14.2";
src = fetchFromGitHub {
rev = "${pname}-${version}";
owner = "grafana";
repo = pname;
hash = "sha256-AcD3ebbPGzmu90TxmOBG0wptOZBG61wBXAIdJwZNMT4=";
hash = "sha256-y+87cMG9Ilyb99EeLp/UjIEl+5e1zyfoaFLW5i12gGY=";
};
vendorHash = null;
pkgs/by-name/os/osu-lazer-bin/package.nix
+5 -4
View File
@@ -9,23 +9,23 @@
let
pname = "osu-lazer-bin";
version = "2024.1009.1";
version = "2024.1115.3";
src =
{
aarch64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
hash = "sha256-fH7cuk879nS8FDIZ8p29pg2aXLJUT+j6Emb39Y6FXq4=";
hash = "sha256-dw+bfuei0Wbk3UNVKZRahZxxsJObTyzJOYEMXYJyUNE=";
stripRoot = false;
};
x86_64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
hash = "sha256-kIH+zlNaqMVbr8FVDiLUh19gfrFUDPGBvMOrZqkMZAE=";
hash = "sha256-EQA2HhoN52VdZsvq8IyocV4zRupVRfdyPpXF3nxZ8rM=";
stripRoot = false;
};
x86_64-linux = fetchurl {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
hash = "sha256-2H2SPcUm/H/0D9BqBiTFvaCwd0c14/r+oWhyeZdNpoU=";
hash = "sha256-kwZHy0FfOUFIWvyOj0ghlQz05U+Lnzl5TgC4T6bhm7o=";
};
}
.${stdenv.system} or (throw "osu-lazer-bin: ${stdenv.system} is unsupported.");
@@ -42,6 +42,7 @@ let
maintainers = with lib.maintainers; [
gepbird
stepbrobd
Guanran928
];
mainProgram = "osu!";
platforms = [
pkgs/by-name/os/osu-lazer/deps.nix
Generated
+40 -40
View File
@@ -2,14 +2,14 @@
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "AutoMapper"; version = "12.0.1"; hash = "sha256-a3wCSaOXl+5RKWNi1ddRbNWkOzfodFAUokqPyQiVHGg="; })
(fetchNuGet { pname = "AutoMapper"; version = "13.0.1"; hash = "sha256-3rlsVaouPVH3BD0SobUbVojHuZzNUThQnwbteDtWQ2g="; })
(fetchNuGet { pname = "CodeFileSanity"; version = "0.0.37"; hash = "sha256-+BoA4FdDUfeREdc42xbnonh3IBLOjzyrrBosaswbSg4="; })
(fetchNuGet { pname = "DiffPlex"; version = "1.7.2"; hash = "sha256-Vsn81duAmPIPkR40h5bEz7hgtF5Kt5nAAGhQZrQbqxE="; })
(fetchNuGet { pname = "DiscordRichPresence"; version = "1.2.1.24"; hash = "sha256-oRNrlF1/yK0QvrW2+48RsmSg9h9/pDIfA56/bpoHXFU="; })
(fetchNuGet { pname = "FFmpeg.AutoGen"; version = "4.3.0.1"; hash = "sha256-e89+ifalu9T2IpbAl7xji9Rf4AF++490tpJta+sp3Vg="; })
(fetchNuGet { pname = "Fody"; version = "6.8.0"; hash = "sha256-2laYscz0i0LalGTAup7dsh6XlYRZSojYpp8XOwZJJfg="; })
(fetchNuGet { pname = "HidSharpCore"; version = "1.2.1.1"; hash = "sha256-lM4o3FYBon8eQIMt4uiJAs8M0t4MW+joykiDX+lrdv4="; })
(fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.59"; hash = "sha256-n4GiwjvKTPwrHqhlprPOichjPGXYY3P/o7B0ULASikA="; })
(fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.70"; hash = "sha256-V/SI2N1+jNkwjSQRd2Y/XVVhdOKvSNz3/NeIFE9V3wY="; })
(fetchNuGet { pname = "Humanizer"; version = "2.14.1"; hash = "sha256-1wGwf5KAmDeiH0Dz8KcTdZw+UMkiNsjKOIOt/VJnnqE="; })
(fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; })
(fetchNuGet { pname = "Humanizer.Core.af"; version = "2.14.1"; hash = "sha256-8CCgI7OweSa53cZWZBXQ8a7VVt/NPP16zHVBZvzU9KQ="; })
@@ -64,40 +64,40 @@
(fetchNuGet { pname = "JetBrains.ReSharper.GlobalTools"; version = "2023.3.3"; hash = "sha256-Nn3imJvnqLe02gR1GyUHYH4+XkrNnhLy9dyCjJCkB7M="; })
(fetchNuGet { pname = "managed-midi"; version = "1.10.1"; hash = "sha256-iuqpyp8vM7ZjtcM9KNqx9se/UhQHsYrQ+lxL4EntyXU="; })
(fetchNuGet { pname = "Markdig"; version = "0.23.0"; hash = "sha256-4Kjeb54eyas0pCMbTHGPK13vW9zEnFyZ5VStwwtClq8="; })
(fetchNuGet { pname = "MessagePack"; version = "2.5.140"; hash = "sha256-qcqLsxV9RO5/YLWh3gE6vJFgiWg+94GcP2MtptimOBI="; })
(fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.140"; hash = "sha256-im4hZAocYWEn5AS2ACreP3mQTEzkW1MiuUJTycIqHUY="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "7.0.15"; hash = "sha256-jt4q2Myg4q/1Re1mF9Div996F2v1e2ldgh6/Pl7mxmQ="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "7.0.15"; hash = "sha256-r3VgxAQQf+61qpb5Q/t303zHszMQPACLoIT/As0KK50="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "7.0.15"; hash = "sha256-yf8ZpFTkvWprefgQNZ7/UyyT8kVs819gCxgQrwE5ee0="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "7.0.15"; hash = "sha256-wMIMPjLrtJl2l6G6j5yWsKl1xlsBfuo/2+J4LRFC/fM="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "7.0.15"; hash = "sha256-VvWPMcsDT3bPEmY2dVgpA9dRul0qfKN4U0Nnn7fK/t8="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "7.0.15"; hash = "sha256-uXqQad5ASMKKZtQKo/w0fsClZISDhhGCwJeY0EzqzJM="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "7.0.15"; hash = "sha256-4T21EUPDtqFopytkCzJ0/MU6zPcJnNU4B9iLORwG/AU="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; version = "7.0.15"; hash = "sha256-SBcERzI/Bq6TgkJtUVJtHFFBeD1Vu0i/aZTj/7Bse/o="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; version = "7.0.15"; hash = "sha256-p+D4hwtbRdXlHb/5fhfrC5aTTIrCHtvVZUjtWZQKUC8="; })
(fetchNuGet { pname = "MessagePack"; version = "2.5.187"; hash = "sha256-3sBINhdkGdKPKTKxE4YuLGFHg6stAEHUIboR1g7eXgA="; })
(fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.187"; hash = "sha256-SQCJa6u8coWMptbR9iQJLjoi/YkT9t0kJNbojh9vUPw="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "8.0.10"; hash = "sha256-xnc9qaYB07MAlqCswm6kUX0HMAKcBhxWXClPN2bB8ZA="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "8.0.10"; hash = "sha256-yp0hgu8kyTE2zU156TWmRUpW24SAaKJm7he4MnEuiG8="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "8.0.10"; hash = "sha256-ulLp+Rni007Wq9n5w2BA8DX7uG1HhYNF/KV5TN3SKSs="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "8.0.10"; hash = "sha256-GEiMdjLvuc0Xmxj9/zKo3b4Y0Vh5jAjfZqPs6vwj5o0="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "8.0.10"; hash = "sha256-vTk+Smuu0Pi/MmmHZtIjdyBsZuC0gWsL/63ovmtMRWQ="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "8.0.10"; hash = "sha256-LlOfWupgG9pXpNXOfHo3/tmS9ZZy3hziAEqI1X42sh4="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "8.0.10"; hash = "sha256-ZWDnjvZLr0FK91cyeJxtAJk2Cf+YW+6SZTW+zEIozGc="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; version = "8.0.10"; hash = "sha256-xgxjqns/uNbzisoPX1cAmqMMrRCHxcon+l8I5TLUKGo="; })
(fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; version = "8.0.10"; hash = "sha256-HgRvpIaMuEUMJGGuUCxxEigHv/Tlb2/Pd+OQJBHE5DU="; })
(fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.4"; hash = "sha256-YPTHTZ8xRPMLADdcVYRO/eq3O9uZjsD+OsGRZE+0+e8="; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; hash = "sha256-dAhj/CgXG5VIy2dop1xplUsLje7uBPFjxasz9rdFIgY="; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; })
(fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.12"; hash = "sha256-Qf9PrGsXtSh7iYlRuFr6D5fGjykBNl8spAXfKLFckhY="; })
(fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.10"; hash = "sha256-YBjY88KAC4ShfcGXcNHL6y1A9NH2xvk4d/qTMfuLuoE="; })
(fetchNuGet { pname = "Microsoft.Diagnostics.NETCore.Client"; version = "0.2.61701"; hash = "sha256-ITNO2LJYyWhYs3A/iqfoaW6ddvkuuBVXQ5YSKQ8wgcU="; })
(fetchNuGet { pname = "Microsoft.Diagnostics.Runtime"; version = "2.0.161401"; hash = "sha256-ke9rovup7UFVz2T6HYtHawwrs/XARLDQOwCysC2qDAs="; })
(fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.0.3"; hash = "sha256-qRoDjAl3I8hYH6tQw06UVn5cf55avtTCjRDUzjUJAgg="; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "7.0.0"; hash = "sha256-QwX//PcURR6aGhH1QFkVmSayqnHaCsFPeE9d8J9nSKs="; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0-rc.1.21451.13"; hash = "sha256-zJQsAVTfA46hUV5q67BslsVn9yehYBclD06wg2UhyWQ="; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; hash = "sha256-N2DHyHiaNvYDQ77f8HI0gE0uIX2aj/rvejVGdCXRP4g="; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.1"; hash = "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU="; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; hash = "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4="; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; hash = "sha256-oTYhI+lMwaQ7l9CfDHeNMBAdfofv4kHC0vqBZ7oJr4U="; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; hash = "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA="; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.2"; hash = "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.0.3"; hash = "sha256-itpwRYzmJZUt2kYJrrcq2IOwqqOskdbE3HMmD8GV/jY="; })
(fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "7.0.15"; hash = "sha256-EnqalFuhuEsdm/4Op2K+yAdvWzad3L7hKcnwFwahypE="; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; hash = "sha256-rr/NXIZ/3FG5FYGrHD7iIIr12AksP4CnfUy1YvEdDa8="; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; hash = "sha256-uoMkX/TnwP0YabThacTMmyxdc9itQp73CN7xEFFox74="; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.1"; hash = "sha256-05mravm6SK0wNV3BKDTmN+8/1RxcPOM9kaUvGhjWY3c="; })
(fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "8.0.10"; hash = "sha256-mJXz6jSbr1xG8L3cILyODzX21uh5o4Qy9yWYgZ6okxM="; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.1"; hash = "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU="; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; hash = "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.2"; hash = "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="; })
(fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "5.0.11"; hash = "sha256-xNqhEqOm7tI3nxdlbAJ9NSm5/WbkRSUCrdDM+syJ9EQ="; })
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; hash = "sha256-pj9I/2HpCU7bLu002/Bb5NF+ofUrJ3IyH7yVqfP8IC0="; })
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.1"; hash = "sha256-uI5Mo+e+8x7mhDcFyDEW2Nwg+LTpw+0R38LZ/ognHz4="; })
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; hash = "sha256-AGnfNNDvZDGZ0Er9JQxeyLoUbVH+jfXF3anFr12qk6w="; })
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; hash = "sha256-DxnEgGiCXpkrxFkxXtOXqwaiAtoIjA8VSSWCcsW0FwE="; })
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.2"; hash = "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys="; })
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; hash = "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4="; })
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; })
(fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.6.3"; hash = "sha256-H2Qw8x47WyFOd/VmgRmGMc+uXySgUv68UISgK8Frsjw="; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; })
@@ -124,7 +124,7 @@
(fetchNuGet { pname = "NuGet.ProjectModel"; version = "5.11.0"; hash = "sha256-Bdwsy96KpU44Dr6JVKPOhOmiZYZ/uMKQ0Ug2nKZiDcQ="; })
(fetchNuGet { pname = "NuGet.Protocol"; version = "5.11.0"; hash = "sha256-q11PcqNtfTKavfr1SPtmJTEx3qwHrXW+MrCw6Y3aNxA="; })
(fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.0"; hash = "sha256-eBfn91Kr7Vv+js8kvKrnai2W3ZN7dY+7u9ivHGwoIxA="; })
(fetchNuGet { pname = "NuGet.Versioning"; version = "6.10.1"; hash = "sha256-jOh27AORk0TIhVePDVAgVhh6FuUo2v3oh/Xapcw7UVI="; })
(fetchNuGet { pname = "NuGet.Versioning"; version = "6.12.1"; hash = "sha256-f/ejCuzCAwKs4N4Ec6yf2RovrhBT0nj0hRDP+03/Iy4="; })
(fetchNuGet { pname = "NUnit"; version = "3.14.0"; hash = "sha256-CuP/q5HovPWfAW3Cty/QxRi7VpjykJ3TDLq5TENI6KY="; })
(fetchNuGet { pname = "NVika"; version = "3.0.0"; hash = "sha256-zgg8aUuIFQ4EZHScy+YHmkwDE9K5vzUJF8s9aiJNFuw="; })
(fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.4"; hash = "sha256-tTk8ezYrMs/Kj+snMvWq9Ae7WLU4pq5NpFHEZV8WjJM="; })
@@ -138,13 +138,13 @@
(fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; hash = "sha256-VfIbFhCDsCRZW5bCbt8MSmE2kAlcKxxx6vdFOus4he8="; })
(fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; hash = "sha256-qUEGJHoYfDvHrpuXdVaiSoV2iVVh9X0yEB41u96+q6A="; })
(fetchNuGet { pname = "ppy.ManagedBass.Wasapi"; version = "2022.1216.0"; hash = "sha256-HzhypEVJA+6h3aBB95zNeGbmzEIRc5435Eh9nYpjVkA="; })
(fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.1009.0"; hash = "sha256-aLZcnVYyrLMeaoz/Jt49m5Po5i814MvtcGcVOVu18ls="; })
(fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.1115.0"; hash = "sha256-liRLzcqMRtWNau6g5GCMyy/SMSr1P9OrFbX4bQ/suj4="; })
(fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2024.809.1-nativelibs"; hash = "sha256-F7xd66bCEDgEjYgqmx21lYde+ebCsX/E2fuqWXH4xyU="; })
(fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; hash = "sha256-XXV/qBJ9vEVF15fcOlDyoJ8j47azuSJaXHEgsn3fOwA="; })
(fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.1003.0"; hash = "sha256-aeY9jfvyC+GFovHs0b5SSGZHMOO5tMMplZQWIRxo9DA="; })
(fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.1106.0"; hash = "sha256-U9Esfl6U08//21VwWr4CBt1CPYGsB9I7ssfBGkQkLOI="; })
(fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; hash = "sha256-Xu4uiYs1pqIXcBWeTBIc8OIqbLmH6MvaY6Dim4ZNikg="; })
(fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.741-alpha"; hash = "sha256-sdX+MoMlIPUyi4yEUVHtqxKWF/VK04e2VaUavmgBEJU="; })
(fetchNuGet { pname = "ppy.SDL3-CS"; version = "2024.916.0"; hash = "sha256-ioILyAlyMiaVVGYxoLzNH78Mlp1Dfbv5xKjDWtwCP8M="; })
(fetchNuGet { pname = "ppy.SDL3-CS"; version = "2024.1022.0"; hash = "sha256-+i2YGAK9AqWpGsAcJSvVTSnGpZhItamrPiwDo9Mm4bk="; })
(fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.62-gca0239da6b"; hash = "sha256-mGlMQbp2/ewA7PzamEeMA1pbboC73iAIARhK4MPrwO4="; })
(fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.62-gca0239da6b"; hash = "sha256-8jkbU2QV4HV8RU1vnSNtP8kNEhDWbTb3Dr2cl8w/T6A="; })
(fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.62-gca0239da6b"; hash = "sha256-I81to2x5D4LlIJN80d5DbqcU0jPTVSPoc0tvL15YG6I="; })
@@ -196,17 +196,17 @@
(fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; hash = "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="; })
(fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; })
(fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; })
(fetchNuGet { pname = "Sentry"; version = "4.3.0"; hash = "sha256-OKwFAQWU626jjNBz4DBWyiQnOMjDhkqMb6VpfX16RUw="; })
(fetchNuGet { pname = "SharpCompress"; version = "0.36.0"; hash = "sha256-8FIcC5b7A5gNqIwxBlolBuxilmSHCDpObpQ+MuGdkZg="; })
(fetchNuGet { pname = "Sentry"; version = "4.13.0"; hash = "sha256-JeyxQFOic72eQ41Guy4NbPy/A4wXvA812229vpLcLCM="; })
(fetchNuGet { pname = "SharpCompress"; version = "0.38.0"; hash = "sha256-bQL3kazuqbuqn+Csy9RYMMUsNMtqkGXF7x32s787UBM="; })
(fetchNuGet { pname = "SharpFNT"; version = "2.0.0"; hash = "sha256-oNeQKFY4LcTdc3s78WxzODYNylrZmSg3BpMtmOBj6q0="; })
(fetchNuGet { pname = "SharpGen.Runtime"; version = "2.0.0-beta.13"; hash = "sha256-CB4681QJaYoL3MCFn4SwgCWxtFf7T/oZQQ6+pLT5oIg="; })
(fetchNuGet { pname = "SharpGen.Runtime.COM"; version = "2.0.0-beta.13"; hash = "sha256-xoQQrf8RIeNwx4aZjXDECd2ROZCj3SFk8q+eJ64cu9I="; })
(fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.5"; hash = "sha256-3UehX9T+I81nfgv2dTHlpoPgYzXFk7kHr1mmlQOCBfw="; })
(fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.8"; hash = "sha256-HGqUUFmkFaS6G/41vZD4xQA9CiATdDRk6ukDGGiEslQ="; })
(fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; hash = "sha256-jSI3SIE/HBLEvM+IzhfnAS0QU+JQzIokC/lGLNLvUyU="; })
(fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.8"; hash = "sha256-j7004Tk/GyQigot9Sx5cgAU9dzhFfOGs02zaj412x8g="; })
(fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.8"; hash = "sha256-Omio9F3a0w52x3CLpk/MOCmB5yeaFxVV9ZOMU18eKew="; })
(fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.8"; hash = "sha256-eE2gvpsXhtAmYqdxLhrne+/u4V/o7tbicuGUEWL4p4s="; })
(fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.10"; hash = "sha256-kZIWjH/TVTXRIsHPZSl7zoC4KAMBMWmgFYGLrQ15Occ="; })
(fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.10"; hash = "sha256-gpZcYwiJVCVwCyJu0R6hYxyMB39VhJDmYh9LxcIVAA8="; })
(fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.6"; hash = "sha256-RxWjm52PdmMV98dgDy0BCpF988+BssRZUgALLv7TH/E="; })
(fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.10"; hash = "sha256-m2v2RQWol+1MNGZsx+G2N++T9BNtQGLLHXUjcwkdCnc="; })
(fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.10"; hash = "sha256-MLs3jiETLZ7k/TgkHynZegCWuAbgHaDQKTPB0iNv7Fg="; })
(fetchNuGet { pname = "StbiSharp"; version = "1.1.0"; hash = "sha256-oP64y/hYgoYo+heDFzmt6sWukTF0lDDFkB16eyoQfHE="; })
(fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; hash = "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs="; })
(fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; })
@@ -238,7 +238,7 @@
(fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; })
(fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; })
(fetchNuGet { pname = "System.IO.Packaging"; version = "8.0.1"; hash = "sha256-xf0BAfqQvITompBsvfpxiLts/6sRQEzdjNA3f/q/vY4="; })
(fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; hash = "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY="; })
(fetchNuGet { pname = "System.IO.Pipelines"; version = "8.0.0"; hash = "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="; })
(fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; })
(fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; })
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; })
@@ -312,7 +312,7 @@
(fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; })
(fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; })
(fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; hash = "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE="; })
(fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; hash = "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM="; })
(fetchNuGet { pname = "System.Threading.Channels"; version = "8.0.0"; hash = "sha256-c5TYoLNXDLroLIPnlfyMHk7nZ70QAckc/c7V199YChg="; })
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; })
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; })
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; })
@@ -321,11 +321,11 @@
(fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; })
(fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; })
(fetchNuGet { pname = "TagLibSharp"; version = "2.3.0"; hash = "sha256-PD9bVZiPaeC8hNx2D+uDUf701cCaMi2IRi5oPTNN+/w="; })
(fetchNuGet { pname = "Velopack"; version = "0.0.630-g9c52e40"; hash = "sha256-6dSuIl1HpqOaIPiCziQSgkDGiPf04q253ADYAo0rghA="; })
(fetchNuGet { pname = "Velopack"; version = "0.0.915"; hash = "sha256-L31qPk7/MLexF+5FP4gdNfwAWB6kNlvMFL2nfkQBSQU="; })
(fetchNuGet { pname = "Vortice.D3DCompiler"; version = "2.4.2"; hash = "sha256-LXdgts8lKbTU67c1W001XRbq5nenzf8XcYCRxc75jR8="; })
(fetchNuGet { pname = "Vortice.Direct3D11"; version = "2.4.2"; hash = "sha256-hU4qzLKhv4QxiP2c9s4IZUGgeQxsOjRhgurrlXXq/qM="; })
(fetchNuGet { pname = "Vortice.DirectX"; version = "2.4.2"; hash = "sha256-LOIxdET0ynaJz70fakVwDYU0qm+1P0SfD1+I9P320oc="; })
(fetchNuGet { pname = "Vortice.DXGI"; version = "2.4.2"; hash = "sha256-/5r4f9iM/wxZLsauQDbq6DoTTdvuuhbcmNgaxVK1ep8="; })
(fetchNuGet { pname = "Vortice.Mathematics"; version = "1.4.25"; hash = "sha256-Mr/HVvwIeeDJtMNToP6kh2hyqud2zT31913HdhB4hm4="; })
(fetchNuGet { pname = "ZstdSharp.Port"; version = "0.7.4"; hash = "sha256-z39r5ekafRbZAsKbOtAlL7ymW5SLosb0NUlStqvPBwE="; })
(fetchNuGet { pname = "ZstdSharp.Port"; version = "0.8.1"; hash = "sha256-PeQvyz3lUrK+t+n1dFtNXCLztQtAfkqUuM6mOqBZHLg="; })
]
pkgs/by-name/os/osu-lazer/package.nix
+3 -2
View File
@@ -20,13 +20,13 @@
buildDotnetModule rec {
pname = "osu-lazer";
version = "2024.1009.1";
version = "2024.1115.3";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
rev = version;
hash = "sha256-odWTLvx41miFgn4O/EDzwm2pfWKxj4B1ieSfNS0hrW8=";
hash = "sha256-AZN/zgHV6ydImOd1zUjYqXJqq5o0XGnvNvTTL/mIrHg=";
};
projectFile = "osu.Desktop/osu.Desktop.csproj";
@@ -106,6 +106,7 @@ buildDotnetModule rec {
maintainers = with lib.maintainers; [
gepbird
thiagokokada
Guanran928
];
platforms = [ "x86_64-linux" ];
mainProgram = "osu!";
pkgs/by-name/pa/paperless-ngx/package.nix
+2 -2
View File
@@ -25,13 +25,13 @@
}:
let
version = "2.13.4";
version = "2.13.5";
src = fetchFromGitHub {
owner = "paperless-ngx";
repo = "paperless-ngx";
rev = "refs/tags/v${version}";
hash = "sha256-db8omhyngvenAgfGGpMAhGkgqGug/sv7AL1G+sniM/c=";
hash = "sha256-AVfm5tC2+hTdEv0ildEj0El1M/sF7ftkEn3pUkG1O7Q=";
};
# subpath installation is broken with uvicorn >= 0.26
pkgs/by-name/st/stalwart-mail/package.nix
+3 -3
View File
@@ -25,7 +25,7 @@ let
# See upstream issue for rocksdb 9.X support
# https://github.com/stalwartlabs/mail-server/issues/407
rocksdb = rocksdb_8_11;
version = "0.10.5";
version = "0.10.6";
in
rustPlatform.buildRustPackage {
pname = "stalwart-mail";
@@ -35,11 +35,11 @@ rustPlatform.buildRustPackage {
owner = "stalwartlabs";
repo = "mail-server";
rev = "refs/tags/v${version}";
hash = "sha256-MD9zAWeitP3cXxzR4znqL551AGFbOcRzhV3goY6l/iY=";
hash = "sha256-/mY8WNQMp15LoFhNJjNzT/SB4dJya6SXvO9A4ZR8WGM=";
fetchSubmodules = true;
};
cargoHash = "sha256-ug49H6RWLlDdJNVW/BJcqNsG/NDNgWiqR8GiZ/HVrvY=";
cargoHash = "sha256-Bd88dJo7Bf/6tmt+x/tkeWecKEZtFVYhyHhGU+/qPIs=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/st/stalwart-mail/webadmin.nix
+3 -3
View File
@@ -16,13 +16,13 @@
rustPlatform.buildRustPackage rec {
pname = "webadmin";
version = "0.1.17";
version = "0.1.19";
src = fetchFromGitHub {
owner = "stalwartlabs";
repo = "webadmin";
rev = "refs/tags/v${version}";
hash = "sha256-kMfdCb2dwoVd9G1uZw2wcfaAAPt6obFfWQbbXG/MDB4=";
hash = "sha256-jaNBYVIIxYjle4JQJdcvzl9f5slRvGPKqtzR2WGc0LE=";
};
npmDeps = fetchNpmDeps {
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-na1HEueX8w7kuDp8LEtJ0nD1Yv39cyk6sEMpS1zix2s=";
};
cargoHash = "sha256-0Urr0MsmenFqg25lZAzg7LgJ/NkZHINoOWtPad7G6GE=";
cargoHash = "sha256-r4j4+vwmx8JJn3+6i6z6dYBOr6Efdid6qtw9oolCTW8=";
postPatch = ''
# Using local tailwindcss for compilation
pkgs/by-name/ti/tippecanoe/package.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tippecanoe";
version = "2.64.0";
version = "2.70.0";
src = fetchFromGitHub {
owner = "felt";
repo = "tippecanoe";
rev = finalAttrs.version;
hash = "sha256-5HMyqUdoNFwZccXlsFms4C+jyfMVLCiCcFapC6y7e+M=";
hash = "sha256-v2dLYW05SlUhLHdUfuf211vQe2xg+IIMS4mJteCzWLk=";
};
buildInputs = [ sqlite zlib ];
pkgs/by-name/un/unifi/package.nix
+53
View File
@@ -0,0 +1,53 @@
{
lib,
stdenv,
dpkg,
fetchurl,
nixosTests,
}:
stdenv.mkDerivation rec {
pname = "unifi-controller";
version = "8.6.9";
# see https://community.ui.com/releases / https://www.ui.com/download/unifi
src = fetchurl {
url = "https://dl.ui.com/unifi/${version}/unifi_sysvinit_all.deb";
sha256 = "sha256-004ZJEoj23FyFEBznqrpPzQ9E6DYpD7gBxa3ewSunIo=";
};
nativeBuildInputs = [ dpkg ];
unpackPhase = ''
runHook preUnpack
dpkg-deb -x $src ./
runHook postUnpack
'';
installPhase = ''
runHook preInstall
mkdir -p $out
cd ./usr/lib/unifi
cp -ar dl lib webapps $out
runHook postInstall
'';
passthru.tests = {
unifi = nixosTests.unifi;
};
meta = with lib; {
homepage = "http://www.ubnt.com/";
description = "Controller for Ubiquiti UniFi access points";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.unfree;
platforms = platforms.unix;
maintainers = with maintainers; [
globin
patryk27
];
knownVulnerabilities = [ ];
};
}
pkgs/development/python-modules/wandb/default.nix
+3
View File
@@ -1,6 +1,7 @@
{
lib,
stdenv,
apple-sdk_11,
fetchFromGitHub,
## wandb-core
@@ -178,6 +179,8 @@ buildPythonPackage rec {
hatchling
];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
dependencies =
[
click
pkgs/development/python-modules/weaviate-client/default.nix
+49 -7
View File
@@ -12,11 +12,21 @@
requests,
setuptools-scm,
validators,
pytestCheckHook,
numpy,
pytest-httpserver,
pandas,
polars,
h5py,
litestar,
pytest-asyncio,
flask,
fastapi,
}:
buildPythonPackage rec {
pname = "weaviate-client";
version = "4.8.1";
version = "4.9.3";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -25,37 +35,69 @@ buildPythonPackage rec {
owner = "weaviate";
repo = "weaviate-python-client";
rev = "refs/tags/v${version}";
hash = "sha256-HSLU9OQMEOCwgxtLj20yJ0Xo9c6SVfMhfVT/F5du17A=";
hash = "sha256-F5vU5JKAOztoJwTe+OL3QKHbuhbbXL5WMia2AYrkRS0=";
};
pythonRelaxDeps = [
"httpx"
"validators"
"authlib"
];
build-system = [ setuptools-scm ];
dependencies = [
authlib
grpcio
flask
grpcio-health-checking
grpcio-tools
h5py
httpx
pydantic
numpy
litestar
fastapi
polars
requests
pandas
validators
];
doCheck = false;
nativeCheckInputs = [
pytest-httpserver
pytest-asyncio
pytestCheckHook # pytestCheckHook won't work
];
preCheck = ''
export HOME=$(mktemp -d)
sed -i '/raw.githubusercontent.com/,+1d' test/test_util.py
substituteInPlace pytest.ini \
--replace-fail "--benchmark-skip" ""
rm -rf test/test_embedded.py # Need network
'';
disabledTests = [
# Need network
"test_bearer_token"
"test_token_refresh_timeout"
"test_with_simple_auth_no_oidc_via_api_key"
"test_client_with_extra_options"
];
pytestFlagsArray = [
"test"
"mock_tests"
];
pythonImportsCheck = [ "weaviate" ];
meta = with lib; {
meta = {
description = "Python native client for easy interaction with a Weaviate instance";
homepage = "https://github.com/weaviate/weaviate-python-client";
changelog = "https://github.com/weaviate/weaviate-python-client/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ happysalada ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ happysalada ];
};
}
pkgs/development/python-modules/weconnect-mqtt/default.nix
+5 -5
View File
@@ -2,7 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
paho-mqtt,
paho-mqtt_2,
pytestCheckHook,
python-dateutil,
pythonOlder,
@@ -40,7 +40,7 @@ buildPythonPackage rec {
dependencies = [
paho-mqtt
paho-mqtt_2
python-dateutil
weconnect
] ++ weconnect.optional-dependencies.Images;
@@ -49,12 +49,12 @@ buildPythonPackage rec {
pythonImportsCheck = [ "weconnect_mqtt" ];
meta = with lib; {
meta = {
description = "Python client that publishes data from Volkswagen WeConnect";
homepage = "https://github.com/tillsteinbach/WeConnect-mqtt";
changelog = "https://github.com/tillsteinbach/WeConnect-mqtt/releases/tag/v${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ fab ];
mainProgram = "weconnect-mqtt";
};
}
pkgs/servers/openafs/1.8/module.nix
+1 -27
View File
@@ -30,33 +30,7 @@ stdenv.mkDerivation {
version = "${version}-${kernel.modDirVersion}";
inherit src;
patches = [
# Linux-6.10: Use filemap_alloc_folio when avail
(fetchpatch {
url = "https://github.com/openafs/openafs/commit/0f6a3a402f4a66114da9231032bd68cdc4dee7bc.patch";
hash = "sha256-1D0mijyF4hbd+xCONT50cd6T9eCpeM8Li3nCI7HgLPA=";
})
# Linux-6.10: define a wrapper for vmalloc
(fetchpatch {
url = "https://github.com/openafs/openafs/commit/658942f2791fad5e33ec7542158c16dfc66eed39.patch";
hash = "sha256-MhfAUX/eNOEkjO0cGVbnIdObMlGtLdCnnGfJECDwO+A=";
})
# Linux-6.10: remove includes for asm/ia32_unistd.h
(fetchpatch {
url = "https://github.com/openafs/openafs/commit/03b280649f5e22ed74c217d7c98c3416a2fa9052.patch";
hash = "sha256-ZdXz2ziuflqz7zNzjepuGvwDAPM31FIzsoEa4iNdLmo=";
})
# afs: avoid empty-body warning
(fetchpatch {
url = "https://github.com/openafs/openafs/commit/d8b56f21994ce66d8daebb7d69e792f34c1a19ed.patch";
hash = "sha256-10VUfZdZiOC8xSPM0nq8onqiv7X/Vv4/WwGlkqWkNkQ=";
})
# Linux 6.10: Move 'inline' before func return type
(fetchpatch {
url = "https://github.com/openafs/openafs/commit/7097eec17bc01bcfc12c4d299136b2d3b94ec3d7.patch";
hash = "sha256-PZmqeXWJL3EQFD9250YfDwCY1rvSGVCbAhzyHP1pE0Q=";
})
];
patches = [ ];
nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ]
++ kernel.moduleBuildDependencies;
pkgs/servers/openafs/1.8/srcs.nix
+3 -3
View File
@@ -1,16 +1,16 @@
{ fetchurl }:
rec {
version = "1.8.12";
version = "1.8.13";
src = fetchurl {
url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
hash = "sha256-EP6mgQxsCwD/ss0/OO1zLBfP15VcoJVNwkoqYXKibnU=";
hash = "sha256-eRABcMokkLEpXZuLEwWPMOI9eruJe/GgcXVddnB4vdE=";
};
srcs = [
src
(fetchurl {
url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
hash = "sha256-ZMbDE8c9S7fHclRQo+bcSiXuHBtxt3IoSABOvOWWJWc=";
hash = "sha256-1PPUL05XZkfbIV2rc8Nl0gQ9MmrT0hqA+MRzGdPkP+U=";
})
];
}
pkgs/servers/sql/postgresql/generic.nix
+20 -12
View File
@@ -305,25 +305,33 @@ let
};
});
postgresqlWithPackages = { postgresql, buildEnv }: f: buildEnv {
postgresqlWithPackages = { postgresql, buildEnv }: f: let
installedExtensions = f postgresql.pkgs;
in buildEnv {
name = "${postgresql.pname}-and-plugins-${postgresql.version}";
paths = f postgresql.pkgs ++ [
paths = installedExtensions ++ [
postgresql
postgresql.man # in case user installs this into environment
];
pathsToLink = ["/"];
passthru.version = postgresql.version;
passthru.psqlSchema = postgresql.psqlSchema;
passthru.withJIT = postgresqlWithPackages {
inherit buildEnv;
postgresql = postgresql.withJIT;
} f;
passthru.withoutJIT = postgresqlWithPackages {
inherit buildEnv;
postgresql = postgresql.withoutJIT;
} f;
passthru = {
inherit installedExtensions;
inherit (postgresql)
psqlSchema
version
;
withJIT = postgresqlWithPackages {
inherit buildEnv;
postgresql = postgresql.withJIT;
} f;
withoutJIT = postgresqlWithPackages {
inherit buildEnv;
postgresql = postgresql.withoutJIT;
} f;
};
};
in
pkgs/servers/unifi/default.nix
-54
View File
@@ -1,54 +0,0 @@
{ lib, stdenv, dpkg, fetchurl, zip, nixosTests }:
let
generic = { version, sha256, suffix ? "", knownVulnerabilities ? [ ], ... } @ args:
stdenv.mkDerivation (args // {
pname = "unifi-controller";
src = fetchurl {
url = "https://dl.ubnt.com/unifi/${version}${suffix}/unifi_sysvinit_all.deb";
inherit sha256;
};
nativeBuildInputs = [ dpkg ];
unpackPhase = ''
runHook preUnpack
dpkg-deb -x $src ./
runHook postUnpack
'';
installPhase = ''
runHook preInstall
mkdir -p $out
cd ./usr/lib/unifi
cp -ar dl lib webapps $out
runHook postInstall
'';
passthru.tests = {
unifi = nixosTests.unifi;
};
meta = with lib; {
homepage = "http://www.ubnt.com/";
description = "Controller for Ubiquiti UniFi access points";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.unfree;
platforms = platforms.unix;
maintainers = with maintainers; [ globin patryk27 ];
inherit knownVulnerabilities;
};
});
in rec {
# see https://community.ui.com/releases / https://www.ui.com/download/unifi
unifi8 = generic {
version = "8.5.6";
suffix = "-1x29lm155t";
sha256 = "sha256-ZpCoE8OPb3FcKzf7Nurf9q+g2BpbjZcp1LvWOsV/tpA=";
};
}
pkgs/tools/audio/wyoming/openwakeword.nix
+1 -1
View File
@@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
];
propagatedBuildInputs = with python3Packages; [
tensorflow
tensorflow-bin
wyoming
];
pkgs/top-level/aliases.nix
+1
View File
@@ -1250,6 +1250,7 @@ mapAliases {
unifi5 = throw "'unifi5' has been removed since its required MongoDB version is EOL."; # Added 2024-04-11
unifi6 = throw "'unifi6' has been removed since its required MongoDB version is EOL."; # Added 2024-04-11
unifi7 = throw "'unifi7' has been removed since it is vulnerable to CVE-2024-42025 and its required MongoDB version is EOL."; # Added 2024-10-01
unifi8 = unifi; # Added 2024-11-15
unifiLTS = throw "'unifiLTS' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Added 2024-04-11
unifiStable = throw "'unifiStable' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Converted to throw 2024-04-11
untrunc = throw "'untrunc' has been renamed to/replaced by 'untrunc-anthwlock'"; # Converted to throw 2024-10-17
pkgs/top-level/all-packages.nix
+18 -11
View File
@@ -12342,11 +12342,6 @@ with pkgs;
matomo_5
matomo-beta;
inherit (callPackages ../servers/unifi { })
unifi8;
unifi = unifi8;
unpackerr = callPackage ../servers/unpackerr {
inherit (darwin.apple_sdk.frameworks) Cocoa WebKit;
};
@@ -14127,10 +14122,18 @@ with pkgs;
buildMozillaMach = opts: callPackage (import ../applications/networking/browsers/firefox/common.nix opts) { };
firefox-unwrapped = callPackage ../applications/networking/browsers/firefox/packages/firefox.nix { };
firefox-beta-unwrapped = callPackage ../applications/networking/browsers/firefox/packages/firefox-beta.nix { };
firefox-devedition-unwrapped = callPackage ../applications/networking/browsers/firefox/packages/firefox-devedition.nix { };
firefox-esr-128-unwrapped = callPackage ../applications/networking/browsers/firefox/packages/firefox-esr-128.nix { };
firefox-unwrapped = import ../applications/networking/browsers/firefox/packages/firefox.nix {
inherit stdenv lib callPackage fetchurl nixosTests buildMozillaMach;
};
firefox-beta-unwrapped = import ../applications/networking/browsers/firefox/packages/firefox-beta.nix {
inherit stdenv lib callPackage fetchurl nixosTests buildMozillaMach;
};
firefox-devedition-unwrapped = import ../applications/networking/browsers/firefox/packages/firefox-devedition.nix {
inherit stdenv lib callPackage fetchurl nixosTests buildMozillaMach;
};
firefox-esr-128-unwrapped = import ../applications/networking/browsers/firefox/packages/firefox-esr-128.nix {
inherit stdenv lib callPackage fetchurl nixosTests buildMozillaMach;
};
firefox-esr-unwrapped = firefox-esr-128-unwrapped;
firefox = wrapFirefox firefox-unwrapped { };
@@ -14187,7 +14190,9 @@ with pkgs;
wmClass = "firefox-aurora";
};
librewolf-unwrapped = callPackage ../applications/networking/browsers/librewolf { };
librewolf-unwrapped = import ../applications/networking/browsers/librewolf {
inherit stdenv lib callPackage buildMozillaMach nixosTests;
};
librewolf = wrapFirefox librewolf-unwrapped {
inherit (librewolf-unwrapped) extraPrefsFiles extraPoliciesFiles;
@@ -14196,7 +14201,9 @@ with pkgs;
firefox_decrypt = python3Packages.callPackage ../tools/security/firefox_decrypt { };
floorp-unwrapped = callPackage ../applications/networking/browsers/floorp { };
floorp-unwrapped = import ../applications/networking/browsers/floorp {
inherit stdenv lib fetchFromGitHub buildMozillaMach nixosTests;
};
floorp = wrapFirefox floorp-unwrapped { };