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-09-21 12:05:41 +00:00
committed by GitHub
parent 9163a9f3b8 d3ae261fc3
commit b84aacf2e6
58 changed files with 635 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+7
View File
@@ -7053,6 +7053,13 @@
githubId = 5918766;
name = "Franz Thoma";
};
fnune = {
email = "fausto.nunez@mailbox.org";
github = "fnune";
githubId = 16181067;
name = "Fausto Núñez Alberro";
keys = [ { fingerprint = "668E 01D1 B129 3F42 0A0F 933A C880 6451 94A2 D562"; } ];
};
foo-dogsquared = {
email = "foodogsquared@foodogsquared.one";
github = "foo-dogsquared";
nixos/modules/programs/nautilus-open-any-terminal.nix
+20 -7
View File
@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.programs.nautilus-open-any-terminal;
@@ -23,20 +28,28 @@ in
nautilus-open-any-terminal
];
environment.sessionVariables.NAUTILUS_4_EXTENSION_DIR = "${pkgs.nautilus-python}/lib/nautilus/extensions-4";
environment.sessionVariables = lib.mkIf (!config.services.xserver.desktopManager.gnome.enable) {
NAUTILUS_4_EXTENSION_DIR = "${pkgs.nautilus-python}/lib/nautilus/extensions-4";
};
environment.pathsToLink = [
"/share/nautilus-python/extensions"
];
programs.dconf = lib.optionalAttrs (cfg.terminal != null) {
enable = true;
profiles.user.databases = [{
settings."com/github/stunkymonkey/nautilus-open-any-terminal".terminal = cfg.terminal;
lockAll = true;
}];
profiles.user.databases = [
{
settings."com/github/stunkymonkey/nautilus-open-any-terminal".terminal = cfg.terminal;
lockAll = true;
}
];
};
};
meta = {
maintainers = with lib.maintainers; [ stunkymonkey linsui ];
maintainers = with lib.maintainers; [
stunkymonkey
linsui
];
};
}
nixos/modules/services/networking/tailscale.nix
+11 -5
View File
@@ -121,10 +121,16 @@ in {
serviceConfig = {
Type = "oneshot";
};
script = ''
status=$(${config.systemd.package}/bin/systemctl show -P StatusText tailscaled.service)
if [[ $status != Connected* ]]; then
${cfg.package}/bin/tailscale up --auth-key 'file:${cfg.authKeyFile}' ${escapeShellArgs cfg.extraUpFlags}
# https://github.com/tailscale/tailscale/blob/v1.72.1/ipn/backend.go#L24-L32
script = let
statusCommand = "${lib.getExe cfg.package} status --json --peers=false | ${lib.getExe pkgs.jq} -r '.BackendState'";
in ''
while [[ "$(${statusCommand})" == "NoState" ]]; do
sleep 0.5
done
status=$(${statusCommand})
if [[ "$status" == "NeedsLogin" || "$status" == "NeedsMachineAuth" ]]; then
${lib.getExe cfg.package} up --auth-key 'file:${cfg.authKeyFile}' ${escapeShellArgs cfg.extraUpFlags}
fi
'';
};
@@ -137,7 +143,7 @@ in {
Type = "oneshot";
};
script = ''
${cfg.package}/bin/tailscale set ${escapeShellArgs cfg.extraSetFlags}
${lib.getExe cfg.package} set ${escapeShellArgs cfg.extraSetFlags}
'';
};
nixos/modules/services/networking/yggdrasil.nix
+10 -8
View File
@@ -1,6 +1,8 @@
{ config, lib, pkgs, ... }:
with lib;
let
inherit (lib) mkIf mkOption;
inherit (lib.types) nullOr path bool listOf str;
keysPath = "/var/lib/yggdrasil/keys.json";
cfg = config.services.yggdrasil;
@@ -11,14 +13,14 @@ let
in
{
imports = [
(mkRenamedOptionModule
(lib.mkRenamedOptionModule
[ "services" "yggdrasil" "config" ]
[ "services" "yggdrasil" "settings" ])
];
options = with types; {
options = {
services.yggdrasil = {
enable = mkEnableOption "the yggdrasil system service";
enable = lib.mkEnableOption "the yggdrasil system service";
settings = mkOption {
type = format.type;
@@ -73,7 +75,7 @@ in
};
group = mkOption {
type = types.nullOr types.str;
type = nullOr str;
default = null;
example = "wheel";
description = "Group to grant access to the Yggdrasil control socket. If `null`, only root can access the socket.";
@@ -108,9 +110,9 @@ in
'';
};
package = mkPackageOption pkgs "yggdrasil" { };
package = lib.mkPackageOption pkgs "yggdrasil" { };
persistentKeys = mkEnableOption ''
persistentKeys = lib.mkEnableOption ''
persistent keys. If enabled then keys will be generated once and Yggdrasil
will retain the same IPv6 address when the service is
restarted. Keys are stored at ${keysPath}
@@ -232,6 +234,6 @@ in
);
meta = {
doc = ./yggdrasil.md;
maintainers = with lib.maintainers; [ gazally ehmry ];
maintainers = with lib.maintainers; [ gazally ehmry nagy ];
};
}
nixos/tests/all-tests.nix
+1
View File
@@ -805,6 +805,7 @@ in {
postgresql-jit = handleTest ./postgresql-jit.nix {};
postgresql-wal-receiver = handleTest ./postgresql-wal-receiver.nix {};
postgresql-tls-client-cert = handleTest ./postgresql-tls-client-cert.nix {};
postgresql-wal2json = handleTest ./postgresql-wal2json.nix {};
powerdns = handleTest ./powerdns.nix {};
powerdns-admin = handleTest ./powerdns-admin.nix {};
power-profiles-daemon = handleTest ./power-profiles-daemon.nix {};
nixos/tests/postgresql-wal2json.nix
+60
View File
@@ -0,0 +1,60 @@
{
system ? builtins.currentSystem,
config ? { },
pkgs ? import ../.. { inherit system config; },
postgresql ? null,
}:
let
makeTest = import ./make-test-python.nix;
# Makes a test for a PostgreSQL package, given by name and looked up from `pkgs`.
makeTestAttribute = name: {
inherit name;
value = makePostgresqlWal2jsonTest pkgs."${name}";
};
makePostgresqlWal2jsonTest =
postgresqlPackage:
makeTest {
name = "postgresql-wal2json-${postgresqlPackage.name}";
meta.maintainers = with pkgs.lib.maintainers; [ euank ];
nodes.machine = {
services.postgresql = {
package = postgresqlPackage;
enable = true;
extraPlugins = with postgresqlPackage.pkgs; [ wal2json ];
settings = {
wal_level = "logical";
max_replication_slots = "10";
max_wal_senders = "10";
};
};
};
testScript = ''
machine.wait_for_unit("postgresql")
machine.succeed(
"sudo -u postgres psql -qAt -f ${./postgresql/wal2json/example2.sql} postgres > /tmp/example2.out"
)
machine.succeed(
"diff ${./postgresql/wal2json/example2.out} /tmp/example2.out"
)
machine.succeed(
"sudo -u postgres psql -qAt -f ${./postgresql/wal2json/example3.sql} postgres > /tmp/example3.out"
)
machine.succeed(
"diff ${./postgresql/wal2json/example3.out} /tmp/example3.out"
)
'';
};
in
# By default, create one test per postgresql version
if postgresql == null then
builtins.listToAttrs (
map makeTestAttribute (builtins.attrNames (import ../../pkgs/servers/sql/postgresql pkgs))
)
# but if postgresql is set, we're being made as a passthru test for a specific postgres + wal2json version, just run one
else
makePostgresqlWal2jsonTest postgresql
nixos/tests/postgresql/wal2json/LICENSE
+27
View File
@@ -0,0 +1,27 @@
Copyright (c) 2013-2024, Euler Taveira de Oliveira
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this
list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.
* Neither the name of the Euler Taveira de Oliveira nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
nixos/tests/postgresql/wal2json/README.md
+11
View File
@@ -0,0 +1,11 @@
Data in this folder taken from the wal2json README's examples [here](https://github.com/eulerto/wal2json/tree/75629c2e1e81a12350cc9d63782fc53252185d8d#sql-functions)
They are used under the terms of the BSD-3 License, a copy of which is included
in this directory.
These files have been lightly modified in order to make their output more reproducible.
Changes:
- `\o /dev/null` has been added before commands that print LSNs since LSNs aren't reproducible
- `now()` has been replaced with a hardcoded timestamp string for reproducibility
- The test is run with `--quiet`, and the expected output has been trimmed accordingly
nixos/tests/postgresql/wal2json/example2.out
+74
View File
@@ -0,0 +1,74 @@
init
{
"change": [
{
"kind": "message",
"transactional": false,
"prefix": "wal2json",
"content": "this non-transactional message will be delivered even if you rollback the transaction"
}
]
}
{
"change": [
{
"kind": "insert",
"schema": "public",
"table": "table2_with_pk",
"columnnames": ["a", "b", "c"],
"columntypes": ["integer", "character varying(30)", "timestamp without time zone"],
"columnvalues": [1, "Backup and Restore", "2018-03-27 12:05:29.914496"]
}
,{
"kind": "insert",
"schema": "public",
"table": "table2_with_pk",
"columnnames": ["a", "b", "c"],
"columntypes": ["integer", "character varying(30)", "timestamp without time zone"],
"columnvalues": [2, "Tuning", "2018-03-27 12:05:29.914496"]
}
,{
"kind": "insert",
"schema": "public",
"table": "table2_with_pk",
"columnnames": ["a", "b", "c"],
"columntypes": ["integer", "character varying(30)", "timestamp without time zone"],
"columnvalues": [3, "Replication", "2018-03-27 12:05:29.914496"]
}
,{
"kind": "message",
"transactional": true,
"prefix": "wal2json",
"content": "this message will be delivered"
}
,{
"kind": "delete",
"schema": "public",
"table": "table2_with_pk",
"oldkeys": {
"keynames": ["a", "c"],
"keytypes": ["integer", "timestamp without time zone"],
"keyvalues": [1, "2018-03-27 12:05:29.914496"]
}
}
,{
"kind": "delete",
"schema": "public",
"table": "table2_with_pk",
"oldkeys": {
"keynames": ["a", "c"],
"keytypes": ["integer", "timestamp without time zone"],
"keyvalues": [2, "2018-03-27 12:05:29.914496"]
}
}
,{
"kind": "insert",
"schema": "public",
"table": "table2_without_pk",
"columnnames": ["a", "b", "c"],
"columntypes": ["integer", "numeric(5,2)", "text"],
"columnvalues": [1, 2.34, "Tapir"]
}
]
}
stop
nixos/tests/postgresql/wal2json/example2.sql
+31
View File
@@ -0,0 +1,31 @@
CREATE TABLE table2_with_pk (a SERIAL, b VARCHAR(30), c TIMESTAMP NOT NULL, PRIMARY KEY(a, c));
CREATE TABLE table2_without_pk (a SERIAL, b NUMERIC(5,2), c TEXT);
SELECT 'init' FROM pg_create_logical_replication_slot('test_slot', 'wal2json');
BEGIN;
INSERT INTO table2_with_pk (b, c) VALUES('Backup and Restore', '2018-03-27 12:05:29.914496');
INSERT INTO table2_with_pk (b, c) VALUES('Tuning', '2018-03-27 12:05:29.914496');
INSERT INTO table2_with_pk (b, c) VALUES('Replication', '2018-03-27 12:05:29.914496');
-- Avoid printing wal LSNs since they're not reproducible, so harder to assert on
\o /dev/null
SELECT pg_logical_emit_message(true, 'wal2json', 'this message will be delivered');
SELECT pg_logical_emit_message(true, 'pgoutput', 'this message will be filtered');
\o
DELETE FROM table2_with_pk WHERE a < 3;
\o /dev/null
SELECT pg_logical_emit_message(false, 'wal2json', 'this non-transactional message will be delivered even if you rollback the transaction');
\o
INSERT INTO table2_without_pk (b, c) VALUES(2.34, 'Tapir');
-- it is not added to stream because there isn't a pk or a replica identity
UPDATE table2_without_pk SET c = 'Anta' WHERE c = 'Tapir';
COMMIT;
SELECT data FROM pg_logical_slot_get_changes('test_slot', NULL, NULL, 'pretty-print', '1', 'add-msg-prefixes', 'wal2json');
SELECT 'stop' FROM pg_drop_replication_slot('test_slot');
DROP TABLE table2_with_pk;
DROP TABLE table2_without_pk;
nixos/tests/postgresql/wal2json/example3.out
+12
View File
@@ -0,0 +1,12 @@
init
{"action":"M","transactional":false,"prefix":"wal2json","content":"this non-transactional message will be delivered even if you rollback the transaction"}
{"action":"B"}
{"action":"I","schema":"public","table":"table3_with_pk","columns":[{"name":"a","type":"integer","value":1},{"name":"b","type":"character varying(30)","value":"Backup and Restore"},{"name":"c","type":"timestamp without time zone","value":"2019-12-29 04:58:34.806671"}]}
{"action":"I","schema":"public","table":"table3_with_pk","columns":[{"name":"a","type":"integer","value":2},{"name":"b","type":"character varying(30)","value":"Tuning"},{"name":"c","type":"timestamp without time zone","value":"2019-12-29 04:58:34.806671"}]}
{"action":"I","schema":"public","table":"table3_with_pk","columns":[{"name":"a","type":"integer","value":3},{"name":"b","type":"character varying(30)","value":"Replication"},{"name":"c","type":"timestamp without time zone","value":"2019-12-29 04:58:34.806671"}]}
{"action":"M","transactional":true,"prefix":"wal2json","content":"this message will be delivered"}
{"action":"D","schema":"public","table":"table3_with_pk","identity":[{"name":"a","type":"integer","value":1},{"name":"c","type":"timestamp without time zone","value":"2019-12-29 04:58:34.806671"}]}
{"action":"D","schema":"public","table":"table3_with_pk","identity":[{"name":"a","type":"integer","value":2},{"name":"c","type":"timestamp without time zone","value":"2019-12-29 04:58:34.806671"}]}
{"action":"I","schema":"public","table":"table3_without_pk","columns":[{"name":"a","type":"integer","value":1},{"name":"b","type":"numeric(5,2)","value":2.34},{"name":"c","type":"text","value":"Tapir"}]}
{"action":"C"}
stop
nixos/tests/postgresql/wal2json/example3.sql
+26
View File
@@ -0,0 +1,26 @@
CREATE TABLE table3_with_pk (a SERIAL, b VARCHAR(30), c TIMESTAMP NOT NULL, PRIMARY KEY(a, c));
CREATE TABLE table3_without_pk (a SERIAL, b NUMERIC(5,2), c TEXT);
SELECT 'init' FROM pg_create_logical_replication_slot('test_slot', 'wal2json');
BEGIN;
INSERT INTO table3_with_pk (b, c) VALUES('Backup and Restore', '2019-12-29 04:58:34.806671');
INSERT INTO table3_with_pk (b, c) VALUES('Tuning', '2019-12-29 04:58:34.806671');
INSERT INTO table3_with_pk (b, c) VALUES('Replication', '2019-12-29 04:58:34.806671');
\o /dev/null
SELECT pg_logical_emit_message(true, 'wal2json', 'this message will be delivered');
SELECT pg_logical_emit_message(true, 'pgoutput', 'this message will be filtered');
DELETE FROM table3_with_pk WHERE a < 3;
SELECT pg_logical_emit_message(false, 'wal2json', 'this non-transactional message will be delivered even if you rollback the transaction');
\o
INSERT INTO table3_without_pk (b, c) VALUES(2.34, 'Tapir');
-- it is not added to stream because there isn't a pk or a replica identity
UPDATE table3_without_pk SET c = 'Anta' WHERE c = 'Tapir';
COMMIT;
SELECT data FROM pg_logical_slot_get_changes('test_slot', NULL, NULL, 'format-version', '2', 'add-msg-prefixes', 'wal2json');
SELECT 'stop' FROM pg_drop_replication_slot('test_slot');
DROP TABLE table3_with_pk;
DROP TABLE table3_without_pk;
pkgs/applications/audio/jacktrip/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
}:
stdenv.mkDerivation rec {
version = "2.3.1";
version = "2.4.0";
pname = "jacktrip";
src = fetchFromGitHub {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
repo = "jacktrip";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-p5NXGmWIzi8M177bPzMKfXMmyMgS1qZuWHdCtBBLeDA=";
hash = "sha256-sTCzmQ/dq12ZmkbarVX1jpSODlBf9OuSB1XwKUnfV64=";
};
preConfigure = ''
pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+7
View File
@@ -539,6 +539,13 @@ let
(attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ];
});
zig-mode = super.zig-mode.overrideAttrs (attrs: {
postPatch = attrs.postPatch or "" + ''
substituteInPlace zig-mode.el \
--replace-fail 'zig-zig-bin "zig"' 'zig-zig-bin "${lib.getExe pkgs.zig}"'
'';
});
zmq = super.zmq.overrideAttrs (old: {
stripDebugList = [ "share" ];
preBuild = ''
pkgs/applications/editors/quartus-prime/default.nix
+34 -6
View File
@@ -1,5 +1,5 @@
{ lib, buildFHSEnv, callPackage, makeDesktopItem, runtimeShell
, runCommand, unstick, quartus-prime-lite
, runCommand, unstick, quartus-prime-lite, libfaketime, pkgsi686Linux
, withQuesta ? true
, supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ]
, unwrapped ? callPackage ./quartus.nix { inherit unstick supportedDevices withQuesta; }
@@ -85,15 +85,28 @@ in buildFHSEnv rec {
progs_wrapped=()
for prog in ''${progs_to_wrap[@]}; do
relname="''${prog#"${unwrapped}/"}"
bname="$(basename "$relname")"
wrapped="$out/$relname"
progs_wrapped+=("$wrapped")
mkdir -p "$(dirname "$wrapped")"
echo "#!${runtimeShell}" >> "$wrapped"
NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK=1
case "$relname" in
questa_fse/*)
echo "export NIXPKGS_IS_QUESTA_WRAPPER=1" >> "$wrapped"
# Any use of LD_PRELOAD breaks Questa, so disable the
# SOURCE_DATE_EPOCH code path.
NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK=0
;;
esac
# SOURCE_DATE_EPOCH blocklist for programs that are known to hang/break
# with fixed/static clock.
case "$bname" in
jtagd|quartus_pgm|quartus)
NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK=0
;;
esac
echo "export NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK=$NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK" >> "$wrapped"
echo "exec $wrapper $prog \"\$@\"" >> "$wrapped"
done
@@ -116,6 +129,17 @@ in buildFHSEnv rec {
if [ "$NIXPKGS_IS_QUESTA_WRAPPER" != 1 ]; then
export LD_PRELOAD=''${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libudev.so.0
fi
# Implement the SOURCE_DATE_EPOCH specification for reproducible builds
# (https://reproducible-builds.org/specs/source-date-epoch).
# Require opt-in with NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD=1 for now, in case
# the blocklist is incomplete.
if [ -n "$SOURCE_DATE_EPOCH" ] && [ "$NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD" = 1 ] && [ "$NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK" = 1 ]; then
export LD_LIBRARY_PATH="${lib.makeLibraryPath [ libfaketime pkgsi686Linux.libfaketime ]}''${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
export LD_PRELOAD=libfaketime.so.1''${LD_PRELOAD:+:$LD_PRELOAD}
export FAKETIME_FMT="%s"
export FAKETIME="$SOURCE_DATE_EPOCH"
fi
'' + extraProfile;
# Run the wrappers directly, instead of going via bash.
@@ -126,6 +150,7 @@ in buildFHSEnv rec {
tests = {
buildSof = runCommand "quartus-prime-lite-test-build-sof"
{ nativeBuildInputs = [ quartus-prime-lite ];
env.NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD = "1";
}
''
cat >mydesign.vhd <<EOF
@@ -153,12 +178,15 @@ in buildFHSEnv rec {
exit 1
fi
touch "$out"
sha1sum mydesign.sof > "$out"
'';
questaEncryptedModel = runCommand "quartus-prime-lite-test-questa-encrypted-model" {} ''
"${quartus-prime-lite}/bin/vlog" "${quartus-prime-lite.unwrapped}/questa_fse/intel/verilog/src/arriav_atoms_ncrypt.v"
touch "$out"
'';
questaEncryptedModel = runCommand "quartus-prime-lite-test-questa-encrypted-model"
{ env.NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD = "1";
}
''
"${quartus-prime-lite}/bin/vlog" "${quartus-prime-lite.unwrapped}/questa_fse/intel/verilog/src/arriav_atoms_ncrypt.v"
touch "$out"
'';
};
};
pkgs/applications/editors/vscode/vscode.nix
+8 -8
View File
@@ -30,21 +30,21 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
x86_64-linux = "0glnqj8kr7m6dq5nbygjwlgim8cngrh3idc10zp05rg0n364906v";
x86_64-darwin = "18xy36jha1ixd8lb0dg045ld9qivyjlds90i2k6rh974mx8jl7rj";
aarch64-linux = "1hdjmfjpdycsj78dfsjyidpg8mx7s66b4sb7xih87vfqvzhfmyw2";
aarch64-darwin = "1xjqq5fz8blprxjnck8zbn933y7kgx1hnq3nc887kp7q0879p9kr";
armv7l-linux = "07rnkswy2lv8wad0iiaknrd329bj1hdadzcklgd34dmqpgr28lij";
x86_64-linux = "0475kwa3ym14l9ggaf2hg4lcrc0lpi9vchzj4sgj4c3606l9i1aa";
x86_64-darwin = "15sz42p7khzxpxii4zx14770kzyk4a3g1kwxjwvd46nxqjqciys4";
aarch64-linux = "14d5p764vx1ppi5f6b6v0wrn1wr3qqyfr6mpncjhnzr2pdss9fz0";
aarch64-darwin = "0kdh7a0nfpadhyn6cj89vw76hhbab4fg5wifbzdrjikwfg8jbd4b";
armv7l-linux = "1aqlpxyzjrf6qm0znyqbl7srn251f7ra5lj594b7906lxhirin3c";
}.${system} or throwSystem;
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.93.0";
version = "1.93.1";
pname = "vscode" + lib.optionalString isInsiders "-insiders";
# This is used for VS Code - Remote SSH test
rev = "4849ca9bdf9666755eb463db297b69e5385090e3";
rev = "38c31bc77e0dd6ae88a4e9cc93428cc27a56ba40";
executableName = "code" + lib.optionalString isInsiders "-insiders";
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -68,7 +68,7 @@ in
src = fetchurl {
name = "vscode-server-${rev}.tar.gz";
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
sha256 = "00yjdgb48mclaamv8c9rz5d6p9pbqrik3y1pj60qqpqf29cj5p9s";
sha256 = "0cxpv9q681nk7gjcs1msn2rnj8i86hlrkb0x4ja1id42aj4xwrqy";
};
};
pkgs/applications/networking/browsers/brave/default.nix
+4 -4
View File
@@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
if stdenv.isAarch64 then
rec {
pname = "brave";
version = "1.69.168";
version = "1.70.117";
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
hash = "sha256-ZSFhbj/Tw+jOaFP2HHnn74DO2w4l37upS+rxLcF5P9I=";
hash = "sha256-FUomXWnIbuW8H0/r+fKEmMG8qO0vBAKUS9kijCbH5Mc=";
platform = "aarch64-linux";
}
else if stdenv.isx86_64 then
rec {
pname = "brave";
version = "1.69.168";
version = "1.70.117";
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
hash = "sha256-smLyA4eZAw62BfbPPFKjKaZd8FJ1FMSV1SUWXCFCzD4=";
hash = "sha256-54puHFpg3zqgORoqale9ZNgokn7q8fbI+240azFqrlQ=";
platform = "x86_64-linux";
}
else
pkgs/applications/networking/browsers/microsoft-edge/default.nix
+6 -6
View File
@@ -1,20 +1,20 @@
{
beta = import ./browser.nix {
channel = "beta";
version = "129.0.2792.21";
version = "129.0.2792.52";
revision = "1";
hash = "sha256-NrDRroKyjY9zC9KoMWaEPAPnu+JNNDZwLVbuDvoUG1M=";
hash = "sha256-KurkG/OxoKOcBcFXj9xhQVSidc2L6bzrDY8c2OmSQro=";
};
dev = import ./browser.nix {
channel = "dev";
version = "130.0.2808.0";
version = "130.0.2835.2";
revision = "1";
hash = "sha256-6mqStxS9HJvfKbrGqQGlqQKXc2SnvOycirPihfnkaLI=";
hash = "sha256-szxMnqw7tUvASsxsYacrQ3StofUJHBWHIhF3EfGIVAs=";
};
stable = import ./browser.nix {
channel = "stable";
version = "128.0.2739.67";
version = "129.0.2792.52";
revision = "1";
hash = "sha256-Y8PxyAibuEhwKJpqnhtBy1F2Kn+ONw6NVtC25R+fFVo=";
hash = "sha256-tiq6PwDrH8ZctfyDza9W3WOsj7NArv4XyMPGWU7fW7A=";
};
}
pkgs/applications/networking/browsers/opera/default.nix
+2 -2
View File
@@ -51,11 +51,11 @@ let
in
stdenv.mkDerivation rec {
pname = "opera";
version = "111.0.5168.61";
version = "113.0.5230.47";
src = fetchurl {
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
hash = "sha256-O2QqosmhhFk6KfiAdlpDYOsZUqGhvtwzYFi2I90Hemo=";
hash = "sha256-0RQTcROUv85yE6ceLkyF09/++WrvK828h5hoN1QYpCE=";
};
unpackPhase = "dpkg-deb -x $src .";
pkgs/applications/networking/browsers/vivaldi/default.nix
+3 -3
View File
@@ -24,7 +24,7 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
version = "6.9.3447.41";
version = "6.9.3447.46";
suffix = {
aarch64-linux = "arm64";
@@ -34,8 +34,8 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
hash = {
aarch64-linux = "sha256-Up2n7G3vatsQC9JKF1A1jAIBbdWm9UhL/75AXuxDCsg=";
x86_64-linux = "sha256-Hcd8W8bDlRUT/zPYP+aiJnUmepS38KuK0wRFYB3uW1Y=";
aarch64-linux = "sha256-r0u7u5R0lMI65zsTxIU0y5A+swJYLAj42ptJWVvFdxs=";
x86_64-linux = "sha256-hIdgyh6c+SbeeT6uY1aN7OCPY+U2GGX6V7eHdwgyuzc=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
pkgs/applications/virtualization/docker/buildx.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-buildx";
version = "0.16.2";
version = "0.17.0";
src = fetchFromGitHub {
owner = "docker";
repo = "buildx";
rev = "v${version}";
hash = "sha256-s4VLuOLPNZGThnvr20EBddxKkreWf3B4D0RRx9OwJiw=";
hash = "sha256-KYPOeDI1g7hUwS7gvKiuOck/2MwvnawP1ZgDAfo4brA=";
};
doCheck = false;
pkgs/applications/virtualization/docker/compose.nix
+3 -3
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-compose";
version = "2.29.2";
version = "2.29.3";
src = fetchFromGitHub {
owner = "docker";
repo = "compose";
rev = "v${version}";
hash = "sha256-UR2O8xBfoFew9G7RjyfXpdA0BcilKBp9Maj3Z+T7Kbw=";
hash = "sha256-t9NyBW9wUwwMB2VAqRUn8KosQFuqWFwuG4Z6KmHXmXc=";
};
postPatch = ''
@@ -16,7 +16,7 @@ buildGoModule rec {
rm -rf e2e/
'';
vendorHash = "sha256-5pBpTXayAo/YbZsYwBuEU8CSTQGzKoyQ5QLzh2McCt8=";
vendorHash = "sha256-hhqNKueE5mJzGbhHqu/Cg9uQJ4v6I8q7+h4MB0MsJww=";
ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
pkgs/by-name/er/era/package.nix
+45
View File
@@ -0,0 +1,45 @@
{
lib,
stdenv,
fetchFromGitHub,
deno,
makeWrapper,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "era";
version = "0.1.3";
src = fetchFromGitHub {
owner = "kyoheiu";
repo = "era";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-OOPVLY9kg4TmKSrpHgsOmAmeDPbX5df0bX51lA6DvcY=";
};
nativeBuildInputs = [ makeWrapper ];
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,lib}
cp -r $src/{src,LICENSE,README.md} $out/lib
makeWrapper ${lib.getExe deno} $out/bin/era \
--set DENO_NO_UPDATE_CHECK "1" \
--add-flags "run -A $out/lib/src/main.ts"
runHook postInstall
'';
meta = {
description = "Rainy clock in your terminal";
homepage = "https://github.com/kyoheiu/era";
changelog = "https://github.com/kyoheiu/era/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ natsukium ];
mainProgram = "era";
inherit (deno.meta) platforms;
};
})
pkgs/by-name/la/labwc-menu-generator/package.nix
+3 -3
View File
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "labwc-menu-generator";
version = "0.1.0-unstable-2024-07-09";
version = "0.1.0-unstable-2024-09-19";
src = fetchFromGitHub {
owner = "labwc";
repo = "labwc-menu-generator";
rev = "a2b3e8e46068d82e97168772e7c194d6b6e03e3d";
hash = "sha256-Y5gBaTgVu3OzZQwGDNLsmQkfS0txBm/vD0MG5av2Gv0=";
rev = "ebb8240bfd39ab2ffbe98d5cfe26f9c1b678822d";
hash = "sha256-4WGBrqY30wVXmnjZ5QPhfNfauvnxqrTE6DFuITfTI4M=";
};
nativeBuildInputs = [
pkgs/by-name/ov/overskride/package.nix
+3 -3
View File
@@ -4,7 +4,7 @@
owner = "kaii-lb";
name = "overskride";
version = "0.5.7";
version = "0.6.0";
in rustPlatform.buildRustPackage {
@@ -15,10 +15,10 @@ in rustPlatform.buildRustPackage {
inherit owner;
repo = name;
rev = "v${version}";
hash = "sha256-vuCpUTn/Re2wZIoCmKHwBRPdfpHDzNHi42iwvBFYjXo=";
hash = "sha256-TbakYKYbVe8wEFOrfj97m2bdAb1BJ7zoi/lyYLobw/k=";
};
cargoHash = "sha256-hX3GHRiE/CbeT/zblQHzbxLPEc/grDddXgqoAe64zUM=";
cargoHash = "sha256-p2PmcLoHfeRUEG2v33vVyiKBkOjpNDbVteSmH5R3RmI=";
nativeBuildInputs = [
pkg-config
pkgs/by-name/we/weaver/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "weaver";
version = "0.9.2";
version = "0.10.0";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "weaver";
rev = "v${version}";
hash = "sha256-HKVUi/XJsvgj+UnhJRa2PkGlfJHNdz8M/re9vYMu1LM=";
hash = "sha256-hSoMt+4D1bpENBD9NmuVBLDUOJkau5Sk2OHS5RyDRYQ=";
};
cargoHash = "sha256-p6NQm4Paq1nDMxmaf3BcZF3V7k6Ifw93BC0InKUjgBk=";
cargoHash = "sha256-4rHDulSsFvKly5M5bo1AtEAl280N/hxhznTngCxw36Y=";
buildInputs = lib.optionals stdenv.isDarwin (
with darwin.apple_sdk_11_0.frameworks; [ SystemConfiguration ]
pkgs/development/compilers/glslang/default.nix
+2
View File
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake python3 bison jq ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
postPatch = ''
cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools
ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers
pkgs/development/libraries/boringssl/default.nix
+4 -4
View File
@@ -10,17 +10,17 @@
# reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md
buildGoModule {
pname = "boringssl";
version = "unstable-2024-02-15";
version = "unstable-2024-09-20";
src = fetchgit {
url = "https://boringssl.googlesource.com/boringssl";
rev = "5a1a5fbdb865fa58f1da0fd8bf6426f801ea37ac";
hash = "sha256-nu+5TeWEAVLGhTE15kxmTWZxo0V2elNUy67gdaU3Y+I=";
rev = "718900aeb84c601523e71abbd18fd70c9e2ad884";
hash = "sha256-TdSObRECiGRQcgz6N2LhKvSi9yRYOZYJdK6MyfJX2Bo=";
};
nativeBuildInputs = [ cmake ninja perl ];
vendorHash = "sha256-074bgtoBRS3SOxLrwZbBdK1jFpdCvF6tRtU1CkrhoDY=";
vendorHash = "sha256-GlhLsPD+yp2LdqsIsfXNEaNKKlc76p0kBCyu4rlEmMg=";
proxyVendor = true;
# hack to get both go and cmake configure phase
pkgs/development/python-modules/apkinspector/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "apkinspector";
version = "1.3.1";
version = "1.3.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "erev0s";
repo = "apkInspector";
rev = "refs/tags/v${version}";
hash = "sha256-zVMY1KMUCSqctAAHOEFXM9yT1X0PDC75ETshF+fc4pU=";
hash = "sha256-trEbm9EFZLoFBWKKOlbI305r+8GdSmU5zWPnNhb5qzQ=";
};
build-system = [ poetry-core ];
pkgs/development/python-modules/dissect-cobaltstrike/default.nix
+3
View File
@@ -78,5 +78,8 @@ buildPythonPackage rec {
changelog = "https://github.com/fox-it/dissect.cobaltstrike/releases/tag/${version}";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
# Compatibility with dissect.struct 4.x
# https://github.com/fox-it/dissect.cobaltstrike/issues/53
broken = versionAtLeast dissect-cstruct.version "4";
};
}
pkgs/development/python-modules/faraday-agent-parameters-types/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "faraday-agent-parameters-types";
version = "1.7.0";
version = "1.7.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "faraday_agent_parameters_types";
inherit version;
hash = "sha256-xFrTOsoh/qCCnzJq97pHW2TogiWfnw4zL4Lul4jRaA0=";
hash = "sha256-ypr5/6mnATFswZPX4aeusH8PoYRa+yVL1gk+pdz7r0w=";
};
postPatch = ''
pkgs/development/python-modules/faraday-plugins/default.nix
+2 -2
View File
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "faraday-plugins";
version = "1.19.0";
version = "1.19.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "infobyte";
repo = "faraday_plugins";
rev = "refs/tags/${version}";
hash = "sha256-ZKib2tpL7Yn3yWuyZFOQ3saNQLwrUEeuojSMpoTy89M=";
hash = "sha256-XWPj348kAuA9BF7Y2/hX712eLRfUZ9kH3oL1jb17/K0=";
};
postPatch = ''
pkgs/development/python-modules/githubkit/default.nix
+2 -2
View File
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "githubkit";
version = "0.11.9";
version = "0.11.10";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "yanyongyu";
repo = "githubkit";
rev = "refs/tags/v${version}";
hash = "sha256-aN8LTWDtzj04w0dQvUVMJ2QhHWaFK4ml1ZoLO2LmKTY=";
hash = "sha256-04Cy4NtC3+/qv4kFcDB1aszmO6x1TguhCOF0CqxYPtw=";
};
pythonRelaxDeps = [ "hishel" ];
pkgs/development/python-modules/mitogen/default.nix
+2 -2
View File
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "mitogen";
version = "0.3.9";
version = "0.3.10";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "mitogen-hq";
repo = "mitogen";
rev = "refs/tags/v${version}";
hash = "sha256-dfOufUvDsrBFvnz8/mp7iY9Tm52KoFFuQQnbq85qTGs=";
hash = "sha256-ndT5bAiUpjkgD2oeS0s/u69a4bBHI4zoXbudcWogTAU=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/mkdocs-material/default.nix
+2 -2
View File
@@ -28,7 +28,7 @@
buildPythonPackage rec {
pname = "mkdocs-material";
version = "9.5.34";
version = "9.5.35";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
owner = "squidfunk";
repo = "mkdocs-material";
rev = "refs/tags/${version}";
hash = "sha256-Gozh4/c9IvhgTU87RWSshlXOWQ3sdtxLA8SQuD/JSEg=";
hash = "sha256-iiukdgkC2B8xWf8abtiSWjEBiCwk/2+1iJqkV9d43VQ=";
};
nativeBuildInputs = [
pkgs/development/python-modules/osxphotos/default.nix
+2 -2
View File
@@ -35,14 +35,14 @@
buildPythonPackage rec {
pname = "osxphotos";
version = "0.68.5";
version = "0.68.6";
pyproject = true;
src = fetchFromGitHub {
owner = "RhetTbull";
repo = "osxphotos";
rev = "refs/tags/v${version}";
hash = "sha256-JhtbbtiCxIGurRAFvk7UP9qzyXw1CCaGlyLHGs/G/uE=";
hash = "sha256-5cKxlfm4i743bJlS2HVPBO1Fbvz1c6wgkkG8Vle8Ajo=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/pyduotecno/default.nix
+2 -2
View File
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pyduotecno";
version = "2024.5.1";
version = "2024.9.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Cereal2nd";
repo = "pyDuotecno";
rev = "refs/tags/${version}";
hash = "sha256-huzv7f1Aq/n3cD9S4oXqGQogq7VpPpzAUqkOhiB879A=";
hash = "sha256-h4OB4V4O645QAPdtO+OtLWffTuA7xlzIveIl+Cyhg3w=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/ucsmsdk/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "ucsmsdk";
version = "0.9.19";
version = "0.9.20";
format = "setuptools";
src = fetchFromGitHub {
owner = "CiscoUcs";
repo = "ucsmsdk";
rev = "refs/tags/v${version}";
hash = "sha256-PPxslqY8v6WbRiRXnR9jVSGAo8k89lHomXpqgSK0meo=";
hash = "sha256-X8lGpfVjIZIpNneOM/mE+9RvglW9FlYoGz7pFs7ellk=";
};
propagatedBuildInputs = [
pkgs/development/python-modules/yalesmartalarmclient/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "yalesmartalarmclient";
version = "0.4.2";
version = "0.4.3";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "domwillcode";
repo = "yale-smart-alarm-client";
rev = "refs/tags/v${version}";
hash = "sha256-/0Vydy7udmiaxtgxhSrwafTR37zHwsEll3VUF+hx25c=";
hash = "sha256-a0rzPEixJXLBfN+kJRPYiJiHY1BKxg/mM14RO3RiVdA=";
};
build-system = [ poetry-core ];
pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "woodpecker-plugin-git";
version = "2.5.2";
version = "2.6.0";
src = fetchFromGitHub {
owner = "woodpecker-ci";
repo = "plugin-git";
rev = "refs/tags/${version}";
hash = "sha256-61WjfeHc8Qyl3RqgafVe1/y8cBOnL8i/fHOAIP4RCdI=";
hash = "sha256-ffP4CmvoxmXdwrWWOG2HIoz1pgmxTUdG5rPsgJ1+3do=";
};
vendorHash = "sha256-rUXi3oaawTJoGPmVxmdR1v2eh8BIvCBjxJBz3XRygEg=";
vendorHash = "sha256-wB1Uv7ZSIEHzR8z96hwXScoGA31uhoql/wwAH3Olj2E=";
CGO_ENABLED = "0";
pkgs/development/tools/database/vitess/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "vitess";
version = "20.0.1";
version = "20.0.2";
src = fetchFromGitHub {
owner = "vitessio";
repo = pname;
rev = "v${version}";
hash = "sha256-OkVBV/Fj2OKxkxjVBdTAyiGETuLw7OvV0KInp533iM8=";
hash = "sha256-I+pz8bz/H1mg7cQnPiJZxYr1gyzajMLVqg8yHbBXYLc=";
};
vendorHash = "sha256-ZDPDL7vJoPv5pIS5xhHAgLiZsiF2B85KNnqGQJPk1SQ=";
pkgs/development/tools/misc/opengrok/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "opengrok";
version = "1.13.20";
version = "1.13.21";
# binary distribution
src = fetchurl {
url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz";
hash = "sha256-qlD1zm2eCQm27N268tht0jtsSiCi3A31XCTFXG9jB0Y=";
hash = "sha256-xzg2KTZpa8DkxifQH7Q6pvyNEZj/mnXkBktNThMbI5k=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/kde/default.nix
+1
View File
@@ -88,6 +88,7 @@ let
applet-window-buttons6 = self.callPackage ./third-party/applet-window-buttons6 { };
karousel = self.callPackage ./third-party/karousel { };
koi = self.callPackage ./third-party/koi { };
krohnkite = self.callPackage ./third-party/krohnkite { };
kzones = self.callPackage ./third-party/kzones { };
}
pkgs/kde/third-party/koi/default.nix
Vendored
+55
View File
@@ -0,0 +1,55 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
kconfig,
kcoreaddons,
kwidgetsaddons,
wrapQtAppsHook,
}:
stdenv.mkDerivation rec {
pname = "koi";
version = "0.3.1";
src = fetchFromGitHub {
owner = "baduhai";
repo = "Koi";
rev = version;
sha256 = "sha256-dhpuKIY/Xi62hzJlnVCIOF0k6uoQ3zH129fLq/r+Kmg";
};
# See https://github.com/baduhai/Koi/blob/master/development/Nix%20OS/dev.nix
sourceRoot = "source/src";
nativeBuildInputs = [
cmake
wrapQtAppsHook
];
buildInputs = [
kconfig
kcoreaddons
kwidgetsaddons
];
meta = with lib; {
description = "Scheduling LIGHT/DARK Theme Converter for the KDE Plasma Desktop";
longDescription = ''
Koi is a program designed to provide the KDE Plasma Desktop functionality to automatically switch between light and dark themes. Koi is under semi-active development, and while it is stable enough to use daily, expect bugs. Koi is designed to be used with Plasma, and while some features may function under different desktop environments, they are unlikely to work and untested.
Features:
- Toggle between light and dark presets based on time
- Change Plasma style
- Change Qt colour scheme
- Change Icon theme
- Change GTK theme
- Change wallpaper
- Hide application to system tray
- Toggle between LIGHT/DARK themes by clicking mouse wheel
'';
license = licenses.lgpl3;
platforms = platforms.linux;
homepage = "https://github.com/baduhai/Koi";
maintainers = with lib.maintainers; [ fnune ];
};
}
pkgs/misc/tmux-plugins/default.nix
+2 -23
View File
@@ -242,29 +242,8 @@ in rec {
};
};
fingers = mkTmuxPlugin rec {
pluginName = "tmux-fingers";
rtpFilePath = "load-config.tmux";
version = "2.1.1";
src = fetchFromGitHub {
owner = "Morantron";
repo = "tmux-fingers";
rev = "${version}";
sha256 = "sha256-1YMh6m8M6FKf8RPXsOfWCVC5CXSr/MynguwkG7O+oEY=";
};
nativeBuildInputs = [ pkgs.makeWrapper pkgs.crystal pkgs.shards ];
postInstall = ''
shards build --production
rm -rf $target/* $target/.*
cp -r bin $target/bin
echo "$target/bin/${pluginName} load-config" > $target/${rtpFilePath}
chmod +x $target/${rtpFilePath}
wrapProgram $target/${rtpFilePath} \
--prefix PATH : ${with pkgs; lib.makeBinPath (
[ gawk ] ++ lib.optionals stdenv.isDarwin [ reattach-to-user-namespace ]
)}
'';
fingers = pkgs.callPackage ./tmux-fingers {
inherit mkTmuxPlugin;
};
fpp = mkTmuxPlugin {
pkgs/misc/tmux-plugins/tmux-fingers/default.nix
+46
View File
@@ -0,0 +1,46 @@
{
mkTmuxPlugin,
substituteAll,
fetchFromGitHub,
crystal,
}:
let
fingers = crystal.buildCrystalPackage rec {
format = "shards";
version = "2.2.2";
pname = "fingers";
src = fetchFromGitHub {
owner = "Morantron";
repo = "tmux-fingers";
rev = "${version}";
sha256 = "sha256-m9QON7diHVEDnnv/alXCJOG+BnfrAKygScrubZZ605I=";
};
shardsFile = ./shards.nix;
crystalBinaries.tmux-fingers.src = "src/fingers.cr";
postInstall = ''
shopt -s dotglob extglob
rm -rv !("tmux-fingers.tmux"|"bin")
shopt -u dotglob extglob
'';
# TODO: Needs starting a TMUX session to run tests
# Unhandled exception: Missing ENV key: "TMUX" (KeyError)
doCheck = false;
doInstallCheck = false;
};
in
mkTmuxPlugin {
inherit (fingers) version src meta;
pluginName = fingers.src.repo;
rtpFilePath = "tmux-fingers.tmux";
patches = [
(substituteAll {
src = ./fix.patch;
tmuxFingersDir = "${fingers}/bin";
})
];
}
pkgs/misc/tmux-plugins/tmux-fingers/fix.patch
+41
View File
@@ -0,0 +1,41 @@
diff --git a/tmux-fingers.tmux b/tmux-fingers.tmux
index f15b509..a14e312 100755
--- a/tmux-fingers.tmux
+++ b/tmux-fingers.tmux
@@ -1,35 +1,4 @@
#!/usr/bin/env bash
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-if command -v "tmux-fingers" &>/dev/null; then
- FINGERS_BINARY="tmux-fingers"
-elif [[ -f "$CURRENT_DIR/bin/tmux-fingers" ]]; then
- FINGERS_BINARY="$CURRENT_DIR/bin/tmux-fingers"
-fi
-
-if [[ -z "$FINGERS_BINARY" ]]; then
- tmux run-shell -b "bash $CURRENT_DIR/install-wizard.sh"
- exit 0
-fi
-
-CURRENT_FINGERS_VERSION="$($FINGERS_BINARY version)"
-
-pushd $CURRENT_DIR &> /dev/null
-CURRENT_GIT_VERSION=$(cat shard.yml | grep "^version" | cut -f2 -d':' | sed "s/ //g")
-popd &> /dev/null
-
-SKIP_WIZARD=$(tmux show-option -gqv @fingers-skip-wizard)
-SKIP_WIZARD=${SKIP_WIZARD:-0}
-
-if [ "$SKIP_WIZARD" = "0" ] && [ "$CURRENT_FINGERS_VERSION" != "$CURRENT_GIT_VERSION" ]; then
- tmux run-shell -b "FINGERS_UPDATE=1 bash $CURRENT_DIR/install-wizard.sh"
-
- if [[ "$?" != "0" ]]; then
- echo "Something went wrong while updating tmux-fingers. Please try again."
- exit 1
- fi
-fi
-
-tmux run "$FINGERS_BINARY load-config"
+tmux run "@tmuxFingersDir@/tmux-fingers load-config"
exit $?
pkgs/misc/tmux-plugins/tmux-fingers/shards.nix
+12
View File
@@ -0,0 +1,12 @@
{
cling = {
url = "https://github.com/devnote-dev/cling.git";
rev = "v3.0.0";
sha256 = "0mj5xvpiif1vhg4qds938p9zb5a47qzl397ybz1l1jks0gg361wq";
};
xdg_base_directory = {
url = "https://github.com/tijn/xdg_base_directory.git";
rev = "60bf28dc060c221d5af52727927e92b840022eb0";
sha256 = "1sa8bw8mzsz0pbj3m8v0w1pnk1q86zjivr0jndfg77wa33ki34y0";
};
}
pkgs/os-specific/linux/pcm/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pcm";
version = "202405";
version = "202409";
src = fetchFromGitHub {
owner = "opcm";
repo = "pcm";
rev = version;
hash = "sha256-yEe1lWbvafc3N3+K9WMMlIXVVX+fVO8QsuKdyIqiKAg=";
hash = "sha256-eCFyk6V1wpTImDKbsSiwgnqIduh62YG8GK0jxZL04Yc=";
};
nativeBuildInputs = [ cmake ];
pkgs/servers/nextcloud/default.nix
+3 -1
View File
@@ -18,7 +18,9 @@ let
};
passthru = {
tests = nixosTests.nextcloud;
tests = lib.filterAttrs (
key: _: (lib.hasSuffix (lib.versions.major version) key)
) nixosTests.nextcloud;
inherit packages;
};
pkgs/servers/redpanda/default.nix
+3 -3
View File
@@ -6,12 +6,12 @@
, stdenv
}:
let
version = "24.2.4";
version = "24.2.5";
src = fetchFromGitHub {
owner = "redpanda-data";
repo = "redpanda";
rev = "v${version}";
sha256 = "sha256-DSwD9oN5hrDjUL0Ey8ARvojr54abBXUNvj/06lLvURk=";
sha256 = "sha256-25ijVHEcj0AXLxC1rSbp3Xyv+SMQRRkRq+qgRJgSnAI=";
};
in
buildGoModule rec {
@@ -19,7 +19,7 @@ buildGoModule rec {
inherit doCheck src version;
modRoot = "./src/go/rpk";
runVend = false;
vendorHash = "sha256-8vwmxUi4oWmHzb2QkIS5sU1NgJmJSV1+2I48TDAo2a0=";
vendorHash = "sha256-JEbIC33J+uUzPN04EtO5XoC0MIkYRXKYNCsFsirJfhY=";
ldflags = [
''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"''
pkgs/servers/sql/postgresql/ext/postgis.nix
+2 -2
View File
@@ -28,7 +28,7 @@ let
in
stdenv.mkDerivation rec {
pname = "postgis";
version = "3.4.2";
version = "3.4.3";
outputs = [
"out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
hash = "sha256-yMh0wAukqYSocDCva/lUSCFQIGCtRz1clvHU0INcWJI=";
hash = "sha256-+N7VBdrrj1dlnaK55Xf/ceGDqqCUcI0u7OLFbZM2H2I=";
};
buildInputs = [
pkgs/servers/sql/postgresql/ext/wal2json.nix
+6 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, postgresql }:
{ lib, callPackage, stdenv, fetchFromGitHub, postgresql }:
stdenv.mkDerivation rec {
pname = "wal2json";
@@ -20,6 +20,11 @@ stdenv.mkDerivation rec {
install -D -t $out/share/postgresql/extension sql/*.sql
'';
passthru.tests.wal2json = lib.recurseIntoAttrs (callPackage ../../../../../nixos/tests/postgresql-wal2json.nix {
inherit (stdenv) system;
inherit postgresql;
});
meta = with lib; {
description = "PostgreSQL JSON output plugin for changeset extraction";
homepage = "https://github.com/eulerto/wal2json";
pkgs/servers/sql/postgresql/generic.nix
+1 -2
View File
@@ -48,7 +48,7 @@ let
pname = "postgresql";
stdenv' =
if jitSupport then
if jitSupport && !stdenv.cc.isClang then
overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override {
# LLVM bintools are not used by default, but are needed to make -flto work below.
bintools = llvmPackages.bintools;
@@ -132,7 +132,6 @@ let
# and allows splitting them cleanly.
env.CFLAGS = "-fdata-sections -ffunction-sections"
+ (if stdenv'.cc.isClang then " -flto" else " -fmerge-constants -Wl,--gc-sections")
+ lib.optionalString (stdenv'.isDarwin && jitSupport) " -fuse-ld=lld"
# Makes cross-compiling work when xml2-config can't be executed on the host.
# Fixed upstream in https://github.com/postgres/postgres/commit/0bc8cebdb889368abdf224aeac8bc197fe4c9ae6
+ lib.optionalString (olderThan "13") " -I${libxml2.dev}/include/libxml2";
pkgs/tools/admin/ansible/lint.nix
+2 -2
View File
@@ -6,13 +6,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "ansible-lint";
version = "24.7.0";
version = "24.9.0";
format = "pyproject";
src = fetchPypi {
inherit version;
pname = "ansible_lint";
hash = "sha256-yi7cfk6AzxnfSyjL9MEY92HObN1qXvnIVh5FTtevWiQ=";
hash = "sha256-uMnJTGw7xotDvPewZ+KG+CAeNBdyx9Pb2wNk7KsrOUQ=";
};
postPatch = ''
pkgs/tools/misc/zoxide/default.nix
+3 -3
View File
@@ -10,13 +10,13 @@
rustPlatform.buildRustPackage rec {
pname = "zoxide";
version = "0.9.5";
version = "0.9.6";
src = fetchFromGitHub {
owner = "ajeetdsouza";
repo = "zoxide";
rev = "refs/tags/v${version}";
hash = "sha256-4Vb0C6k36VQwiruGj7lu6MjDEeTh84JSHw47YMbFb30=";
hash = "sha256-3XC5K4OlituoFMPN9yJkYi+tkH6M0KK5jVAGdr/GLd0=";
};
nativeBuildInputs = [ installShellFiles ];
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
--replace '"fzf"' '"${fzf}/bin/fzf"'
'';
cargoHash = "sha256-G6Aqn+q48s8Qsoa1EMowtw5bnUnnYWhyGr4hNhVYNMo=";
cargoHash = "sha256-ZRsnoLysNzDIi9hDOqwAzbxcyFQgn2Wv3gRNAjV5HfE=";
postInstall = ''
installManPage man/man*/*
pkgs/tools/networking/easyrsa/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "easyrsa";
version = "3.2.0";
version = "3.2.1";
src = fetchFromGitHub {
owner = "OpenVPN";
repo = "easy-rsa";
rev = "v${version}";
hash = "sha256-hjebDE7Ts93vtoOTquFbfTWdInhI7HXc4pRxIsvNLtg=";
hash = "sha256-/c2Redb6whfM2D8hHBrcSaQ3YsBESLjeoKFb5a2lFbQ=";
};
nativeBuildInputs = [ makeWrapper ];
pkgs/tools/security/bitwarden-directory-connector/default.nix
+3 -3
View File
@@ -13,14 +13,14 @@
let
common = { name, npmBuildScript, installPhase }: buildNpmPackage rec {
pname = name;
version = "2024.3.2";
version = "2024.9.0";
nodejs = nodejs_18;
src = fetchFromGitHub {
owner = "bitwarden";
repo = "directory-connector";
rev = "v${version}";
hash = "sha256-CB5HrT+p63zANg1SEoynk6hPPW5DcC9Qfo2+QDy2iwc=";
hash = "sha256-Vop5Y1prdjA5SOQsA1HNBr3IBhe9Ya8d8M6CsS9xohg=";
};
postPatch = ''
@@ -32,7 +32,7 @@ let
--replace-fail "AppImage" "dir"
'';
npmDepsHash = "sha256-6WYNaF6z8OwWmi/Mv091LsuTUEUhWd8cDD11QKE8A5U=";
npmDepsHash = "sha256-8rmZSl5K2l97QHaNtcfW202TtcEa3HIjEjO/AkaZkdQ=";
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";