mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-09 19:13:26 +03:00
Merge remote-tracking branch 'origin/master' into staging-next
This commit is contained in:
K900
commit
bada9d0a53
188 changed files with 2037 additions and 2241 deletions
|
|
@ -2196,6 +2196,9 @@ The following rules are desired to be respected:
|
|||
and using a `-` as delimiter.
|
||||
* Attribute names in `python-packages.nix` should be sorted alphanumerically to
|
||||
avoid merge conflicts and ease locating attributes.
|
||||
* Non-python runtime dependencies should be added via explicit wrapping or
|
||||
patching (using e.g. `substituteInPlace`), rather than through propagation via
|
||||
`dependencies`/`propagatedBuildInputs`, to reduce clutter in `$PATH`.
|
||||
|
||||
This list is useful for reviewers as well as for self-checking when submitting packages.
|
||||
|
||||
|
|
|
|||
|
|
@ -11007,6 +11007,12 @@
|
|||
githubId = 5579359;
|
||||
name = "Jason Yundt";
|
||||
};
|
||||
jayrovacsek = {
|
||||
email = "nixpkgs@jay.rovacsek.com";
|
||||
github = "JayRovacsek";
|
||||
githubId = 29395089;
|
||||
name = "Jay Rovacsek";
|
||||
};
|
||||
jb55 = {
|
||||
email = "jb55@jb55.com";
|
||||
github = "jb55";
|
||||
|
|
|
|||
|
|
@ -398,9 +398,21 @@ rec {
|
|||
|
||||
enableStrictShellChecks = mkOption {
|
||||
type = types.bool;
|
||||
description = "Enable running shellcheck on the generated scripts for this unit.";
|
||||
# The default gets set in systemd-lib.nix because we don't have access to
|
||||
# the full NixOS config here.
|
||||
description = ''
|
||||
Enable running `shellcheck` on the generated scripts for this unit.
|
||||
|
||||
When enabled, scripts generated by the unit will be checked with
|
||||
`shellcheck` and any errors or warnings will cause the build to
|
||||
fail.
|
||||
|
||||
This affects all scripts that have been created through the
|
||||
`script`, `reload`, `preStart`, `postStart`, `preStop` and
|
||||
`postStop` options for systemd services. This does not affect
|
||||
command lines passed directly to `ExecStart`, `ExecReload`,
|
||||
`ExecStartPre`, `ExecStartPost`, `ExecStop` or `ExecStopPost`.
|
||||
'';
|
||||
# The default gets set in systemd-lib.nix because we don't have
|
||||
# access to the full NixOS config here.
|
||||
defaultText = literalExpression "config.systemd.enableStrictShellChecks";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -68,7 +68,6 @@ in
|
|||
|
||||
systemd.timers.tzupdate = {
|
||||
enable = cfg.timer.enable;
|
||||
interval = cfg.timer.interval;
|
||||
timerConfig = {
|
||||
OnStartupSec = "30s";
|
||||
OnCalendar = cfg.timer.interval;
|
||||
|
|
|
|||
|
|
@ -226,7 +226,32 @@ in
|
|||
package = mkPackageOption pkgs "systemd" { };
|
||||
|
||||
enableStrictShellChecks = mkEnableOption "" // {
|
||||
description = "Whether to run shellcheck on the generated scripts for systemd units.";
|
||||
description = ''
|
||||
Whether to run `shellcheck` on the generated scripts for systemd
|
||||
units.
|
||||
|
||||
When enabled, all systemd scripts generated by NixOS will be checked
|
||||
with `shellcheck` and any errors or warnings will cause the build to
|
||||
fail.
|
||||
|
||||
This affects all scripts that have been created through the `script`,
|
||||
`reload`, `preStart`, `postStart`, `preStop` and `postStop` options for
|
||||
systemd services. This does not affect command lines passed directly
|
||||
to `ExecStart`, `ExecReload`, `ExecStartPre`, `ExecStartPost`,
|
||||
`ExecStop` or `ExecStopPost`.
|
||||
|
||||
It therefore also does not affect systemd units that are coming from
|
||||
packages and that are not defined through the NixOS config. This option
|
||||
is disabled by default, and although some services have already been
|
||||
fixed, it is still likely that you will encounter build failures when
|
||||
enabling this.
|
||||
|
||||
We encourage people to enable this option when they are willing and
|
||||
able to submit fixes for potential build failures to Nixpkgs. The
|
||||
option can also be enabled or disabled for individual services using
|
||||
the `enableStrictShellChecks` option on the service itself, which will
|
||||
take precedence over the global setting.
|
||||
'';
|
||||
};
|
||||
|
||||
units = mkOption {
|
||||
|
|
|
|||
|
|
@ -1389,6 +1389,7 @@ in
|
|||
tuxguitar = runTest ./tuxguitar.nix;
|
||||
twingate = runTest ./twingate.nix;
|
||||
typesense = handleTest ./typesense.nix { };
|
||||
tzupdate = runTest ./tzupdate.nix;
|
||||
ucarp = handleTest ./ucarp.nix { };
|
||||
udisks2 = handleTest ./udisks2.nix { };
|
||||
ulogd = handleTest ./ulogd/ulogd.nix { };
|
||||
|
|
|
|||
22
nixos/tests/tzupdate.nix
Normal file
22
nixos/tests/tzupdate.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ lib, ... }:
|
||||
let
|
||||
clientNodeName = "client";
|
||||
in
|
||||
{
|
||||
name = "tzupdate";
|
||||
|
||||
# TODO: Test properly:
|
||||
# - Add server node
|
||||
# - Add client configuration to talk to the server node
|
||||
# - Assert that the time zone changes appropriately
|
||||
nodes.${clientNodeName} = {
|
||||
services.tzupdate.enable = true;
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
${clientNodeName}.wait_for_unit("multi-user.target")
|
||||
'';
|
||||
|
||||
meta.maintainers = [ lib.maintainers.l0b0 ];
|
||||
}
|
||||
|
|
@ -36,13 +36,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "musescore";
|
||||
version = "4.5.1";
|
||||
version = "4.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "musescore";
|
||||
repo = "MuseScore";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-ha3rBILekycHiPdcaPNsbvlF289NzFs9srP3unOuJRg=";
|
||||
sha256 = "sha256-9jafh9zyf+tuC+WU6nQIMBVm+Gqqcig8jS2R1h/YnIo=";
|
||||
};
|
||||
|
||||
# Backport + additional patch to fix build on Qt 6.9
|
||||
|
|
|
|||
|
|
@ -13,18 +13,18 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "youtube-music";
|
||||
version = "3.8.1";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "th-ch";
|
||||
repo = "youtube-music";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-KypGAP3dx1g5x5IWbmzXIR9olZo190s5r+VkbzIjvuQ=";
|
||||
hash = "sha256-xaHYNfW5ZLYiaeJ0F32NQ87woMh6K4Ea9rjgNOyabck=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-5Vlf2+l77r6HvuSGy7NrGV1HDX+l5DC0fq/pMWDKSas=";
|
||||
hash = "sha256-xIQyTetHU37gTxCcQp4VCqzGdIfVQGy/aORCVba6YQ0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "texmaker";
|
||||
version = "6.0.0";
|
||||
version = "6.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.xm1math.net/texmaker/texmaker-${version}.tar.bz2";
|
||||
hash = "sha256-l3zlgOJcGrbgvD2hA74LQ+v2C4zg0nJzEE/df1hhd/w=";
|
||||
hash = "sha256-uMI13wzY/XcUzXDTte42MWOwJUqd6pGAeBuPDi5GyvY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ vimUtils.buildVimPlugin rec {
|
|||
pname = "bitbake-vim";
|
||||
version = "2.10.4";
|
||||
|
||||
# The tags are very messy on the upstream repo. We prefer disabling automatic updates for this plugin.
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitHub {
|
||||
owner = "openembedded";
|
||||
repo = "bitbake";
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ buildVscodeMarketplaceExtension {
|
|||
mktplcRef = {
|
||||
name = "vscode-wakatime";
|
||||
publisher = "WakaTime";
|
||||
version = "25.0.0";
|
||||
hash = "sha256-n/7y2nbD+ziUCDmNbfuT01GK/ls8rTfghpntj6SmsbA=";
|
||||
version = "25.0.1";
|
||||
hash = "sha256-4Q/38zO8G39oeZh4N9hOSFBeB0rI7ouH5vlBmV78EnQ=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
|||
mktplcRef = {
|
||||
name = "calva";
|
||||
publisher = "betterthantomorrow";
|
||||
version = "2.0.501";
|
||||
hash = "sha256-j/WCtyrBc/D37kcjzJ/TVrqXSh9EzDoAe18mYXs43fk=";
|
||||
version = "2.0.502";
|
||||
hash = "sha256-TEU1+8IUz0GqWoB2DSE+TzyHFLL0nMSMiZyzWD6IoEA=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
jq
|
||||
|
|
|
|||
|
|
@ -410,8 +410,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "vscode-neovim";
|
||||
publisher = "asvetliakov";
|
||||
version = "1.18.19";
|
||||
hash = "sha256-JGyyvDZQmlVGwEwQHh+82yK7uSrtt/HBaWHzbiGJ614=";
|
||||
version = "1.18.20";
|
||||
hash = "sha256-g3rRdFjbxrp9y/dVhj/2GUJvDbG92VGq/jPtlLXV2kM=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog";
|
||||
|
|
@ -492,8 +492,8 @@ let
|
|||
mktplcRef = {
|
||||
publisher = "banacorn";
|
||||
name = "agda-mode";
|
||||
version = "0.5.5";
|
||||
hash = "sha256-xz+KO743jGziLzO7pINTcOX9JV68MJ0juDl+rpr9hk8=";
|
||||
version = "0.5.6";
|
||||
hash = "sha256-FKcPJzdhK0QbaG3wBkdGOkiDkZ4qVJh3RBTnD4wLIh8=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/banacorn.agda-mode/changelog";
|
||||
|
|
@ -785,8 +785,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "vscode-tailwindcss";
|
||||
publisher = "bradlc";
|
||||
version = "0.14.15";
|
||||
hash = "sha256-BJKPAyXBHX9W0pSxtri67PFL1zA4Vd2OMFfWi5bDnYQ=";
|
||||
version = "0.14.16";
|
||||
hash = "sha256-U2oZSIsLpqEqYBIEjSnIToEOOnTCUi4vR6XwjnNUDN8=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/bradlc.vscode-tailwindcss/changelog";
|
||||
|
|
@ -1015,8 +1015,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "coder-remote";
|
||||
publisher = "coder";
|
||||
version = "1.7.1";
|
||||
hash = "sha256-egtB8mF9bbGb5YJ2pS9uGMzLmJcHAZ7UTswrn6k2k3A=";
|
||||
version = "1.8.0";
|
||||
hash = "sha256-zAe2IFT69oZ/OLVSaaY5lGSiF/7FGiQngz/EXekwQtM=";
|
||||
};
|
||||
meta = {
|
||||
description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click";
|
||||
|
|
@ -1178,8 +1178,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "vscode-database-client2";
|
||||
publisher = "cweijan";
|
||||
version = "8.2.5";
|
||||
hash = "sha256-t6+LLLGuh67cuvGzv9+ic7AFqQU+bxDc6UByJM0OF7s=";
|
||||
version = "8.2.7";
|
||||
hash = "sha256-RH+nqLiT5atyTC9WMFpY5ARTolK8+d1VZJY8oHK1G7E=";
|
||||
};
|
||||
meta = {
|
||||
description = "Database Client For Visual Studio Code";
|
||||
|
|
@ -1207,8 +1207,8 @@ let
|
|||
mktplcRef = {
|
||||
publisher = "DanielSanMedium";
|
||||
name = "dscodegpt";
|
||||
version = "3.10.84";
|
||||
hash = "sha256-s7Zo8zRZ4nsEuoSPwQL3osRs5zlmbcEsCjIJ8janhPs=";
|
||||
version = "3.11.24";
|
||||
hash = "sha256-bQf8kr4wvbUk+IMdoevBqZxTKg81uKlQO9yD6xJd1TM=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog";
|
||||
|
|
@ -1259,8 +1259,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "databricks";
|
||||
publisher = "databricks";
|
||||
version = "2.9.2";
|
||||
hash = "sha256-lGVp/pkYQFqCa1fCEydrNke1yRxUmTRaaN+giuLdISQ=";
|
||||
version = "2.9.4";
|
||||
hash = "sha256-6BSwkK6/YbCFci0p8aox8E9KP2M1daj3bu4qBxjybUE=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/databricks.databricks/changelog";
|
||||
|
|
@ -1486,8 +1486,8 @@ let
|
|||
mktplcRef = {
|
||||
publisher = "discloud";
|
||||
name = "discloud";
|
||||
version = "2.22.42";
|
||||
hash = "sha256-jIjRMQ279KK8BxcQWWzcRcwfhkTg8W4aGUwqijje7ZY=";
|
||||
version = "2.22.45";
|
||||
hash = "sha256-5nTNidm/oR1CazYXJfb6pKKXS5CSo3UUuW3xDp6yYGk=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog";
|
||||
|
|
@ -1918,8 +1918,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "foam-vscode";
|
||||
publisher = "foam";
|
||||
version = "0.26.10";
|
||||
hash = "sha256-vhQtdc0553TyPkQnTHwg7Nr+UbDMf9yR+2jj40ANPdQ=";
|
||||
version = "0.26.11";
|
||||
hash = "sha256-tq4Woc4+vBVWox1ldTmJQJG/NGQPDAVEi+rviFEbVt0=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog";
|
||||
|
|
@ -2187,8 +2187,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "gitlab-workflow";
|
||||
publisher = "gitlab";
|
||||
version = "6.11.0";
|
||||
hash = "sha256-4fzjJKj4RGzqD+ionUA2Al7UGv5aJNCo8O1JOnS+nqY=";
|
||||
version = "6.12.0";
|
||||
hash = "sha256-0Pka2v2nXMfRD3TCiVAfLaxEhpQml9R/6Lg3/tk03zQ=";
|
||||
};
|
||||
meta = {
|
||||
description = "GitLab extension for Visual Studio Code";
|
||||
|
|
@ -2203,8 +2203,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "gleam";
|
||||
publisher = "gleam";
|
||||
version = "2.11.1";
|
||||
hash = "sha256-tySY6vPg71QQKeKivCoJzcAH73nML/NWhtr+TgaSKRg=";
|
||||
version = "2.12.0";
|
||||
hash = "sha256-kAs3+ecfMl2IcL+I4TXhbzq55AbHZ9NiQLhK6Eg+iZI=";
|
||||
};
|
||||
meta = {
|
||||
description = "Support for the Gleam programming language";
|
||||
|
|
@ -2219,8 +2219,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "Go";
|
||||
publisher = "golang";
|
||||
version = "0.47.1";
|
||||
hash = "sha256-FKbPvXIO7SGt9C2lD7+0Q6yD0QNzrdef1ltsYXPmAi0=";
|
||||
version = "0.47.2";
|
||||
hash = "sha256-d2JXrKd3pMPWshy1pZ0HGmk2ZTVn4W5IrwakkibZTgk=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/golang.Go/changelog";
|
||||
|
|
@ -3017,8 +3017,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "asn1js";
|
||||
publisher = "lapo";
|
||||
version = "0.2.1";
|
||||
hash = "sha256-/75tsueW1PQIHN6YOLajREcMbRnzxzBIGnd7LGAxwBs=";
|
||||
version = "0.2.2";
|
||||
hash = "sha256-U1mvxDqyNbTalKgxtCLxLOMT3ZxVGC2KXWW47khtQKA=";
|
||||
};
|
||||
meta = {
|
||||
description = "Decode ASN.1 content inside VSCode";
|
||||
|
|
@ -4065,8 +4065,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "ansible";
|
||||
publisher = "redhat";
|
||||
version = "25.3.1";
|
||||
hash = "sha256-1w4B5+WHDJzU4Fz5x2pXDAssRWjZPl79ykTNbk2rQXo=";
|
||||
version = "25.4.0";
|
||||
hash = "sha256-E/BogNtax4dkv6hlYcaRinTxr4jnVyV9hVCdkIkul9s=";
|
||||
};
|
||||
meta = {
|
||||
description = "Ansible language support";
|
||||
|
|
@ -4649,8 +4649,8 @@ let
|
|||
mktplcRef = {
|
||||
publisher = "streetsidesoftware";
|
||||
name = "code-spell-checker";
|
||||
version = "4.0.45";
|
||||
hash = "sha256-2goKjykQMLTRPP9Y0aBXLu3qDlhEKO00x82C18nKlIY=";
|
||||
version = "4.0.47";
|
||||
hash = "sha256-g9r8I909ge44JfBRm1JBHFluXr9H8zl0ERqkwoxtQaI=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";
|
||||
|
|
@ -4759,8 +4759,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "tabnine-vscode";
|
||||
publisher = "tabnine";
|
||||
version = "3.259.0";
|
||||
hash = "sha256-BhJskqQr222VA6Sf7okttUIeYpsi99IyXJIOOWZKQ9M=";
|
||||
version = "3.260.0";
|
||||
hash = "sha256-Ve9PGpsqc7q5wCu62X0I5xJsQJ0xAJKN6VNi6HfWNDk=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
|
|
@ -5086,8 +5086,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "vscode-mdx";
|
||||
publisher = "unifiedjs";
|
||||
version = "1.8.13";
|
||||
hash = "sha256-QTIDs+HVnM+zJ3jqhiBhUTsrI44kaHInYDXLXMC1/9E=";
|
||||
version = "1.8.14";
|
||||
hash = "sha256-kIQPvmLkqZa3jPxIfJ3LDyIvr5yXQTsO7uzzvFa9EJM=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/unifiedjs.vscode-mdx/changelog";
|
||||
|
|
@ -5394,8 +5394,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "volar";
|
||||
publisher = "Vue";
|
||||
version = "2.2.8";
|
||||
hash = "sha256-efEeTq/y4al38Tdut3bHVdluf3tUYqc6CFPX+ch1gLg=";
|
||||
version = "2.2.10";
|
||||
hash = "sha256-cQxDoKDfzifcGTkhS8rC+JUQofbxMfXmkJF1CwiU1nc=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md";
|
||||
|
|
@ -5548,8 +5548,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "php-debug";
|
||||
publisher = "xdebug";
|
||||
version = "1.35.0";
|
||||
hash = "sha256-HQYxQPKirPCnje2lrOFprBG3ha7YaV5iytmeI8CTQJU=";
|
||||
version = "1.36.1";
|
||||
hash = "sha256-4r3mf7q6n1b/cVYIGZyRNK5nEAJYzTz4cJrKNH+R01s=";
|
||||
};
|
||||
meta = {
|
||||
description = "PHP Debug Adapter";
|
||||
|
|
|
|||
|
|
@ -7,14 +7,13 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
|||
mktplcRef = {
|
||||
name = "terraform";
|
||||
publisher = "hashicorp";
|
||||
version = "2.19.0";
|
||||
hash = "sha256-k/fcEJuELz0xkwivSrP6Nxtz861BLq1wR2ZDMXVrvkY=";
|
||||
version = "2.34.3";
|
||||
hash = "sha256-kE9xH0cp741aCqhrwFDW+lQxOAsdLNzCCOTWMxd+li0=";
|
||||
};
|
||||
|
||||
patches = [ ./fix-terraform-ls.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace out/serverPath.js --replace TERRAFORM-LS-PATH ${terraform-ls}/bin/terraform-ls
|
||||
substituteInPlace dist/extension.js \
|
||||
--replace-fail 'this.customBinPath=Ga("terraform").get("languageServer.path")' 'this.customBinPath = Ga("terraform").get("languageServer.path") || '${terraform-ls}/bin/terraform-ls';'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
diff --git a/out/serverPath.js b/out/serverPath.js
|
||||
index fafa915..2e6d376 100644
|
||||
--- a/out/serverPath.js
|
||||
+++ b/out/serverPath.js
|
||||
@@ -18,7 +18,13 @@ exports.CUSTOM_BIN_PATH_OPTION_NAME = 'languageServer.pathToBinary';
|
||||
class ServerPath {
|
||||
constructor(context) {
|
||||
this.context = context;
|
||||
- this.customBinPath = vscode.workspace.getConfiguration('terraform').get(exports.CUSTOM_BIN_PATH_OPTION_NAME);
|
||||
+
|
||||
+ const customBinPath = vscode.workspace.getConfiguration('terraform').get(exports.CUSTOM_BIN_PATH_OPTION_NAME);
|
||||
+ if (!customBinPath) {
|
||||
+ this.customBinPath = 'TERRAFORM-LS-PATH';
|
||||
+ } else {
|
||||
+ this.customBinPath = customBinPath;
|
||||
+ }
|
||||
}
|
||||
installPath() {
|
||||
return path.join(this.context.globalStorageUri.fsPath, INSTALL_FOLDER_NAME);
|
||||
|
|
@ -14,19 +14,19 @@ let
|
|||
{
|
||||
x86_64-linux = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-5B2LAV5azD1mGDFWnxIOYjyyJMXxqxyL5qP0zs6jWgs=";
|
||||
hash = "sha256-NTmo45hhvVp5atYWt3046Fe7AtHouH6UBF/FPUllIQQ=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-6tmHa8XbuNLheUzY8pr6oEJlkUJpeCeT3O7xfo2Iqls=";
|
||||
hash = "sha256-7K7i+4NtoTmwT1a3dIBF7M2oXyqc66Evos8q1B1RWkk=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
arch = "darwin-x64";
|
||||
hash = "sha256-KRJ148+N3Hzht1GgnO0s5Mv27q+onPyZlY9myXw3zjg=";
|
||||
hash = "sha256-O/bpKFoCqtzwdNjwWA4WfaeFPUdZtfn14opiSXtjD90=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-vmtE6oeLs1B9s69yaOHASdFKznV1p3v+SsJUAJrwUrU=";
|
||||
hash = "sha256-9kNKHg8lpXf94RT1/oYYeSOX0uHqjpg+zW64NNMQs7A=";
|
||||
};
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
|
||||
|
|
@ -36,7 +36,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
|||
mktplcRef = {
|
||||
name = "csdevkit";
|
||||
publisher = "ms-dotnettools";
|
||||
version = "1.18.23";
|
||||
version = "1.18.25";
|
||||
inherit (extInfo) hash arch;
|
||||
};
|
||||
sourceRoot = "extension"; # This has more than one folder.
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
|||
mktplcRef = {
|
||||
name = "vsliveshare";
|
||||
publisher = "ms-vsliveshare";
|
||||
version = "1.0.5918";
|
||||
hash = "sha256-Tk0mKydUF8M7l7NC9wEA7t2rzJWy/mq4/HvIHI2/ldQ=";
|
||||
version = "1.0.5948";
|
||||
hash = "sha256-KOu9zF5l6MTLU8z/l4xBwRl2X3uIE15YgHEZJrKSHGY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace extension.js \
|
||||
substituteInPlace vendor.js \
|
||||
--replace-fail '"xsel"' '"${xsel}/bin/xsel"'
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
|||
mktplcRef = {
|
||||
publisher = "RooVeterinaryInc";
|
||||
name = "roo-cline";
|
||||
version = "3.13.2";
|
||||
hash = "sha256-ezmBS84RonkqlguLcgGZa4663GpY6yReKKb+r6YzQms=";
|
||||
version = "3.14.3";
|
||||
hash = "sha256-hYtjcxlHwtvESs08WdWuMGi10LIvdH5SEBeAI7ah8oc=";
|
||||
};
|
||||
|
||||
passthru.updateScript = vscode-extension-update-script { };
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
|||
mktplcRef = {
|
||||
name = "claude-dev";
|
||||
publisher = "saoudrizwan";
|
||||
version = "3.12.3";
|
||||
hash = "sha256-HluLBJe7v21vViI7NcbmrXpE/ZBserW4eAvab5swjyQ=";
|
||||
version = "3.13.3";
|
||||
hash = "sha256-N7y0+WeP0zgWRBD2LqLR++dQty9wbaqA+vWQYsaGo2k=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -10,16 +10,10 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
|||
mktplcRef = {
|
||||
name = "sourcery";
|
||||
publisher = "sourcery";
|
||||
version = "1.28.0";
|
||||
hash = "sha256-wQt2T7RhQ5qU4P7J0vQwzc9mL40pDY5tS0HILhy4twg=";
|
||||
version = "1.35.0";
|
||||
hash = "sha256-3+8kzQ+DZVysv0wYc3uM+8Z6jACgxCKNcZVJ2LOlodo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
pushd sourcery_binaries/install
|
||||
rm -r win ${if stdenv.hostPlatform.isLinux then "mac" else "linux"}
|
||||
popd
|
||||
'';
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,16 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
|||
mktplcRef = {
|
||||
name = "lua";
|
||||
publisher = "sumneko";
|
||||
version = "3.7.3";
|
||||
hash = "sha256-JsZrCeT843QvQkebyOVlO9MI2xbEQI8xX0DrPacfGrM=";
|
||||
version = "3.14.0";
|
||||
hash = "sha256-auXQudzWRbq/cXMpFkheqHhJMu7XwacdsaZYAkv1pQs=";
|
||||
};
|
||||
|
||||
# Running chmod in runtime will lock up extension
|
||||
# indefinitely if the binary is in nix store.
|
||||
patches = [ ./remove-chmod.patch ];
|
||||
postPatch = ''
|
||||
substituteInPlace client/out/src/languageserver.js \
|
||||
--replace-fail 'await fs.promises.chmod(command, "777");' ""
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
ln -sf ${lua-language-server}/bin/lua-language-server \
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
--- a/client/out/languageserver.js
|
||||
+++ b/client/out/languageserver.js
|
||||
@@ -164,11 +164,9 @@ class LuaClient extends vscode_1.Disposable {
|
||||
break;
|
||||
case "linux":
|
||||
command = this.context.asAbsolutePath(path.join("server", binDir ? binDir : "bin-Linux", "lua-language-server"));
|
||||
- yield fs.promises.chmod(command, "777");
|
||||
break;
|
||||
case "darwin":
|
||||
command = this.context.asAbsolutePath(path.join("server", binDir ? binDir : "bin-macOS", "lua-language-server"));
|
||||
- yield fs.promises.chmod(command, "777");
|
||||
break;
|
||||
default:
|
||||
throw new Error(`Unsupported operating system "${platform}"!`);
|
||||
|
|
@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
|||
sources = {
|
||||
"x86_64-linux" = {
|
||||
arch = "linux-x64";
|
||||
hash = "sha256-Sno0UnWnuOogT9DMEF+8dMZLqxAoHSsKORkHpre40dE=";
|
||||
hash = "sha256-70IC1Df7FxIbh9iFPqC7ej+NpAW8BKD30qYlhtC0QLo=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
arch = "darwin-x64";
|
||||
hash = "sha256-GaqBiAs0G9h1p2itDITPFBkFD1uOmM0fEp4tKmYFCXY=";
|
||||
hash = "sha256-NA6QjtqtEWRHjs4s1F3tVnd+qwk3T7KAhZdNsCv2WXo=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
arch = "linux-arm64";
|
||||
hash = "sha256-uDRhsAGw7mEI2ztC8QWDtrHAeMwk9IzU5Sln7HQl+1Y=";
|
||||
hash = "sha256-BIop7QBbJCRO5u81NMuRHcKtAHpPAWZFIApv7g/3pI8=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
arch = "darwin-arm64";
|
||||
hash = "sha256-/5VEFXlGORo9t5ehDmLcqb0cYvJ6Gb1yIootyqpMZM8=";
|
||||
hash = "sha256-mghcU1iyxlU1uY9tb4j5/qdy5TM+MFXN2ci95erzihg=";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
name = "visualjj";
|
||||
publisher = "visualjj";
|
||||
version = "0.14.4";
|
||||
version = "0.14.5";
|
||||
}
|
||||
// sources.${stdenvNoCC.hostPlatform.system}
|
||||
or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "mednafen-pce-fast";
|
||||
version = "0-unstable-2025-03-28";
|
||||
version = "0-unstable-2025-04-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "beetle-pce-fast-libretro";
|
||||
rev = "4ee33ff536f14295c178a037f9b5d5a960ce3c6f";
|
||||
hash = "sha256-ZL+aV469RHp5SSBFmK0q+1h2MdcM1q+TZu5Rrv/N0DU=";
|
||||
rev = "baa35513545b011faa8b0b5db334d24ba15539ed";
|
||||
hash = "sha256-jEvbHCK9AB4u3raWbAivscHqBiH9s+RkgExTVW1yvnk=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "mednafen-psx" + lib.optionalString withHw "-hw";
|
||||
version = "0-unstable-2025-04-11";
|
||||
version = "0-unstable-2025-04-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "beetle-psx-libretro";
|
||||
rev = "5d2137e5f15db3b52583e8246bcf2669cebb147b";
|
||||
hash = "sha256-Gu5rubuNsMWOCNaNrqRR/hoErmhYdGC+9o/xDXuaWuM=";
|
||||
rev = "4e0cb4ddf0c52ef802cd4f7f2b7d3a187ab9962d";
|
||||
hash = "sha256-XjJf/EPgJmbxGPJl2SEoVA47iRzjSKISt/3rmW5Wysg=";
|
||||
};
|
||||
|
||||
extraBuildInputs = lib.optionals withHw [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "gambatte";
|
||||
version = "0-unstable-2025-04-04";
|
||||
version = "0-unstable-2025-04-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "gambatte-libretro";
|
||||
rev = "2910240a4100ccad68f935082b8bbce194673cb5";
|
||||
hash = "sha256-segz2SocZaNNgToNQOIEVIOD3CidyZIS81dStcdAsTs=";
|
||||
rev = "b285b0823ac867371e72c54d5275a554c7be312c";
|
||||
hash = "sha256-/PFSMcx+iBpiMHSqAhGVjbXDkMk9En0UZPChPROaLck=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "genesis-plus-gx";
|
||||
version = "0-unstable-2025-04-04";
|
||||
version = "0-unstable-2025-04-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "Genesis-Plus-GX";
|
||||
rev = "32a4853c5fd352cc3054e83ed375476cf023aa5f";
|
||||
hash = "sha256-3r562/3WWWkibEKzPrA+lASY5Wpz8kuX5EQKqFKJdAA=";
|
||||
rev = "99678a0ef3cfcca500ed01c24bbb1020d8af4c12";
|
||||
hash = "sha256-iijYZ4+TM61EkJynDaPYBi/bYrypouFRmhaG63cxgJo=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "nestopia";
|
||||
version = "0-unstable-2025-03-22";
|
||||
version = "0-unstable-2025-04-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "nestopia";
|
||||
rev = "b3eb368603cd519d54bb4886d2934ee4fd188081";
|
||||
hash = "sha256-gaMZEP+8vCb/b9lhrXcUK4N7v9uxX/FVgnzK48rxyHQ=";
|
||||
rev = "d2eefab298b0b9152d2934d6f0227b6803c877b3";
|
||||
hash = "sha256-lmfyNi+E2SoCOAtXuJ3F5S3mm1OCta9FHtoqPpLgYk8=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
mkLibretroCore {
|
||||
core = "puae";
|
||||
version = "0-unstable-2025-04-15";
|
||||
version = "0-unstable-2025-04-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "libretro-uae";
|
||||
rev = "0faf39cfd84e114d985e020562e75c22b4bc1569";
|
||||
hash = "sha256-eJnCHei0/SdJD33SGsRgUL1+IapcvX/FcxHDlYmkob0=";
|
||||
rev = "7dd724eaa48f05f02d9d2f1bfa131c34b6ab5351";
|
||||
hash = "sha256-i046+gZa8u/nmGGlF/uA2Lz5VZJTgwXz9aK2C/2l470=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "seamly2d";
|
||||
version = "2025.3.25.1924";
|
||||
version = "2025.4.14.211";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FashionFreedom";
|
||||
repo = "Seamly2D";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-hBXdf/r3hXSjy6Vp5SjfOcefxj/aP0La4LTiyOESzmQ=";
|
||||
hash = "sha256-Zs1zinWWbodF340fo18HbRD//JIm/fhEgapAcR0JnzA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pe-bear";
|
||||
version = "0.7.0";
|
||||
version = "0.7.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hasherezade";
|
||||
repo = "pe-bear";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jHFH1GAbAtOzUh+Gma89YCU5r/yuwekv/bqiyy8VmRk=";
|
||||
hash = "sha256-W8Sa7MKTf7mbdzAEL6tNDpmXIFWAC/8qSXBqqsZ4WFk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cni";
|
||||
version = "1.2.3";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containernetworking";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ocSc1fhbBB8YRxVVOvYMombOOkLMdfv9V4GYbf8kwIE=";
|
||||
hash = "sha256-xeajsM8ZIlI6Otv9CQhPfYaVQwmJ5QcFEn1xt6e/ivQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/aPx8NgGkJ1irU0LGzmYTlsiX2U5or24Vl1PGHWuDyE=";
|
||||
vendorHash = "sha256-uo3ZwFdD6aJ0WDGmt51l3hs9agUnv1cIQY/KMlNe5nI=";
|
||||
|
||||
subPackages = [
|
||||
"./cnitool"
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
"aci": {
|
||||
"hash": "sha256-f4hgHFJgRUG+mhRgD7GMtkXoYkzAbkxxMIzvGLS0ums=",
|
||||
"hash": "sha256-NS5q6ElCGEGSceOCIVudKE6m6EzXMV/3HGHHXwYopOA=",
|
||||
"homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci",
|
||||
"owner": "CiscoDevNet",
|
||||
"repo": "terraform-provider-aci",
|
||||
"rev": "v2.15.0",
|
||||
"rev": "v2.16.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -498,13 +498,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"gitlab": {
|
||||
"hash": "sha256-1TN37PZR2skkmKhRbv1Z1Kv45G9b8WQz9yDK14fs1TI=",
|
||||
"hash": "sha256-tZJuXYRD6+E6Bhrn+cjeSCRAePgj/g+E8YTStwjZiSM=",
|
||||
"homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab",
|
||||
"owner": "gitlabhq",
|
||||
"repo": "terraform-provider-gitlab",
|
||||
"rev": "v17.10.0",
|
||||
"rev": "v17.11.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-1KTU8nMYUfC+LJHFeIpK6m4RUPWvSHNSXGVJgcnsVl8="
|
||||
"vendorHash": "sha256-3URc3A1kkcVQ/riB2/THuIEiCq9MrifxgRL73cjsbDA="
|
||||
},
|
||||
"google": {
|
||||
"hash": "sha256-GuwIiAyZwa66Vl6dIKdmzHYhWdNrfISy3YKLJQva92U=",
|
||||
|
|
@ -922,13 +922,13 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"okta": {
|
||||
"hash": "sha256-M2F84q7ZBzrGUpUv5vTWeeb3jG4RcinFxiQxooWkrhs=",
|
||||
"hash": "sha256-1/GKJWRy+epeEwReieN6aVNP4/oPT3FTkHeHtticL8k=",
|
||||
"homepage": "https://registry.terraform.io/providers/okta/okta",
|
||||
"owner": "okta",
|
||||
"repo": "terraform-provider-okta",
|
||||
"rev": "v4.16.0",
|
||||
"rev": "v4.17.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-fYCisoPEON8F11HauVONyqS56RS/1+bebnLeCCXTrsw="
|
||||
"vendorHash": "sha256-5BkKjne3r3V8T+SkqjfHVEpXXK8sKTYMc23g1EaLoOE="
|
||||
},
|
||||
"oktaasa": {
|
||||
"hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ let
|
|||
{
|
||||
stable = "0.0.91";
|
||||
ptb = "0.0.136";
|
||||
canary = "0.0.621";
|
||||
canary = "0.0.649";
|
||||
development = "0.0.73";
|
||||
}
|
||||
else
|
||||
|
|
@ -34,7 +34,7 @@ let
|
|||
};
|
||||
canary = fetchurl {
|
||||
url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
hash = "sha256-Jz7YIH107n89N/wQfhs9QfEqWCYO+BtjHrgSvk7xG+o=";
|
||||
hash = "sha256-FXwnE3knSD6U6CxkewplwZJr3F8vUBDAztMDHjtV1Jw=";
|
||||
};
|
||||
development = fetchurl {
|
||||
url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
buildKodiAddon rec {
|
||||
pname = "jurialmunkey";
|
||||
namespace = "script.module.jurialmunkey";
|
||||
version = "0.2.21";
|
||||
version = "0.2.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jurialmunkey";
|
||||
repo = namespace;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vcYydVrcVJ7jaeFXCad7pgxvoZy63QLlRS3HO9GsmtU=";
|
||||
hash = "sha256-3bT1mFzY28r3tzb5zrLKwLs83uotfKezI020SetJuso=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -54,6 +54,22 @@ lib.recurseIntoAttrs (
|
|||
};
|
||||
};
|
||||
|
||||
simplebookmark = {
|
||||
scriptPath = "scripts/SimpleBookmark.lua";
|
||||
meta = {
|
||||
description = "Simple bookmarks script based on assigning keys";
|
||||
maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
|
||||
};
|
||||
};
|
||||
|
||||
simplehistory = {
|
||||
scriptPath = "scripts/SimpleHistory.lua";
|
||||
meta = {
|
||||
description = "Store videos in a history file, continue watching your last played or resume previously played videos, manage and play from your history, and more";
|
||||
maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
|
||||
};
|
||||
};
|
||||
|
||||
smartskip = {
|
||||
scriptPath = "scripts/SmartSkip.lua";
|
||||
meta = {
|
||||
|
|
@ -61,5 +77,13 @@ lib.recurseIntoAttrs (
|
|||
maintainers = with lib.maintainers; [ iynaix ];
|
||||
};
|
||||
};
|
||||
|
||||
undoredo = {
|
||||
scriptPath = "scripts/UndoRedo.lua";
|
||||
meta = {
|
||||
description = "Undo / redo any accidental time jumps";
|
||||
maintainers = with lib.maintainers; [ iynaix ];
|
||||
};
|
||||
};
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -10,17 +10,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "obs-livesplit-one";
|
||||
version = "0.3.4";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LiveSplit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3B3P1PlzIlpVqHJMKWpEnWXGgD/IaiWM1FVKn0BtRj0=";
|
||||
sha256 = "sha256-4Ar4ChSl226BVFyAnqpWDLxsZF63bxl++sWD+6aENW8=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-JHocpqDeF24Qn9lUr+YCnZqgckLhGRpWQD7WGCxVmd8=";
|
||||
cargoHash = "sha256-e0FDa72vzRb5AMVmtkvAkiQ5GUXsq0LekqF+wDYDsr8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
|
|
|||
|
|
@ -22,17 +22,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "aaaaxy";
|
||||
version = "1.6.176";
|
||||
version = "1.6.194";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "divVerent";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LukI+FgM2gtKp2/3ySJ0FT6lTlBYTh400GFC5NK7S8I=";
|
||||
hash = "sha256-4iL3+GeyOZoZN8IXo0jjSq3hYHKBTpytk8owXMdfACo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bw2Zk4vHzVaXdKwYJF+DkfJefxJlZKlFlh5LGcgkZBY=";
|
||||
vendorHash = "sha256-XBcrs6G3Kq9WsODegy2KxqSp+qwr+NpdLJLa3qmW9kA=";
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "airwindows";
|
||||
version = "0-unstable-2025-04-06";
|
||||
version = "0-unstable-2025-04-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "airwindows";
|
||||
repo = "airwindows";
|
||||
rev = "d109d6b9948449a883a9694d3f5aa8702a57f56b";
|
||||
hash = "sha256-4yXcPedz5wYqAiLyF5Cgc/DH4jjfJGSLv4qDyIJW4x0=";
|
||||
rev = "9e38c7af2c4b74e4a1f138ebaccc07e5800c73b8";
|
||||
hash = "sha256-/6Z+CTrUeH3wNlwlP3aS5scYjhC0NwC0QXe+IMvphkc=";
|
||||
};
|
||||
|
||||
# we patch helpers because honestly im spooked out by where those variables
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "alsa-tools";
|
||||
version = "1.2.11";
|
||||
version = "1.2.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://alsa/tools/alsa-tools-${finalAttrs.version}.tar.bz2";
|
||||
hash = "sha256-CRXJY0pQL9NlXKnFdNJZvJ55mD2R1Frqz/bzwA+K4+k=";
|
||||
hash = "sha256-+u9v3TnsecmlRz3GOqG2Mxv3ZkqdRSoKgZjOxwFsvG8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "avisynthplus";
|
||||
version = "3.7.4";
|
||||
version = "3.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AviSynth";
|
||||
repo = "AviSynthPlus";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-M+F7bUSlH6kAyQLCq0RxmaE19RqHPPleTMyRuz5zqPg=";
|
||||
hash = "sha256-RkEZWsAKZABtl+SbRLCjMqyQoi9ainbaI9hWlpO6Fwo=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "aws-lc";
|
||||
version = "1.49.1";
|
||||
version = "1.50.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-lc";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-gnYtzXHaS7QLcVmIcQsQDy6wNesQJ2ruE9W32HqiA5A=";
|
||||
hash = "sha256-aYill04Fs/mJFCmzP/tlwUcPRHJz6R9knQWKGEOMwfQ=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
|
|||
|
|
@ -140,9 +140,9 @@
|
|||
|
||||
vm-repair = mkAzExtension rec {
|
||||
pname = "vm-repair";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
url = "https://azcliprod.blob.core.windows.net/cli-extensions/vm_repair-${version}-py2.py3-none-any.whl";
|
||||
hash = "sha256-3Pgwppp4IssNYhJ+USQNwMEp91XdZDwNlnNWzVWrHFM=";
|
||||
hash = "sha256-DOuH7BG4WrhP7SQH3GInFh7DHT0qN3JhSG76EXmNn24=";
|
||||
description = "Support for repairing Azure Virtual Machines";
|
||||
propagatedBuildInputs = with python3Packages; [ opencensus ];
|
||||
meta.maintainers = with lib.maintainers; [ ];
|
||||
|
|
|
|||
|
|
@ -6,15 +6,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "b3sum";
|
||||
version = "1.8.0";
|
||||
version = "1.8.2";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
hash = "sha256-FWblGKr/ZQsLZkPOax20FYEyoLiPREf7UjfOtFCljZU=";
|
||||
hash = "sha256-/qyBs+t8n5I6uf1dSc3E0yHpdlUz77pvlqV5+r4dRBc=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-vSxAG0CKtTHZ/3fSDtZqmqvfY+swDBBPZ8YZP1Vlj0w=";
|
||||
cargoHash = "sha256-PKVDfBFWQY95FxJ66vl6E26GEZChNCsA3ST++iieYSM=";
|
||||
|
||||
meta = {
|
||||
description = "BLAKE3 cryptographic hash function";
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "bcc";
|
||||
version = "0.33.0";
|
||||
version = "0.34.0";
|
||||
|
||||
disabled = !stdenv.hostPlatform.isLinux;
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
|
|||
owner = "iovisor";
|
||||
repo = "bcc";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-6dT3seLuEVQNKWiYGLK1ajXzW7pb62S/GQ0Lp4JdGjc=";
|
||||
hash = "sha256-sSHEsvTtqPpfxSevmjciQ+xFj+4G4GE4ExWoIYc+DQI=";
|
||||
};
|
||||
format = "other";
|
||||
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bftpd";
|
||||
version = "6.2";
|
||||
version = "6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-lZGFsUV6LNjkBNUpV9UYedVt1yt1qTBJUorxGt4ApsI=";
|
||||
sha256 = "sha256-f7XZCSrGwmQqyf5C4xtJ46Q4SDHxbr15rDzcAK1PvB4=";
|
||||
};
|
||||
|
||||
# utmp has been replaced by utmpx since Mac OS X 10.6 (Snow Leopard):
|
||||
|
|
|
|||
|
|
@ -15,17 +15,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "broot";
|
||||
version = "1.46.0";
|
||||
version = "1.46.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = "broot";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-m7TG3Bxqp87g9GPijy+daP4nYgCJkTmC95U+DgUcWGM=";
|
||||
hash = "sha256-MfBlJ7SokBKkAkmBSj4NsE2hKVqYeGN3z/xiq2VK3vU=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-elpzGgF9o7iV2YaQFFqQ9jafEuYVPImC808MWWFZ4gw=";
|
||||
cargoHash = "sha256-QJJxZDRJZkg/A1NjTBj7KpcfO8VUnXXcJT9knguAf/g=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -1,31 +1,29 @@
|
|||
{
|
||||
mkDerivation,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
qttools,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "calaos_installer";
|
||||
version = "3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "calaos";
|
||||
repo = "calaos_installer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-e/f58VtGmKukdv4rIrGljXhA9d/xUycM5V6I1FT5qeY=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-e/f58VtGmKukdv4rIrGljXhA9d/xUycM5V6I1FT5qeY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
buildInputs = [ libsForQt5.qtbase ];
|
||||
nativeBuildInputs = with libsForQt5; [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
qttools
|
||||
];
|
||||
buildInputs = [ qtbase ];
|
||||
|
||||
qmakeFlags = [ "REVISION=${version}" ];
|
||||
qmakeFlags = [ "REVISION=${finalAttrs.version}" ];
|
||||
|
||||
installPhase =
|
||||
if stdenv.hostPlatform.isDarwin then
|
||||
|
|
@ -39,12 +37,13 @@ mkDerivation rec {
|
|||
cp -a calaos_installer $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Calaos Installer, a tool to create calaos configuration";
|
||||
mainProgram = "calaos_installer";
|
||||
homepage = "https://www.calaos.fr/";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ tiramiseb ];
|
||||
downloadPage = "https://github.com/calaos/calaos_installer/";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ tiramiseb ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
@ -8,17 +8,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-zigbuild";
|
||||
version = "0.19.8";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "messense";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-S/Xx487z8LFjCSrB9tQTJy4+AQial2Dptg5xZqzPkVE=";
|
||||
hash = "sha256-sUoEKLaUBxKKtCwgw/CcLrVRA4OMhto7d0PR+TMU5xk=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-L9SoaXGzYHY6vOWESvovHNzSehOWD4RGAC/3K6qT6Ks=";
|
||||
cargoHash = "sha256-jvSOYWydnCFgJx1LTzQ1kHEVpzsdPLo19NVMBaLJEeQ=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -15,9 +15,14 @@
|
|||
enable_cxx ? false,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cdo";
|
||||
version = "2.4.2";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://code.mpimet.mpg.de/attachments/download/29864/cdo-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-QYv5HoZMv+VHw8jhUNMUGc+nFefTRVCMVZGxq9pUV9E=";
|
||||
};
|
||||
|
||||
# Dependencies
|
||||
buildInputs = [
|
||||
|
|
@ -27,11 +32,6 @@ stdenv.mkDerivation rec {
|
|||
python3
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://code.mpimet.mpg.de/attachments/download/29481/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-TfH+K4+S9Uwn6585nt+rQNkyIAWmcyyhUk71wWJ6xOc=";
|
||||
};
|
||||
|
||||
configureFlags =
|
||||
[
|
||||
"--with-netcdf=${netcdf}"
|
||||
|
|
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optional enable_all_static "--enable-all-static"
|
||||
++ lib.optional enable_cxx "--enable-cxx";
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Collection of command line Operators to manipulate and analyse Climate and NWP model Data";
|
||||
mainProgram = "cdo";
|
||||
longDescription = ''
|
||||
|
|
@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
|
|||
There are more than 600 operators available.
|
||||
'';
|
||||
homepage = "https://code.mpimet.mpg.de/projects/cdo/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.ltavard ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.ltavard ];
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ceph-csi";
|
||||
version = "3.13.1";
|
||||
version = "3.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ceph";
|
||||
repo = "ceph-csi";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Wa5elZbQotgeb4pH9DIZd48CQyBJ0O5y1SidIb/iyGY=";
|
||||
hash = "sha256-c6OaWDR38S0yl3pVN+DYjfg9oHqmVXljstmvBDmfOi8=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -16,11 +16,9 @@
|
|||
let
|
||||
# x64 darwin fails with invalid memory reference with clang-18 & 19.
|
||||
# https://github.com/cisco/ChezScheme/issues/896
|
||||
stdenv =
|
||||
if args.stdenv.hostPlatform.isDarwin && args.stdenv.hostPlatform.isx86_64 then
|
||||
llvmPackages_17.stdenv
|
||||
else
|
||||
args.stdenv;
|
||||
# aarch64 darwin fails to execute `system` calls with clang-18 & 19.
|
||||
# https://github.com/cisco/ChezScheme/issues/928
|
||||
stdenv = if args.stdenv.hostPlatform.isDarwin then llvmPackages_17.stdenv else args.stdenv;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "chez-scheme";
|
||||
|
|
|
|||
|
|
@ -7,18 +7,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "crawley";
|
||||
version = "1.7.10";
|
||||
version = "1.7.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "s0rg";
|
||||
repo = "crawley";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vc3HHkX0BFVSJi1Ll9T8IgYh5P6rzi4FowE7Jdy/tO8=";
|
||||
hash = "sha256-P+BsfVYqUDZ+wqIwziWLI3V0nUnypenHFfmw6EkPigo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
vendorHash = "sha256-jj8FNZs/bkFQxveOkqmGVO3MNPPv5O9ebodoi7hhzIs=";
|
||||
vendorHash = "sha256-lcCcfn83WGBegQzUKEF8kpu7DdcLyVbS+PGX0mYrr40=";
|
||||
|
||||
ldflags = [
|
||||
"-w"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
stdenv,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
dpkg,
|
||||
autoPatchelfHook,
|
||||
|
|
@ -17,20 +17,20 @@
|
|||
# the dependencies from other pkgs.
|
||||
|
||||
let
|
||||
version = "4.11.0-6";
|
||||
version = "5.1.0-6";
|
||||
|
||||
unpacked = stdenv.mkDerivation rec {
|
||||
unpacked = stdenv.mkDerivation (finalAttrs: {
|
||||
inherit version;
|
||||
pname = "dell-command-configure-unpacked";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://dl.dell.com/FOLDER10469726M/1/command-configure_${version}.ubuntu22_amd64.tar.gz"
|
||||
"https://web.archive.org/web/20240228233129/https://dl.dell.com/FOLDER10469726M/1/command-configure_4.11.0-6.ubuntu22_amd64.tar.gz"
|
||||
"https://dl.dell.com/FOLDER12705845M/1/command-configure_${version}.ubuntu24_amd64.tar.gz"
|
||||
"https://web.archive.org/web/20250421172156/https://dl.dell.com/FOLDER12705845M/1/command-configure_5.1.0-6.ubuntu24_amd64.tar.gz"
|
||||
];
|
||||
# The CDN blocks the Curl user-agent, so set to blank instead.
|
||||
curlOpts = ''-A=""'';
|
||||
hash = "sha256-Bwa4sYguYwEBKEJSP3wzHhzjuDeaGQN8fKeooWHX18E=";
|
||||
hash = "sha256-MM6Djkz/VuVCLHGEji88Xq0vIV+AfqQkjNXz4zqFOtw=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
@ -38,8 +38,8 @@ let
|
|||
nativeBuildInputs = [ dpkg ];
|
||||
|
||||
unpackPhase = ''
|
||||
tar -xzf ${src}
|
||||
dpkg-deb -x command-configure_${version}.ubuntu22_amd64.deb command-configure
|
||||
tar -xzf ${finalAttrs.src}
|
||||
dpkg-deb -x command-configure_${version}.ubuntu24_amd64.deb command-configure
|
||||
dpkg-deb -x srvadmin-hapi_9.5.0_amd64.deb srvadmin-hapi
|
||||
'';
|
||||
|
||||
|
|
@ -47,7 +47,7 @@ let
|
|||
mkdir $out
|
||||
cp -r . $out
|
||||
'';
|
||||
};
|
||||
});
|
||||
|
||||
# Contains a fopen() wrapper for finding the firmware package
|
||||
wrapperLibName = "wrapper-lib.so";
|
||||
|
|
@ -74,16 +74,20 @@ stdenv.mkDerivation {
|
|||
inherit version;
|
||||
pname = "dell-command-configure";
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
(lib.getLib stdenv.cc.cc)
|
||||
];
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
src = unpacked;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D -t $out/lib -m644 -v command-configure/opt/dell/dcc/libhapiintf.so
|
||||
install -D -t $out/lib -m644 -v command-configure/opt/dell/dcc/libsmbios_c.so.2
|
||||
install -D -t $out/bin -m755 -v command-configure/opt/dell/dcc/cctk
|
||||
|
|
@ -91,6 +95,8 @@ stdenv.mkDerivation {
|
|||
for lib in $(find srvadmin-hapi/opt/dell/srvadmin/lib64 -type l); do
|
||||
install -D -t $out/lib -m644 -v $lib
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
|
|
@ -104,11 +110,11 @@ stdenv.mkDerivation {
|
|||
$out/lib/*
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Configure BIOS settings on Dell laptops";
|
||||
homepage = "https://www.dell.com/support/article/us/en/19/sln311302/dell-command-configure";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ ryangibb ];
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with lib.maintainers; [ ryangibb ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
diff --git a/distrobuilder/lxc.generator b/distrobuilder/lxc.generator
|
||||
index dc5b506..0265da8 100644
|
||||
--- a/distrobuilder/lxc.generator
|
||||
+++ b/distrobuilder/lxc.generator
|
||||
@@ -21,16 +21,6 @@ is_incus_vm() {
|
||||
[ -e /dev/virtio-ports/org.linuxcontainers.incus ]
|
||||
diff --git c/distrobuilder/lxc.generator w/distrobuilder/lxc.generator
|
||||
index 5f854d3..927f2df 100644
|
||||
--- c/distrobuilder/lxc.generator
|
||||
+++ w/distrobuilder/lxc.generator
|
||||
@@ -16,16 +16,6 @@ is_lxc_privileged_container() {
|
||||
grep -qw 4294967295$ /proc/self/uid_map
|
||||
}
|
||||
|
||||
-# is_in_path succeeds if the given file exists in on of the paths
|
||||
-is_in_path() {
|
||||
- # Don't use $PATH as that may not include all relevant paths
|
||||
- for path in /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin; do
|
||||
- [ -e "${path}/$1" ] && return 0
|
||||
- [ -e "${path}/${1}" ] && return 0
|
||||
- done
|
||||
-
|
||||
- return 1
|
||||
|
|
@ -19,21 +19,23 @@ index dc5b506..0265da8 100644
|
|||
## Fix functions
|
||||
# fix_ro_paths avoids udevd issues with /sys and /proc being writable
|
||||
fix_ro_paths() {
|
||||
@@ -42,38 +32,6 @@ fix_ro_paths() {
|
||||
@@ -47,41 +37,6 @@ fix_ro_run() {
|
||||
EOF
|
||||
}
|
||||
|
||||
-# fix_nm_link_state forces the network interface to a DOWN state ahead of NetworkManager starting up
|
||||
-fix_nm_link_state() {
|
||||
- [ -e "/sys/class/net/$1" ] || return 0
|
||||
- ip_path=
|
||||
- if [ -f /sbin/ip ]; then
|
||||
- ip_path=/sbin/ip
|
||||
- elif [ -f /bin/ip ]; then
|
||||
- ip_path=/bin/ip
|
||||
- [ -e "/sys/class/net/${1}" ] || return 0
|
||||
-
|
||||
- ip=
|
||||
- if [ -f "/sbin/ip" ]; then
|
||||
- ip="/sbin/ip"
|
||||
- elif [ -f "/bin/ip" ]; then
|
||||
- ip="/bin/ip"
|
||||
- else
|
||||
- return 0
|
||||
- fi
|
||||
-
|
||||
- cat <<-EOF > /run/systemd/system/network-device-down.service
|
||||
- # This file was created by distrobuilder
|
||||
- [Unit]
|
||||
|
|
@ -44,13 +46,14 @@ index dc5b506..0265da8 100644
|
|||
- [Service]
|
||||
- # do not turn off if there is a default route to 169.254.0.1, i.e. the device is a routed nic
|
||||
- ExecCondition=/bin/sh -c '! /usr/bin/grep -qs 00000000.0100FEA9 /proc/net/route'
|
||||
- ExecStart=-${ip_path} link set $1 down
|
||||
- ExecStart=-${ip} link set ${1} down
|
||||
- Type=oneshot
|
||||
- RemainAfterExit=true
|
||||
-
|
||||
- [Install]
|
||||
- WantedBy=default.target
|
||||
- EOF
|
||||
-
|
||||
- mkdir -p /run/systemd/system/default.target.wants
|
||||
- ln -sf /run/systemd/system/network-device-down.service /run/systemd/system/default.target.wants/network-device-down.service
|
||||
-}
|
||||
|
|
@ -58,78 +61,105 @@ index dc5b506..0265da8 100644
|
|||
# fix_systemd_override_unit generates a unit specific override
|
||||
fix_systemd_override_unit() {
|
||||
dropin_dir="/run/systemd/${1}.d"
|
||||
@@ -113,16 +71,7 @@ fix_systemd_mask() {
|
||||
@@ -122,16 +77,7 @@ fix_systemd_mask() {
|
||||
# fix_systemd_udev_trigger overrides the systemd-udev-trigger.service to match the latest version
|
||||
# of the file which uses "ExecStart=-" instead of "ExecStart=".
|
||||
fix_systemd_udev_trigger() {
|
||||
- cmd=
|
||||
- udev=
|
||||
- if [ -f /usr/bin/udevadm ]; then
|
||||
- cmd=/usr/bin/udevadm
|
||||
- udev=/usr/bin/udevadm
|
||||
- elif [ -f /sbin/udevadm ]; then
|
||||
- cmd=/sbin/udevadm
|
||||
- udev=/sbin/udevadm
|
||||
- elif [ -f /bin/udevadm ]; then
|
||||
- cmd=/bin/udevadm
|
||||
- udev=/bin/udevadm
|
||||
- else
|
||||
- return 0
|
||||
- fi
|
||||
+ cmd=udevadm
|
||||
+ udev=/run/current-system/sw/bin/udevadm
|
||||
|
||||
mkdir -p /run/systemd/system/systemd-udev-trigger.service.d
|
||||
cat <<-EOF > /run/systemd/system/systemd-udev-trigger.service.d/zzz-lxc-override.conf
|
||||
@@ -134,38 +83,13 @@ fix_systemd_udev_trigger() {
|
||||
@@ -143,52 +89,40 @@ fix_systemd_udev_trigger() {
|
||||
EOF
|
||||
}
|
||||
|
||||
-# fix_systemd_sysctl overrides the systemd-sysctl.service to use "ExecStart=-" instead of "ExecStart=".
|
||||
-fix_systemd_sysctl() {
|
||||
- cmd=/usr/lib/systemd/systemd-sysctl
|
||||
- ! [ -e "${cmd}" ] && cmd=/lib/systemd/systemd-sysctl
|
||||
- sysctl=/usr/lib/systemd/systemd-sysctl
|
||||
- [ ! -e "${sysctl}" ] && sysctl=/lib/systemd/systemd-sysctl
|
||||
-
|
||||
- mkdir -p /run/systemd/system/systemd-sysctl.service.d
|
||||
- cat <<-EOF > /run/systemd/system/systemd-sysctl.service.d/zzz-lxc-override.conf
|
||||
- # This file was created by distrobuilder
|
||||
- [Service]
|
||||
- ExecStart=
|
||||
- ExecStart=-${cmd}
|
||||
- ExecStart=-${sysctl}
|
||||
- EOF
|
||||
-}
|
||||
-
|
||||
## Main logic
|
||||
-# Nothing to do in Incus VM but deployed in case it is later converted to a container
|
||||
-is_incus_vm && exit 0
|
||||
|
||||
# Exit immediately if not an Incus/LXC container
|
||||
is_lxc_container || exit 0
|
||||
|
||||
-# Check for NetworkManager
|
||||
-nm_exists=0
|
||||
-
|
||||
-is_in_path NetworkManager && nm_exists=1
|
||||
-
|
||||
# Determine systemd version
|
||||
-SYSTEMD=""
|
||||
-for path in /usr/lib/systemd/systemd /lib/systemd/systemd; do
|
||||
- [ -x "${path}" ] || continue
|
||||
-
|
||||
- systemd_version="$("${path}" --version | head -n1 | cut -d' ' -f2 | cut -d'~' -f1)"
|
||||
+SYSTEMD="$(/run/current-system/sw/lib/systemd/systemd --version | head -n1 | cut -d' ' -f2 | cut -d'~' -f1)"
|
||||
|
||||
- SYSTEMD="$("${path}" --version | head -n1 | cut -d' ' -f2 | cut -d'~' -f1)"
|
||||
- break
|
||||
-done
|
||||
+systemd_version="$(systemd --version | head -n1 | cut -d' ' -f2)"
|
||||
|
||||
# Determine distro name and release
|
||||
ID=""
|
||||
@@ -196,7 +120,6 @@ fi
|
||||
-# Apply systemd overrides
|
||||
-if [ "${SYSTEMD}" -ge 244 ]; then
|
||||
- fix_systemd_override_unit system/service
|
||||
-else
|
||||
- # Setup per-unit overrides
|
||||
- find /lib/systemd /etc/systemd /run/systemd /usr/lib/systemd -name "*.service" -type f | sed 's#/\(lib\|etc\|run\|usr/lib\)/systemd/##g'| while read -r service_file; do
|
||||
- fix_systemd_override_unit "${service_file}"
|
||||
- done
|
||||
-fi
|
||||
|
||||
-# Workarounds for unprivileged containers.
|
||||
-if ! is_lxc_privileged_container; then
|
||||
- fix_ro_paths systemd-networkd.service
|
||||
- fix_ro_paths systemd-resolved.service
|
||||
+
|
||||
+# Overriding some systemd features is only needed if security.nesting=false
|
||||
+# in which case, /dev/.lxc will be missing
|
||||
+# Adding this conditional back for NixOS as we do not have the reported
|
||||
+# problems, and the overrides could reduce potential service hardening
|
||||
+if [ ! -d /dev/.lxc ]; then
|
||||
+ # Apply systemd overrides
|
||||
+ if [ "${SYSTEMD}" -ge 244 ]; then
|
||||
+ fix_systemd_override_unit system/service
|
||||
+ else
|
||||
+ # Setup per-unit overrides
|
||||
+ find /lib/systemd /etc/systemd /run/systemd /usr/lib/systemd -name "*.service" -type f | sed 's#/\(lib\|etc\|run\|usr/lib\)/systemd/##g'| while read -r service_file; do
|
||||
+ fix_systemd_override_unit "${service_file}"
|
||||
+ done
|
||||
+ fi
|
||||
+
|
||||
+ # Workarounds for unprivileged containers.
|
||||
+ if ! is_lxc_privileged_container; then
|
||||
+ fix_ro_paths systemd-networkd.service
|
||||
+ fix_ro_paths systemd-resolved.service
|
||||
+ fi
|
||||
fi
|
||||
|
||||
# Ignore failures on some units.
|
||||
fix_systemd_udev_trigger
|
||||
-fix_systemd_sysctl
|
||||
|
||||
# Mask some units.
|
||||
fix_systemd_mask dev-hugepages.mount
|
||||
@@ -226,11 +149,6 @@ if [ -d /etc/udev ]; then
|
||||
# Fix issues with /run not being writable.
|
||||
fix_ro_run systemd-nsresourced.service
|
||||
@@ -221,11 +155,6 @@ if [ -d /etc/udev ]; then
|
||||
EOF
|
||||
fi
|
||||
|
||||
-# Workarounds for NetworkManager in containers
|
||||
-if [ "${nm_exists}" -eq 1 ]; then
|
||||
-if is_in_path NetworkManager; then
|
||||
- fix_nm_link_state eth0
|
||||
-fi
|
||||
-
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
gnutar,
|
||||
hivex,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
pkg-config,
|
||||
squashfsTools,
|
||||
|
|
@ -35,16 +36,15 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "distrobuilder";
|
||||
version = "3.1";
|
||||
version = "3.2";
|
||||
|
||||
vendorHash = "sha256-3oHLvOdHbOdaL2FTo+a5HmayNi/i3zoAsU/du9h1N30=";
|
||||
vendorHash = "sha256-nlqapWxuSZlbt22F3Y9X1uXFxJHvEoUBZDl078x8ZnA=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lxc";
|
||||
repo = "distrobuilder";
|
||||
rev = "refs/tags/distrobuilder-${version}";
|
||||
sha256 = "sha256-cIzIoLQmg1kgI1QRAmFh/ca88PJBW2yIY92BKHKwTMk=";
|
||||
fetchSubmodules = false;
|
||||
tag = "distrobuilder-${version}";
|
||||
sha256 = "sha256-aDCx2WGAKdTNf0uMzwxG0AUmbuuWBFPYzNyycKklYOY=";
|
||||
};
|
||||
|
||||
buildInputs = bins;
|
||||
|
|
@ -67,6 +67,8 @@ buildGoModule rec {
|
|||
};
|
||||
|
||||
generator = callPackage ./generator.nix { inherit src version; };
|
||||
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -33,14 +33,14 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dwarfs";
|
||||
version = "0.11.2";
|
||||
version = "0.12.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mhx";
|
||||
repo = "dwarfs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-6dsBWQFYjxg1oxcbc7pzK69plbCIaOW2QFzhmYrm0ck=";
|
||||
hash = "sha256-ZQ93OQ0HQ/6UP8vNe2okRMqkLX96o5+ruoWoZ52zsl0=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "amazon-ecs-agent";
|
||||
version = "1.91.2";
|
||||
version = "1.92.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "aws";
|
||||
repo = pname;
|
||||
hash = "sha256-7f1qJ9dgouhj+DGikdIzUREPraAA/1y/5lYA8fbIoJo=";
|
||||
hash = "sha256-g0yIJ0W71UGgPZ5m/BaeTCOTAfQ6589wAvYZ15Izt8o=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "3.1";
|
||||
version = "3.2";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit version;
|
||||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation {
|
|||
owner = "dagargo";
|
||||
repo = "elektroid";
|
||||
rev = version;
|
||||
hash = "sha256-YJcvJlnRUhwjQ6P3jgjyDtoJhuije1uY77mGNGZure0=";
|
||||
hash = "sha256-8tKs0i1dkoLlk1a33n7+6eIXqjNu3PHUTznrEC/HPIM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "emptty";
|
||||
version = "0.13.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tvrzna";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xZfR4sn20fDaTNAxuxVflpr+8AFg5Z7vesO7P8Jxw6A=";
|
||||
hash = "sha256-AsIt7EI5RkSchhaMGKofOsfPNROhX8f5gDaqZ7Q2394=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fiji";
|
||||
version = "20241114-1317";
|
||||
version = "20250408-1717";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.imagej.net/fiji/archive/${version}/fiji-nojre.zip";
|
||||
sha256 = "sha256-dNpscgZiiE2cuuo11YLs+mgoBRZ/MpUXDaAX3x+E/w8=";
|
||||
sha256 = "sha256-bqVrTBKII58E7WSlQfRPE0Dxd4h/oJALFvIOdAAFZoI=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -8,18 +8,18 @@
|
|||
let
|
||||
# make install will use dconf to find desktop background file uri.
|
||||
# consider adding an args to allow specify pictures manually.
|
||||
# https://github.com/daniruiz/flat-remix-gnome/blob/20250330/Makefile#L38
|
||||
# https://github.com/daniruiz/flat-remix-gnome/blob/20250413/Makefile#L38
|
||||
fake-dconf = writeScriptBin "dconf" "echo -n";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flat-remix-gnome";
|
||||
version = "20250330";
|
||||
version = "20250413";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "daniruiz";
|
||||
repo = "flat-remix-gnome";
|
||||
rev = version;
|
||||
hash = "sha256-Ho2tqJgitSdk/i2jH5jhD3XLyy6BXUhyhb6UV7g1waM=";
|
||||
hash = "sha256-NgRqpL2bqdgiLfs08htqAsTFAbi7E+G/R0aBFpE9bmc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
# make install will back up this file, it will fail if the file doesn't exist.
|
||||
# https://github.com/daniruiz/flat-remix-gnome/blob/20250330/Makefile#L56
|
||||
# https://github.com/daniruiz/flat-remix-gnome/blob/20250413/Makefile#L56
|
||||
preInstall = ''
|
||||
mkdir -p $out/share/gnome-shell/
|
||||
touch $out/share/gnome-shell/gnome-shell-theme.gresource
|
||||
|
|
|
|||
|
|
@ -1,351 +0,0 @@
|
|||
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
|
||||
index 37a1a2d..45640a1 100644
|
||||
--- a/src-tauri/Cargo.lock
|
||||
+++ b/src-tauri/Cargo.lock
|
||||
@@ -778,9 +778,9 @@ dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
"block",
|
||||
"cocoa-foundation",
|
||||
- "core-foundation",
|
||||
+ "core-foundation 0.10.0",
|
||||
"core-graphics",
|
||||
- "foreign-types",
|
||||
+ "foreign-types 0.5.0",
|
||||
"libc",
|
||||
"objc",
|
||||
]
|
||||
@@ -793,7 +793,7 @@ checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d"
|
||||
dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
"block",
|
||||
- "core-foundation",
|
||||
+ "core-foundation 0.10.0",
|
||||
"core-graphics-types",
|
||||
"libc",
|
||||
"objc",
|
||||
@@ -873,6 +873,16 @@ dependencies = [
|
||||
"version_check",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "core-foundation"
|
||||
+version = "0.9.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
|
||||
+dependencies = [
|
||||
+ "core-foundation-sys",
|
||||
+ "libc",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "core-foundation"
|
||||
version = "0.10.0"
|
||||
@@ -896,9 +906,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
|
||||
dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
- "core-foundation",
|
||||
+ "core-foundation 0.10.0",
|
||||
"core-graphics-types",
|
||||
- "foreign-types",
|
||||
+ "foreign-types 0.5.0",
|
||||
"libc",
|
||||
]
|
||||
|
||||
@@ -909,7 +919,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
|
||||
dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
- "core-foundation",
|
||||
+ "core-foundation 0.10.0",
|
||||
"libc",
|
||||
]
|
||||
|
||||
@@ -1435,6 +1445,15 @@ version = "0.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
|
||||
|
||||
+[[package]]
|
||||
+name = "foreign-types"
|
||||
+version = "0.3.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
|
||||
+dependencies = [
|
||||
+ "foreign-types-shared 0.1.1",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "foreign-types"
|
||||
version = "0.5.0"
|
||||
@@ -1442,7 +1461,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
|
||||
dependencies = [
|
||||
"foreign-types-macros",
|
||||
- "foreign-types-shared",
|
||||
+ "foreign-types-shared 0.3.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1456,6 +1475,12 @@ dependencies = [
|
||||
"syn 2.0.87",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "foreign-types-shared"
|
||||
+version = "0.1.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
|
||||
+
|
||||
[[package]]
|
||||
name = "foreign-types-shared"
|
||||
version = "0.3.1"
|
||||
@@ -2779,6 +2804,22 @@ dependencies = [
|
||||
"want",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "hyper-tls"
|
||||
+version = "0.6.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
|
||||
+dependencies = [
|
||||
+ "bytes",
|
||||
+ "http-body-util",
|
||||
+ "hyper",
|
||||
+ "hyper-util",
|
||||
+ "native-tls",
|
||||
+ "tokio",
|
||||
+ "tokio-native-tls",
|
||||
+ "tower-service",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "hyper-util"
|
||||
version = "0.1.10"
|
||||
@@ -3418,9 +3459,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
-version = "0.2.163"
|
||||
+version = "0.2.164"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "1fdaeca4cf44ed4ac623e86ef41f056e848dbeab7ec043ecb7326ba300b36fd0"
|
||||
+checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f"
|
||||
|
||||
[[package]]
|
||||
name = "libgit2-sys"
|
||||
@@ -3453,7 +3494,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
- "windows-targets 0.52.6",
|
||||
+ "windows-targets 0.48.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3688,6 +3729,23 @@ dependencies = [
|
||||
"windows-sys 0.59.0",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "native-tls"
|
||||
+version = "0.2.13"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c"
|
||||
+dependencies = [
|
||||
+ "libc",
|
||||
+ "log",
|
||||
+ "openssl",
|
||||
+ "openssl-probe",
|
||||
+ "openssl-sys",
|
||||
+ "schannel",
|
||||
+ "security-framework",
|
||||
+ "security-framework-sys",
|
||||
+ "tempfile",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "ndk"
|
||||
version = "0.9.0"
|
||||
@@ -4065,6 +4123,32 @@ dependencies = [
|
||||
"pathdiff",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "openssl"
|
||||
+version = "0.10.69"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "f5e534d133a060a3c19daec1eb3e98ec6f4685978834f2dbadfe2ec215bab64e"
|
||||
+dependencies = [
|
||||
+ "bitflags 2.6.0",
|
||||
+ "cfg-if",
|
||||
+ "foreign-types 0.3.2",
|
||||
+ "libc",
|
||||
+ "once_cell",
|
||||
+ "openssl-macros",
|
||||
+ "openssl-sys",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "openssl-macros"
|
||||
+version = "0.1.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
|
||||
+dependencies = [
|
||||
+ "proc-macro2",
|
||||
+ "quote",
|
||||
+ "syn 2.0.87",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "openssl-probe"
|
||||
version = "0.1.5"
|
||||
@@ -4854,19 +4938,23 @@ dependencies = [
|
||||
"http-body",
|
||||
"http-body-util",
|
||||
"hyper",
|
||||
+ "hyper-tls",
|
||||
"hyper-util",
|
||||
"ipnet",
|
||||
"js-sys",
|
||||
"log",
|
||||
"mime",
|
||||
+ "native-tls",
|
||||
"once_cell",
|
||||
"percent-encoding",
|
||||
"pin-project-lite",
|
||||
+ "rustls-pemfile",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"serde_urlencoded",
|
||||
"sync_wrapper",
|
||||
"tokio",
|
||||
+ "tokio-native-tls",
|
||||
"tokio-util 0.7.12",
|
||||
"tower-service",
|
||||
"url",
|
||||
@@ -5000,6 +5088,21 @@ dependencies = [
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "rustls-pemfile"
|
||||
+version = "2.2.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
|
||||
+dependencies = [
|
||||
+ "rustls-pki-types",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "rustls-pki-types"
|
||||
+version = "1.10.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
|
||||
+
|
||||
[[package]]
|
||||
name = "rustversion"
|
||||
version = "1.0.18"
|
||||
@@ -5027,6 +5130,15 @@ version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "088c5d71572124929ea7549a8ce98e1a6fd33d0a38367b09027b382e67c033db"
|
||||
|
||||
+[[package]]
|
||||
+name = "schannel"
|
||||
+version = "0.1.26"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
|
||||
+dependencies = [
|
||||
+ "windows-sys 0.59.0",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "schemars"
|
||||
version = "0.8.21"
|
||||
@@ -5089,6 +5201,29 @@ version = "4.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
|
||||
|
||||
+[[package]]
|
||||
+name = "security-framework"
|
||||
+version = "2.11.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
|
||||
+dependencies = [
|
||||
+ "bitflags 2.6.0",
|
||||
+ "core-foundation 0.9.4",
|
||||
+ "core-foundation-sys",
|
||||
+ "libc",
|
||||
+ "security-framework-sys",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "security-framework-sys"
|
||||
+version = "2.12.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2"
|
||||
+dependencies = [
|
||||
+ "core-foundation-sys",
|
||||
+ "libc",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "selectors"
|
||||
version = "0.22.0"
|
||||
@@ -5436,7 +5571,7 @@ dependencies = [
|
||||
"bytemuck",
|
||||
"cfg_aliases",
|
||||
"core-graphics",
|
||||
- "foreign-types",
|
||||
+ "foreign-types 0.5.0",
|
||||
"js-sys",
|
||||
"log",
|
||||
"objc2",
|
||||
@@ -5631,7 +5766,7 @@ checksum = "6682a07cf5bab0b8a2bd20d0a542917ab928b5edb75ebd4eda6b05cbaab872da"
|
||||
dependencies = [
|
||||
"bitflags 2.6.0",
|
||||
"cocoa",
|
||||
- "core-foundation",
|
||||
+ "core-foundation 0.10.0",
|
||||
"core-graphics",
|
||||
"crossbeam-channel",
|
||||
"dispatch",
|
||||
@@ -6208,6 +6343,16 @@ dependencies = [
|
||||
"syn 2.0.87",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "tokio-native-tls"
|
||||
+version = "0.3.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
|
||||
+dependencies = [
|
||||
+ "native-tls",
|
||||
+ "tokio",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "tokio-util"
|
||||
version = "0.6.10"
|
||||
@@ -7006,7 +7151,7 @@ version = "0.1.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
|
||||
dependencies = [
|
||||
- "windows-sys 0.59.0",
|
||||
+ "windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
|
||||
index 550b0cf..9b711a4 100644
|
||||
--- a/src-tauri/Cargo.toml
|
||||
+++ b/src-tauri/Cargo.toml
|
||||
@@ -14,7 +14,7 @@ zip = "0.6"
|
||||
assert_matches = "1.5"
|
||||
|
||||
[dependencies]
|
||||
-tauri = { version = "2.0.0", features = [] }
|
||||
+tauri = { version = "2.0.0", features = ["native-tls"] }
|
||||
tauri-codegen = "2.0.0"
|
||||
tauri-macros = "2.0.0"
|
||||
tauri-plugin = "2.0.0"
|
||||
|
|
@ -1,71 +1,52 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
fetchNpmDeps,
|
||||
yq,
|
||||
|
||||
cargo-tauri,
|
||||
cargo,
|
||||
rustc,
|
||||
nodejs,
|
||||
npmHooks,
|
||||
pkg-config,
|
||||
wrapGAppsHook3,
|
||||
|
||||
openssl,
|
||||
webkitgtk_4_1,
|
||||
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "gg";
|
||||
version = "0.23.0";
|
||||
version = "0.27.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gulbanana";
|
||||
repo = "gg";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-iQxPJgMxBtyindkNdQkehwPf7ZgWCI09PToqs2y1Hfw=";
|
||||
hash = "sha256-vmzALX1x7VfdnwN05bCwbnTL+HfFVyNiKFoT74tFuu8=";
|
||||
};
|
||||
|
||||
patches = [ ./native-tls.patch ];
|
||||
cargoRoot = "src-tauri";
|
||||
|
||||
buildAndTestSubdir = "src-tauri";
|
||||
|
||||
# FIXME: Switch back to cargoHash when https://github.com/NixOS/nixpkgs/issues/356811 is fixed
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs)
|
||||
pname
|
||||
version
|
||||
src
|
||||
patches
|
||||
;
|
||||
# Tries to apply patches inside cargoRoot.
|
||||
prePatch = "pushd ..";
|
||||
postPatch = "popd";
|
||||
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";
|
||||
hash = "sha256-zEYU5l57VxVKKhoGfa77kT05vwoLyAu9eyt7C9dhAGM=";
|
||||
};
|
||||
cargoHash = "sha256-esStQ55+T4uLbHbg7P7hqS6kIpXIMxouRSFkTo6dvAU=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-SMz1ohPSF5tvf2d3is4PXhnjHG9hHuS5NYmHbe46HaU=";
|
||||
hash = "sha256-yFDGH33maCndH4vgyMfNg0+c5jCOeoIAWUJgAPHXwsM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo-tauri.hook
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
rustc
|
||||
nodejs
|
||||
npmHooks.npmConfigHook
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
];
|
||||
nativeBuildInputs =
|
||||
[
|
||||
cargo-tauri.hook
|
||||
nodejs
|
||||
npmHooks.npmConfigHook
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[ openssl ]
|
||||
|
|
@ -89,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
meta = {
|
||||
description = "GUI for the version control system Jujutsu";
|
||||
homepage = "https://github.com/gulbanana/gg";
|
||||
changelog = "https://github.com/gulbanana/gg/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/gulbanana/gg/blob/v${finalAttrs.version}/CHANGELOG.md";
|
||||
license = with lib.licenses; [ asl20 ];
|
||||
inherit (cargo-tauri.hook.meta) platforms;
|
||||
maintainers = with lib.maintainers; [ pluiedev ];
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "go-blueprint";
|
||||
version = "0.10.6";
|
||||
version = "0.10.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Melkeydev";
|
||||
repo = "go-blueprint";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-xWv/4/7+eqSBLmyuF+vLLZzMn8A8sE6vkldER145FQQ=";
|
||||
hash = "sha256-oEp+qMWN2SIW9MBVbfk72Ogu9nbuR++YsTeRpbbQ2LY=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gscreenshot";
|
||||
version = "3.8.0";
|
||||
version = "3.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thenaterhood";
|
||||
repo = "${pname}";
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-erNP5Joz4j08jN2c0wUX/h3sJmr/wXYFghBA+7RX4Aw=";
|
||||
sha256 = "sha256-u60wxtWE7VaAE/xKlcY9vE7Chs5TPd0BTe5zy1D7ZAQ=";
|
||||
};
|
||||
|
||||
# needed for wrapGAppsHook3 to function
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "handheld-daemon";
|
||||
version = "3.13.7";
|
||||
version = "3.15.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hhd-dev";
|
||||
repo = "hhd";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ISUu87Y1Ti6DepDAIMZREz1TkZlGlhkmUWm2zMzvlrM=";
|
||||
hash = "sha256-O3Pgrb3k891IAmYtYWulosAOxtnIvLd+voEsyYtm/0U=";
|
||||
};
|
||||
|
||||
# Handheld-daemon runs some selinux-related utils which are not in nixpkgs.
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
}:
|
||||
let
|
||||
pname = "heptabase";
|
||||
version = "1.55.1";
|
||||
version = "1.55.6";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
|
||||
hash = "sha256-m18EUpcxUW5hyhFYLhHZqIEStqzsyss7T4TelAjw/eQ=";
|
||||
hash = "sha256-Gb+jjujv/mjHCpk5p5UG6pO9rh7Dswou8h51FpsqLek=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
|
|
|||
|
|
@ -7,17 +7,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "httm";
|
||||
version = "0.46.8";
|
||||
version = "0.46.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimono-koans";
|
||||
repo = "httm";
|
||||
rev = version;
|
||||
hash = "sha256-IGhEKtu4RMhI7VYn6I4M9eFY6MdcWxiHsu90rY0l8sw=";
|
||||
hash = "sha256-O1WIoHN0R78lJaPFCEYm4NTNTKwfNGdwi0POQRiuGKk=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-LmQ3+yqSO7vhnV6XshUSSe6QkYVcradVsmIcLrdNE94=";
|
||||
cargoHash = "sha256-uOT8naOnimA9Xt2uA8aCAy0w/5WXZajacN1d5Q27uSY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "24.05";
|
||||
version = "25.04";
|
||||
pname = "intel-cmt-cat";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "intel-cmt-cat";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-e4sbQNpUCZaZDhLLRVDXHXsEelZaZIdc8n3ksUnAkKQ=";
|
||||
sha256 = "sha256-Sbxfa9F+TSv2A8nilrB0PD312v1qN++k8Pezd7wd0PA=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -8,22 +8,23 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jellyfin-rpc";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Radiicall";
|
||||
repo = "jellyfin-rpc";
|
||||
tag = version;
|
||||
hash = "sha256-cEHJJXMfXKDPKah2wDAdcO0SXO4ZPL/SqFbxONmI57M=";
|
||||
hash = "sha256-RZ4G8/gMD2HsNdCJyr1PTKySGcv45a57KAEqAvLBtjQ=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-CWl/hVtwv2Q4/GwJJGTHCxnMxj8ZR9wPmLTlai0MyBA=";
|
||||
cargoHash = "sha256-olg36uXAXVe3BuAqMAlLyokoeDm9wVLfE45tKuGlWF8=";
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
doInstallCheck = true;
|
||||
# TODO: Re-enable when upstream bumps the version number internally
|
||||
# nativeInstallCheckInputs = [
|
||||
# versionCheckHook
|
||||
# ];
|
||||
# doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@
|
|||
|
||||
let
|
||||
pname = "jicofo";
|
||||
version = "1.0-1124";
|
||||
version = "1.0-1128";
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
||||
sha256 = "pnSp9naOGC4V8MlrBVZ9e4Qk4GZSQdepS2xocQSfw30=";
|
||||
sha256 = "pWTOAvsvWGWgt4q9jNyp0faZrbRx0De3R5U5j+GNTDA=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jitsi-meet-prosody";
|
||||
version = "1.0.8499";
|
||||
version = "1.0.8542";
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
||||
sha256 = "U+Xy0uFdH4vYx9GYuwWD5o/K6pMRlqM0QJdWFBJXNls=";
|
||||
sha256 = "dVqKnDq8rNmLbhMUvDGAT2pKLPZjW4ZXUwvz1wxM2Rs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@
|
|||
|
||||
let
|
||||
pname = "jitsi-videobridge2";
|
||||
version = "2.3-215-gbee626bf";
|
||||
version = "2.3-220-g7cda0a66";
|
||||
src = fetchurl {
|
||||
url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
|
||||
sha256 = "naporhTId7igQ2OHEiwmP9t1MPniBOehWhuRAFQJSVE=";
|
||||
sha256 = "5jl2K3EL7zS3hw14LuK6WqL9SDgvLN+pZlRqJew0LJE=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kronosnet";
|
||||
version = "1.30";
|
||||
version = "1.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kronosnet";
|
||||
repo = "kronosnet";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ydu7qS2Wuy5c5pCv1X8SdEIx8sTvfGusCJwltkb3YXQ=";
|
||||
sha256 = "sha256-PZWaKrCy0S8d/x3GMh7X2wEiHwgiuEFpfCwKpbLvhsc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubernetes-polaris";
|
||||
version = "9.6.1";
|
||||
version = "9.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FairwindsOps";
|
||||
repo = "polaris";
|
||||
rev = version;
|
||||
sha256 = "sha256-/pj52K33IimsnrSoSRhHy+WgzzRwGZQiBsNf1+L1B3c=";
|
||||
sha256 = "sha256-g7qttmh5iYCtDvt3YW5aECpbpNsG7fC9itODsD40q+w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-l6RCHi4QLPLoF6+Wgcc/lvtBnQDQo0Gncc8VVkcnFBY=";
|
||||
vendorHash = "sha256-yDR2eY/idL4Realr84iLMA2P9SoALP3/4V+Dvd4j6Ow=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kyverno";
|
||||
version = "1.13.4";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kyverno";
|
||||
repo = "kyverno";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XkFxgBn4x/2H7j0nZufzmfGltY9ROOjEWqxmQrO7RNw=";
|
||||
hash = "sha256-8y/2Vf1QPImUUsVMT5B/F8PYadtSoGYZtFtfgdUbt2M=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
@ -26,7 +26,7 @@ buildGoModule rec {
|
|||
"-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-cmS3zNeknHhnbZnPrCXBs2N6oA3fM271K0ePL8nERm0=";
|
||||
vendorHash = "sha256-d4Q2etUHSEbbFnuCvkkJZWxvsnomtUSbDzkMTsFy3yk=";
|
||||
|
||||
subPackages = [ "cmd/cli/kubectl-kyverno" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,17 +8,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lalrpop";
|
||||
version = "0.20.2";
|
||||
version = "0.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lalrpop";
|
||||
repo = "lalrpop";
|
||||
rev = version;
|
||||
hash = "sha256-cFwBck+bdOjhF6rQQj03MOO+XCsrII5c4Xvhsw12ETA=";
|
||||
hash = "sha256-RvKJ3PKOKJbY0/WBpUwbau9LyCzb/peD73Ey9stECeg=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-c0xota0APLm/xQSH2Orn0PgCKuhUVhXEtzNge/GeYo0=";
|
||||
cargoHash = "sha256-KqG8AqYK1sslZyqCMKesxuyy9+IenXW56edoxygKj4k=";
|
||||
|
||||
patches = [
|
||||
(replaceVars ./use-correct-binary-path-in-tests.patch {
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@
|
|||
openssl,
|
||||
pythonSupport ? false,
|
||||
python310,
|
||||
...
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "lf";
|
||||
version = "34";
|
||||
version = "35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gokcehan";
|
||||
repo = "lf";
|
||||
rev = "r${version}";
|
||||
hash = "sha256-LUlNwzTusp3Deg01K0HOtR5VXI6Ujnb1Dq6p88gFxAU=";
|
||||
hash = "sha256-0ZyIbEKiQ9l30gqHlpW7l/6/TzqVRvnKk9c2FiQ6E6Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-CwsHhFVdC+OCv0LWEahJYu33fE0/isNlHKG3rtEw0Ic=";
|
||||
vendorHash = "sha256-QPsIZ4TRfsYt/bLLQ+1D2X4H+ol3gU8biJIktUv8DYQ=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcgroup";
|
||||
version = "3.1";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libcgroup";
|
||||
repo = "libcgroup";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-CnejQcOyW3QzHuvsAdKe4M4XgmG9ufRaEBdO48+8ZqQ=";
|
||||
hash = "sha256-kWW9ID/eYZH0O/Ge8pf3Cso4yu644R5EiQFYfZMcizs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libvpl";
|
||||
version = "2.14.0";
|
||||
version = "2.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "libvpl";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-51kl9w1xqldQXGWbk6bveS2jMZWQOz/gYP/hPXDk/7M=";
|
||||
hash = "sha256-aCoyIHgX3ftlk0CKg/cXNAVjuGI8GMT358GoiyaNjnI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
gettext,
|
||||
libiconv,
|
||||
bison,
|
||||
|
|
@ -13,25 +12,15 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "lifelines";
|
||||
version = "unstable-2019-05-07";
|
||||
version = "0-unstable-2025-01-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lifelines";
|
||||
repo = "lifelines";
|
||||
rev = "43f29285ed46fba322b6a14322771626e6b02c59";
|
||||
sha256 = "1agszzlmkxmznpc1xj0vzxkskrcfagfjvqsdyw1yp5yg6bsq272y";
|
||||
rev = "fbc92b6585e5f642c59a5317a0f4d4573f51b2d6";
|
||||
sha256 = "sha256-G/Sj3E8K4QDR4fJcipCKTXpQU19LOfOeLBp5k7uPwk4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix pending upstream inclusion for ncurses-6.3 support:
|
||||
# https://github.com/lifelines/lifelines/pull/437
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3.patch";
|
||||
url = "https://github.com/lifelines/lifelines/commit/e04ce2794d458c440787c191877fbbc0784447bd.patch";
|
||||
sha256 = "1smnz4z5hfjas79bfvlnpw9x8199a5g0p9cvhf17zpcnz1432kg7";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gettext
|
||||
libiconv
|
||||
|
|
@ -43,11 +32,11 @@ stdenv.mkDerivation {
|
|||
bison
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Genealogy tool with ncurses interface";
|
||||
homepage = "https://lifelines.github.io/lifelines/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ disassembler ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.disassembler ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ligolo-ng";
|
||||
version = "0.7.5";
|
||||
version = "0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tnpitsecurity";
|
||||
repo = "ligolo-ng";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-BU3gBUNOTjpAANkvzPcgsZrly+TkbG86LHtZf93uxeY=";
|
||||
hash = "sha256-9+n6d9bY9VJiMsgvFNhbdkZ5S1Eo0YxyakuOocMvCdE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-v6lHY3s1TJh8u4JaTa9kcCj+1pl01zckvTVeLk8TZ+w=";
|
||||
vendorHash = "sha256-1K9T7jbQxrnf9j/oa8UvZFatYOiDnJCrMc0DoFGo73U=";
|
||||
|
||||
postConfigure = ''
|
||||
export CGO_ENABLED=0
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "louvre";
|
||||
version = "2.16.2-1";
|
||||
version = "2.16.3-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CuarzoSoftware";
|
||||
repo = "Louvre";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-E6g9BqP8KniCBfYC1xOMqLA5RiAacsslgWAkvTop3CA=";
|
||||
hash = "sha256-ZdV/KvYnPN4IKU6kbjDhCgcC3TdWqZbNJzDt39ZQ2x8=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/src";
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "m17n-db";
|
||||
version = "1.8.9";
|
||||
version = "1.8.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/m17n/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-SBJUo4CqnGbX9Ow6o3Kn4dL+R/w53252BEvUQBfEJKQ=";
|
||||
hash = "sha256-MQJOBRNTNEi5sx6jKU01pkJuZpDrRGKGgHMaqVXAwWw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
|
|
|||
|
|
@ -174,11 +174,11 @@ in
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "microsoft-edge";
|
||||
version = "135.0.3179.54";
|
||||
version = "135.0.3179.85";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-AppUIXOFouGRxMM6ioZq0cglKkNh811n+36z5yvVAuc=";
|
||||
hash = "sha256-x1YpKsvj2Jx1/VE13eE/aCkv+b7rGOQo4xcRYu2GQGA=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "monophony";
|
||||
version = "2.15.0";
|
||||
version = "3.3.2";
|
||||
pyproject = false;
|
||||
|
||||
sourceRoot = "${src.name}/source";
|
||||
|
|
@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
|
|||
owner = "zehkira";
|
||||
repo = "monophony";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fC+XXOGBpG5pIQW1tCNtQaptBCyLM+YGgsZLjWrMoDA=";
|
||||
hash = "sha256-UpklkBKssnwSnh9FeW5gOxY3EkwMbWAM/UEHpq+SIQo=";
|
||||
};
|
||||
|
||||
pythonPath = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nfdump";
|
||||
version = "1.7.5";
|
||||
version = "1.7.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phaag";
|
||||
repo = "nfdump";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-1S55WVVHczYBDGwTxGZr+ND+e4a892jkTINlvIR2xgI=";
|
||||
hash = "sha256-4iyoQAjOQW4KNJbRmdisdecuOz+DFvQGEKgq8cq7GDI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "notation";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "notaryproject";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KxxksliL2ZxbvwbLKB81Lhpvjab9nm4o3QBT2CVFwDw=";
|
||||
hash = "sha256-l9A5AwKJ/atN92Oral6PRH2nCbMJ+/ST9weXYRZXWms=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Mjuw0J5ITLcTWbCUYKLBDrK84wrN7KC05dn0+eBqb9s=";
|
||||
vendorHash = "sha256-WFcy7to3bV3V3bBto5F175PEIxrG9Tj7MuLeBXdSvaM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "nvidia-container-toolkit";
|
||||
version = "1.17.5";
|
||||
version = "1.17.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-vEo8agJ3jTaBokBjdGcO2naE457y8KPUAedC8vtwD1Y=";
|
||||
hash = "sha256-MQQTQ6AaoA4VIAT7YPo3z6UbZuKHjOvu9sW2975TveM=";
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvidia-modprobe";
|
||||
version = "570.133.07";
|
||||
version = "575.51.02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NVIDIA";
|
||||
repo = "nvidia-modprobe";
|
||||
rev = version;
|
||||
hash = "sha256-6/1g66Mr0Ru4V3JMTRXet1aiNa0wrTIGw84QPrCO85c=";
|
||||
hash = "sha256-3iQySxYLG+GwtACeY7n5IwUSc0dVVgu6S0y+XMmv7AU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gnum4 ];
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
let
|
||||
bits = if stdenv.hostPlatform.is64bit then "x64" else "ia32";
|
||||
version = "0.97.0";
|
||||
version = "0.98.2";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "nwjs-ffmpeg-prebuilt";
|
||||
|
|
@ -16,8 +16,8 @@ stdenv.mkDerivation {
|
|||
src =
|
||||
let
|
||||
hashes = {
|
||||
"x64" = "sha256-Z4AS8qjDgbXhpzLVspc4Y/78kdmwuqB2wtsjQ3MjMzE=";
|
||||
"ia32" = "sha256-Z4AS8qjDgbXhpzLVspc4Y/78kdmwuqB2wtsjQ3MjMzE=";
|
||||
"x64" = "sha256-Bx2Mz9RniryLdOFP11p+wp7o1b83LwbkOIXPYAXQdOk=";
|
||||
"ia32" = "sha256-Bx2Mz9RniryLdOFP11p+wp7o1b83LwbkOIXPYAXQdOk=";
|
||||
};
|
||||
in
|
||||
fetchurl {
|
||||
|
|
|
|||
|
|
@ -62,14 +62,14 @@ in
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "olvid";
|
||||
version = "2.3.0";
|
||||
version = "2.4.2";
|
||||
|
||||
dontUnpack = true;
|
||||
dontWrapGApps = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://static.olvid.io/linux/${repo}-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-MzWDqF8mfrtIRmz4Eoxeek3nwV0S3TobZNxIGz1SQM8=";
|
||||
hash = "sha256-eL6XLdEwb3txgN7/YZv1vQGI4pznZb/CrjYY+QZlr5I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "oneDNN";
|
||||
version = "3.7.2";
|
||||
version = "3.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oneapi-src";
|
||||
repo = "oneDNN";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-buOrJOPI2Fe5fqyaFjC+Wai4BX2RhQ+41+VR2Kyi8+A=";
|
||||
hash = "sha256-wOS/VBcP8VyuBAdXVNkTDtYizTQe00ZocW5p0PMqbr4=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue