Merge branch 'master' into staging-next

This commit is contained in:
Weijia Wang
2024-12-11 16:42:17 +01:00
138 changed files with 1158 additions and 682 deletions
+29
View File
@@ -2304,6 +2304,12 @@
githubId = 99703210;
name = "Katherine Jamison";
};
axka = {
name = "Axel Karjalainen";
email = "axel@axka.fi";
github = "axelkar";
githubId = 120189068;
};
ayazhafiz = {
email = "ayaz.hafiz.1@gmail.com";
github = "hafiz";
@@ -10513,6 +10519,18 @@
githubId = 1476865;
name = "jigglycrumb";
};
jiriks74 = {
name = "Jiří Štefka";
email = "jiri@stefka.eu";
github = "jiriks74";
githubId = 54378412;
matrix = "@jiriks74:matrix.org";
keys = [
{
fingerprint = "563AC7887FD6414714A6ACAC1D5E30D3DB2264DE";
}
];
};
jirkamarsik = {
email = "jiri.marsik89@gmail.com";
github = "jirkamarsik";
@@ -13768,6 +13786,17 @@
githubId = 28183516;
name = "Mateusz Słodkowicz";
};
mateusauler = {
email = "mateus@auler.dev";
github = "mateusauler";
githubId = 24767687;
name = "Mateus Auler";
keys = [
{
fingerprint = "A09D C093 3C37 4BFC 2B5A 269F 80A5 D62F 6EB7 D9F0";
}
];
};
math-42 = {
email = "matheus.4200@gmail.com";
github = "Math-42";
@@ -45,6 +45,8 @@
- [KanBoard](https://github.com/kanboard/kanboard), a project management tool that focuses on the Kanban methodology. Available as [services.kanboard](#opt-services.kanboard.enable).
- [git-worktree-switcher](https://github.com/mateusauler/git-worktree-switcher), switch between git worktrees with speed. Available as [programs.git-worktree-switcher](#opt-programs.git-worktree-switcher.enable)
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
## Backward Incompatibilities {#sec-release-25.05-incompatibilities}
@@ -67,6 +69,8 @@
- `zammad` has had its support for MySQL removed, since it was never working correctly and is now deprecated upstream. Check the [migration guide](https://docs.zammad.org/en/latest/appendix/migrate-to-postgresql.html) for how to convert your database to PostgreSQL.
- `nodePackages.vls` has been deprecated, as the upstream consumer of it, vetur, has been deprecated by upstream. Upstream suggests migrating to Volar for Vue LSP tooling instead.
- `nodePackages.create-react-native-app` has been removed, as it is deprecated. Upstream suggests using a framework for React Native apps instead.
- `nodePackages.insect` has been removed, as it's deprecated by upstream. The suggested replacement is `numbat`.
@@ -132,7 +136,7 @@
- Cinnamon has been updated to 6.4.
- `networking.wireguard` now has an optional networkd backend, enabled with `networking.wireguard.useNetworkd`. Some `networking.wireguard` options have slightly different behavior with the networkd and script-based backends, documented in each option. Before upgrading, make sure the `privateKeyFile` and `presharedKeyFile` paths are readable by the `systemd-network` user if using the networkd backend.
- `networking.wireguard` now has an optional networkd backend. It is enabled by default when `networking.useNetworkd` is enabled, and it can be enabled alongside scripted networking with `networking.wireguard.useNetworkd`. Some `networking.wireguard` options have slightly different behavior with the networkd and script-based backends, documented in each option.
- `services.avahi.ipv6` now defaults to true.
-2
View File
@@ -163,8 +163,6 @@ in
++ lib.optional (cfg.hostName != "") cfg.hostName; # Then the hostname (without the domain)
in {
"127.0.0.2" = hostnames;
} // lib.optionalAttrs cfg.enableIPv6 {
"::1" = hostnames;
};
networking.hostFiles = let
+1
View File
@@ -18,6 +18,7 @@ let
qt6Packages.qt6gtk2
];
kde = [
libsForQt5.kio
libsForQt5.plasma-integration
libsForQt5.systemsettings
];
+1
View File
@@ -207,6 +207,7 @@
./programs/gdk-pixbuf.nix
./programs/geary.nix
./programs/git.nix
./programs/git-worktree-switcher.nix
./programs/gnome-disks.nix
./programs/gnome-terminal.nix
./programs/gnupg.nix
@@ -0,0 +1,40 @@
{
config,
pkgs,
lib,
...
}:
let
cfg = config.programs.git-worktree-switcher;
initScript =
shell:
if (shell == "fish") then
''
${lib.getExe pkgs.git-worktree-switcher} init ${shell} | source
''
else
''
eval "$(${lib.getExe pkgs.git-worktree-switcher} init ${shell})"
'';
in
{
options = {
programs.git-worktree-switcher = {
enable = lib.mkEnableOption "git-worktree-switcher, switch between git worktrees with speed.";
};
};
config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [ git-worktree-switcher ];
programs.bash.interactiveShellInit = initScript "bash";
programs.zsh.interactiveShellInit = lib.optionalString config.programs.zsh.enable (
initScript "zsh"
);
programs.fish.interactiveShellInit = lib.optionalString config.programs.fish.enable (
initScript "fish"
);
};
}
@@ -55,6 +55,7 @@ in
};
wantedBy = [ "graphical-session.target" ];
partOf = [ "graphical-session.target" ];
};
systemd.user.sockets.yubikey-touch-detector = {
wantedBy = [ "sockets.target" ];
@@ -155,7 +155,11 @@ in
config =
let
usesDev = lib.hasPrefix "/" cfg.device;
usesDev = lib.any (prefix: lib.hasPrefix prefix cfg.device) [
"/"
"ens:/"
"enh:/"
];
in
lib.mkIf cfg.enable {
systemd.services.ebusd = {
@@ -200,12 +204,14 @@ in
# Hardening
CapabilityBoundingSet = "";
DeviceAllow = lib.optionals usesDev [ cfg.device ];
DeviceAllow = lib.optionals usesDev [
(lib.removePrefix "ens:" (lib.removePrefix "enh:" cfg.device))
];
DevicePolicy = "closed";
LockPersonality = true;
MemoryDenyWriteExecute = false;
NoNewPrivileges = true;
PrivateDevices = usesDev;
PrivateDevices = !usesDev;
PrivateUsers = true;
PrivateTmp = true;
ProtectClock = true;
@@ -514,7 +514,7 @@ in
systemd.services.librenms-setup = {
description = "Preparation tasks for LibreNMS";
before = [ "phpfpm-librenms.service" ];
after = [ "systemd-tmpfiles-setup.service" ]
after = [ "systemd-tmpfiles-setup.service" "network.target" ]
++ (lib.optional (cfg.database.host == "localhost") "mysql.service");
wantedBy = [ "multi-user.target" ];
restartTriggers = [ package configFile ];
+4 -2
View File
@@ -2,7 +2,9 @@
with lib;
{
let
json = pkgs.formats.json { };
in {
options = {
services.v2ray = {
@@ -32,7 +34,7 @@ with lib;
};
config = mkOption {
type = types.nullOr (types.attrsOf types.unspecified);
type = types.nullOr json.type;
default = null;
example = {
inbounds = [{
@@ -14,14 +14,26 @@ let
mapAttrsToList
nameValuePair
;
inherit (lib.lists) concatMap concatLists;
inherit (lib.lists) concatMap concatLists filter;
inherit (lib.modules) mkIf;
inherit (lib.options) literalExpression mkOption;
inherit (lib.strings) hasInfix;
inherit (lib.trivial) flip;
inherit (lib.trivial) flip pipe;
removeNulls = filterAttrs (_: v: v != null);
privateKeyCredential = interfaceName: "wireguard-${interfaceName}-private-key";
presharedKeyCredential =
interfaceName: peer: "wireguard-${interfaceName}-${peer.name}-preshared-key";
interfaceCredentials =
interfaceName: interface:
[ "${privateKeyCredential interfaceName}:${interface.privateKeyFile}" ]
++ pipe interface.peers [
(filter (peer: peer.presharedKeyFile != null))
(map (peer: "${presharedKeyCredential interfaceName peer}:${peer.presharedKeyFile}"))
];
generateNetdev =
name: interface:
nameValuePair "40-${name}" {
@@ -31,20 +43,20 @@ let
MTUBytes = interface.mtu;
};
wireguardConfig = removeNulls {
PrivateKeyFile = interface.privateKeyFile;
PrivateKey = "@${privateKeyCredential name}";
ListenPort = interface.listenPort;
FirewallMark = interface.fwMark;
RouteTable = if interface.allowedIPsAsRoutes then interface.table else null;
RouteMetric = interface.metric;
};
wireguardPeers = map generateWireguardPeer interface.peers;
wireguardPeers = map (generateWireguardPeer name) interface.peers;
};
generateWireguardPeer =
peer:
interfaceName: peer:
removeNulls {
PublicKey = peer.publicKey;
PresharedKeyFile = peer.presharedKeyFile;
PresharedKey = "@${presharedKeyCredential interfaceName peer}";
AllowedIPs = peer.allowedIPs;
Endpoint = peer.endpoint;
PersistentKeepalive = peer.persistentKeepalive;
@@ -96,7 +108,8 @@ in
options.networking.wireguard = {
useNetworkd = mkOption {
default = false;
default = config.networking.useNetworkd;
defaultText = literalExpression "config.networking.useNetworkd";
type = types.bool;
description = ''
Whether to use networkd as the network configuration backend for
@@ -201,6 +214,8 @@ in
};
systemd.timers = mapAttrs' generateRefreshTimer refreshEnabledInterfaces;
systemd.services = mapAttrs' generateRefreshService refreshEnabledInterfaces;
systemd.services = (mapAttrs' generateRefreshService refreshEnabledInterfaces) // {
systemd-networkd.serviceConfig.LoadCredential = mapAttrsToList interfaceCredentials cfg.interfaces;
};
};
}
@@ -49,9 +49,6 @@ let
default = null;
description = ''
Private key file as generated by {command}`wg genkey`.
When {option}`networking.wireguard.useNetworkd` is enabled, this file
must be readable by the `systemd-network` user.
'';
};
@@ -259,9 +256,6 @@ let
Optional, and may be omitted. This option adds an additional layer of
symmetric-key cryptography to be mixed into the already existing
public-key cryptography, for post-quantum resistance.
When {option}`networking.wireguard.useNetworkd` is enabled, this file
must be readable by the `systemd-network` user.
'';
};
+2
View File
@@ -62,6 +62,8 @@ let
fqdn_and_host_name
== machine.succeed("getent hosts 127.0.0.2 | awk '{print $2,$3}'").strip()
)
assert "${fqdn}" == machine.succeed("getent hosts ${hostName} | awk '{print $2}'").strip()
'';
};
@@ -30,7 +30,12 @@ stdenv.mkDerivation {
chmod -R u+w $TMPDIR/VampTransforms
echo "Starting Bitwig Studio in Bubblewrap Environment"
${bubblewrap}/bin/bwrap --bind / / --bind $TMPDIR/VampTransforms ${bitwig-studio-unwrapped}/libexec/resources/VampTransforms ${bitwig-studio-unwrapped}/bin/bitwig-studio || true
${bubblewrap}/bin/bwrap \
--bind / / \
--bind $TMPDIR/VampTransforms ${bitwig-studio-unwrapped}/libexec/resources/VampTransforms \
--dev-bind /dev /dev \
${bitwig-studio-unwrapped}/bin/bitwig-studio \
|| true
echo "Bitwig exited, removing temporary directory"
rm -rf $TMPDIR
@@ -7,12 +7,12 @@
nix-update-script,
}:
let
version = "0.7.3";
version = "0.7.6";
src = fetchFromGitHub {
owner = "Saghen";
repo = "blink.cmp";
rev = "refs/tags/v${version}";
hash = "sha256-nxiODLKgGeXzN5sqkLWU0PcsuSSB1scSzTC5qyCxLCI=";
hash = "sha256-fzAqUqMx4zqN9dtTYRAibhWd5CKh2pvai9g7E/xxnE8=";
};
libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so";
blink-fuzzy-lib = rustPlatform.buildRustPackage {
@@ -9,8 +9,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "jupyter";
publisher = "ms-toolsai";
version = "2024.10.0";
hash = "sha256-4b3aE1RgqxEKHMEMlhIjRk4WR3DZRWmqMfGGFQi43J0=";
version = "2024.11.0";
hash = "sha256-BwZLF52ilEaLU6swUFEa+PtrxzsFOLIYd8TVD7xRgPg=";
};
nativeBuildInputs = [
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "mednafen-wswan";
version = "0-unstable-2024-06-28";
version = "0-unstable-2024-10-21";
src = fetchFromGitHub {
owner = "libretro";
repo = "beetle-wswan-libretro";
rev = "440e9228592a3f603d7d09e8bee707b0163f545f";
hash = "sha256-+98gCDBYeqUlFGzX83lwTGqSezLnzWRwapZCn4T37uE=";
rev = "2aeb47d3a58bf0360c686f842d9bb5bd201306fe";
hash = "sha256-LrF9p5tPtUamVLC41bJxcYDKvHmhVfwMieyIAdHaGmU=";
};
makefile = "Makefile";
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "bluemsx";
version = "0-unstable-2024-10-22";
version = "0-unstable-2024-12-04";
src = fetchFromGitHub {
owner = "libretro";
repo = "bluemsx-libretro";
rev = "01ce142ccb85c302420cb962d1b6e6a68a6ce076";
hash = "sha256-h3Zpv+h6CbM1pdSOXsjN0pFUjXLn5T/R5W55VZXpMVM=";
rev = "572c91856a5288b7433c619af651e31f00f3ce7e";
hash = "sha256-fN5zjQGIyx3yIEgIhC50gD3O2F6WPJ/ssiauQ5Z/t9s=";
};
meta = {
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "fceumm";
version = "0-unstable-2024-09-23";
version = "0-unstable-2024-11-23";
src = fetchFromGitHub {
owner = "libretro";
repo = "libretro-fceumm";
rev = "e226068f979cd8fbfc3be9780d16cfb1405095b0";
hash = "sha256-2G5EzcDJkEhaN+nXi/wu3+Ejim04ZzOr+LW69cLAEuM=";
rev = "449db5de6b56e9d44fc685e1b38399f0b233bd28";
hash = "sha256-yD75ohq7dJwXt6t3RLMwTtmdLGLS3/eb98uBlnazWDk=";
};
meta = {
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "fmsx";
version = "0-unstable-2024-06-28";
version = "0-unstable-2024-10-21";
src = fetchFromGitHub {
owner = "libretro";
repo = "fmsx-libretro";
rev = "cf97a3c6da07d5f8e98c90c907ad987ffea432e0";
hash = "sha256-mPgmt05XDnB+eIWtOpBfZ37Cz24VBei1lLLaYsJNeAA=";
rev = "9eb5f25df5397212a3e3088ca1a64db0740bbe5f";
hash = "sha256-Pac1tQvPxYETU+fYU17moBHGfjNtzZiOsOms1uFQAmE=";
};
makefile = "Makefile";
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "freeintv";
version = "0-unstable-2024-06-28";
version = "0-unstable-2024-10-21";
src = fetchFromGitHub {
owner = "libretro";
repo = "freeintv";
rev = "6bd91d0d83d896e66b9fd7e5e239f93f00e4ad87";
hash = "sha256-P3devj/aAa0e/QpV68kQkLAvhrVGO8O8ijkUAobgUb0=";
rev = "beab9af119fc117833d2d866d8d4ea0857ec0236";
hash = "sha256-+3hF7OZ2OD8K3OsvzJ3+Nn3DwC7PfD+Mr3Ku2/W/fDQ=";
};
makefile = "Makefile";
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "gambatte";
version = "0-unstable-2024-10-04";
version = "0-unstable-2024-11-29";
src = fetchFromGitHub {
owner = "libretro";
repo = "gambatte-libretro";
rev = "3eeb65e9bcf4b2a7ca24c5cebdfa7e342177ef0f";
hash = "sha256-tNGMR6GIyXen9+Ktg3IvYTcPidc+5Z8TpBQu1YgmqlY=";
rev = "9d92381643a6aad186054fa6019a47b710f73d2c";
hash = "sha256-gbjUIETbGb8i9bQuKRlpPOLnZorA/ho5DqT9AXkojUY=";
};
meta = {
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "genesis-plus-gx";
version = "0-unstable-2024-09-18";
version = "0-unstable-2024-11-22";
src = fetchFromGitHub {
owner = "libretro";
repo = "Genesis-Plus-GX";
rev = "7de0f0b6cde9bda1235b448aa607044b3f80ab3c";
hash = "sha256-W06vSrGKbXMcXIouW9/fD93sBfwREqIL8HvB3kan0tM=";
rev = "03ebe2b96ed3f5747588de55ab3fec9add0a49c2";
hash = "sha256-0SAxxJqgxwQfpv4KE0J1Zr0XcGDQzCAbRku9obMamv4=";
};
meta = {
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "mesen";
version = "0-unstable-2024-06-09";
version = "0.9.9-unstable-2024-10-21";
src = fetchFromGitHub {
owner = "libretro";
repo = "mesen";
rev = "91db6be681f70b2080525c267af6132555323ea1";
hash = "sha256-rw/bwHaeglO/DPeOCFHAWF5Y5DXVKiteO4bWZjTB4rI=";
rev = "791c5e8153ee6e29691d45b5df2cf1151ff416f9";
hash = "sha256-PEEGJsyT+D/JwBxH2H9OY2MwaGt1i+1kmDZUT6zROic=";
};
makefile = "Makefile";
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "nestopia";
version = "0-unstable-2024-10-17";
version = "0-unstable-2024-12-10";
src = fetchFromGitHub {
owner = "libretro";
repo = "nestopia";
rev = "b932740e8abbe2cda80d06b083fdd8115af1c5d5";
hash = "sha256-lIWk3V93vTKZM/jvfLkA06c7DDSEQtLmqRzJUi0TK/4=";
rev = "8b622a6e2a7403fff47830e0437f324ed9f24464";
hash = "sha256-I9YKOV+mPZrcA5bB1KfWk+NaWIxSpBpZT8ntNxSt/m0=";
};
makefile = "Makefile";
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "o2em";
version = "0-unstable-2024-06-28";
version = "0-unstable-2024-10-21";
src = fetchFromGitHub {
owner = "libretro";
repo = "libretro-o2em";
rev = "c8f458d035392963823fbb50db0cec0033d9315f";
hash = "sha256-riqMXm+3BG4Gz0wrmVFxtVhuMRtZHZqCViAupp/Q42U=";
rev = "3ba4231c1dc8dcdf487428712856b790d2e4b8f3";
hash = "sha256-HhTkFm9Jte4wDPxTcXRgCg2tCfdQvo0M3nHRhlPmz/w=";
};
makefile = "Makefile";
@@ -5,13 +5,13 @@
}:
mkLibretroCore {
core = "vba-next";
version = "0-unstable-2024-06-28";
version = "0-unstable-2024-10-21";
src = fetchFromGitHub {
owner = "libretro";
repo = "vba-next";
rev = "2c726f25da75a5600ef5791ce904befe06c4dddd";
hash = "sha256-Elb6cOm2oO+3fNUaTXLN4kyhftoJ/oWXD571mXApybs=";
rev = "d0ec7f3e209a91b903bb9d2c2397fef2bb3cca32";
hash = "sha256-g3Eb1bMGjt+H7awUlMCtKVu223+UvyQ2VBh8aQG1yo8=";
};
meta = {
@@ -1,9 +1,9 @@
{
"chromium": {
"version": "131.0.6778.108",
"version": "131.0.6778.139",
"chromedriver": {
"hash_darwin": "sha256-X0kzihCQsICn5SRdU+THdthov0EPxsmMcrm6YJ6hMhs=",
"hash_darwin_aarch64": "sha256-3Qdj44cZD4wQTzkBx47ZCfqHE2HckkLuqYKpJxxfESk="
"hash_darwin": "sha256-QLYUD5SDHoPdiPHX46ps/oBhzDjwxBuQEh0hzbEY73Q=",
"hash_darwin_aarch64": "sha256-VZ4nS9H1J1R6OXqqOaFLHM2rD8dyUTTWur5X1CNm4sU="
},
"deps": {
"depot_tools": {
@@ -19,8 +19,8 @@
"DEPS": {
"src": {
"url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "3b014839fbc4fb688b2f5af512d6ce312ad208b1",
"hash": "sha256-ypzu3LveMFcOFm7+JlaERjzs3SK/n9+sfm5wOKB8/zw=",
"rev": "c35bbcbd7c2775a12a3f320e05ac0022939b1a8a",
"hash": "sha256-oJ4y9W51RMiUk40Uz8b3LJH0kMD5GMDG2V//Tng4/4A=",
"recompress": true
},
"src/third_party/clang-format/script": {
@@ -360,8 +360,8 @@
},
"src/third_party/icu": {
"url": "https://chromium.googlesource.com/chromium/deps/icu.git",
"rev": "4239b1559d11d4fa66c100543eda4161e060311e",
"hash": "sha256-7568UHNDOzyTCLy3TAwxZLUrKfB6A1yKA0wVZQJjKoI="
"rev": "ba7ed88cc5ffa428a82a0f787dd61031aa5ef4ca",
"hash": "sha256-WtCoxcbEkkZayB6kXdQEhZ7/ue+ka6cguhFbpeWUBJA="
},
"src/third_party/jsoncpp/source": {
"url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git",
@@ -760,8 +760,8 @@
},
"src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "e38771cb283b9689683c5ac0b5831dd89f8ec690",
"hash": "sha256-csSDnepYxil0R3PD/LVxW7JBcasOKG4l6q6vj8zHV/I="
"rev": "b97fcc24b3523da5e389d2a6d76857f134be09c5",
"hash": "sha256-5Es9Zot/DH+UKq3+aCgeQC+Llgj7/lmPXUYvar/hX7I="
}
}
},
@@ -243,13 +243,13 @@
"vendorHash": "sha256-j3qdi19dxJL+R8Xa6MDag6KHMuBnzEZ9lUhuSAEZOAQ="
},
"cloudflare": {
"hash": "sha256-R6cJQaBnsARO3qg48ijqVdyrSivLN3Wf96yqTjuaN/c=",
"hash": "sha256-RC8/tw01yNxeqOlmLzzagRgxQm+o+4ztJ/7KWyBPJ+I=",
"homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
"owner": "cloudflare",
"repo": "terraform-provider-cloudflare",
"rev": "v4.44.0",
"rev": "v4.48.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-g575BZRdCekfUgF78DENloCeM8TTz5OhLxxgb1OkElc="
"vendorHash": "sha256-tznAR/SRtJJdxm17f8ej5Lt8BCVlCW3zkrBX94ErbjQ="
},
"cloudfoundry": {
"hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=",
@@ -633,13 +633,13 @@
"vendorHash": null
},
"ibm": {
"hash": "sha256-ZjsQBqn0faSqgSrdV4G+18XD1ZpCd3zRt5I1zQ3MWoQ=",
"hash": "sha256-xryHugAi0cJHFx5SvJrcbVrnhjCLA7eT9wUdvk3ynGg=",
"homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
"owner": "IBM-Cloud",
"repo": "terraform-provider-ibm",
"rev": "v1.71.2",
"rev": "v1.72.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-eYmxVdMbGT7aW9tfH9shgc/eIDfe41OdLOGrDuxivTY="
"vendorHash": "sha256-lEuaR4OPbg1kyGY1u1eWRsGfVpW5vHjQsovuBMXiLrQ="
},
"icinga2": {
"hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
@@ -22,13 +22,13 @@
mkDerivation rec {
pname = "twinkle";
version = "unstable-2023-03-25";
version = "unstable-2024-20-11";
src = fetchFromGitHub {
owner = "LubosD";
repo = "twinkle";
rev = "355813d5640ad58c84dc063826069384470ce310";
hash = "sha256-u+RewFwW17Oz2+lJLlmwebaGn4ebTBquox9Av7Jh1as=";
rev = "e067dcba28f4e2acd7f71b875fc4168e9706aaaa";
hash = "sha256-3YtZwP/ugWOSfUa4uaEAEEsk9i5j93eLt5lHgAu5qqI=";
};
buildInputs = [
@@ -174,6 +174,7 @@ let
FOSS_ONLY = !gitlabEnterprise;
SKIP_YARN_INSTALL = 1;
NODE_OPTIONS = "--max-old-space-size=8192";
configurePhase = ''
runHook preConfigure
@@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec {
'';
propagatedBuildInputs = with python3.pkgs; [
ipython
nbformat
];
+13
View File
@@ -0,0 +1,13 @@
# https://aur.archlinux.org/cgit/aur.git/tree/arrpc.service?h=arrpc
[Unit]
Description=arRPC Discord RPC daemon
After=network.target
[Service]
Type=simple
ExecStart=@arrpc@
Restart=on-failure
[Install]
WantedBy=default.target
+22 -14
View File
@@ -1,31 +1,39 @@
{ lib
, buildNpmPackage
, fetchFromGitHub
}: buildNpmPackage rec {
{
lib,
buildNpmPackage,
fetchFromGitHub,
}:
buildNpmPackage rec {
pname = "arrpc";
version = "3.4.0";
version = "3.5.0";
src = fetchFromGitHub {
owner = "OpenAsar";
repo = "arrpc";
# Release commits are not tagged
# release: 3.4.0
rev = "cca93db585dedf8acc1423f5e2db215de95c4c3b";
hash = "sha256-SeegrCgbjfVxG/9xfOcdfbVdDssZOhjBRnDipu6L7Wg=";
tag = version;
hash = "sha256-3xkqWcLhmSIH6Al2SvM9qBpdcLzEqUmUCgwYBPAgVpo=";
};
npmDepsHash = "sha256-S9cIyTXqCp8++Yj3VjBbcStOjzjgd0Cq7KL7NNzZFpY=";
npmDepsHash = "sha256-lw6pngFC2Pnk+I8818TOTwN4r+8IsjvdMYIyTsTi49g=";
dontNpmBuild = true;
postInstall = ''
mkdir -p $out/lib/systemd/user
substitute ${./arrpc.service} $out/lib/systemd/user/arrpc.service \
--subst-var-by arrpc $out/bin/arrpc
'';
meta = {
# ideally we would do blob/${version}/changelog.md here
# upstream does not tag releases
changelog = "https://github.com/OpenAsar/arrpc/blob/${src.rev}/changelog.md";
changelog = "https://github.com/OpenAsar/arrpc/blob/${version}/changelog.md";
description = "Open Discord RPC server for atypical setups";
homepage = "https://arrpc.openasar.dev/";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ anomalocaris NotAShelf ];
maintainers = with lib.maintainers; [
anomalocaris
NotAShelf
ulysseszhan
];
mainProgram = "arrpc";
};
}
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "ast-grep";
version = "0.30.0";
version = "0.31.1";
src = fetchFromGitHub {
owner = "ast-grep";
repo = "ast-grep";
rev = version;
hash = "sha256-Fk46F1EBWSVFAUUDAtXcwq9iCSATW1CV/ul3NEa1YqA=";
hash = "sha256-6xdqxo7XFzZHuzCUDM50iwJdub/XElKG0AlRL5mS7u4=";
};
cargoHash = "sha256-5yJ248BSp9w/r1chQqIucxzfvFGy+jumSquF9gVmSUM=";
cargoHash = "sha256-6s+XVpGTrKCBX2E/9+VyiUTvi47Xj48lPkUXlfXnufQ=";
nativeBuildInputs = [ installShellFiles ];
+3 -3
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "bark-server";
version = "2.1.5";
version = "2.1.6";
src = fetchFromGitHub {
owner = "Finb";
repo = "bark-server";
rev = "refs/tags/v${version}";
hash = "sha256-lPhRWMR+gConFOxiSONBRrwPoARaGqzaIU3hd3wSO8E=";
hash = "sha256-T4/ye3F0x2XvYEi6BFw6225lnYLRinwjgSz6UxqqV88=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -26,7 +26,7 @@ buildGoModule rec {
'';
};
vendorHash = "sha256-GemXcU5nmMkZSNpuXoRt9EH5PrxMHWLJ56bNYHXOB9I=";
vendorHash = "sha256-Yti+W3GKUMEfNBHf4C435BpYsDjCzgfLr55iqU3BGbA=";
ldflags = [
"-s"
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-modules";
version = "0.19.1";
version = "0.20.2";
src = fetchFromGitHub {
owner = "regexident";
repo = "cargo-modules";
rev = "refs/tags/v${version}";
hash = "sha256-2wA34rQHHAvx+5NhmtugnGTMZ2Sj8MNpdkkIJhDK1HM=";
hash = "sha256-GrkAEblelLWIGYdOlbRWNBibNnb+/eA3e8aM5+L7Z7g=";
};
cargoHash = "sha256-3R7rFkA2tObJZk5ypWPpMojEZvrDgKZsc1dN1wBJ63A=";
cargoHash = "sha256-/CQWVrXwkg0xVFAC2nYHtGlWYxU2TIkCLb6+NgmarDw=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
+3 -3
View File
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "chamber";
version = "3.1.0";
version = "3.1.1";
src = fetchFromGitHub {
owner = "segmentio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-BD4gtdlIh5IRgTtrCdEN+o5d00wZsczsH0JbdoFdg4o=";
sha256 = "sha256-1ySOlP0sFk3+IRt/zstZK6lEE2pzoVSiZz3wFxdesgc=";
};
CGO_ENABLED = 0;
vendorHash = "sha256-Rk6doJqLD8ucU+mGDtteCyM/QvnzbIVnFmFW9b09560=";
vendorHash = "sha256-KlouLjW9hVKFi9uz34XHd4CzNOiyO245QNygkB338YQ=";
ldflags = [ "-s" "-w" "-X main.Version=v${version}" ];
+44
View File
@@ -0,0 +1,44 @@
{
fetchPypi,
lib,
python3Packages,
}:
python3Packages.buildPythonApplication rec {
pname = "codecov-cli";
version = "9.1.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-jaljYA2x2nZUOn9vy/CdtxfGjQKHtrtY13WmBdsICTA=";
};
build-system = with python3Packages; [
setuptools
];
pythonRelaxDeps = [
"httpx"
"responses"
"tree-sitter"
];
dependencies = with python3Packages; [
click
httpx
ijson
pyyaml
regex
responses
test-results-parser
tree-sitter
];
meta = {
description = "Codecov Command Line Interface";
homepage = "https://github.com/codecov/codecov-cli";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ veehaitch ];
};
}
+3 -3
View File
@@ -10,13 +10,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "cpuinfo";
version = "0-unstable-2024-11-14";
version = "0-unstable-2024-12-09";
src = fetchFromGitHub {
owner = "pytorch";
repo = "cpuinfo";
rev = "cebb0933058d7f181c979afd50601dc311e1bf8c";
hash = "sha256-MlJZmgwHt6+hJHdl8lKOTeaTT+PTOgRHfmCCjn0a3Zc=";
rev = "ca156f7bc9109c552973414a63d310f76ef0cbf8";
hash = "sha256-hIGizsl1NSGySXPI9Xx69xCfQLAMpYviYhBXX201N4o=";
};
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
-2
View File
@@ -4,12 +4,10 @@
flutter,
lib,
tor,
zenity,
}:
let
runtimeBinDependencies = [
tor
zenity
];
in
flutter.buildFlutterApplication rec {
+2 -2
View File
@@ -22,13 +22,13 @@
let
self = python3.pkgs.buildPythonApplication rec {
pname = "duplicity";
version = "3.0.3.1";
version = "3.0.3.2";
src = fetchFromGitLab {
owner = "duplicity";
repo = "duplicity";
rev = "rel.${version}";
hash = "sha256-s8yPmuGivvmqAKsdaGouP/UoK6Ea27HjvSm39eQuKF0=";
hash = "sha256-aP2+MIV9EgwGb9detibHzW2AJdbnP+9ur9Y/Irw26qM=";
};
patches = [
+2 -1
View File
@@ -6,6 +6,7 @@
util-linux,
nasm,
python3,
pkgsBuildHost,
}:
edk2.mkDerivation "ShellPkg/ShellPkg.dsc" (finalAttrs: {
pname = "edk2-uefi-shell";
@@ -32,7 +33,7 @@ edk2.mkDerivation "ShellPkg/ShellPkg.dsc" (finalAttrs: {
# Set explicitly to use Python 3 from nixpkgs. Otherwise, the build system will detect and try to
# use `/usr/bin/python3` on Darwin when sandboxing is disabled.
PYTHON_COMMAND = "${lib.getBin python3}/bin/python3";
PYTHON_COMMAND = "${lib.getBin pkgsBuildHost.python3}/bin/python3";
# We only have a .efi file in $out which shouldn't be patched or stripped
dontPatchELF = true;
+2 -13
View File
@@ -2,7 +2,6 @@
cmake,
doxygen,
fetchFromGitHub,
fetchpatch,
lib,
pkg-config,
pythonSupport ? false,
@@ -12,14 +11,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "example-robot-data";
version = "4.1.0";
version = "4.2.0";
src = fetchFromGitHub {
owner = "Gepetto";
repo = "example-robot-data";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-Heq+c8SSYNO8ksTv5FphRBRStlTakm9T66jlPXon5tI=";
hash = "sha256-IRmqeaN0EaIjYaibTEAR8KhixoNQsl6YydbGQRinP6w=";
};
outputs = [
@@ -29,16 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
patches = [
# Temporary patch for pinocchio v3.0.0 compatibility.
# Should be removed on next example-robot-data release
(fetchpatch {
name = "pin3.patch";
url = "https://github.com/Gepetto/example-robot-data/pull/217/commits/a605ceec857005cde153ec5895e227205eb7a5c3.patch";
hash = "sha256-cvAWFytrU2XVggo/nCg8cuLcaZBTACXg6LxjL/6YMPs=";
})
];
nativeBuildInputs =
[
cmake
-5
View File
@@ -7,7 +7,6 @@
buildGoModule,
makeDesktopItem,
copyDesktopItems,
zenity,
wrapGAppsHook3,
autoPatchelfHook,
}:
@@ -97,10 +96,6 @@ flutter324.buildFlutterApplication {
install -Dm644 ./assets/images/icon.png $out/share/pixmaps/flclash.png
'';
extraWrapProgramArgs = ''
--prefix PATH : ${lib.makeBinPath [ zenity ]}
'';
meta = {
description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free";
homepage = "https://github.com/chen08209/FlClash";
-3
View File
@@ -8,7 +8,6 @@
flutter324,
pulseaudio,
makeDesktopItem,
zenity,
olm,
targetFlutterPlatform ? "linux",
@@ -64,8 +63,6 @@ flutter324.buildFlutterApplication (
runtimeDependencies = [ pulseaudio ];
extraWrapProgramArgs = "--prefix PATH : ${zenity}/bin";
env.NIX_LDFLAGS = "-rpath-link ${libwebrtcRpath}";
desktopItem = makeDesktopItem {
@@ -6,17 +6,17 @@
}:
rustPlatform.buildRustPackage rec {
pname = "flutter_rust_bridge_codegen";
version = "2.6.0";
version = "2.7.0";
src = fetchFromGitHub {
owner = "fzyzcjy";
repo = "flutter_rust_bridge";
rev = "v${version}";
hash = "sha256-SGbl1l2jtANO9QMNz9GDXI794RY/K+ldpmDxLkqAa+Y=";
hash = "sha256-XHHgKwwGI0v6PD+KQBA8AvUBqUPxefxoJXcZDwjOemQ=";
fetchSubmodules = true;
};
cargoHash = "sha256-b+duVR3vn1HrhUcVucHfzjTDhbru3+IYVNS3ji6LGto=";
cargoHash = "sha256-MDQFHQQWEStBwrwlGti5bY5HwACcrLrSR9Zs9DxTz/A=";
cargoBuildFlags = "--package flutter_rust_bridge_codegen";
cargoTestFlags = "--package flutter_rust_bridge_codegen";
+2 -6
View File
@@ -21,7 +21,6 @@
, ninja
, gnome
, gspell
, perl
, itstool
, desktop-file-utils
, vala
@@ -29,13 +28,13 @@
stdenv.mkDerivation rec {
pname = "gedit";
version = "48.0";
version = "48.1";
outputs = [ "out" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz";
sha256 = "/g/vm3sHmRINuGrok6BgA2oTRFNS3tkWm6so04rPDoA=";
hash = "sha256-lx56wmvAo6Pe0np1Y3ckFWh9sOWgkrRUflsQpVhYswo=";
};
patches = [
@@ -50,7 +49,6 @@ stdenv.mkDerivation rec {
libxml2
meson
ninja
perl
pkg-config
python3
vala
@@ -77,9 +75,7 @@ stdenv.mkDerivation rec {
postPatch = ''
chmod +x build-aux/meson/post_install.py
chmod +x plugins/externaltools/scripts/gedit-tool-merge.pl
patchShebangs build-aux/meson/post_install.py
patchShebangs plugins/externaltools/scripts/gedit-tool-merge.pl
'';
# Reliably fails to generate gedit-file-browser-enum-types.h in time
@@ -0,0 +1,30 @@
diff --git a/wt b/wt
index 60999f2..5687822 100755
--- a/wt
+++ b/wt
@@ -27,7 +27,6 @@ help_message() {
echo -e "\twt: go to the main worktree"
echo -e "\twt <worktree-name>: search for worktree names and change to that directory."
echo -e "\twt names: list out only the git worktree names."
- echo -e "\twt update: update to the latest release of worktree switcher."
echo -e "\twt version: show the CLI version."
echo -e "\twt init <shell>: print the init script for <shell>."
echo -e "\twt help: shows this help message."
@@ -163,9 +162,6 @@ case "${args[0]}" in
names)
worktree_list_names
;;
-update)
- update
- ;;
help)
help_message
;;
@@ -176,7 +172,6 @@ init)
init
;;
*)
- auto_check_update
directory=$(git worktree list --porcelain 2> /dev/null | sed -n '/'"${arg:-.}"'/{s/^worktree\s*//p;q}')
;;
esac
@@ -0,0 +1,63 @@
{
lib,
stdenv,
fetchFromGitHub,
makeWrapper,
installShellFiles,
git,
jq,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "git-worktree-switcher";
version = "0.2.4";
src = fetchFromGitHub {
owner = "mateusauler";
repo = "git-worktree-switcher";
rev = "refs/tags/${finalAttrs.version}-fork";
hash = "sha256-N+bDsLEUM6FWhyliUav2n5hwMa5EEuVPoIK+Cja0DxA=";
};
buildInputs = [
jq
git
];
nativeBuildInputs = [
makeWrapper
installShellFiles
];
patches = [
./disable-update.patch # Disable update and auto update functionality
];
installPhase = ''
mkdir -p $out/bin
cp wt $out/bin
wrapProgram $out/bin/wt --prefix PATH : ${
lib.makeBinPath [
git
jq
]
}
installShellCompletion --zsh completions/_wt_completion
installShellCompletion --bash completions/wt_completion
installShellCompletion --fish completions/wt.fish
'';
meta = {
homepage = "https://github.com/mateusauler/git-worktree-switcher";
description = "Switch between git worktrees with speed.";
license = lib.licenses.mit;
platforms = lib.platforms.all;
mainProgram = "wt";
maintainers = with lib.maintainers; [
jiriks74
mateusauler
];
};
})
+3 -3
View File
@@ -9,16 +9,16 @@
buildNpmPackage rec {
pname = "gitlab-ci-local";
version = "4.55.0";
version = "4.56.0";
src = fetchFromGitHub {
owner = "firecow";
repo = "gitlab-ci-local";
rev = version;
hash = "sha256-rfe2vvg6F4MzV/FN52cf31Ef0XlMGM+UpbSRq2vinsM=";
hash = "sha256-JMT0HtCeeM9gI6k44BohNjAq/EpvBtX2Iqe4VkBqvn4=";
};
npmDepsHash = "sha256-uv0/pasytEKEhkQXhjh51YWPMaskTEb3w4vMaMpspmI=";
npmDepsHash = "sha256-J+S8/JXAyt/nDkfLtSEGlR38oCb0DlJDDkc1t+IiyPA=";
postPatch = ''
# remove cleanup which runs git commands
+2 -2
View File
@@ -8,13 +8,13 @@
stdenv.mkDerivation (final: {
pname = "glaze";
version = "4.0.1";
version = "4.0.2";
src = fetchFromGitHub {
owner = "stephenberry";
repo = "glaze";
rev = "v${final.version}";
hash = "sha256-gQfRz7b1kbn1AoKUNG62LBynmJNbDTXzPXaX6kDCjVw=";
hash = "sha256-fNarN2VFgfZDmY62EoLsiMdW60XPbi71wbiSe/ftaFc=";
};
nativeBuildInputs = [ cmake ];
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "go-task";
version = "3.40.0";
version = "3.40.1";
src = fetchFromGitHub {
owner = "go-task";
repo = "task";
rev = "refs/tags/v${version}";
hash = "sha256-SOXtzesS+luil8Q0iKlhWv4hqPyRU2V+Um6S/uzChas=";
hash = "sha256-jQKPTKEzTfzqPlNlKFMduaAhvDsogRv3vCGtZ4KP/O4=";
};
vendorHash = "sha256-5AABVG+MHvw8f8tcphUqQFid/mzXeWjbsD9mHJfyxDw=";
vendorHash = "sha256-bw9NaJOMMKcKth0hRqNq8mqib/5zLpjComo0oj22A/U=";
doCheck = false;
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "google-java-format";
version = "1.25.0";
version = "1.25.1";
src = fetchurl {
url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar";
sha256 = "sha256-i9lJ6EpkNQRs8Y3fp2lmHqrJ2iGy08pGxLoS+WY3vLs=";
sha256 = "sha256-D1gf6WLRju+J2HUeIVqfYsUNv27aQwiT/EgtqmXLk+0=";
};
dontUnpack = true;
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "goread";
version = "1.7.0";
version = "1.7.1";
src = fetchFromGitHub {
owner = "TypicalAM";
repo = "goread";
rev = "v${version}";
hash = "sha256-a30i8eh7asc4nlomrEFV3EgwMs69UUyXPWiRQ5w6Xvc=";
hash = "sha256-tWQVqHtuTCHrsZu3CfTWUQzvUYbQrrdJoWHp43dfPEE=";
};
vendorHash = "sha256-S/0uuy/G7ZT239OgKaOT1dmY+u5/lnZKL4GtbEi2zCI=";
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "httm";
version = "0.43.2";
version = "0.44.0";
src = fetchFromGitHub {
owner = "kimono-koans";
repo = pname;
rev = version;
hash = "sha256-8oG40pxhWd2MRxUSzZ3lgcsC9M1W5yBUZ0t5tO3B86U=";
hash = "sha256-RDz/R2wfB8nEiSUD58YsF1wRgMmJkMxRTfYjSB8fEsM=";
};
cargoHash = "sha256-KKvpI3U6/cByP5M2ZiNtVrYyh2Nqe9cee2ObKqRBEyg=";
cargoHash = "sha256-c4u8/bYkme3iJzuIXIJoclgukTMZ6LZEhezggs/lcro=";
nativeBuildInputs = [ installShellFiles ];
+2 -2
View File
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "hypnotix";
version = "4.7";
version = "4.8";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "hypnotix";
rev = version;
hash = "sha256-e5vz5bCypzbofps+VW2UrKMsRBl7edeF8Ky00muCub4=";
hash = "sha256-/RW7AGEr/cAnEvjKXSqOWtAfVfqGYrGbIiQN3K5WLM4=";
};
patches = [
+31 -15
View File
@@ -1,33 +1,49 @@
{ lib
, rustPlatform
, fetchFromGitHub
, stdenv
, darwin
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
versionCheckHook,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "jaq";
version = "1.6.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "01mf02";
repo = "jaq";
rev = "v${version}";
hash = "sha256-VD10BO7bxTmD1A1AZsiEiYBsVhAKlXxdHNMmXqpvpKM=";
tag = "v${version}";
hash = "sha256-S8ELxUKU8g8+6HpM+DxINEqMDha7SgesDymhCb7T9bg=";
};
cargoHash = "sha256-7MK0iLBpjvWE7UH5Tb3qIm2XnEVsAvBy34Ed4wHagZQ=";
cargoHash = "sha256-i3AxIlRY6r0zrMmZVh1l9fPiR652xjhTcwCyHCHCrL8=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Security
# This very line fails on `x86_64-darwin`: assertion failed: out.eq(ys)
# https://github.com/01mf02/jaq/blob/v2.0.1/jaq-json/tests/funs.rs#L118
postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
substituteInPlace jaq-json/tests/funs.rs \
--replace-fail 'give(json!(null), "2.1 % 0 | isnan", json!(true));' ""
'';
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
doInstallCheck = true;
meta = with lib; {
passthru.updateScript = nix-update-script { };
meta = {
description = "Jq clone focused on correctness, speed and simplicity";
homepage = "https://github.com/01mf02/jaq";
changelog = "https://github.com/01mf02/jaq/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ figsoda siraben ];
changelog = "https://github.com/01mf02/jaq/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [
figsoda
siraben
];
mainProgram = "jaq";
};
}
+2 -2
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "kubescape";
version = "3.0.21";
version = "3.0.22";
src = fetchFromGitHub {
owner = "kubescape";
repo = "kubescape";
rev = "refs/tags/v${version}";
hash = "sha256-8Reg49X+3wzE2FJVkTA8T3VN0Ph3ToSXAeMAc2b5rYk=";
hash = "sha256-m1tfYuRDPxm8Q1e4RIzqfkv9vOjGUPvI0FADvYXep/c=";
fetchSubmodules = true;
};
@@ -0,0 +1,141 @@
{
lib,
stdenv,
runCommand,
megacmd,
unzip,
makeWrapper,
autoPatchelfHook,
makeDesktopItem,
copyDesktopItems,
libgcc,
dbus,
xorg_sys_opengl,
systemd,
libcap,
libdrm,
pulseaudio,
libsndfile,
flac,
libvorbis,
libopus,
mpg123,
lame,
libGL,
vulkan-loader,
libasyncns,
xorg,
}:
let
pname = "legends-of-equestria";
version = "2024.05.01";
description = "Free-to-play MMORPG";
runtimeDeps =
[
dbus.lib
xorg_sys_opengl
systemd
libcap.lib
libdrm
pulseaudio
libsndfile
flac
libvorbis
mpg123
lame.lib
libGL
vulkan-loader
libasyncns
]
++ (with xorg; [
libX11
libxcb
libXau
libXdmcp
libXext
libXcursor
libXrender
libXfixes
libXinerama
libXi
libXrandr
libXScrnSaver
]);
in
stdenv.mkDerivation {
inherit pname version;
src =
runCommand "mega-loe"
{
inherit pname version;
nativeBuildInputs = [
megacmd
unzip
];
url = "https://mega.nz/file/NjIwwJoK#MVi3C3FAcSQPd7FRpQc0CoStBG8jSFuPn0jD-pG3zY0";
outputHashAlgo = "sha256";
outputHash = "VXBtEB3G5MTrWn9OOvmCG3sDoasjbKkLJruhdQZa4SQ=";
outputHashMode = "recursive";
}
''
export HOME=$(mktemp -d)
dest=$HOME/mega-loe
mkdir -p $dest
mega-get "$url" $dest
mkdir -p $out
unzip -d $out $dest/*.zip
'';
dontBuild = true;
buildInputs = [
libgcc
];
nativeBuildInputs = [
makeWrapper
copyDesktopItems
autoPatchelfHook
];
installPhase = ''
runHook preInstall
loeHome=$out/lib/${pname}
mkdir -p $loeHome
cp -r LoE/* $loeHome
makeWrapper $loeHome/LoE.x86_64 $out/bin/LoE \
--suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}"
icon=$out/share/icons/hicolor/128x128/apps/legends-of-equestria.png
mkdir -p $(dirname $icon)
ln -s $loeHome/LoE_Data/Resources/UnityPlayer.png $icon
runHook postInstall
'';
passthru.updateScript = ./update.sh;
desktopItems = [
(makeDesktopItem {
name = "legends-of-equestria";
comment = description;
desktopName = "Legends of Equestria";
genericName = "Legends of Equestria";
exec = "LoE";
icon = "legends-of-equestria";
categories = [ "Game" ];
})
];
meta = {
inherit description;
license = lib.licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with lib.maintainers; [ ulysseszhan ];
mainProgram = "LoE";
homepage = "https://www.legendsofequestria.com";
downloadPage = "https://www.legendsofequestria.com/downloads";
};
}
+17
View File
@@ -0,0 +1,17 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl common-updater-scripts
set -eu -o pipefail
DOWNLOADS_PAGE_URL=https://www.legendsofequestria.com/downloads
REGEX='href="(https.+)".+Linux.+v(([0-9]+\.)+[0-9]+)'
if [[ $(curl -s $DOWNLOADS_PAGE_URL | grep -Fi Linux) =~ $REGEX ]]; then
url="${BASH_REMATCH[1]}"
version="${BASH_REMATCH[2]}"
else
echo "cannot find the latest version"
exit 1
fi
update-source-version legends-of-equestria "$version" "" "$url"
@@ -16,7 +16,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libgedit-gtksourceview";
version = "299.3.0";
version = "299.4.0";
outputs = [ "out" "dev" "devdoc" ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "gedit";
repo = "libgedit-gtksourceview";
rev = finalAttrs.version;
hash = "sha256-C2Bq01PlALJMr7kHsSr9VaSNcktc250yGevRYQ7Ipck=";
hash = "sha256-befm5UIXh2aCpKN2NH0aJhCYLf9j/ug0kVDAD5xNt4k=";
};
patches = [
+2 -2
View File
@@ -18,7 +18,7 @@
stdenv.mkDerivation rec {
pname = "libgedit-tepl";
version = "6.11.0";
version = "6.12.0";
outputs = [ "out" "dev" "devdoc" ];
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "gedit";
repo = "libgedit-tepl";
rev = version;
hash = "sha256-8y3EQZKYRcx2ocG7aR7tGBCE/68yPdrBcPNm6O2lM4c=";
hash = "sha256-s3b7wj6b2SM0+i0vXUDDhnspgPcsRAsA5kLblh0orJE=";
};
strictDeps = true;
+1 -1
View File
@@ -15,7 +15,7 @@
stdenv.mkDerivation rec {
pname = "libserdes";
version = "7.7.1";
version = "7.8.0";
src = fetchFromGitHub {
owner = "confluentinc";
+2 -2
View File
@@ -18,7 +18,7 @@ let
llvmPackages = llvmPackages_18;
stdenv = llvmPackages.stdenv;
version = "8.4.0";
version = "8.6.0";
hasI686 =
(if targets == [ ] then stdenv.hostPlatform.isx86_32 else (builtins.elem "i686" targets))
@@ -64,7 +64,7 @@ stdenv.mkDerivation {
# Packaging that in Nix is very cumbersome.
src = fetchurl {
url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz";
hash = "sha256-MSKUXfwnLw/tVAfhUoKYNGUeMYb7Ka4UWAtx9R1eSR8=";
hash = "sha256-4bFZ6nxNcrJTQhkJ5S1KU0PJN4yu9Li+QznF5IxpGCE=";
};
hardeningDisable = [
+3 -3
View File
@@ -8,16 +8,16 @@
buildNpmPackage rec {
pname = "lint-staged";
version = "15.2.10";
version = "15.2.11";
src = fetchFromGitHub {
owner = "okonet";
repo = "lint-staged";
rev = "v${version}";
hash = "sha256-Mtr3PXV4pSQgtP+RkPmXpDgmW5hFo7a+xb2GAi+wFg4=";
hash = "sha256-f2sHvbReLfX+PtFAZuxK36ZzHmaegqCG/7ADel8YVOA=";
};
npmDepsHash = "sha256-Br/KlvRkr+jFe8y2KEiE38FYrwgSbY5WpvwVOO4LGuQ=";
npmDepsHash = "sha256-RhR5nexLM5Ah35u/8jhv2PzrMYWYztPf964kQXWNim8=";
dontNpmBuild = true;
+1 -7
View File
@@ -35,7 +35,6 @@
libvdpau,
rustPlatform,
stdenv,
zenity,
copyDesktopItems,
makeDesktopItem,
replaceVars,
@@ -157,12 +156,7 @@ flutter324.buildFlutterApplication {
'';
extraWrapProgramArgs = ''
--prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib" \
--prefix PATH : "${
lib.makeBinPath [
zenity
]
}"
--prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib"
'';
meta = {
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "marwaita-orange";
version = "22";
version = "23";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
hash = "sha256-hp+5UIr3uXuUay3K6HsaGs+Wh9VFx1yVNb3d0Jw2M34=";
hash = "sha256-YLgLjTsoaPV7MErVxc48PsgR8y5lhehQfTal+/ZwYsI=";
};
buildInputs = [
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "microfetch";
version = "0.4.1";
version = "0.4.2";
src = fetchFromGitHub {
owner = "NotAShelf";
repo = "microfetch";
rev = "refs/tags/v${version}";
hash = "sha256-mK1sBcTieMjYneMhkuxoOt5+fELcyjH9+SQpzs7542Y=";
hash = "sha256-EfQs9CdbWhf/elujUO/N3TU5TiQJalYMqRGbPIGiMwg=";
};
cargoHash = "sha256-LEw7z73Jm7/mJomN6yy87iCFauXifA+vffn/drXwqpY=";
cargoHash = "sha256-/pRkF8xp0bOsliJPlQNQBkkeSf1cFe+yBo4CzMbcnKM=";
passthru.updateScript = nix-update-script { };
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "nats-server";
version = "2.10.22";
version = "2.10.23";
src = fetchFromGitHub {
owner = "nats-io";
repo = pname;
rev = "v${version}";
hash = "sha256-B+fSB3aTXAc/EjKSaFR2clieLNFszA2U2BdMsYJRZFE=";
hash = "sha256-XZPp8hRuweSUJaCXRgJJ2F8/cglWKMeDC/HZxxvL+V8=";
};
vendorHash = "sha256-0VkY1+3tlAfGDt+fhyMbmyT4TN0bw1HVJLi2+mivkrc=";
vendorHash = "sha256-ZpPxx7WwknlJTk1tMuH6L4oxQAFnd41y4pGky86qKR8=";
doCheck = false;
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "nomino";
version = "1.3.6";
version = "1.3.7";
src = fetchFromGitHub {
owner = "yaa110";
repo = pname;
rev = version;
hash = "sha256-HbI2XPYNSFBc/h+kEsNsOxJ8+7uq1Ia0ce98FKoUlng=";
hash = "sha256-rePNcO8vssCR7YfdDCV+YT1hqGKBeMCwWpGmBnKtl9w=";
};
cargoHash = "sha256-zA5cTdW0x7k8/mAUfUBzbiBR1ypyeLr7AOyg+16Islk=";
cargoHash = "sha256-C+fcN3byvPFtgX/DYexNZryoirOAhSx0hhOYR2gdW3s=";
meta = with lib; {
description = "Batch rename utility for developers";
+3 -3
View File
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "ocm";
version = "1.0.2";
version = "1.0.3";
src = fetchFromGitHub {
owner = "openshift-online";
repo = "ocm-cli";
rev = "v${version}";
sha256 = "sha256-cKXC7+Hn+74ukHG7iN4QwIv9vuPXm8FKyaKPD62S5ck=";
sha256 = "sha256-RuGUIG58cyyWvHD/0T7xwtzFy9XJUmavkQg4MRAHQqQ=";
};
vendorHash = "sha256-uj4xmNZViag+j4YavFjDvc/ClMBb99DhwlcKzvGWQ7c=";
vendorHash = "sha256-qkTh+tkU6MXBJkX0XwktRCMjoySe1/9uWHFGTc7ozRM=";
# Strip the final binary.
ldflags = [
+13
View File
@@ -0,0 +1,13 @@
diff --git a/Cargo.toml b/Cargo.toml
index 65be773..3499dee 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,7 +30,7 @@ nom = "7.1.3"
nom-derive = "0.10.1"
prost = "0.11.8"
rayon = "1.7.0"
-rust-lzma = { version = "0.6.0", features = ["static"] }
+rust-lzma = "0.6.0"
sha2 = "0.10.6"
sync-unsafe-cell = "0.1.0"
tempfile = "3.6.0"
+41
View File
@@ -0,0 +1,41 @@
{
lib,
fetchFromGitHub,
rustPlatform,
pkg-config,
protobuf,
xz,
}:
rustPlatform.buildRustPackage rec {
pname = "otadump";
version = "0.1.2";
src = fetchFromGitHub {
owner = "crazystylus";
repo = "otadump";
rev = version;
hash = "sha256-4zPVcTU+0otV4EPQi80uSRkpRo9XzI0V3Kr17ugXX2U=";
};
patches = [ ./no-static.patch ];
nativeBuildInputs = [
pkg-config
protobuf
];
buildInputs = [ xz ];
doCheck = false; # There are no tests
cargoHash = "sha256-lTzEgy9mevkmefvTZT9hEBHN5I+kXVqTev5+sy/JoaE=";
meta = {
description = "Command-line tool to extract partitions from Android OTA files";
homepage = "https://github.com/crazystylus/otadump";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.axka ];
mainProgram = "otadump";
};
}
+28 -5
View File
@@ -3,37 +3,60 @@
python3,
fetchFromGitHub,
imagemagick,
installShellFiles,
nix-update-script,
}:
python3.pkgs.buildPythonApplication rec {
pname = "pywal16";
version = "3.6.0";
version = "3.7.2";
pyproject = true;
src = fetchFromGitHub {
owner = "eylles";
repo = "pywal16";
rev = "refs/tags/${version}";
hash = "sha256-YKHOH1bEsZHTgYm8AYpfA6C8RtWxAqNQ+GHMcdaj/JU=";
tag = version;
hash = "sha256-aizuON8Y321i7bF2SuC5UC1iOWHY217ccfzY9WmaevQ=";
};
nativeBuildInputs = [ python3.pkgs.setuptools ];
build-system = [ python3.pkgs.setuptools ];
nativeBuildInputs = [ installShellFiles ];
nativeCheckInputs = [
python3.pkgs.pytestCheckHook
imagemagick
];
postInstall = ''
installManPage data/man/man1/wal.1
'';
preCheck = ''
export HOME=$(mktemp -d)
'';
pythonImportsCheck = [ "pywal" ];
optional-dependencies = with python3.pkgs; {
colorthief = [ colorthief ];
colorz = [ colorz ];
fast-colorthief = [ fast-colorthief ];
haishoku = [ haishoku ];
all = [
colorthief
colorz
ast-colorthief
haishoku
];
};
passthru.updateScript = nix-update-script { };
meta = {
description = "16 colors fork of pywal";
homepage = "https://github.com/eylles/pywal16";
changelog = "https://github.com/eylles/pywal16/blob/${src.rev}/CHANGELOG.md";
changelog = "https://github.com/eylles/pywal16/blob/refs/tags/${version}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ moraxyc ];
mainProgram = "wal";
-2
View File
@@ -5,7 +5,6 @@
lib,
flutter,
quickemu,
zenity,
}:
flutter.buildFlutterApplication rec {
pname = "quickgui";
@@ -26,7 +25,6 @@ flutter.buildFlutterApplication rec {
extraWrapProgramArgs = "--prefix PATH : ${
lib.makeBinPath [
quickemu
zenity
]
}";
+4 -4
View File
@@ -20,19 +20,19 @@
stdenv.mkDerivation (finalAttrs: {
pname = "resources";
version = "1.7.0";
version = "1.7.1";
src = fetchFromGitHub {
owner = "nokyan";
repo = "resources";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-mnOpWVJTNGNdGd6fMIZl3AOF4NbtMm1XS8QFqfAF/18=";
hash = "sha256-SHawaH09+mDovFiznZ+ZkUgUbv5tQGcXBgUGrdetOcA=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit (finalAttrs) src;
name = "resources-${finalAttrs.version}";
hash = "sha256-vIqtKJxKQ/mHFcB6IxfX27Lk2ID/W+M4hQnPB/aExa4=";
hash = "sha256-tUD+gx9nQiGWKKRPcR7OHbPvU2j1dQjYck7FF9vYqSQ=";
};
nativeBuildInputs = [
@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
};
meta = {
changelog = "https://github.com/nokyan/resources/releases/tag/${finalAttrs.version}";
changelog = "https://github.com/nokyan/resources/releases/tag/v${finalAttrs.version}";
description = "Monitor your system resources and processes";
homepage = "https://github.com/nokyan/resources";
license = lib.licenses.gpl3Only;
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "rqlite";
version = "8.34.1";
version = "8.34.3";
src = fetchFromGitHub {
owner = "rqlite";
repo = pname;
rev = "v${version}";
sha256 = "sha256-YU2TQ+QTtrderXx2l/bqRCaNiuCOBD/jRYZ/oEKO9H4=";
sha256 = "sha256-iErUNuX0FecBeMkcJv75TxlXP4WrdOsS9T5ABsedZlg=";
};
vendorHash = "sha256-yoowUrS7UDk6sCfTYmDEVWzGBtzT7DR1vuqPWlcqRzU=";
vendorHash = "sha256-v30TFML8RBn02LaNDQ0LBbhJduQUZDEBUCSSDwW2Ixo=";
subPackages = [
"cmd/rqlite"
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "rustypaste";
version = "0.15.1";
version = "0.16.0";
src = fetchFromGitHub {
owner = "orhun";
repo = pname;
rev = "v${version}";
sha256 = "sha256-C/ndU09+yQTXEUWDO3u9Bl5M3x3aaRHVuWpomUAa/B8=";
sha256 = "sha256-Kv6hmqqGY9SssiT/MYmYCZ71N8CHFTT7K4q7eMdQTQU=";
};
cargoHash = "sha256-b9KZzevaTl52pduN4gkF8k6yqgDcE8x5sOwmPxzYfWA=";
cargoHash = "sha256-podM44J7RGpLdPo+yS7clwX6vvvQRllkqPu7UpC/LzI=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
+2 -2
View File
@@ -2,12 +2,12 @@
python3Packages.buildPythonApplication rec {
pname = "scdl";
version = "2.12.1";
version = "2.12.3";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-8BMO5/XJdAkz/E1ZDXavJudNSOiZdYLcZVMk1S8g9nU=";
hash = "sha256-24X+UAabxjyUYF/0qgXEpHgBNXDNn/q8/Nxw2jXKQdM=";
};
build-system = [ python3Packages.setuptools ];
+9 -9
View File
@@ -1,21 +1,21 @@
{
"version": "0.1.17",
"version": "0.1.20",
"assets": {
"x86_64-linux": {
"url": "https://github.com/withered-magic/starpls/releases/download/v0.1.17/starpls-linux-amd64",
"hash": "sha256-LGW7KBC0/q/JMdpQSaTjqSqjjNqH49WoZJQMXKOkq5c="
"url": "https://github.com/withered-magic/starpls/releases/download/v0.1.20/starpls-linux-amd64",
"hash": "sha256-oImI2aWIGPKJiu/eDwT2ExP0UNz6kj8ZWjZNPUkT5Dc="
},
"aarch64-linux": {
"url": "https://github.com/withered-magic/starpls/releases/download/v0.1.17/starpls-linux-aarch64",
"hash": "sha256-qsS0J4qiaj7nuC9Gv2hZHAuZ3L+GZFaZAazkxOlZvAc="
"url": "https://github.com/withered-magic/starpls/releases/download/v0.1.20/starpls-linux-aarch64",
"hash": "sha256-z6KY//iMcXXtTRn+9DuXAYZRsakyNOjiGpLztC0g6a4="
},
"x86_64-darwin": {
"url": "https://github.com/withered-magic/starpls/releases/download/v0.1.17/starpls-darwin-amd64",
"hash": "sha256-VB2Y8UMyVxkPmeA0wTlIq/0Rc4Yei9PZrMz86m111GA="
"url": "https://github.com/withered-magic/starpls/releases/download/v0.1.20/starpls-darwin-amd64",
"hash": "sha256-hTD+DE6Ih10+Jr2sATDAedpRQOnW9BCrEcAcuvd/u50="
},
"aarch64-darwin": {
"url": "https://github.com/withered-magic/starpls/releases/download/v0.1.17/starpls-darwin-arm64",
"hash": "sha256-JSJ6gypX1bcPJ57f4XIB5DCL2HynhhIlG6pwbJjpVCE="
"url": "https://github.com/withered-magic/starpls/releases/download/v0.1.20/starpls-darwin-arm64",
"hash": "sha256-tOk/w+g8xI7uGKPUc8Ff5QQ6/brmy6TcfzH8dCjlU2w="
}
}
}
+2 -2
View File
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "tarlz";
version = "0.25";
version = "0.26";
outputs = [ "out" "man" "info" ];
nativeBuildInputs = [ lzip texinfo ];
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://savannah/lzip/tarlz/tarlz-${version}.tar.lz";
hash = "sha256-fQu+nDoTe7k6EL5WmI/Pc2Lk28ZUkGOe3EJVtwQQX84=";
hash = "sha256-U/4FXvcDSFcJddIgzq1WNvkXXwwHu+yORQuv8YuZmOQ=";
};
enableParallelBuilding = true;
+3 -3
View File
@@ -8,16 +8,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "television";
version = "0.5.3";
version = "0.6.2";
src = fetchFromGitHub {
owner = "alexpasmantier";
repo = "television";
rev = "refs/tags/" + version;
hash = "sha256-xYfaFs0a37maeLdnlEGVsocWWym41EOZ9dsuFXc1hMY=";
hash = "sha256-Z2FkgGpXSetmG90c4RoiBlp8fyivmcbyA5fQ2jYsLLg=";
};
cargoHash = "sha256-z12FeXQ2IpDZQYqnt6MPkLeW4Ul3XphSI38ikM/YizY=";
cargoHash = "sha256-K0NfS5oXlhlEhk4qpHbI/9R0IlxP0qo3DLgB99/VdP4=";
passthru = {
tests.version = testers.testVersion {
+4
View File
@@ -41,6 +41,8 @@
# enable support for python plugins in unbound: note this is distinct from pyunbound
# see https://unbound.docs.nlnetlabs.nl/en/latest/developer/python-modules.html
, withPythonModule ? false
# enable support for .so plugins
, withDynlibModule ? false
, withLto ? !stdenv.hostPlatform.isStatic && !stdenv.hostPlatform.isMinGW
, withMakeWrapper ? !stdenv.hostPlatform.isMinGW
, libnghttp2
@@ -91,6 +93,8 @@ stdenv.mkDerivation (finalAttrs: {
"--enable-systemd"
] ++ lib.optionals withPythonModule [
"--with-pythonmodule"
] ++ lib.optionals withDynlibModule [
"--with-dynlibmodule"
] ++ lib.optionals withDoH [
"--with-libnghttp2=${libnghttp2.dev}"
] ++ lib.optionals withECS [
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "versitygw";
version = "1.0.8";
version = "1.0.9";
src = fetchFromGitHub {
owner = "versity";
repo = "versitygw";
rev = "refs/tags/v${version}";
hash = "sha256-hrGPHl8vfLsL1JMcaU+RAQj6CaBJKsW+Q2AGCbgYUSA=";
hash = "sha256-giPk0037zMqrqG6L1b9M7Us9d9YpGNjlJXWaNCIx3vc=";
};
vendorHash = "sha256-zZufxxZZ5Lfr0vWcygXdiRK+bhUr/+MFk4ajJGz5TMI=";
vendorHash = "sha256-vW1LQDr2u/owt919HyRkd6frCQquCq5rrYFAp0n3x2o=";
doCheck = false; # Require access to online S3 services
+14
View File
@@ -2,6 +2,8 @@
fetchFromGitHub,
lib,
stdenv,
makeDesktopItem,
copyDesktopItems,
libX11,
libxcb,
qt5,
@@ -20,6 +22,16 @@ stdenv.mkDerivation (finalAttrs: {
sourceRoot = "${finalAttrs.src.name}/src";
desktopItems = [
(makeDesktopItem {
name = finalAttrs.pname;
desktopName = "Whatsie";
icon = finalAttrs.pname;
exec = finalAttrs.pname;
comment = finalAttrs.meta.description;
})
];
buildInputs = [
libX11
libxcb
@@ -27,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
];
nativeBuildInputs = [
copyDesktopItems
qt5.wrapQtAppsHook
qt5.qmake
];
@@ -43,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
runHook preInstall
install -Dm755 whatsie -t $out/bin
install -Dm644 $src/snap/gui/icon.svg $out/share/icons/hicolor/scalable/apps/whatsie.svg
runHook postInstall
'';
@@ -9,15 +9,15 @@
buildGoModule rec {
pname = "yubikey-touch-detector";
version = "1.12.0";
version = "1.12.2";
src = fetchFromGitHub {
owner = "maximbaz";
repo = "yubikey-touch-detector";
rev = version;
hash = "sha256-Uh6DzDMBnTkKP1GW71TwGOfe3apDNNDUzZ5GLkPxrkE=";
hash = "sha256-vhaJSgQUBYBXfQHHR7cR3zHCZstwRD/jXhqYR1vqMqA=";
};
vendorHash = "sha256-mhmYTicj/ihGNzeCZd1ZijWPkvxQZjBxaC5dyAU1O7U=";
vendorHash = "sha256-x8Fmhsk6MtgAtLxgH/V3KusM0BXAOaSU+2HULR5boJQ=";
nativeBuildInputs = [ pkg-config ];
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "elementary-terminal";
version = "6.2.0";
version = "6.3.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "terminal";
rev = version;
sha256 = "sha256-o5hMrsn6OBk/2ycCDdT8n6gQUWcRuoaHqnmkODnJ6B8=";
sha256 = "sha256-Pr2Jm37vuw1DOx63BXKT3oPK6C7i5v9ObYFNR6Hvhns=";
};
nativeBuildInputs = [
@@ -1,6 +1,7 @@
{ callPackage }:
{
file_picker = callPackage ./file_picker { };
flutter_secure_storage_linux = callPackage ./flutter-secure-storage-linux { };
flutter_volume_controller = callPackage ./flutter_volume_controller { };
fvp = callPackage ./fvp { };
@@ -0,0 +1,25 @@
{
stdenv,
zenity,
}:
{ version, src, ... }:
stdenv.mkDerivation rec {
pname = "file_picker";
inherit version src;
inherit (src) passthru;
postPatch = ''
substituteInPlace lib/src/linux/file_picker_linux.dart \
--replace-fail "isExecutableOnPath('zenity')" "'${zenity}/bin/zenity'"
'';
installPhase = ''
runHook preInstall
cp -r . $out
runHook postInstall
'';
}
@@ -14,11 +14,12 @@
, glib-testing
, python3
, nixosTests
, malcontent-ui
}:
stdenv.mkDerivation rec {
pname = "malcontent";
version = "0.12.0";
version = "0.13.0";
outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ];
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "pwithnall";
repo = "malcontent";
rev = version;
hash = "sha256-UK/WVqDMkwIqkTFFjzh7PRCA/Ej8Iyu33FasnAEApRs=";
hash = "sha256-DVoTJrpXk5AoRMz+TxEP3NIAA/OOGRzZurLyGp0UBUo=";
};
patches = [
@@ -70,10 +71,10 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace libmalcontent/tests/app-filter.c \
--replace "/usr/bin/true" "${coreutils}/bin/true" \
--replace "/bin/true" "${coreutils}/bin/true" \
--replace "/usr/bin/false" "${coreutils}/bin/false" \
--replace "/bin/false" "${coreutils}/bin/false"
--replace-fail "/usr/bin/true" "${coreutils}/bin/true" \
--replace-fail "/bin/true" "${coreutils}/bin/true" \
--replace-fail "/usr/bin/false" "${coreutils}/bin/false" \
--replace-fail "/bin/false" "${coreutils}/bin/false"
'';
postInstall = ''
@@ -86,6 +87,7 @@ stdenv.mkDerivation rec {
passthru = {
tests = {
installedTests = nixosTests.installed-tests.malcontent;
inherit malcontent-ui;
};
};
@@ -208,6 +208,7 @@ mapAliases {
inherit (pkgs) undollar; # added 2024-06-29
inherit (pkgs) ungit; # added 2023-08-20
inherit (pkgs) vim-language-server; # added 2024-06-25
vls = throw "vls has been deprecated by upstream as vetur is also deprecated. Upstream suggests migrating to Volar for Vue LSP tooling instead."; # added 2024-12-09
inherit (pkgs) vsc-leetcode-cli; # Added 2023-08-30
vscode-css-languageserver-bin = throw "vscode-css-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26
vscode-html-languageserver-bin = throw "vscode-html-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26
@@ -217,7 +217,6 @@
, "vega-cli"
, "vega-lite"
, "vercel"
, "vls"
, "vscode-json-languageserver"
, "wavedrom-cli"
, "webpack"
-223
View File
@@ -22578,15 +22578,6 @@ let
sha512 = "oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw==";
};
};
"eslint-plugin-vue-9.28.0" = {
name = "eslint-plugin-vue";
packageName = "eslint-plugin-vue";
version = "9.28.0";
src = fetchurl {
url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.28.0.tgz";
sha512 = "ShrihdjIhOTxs+MfWun6oJWuk+g/LAhN+CiuOl/jjkG3l0F2AuK5NMTaWqyvBgkFtpYmyks6P4603mLmhNJW8g==";
};
};
"eslint-rule-docs-1.1.235" = {
name = "eslint-rule-docs";
packageName = "eslint-rule-docs";
@@ -51381,15 +51372,6 @@ let
sha512 = "qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg==";
};
};
"vue-eslint-parser-9.4.3" = {
name = "vue-eslint-parser";
packageName = "vue-eslint-parser";
version = "9.4.3";
src = fetchurl {
url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.4.3.tgz";
sha512 = "2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg==";
};
};
"w3c-hr-time-1.0.2" = {
name = "w3c-hr-time";
packageName = "w3c-hr-time";
@@ -52497,15 +52479,6 @@ let
sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==";
};
};
"xml-name-validator-4.0.0" = {
name = "xml-name-validator";
packageName = "xml-name-validator";
version = "4.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz";
sha512 = "ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==";
};
};
"xml-name-validator-5.0.0" = {
name = "xml-name-validator";
packageName = "xml-name-validator";
@@ -78716,202 +78689,6 @@ in
bypassCache = true;
reconstructLock = true;
};
vls = nodeEnv.buildNodePackage {
name = "vls";
packageName = "vls";
version = "0.8.5";
src = fetchurl {
url = "https://registry.npmjs.org/vls/-/vls-0.8.5.tgz";
sha512 = "61kbdO2COZWBMC4wq59QfDdev9ruXd0226f57DFJTFpFXv85S+qnHakQlAmbSYFFLGKcx95HB2UjnuQh4YRwFA==";
};
dependencies = [
sources."@babel/code-frame-7.24.7"
sources."@babel/helper-validator-identifier-7.24.7"
(sources."@babel/highlight-7.24.7" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."chalk-2.4.2"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
sources."escape-string-regexp-1.0.5"
sources."has-flag-3.0.0"
sources."supports-color-5.5.0"
];
})
sources."@eslint-community/eslint-utils-4.4.0"
sources."@eslint-community/regexpp-4.11.1"
sources."@eslint/eslintrc-2.1.4"
sources."@eslint/js-8.57.1"
sources."@humanwhocodes/config-array-0.13.0"
sources."@humanwhocodes/module-importer-1.0.1"
sources."@humanwhocodes/object-schema-2.0.3"
sources."@nodelib/fs.scandir-2.1.5"
sources."@nodelib/fs.stat-2.0.5"
sources."@nodelib/fs.walk-1.2.8"
sources."@ungap/structured-clone-1.2.0"
sources."acorn-8.12.1"
sources."acorn-jsx-5.3.2"
sources."ajv-6.12.6"
sources."ansi-regex-5.0.1"
sources."ansi-styles-4.3.0"
sources."argparse-2.0.1"
sources."balanced-match-1.0.2"
sources."boolbase-1.0.0"
sources."brace-expansion-1.1.11"
sources."builtin-modules-1.1.1"
sources."call-bind-1.0.7"
sources."callsites-3.1.0"
sources."chalk-4.1.2"
sources."character-parser-2.2.0"
sources."color-convert-2.0.1"
sources."color-name-1.1.4"
sources."commander-2.20.3"
sources."concat-map-0.0.1"
sources."cross-spawn-7.0.3"
sources."cssesc-3.0.0"
sources."debug-4.3.7"
sources."deep-is-0.1.4"
sources."define-data-property-1.1.4"
sources."diff-4.0.2"
sources."doctrine-3.0.0"
sources."es-define-property-1.0.0"
sources."es-errors-1.3.0"
sources."escape-string-regexp-4.0.0"
sources."eslint-8.57.1"
sources."eslint-plugin-vue-9.28.0"
sources."eslint-scope-7.2.2"
sources."eslint-visitor-keys-3.4.3"
sources."espree-9.6.1"
sources."esprima-4.0.1"
sources."esquery-1.6.0"
sources."esrecurse-4.3.0"
sources."estraverse-5.3.0"
sources."esutils-2.0.3"
sources."fast-deep-equal-3.1.3"
sources."fast-json-stable-stringify-2.1.0"
sources."fast-levenshtein-2.0.6"
sources."fastq-1.17.1"
sources."file-entry-cache-6.0.1"
sources."find-up-5.0.0"
sources."flat-cache-3.2.0"
sources."flatted-3.3.1"
sources."fs.realpath-1.0.0"
sources."function-bind-1.1.2"
sources."get-intrinsic-1.2.4"
sources."glob-7.2.3"
sources."glob-parent-6.0.2"
sources."globals-13.24.0"
sources."gopd-1.0.1"
sources."graphemer-1.4.0"
sources."has-flag-4.0.0"
sources."has-property-descriptors-1.0.2"
sources."has-proto-1.0.3"
sources."has-symbols-1.0.3"
sources."has-tostringtag-1.0.2"
sources."hasown-2.0.2"
sources."ignore-5.3.2"
sources."import-fresh-3.3.0"
sources."imurmurhash-0.1.4"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."is-core-module-2.15.1"
(sources."is-expression-4.0.0" // {
dependencies = [
sources."acorn-7.4.1"
];
})
sources."is-extglob-2.1.1"
sources."is-glob-4.0.3"
sources."is-path-inside-3.0.3"
sources."is-regex-1.1.4"
sources."isexe-2.0.0"
sources."js-tokens-4.0.0"
sources."js-yaml-4.1.0"
sources."json-buffer-3.0.1"
sources."json-schema-traverse-0.4.1"
sources."json-stable-stringify-without-jsonify-1.0.1"
sources."keyv-4.5.4"
sources."levn-0.4.1"
sources."locate-path-6.0.0"
sources."lodash-4.17.21"
sources."lodash.merge-4.6.2"
sources."minimatch-3.1.2"
sources."minimist-1.2.8"
sources."mkdirp-0.5.6"
sources."ms-2.1.3"
sources."natural-compare-1.4.0"
sources."nth-check-2.1.1"
sources."object-assign-4.1.1"
sources."once-1.4.0"
sources."optionator-0.9.4"
sources."p-limit-3.1.0"
sources."p-locate-5.0.0"
sources."parent-module-1.0.1"
sources."path-exists-4.0.0"
sources."path-is-absolute-1.0.1"
sources."path-key-3.1.1"
sources."path-parse-1.0.7"
sources."picocolors-1.1.0"
sources."postcss-selector-parser-6.1.2"
sources."prelude-ls-1.2.1"
sources."prettier-2.8.8"
sources."pug-error-2.1.0"
sources."pug-lexer-5.0.1"
sources."punycode-2.3.1"
sources."queue-microtask-1.2.3"
sources."resolve-1.22.8"
sources."resolve-from-4.0.0"
sources."reusify-1.0.4"
sources."rimraf-3.0.2"
sources."run-parallel-1.2.0"
sources."semver-7.6.3"
sources."set-function-length-1.2.2"
sources."shebang-command-2.0.0"
sources."shebang-regex-3.0.0"
sources."sprintf-js-1.0.3"
sources."strip-ansi-6.0.1"
sources."strip-json-comments-3.1.1"
sources."supports-color-7.2.0"
sources."supports-preserve-symlinks-flag-1.0.0"
sources."text-table-0.2.0"
sources."tslib-1.14.1"
(sources."tslint-6.1.3" // {
dependencies = [
sources."ansi-styles-3.2.1"
sources."argparse-1.0.10"
sources."chalk-2.4.2"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
sources."escape-string-regexp-1.0.5"
sources."has-flag-3.0.0"
sources."js-yaml-3.14.1"
sources."semver-5.7.2"
sources."supports-color-5.5.0"
];
})
sources."tsutils-2.29.0"
sources."type-check-0.4.0"
sources."type-fest-0.20.2"
sources."typescript-4.9.5"
sources."uri-js-4.4.1"
sources."util-deprecate-1.0.2"
sources."vue-eslint-parser-9.4.3"
sources."which-2.0.2"
sources."word-wrap-1.2.5"
sources."wrappy-1.0.2"
sources."xml-name-validator-4.0.0"
sources."yocto-queue-0.1.0"
];
buildInputs = globalBuildInputs;
meta = {
description = "Vue Language Server";
homepage = "https://github.com/vuejs/vetur/tree/master/server";
license = "MIT";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
vscode-json-languageserver = nodeEnv.buildNodePackage {
name = "vscode-json-languageserver";
packageName = "vscode-json-languageserver";
@@ -0,0 +1,36 @@
{
buildDunePackage,
crowbar,
eio,
eio_main,
logs,
mdx,
mirage-crypto-rng-eio,
ptime,
tls,
}:
buildDunePackage rec {
pname = "tls-eio";
inherit (tls) src meta version;
minimalOCamlVersion = "5.0";
doCheck = true;
nativeCheckInputs = [
mdx.bin
];
checkInputs = [
crowbar
eio_main
(mdx.override { inherit logs; })
];
propagatedBuildInputs = [
ptime
eio
mirage-crypto-rng-eio
tls
];
}
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "aioacaia";
version = "0.1.10";
version = "0.1.11";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "zweckj";
repo = "aioacaia";
rev = "refs/tags/v${version}";
hash = "sha256-Lp7sYnVzk1w7zgKDtoBMrzArTNAQ3jgt4Ch3uJ8ZDyY=";
hash = "sha256-9lRF3NrJ/Zl7ZOihiUiflxCjUi9WHjovgbpFebJJl9M=";
};
build-system = [ setuptools ];
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "cymem";
version = "2.0.8";
version = "2.0.10";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -18,8 +18,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "explosion";
repo = "cymem";
rev = "refs/tags/v${version}";
hash = "sha256-e4lgV39lwC2Goqmd8Jjra+znuCpxsv2IsRXfFbQkGN8=";
tag = "release-v${version}";
hash = "sha256-lMbovEIYdXYQvLeVaCm8KfYaQ2TFSAi6picu7Ju9peg=";
};
build-system = [
@@ -40,7 +40,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Cython memory pool for RAII-style memory management";
homepage = "https://github.com/explosion/cymem";
changelog = "https://github.com/explosion/cymem/releases/tag/v${version}";
changelog = "https://github.com/explosion/cymem/releases/tag/release-v${version}";
license = licenses.mit;
maintainers = with maintainers; [ nickcao ];
};
@@ -58,7 +58,7 @@ buildPythonPackage rec {
owner = "datalad";
repo = "datalad";
rev = "refs/tags/${version}";
hash = "sha256-l3II9xebSq09He5e4GGGiGtfe6ERtIQD00eHKGx46WA=";
hash = "sha256-sIWHBaqTJuKQHvh+L10PUehsmjRFl/holXzp0SMqr+k=";
};
postPatch = ''
@@ -13,17 +13,17 @@
}:
buildPythonPackage rec {
version = "4.2.0";
version = "4.2.3";
pname = "fints";
pyproject = true;
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "raphaelm";
repo = "python-fints";
rev = "v${version}";
hash = "sha256-BM57Ov36DEJVH5DBm/mJife16iaFfjlQrF0IXRziM2A=";
tag = "v${version}";
hash = "sha256-QR5/mAll6vuP+hJo/oguynLLsGawhTQNaU6TCgww9yM=";
};
pythonRemoveDeps = [ "enum-tools" ];
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "gotailwind";
version = "0.2.4";
version = "0.3.0";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "frenck";
repo = "python-gotailwind";
rev = "refs/tags/v${version}";
hash = "sha256-g4wYjMJXSm7cjb5Zck1O0A+ETfqMTmiI8In26mcGhNw=";
hash = "sha256-kNyqSyJ1ha+BumYX4ruWaN0akEvUEsRxPs7Fj7LDHOw=";
};
postPatch = ''

Some files were not shown because too many files have changed in this diff Show More