Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-10-06 18:03:58 +00:00 committed by GitHub
commit 7ab01e096c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
105 changed files with 6798 additions and 6267 deletions

View File

@ -0,0 +1,5 @@
# desktop-file-utils {#desktop-file-utils}
This setup hook removes the MIME cache (located at `$out/share/applications/mimeinfo.cache`) in the `preFixupPhase`.
This hook is necessary because `mimeinfo.cache` can be created when a package uses `desktop-file-utils`, resulting in collisions if multiple packages are installed that contain this file (as in [#48295](https://github.com/NixOS/nixpkgs/issues/48295)).

View File

@ -12,6 +12,7 @@ bmake.section.md
breakpoint.section.md
cernlib.section.md
cmake.section.md
desktop-file-utils.section.md
gdk-pixbuf.section.md
ghc.section.md
gnome.section.md

View File

@ -201,11 +201,11 @@ in {
--syncmode ${cfg.syncmode} \
${optionalString (cfg.permissioned)
"--permissioned"} \
--mine --minerthreads 1 \
--mine --miner.threads 1 \
${optionalString (cfg.rpc.enable)
"--rpc --rpcaddr ${cfg.rpc.address} --rpcport ${toString cfg.rpc.port} --rpcapi ${cfg.rpc.api}"} \
${optionalString (cfg.ws.enable)
"--ws --wsaddr ${cfg.ws.address} --wsport ${toString cfg.ws.port} --wsapi ${cfg.ws.api} --wsorigins ${cfg.ws.origins}"} \
"--ws --ws.addr ${cfg.ws.address} --ws.port ${toString cfg.ws.port} --ws.api ${cfg.ws.api} --ws.origins ${cfg.ws.origins}"} \
--emitcheckpoints \
--datadir ${dataDir} \
--port ${toString cfg.port}'';

View File

@ -896,7 +896,7 @@ in
typesHashMaxSize = mkOption {
type = types.ints.positive;
default = if cfg.defaultMimeTypes == "${pkgs.mailcap}/etc/nginx/mime.types" then 2688 else 1024;
defaultText = literalExpression ''if cfg.defaultMimeTypes == "''${pkgs.mailcap}/etc/nginx/mime.types" then 2688 else 1024'';
defaultText = literalExpression ''if config.services.nginx.defaultMimeTypes == "''${pkgs.mailcap}/etc/nginx/mime.types" then 2688 else 1024'';
description = ''
Sets the maximum size of the types hash tables (`types_hash_max_size`).
It is recommended that the minimum size possible size is used.

View File

@ -64,7 +64,10 @@ in
networking.firewall.allowedTCPPorts = [ 443 ];
networking.firewall.allowedUDPPorts = [ 443 ];
services.dnsdist.dnscrypt.enable = true;
services.dnsdist.dnscrypt.providerKey = "${./dnscrypt-wrapper/secret.key}";
services.dnsdist.dnscrypt.providerKey = pkgs.runCommand "dnscrypt-secret.key" {} ''
echo 'R70+xqm7AaDsPtDgpSjSG7KHvEqVf6u6PZ+E3cGPbOwUQdg6/
RIIpK6pHkINhrv7nxwIG5c7b/m5NJVT3A1AXQ==' | base64 -id > "$out"
'';
}
];

View File

@ -82,8 +82,9 @@ with pkgs.lib;
machine.wait_for_unit("multi-user.target")
with subtest("BTRFS filesystems are mounted correctly"):
machine.succeed("grep -E '/dev/vda / btrfs rw,relatime,space_cache=v2,subvolid=[0-9]+,subvol=/root 0 0' /proc/mounts")
machine.succeed("grep -E '/dev/vda /home btrfs rw,relatime,space_cache=v2,subvolid=[0-9]+,subvol=/home 0 0' /proc/mounts")
print("output of \"grep -E '/dev/vda' /proc/mounts\":\n" + machine.execute("grep -E '/dev/vda' /proc/mounts")[1])
machine.succeed("grep -E '/dev/vda / btrfs rw,.*subvolid=[0-9]+,subvol=/root 0 0' /proc/mounts")
machine.succeed("grep -E '/dev/vda /home btrfs rw,.*subvolid=[0-9]+,subvol=/home 0 0' /proc/mounts")
'';
};

View File

@ -18,14 +18,14 @@ with pkgs; {
testScript = { nodes, ... }:
let
sqlSU = "${nodes.master.config.services.postgresql.superUser}";
sqlSU = "${nodes.master.services.postgresql.superUser}";
pgProve = "${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}";
in
''
start_all()
master.wait_for_unit("postgresql")
master.succeed(
"${pkgs.gnused}/bin/sed -e '12 i CREATE EXTENSION pgcrypto;\\nCREATE EXTENSION pgtap;\\nSET search_path TO tap,public;' ${pgjwt.src}/test.sql > /tmp/test.sql"
"${pkgs.gnused}/bin/sed -e '12 i SET search_path TO tap,public;' ${pgjwt.src}/test.sql > /tmp/test.sql"
)
master.succeed(
"${pkgs.sudo}/bin/sudo -u ${sqlSU} PGOPTIONS=--search_path=tap,public ${pgProve}/bin/pg_prove -d postgres -v -f /tmp/test.sql"

View File

@ -62,6 +62,7 @@ in
"0x0000000000000000000000000000000000000000000000000000000000000000";
eip155Block = 1;
eip158Block = 1;
homesteadBlock = 1;
isQuorum = true;
istanbul = {
epoch = 30000;

View File

@ -52,6 +52,7 @@ in
server.succeed("scp ${sshOpts} /tmp/tmate.conf client:/tmp/tmate.conf")
client.wait_for_file("/tmp/tmate.conf")
client.wait_until_tty_matches("1", "login:")
client.send_chars("root\n")
client.sleep(2)
client.send_chars("tmate -f /tmp/tmate.conf\n")
@ -62,7 +63,8 @@ in
client.wait_for_file("/tmp/ssh_command")
ssh_cmd = client.succeed("cat /tmp/ssh_command")
client2.succeed("mkdir -p ~/.ssh; ssh-keyscan -p 2223 server > ~/.ssh/known_hosts")
client2.succeed("mkdir -p ~/.ssh; ssh-keyscan -4 -p 2223 server > ~/.ssh/known_hosts")
client2.wait_until_tty_matches("1", "login:")
client2.send_chars("root\n")
client2.sleep(2)
client2.send_chars(ssh_cmd.strip() + "\n")

View File

@ -8,6 +8,8 @@ let
maintainers = [ oddlama rnhmjoj ];
};
naughtyPassphrase = ''!,./;'[]\-=<>?:"{}|_+@$%^&*()`~ # ceci n'est pas un commentaire'';
runConnectionTest = name: extraConfig: runTest {
name = "wpa_supplicant-${name}";
inherit meta;
@ -28,7 +30,7 @@ let
ssid = "nixos-test-sae";
authentication = {
mode = "wpa3-sae";
saePasswords = [ { password = "reproducibility"; } ];
saePasswords = [ { password = naughtyPassphrase; } ];
};
bssid = "02:00:00:00:00:00";
};
@ -37,8 +39,8 @@ let
authentication = {
mode = "wpa3-sae-transition";
saeAddToMacAllow = true;
saePasswordsFile = pkgs.writeText "password" "reproducibility";
wpaPasswordFile = pkgs.writeText "password" "reproducibility";
saePasswordsFile = pkgs.writeText "password" naughtyPassphrase;
wpaPasswordFile = pkgs.writeText "password" naughtyPassphrase;
};
bssid = "02:00:00:00:00:01";
};
@ -46,7 +48,7 @@ let
ssid = "nixos-test-wpa2";
authentication = {
mode = "wpa2-sha256";
wpaPassword = "reproducibility";
wpaPassword = naughtyPassphrase;
};
bssid = "02:00:00:00:00:02";
};
@ -66,7 +68,7 @@ let
# secrets
secretsFile = pkgs.writeText "wpa-secrets" ''
psk_nixos_test=reproducibility
psk_nixos_test=${naughtyPassphrase}
'';
}
extraConfig

View File

@ -11,7 +11,7 @@
}:
stdenv.mkDerivation rec {
version = "2.4.0";
version = "2.4.1";
pname = "jacktrip";
src = fetchFromGitHub {
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
repo = "jacktrip";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-sTCzmQ/dq12ZmkbarVX1jpSODlBf9OuSB1XwKUnfV64=";
hash = "sha256-KxpoY7g5oKN2j8rOcFcJf/29xTELxhBn5KBvKB5kL8M=";
};
preConfigure = ''

View File

@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
name = "tinymist";
publisher = "myriad-dreamin";
inherit (tinymist) version;
hash = "sha256-XkpoSf2UO3OoEMMpXBMkY1peQPR/4QoQ4LrY81IsHT0=";
hash = "sha256-PcCZkY1+ks9J5JaDJLVgiJuXgRxIvUZHI00gatjeVbA=";
};
nativeBuildInputs = [

View File

@ -15,10 +15,10 @@
"src": {
"owner": "libretro",
"repo": "libretro-atari800",
"rev": "39380a6e028589e850ecdfd2a5a19307b475d667",
"hash": "sha256-Rw6eTaKHZaCEgvnIqctaKCYQ+W8cHLtckLK8U5Ugck4="
"rev": "683a37f25e34af6cb22ee4c4f9acf9db53d49662",
"hash": "sha256-B7EwI0ii8hqkcg314hWi06OI7E5unufkKSak53pqrAY="
},
"version": "unstable-2024-09-24"
"version": "unstable-2024-10-01"
},
"beetle-gba": {
"fetcher": "fetchFromGitHub",
@ -55,10 +55,10 @@
"src": {
"owner": "libretro",
"repo": "beetle-pce-libretro",
"rev": "e6c21fdf7d1aeae411f08272121213fa4de96bbc",
"hash": "sha256-ZeBoLTsr1A+IPQJ+oIGNADrgKySDHczXY6uriLmeHV4="
"rev": "68a9f57622f7c3b8581eb2cfba6133774d122563",
"hash": "sha256-tlepLBcuB4H/MvZdXSDT/zupwhRznHsvEt0lgMqq1dE="
},
"version": "unstable-2024-09-27"
"version": "unstable-2024-10-01"
},
"beetle-pce-fast": {
"fetcher": "fetchFromGitHub",
@ -95,20 +95,20 @@
"src": {
"owner": "libretro",
"repo": "beetle-saturn-libretro",
"rev": "7a8f808a1d447fcb8fa9547d9f163eb3600d3086",
"hash": "sha256-Yp1HuhbsQGicrFeIbnJP6Rd6hVK4BRclUnPKZlYC7pM="
"rev": "3c12611c8cc13adaf2b82ca0a2e4862ebfd06753",
"hash": "sha256-9GyFloo+7mBA6C2p791P1+g0GfuFEKB2+3QSCz9gXmc="
},
"version": "unstable-2024-05-19"
"version": "unstable-2024-10-01"
},
"beetle-supafaust": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "libretro",
"repo": "supafaust",
"rev": "6b639c98372d1c9bac885c55d772c812d2a9d525",
"hash": "sha256-EVXwjrxooZm1JqG4HswUe8zwN81Rm7SPB5Fr4WfpTnc="
"rev": "e25f66765938d33f9ad5850e8d6cd597e55b7299",
"hash": "sha256-ZgOXHhEHt54J2B1q6uA8v6uOK53g7idJlgoC4guTGow="
},
"version": "unstable-2023-06-19"
"version": "unstable-2024-10-01"
},
"beetle-supergrafx": {
"fetcher": "fetchFromGitHub",
@ -155,10 +155,10 @@
"src": {
"owner": "libretro",
"repo": "bluemsx-libretro",
"rev": "824690b5ac997ec9694e8db1595186459bb3b652",
"hash": "sha256-8UgVUTKGjSt2HwVgE6a/cs1npsOR8j9TxWBH/RA9VNk="
"rev": "7a4a21d1e90a9135f678587cd8aea3f023798edd",
"hash": "sha256-emwyVbZHJU2ujHeiqD1mthKFvnP4bXdUDLAv+DFMMN4="
},
"version": "unstable-2024-08-08"
"version": "unstable-2024-10-01"
},
"bsnes": {
"fetcher": "fetchFromGitHub",
@ -246,10 +246,10 @@
"src": {
"owner": "schellingb",
"repo": "dosbox-pure",
"rev": "ea7b947a8ed156a1ce2ce49329a5686c69f80075",
"hash": "sha256-aqNyYG7H+YBLhQlnkfBfmX3PkBF8GeYXc+KHkvkxlRo="
"rev": "9b4147fd14332a7354c9b76fa72653bda2d919e9",
"hash": "sha256-lzRBzBMIQ3X+VAHK8pl/HYELecTkdFlWJI7C1csmZ7I="
},
"version": "unstable-2024-09-16"
"version": "unstable-2024-09-28"
},
"easyrpg": {
"fetcher": "fetchFromGitHub",
@ -287,10 +287,10 @@
"src": {
"owner": "libretro",
"repo": "fbneo",
"rev": "3d69bc5519c4382b3d5da2763ae42e3b6a3d019e",
"hash": "sha256-Tf5nLy9G9h/qBrwdBFO3OUYl3n81NPw4slEeCfLzMjI="
"rev": "d72f49f4a45dbfc5a855956d1a75ce2d0601c1c5",
"hash": "sha256-+T+HQo6IfY8+oE/mOg54Vn9NhasGYNCLXksFdSDT/xE="
},
"version": "unstable-2024-09-26"
"version": "unstable-2024-10-03"
},
"fceumm": {
"fetcher": "fetchFromGitHub",
@ -307,11 +307,11 @@
"src": {
"owner": "flyinghead",
"repo": "flycast",
"rev": "343021a8c507f4723b3f56a3bb817206912fcb36",
"hash": "sha256-DMbhCHW2VHEle0oihaz1GEPOGDCXxfdZoL8MdPZT4d0=",
"rev": "d689c50e21bf956913ac607933cd4082eaedc06b",
"hash": "sha256-XIe1JrKVY4ba5WnKrVofWNpJU5pcwUyDd14ZzaGcf+k=",
"fetchSubmodules": true
},
"version": "unstable-2024-09-27"
"version": "unstable-2024-10-05"
},
"fmsx": {
"fetcher": "fetchFromGitHub",
@ -348,10 +348,10 @@
"src": {
"owner": "libretro",
"repo": "gambatte-libretro",
"rev": "e9a1941276e932813dc742796ffd1d0939c5d1d5",
"hash": "sha256-4FFYocOa2fuBT8UFKM87Fn5E6pjkfe4tUVDtpEchtJo="
"rev": "3eeb65e9bcf4b2a7ca24c5cebdfa7e342177ef0f",
"hash": "sha256-tNGMR6GIyXen9+Ktg3IvYTcPidc+5Z8TpBQu1YgmqlY="
},
"version": "unstable-2024-09-27"
"version": "unstable-2024-10-04"
},
"genesis-plus-gx": {
"fetcher": "fetchFromGitHub",
@ -368,10 +368,10 @@
"src": {
"owner": "libretro",
"repo": "gpsp",
"rev": "f2837be54aa680c4ec0c7be0669cdcd65582cc66",
"hash": "sha256-Kfw4KYNH/K3y6Iy/eYu/OlInibv9JLQvOSDh429G2zg="
"rev": "01ca530d0797021fb519a49c18f5df15c5093605",
"hash": "sha256-4ka3finPgtAJx3SWXG9L6+t+Dbn++pRQJJi9EG7jV3s="
},
"version": "unstable-2024-08-24"
"version": "unstable-2024-10-01"
},
"gw": {
"fetcher": "fetchFromGitHub",
@ -398,21 +398,21 @@
"src": {
"owner": "libretro",
"repo": "hatari",
"rev": "c10a21dbe99277b06ccf7de10eceb74f5d57e921",
"hash": "sha256-R5N7EUVUKJ1GXQtnlCCE33DlDsxMzpPp6pYUHJJ/5Ig="
"rev": "153887d70df7c91e192192fa7ca34f90e000a7c5",
"hash": "sha256-s1VNAIuO0N4mrInb74sRcSTBMwwHwtYw9JnCKNVPNpU="
},
"version": "unstable-2024-06-28"
"version": "unstable-2024-10-01"
},
"mame": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "libretro",
"repo": "mame",
"rev": "231b5e6d621ed93168ad19eed6c0e3390d4e81ff",
"hash": "sha256-UD1kNQ6KXEa60ZA+65XXqgihLu/XJxTLvbM4Wt9y2vs=",
"rev": "6a3d1606e41aaedc94e6b00d68e682a95ac36bec",
"hash": "sha256-Fcd906E1I52fDnBWehrdtk6NfYA1yhmHIQ7xZCcbtEU=",
"fetchSubmodules": true
},
"version": "unstable-2024-09-27"
"version": "unstable-2024-10-04"
},
"mame2000": {
"fetcher": "fetchFromGitHub",
@ -439,10 +439,10 @@
"src": {
"owner": "libretro",
"repo": "mame2003-plus-libretro",
"rev": "9221b2f66dbc7a08b22a7365e2431e027e382322",
"hash": "sha256-mm4g1JX98yW/6Us1k5DwaYQQbhmfiBSxxXFvwgvB5yE="
"rev": "63d5c26b5824189e7244116a64bc0b272415718e",
"hash": "sha256-iBZjx8Oj4nR6PDFud42x5y8EIV7YHzdzlgRKbq/QOTI="
},
"version": "unstable-2024-09-26"
"version": "unstable-2024-10-05"
},
"mame2010": {
"fetcher": "fetchFromGitHub",
@ -631,21 +631,21 @@
"src": {
"owner": "libretro",
"repo": "pcsx_rearmed",
"rev": "237887e817e23800997466632deb8ba63797a4cb",
"hash": "sha256-AhyCkQzgppCnwcX+qpKcSEJ58hosJwL9wwn80HOHpvg="
"rev": "778896e3888aaaea996e81f0e641cb35b4b74694",
"hash": "sha256-ULRtrWo4EO59RLZHZ5wOHl+vxLcMpnMPj1kszlGk3TQ="
},
"version": "unstable-2024-09-03"
"version": "unstable-2024-10-06"
},
"picodrive": {
"fetcher": "fetchFromGitHub",
"src": {
"owner": "libretro",
"repo": "picodrive",
"rev": "6508730c524420e05626b0b06dbc603e02d3af64",
"hash": "sha256-iL6eKG2O6ePYo6NK0VsTVLaRKgwuapXotvSOy7KipgI=",
"rev": "eb94de7ce26e2e70ab8c7805000f346c1c218bd0",
"hash": "sha256-XK66u+8CDo1HVlVhwu3U6Ckn0LcLeTuD3CDC6hboP5Y=",
"fetchSubmodules": true
},
"version": "unstable-2024-09-06"
"version": "unstable-2024-10-01"
},
"play": {
"fetcher": "fetchFromGitHub",
@ -663,11 +663,11 @@
"src": {
"owner": "hrydgard",
"repo": "ppsspp",
"rev": "64ce72e81df48f78db5d5b192bd68eca218bd0a1",
"hash": "sha256-DRodUtFcHt+t8GAHI+3+WDltbUzkWZ/ahunOPELabTI=",
"rev": "16d97aa810521da5e7a00145cdd5be80a27b4a35",
"hash": "sha256-oYSypeyUsmprPZqSMGwBZtetCgoKA/GbfMBU+obvwxg=",
"fetchSubmodules": true
},
"version": "unstable-2024-09-28"
"version": "unstable-2024-10-03"
},
"prboom": {
"fetcher": "fetchFromGitHub",
@ -754,10 +754,10 @@
"src": {
"owner": "snes9xgit",
"repo": "snes9x",
"rev": "72e4946410bff2a09ff327599f014e9f6e855c54",
"hash": "sha256-srPtEMIjsaFdmOkymGhb6vMuY5EBnTVhzJnpsCE/fMQ="
"rev": "08403d47d1c81370aacd8f65b3146bbd69d2c89c",
"hash": "sha256-9u+olvp2OI+zWsLxWAo9P4Dr4bFeTXESU1RUo9sLNfU="
},
"version": "unstable-2024-09-27"
"version": "unstable-2024-10-03"
},
"snes9x2002": {
"fetcher": "fetchFromGitHub",
@ -794,10 +794,10 @@
"src": {
"owner": "stella-emu",
"repo": "stella",
"rev": "cb61f676ec78cd3f76cbd233bfd91575abde13be",
"hash": "sha256-t+QBWIE5+rEzdv4bbk6MqIQh3XsUgviX69RKe/zMb4Q="
"rev": "d69e47421cb5319ab0947dd005b2f1ddbd81f442",
"hash": "sha256-c7A1gFvYkxxwuwrntw/w8FYD24l5m1Uip+44Pe664lE="
},
"version": "unstable-2024-09-26"
"version": "unstable-2024-10-04"
},
"stella2014": {
"fetcher": "fetchFromGitHub",
@ -834,10 +834,10 @@
"src": {
"owner": "libretro",
"repo": "ThePowderToy",
"rev": "f644498193c4c8be689d8a1d2a70e37e4eff4243",
"hash": "sha256-aPUqrrrH2Ia56A3Kx6ClMcZO9nbHGJIcEQ6nFyIMamo="
"rev": "5d9c749780063b87bd62ddb025dee4241f196f26",
"hash": "sha256-BYeQ2WZgyvjDH5+akrVP5TlLq6Go3NKXB7zeR9oaaJ8="
},
"version": "unstable-2023-01-17"
"version": "unstable-2024-10-01"
},
"tic80": {
"fetcher": "fetchFromGitHub",

View File

@ -69,9 +69,9 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the hash for staging as well.
version = "9.18";
version = "9.19";
url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz";
hash = "sha256-ZSb1IRwIVFO8tkKUbrLOjR1CqKSmgWi/Kg1z8yYS3Rw=";
hash = "sha256-LBOgw/MfJaVNQV2GeFoa1G74oHrpc7a2mTRaRSBqwBU=";
inherit (stable) patches;
## see http://wiki.winehq.org/Gecko
@ -117,7 +117,7 @@ in rec {
staging = fetchFromGitLab rec {
# https://gitlab.winehq.org/wine/wine-staging
inherit (unstable) version;
hash = "sha256-m3tuwb6OFcgZ/NATixIH1j3YgrzsREJNpnVbevN/9FY=";
hash = "sha256-TKW8y8kPsI0af/nEr3rU9nH49I77u+/6CHE64JgdkOU=";
domain = "gitlab.winehq.org";
owner = "wine";
repo = "wine-staging";

View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "typioca";
version = "3.0.0";
version = "3.1.0";
src = fetchFromGitHub {
owner = "bloznelis";
repo = "typioca";
rev = version;
hash = "sha256-pYHEi1J8i8AeRM62TNrklivcmiv4Kq0a5Z7Fn1RB/Jk=";
hash = "sha256-fViYwewzhJUJjMupCYk1UsnnPAhByYZqYkuKD6MJNnE=";
};
vendorHash = "sha256-4T5xbCvzYn1bOKz0WCCiFojoQztOQ66SH4+WDI3Sn5g=";
vendorHash = "sha256-fUkajuviQuQuVgzWAxsInd+c+eNQArKNjiNsi7mCNWU=";
ldflags = [
"-s"

View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "glooctl";
version = "1.17.10";
version = "1.17.14";
src = fetchFromGitHub {
owner = "solo-io";
repo = "gloo";
rev = "v${version}";
hash = "sha256-p917jiPvWjLRoH2y81TvILc9WYZ6n1y1UQy8hIO93jM=";
hash = "sha256-7KkaQYTsamUapWKPB0JIoEnOs/SvrCbBgQqvQg9VQ9o=";
};
vendorHash = "sha256-rAObw4J0ATle1gq5Z1MsrGy/iqQDHjnMPAEIPBgtY3g=";

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helmsman";
version = "3.17.0";
version = "3.17.1";
src = fetchFromGitHub {
owner = "Praqma";
repo = "helmsman";
rev = "v${version}";
sha256 = "sha256-mXc3CVKh4pFAZVppvk5TTg6s6dOA2Gv+ROLNV37DAl4=";
sha256 = "sha256-u/Fj3A81hH7i1yTg+kcqCPrwEkj0cyhZvNzRYURDoZU=";
};
vendorHash = "sha256-zn8q3HpyQWNsksYbqJcgnjOxaBVUr3dIYHk+FAalNxA=";
vendorHash = "sha256-3eIMMKMvRzOSMvufETR9H1PnPDeEc+su8UuvbQJZ7kI=";
doCheck = false;

View File

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "kubevela";
version = "1.9.12";
version = "1.9.13";
src = fetchFromGitHub {
owner = "kubevela";
repo = "kubevela";
rev = "v${version}";
hash = "sha256-AltyaV4tFW/3nOzEgWwlIqFXVaEtcpN5IxdFScZ7Nes=";
hash = "sha256-b9N7vEY6AjJmOWySyssW7nrlZ+iFhOzVFmVQGfk/ilw=";
};
vendorHash = "sha256-Ethbor1nZRYuemBL03QdnExNJtdOJ4w76sjLrBDW9Aw=";
vendorHash = "sha256-WE5jE58pCXUvIKo+NAQUNrNzxLkUDIuJp2yBqE+8Ors=";
ldflags = [
"-s" "-w"

View File

@ -18,23 +18,15 @@
stdenv.mkDerivation (finalAttrs: {
pname = "remmina";
version = "1.4.35";
version = "1.4.36";
src = fetchFromGitLab {
owner = "Remmina";
repo = "Remmina";
rev = "v${finalAttrs.version}";
hash = "sha256-0z2fcBnChCBYPxyFm/xpAW0jHaUGA92NQgjt+lWFUnM=";
hash = "sha256-u+ysAFi7I7nXIiAw7VCmHbqgtRoZgkPnRfy/Mnl1b2g=";
};
patches = [
(fetchpatch2 {
name = "add-a-conditional-check-for-darwin-and-NetBSD.patch";
url = "https://gitlab.com/Remmina/Remmina/-/commit/3b681398c823e070c7f780166b9d9fc2158e66c1.diff";
hash = "sha256-Ovdrsl9bftXiuXV+sqvDP9VGuXQZzC5VKOmkYmBXhNA=";
})
];
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook3 ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];

View File

@ -20,11 +20,11 @@
stdenv.mkDerivation rec {
pname = "zotero";
version = "7.0.3";
version = "7.0.7";
src = fetchurl {
url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
hash = "sha256-W5/j5ohrx/X0qlOiWWtB/FEF9aZCnbbAA3pcL8R6yy0=";
hash = "sha256-ERL+zKjNOz+j/Q5dyTXVczLnwaTl/SzgSaKVkA9uyJ4=";
};
dontPatchELF = true;

View File

@ -8,11 +8,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "quisk";
version = "4.2.38";
version = "4.2.39";
src = fetchPypi {
inherit pname version;
hash = "sha256-IF7I+NgnqwU6c5R4caZslt7DJneI3fYk4KXl10dIsEw=";
hash = "sha256-LE7VPKzpDycUNHpdmO43GqlHnF/gwr6H7LWq8DpcXdk=";
};
buildInputs = [

View File

@ -15,13 +15,13 @@
buildGoModule rec {
pname = "cri-o";
version = "1.31.0";
version = "1.31.1";
src = fetchFromGitHub {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
hash = "sha256-pY8FRxexf/WG+aGkKZc4EtqO9uxAV7D6EFWirgSEye8=";
hash = "sha256-0IPQsCLiL0Q15pq89qToMfw6mDwmMZroNBkTCfgqx6s=";
};
vendorHash = null;

File diff suppressed because it is too large Load Diff

View File

@ -11,21 +11,22 @@
rustPlatform.buildRustPackage rec {
pname = "cosmic-bg";
version = "1.0.0-alpha.1";
version = "1.0.0-alpha.2";
src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
rev = "epoch-${version}";
hash = "sha256-imGSOPS/ay3EycyrrQcIePDXNEYRk7NTAV+EtUPtEdg=";
hash = "sha256-lAFAZBo5FnXgJV3MrZhaYmBxqtH1E7+Huj53ho/hPik=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";
"cosmic-config-0.1.0" = "sha256-5J9tjpEcZJrUtW7barwXTOTNXNr33TLwYjApKkwDSvc=";
"smithay-client-toolkit-0.18.0" = "sha256-2WbDKlSGiyVmi7blNBr2Aih9FfF2dq/bny57hoA4BrE=";
"clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk=";
"cosmic-config-0.1.0" = "sha256-mdRRfXLyDBYQIPmbuXgXGoOKUlyw6CiSmOUBz1b3vJY=";
"smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34=";
};
};

View File

@ -5,19 +5,18 @@
rustPlatform,
just,
dbus,
rust,
stdenv,
xdg-desktop-portal-cosmic,
}:
rustPlatform.buildRustPackage rec {
pname = "cosmic-session";
version = "1.0.0-alpha.1";
version = "1.0.0-alpha.2";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-session";
rev = "epoch-${version}";
hash = "sha256-5zfEBNsMxtKPJZcGYZth/SoXrsg0gpug15VR5fPbvt0=";
hash = "sha256-rkzcu5lXKVQ5RfilcKQjTzeKZv+FpqrtARZgGGlYKK4=";
};
cargoLock = {

File diff suppressed because it is too large Load Diff

View File

@ -5,13 +5,13 @@
rustPlatform.buildRustPackage rec {
pname = "cosmic-store";
version = "1.0.0-alpha.1";
version = "1.0.0-alpha.2";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-store";
rev = "epoch-${version}";
hash = "sha256-RuqWO2/sqMMd9xMRClAy7cwv7iCTEC15TZ7JLBZ2zwM=";
hash = "sha256-mq94ZMVOdXAPR52ID5x8nppJ9mNoTOPBfn7Eouj3T1U=";
fetchSubmodules = true;
};
@ -22,11 +22,11 @@ rustPlatform.buildRustPackage rec {
"appstream-0.2.2" = "sha256-OWeNXxvqU8s0ksdY9v5bZeNfDYgMBVd1DhEAjjZxEmo=";
"atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";
"clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk=";
"cosmic-config-0.1.0" = "sha256-d2R5xytwf0BIbllG6elc/nn7nmiC3+VI1g3EiW8WEHA=";
"cosmic-text-0.12.0" = "sha256-VUUCcW5XnkmCB8cQ5t2xT70wVD5WKXEOPNgNd2xod2A=";
"cosmic-config-0.1.0" = "sha256-gXrMEoAN+7nYAEcs4w6wROhQTjMCxkGn+muJutktLyk=";
"cosmic-text-0.12.1" = "sha256-u2Tw+XhpIKeFg8Wgru/sjGw6GUZ2m50ZDmRBJ1IM66w=";
"d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4=";
"glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg=";
"smithay-clipboard-0.8.0" = "sha256-pBQZ+UXo9hZ907mfpcZk+a+8pKrIWdczVvPkjT3TS8U=";
"smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34=";
"softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg=";
"taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI=";
"winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4=";

File diff suppressed because it is too large Load Diff

View File

@ -18,37 +18,40 @@
rustPlatform.buildRustPackage rec {
pname = "cosmic-term";
version = "1.0.0-alpha.1";
version = "1.0.0-alpha.2";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-term";
rev = "epoch-${version}";
hash = "sha256-dY4QGQXJFL+yjCYRGCg3NfMLMjlEBSEmxHn68PvhCAQ=";
hash = "sha256-rMaHWtT5bhjdji3dAnfyCm7lMXDWjIBVh4ZUwApZphU=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"accesskit-0.12.2" = "sha256-1UwgRyUe0PQrZrpS7574oNLi13fg5HpgILtZGW6JNtQ=";
"alacritty_terminal-0.24.1-dev" = "sha256-aVB1CNOLjNh6AtvdbomODNrk00Md8yz8QzldzvDo1LI=";
"atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";
"clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk=";
"cosmic-config-0.1.0" = "sha256-DgMh0gqWUmXjBhBySR0CMnv/8O3XbS2BwomU9eNt+4o=";
"cosmic-files-0.1.0" = "sha256-QDkHhU0zE0szFwGuVuSYrXd7AUdTU1rYxlAsaHr2YvQ=";
"cosmic-text-0.12.1" = "sha256-x0XTxzbmtE2d4XCG/Nuq3DzBpz15BbnjRRlirfNJEiU=";
"cosmic-config-0.1.0" = "sha256-gXrMEoAN+7nYAEcs4w6wROhQTjMCxkGn+muJutktLyk=";
"cosmic-files-0.1.0" = "sha256-rBR6IPpMgOltyaRPPZ5V8tYH/xtQphgrPWci/kvlgEg=";
"cosmic-text-0.12.1" = "sha256-u2Tw+XhpIKeFg8Wgru/sjGw6GUZ2m50ZDmRBJ1IM66w=";
"d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4=";
"filetime-0.2.24" = "sha256-lU7dPotdnmyleS2B75SmDab7qJfEzmJnHPF18CN/Y98=";
"fs_extra-1.3.0" = "sha256-ftg5oanoqhipPnbUsqnA4aZcyHqn9XsINJdrStIPLoE=";
"glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg=";
"libc-0.2.154" = "sha256-/pkmpCxzRTjBiLFKauqUqGTBTxNUQX4zwPWYpDsjwVQ=";
"smithay-clipboard-0.8.0" = "sha256-4InFXm0ahrqFrtNLeqIuE3yeOpxKZJZx+Bc0yQDtv34=";
"softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg=";
"taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI=";
"trash-5.1.1" = "sha256-So8rQ8gLF5o79Az396/CQY/veNo4ticxYpYZPfMJyjQ=";
"winit-0.29.10" = "sha256-ScTII2AzK3SC8MVeASZ9jhVWsEaGrSQ2BnApTxgfxK4=";
};
};
# COSMIC applications now uses vergen for the About page
# Update the COMMIT_DATE to match when the commit was made
env.VERGEN_GIT_COMMIT_DATE = "2024-08-03";
env.VERGEN_GIT_COMMIT_DATE = "2024-09-24";
env.VERGEN_GIT_SHA = src.rev;
postPatch = ''

View File

@ -1,33 +1,47 @@
{ lib, stdenv, fetchFromGitHub, ruby, gnugrep, diffutils, git, darcs }:
{
lib,
stdenv,
fetchFromGitHub,
ruby,
gnugrep,
diffutils,
git,
darcs,
unstableGitUpdater,
}:
stdenv.mkDerivation {
pname = "darcs-to-git";
version = "2015-06-04";
version = "0-unstable-2024-02-20";
src = fetchFromGitHub {
owner = "purcell";
repo = "darcs-to-git";
rev = "e5fee32495908fe0f7d700644c7b37347b7a0a5b";
sha256 = "sha256-UQI3av+0zj1SNwEonwuk5n2RjZN3+tSJFJuFCjrorFM=";
rev = "2a31a95726658fef1b48e1f0010928fc2a69d5bf";
hash = "sha256-ep36lAYUnO3kX0ff3PxrBHog5CIGsJaERiNN5DmmAQI=";
};
patchPhase = let
matchExecution = ''(\<(output_of|system|run)\([^"%]*("|%w\()|^[^"`]*`)'';
in ''
sed -r -i \
-e '1s|^#!.*|#!${ruby}/bin/ruby|' \
-e 's!${matchExecution}git\>!\1${git}/bin/git!' \
-e 's!${matchExecution}darcs\>!\1${darcs}/bin/darcs!' \
-e 's!${matchExecution}diff\>!\1${diffutils}/bin/diff!' \
-e 's!\<egrep\>!${gnugrep}/bin/egrep!g' \
-e 's!%w\(darcs init\)!%w(${darcs}/bin/darcs init)!' \
darcs-to-git
'';
patchPhase =
let
matchExecution = ''(\<(output_of|system|run)\([^"%]*("|%w\()|^[^"`]*`)'';
in
''
sed -r -i \
-e '1s|^#!.*|#!${ruby}/bin/ruby|' \
-e 's!${matchExecution}git\>!\1${git}/bin/git!' \
-e 's!${matchExecution}darcs\>!\1${darcs}/bin/darcs!' \
-e 's!${matchExecution}diff\>!\1${diffutils}/bin/diff!' \
-e 's!\<egrep\>!${gnugrep}/bin/egrep!g' \
-e 's!%w\(darcs init\)!%w(${darcs}/bin/darcs init)!' \
darcs-to-git
'';
installPhase = ''
install -vD darcs-to-git "$out/bin/darcs-to-git"
'';
passthru.updateScript = unstableGitUpdater { };
doCheck = true;
checkPhase = ''

View File

@ -0,0 +1,51 @@
{
lib,
stdenv,
fetchFromGitHub,
m4,
installShellFiles,
util-linux,
}:
stdenv.mkDerivation rec {
pname = "dinit";
version = "0.19.0";
src = fetchFromGitHub {
owner = "davmac314";
repo = "dinit";
rev = "v${version}";
hash = "sha256-ApB0pEFSyawNASF/rqRmhT4FLofZzYmNdNmG2FGpnnk=";
};
postPatch = ''
substituteInPlace src/shutdown.cc \
--replace-fail '"/bin/umount"' '"${util-linux}/bin/umount"' \
--replace-fail '"/sbin/swapoff"' '"${util-linux}/bin/swapoff"'
'';
nativeBuildInputs = [
m4
installShellFiles
];
configureFlags = [
"--prefix=${placeholder "out"}"
"--sbindir=${placeholder "out"}/bin"
];
postInstall = ''
installShellCompletion --cmd dinitctl \
--bash contrib/shell-completion/bash/dinitctl \
--fish contrib/shell-completion/fish/dinitctl.fish \
--zsh contrib/shell-completion/zsh/_dinit
'';
meta = {
description = "A service manager / supervision system, which can (on Linux) also function as a system manager and init";
homepage = "https://davmac.org/projects/dinit";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ aanderse ];
platforms = lib.platforms.unix;
};
}

View File

@ -1,7 +1,7 @@
{ lib, buildGoModule, fetchFromGitHub }:
let
pname = "e1s";
version = "1.0.39";
version = "1.0.41";
in
buildGoModule {
inherit pname version;
@ -10,7 +10,7 @@ buildGoModule {
owner = "keidarcy";
repo = "e1s";
rev = "refs/tags/v${version}";
hash = "sha256-kfG9Nkt5L2YokTLPzPuIAmjCHlZvr3FqZiYLr8bU+K4=";
hash = "sha256-JYda+CoTa8HAZ0B0kcr4s9u+4dlhthFLpjGaZqAFuhU=";
};
vendorHash = "sha256-u6h/sqI0Rqs3ZmVXtMNVuL3h9Cj15+mM+QnIaylzlHI=";
@ -18,7 +18,7 @@ buildGoModule {
meta = with lib; {
description = "Easily Manage AWS ECS Resources in Terminal 🐱";
homepage = "https://github.com/keidarcy/e1s";
changelog = "https://github.com/derailed/e1s/releases/tag/v${version}";
changelog = "https://github.com/keidarcy/e1s/releases/tag/v${version}";
license = licenses.mit;
mainProgram = "e1s";
maintainers = with maintainers; [ zelkourban ];

View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "fabric-ai";
version = "1.4.26";
version = "1.4.46";
src = fetchFromGitHub {
owner = "danielmiessler";
repo = "fabric";
rev = "v${version}";
hash = "sha256-KoGulBnQDLpRWB+Bogu+bvXDJ98ImyzTZrvoEaVh5BQ=";
hash = "sha256-c25qnRgr7g8dIcHuRyqCmzGBqNR2wxvgjt7E6x8VsZA=";
};
vendorHash = "sha256-uWq+S6J/RInAaQOO0T3LkpQ89mHq0Wj+wXw+Tioxy70=";
vendorHash = "sha256-ef5fn3D0DcvluLIlwfZFGS/6bZgkduQhRXvjCrghBL8=";
ldflags = [
"-s"

View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "files-cli";
version = "2.13.141";
version = "2.13.148";
src = fetchFromGitHub {
repo = "files-cli";
owner = "files-com";
rev = "v${version}";
hash = "sha256-UVD2zWas4QZD3W6Xro7tiGJDdbive60dYPDY1UTnl08=";
hash = "sha256-r3pYDBE1YaKuFdxxpDVcMGfX5vOLt4xh3eY0fgLIGk0=";
};
vendorHash = "sha256-4HkIwyRqvbk7qIzCjZNTzF7wDNupNaDpOiqqdlx9UIo=";
vendorHash = "sha256-/w1uo3SmCUjKp1FcB2NfhrFCLh5zCP+6uf03uwb+SvU=";
ldflags = [
"-s"

View File

@ -1,5 +1,5 @@
{ lib
, flutter322
, flutter324
, mpv-unwrapped
, xdg-user-dirs
, patchelf
@ -8,16 +8,16 @@
, makeDesktopItem
}:
let
version = "0.9.9-beta";
version = "0.9.11-beta";
in
flutter322.buildFlutterApplication {
flutter324.buildFlutterApplication {
inherit version;
pname = "finamp";
src = fetchFromGitHub {
owner = "jmshrv";
repo = "finamp";
rev = version;
hash = "sha256-cCXDvsXgA/B274pQzyQRzmzz0QvqcFMLQrUjDU/B08Y=";
hash = "sha256-ruHjLM68c/k+Q64eeoezj5gmmniLBAOt3PEmmaO81xo=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;

View File

@ -30,15 +30,25 @@
"source": "hosted",
"version": "0.11.3"
},
"app_set_id": {
"dependency": "direct main",
"description": {
"name": "app_set_id",
"sha256": "455b04bc03fd9b1b66a50bbca74278d973ac4e6f2c03d5dd4707bb071613a7e5",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.0"
},
"archive": {
"dependency": "transitive",
"description": {
"name": "archive",
"sha256": "6bd38d335f0954f5fad9c79e614604fbf03a0e5b975923dd001b6ea965ef5b4b",
"sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.6.0"
"version": "3.6.1"
},
"args": {
"dependency": "transitive",
@ -64,21 +74,21 @@
"dependency": "direct main",
"description": {
"name": "audio_service",
"sha256": "4547c312a94f9cb2c48b60823fb190767cbd63454a83c73049384d5d3cba4650",
"sha256": "9dd5ba7e77567b290c35908b1950d61485b4dfdd3a0ac398e98cfeec04651b75",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.18.13"
"version": "0.18.15"
},
"audio_service_mpris": {
"dependency": "direct main",
"description": {
"name": "audio_service_mpris",
"sha256": "a8d1583f9143d17b2facc994a99bd1ea257cec43adcb8d7349458555c62b570f",
"sha256": "b16db3584a4b2464c0bfd575c1a21765723d257931222f8adfcb0511f940d352",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.1.3"
"version": "0.1.5"
},
"audio_service_platform_interface": {
"dependency": "direct main",
@ -94,21 +104,21 @@
"dependency": "transitive",
"description": {
"name": "audio_service_web",
"sha256": "9d7d5ae5f98a5727f2580fad73062f2484f400eef6cef42919413268e62a363e",
"sha256": "4cdc2127cd4562b957fb49227dc58e3303fafb09bde2573bc8241b938cf759d9",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.1.2"
"version": "0.1.3"
},
"audio_session": {
"dependency": "direct main",
"description": {
"name": "audio_session",
"sha256": "a49af9981eec5d7cd73b37bacb6ee73f8143a6a9f9bd5b6021e6c346b9b6cf4e",
"sha256": "343e83bc7809fbda2591a49e525d6b63213ade10c76f15813be9aed6657b3261",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.1.19"
"version": "0.1.21"
},
"auto_size_text": {
"dependency": "direct main",
@ -124,11 +134,11 @@
"dependency": "direct main",
"description": {
"name": "background_downloader",
"sha256": "9504093db43da6095c44dd14fc816f3ee8961633ace12340f5d3c4fbfd346e2d",
"sha256": "6a945db1a1c7727a4bc9c1d7c882cfb1a819f873b77e01d5e5dd6a3fb231cb28",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.5.2"
"version": "8.5.5"
},
"balanced_text": {
"dependency": "direct main",
@ -141,6 +151,26 @@
"source": "git",
"version": "0.0.3"
},
"battery_plus": {
"dependency": "direct main",
"description": {
"name": "battery_plus",
"sha256": "ccc1322fee1153a0f89e663e0eac2f64d659da506454cf24dcad75eb08ae138b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.0.2"
},
"battery_plus_platform_interface": {
"dependency": "transitive",
"description": {
"name": "battery_plus_platform_interface",
"sha256": "e8342c0f32de4b1dfd0223114b6785e48e579bfc398da9471c9179b907fa4910",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.1"
},
"boolean_selector": {
"dependency": "transitive",
"description": {
@ -205,21 +235,21 @@
"dependency": "direct dev",
"description": {
"name": "build_runner",
"sha256": "1414d6d733a85d8ad2f1dfcb3ea7945759e35a123cb99ccfac75d0758f75edfa",
"sha256": "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.10"
"version": "2.4.11"
},
"build_runner_core": {
"dependency": "transitive",
"description": {
"name": "build_runner_core",
"sha256": "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799",
"sha256": "e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "7.3.0"
"version": "7.3.1"
},
"built_collection": {
"dependency": "transitive",
@ -265,21 +295,21 @@
"dependency": "direct main",
"description": {
"name": "chopper",
"sha256": "779a7bc5c7af2e45bd35c49698f2b6fabc23ac053b622294369bbb079eeb8920",
"sha256": "6b2f5681f2bdca65a1fe2372922e797303fa058b6ead765afa88e40e0fd61071",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.0.0"
"version": "8.0.2"
},
"chopper_generator": {
"dependency": "direct dev",
"description": {
"name": "chopper_generator",
"sha256": "f7f4913d14bbec24b5cc3c5270f47a3a218bd1c764d7ed3eb0bf4574913208f3",
"sha256": "7d25ad17062a9b671020f96082ed5f8ee85e18137beb74aca4620137ae6ea523",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.0.0"
"version": "8.0.2"
},
"ci": {
"dependency": "transitive",
@ -375,21 +405,21 @@
"dependency": "transitive",
"description": {
"name": "cross_file",
"sha256": "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32",
"sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.3.4+1"
"version": "0.3.4+2"
},
"crypto": {
"dependency": "transitive",
"description": {
"name": "crypto",
"sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab",
"sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.3"
"version": "3.0.5"
},
"custom_lint": {
"dependency": "direct dev",
@ -455,21 +485,21 @@
"dependency": "direct main",
"description": {
"name": "device_info_plus",
"sha256": "eead12d1a1ed83d8283ab4c2f3fca23ac4082f29f25f29dff0f758f57d06ec91",
"sha256": "a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "10.1.0"
"version": "10.1.2"
},
"device_info_plus_platform_interface": {
"dependency": "transitive",
"description": {
"name": "device_info_plus_platform_interface",
"sha256": "d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64",
"sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "7.0.0"
"version": "7.0.1"
},
"equatable": {
"dependency": "transitive",
@ -505,11 +535,11 @@
"dependency": "transitive",
"description": {
"name": "ffi",
"sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21",
"sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.2"
"version": "2.1.3"
},
"file": {
"dependency": "transitive",
@ -525,11 +555,11 @@
"dependency": "direct main",
"description": {
"name": "file_picker",
"sha256": "29c90806ac5f5fb896547720b73b17ee9aed9bba540dc5d91fe29f8c5745b10a",
"sha256": "825aec673606875c33cd8d3c4083f1a3c3999015a84178b317b7ef396b7384f3",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.0.3"
"version": "8.0.7"
},
"file_sizes": {
"dependency": "direct main",
@ -581,21 +611,21 @@
"dependency": "transitive",
"description": {
"name": "flutter_gen_core",
"sha256": "b9894396b2a790cc2d6eb3ed86e5e113aaed993765b21d4b981c9da4476e0f52",
"sha256": "638d518897f1aefc55a24278968027591d50223a6943b6ae9aa576fe1494d99d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.5.0+1"
"version": "5.7.0"
},
"flutter_gen_runner": {
"dependency": "direct dev",
"description": {
"name": "flutter_gen_runner",
"sha256": "b4c4c54e4dd89022f5e405fe96f16781be2dfbeabe8a70ccdf73b7af1302c655",
"sha256": "7f2f02d95e3ec96cf70a1c515700c0dd3ea905af003303a55d6fb081240e6b8a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.5.0+1"
"version": "5.7.0"
},
"flutter_launcher_icons": {
"dependency": "direct dev",
@ -627,11 +657,11 @@
"dependency": "transitive",
"description": {
"name": "flutter_plugin_android_lifecycle",
"sha256": "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f",
"sha256": "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.19"
"version": "2.0.22"
},
"flutter_riverpod": {
"dependency": "direct main",
@ -677,11 +707,11 @@
"dependency": "direct main",
"description": {
"name": "flutter_tabler_icons",
"sha256": "5c27597ed7e3a7f8ae5a3d6aa2c27223fdd3da165c08a4879083c394acfa3678",
"sha256": "08581b2d87e41c86e3acb7cf48482f1a1775e4ed37febc02ca1b99a221836580",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.29.0"
"version": "1.40.0"
},
"flutter_test": {
"dependency": "direct dev",
@ -693,11 +723,11 @@
"dependency": "direct main",
"description": {
"name": "flutter_to_airplay",
"sha256": "9ed02327954d2bdb28d529198bedb1b6ab993be08125fdff46af2c5e5f245983",
"sha256": "702408986b652dfaef5ad68c6f3c3008941ae8d8ef5db526792239c8d490a16d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.4"
"version": "2.0.5"
},
"flutter_vibrate": {
"dependency": "direct main",
@ -715,15 +745,25 @@
"source": "sdk",
"version": "0.0.0"
},
"focus_on_it": {
"dependency": "direct main",
"description": {
"name": "focus_on_it",
"sha256": "bd75489d7cb3cbde483126316a753e1a442a35c01a2278ae9bf54a4d86b89f02",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.1"
},
"freezed_annotation": {
"dependency": "transitive",
"description": {
"name": "freezed_annotation",
"sha256": "c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d",
"sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.1"
"version": "2.4.4"
},
"frontend_server_client": {
"dependency": "transitive",
@ -759,11 +799,11 @@
"dependency": "transitive",
"description": {
"name": "graphs",
"sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19",
"sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.1"
"version": "2.3.2"
},
"hashcodes": {
"dependency": "transitive",
@ -819,11 +859,11 @@
"dependency": "transitive",
"description": {
"name": "http",
"sha256": "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938",
"sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.1"
"version": "1.2.2"
},
"http_multi_server": {
"dependency": "transitive",
@ -960,21 +1000,21 @@
"dependency": "direct main",
"description": {
"name": "just_audio",
"sha256": "5abfab1d199e01ab5beffa61b3e782350df5dad036cb8c83b79fa45fc656614e",
"sha256": "d8e8aaf417d33e345299c17f6457f72bd4ba0c549dc34607abb5183a354edc4d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.9.38"
"version": "0.9.40"
},
"just_audio_media_kit": {
"dependency": "direct main",
"description": {
"name": "just_audio_media_kit",
"sha256": "bbecbd43959c230d9f9610df0e0165855e711b4c960ce730c08f31107cc3bd26",
"sha256": "7f57d317fafa04cb3e70b924e8f632ffb7eca7a97a369e1e44738ed89fbd5da1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.4"
"version": "2.0.5"
},
"just_audio_platform_interface": {
"dependency": "transitive",
@ -990,31 +1030,31 @@
"dependency": "transitive",
"description": {
"name": "just_audio_web",
"sha256": "0edb481ad4aa1ff38f8c40f1a3576013c3420bf6669b686fe661627d49bc606c",
"sha256": "b163878529d9b028c53a6972fcd58cae2405bcd11cbfcea620b6fb9f151429d6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.4.11"
"version": "0.4.12"
},
"leak_tracker": {
"dependency": "transitive",
"description": {
"name": "leak_tracker",
"sha256": "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a",
"sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "10.0.4"
"version": "10.0.5"
},
"leak_tracker_flutter_testing": {
"dependency": "transitive",
"description": {
"name": "leak_tracker_flutter_testing",
"sha256": "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8",
"sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.3"
"version": "3.0.5"
},
"leak_tracker_testing": {
"dependency": "transitive",
@ -1080,21 +1120,21 @@
"dependency": "transitive",
"description": {
"name": "material_color_utilities",
"sha256": "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a",
"sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.8.0"
"version": "0.11.1"
},
"media_kit": {
"dependency": "transitive",
"description": {
"name": "media_kit",
"sha256": "3289062540e3b8b9746e5c50d95bd78a9289826b7227e253dff806d002b9e67a",
"sha256": "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.10+1"
"version": "1.1.11"
},
"media_kit_libs_linux": {
"dependency": "direct main",
@ -1121,21 +1161,21 @@
"dependency": "transitive",
"description": {
"name": "meta",
"sha256": "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136",
"sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.12.0"
"version": "1.15.0"
},
"mime": {
"dependency": "transitive",
"description": {
"name": "mime",
"sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2",
"sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.5"
"version": "1.0.6"
},
"mini_music_visualizer": {
"dependency": "direct main",
@ -1151,11 +1191,11 @@
"dependency": "direct dev",
"description": {
"name": "msix",
"sha256": "519b183d15dc9f9c594f247e2d2339d855cf0eaacc30e19b128e14f3ecc62047",
"sha256": "c50d6bd1aafe0d071a3c1e5a5ccb056404502935cb0a549e3178c4aae16caf33",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.16.7"
"version": "3.16.8"
},
"nested": {
"dependency": "transitive",
@ -1171,11 +1211,11 @@
"dependency": "direct main",
"description": {
"name": "octo_image",
"sha256": "45b40f99622f11901238e18d48f5f12ea36426d8eced9f4cbf58479c7aa2430d",
"sha256": "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.0"
"version": "2.1.0"
},
"package_config": {
"dependency": "transitive",
@ -1191,21 +1231,21 @@
"dependency": "direct main",
"description": {
"name": "package_info_plus",
"sha256": "b93d8b4d624b4ea19b0a5a208b2d6eff06004bc3ce74c06040b120eeadd00ce0",
"sha256": "a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "8.0.0"
"version": "8.0.2"
},
"package_info_plus_platform_interface": {
"dependency": "transitive",
"description": {
"name": "package_info_plus_platform_interface",
"sha256": "f49918f3433a3146047372f9d4f1f847511f2acd5cd030e1f44fe5a50036b70e",
"sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.0"
"version": "3.0.1"
},
"palette_generator": {
"dependency": "direct main",
@ -1242,21 +1282,21 @@
"dependency": "direct main",
"description": {
"name": "path_provider",
"sha256": "c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161",
"sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.1.3"
"version": "2.1.4"
},
"path_provider_android": {
"dependency": "transitive",
"description": {
"name": "path_provider_android",
"sha256": "a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d",
"sha256": "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.4"
"version": "2.2.10"
},
"path_provider_foundation": {
"dependency": "transitive",
@ -1292,11 +1332,11 @@
"dependency": "transitive",
"description": {
"name": "path_provider_windows",
"sha256": "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170",
"sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.1"
"version": "2.3.0"
},
"permission_handler": {
"dependency": "direct main",
@ -1312,41 +1352,41 @@
"dependency": "transitive",
"description": {
"name": "permission_handler_android",
"sha256": "8bb852cd759488893805c3161d0b2b5db55db52f773dbb014420b304055ba2c5",
"sha256": "76e4ab092c1b240d31177bb64d2b0bea43f43d0e23541ec866151b9f7b2490fa",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "12.0.6"
"version": "12.0.12"
},
"permission_handler_apple": {
"dependency": "transitive",
"description": {
"name": "permission_handler_apple",
"sha256": "e9ad66020b89ff1b63908f247c2c6f931c6e62699b756ef8b3c4569350cd8662",
"sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "9.4.4"
"version": "9.4.5"
},
"permission_handler_html": {
"dependency": "transitive",
"description": {
"name": "permission_handler_html",
"sha256": "54bf176b90f6eddd4ece307e2c06cf977fb3973719c35a93b85cc7093eb6070d",
"sha256": "af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.1.1"
"version": "0.1.3+2"
},
"permission_handler_platform_interface": {
"dependency": "transitive",
"description": {
"name": "permission_handler_platform_interface",
"sha256": "48d4fcf201a1dad93ee869ab0d4101d084f49136ec82a8a06ed9cfeacab9fd20",
"sha256": "e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.2.1"
"version": "4.2.3"
},
"permission_handler_windows": {
"dependency": "transitive",
@ -1372,11 +1412,11 @@
"dependency": "transitive",
"description": {
"name": "platform",
"sha256": "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec",
"sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.4"
"version": "3.1.5"
},
"plugin_platform_interface": {
"dependency": "transitive",
@ -1422,31 +1462,31 @@
"dependency": "transitive",
"description": {
"name": "pubspec_parse",
"sha256": "c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367",
"sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.3"
"version": "1.3.0"
},
"puppeteer": {
"dependency": "transitive",
"description": {
"name": "puppeteer",
"sha256": "c45c51b4ad8d70acdffeb1cfb9d16b60a7eaab7bfef314dd5b02c3607269b556",
"sha256": "871140cbcc1bcbc6d8e4c2c6ca8fdeed5fae66dfef1efc4c271160a96e0823f9",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.11.0"
"version": "3.14.0"
},
"qs_dart": {
"dependency": "transitive",
"description": {
"name": "qs_dart",
"sha256": "5f1827ccdfa061582c121e7a8fe4a83319fa455bcd1fd6e46ff5b17b57aed680",
"sha256": "8dddeaf1d32fe407e253840b2c25c9ab5bf347d2761d82cb4ce010096565c9ff",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.0"
"version": "1.2.3"
},
"recursive_regex": {
"dependency": "transitive",
@ -1582,11 +1622,11 @@
"dependency": "transitive",
"description": {
"name": "shelf_static",
"sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e",
"sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.2"
"version": "1.1.3"
},
"shelf_web_socket": {
"dependency": "transitive",
@ -1769,11 +1809,11 @@
"dependency": "transitive",
"description": {
"name": "test_api",
"sha256": "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f",
"sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.7.0"
"version": "0.7.2"
},
"time": {
"dependency": "transitive",
@ -1815,6 +1855,16 @@
"source": "hosted",
"version": "1.3.2"
},
"universal_io": {
"dependency": "transitive",
"description": {
"name": "universal_io",
"sha256": "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.2.2"
},
"universal_platform": {
"dependency": "transitive",
"description": {
@ -1825,6 +1875,16 @@
"source": "hosted",
"version": "1.1.0"
},
"upower": {
"dependency": "transitive",
"description": {
"name": "upower",
"sha256": "cf042403154751180affa1d15614db7fa50234bc2373cd21c3db666c38543ebf",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.7.0"
},
"uri_parser": {
"dependency": "transitive",
"description": {
@ -1839,41 +1899,41 @@
"dependency": "direct main",
"description": {
"name": "url_launcher",
"sha256": "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.2.6"
},
"url_launcher_android": {
"dependency": "transitive",
"description": {
"name": "url_launcher_android",
"sha256": "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.2"
},
"url_launcher_ios": {
"dependency": "transitive",
"description": {
"name": "url_launcher_ios",
"sha256": "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89",
"sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.0"
},
"url_launcher_android": {
"dependency": "transitive",
"description": {
"name": "url_launcher_android",
"sha256": "f0c73347dfcfa5b3db8bc06e1502668265d39c08f310c29bff4e28eea9699f79",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.9"
},
"url_launcher_ios": {
"dependency": "transitive",
"description": {
"name": "url_launcher_ios",
"sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.3.1"
},
"url_launcher_linux": {
"dependency": "transitive",
"description": {
"name": "url_launcher_linux",
"sha256": "ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811",
"sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.1"
"version": "3.2.0"
},
"url_launcher_macos": {
"dependency": "transitive",
@ -1899,21 +1959,21 @@
"dependency": "transitive",
"description": {
"name": "url_launcher_web",
"sha256": "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a",
"sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.1"
"version": "2.3.3"
},
"url_launcher_windows": {
"dependency": "transitive",
"description": {
"name": "url_launcher_windows",
"sha256": "ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7",
"sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.1.1"
"version": "3.1.2"
},
"uuid": {
"dependency": "direct main",
@ -1965,15 +2025,45 @@
"source": "hosted",
"version": "2.1.4"
},
"visibility_detector": {
"dependency": "transitive",
"description": {
"name": "visibility_detector",
"sha256": "dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.4.0+2"
},
"vm_service": {
"dependency": "transitive",
"description": {
"name": "vm_service",
"sha256": "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec",
"sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "14.2.1"
"version": "14.2.5"
},
"wakelock_plus": {
"dependency": "direct main",
"description": {
"name": "wakelock_plus",
"sha256": "bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.8"
},
"wakelock_plus_platform_interface": {
"dependency": "transitive",
"description": {
"name": "wakelock_plus_platform_interface",
"sha256": "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.2.1"
},
"watcher": {
"dependency": "transitive",
@ -2019,21 +2109,21 @@
"dependency": "transitive",
"description": {
"name": "win32",
"sha256": "a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4",
"sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "5.5.1"
"version": "5.5.4"
},
"win32_registry": {
"dependency": "transitive",
"description": {
"name": "win32_registry",
"sha256": "10589e0d7f4e053f2c61023a31c9ce01146656a70b7b7f0828c0b46d7da2a9bb",
"sha256": "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.3"
"version": "1.1.4"
},
"window_manager": {
"dependency": "direct main",
@ -2088,6 +2178,6 @@
},
"sdks": {
"dart": ">=3.4.0 <4.0.0",
"flutter": ">=3.19.0"
"flutter": ">=3.22.0"
}
}

View File

@ -1,20 +1,21 @@
{ buildDotnetModule
, darwin
, dotnetCorePackages
, fetchFromGitHub
, fetchpatch
, git
, glibc
, glibcLocales
, lib
, nixosTests
, stdenv
, which
, buildPackages
, runtimeShell
{
buildDotnetModule,
darwin,
dotnetCorePackages,
fetchFromGitHub,
fetchpatch,
git,
glibc,
glibcLocales,
lib,
nixosTests,
stdenv,
which,
buildPackages,
runtimeShell,
# List of Node.js runtimes the package should support
, nodeRuntimes ? [ "node20" ]
, nodejs_20
nodeRuntimes ? [ "node20" ],
nodejs_20,
}:
# Node.js runtimes supported by upstream
@ -22,13 +23,13 @@ assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes;
buildDotnetModule rec {
pname = "github-runner";
version = "2.319.1";
version = "2.320.0";
src = fetchFromGitHub {
owner = "actions";
repo = "runner";
rev = "v${version}";
hash = "sha256-cXOYW4py2RRJVUKrQBGf6LHNyc1sJ/bMR4hJxtDv3PU=";
hash = "sha256-mVi/Z89R2nbxQAyEkpbcaU3Pc3wK6989QojHew9ad4g=";
leaveDotGit = true;
postFetch = ''
git -C $out rev-parse --short HEAD > $out/.git-revision
@ -79,25 +80,24 @@ buildDotnetModule rec {
url = "https://github.com/actions/runner/commit/5ff0ce1.patch";
hash = "sha256-2Vg3cKZK3cE/OcPDZkdN2Ro2WgvduYTTwvNGxwCfXas=";
})
] ++ lib.optionals (nodeRuntimes == [ "node20" ]) [
# If the package is built without Node 16, make Node 20 the default internal version
# https://github.com/actions/runner/pull/2844
(fetchpatch {
name = "internal-node-20.patch";
url = "https://github.com/actions/runner/commit/acdc6ed.patch";
hash = "sha256-3/6yhhJPr9OMWBFc5/NU/DRtn76aTYvjsjQo2u9ZqnU=";
})
];
postPatch = ''
# Ignore changes to src/Runner.Sdk/BuildConstants.cs
substituteInPlace src/dir.proj \
--replace 'git update-index --assume-unchanged ./Runner.Sdk/BuildConstants.cs' \
'true'
'';
postPatch =
''
# Ignore changes to src/Runner.Sdk/BuildConstants.cs
substituteInPlace src/dir.proj \
--replace 'git update-index --assume-unchanged ./Runner.Sdk/BuildConstants.cs' \
'true'
''
+ lib.optionalString (nodeRuntimes == [ "node20" ]) ''
substituteInPlace src/Runner.Common/Util/NodeUtil.cs \
--replace-fail '_defaultNodeVersion = "node16"' '_defaultNodeVersion = "node20"'
'';
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = isNull glibcLocales;
LOCALE_ARCHIVE = lib.optionalString (!DOTNET_SYSTEM_GLOBALIZATION_INVARIANT) "${glibcLocales}/lib/locale/locale-archive";
LOCALE_ARCHIVE = lib.optionalString (
!DOTNET_SYSTEM_GLOBALIZATION_INVARIANT
) "${glibcLocales}/lib/locale/locale-archive";
postConfigure = ''
# Generate src/Runner.Sdk/BuildConstants.cs
@ -110,19 +110,23 @@ buildDotnetModule rec {
src/dir.proj
'';
nativeBuildInputs = [
which
git
] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
darwin.autoSignDarwinBinariesHook
];
nativeBuildInputs =
[
which
git
]
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
darwin.autoSignDarwinBinariesHook
];
buildInputs = [ stdenv.cc.cc.lib ];
dotnet-sdk = dotnetCorePackages.sdk_6_0;
dotnet-runtime = dotnetCorePackages.runtime_6_0;
dotnetFlags = [ "-p:PackageRuntime=${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" ];
dotnetFlags = [
"-p:PackageRuntime=${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}"
];
# As given here: https://github.com/actions/runner/blob/0befa62/src/dir.proj#L33-L41
projectFile = [
@ -209,70 +213,79 @@ buildDotnetModule rec {
testProjectFile = [ "src/Test/Test.csproj" ];
preCheck = ''
mkdir -p _layout/externals
'' + lib.optionalString (lib.elem "node20" nodeRuntimes) ''
ln -s ${nodejs_20} _layout/externals/node20
'';
preCheck =
''
mkdir -p _layout/externals
''
+ lib.optionalString (lib.elem "node20" nodeRuntimes) ''
ln -s ${nodejs_20} _layout/externals/node20
'';
postInstall = ''
mkdir -p $out/bin
postInstall =
''
mkdir -p $out/bin
install -m755 src/Misc/layoutbin/runsvc.sh $out/lib/github-runner
install -m755 src/Misc/layoutbin/RunnerService.js $out/lib/github-runner
install -m755 src/Misc/layoutroot/run.sh $out/lib/github-runner
install -m755 src/Misc/layoutroot/run-helper.sh.template $out/lib/github-runner/run-helper.sh
install -m755 src/Misc/layoutroot/config.sh $out/lib/github-runner
install -m755 src/Misc/layoutroot/env.sh $out/lib/github-runner
install -m755 src/Misc/layoutbin/runsvc.sh $out/lib/github-runner
install -m755 src/Misc/layoutbin/RunnerService.js $out/lib/github-runner
install -m755 src/Misc/layoutroot/run.sh $out/lib/github-runner
install -m755 src/Misc/layoutroot/run-helper.sh.template $out/lib/github-runner/run-helper.sh
install -m755 src/Misc/layoutroot/config.sh $out/lib/github-runner
install -m755 src/Misc/layoutroot/env.sh $out/lib/github-runner
# env.sh is patched to not require any wrapping
ln -sr "$out/lib/github-runner/env.sh" "$out/bin/"
# env.sh is patched to not require any wrapping
ln -sr "$out/lib/github-runner/env.sh" "$out/bin/"
substituteInPlace $out/lib/github-runner/config.sh \
--replace './bin/Runner.Listener' "$out/bin/Runner.Listener"
'' + lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace $out/lib/github-runner/config.sh \
--replace 'command -v ldd' 'command -v ${glibc.bin}/bin/ldd' \
--replace 'ldd ./bin' '${glibc.bin}/bin/ldd ${dotnet-runtime}/shared/Microsoft.NETCore.App/${dotnet-runtime.version}/' \
--replace '/sbin/ldconfig' '${glibc.bin}/bin/ldconfig'
'' + ''
# Remove uneeded copy for run-helper template
substituteInPlace $out/lib/github-runner/run.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' '
substituteInPlace $out/lib/github-runner/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/'
substituteInPlace $out/lib/github-runner/config.sh \
--replace './bin/Runner.Listener' "$out/bin/Runner.Listener"
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace $out/lib/github-runner/config.sh \
--replace 'command -v ldd' 'command -v ${glibc.bin}/bin/ldd' \
--replace 'ldd ./bin' '${glibc.bin}/bin/ldd ${dotnet-runtime}/shared/Microsoft.NETCore.App/${dotnet-runtime.version}/' \
--replace '/sbin/ldconfig' '${glibc.bin}/bin/ldconfig'
''
+ ''
# Remove uneeded copy for run-helper template
substituteInPlace $out/lib/github-runner/run.sh --replace 'cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh' ' '
substituteInPlace $out/lib/github-runner/run-helper.sh --replace '"$DIR"/bin/' '"$DIR"/'
# Make paths absolute
substituteInPlace $out/lib/github-runner/runsvc.sh \
--replace './externals' "$out/lib/externals" \
--replace './bin/RunnerService.js' "$out/lib/github-runner/RunnerService.js"
# Make paths absolute
substituteInPlace $out/lib/github-runner/runsvc.sh \
--replace './externals' "$out/lib/externals" \
--replace './bin/RunnerService.js' "$out/lib/github-runner/RunnerService.js"
# The upstream package includes Node and expects it at the path
# externals/node$version. As opposed to the official releases, we don't
# link the Alpine Node flavors.
mkdir -p $out/lib/externals
'' + lib.optionalString (lib.elem "node20" nodeRuntimes) ''
ln -s ${nodejs_20} $out/lib/externals/node20
'' + ''
# Install Nodejs scripts called from workflows
install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js
mkdir -p $out/lib/github-runner/checkScripts
install src/Misc/layoutbin/checkScripts/* $out/lib/github-runner/checkScripts/
'' + lib.optionalString stdenv.hostPlatform.isLinux ''
# Wrap explicitly to, e.g., prevent extra entries for LD_LIBRARY_PATH
makeWrapperArgs=()
# The upstream package includes Node and expects it at the path
# externals/node$version. As opposed to the official releases, we don't
# link the Alpine Node flavors.
mkdir -p $out/lib/externals
''
+ lib.optionalString (lib.elem "node20" nodeRuntimes) ''
ln -s ${nodejs_20} $out/lib/externals/node20
''
+ ''
# Install Nodejs scripts called from workflows
install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js
mkdir -p $out/lib/github-runner/checkScripts
install src/Misc/layoutbin/checkScripts/* $out/lib/github-runner/checkScripts/
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
# Wrap explicitly to, e.g., prevent extra entries for LD_LIBRARY_PATH
makeWrapperArgs=()
# We don't wrap with libicu
substituteInPlace $out/lib/github-runner/config.sh \
--replace '$LDCONFIG_COMMAND -NXv ''${libpath//:/ }' 'echo libicu'
'' + ''
# XXX: Using the corresponding Nix argument does not work as expected:
# https://github.com/NixOS/nixpkgs/issues/218449
# Common wrapper args for `executables`
makeWrapperArgs+=(
--run 'export RUNNER_ROOT="''${RUNNER_ROOT:-"$HOME/.github-runner"}"'
--run 'mkdir -p "$RUNNER_ROOT"'
--chdir "$out"
)
'';
# We don't wrap with libicu
substituteInPlace $out/lib/github-runner/config.sh \
--replace '$LDCONFIG_COMMAND -NXv ''${libpath//:/ }' 'echo libicu'
''
+ ''
# XXX: Using the corresponding Nix argument does not work as expected:
# https://github.com/NixOS/nixpkgs/issues/218449
# Common wrapper args for `executables`
makeWrapperArgs+=(
--run 'export RUNNER_ROOT="''${RUNNER_ROOT:-"$HOME/.github-runner"}"'
--run 'mkdir -p "$RUNNER_ROOT"'
--chdir "$out"
)
'';
# List of files to wrap
executables = [
@ -318,8 +331,18 @@ buildDotnetModule rec {
description = "Self-hosted runner for GitHub Actions";
homepage = "https://github.com/actions/runner";
license = licenses.mit;
maintainers = with maintainers; [ veehaitch kfollesdal aanderse zimbatm ];
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
maintainers = with maintainers; [
veehaitch
kfollesdal
aanderse
zimbatm
];
platforms = [
"x86_64-linux"
"aarch64-linux"
"x86_64-darwin"
"aarch64-darwin"
];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
};
}

View File

@ -1,6 +1,6 @@
--- a/libgnucash/app-utils/gnc-quotes.cpp 2023-09-23 07:04:21.000000000 +0900
+++ b/libgnucash/app-utils/gnc-quotes.cpp 2023-09-25 11:58:46.482696433 +0900
@@ -125,7 +125,6 @@
--- a/libgnucash/app-utils/gnc-quotes.cpp 2023-09-23 07:04:21.000000000 +0900
+++ b/libgnucash/app-utils/gnc-quotes.cpp 2023-09-25 11:58:46.482696433 +0900
@@ -129,7 +129,6 @@
class GncFQQuoteSource final : public GncQuoteSource
{
@ -8,12 +8,12 @@
std::string c_fq_wrapper;
std::string m_version;
StrVec m_sources;
@@ -148,13 +147,12 @@
@@ -152,13 +151,12 @@
static const std::string empty_string{};
GncFQQuoteSource::GncFQQuoteSource() :
-c_cmd{bp::search_path("perl")},
m_version{}, m_sources{}, m_api_key{}
m_version{}, m_sources{}, m_env{boost::this_process::environment()}
{
char *bindir = gnc_path_get_bindir();
c_fq_wrapper = std::string(bindir) + "/finance-quote-wrapper";
@ -23,7 +23,7 @@
auto [rv, sources, errors] = run_cmd(args, empty_string);
if (rv)
{
@@ -200,7 +198,7 @@
@@ -192,7 +190,7 @@
QuoteResult
GncFQQuoteSource::get_quotes(const std::string& json_str) const
{
@ -32,21 +32,12 @@
return run_cmd(args, json_str);
}
@@ -218,7 +216,7 @@
@@ -209,7 +207,7 @@
auto input_buf = bp::buffer (json_string);
bp::child process;
if (m_api_key.empty())
- process = bp::child(c_cmd, args,
+ process = bp::child(c_fq_wrapper, args,
bp::std_out > out_buf,
bp::std_err > err_buf,
bp::std_in < input_buf,
@@ -227,7 +225,7 @@
#endif
svc);
else
- process = bp::child(c_cmd, args,
+ process = bp::child(c_fq_wrapper, args,
bp::std_out > out_buf,
bp::std_err > err_buf,
bp::std_in < input_buf,
- process = bp::child(c_cmd, args,
+ process = bp::child(c_fq_wrapper, args,
bp::std_out > out_buf,
bp::std_err > err_buf,
bp::std_in < input_buf,

View File

@ -1,11 +0,0 @@
--- a/libgnucash/engine/test/CMakeLists.txt 2024-02-23 09:05:19.000000000 +0900
+++ b/libgnucash/engine/test/CMakeLists.txt 2024-05-08 22:08:04.572060359 +0900
@@ -57,7 +57,6 @@
add_engine_test(test-account-object test-account-object.cpp)
add_engine_test(test-group-vs-book test-group-vs-book.cpp)
-add_engine_test(test-lots test-lots.cpp)
add_engine_test(test-querynew test-querynew.c)
add_engine_test(test-query test-query.cpp)
add_engine_test(test-split-vs-account test-split-vs-account.cpp)

View File

@ -2,6 +2,7 @@
, stdenv
, fetchFromGitHub
, fetchurl
, fetchpatch2
, aqbanking
, boost
, cmake
@ -27,12 +28,12 @@
stdenv.mkDerivation rec {
pname = "gnucash";
version = "5.8";
version = "5.9";
# raw source code doesn't work out of box; fetchFromGitHub not usable
src = fetchurl {
url = "https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}.tar.bz2";
hash = "sha256-osgj+3ALnUWYaS7IE5SVm944jY7xke/k6iwCQmu1JZM=";
hash = "sha256-W+LlNk/DZGT8Msdo4qtGCmMPdNtq631EJm49q5giL9A=";
};
nativeBuildInputs = [
@ -75,9 +76,12 @@ stdenv.mkDerivation rec {
./0003-remove-valgrind.patch
# this patch makes gnucash exec the Finance::Quote wrapper directly
./0004-exec-fq-wrapper.patch
# this patch disables a flaky test
# see https://bugs.gnucash.org/show_bug.cgi?id=799289
./0005-disable-test-lots.patch
# this patch fixes gnucah-cli -Q dump, remove on next release
(fetchpatch2 {
name = "0005-fix-quote-report.patch";
url = "https://github.com/Gnucash/gnucash/commit/711554ecd5505004aee4808519d9d8e4e4ed7c9a.patch?full_index=1";
hash = "sha256-uRaUdSJu2LnYVp/3DqrK0rTnCpr7oZRtrgTPbKAHThk=";
})
];
# this needs to be an environment variable and not a cmake flag to suppress
@ -101,7 +105,7 @@ stdenv.mkDerivation rec {
owner = "Gnucash";
repo = "gnucash-docs";
rev = version;
hash = "sha256-3b1Nue3eEefDi4WI+o3ATfrsQ+H/I+QwTr4Nuc9J7Zg=";
hash = "sha256-uXpIAsucVUaAlqYTKfrfBg04Kb5Mza67l0ZU6fxkSUY=";
};
nativeBuildInputs = [ cmake ];

View File

@ -1,16 +1,18 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule {
buildGoModule rec {
pname = "gokey";
version = "0.1.2-unstable-2023-11-16";
version = "0.1.3";
patches = [ ./version.patch ];
src = fetchFromGitHub {
owner = "cloudflare";
repo = "gokey";
rev = "26fcef24d123e0eaf7b92224e6880f529f94aa9f";
hash = "sha256-nt4fO8NKYfRkpoC1z8zDrEZC7+fo6sU/ZOHCMHIAT58=";
rev = "refs/tags/v${version}";
hash = "sha256-pvtRSWq/vXlyUShb61aiDlis9AiQnrA2PWycr1Zw0og=";
};
vendorHash = "sha256-ZDCoRE2oP8ANsu7jfLm3BMLzXdsq1dhsEigvwWgKk54=";
vendorHash = "sha256-qlP2tI6QQMjxP59zaXgx4mX9IWSrOKWmme717wDaUEc=";
meta = with lib; {
homepage = "https://github.com/cloudflare/gokey";

View File

@ -0,0 +1,15 @@
diff --git a/go.mod b/go.mod
index 50b6806..f23b2ec 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,9 @@
module github.com/cloudflare/gokey
-go 1.13
+go 1.17
require (
golang.org/x/crypto v0.17.0
golang.org/x/term v0.15.0
+ golang.org/x/sys v0.15.0
)

View File

@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hyprutils";
version = "0.2.2";
version = "0.2.3";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprutils";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-PNnIpwGqpTvMU3N2r0wMQwK1E+t4Bb5fbJwblQvr+80=";
hash = "sha256-9gsVvcxW9bM3HMcnHHK+vYHOzXb1ODFqN+sJ4zIRsAU=";
};
nativeBuildInputs = [

File diff suppressed because it is too large Load Diff

View File

@ -24,13 +24,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "keyguard";
version = "1.6.0";
version = "1.6.1";
src = fetchFromGitHub {
owner = "AChep";
repo = "keyguard-app";
rev = "16e02dee823184058d43a706ed6a34d03e29680b";
hash = "sha256-jiQnLMGUdM2UcW4c/zz2XqEVix5B68wEvpPtVAnVfEI=";
rev = "25b505f7679e40bd42f5ff59218deb0f2aac2083";
hash = "sha256-+WXeHcILukCheUzD59ffP+eMLXF8T5qm3NWNUugWIqg=";
};
inherit gradleBuildTask gradleUpdateTask;

View File

@ -1,23 +1,24 @@
{ stdenv
, lib
, fetchFromGitHub
, unstableGitUpdater
, nixosTests
, cmake
, pkg-config
, mir
, libxkbcommon
{
stdenv,
lib,
fetchFromGitHub,
gitUpdater,
nixosTests,
cmake,
pkg-config,
mir,
libxkbcommon,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "miriway";
version = "0-unstable-2024-08-31";
version = "24.09";
src = fetchFromGitHub {
owner = "Miriway";
repo = "Miriway";
rev = "2d754931f038865bd91938578b862262f0ce7c00";
hash = "sha256-wmtAbajZ859tvLjKuwqFUq05VGLxHNJX1XyIXM6vvgU=";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-/0txc9ynC3rj9tbHwYNlDe2C1DlmjoE2Q2/uoBz2GFg=";
};
strictDeps = true;
@ -33,14 +34,14 @@ stdenv.mkDerivation (finalAttrs: {
];
passthru = {
updateScript = unstableGitUpdater { };
updateScript = gitUpdater { rev-prefix = "v"; };
providedSessions = [ "miriway" ];
tests = {
inherit (nixosTests) miriway;
};
};
meta = with lib; {
meta = {
description = "Mir based Wayland compositor";
longDescription = ''
Miriway is a starting point for creating a Wayland based desktop environment using Mir.
@ -64,8 +65,9 @@ stdenv.mkDerivation (finalAttrs: {
enabling these in miriway-shell.config.
'';
homepage = "https://github.com/Miriway/Miriway";
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = with maintainers; [ OPNA2608 ];
license = lib.licenses.gpl3Only;
platforms = lib.platforms.linux;
mainProgram = "miriway";
maintainers = with lib.maintainers; [ OPNA2608 ];
};
})

View File

@ -13,14 +13,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "newsraft";
version = "0.25";
version = "0.27";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "newsraft";
repo = "newsraft";
rev = "newsraft-${finalAttrs.version}";
hash = "sha256-hRWhjv/uCL3w0BUzYho3luCeZPyDsXqxnhx1wMovHY0=";
hash = "sha256-MtdFnoB6Dc3xvTCc2PMIp5VsZiU5JE58q6WctM3mDZw=";
};
nativeBuildInputs = [ pkg-config ];

View File

@ -11,13 +11,13 @@
buildGoModule rec {
pname = "powerpipe";
version = "0.4.3";
version = "0.4.4";
src = fetchFromGitHub {
owner = "turbot";
repo = "powerpipe";
rev = "refs/tags/v${version}";
hash = "sha256-WrjdxLlDvC+rq3bJ0U8pqSJvfqH9Y54BOoWUfb5pMho=";
hash = "sha256-B88Kc4cCadsyN/sx3TimFX3ad6WZqn/Qaw39ms8b+HE=";
};
vendorHash = "sha256-zBwk03aEjWs+CfbIZh0g7absKc5+SNLTVhrctuTpjMk=";

View File

@ -1,5 +1,5 @@
diff --git a/mk b/mk
index a5baa0f8..37cac28e 100755
index a5baa0f..4ed2350 100644
--- a/mk
+++ b/mk
@@ -25,7 +25,7 @@ const rm = (x) => {
@ -22,13 +22,40 @@ index a5baa0f8..37cac28e 100755
},
};
wf('_/version.js', `D=${JSON.stringify(vi)}`);
@@ -50,6 +50,9 @@ const incl = new RegExp('^$'
+ '|^/style($|/(fonts|img)|.*\\.css$)');
@@ -51,8 +51,7 @@ const incl = new RegExp('^$'
const pkg = (x, y, f) => {
rq('electron-packager')({
+ asar: true,
+ electronZipDir: "local-cache",
+ electronVersion: "@electron_version@",
dir: '.',
platform: x,
arch: y,
- platform: x,
- arch: y,
+ asar: true,
tmpdir: '/tmp/ridebuild',
out: `_/${pj.name}`,
overwrite: true,
@@ -79,8 +78,8 @@ const pkg = (x, y, f) => {
ProductName: 'RIDE',
InternalName: 'RIDE',
},
- }).then(() => {
- const d = `_/${pj.name}/${pj.productName}-${x}-${y}`;
+ }).then(paths => {
+ const d = paths[0];
rm(`${d}/version`);
fs.existsSync(`${d}/LICENSE`) && mv(`${d}/LICENSE`, `${d}/LICENSE.electron`);
generateLicenses(`${d}/ThirdPartyNotices.txt`);
@@ -88,6 +87,7 @@ const pkg = (x, y, f) => {
}, e => f(e));
};
+const self = (f) => { b(e => (e ? f(e) : pkg(undefined, undefined, f))); };
const l = (f) => { b(e => (e ? f(e) : pkg('linux', 'x64', f))); };
const w = (f) => { b(e => (e ? f(e) : pkg('win32', 'ia32', f))); };
const o = (f) => { b(e => (e ? f(e) : pkg('darwin', 'x64', f))); };
@@ -109,6 +109,7 @@ tasks.ma=ma; tasks.masarm = ma;
tasks.a = a; tasks.arm = a;
tasks.d = d; tasks.dist = d;
tasks.c = c; tasks.clean = c;
+tasks.self = self;
async.each(
process.argv.length > 2 ? process.argv.slice(2) : ['build'],

View File

@ -4,7 +4,7 @@
buildNpmPackage,
fetchFromGitHub,
fetchpatch,
substituteAll,
replaceVars,
jq,
moreutils,
zip,
@ -15,24 +15,6 @@
cctools,
}:
let
platformInfos = {
"x86_64-linux" = {
zipSuffix = "linux-x64";
buildCmd = "linux";
};
"x86_64-darwin" = {
zipSuffix = "darwin-x64";
buildCmd = "osx";
};
"aarch64-darwin" = {
zipSuffix = "darwin-arm64";
buildCmd = "osxarm";
};
};
platformInfo = platformInfos.${stdenv.system};
in
buildNpmPackage rec {
pname = "ride";
version = "4.5.4097";
@ -40,7 +22,7 @@ buildNpmPackage rec {
src = fetchFromGitHub {
owner = "Dyalog";
repo = "ride";
rev = "v${version}";
rev = "refs/tags/v${version}";
hash = "sha256-xR+HVC1JVrPkgPhIJZxdTVG52+QbanmD1c/uO5l84oc=";
};
@ -53,11 +35,10 @@ buildNpmPackage rec {
url = "https://github.com/Dyalog/ride/commit/de42ebbd5036cfe0c7e6604296e87cc57ac9d365.patch";
hash = "sha256-5iKSNcxOOo2fKNvy3Rv+AlH3psYhLWLWUY0l8M6mAD4=";
})
# Fix info in the "about" page, set electron version, set local-cache as zipdir
(substituteAll {
src = ./mk.patch;
version = version;
electron_version = electron.version;
# Fix info in the "about" page, enable asar, add option to build for the detected system
(replaceVars ./mk.patch {
inherit version;
})
];
@ -89,7 +70,7 @@ buildNpmPackage rec {
zip
makeWrapper
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ]
++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ];
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
@ -99,20 +80,23 @@ buildNpmPackage rec {
stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0"
) "-D_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION=1";
npmBuildFlags = platformInfo.buildCmd;
# our patch adds the platform detecting build option
npmBuildFlags = "self";
# This package uses electron-packager instead of electron-builder
# Here, we create a local cache of electron zip-files, so electron-packager can copy from it
postConfigure = ''
mkdir local-cache
# electron files need to be writable on Darwin
cp -r ${electron.dist} electron-dist
chmod -R u+w electron-dist
pushd electron-dist
zip -qr ../local-cache/electron-v${electron.version}-${platformInfo.zipSuffix}.zip *
zip -0Xqr ../electron.zip *
popd
rm -r electron-dist
# force electron-packager to use our electron instead of downloading it, even if it is a different version
substituteInPlace node_modules/electron-packager/src/index.js \
--replace-fail 'await this.getElectronZipPath(downloadOpts)' '"electron.zip"'
'';
installPhase = ''
@ -122,13 +106,13 @@ buildNpmPackage rec {
install -Dm644 ThirdPartyNotices.txt -t $out/share/doc/ride
${lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
${lib.optionalString stdenv.hostPlatform.isLinux ''
install -Dm644 $src/D.png $out/share/icons/hicolor/64x64/apps/ride.png
install -Dm644 $src/D.svg $out/share/icons/hicolor/scalable/apps/ride.svg
mkdir -p $out/share/ride
cp -r locales resources{,.pak} $out/share/ride
makeWrapper ${lib.getExe electron} $out/bin/ride \
makeShellWrapper ${lib.getExe electron} $out/bin/ride \
--add-flags $out/share/ride/resources/app.asar \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
--inherit-argv0
@ -161,7 +145,7 @@ buildNpmPackage rec {
];
meta = {
changelog = "https://github.com/Dyalog/ride/releases/tag/${src.rev}";
changelog = "https://github.com/Dyalog/ride/releases/tag/v${version}";
description = "Remote IDE for Dyalog APL";
homepage = "https://github.com/Dyalog/ride";
license = lib.licenses.mit;
@ -170,6 +154,6 @@ buildNpmPackage rec {
tomasajt
markus1189
];
platforms = lib.attrNames platformInfos;
platforms = electron.meta.platforms;
};
}

View File

@ -32,7 +32,7 @@
(fetchNuGet { pname = "Microsoft.CodeAnalysis.PublicApiAnalyzers"; version = "3.11.0-beta1.24081.1"; hash = "sha256-nXx0MSYXVzdr0jcNo9aZLocZU1ywN+n/vdD2kYBh5TI="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/3.11.0-beta1.24081.1/microsoft.codeanalysis.publicapianalyzers.3.11.0-beta1.24081.1.nupkg"; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.csharp/4.7.0/microsoft.csharp.4.7.0.nupkg"; })
(fetchNuGet { pname = "Microsoft.DiaSymReader"; version = "2.0.0"; hash = "sha256-8hotZmh8Rb6Q6oD9Meb74SvAdbDo39Y/1m8h43HHjjw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diasymreader/2.0.0/microsoft.diasymreader.2.0.0.nupkg"; })
(fetchNuGet { pname = "Microsoft.DotNet.Arcade.Sdk"; version = "9.0.0-beta.24416.2"; hash = "sha256-MMfwLKBLTEtaNt896ueqH50zb/XyeXqpGJAC0O8yifw="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.24416.2/microsoft.dotnet.arcade.sdk.9.0.0-beta.24416.2.nupkg"; })
(fetchNuGet { pname = "Microsoft.DotNet.Arcade.Sdk"; version = "9.0.0-beta.24459.6"; hash = "sha256-XuqUYxeGP0Wj9ExlKuOc3OwpVGAlDxrJ7Mip2IiT35c="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.24459.6/microsoft.dotnet.arcade.sdk.9.0.0-beta.24459.6.nupkg"; })
(fetchNuGet { pname = "Microsoft.DotNet.XliffTasks"; version = "9.0.0-beta.24076.5"; hash = "sha256-5cREL85PwcDwo4yyc2Eh908HQ/Cm36w9uZSIvVELZH0="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.24076.5/microsoft.dotnet.xlifftasks.9.0.0-beta.24076.5.nupkg"; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration/8.0.0/microsoft.extensions.configuration.8.0.0.nupkg"; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration.abstractions/8.0.0/microsoft.extensions.configuration.abstractions.8.0.0.nupkg"; })

View File

@ -27,18 +27,18 @@ in
buildDotnetModule rec {
inherit pname dotnet-sdk dotnet-runtime;
vsVersion = "2.45.17";
vsVersion = "2.49.25";
src = fetchFromGitHub {
owner = "dotnet";
repo = "roslyn";
rev = "VSCode-CSharp-${vsVersion}";
hash = "sha256-5u+5UkcWn5XKxhbAbZeUBWBAI4B1nuZFP4qDF4cHerU=";
hash = "sha256-1amL+K6gf7qJtODxyBtaswhJSLbMrl2LqpmLAArNpW0=";
};
# versioned independently from vscode-csharp
# "roslyn" in here:
# https://github.com/dotnet/vscode-csharp/blob/main/package.json
version = "4.12.0-2.24422.6";
version = "4.12.0-3.24470.4";
projectFile = "src/LanguageServer/${project}/${project}.csproj";
useDotnetFromEnv = true;
nugetDeps = ./deps.nix;

View File

@ -5,7 +5,7 @@
p7zip,
}:
let
version = "1.020";
version = "1.021";
source =
with lib.attrsets;
@ -18,10 +18,10 @@ let
})
)
{
Mono = "sha256-PcP4zJk8pptuX9tchr4qOorqAvj8YMRBcVrtCbp/1Zo=";
Round = "sha256-3wqMdnpdn4xpw7wO+QmIpl5/vZjQGgcfTMdtewK28B8=";
Sans = "sha256-isRqIVcH24knPqPI+a+9CpxEKd+PG642giUS9+VbC60=";
Serif = "sha256-k0I0NXStE1hcdOaOykuESy6sYqBHHaMaDxxr3tJUSYU=";
Mono = "sha256-3WwknXSMH12Lu/HA/f647AyhDg2O9Eg5ZGDBrFp4SbE=";
Round = "sha256-vRL2YQkcp5vDSbLaMDEYd7HJVohZFYKlBfxAdY2l3mA=";
Sans = "sha256-x5z6GYsfQ+8a8W0djJTY8iutuLNYvaemIpdYh94krk0=";
Serif = "sha256-3WK7vty3zZFNKkwViEsozU3qa+5hymYwXk6ta9AxmNM=";
};
in
stdenvNoCC.mkDerivation {

View File

@ -1,2 +0,0 @@
source 'https://rubygems.org'
gem 'shopify-cli', '2.35.0'

View File

@ -1,40 +0,0 @@
GEM
remote: https://rubygems.org/
specs:
ast (2.4.2)
bugsnag (6.27.1)
concurrent-ruby (~> 1.0)
concurrent-ruby (1.3.3)
ffi (1.17.0)
liquid (5.5.0)
listen (3.7.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mini_portile2 (2.8.7)
nokogiri (1.16.6)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
parser (3.3.3.0)
ast (~> 2.4.1)
racc
racc (1.8.0)
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
shopify-cli (2.35.0)
bugsnag (~> 6.22)
listen (~> 3.7.0)
theme-check (~> 1.14.0)
theme-check (1.14.0)
liquid (>= 5.4.0)
nokogiri (>= 1.12)
parser (~> 3)
PLATFORMS
ruby
DEPENDENCIES
shopify-cli (= 2.35.0)
BUNDLED WITH
2.3.27

View File

@ -1,149 +0,0 @@
{
ast = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
type = "gem";
};
version = "2.4.2";
};
bugsnag = {
dependencies = ["concurrent-ruby"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09bz3sahhv5ngnfmms8z4lbbssk558wykzvvvacysvkc20zffacn";
type = "gem";
};
version = "6.27.1";
};
concurrent-ruby = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g";
type = "gem";
};
version = "1.3.3";
};
ffi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
type = "gem";
};
version = "1.17.0";
};
liquid = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0f4fn62ba8ivabwcpa0fpg6yi1j3z7fdskb57v8zfaacg8gmky5k";
type = "gem";
};
version = "5.5.0";
};
listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0agybr37wpjv3xy4ipcmsvsibgdgphzrwbvcj4vfiykpmakwm01v";
type = "gem";
};
version = "3.7.1";
};
mini_portile2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk";
type = "gem";
};
version = "2.8.7";
};
nokogiri = {
dependencies = ["mini_portile2" "racc"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk";
type = "gem";
};
version = "1.16.6";
};
parser = {
dependencies = ["ast" "racc"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sryynf3iws1b2ffba1gvmlpf8jzhfva5p0qdf37x6wdj683rqm2";
type = "gem";
};
version = "3.3.3.0";
};
racc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09";
type = "gem";
};
version = "1.8.0";
};
rb-fsevent = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423";
type = "gem";
};
version = "0.11.2";
};
rb-inotify = {
dependencies = ["ffi"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vmy8xgahixcz6hzwy4zdcyn2y6d6ri8dqv5xccgzc1r292019x0";
type = "gem";
};
version = "0.11.1";
};
shopify-cli = {
dependencies = ["bugsnag" "listen" "theme-check"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1krlrds1fawlavk05a5ydibndxmg33f17sm2qrccji0rm434qdxx";
type = "gem";
};
version = "2.35.0";
};
theme-check = {
dependencies = ["liquid" "nokogiri" "parser"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1w5mmxnyc0h612c04x6h3xb8jjcq5l6mh2vql4138h2r2z98vdwq";
type = "gem";
};
version = "1.14.0";
};
}

View File

@ -1,14 +1,14 @@
{
"name": "shopify",
"version": "3.63.2",
"version": "3.67.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "shopify",
"version": "3.63.2",
"version": "3.67.1",
"dependencies": {
"@shopify/cli": "3.63.2"
"@shopify/cli": "3.67.1"
},
"bin": {
"shopify": "node_modules/@shopify/cli/bin/run.js"
@ -18,6 +18,7 @@
"version": "0.11.0",
"resolved": "https://registry.npmjs.org/@ast-grep/napi/-/napi-0.11.0.tgz",
"integrity": "sha512-b+R8h20+ClsYZBJqcyguLy4THfGmg2a54HgfZ0a1vdCkfe9ftjblALiZf2DsOc0+Si8BDWd09TMNn2psUuibJA==",
"license": "MIT",
"engines": {
"node": ">= 10"
},
@ -37,6 +38,7 @@
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"darwin"
@ -52,6 +54,7 @@
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"darwin"
@ -67,6 +70,7 @@
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
@ -82,6 +86,7 @@
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"win32"
@ -97,6 +102,7 @@
"cpu": [
"ia32"
],
"license": "MIT",
"optional": true,
"os": [
"win32"
@ -112,6 +118,7 @@
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"win32"
@ -127,6 +134,7 @@
"cpu": [
"arm"
],
"license": "MIT",
"optional": true,
"os": [
"android"
@ -142,6 +150,7 @@
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"android"
@ -157,6 +166,7 @@
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"android"
@ -172,6 +182,7 @@
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"darwin"
@ -187,6 +198,7 @@
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"darwin"
@ -202,6 +214,7 @@
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"freebsd"
@ -217,6 +230,7 @@
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"freebsd"
@ -232,6 +246,7 @@
"cpu": [
"arm"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
@ -247,6 +262,7 @@
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
@ -262,6 +278,7 @@
"cpu": [
"ia32"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
@ -277,6 +294,7 @@
"cpu": [
"loong64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
@ -292,6 +310,7 @@
"cpu": [
"mips64el"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
@ -307,6 +326,7 @@
"cpu": [
"ppc64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
@ -322,6 +342,7 @@
"cpu": [
"riscv64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
@ -337,6 +358,7 @@
"cpu": [
"s390x"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
@ -352,6 +374,7 @@
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
@ -367,6 +390,7 @@
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"netbsd"
@ -382,6 +406,7 @@
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"openbsd"
@ -397,6 +422,7 @@
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"sunos"
@ -412,6 +438,7 @@
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"win32"
@ -427,6 +454,7 @@
"cpu": [
"ia32"
],
"license": "MIT",
"optional": true,
"os": [
"win32"
@ -442,6 +470,7 @@
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"win32"
@ -450,271 +479,11 @@
"node": ">=12"
}
},
"node_modules/@parcel/watcher": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.4.1.tgz",
"integrity": "sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==",
"optional": true,
"dependencies": {
"detect-libc": "^1.0.3",
"is-glob": "^4.0.3",
"micromatch": "^4.0.5",
"node-addon-api": "^7.0.0"
},
"engines": {
"node": ">= 10.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
},
"optionalDependencies": {
"@parcel/watcher-android-arm64": "2.4.1",
"@parcel/watcher-darwin-arm64": "2.4.1",
"@parcel/watcher-darwin-x64": "2.4.1",
"@parcel/watcher-freebsd-x64": "2.4.1",
"@parcel/watcher-linux-arm-glibc": "2.4.1",
"@parcel/watcher-linux-arm64-glibc": "2.4.1",
"@parcel/watcher-linux-arm64-musl": "2.4.1",
"@parcel/watcher-linux-x64-glibc": "2.4.1",
"@parcel/watcher-linux-x64-musl": "2.4.1",
"@parcel/watcher-win32-arm64": "2.4.1",
"@parcel/watcher-win32-ia32": "2.4.1",
"@parcel/watcher-win32-x64": "2.4.1"
}
},
"node_modules/@parcel/watcher-android-arm64": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.4.1.tgz",
"integrity": "sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg==",
"cpu": [
"arm64"
],
"optional": true,
"os": [
"android"
],
"engines": {
"node": ">= 10.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
"node_modules/@parcel/watcher-darwin-arm64": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.4.1.tgz",
"integrity": "sha512-ln41eihm5YXIY043vBrrHfn94SIBlqOWmoROhsMVTSXGh0QahKGy77tfEywQ7v3NywyxBBkGIfrWRHm0hsKtzA==",
"cpu": [
"arm64"
],
"optional": true,
"os": [
"darwin"
],
"engines": {
"node": ">= 10.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
"node_modules/@parcel/watcher-darwin-x64": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.4.1.tgz",
"integrity": "sha512-yrw81BRLjjtHyDu7J61oPuSoeYWR3lDElcPGJyOvIXmor6DEo7/G2u1o7I38cwlcoBHQFULqF6nesIX3tsEXMg==",
"cpu": [
"x64"
],
"optional": true,
"os": [
"darwin"
],
"engines": {
"node": ">= 10.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
"node_modules/@parcel/watcher-freebsd-x64": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.4.1.tgz",
"integrity": "sha512-TJa3Pex/gX3CWIx/Co8k+ykNdDCLx+TuZj3f3h7eOjgpdKM+Mnix37RYsYU4LHhiYJz3DK5nFCCra81p6g050w==",
"cpu": [
"x64"
],
"optional": true,
"os": [
"freebsd"
],
"engines": {
"node": ">= 10.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
"node_modules/@parcel/watcher-linux-arm-glibc": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.4.1.tgz",
"integrity": "sha512-4rVYDlsMEYfa537BRXxJ5UF4ddNwnr2/1O4MHM5PjI9cvV2qymvhwZSFgXqbS8YoTk5i/JR0L0JDs69BUn45YA==",
"cpu": [
"arm"
],
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">= 10.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
"node_modules/@parcel/watcher-linux-arm64-glibc": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.4.1.tgz",
"integrity": "sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==",
"cpu": [
"arm64"
],
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">= 10.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
"node_modules/@parcel/watcher-linux-arm64-musl": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.4.1.tgz",
"integrity": "sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==",
"cpu": [
"arm64"
],
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">= 10.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
"node_modules/@parcel/watcher-linux-x64-glibc": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.4.1.tgz",
"integrity": "sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==",
"cpu": [
"x64"
],
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">= 10.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
"node_modules/@parcel/watcher-linux-x64-musl": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.4.1.tgz",
"integrity": "sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==",
"cpu": [
"x64"
],
"optional": true,
"os": [
"linux"
],
"engines": {
"node": ">= 10.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
"node_modules/@parcel/watcher-win32-arm64": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.4.1.tgz",
"integrity": "sha512-Uq2BPp5GWhrq/lcuItCHoqxjULU1QYEcyjSO5jqqOK8RNFDBQnenMMx4gAl3v8GiWa59E9+uDM7yZ6LxwUIfRg==",
"cpu": [
"arm64"
],
"optional": true,
"os": [
"win32"
],
"engines": {
"node": ">= 10.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
"node_modules/@parcel/watcher-win32-ia32": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.4.1.tgz",
"integrity": "sha512-maNRit5QQV2kgHFSYwftmPBxiuK5u4DXjbXx7q6eKjq5dsLXZ4FJiVvlcw35QXzk0KrUecJmuVFbj4uV9oYrcw==",
"cpu": [
"ia32"
],
"optional": true,
"os": [
"win32"
],
"engines": {
"node": ">= 10.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
"node_modules/@parcel/watcher-win32-x64": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.4.1.tgz",
"integrity": "sha512-+DvS92F9ezicfswqrvIRM2njcYJbd5mb9CUgtrHCHmvn7pPPa+nMDRu1o1bYYz/l5IB2NVGNJWiH7h1E58IF2A==",
"cpu": [
"x64"
],
"optional": true,
"os": [
"win32"
],
"engines": {
"node": ">= 10.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/parcel"
}
},
"node_modules/@shopify/cli": {
"version": "3.63.2",
"resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.63.2.tgz",
"integrity": "sha512-bkUUxA3r9G6DfMyhfuA0YalCA5GHqnQ/18pD9H7ppV43646iMpZrAEi0MtiyrFwerLZ//1Ic3NgMMKqkcmOQxg==",
"version": "3.67.1",
"resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.67.1.tgz",
"integrity": "sha512-yThhhrfV4M9cAx8Ng5DPoxEemtPtiIur1jiVJBp8cuooJMTHvjANZ3eOcs9xeKGb5BMzoseZ1jR5Gh8MYGCjQQ==",
"license": "MIT",
"os": [
"darwin",
"linux",
@ -729,33 +498,6 @@
},
"engines": {
"node": "^18.20.0 || >=20.10.0"
},
"optionalDependencies": {
"@parcel/watcher": "2.4.1"
}
},
"node_modules/braces": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
"optional": true,
"dependencies": {
"fill-range": "^7.1.1"
},
"engines": {
"node": ">=8"
}
},
"node_modules/detect-libc": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
"integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
"optional": true,
"bin": {
"detect-libc": "bin/detect-libc.js"
},
"engines": {
"node": ">=0.10"
}
},
"node_modules/esbuild": {
@ -763,6 +505,7 @@
"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.8.tgz",
"integrity": "sha512-l7iffQpT2OrZfH2rXIp7/FkmaeZM0vxbxN9KfiCwGYuZqzMg/JdvX26R31Zxn/Pxvsrg3Y9N6XTcnknqDyyv4w==",
"hasInstallScript": true,
"license": "MIT",
"bin": {
"esbuild": "bin/esbuild"
},
@ -793,94 +536,6 @@
"@esbuild/win32-ia32": "0.19.8",
"@esbuild/win32-x64": "0.19.8"
}
},
"node_modules/fill-range": {
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
"optional": true,
"dependencies": {
"to-regex-range": "^5.0.1"
},
"engines": {
"node": ">=8"
}
},
"node_modules/is-extglob": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
"optional": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/is-glob": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
"optional": true,
"dependencies": {
"is-extglob": "^2.1.1"
},
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/is-number": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
"optional": true,
"engines": {
"node": ">=0.12.0"
}
},
"node_modules/micromatch": {
"version": "4.0.7",
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
"integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
"optional": true,
"dependencies": {
"braces": "^3.0.3",
"picomatch": "^2.3.1"
},
"engines": {
"node": ">=8.6"
}
},
"node_modules/node-addon-api": {
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz",
"integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==",
"optional": true,
"engines": {
"node": "^16 || ^18 || >= 20"
}
},
"node_modules/picomatch": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
"optional": true,
"engines": {
"node": ">=8.6"
},
"funding": {
"url": "https://github.com/sponsors/jonschlinkert"
}
},
"node_modules/to-regex-range": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
"optional": true,
"dependencies": {
"is-number": "^7.0.0"
},
"engines": {
"node": ">=8.0"
}
}
}
}

View File

@ -1,11 +1,11 @@
{
"name": "shopify",
"version": "3.63.2",
"version": "3.67.1",
"private": true,
"bin": {
"shopify": "node_modules/@shopify/cli/bin/run.js"
},
"dependencies": {
"@shopify/cli": "3.63.2"
"@shopify/cli": "3.67.1"
}
}

View File

@ -1,12 +1,6 @@
{ buildNpmPackage, lib, makeWrapper, bundlerEnv, testers, shopify-cli }:
{ buildNpmPackage, lib, testers, shopify-cli }:
let
version = "3.63.2";
# Package the legacy ruby CLI.
rubyGems = bundlerEnv {
name = "shopify-cli-legacy";
gemdir = ./.;
};
version = "3.67.1";
in
buildNpmPackage {
pname = "shopify";
@ -20,11 +14,9 @@ buildNpmPackage {
];
};
npmDepsHash = "sha256-6CEDcWXZXYHFrT2xpbj5NwMrbDZXH6HclgTGkfKDlJs=";
npmDepsHash = "sha256-jb87K1tCMYgWrsAgzvdHW8ChB+dvc9yNM0hqajy8Rbo=";
dontNpmBuild = true;
nativeBuildInputs = [ makeWrapper ];
passthru = {
updateScript = ./update.sh;
tests.version = testers.testVersion {
@ -33,18 +25,6 @@ buildNpmPackage {
};
};
postInstall = ''
# Disable the installCLIDependencies function.
substituteInPlace $(grep -r -l 'await installCLIDependencies' $out/lib/node_modules/shopify/node_modules/@shopify/cli/dist) \
--replace-fail 'await installCLIDependencies' '// await installCLIDependencies'
wrapProgram $out/bin/shopify \
--set SHOPIFY_RUBY_BINDIR ${rubyGems.wrappedRuby}/bin \
--prefix PATH : ${rubyGems}/bin \
--set SHOPIFY_CLI_VERSION ${version} \
--set SHOPIFY_CLI_BUNDLED_THEME_CLI 0
'';
meta = {
platforms = lib.platforms.all;
mainProgram = "shopify";

View File

@ -27,16 +27,6 @@ npm i --package-lock-only
npm_hash=$(prefetch-npm-deps package-lock.json)
sed -i "s|npmDepsHash = \".*\";|npmDepsHash = \"$npm_hash\";|" package.nix
# Update the Gemfile
curl -sf "https://raw.githubusercontent.com/Shopify/cli/$version/packages/cli-kit/src/public/node/ruby.ts" > $tmp/ruby.ts
ruby_version=$(cat $tmp/ruby.ts | grep -oP "RubyCLIVersion = '\K[^']*")
sed -i "s|gem 'shopify-cli', '.*'|gem 'shopify-cli', '$ruby_version'|" Gemfile
# Update Gemfile.lock
rm -f Gemfile.lock gemset.nix
BUNDLE_FORCE_RUBY_PLATFORM=true bundle lock
bundix
popd
nix-update shopify-cli --version $version

View File

@ -0,0 +1,69 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
makeBinaryWrapper,
nix-update-script,
runCommand,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "stdoutisatty";
version = "1.0";
src = fetchFromGitHub {
owner = "lilydjwg";
repo = "stdoutisatty";
rev = finalAttrs.version;
hash = "sha256-NyVn9cxx0rY1ridNDTqe0pzcVhdLVaPCKT4hoQkQzRs=";
};
nativeBuildInputs = [
cmake
makeBinaryWrapper
];
cmakeFlags = [
# must specify the full path to `libstdoutisatty.so` in the nix store
(lib.cmakeFeature "CMAKE_C_FLAGS" "-DLIB_FILE='\"${placeholder "out"}/lib/libstdoutisatty.so\"'")
];
passthru = {
updateScript = nix-update-script { };
tests = {
ls-color = runCommand "${finalAttrs.pname}-test-ls-color" { } ''
set -x
mkdir somedir
ln -s somedir somelink
color_auto=$(ls -1 --color=auto)
color_always=$(ls -1 --color=always)
${lib.getExe finalAttrs.finalPackage} \
ls -1 --color=auto > $out
[[ "$(cat $out)" == "$color_always" ]]
[[ "$(cat $out)" != "$color_auto" ]]
set +x
'';
};
};
meta = {
description = "Make programs think their stdout is a tty / terminal";
longDescription = ''
`stdoutisatty command` makes `command` think their stdout is a terminal,
even if it is actually being piped into another program (e.g. `less`).
This is most useful for preserving user-friendly, colored outputs.
For example, `stdoutisatty ls --color=auto | less` will always show
colored output, despite being piped into a pager.
'';
homepage = "https://github.com/lilydjwg/stdoutisatty";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ bryango ];
mainProgram = "stdoutisatty";
platforms = lib.platforms.linux;
};
})

View File

@ -3679,7 +3679,7 @@ dependencies = [
[[package]]
name = "sync-lsp"
version = "0.11.22"
version = "0.11.28"
dependencies = [
"anyhow",
"clap",
@ -3819,7 +3819,7 @@ dependencies = [
[[package]]
name = "tests"
version = "0.11.22"
version = "0.11.28"
dependencies = [
"insta",
"lsp-server",
@ -3916,7 +3916,7 @@ dependencies = [
[[package]]
name = "tinymist"
version = "0.11.22"
version = "0.11.28"
dependencies = [
"anyhow",
"async-trait",
@ -3956,7 +3956,7 @@ dependencies = [
"serde_json",
"serde_yaml",
"sync-lsp",
"tinymist-assets 0.11.22 (registry+https://github.com/rust-lang/crates.io-index)",
"tinymist-assets 0.11.28 (registry+https://github.com/rust-lang/crates.io-index)",
"tinymist-query",
"tinymist-render",
"tinymist-world",
@ -3982,7 +3982,7 @@ dependencies = [
[[package]]
name = "tinymist-analysis"
version = "0.11.22"
version = "0.11.28"
dependencies = [
"base64 0.22.1",
"comemo 0.4.0",
@ -3999,17 +3999,17 @@ dependencies = [
[[package]]
name = "tinymist-assets"
version = "0.11.22"
version = "0.11.28"
[[package]]
name = "tinymist-assets"
version = "0.11.22"
version = "0.11.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "133e31d88d00f03791f99009c4102a14b2b1a7474e8179ca7e2e42806c7134ef"
checksum = "a08ac1383bf5177ca572a0f88fb2175373ebe591d0c1bde0b85d6e0fa25d2f6b"
[[package]]
name = "tinymist-query"
version = "0.11.22"
version = "0.11.28"
dependencies = [
"anyhow",
"base64 0.22.1",
@ -4060,7 +4060,7 @@ dependencies = [
[[package]]
name = "tinymist-render"
version = "0.11.22"
version = "0.11.28"
dependencies = [
"base64 0.22.1",
"log",
@ -4071,7 +4071,7 @@ dependencies = [
[[package]]
name = "tinymist-world"
version = "0.11.22"
version = "0.11.28"
dependencies = [
"anyhow",
"chrono",
@ -4086,7 +4086,7 @@ dependencies = [
"serde",
"serde_json",
"tar",
"tinymist-assets 0.11.22 (registry+https://github.com/rust-lang/crates.io-index)",
"tinymist-assets 0.11.28 (registry+https://github.com/rust-lang/crates.io-index)",
"typst-assets",
]
@ -4348,7 +4348,7 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
[[package]]
name = "typlite"
version = "0.11.22"
version = "0.11.28"
dependencies = [
"base64 0.22.1",
"comemo 0.4.0",
@ -4492,7 +4492,7 @@ dependencies = [
[[package]]
name = "typst-preview"
version = "0.11.22"
version = "0.11.28"
dependencies = [
"clap",
"comemo 0.4.0",
@ -4505,7 +4505,7 @@ dependencies = [
"reflexo-vec2svg",
"serde",
"serde_json",
"tinymist-assets 0.11.22 (registry+https://github.com/rust-lang/crates.io-index)",
"tinymist-assets 0.11.28 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio",
"typst",
"typst-assets",
@ -4533,7 +4533,7 @@ dependencies = [
[[package]]
name = "typst-shim"
version = "0.11.22"
version = "0.11.28"
dependencies = [
"cfg-if",
"typst",

View File

@ -8,9 +8,8 @@
zlib,
stdenv,
darwin,
versionCheckHook,
nix-update-script,
testers,
tinymist,
vscode-extensions,
}:
@ -18,13 +17,13 @@ rustPlatform.buildRustPackage rec {
pname = "tinymist";
# Please update the corresponding vscode extension when updating
# this derivation.
version = "0.11.22";
version = "0.11.28";
src = fetchFromGitHub {
owner = "Myriad-Dreamin";
repo = "tinymist";
rev = "refs/tags/v${version}";
hash = "sha256-CQt6ptVwx86rYmXSgQ962fJupRQidLRFXU6yYkWasR0=";
hash = "sha256-Wiuf53HlTMJeYJG815e9PgOtJBRxYRPllus7mmxdvM4=";
};
cargoLock = {
@ -64,14 +63,16 @@ rustPlatform.buildRustPackage rec {
"--skip=docs::tests::touying"
];
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "-V" ];
doInstallCheck = true;
passthru = {
updateScript = nix-update-script { };
tests = {
vscode-extension = vscode-extensions.myriad-dreamin.tinymist;
version = testers.testVersion {
command = "${meta.mainProgram} -V";
package = tinymist;
};
};
};

View File

@ -0,0 +1,86 @@
{
lib,
stdenvNoCC,
clangStdenv,
fetchFromGitHub,
mill,
which,
}:
let
# we need to lock the mill version, because an update will change the
# fetched internal dependencies, thus breaking the deps FOD
lockedMill = mill.overrideAttrs (oldAttrs: {
# should ideally match the version listed inside the `.mill-version` file of the source
version = "0.11.12";
src = oldAttrs.src.overrideAttrs {
outputHash = "sha256-k4/oMHvtq5YXY8hRlX4gWN16ClfjXEAn6mRIoEBHNJo=";
};
});
in
clangStdenv.mkDerivation (finalAttrs: {
pname = "vyxal";
version = "3.4.9";
src = fetchFromGitHub {
owner = "Vyxal";
repo = "Vyxal";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-8hA4u9zz8jm+tlSZ88z69/PUFNYk7+i3jtgUntgDgPE=";
};
# make sure to resolve all dependencies needed
deps = stdenvNoCC.mkDerivation {
name = "vyxal-${finalAttrs.version}-deps";
inherit (finalAttrs) src;
nativeBuildInputs = [ lockedMill ];
buildPhase = ''
runHook preBuild
export JAVA_TOOL_OPTIONS="-Duser.home=$(mktemp -d)"
export COURSIER_CACHE=$out/.coursier
mill native.prepareOffline --all
runHook postBuild
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "sha256-yXKzntb498b8ZLYq7w+s1Brj+pvPN9otdkdY8QGVHPs=";
};
nativeBuildInputs = [
lockedMill
which
];
buildPhase = ''
runHook preBuild
export JAVA_TOOL_OPTIONS="-Duser.home=$(mktemp -d)"
export COURSIER_CACHE=${finalAttrs.deps}/.coursier
mill native.nativeLink
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm755 out/native/nativeLink.dest/out $out/bin/vyxal
runHook postInstall
'';
meta = {
changelog = "https://github.com/Vyxal/Vyxal/releases/tag/v${finalAttrs.version}";
description = "Code-golfing language that has aspects of traditional programming languages";
homepage = "https://github.com/Vyxal/Vyxal";
license = lib.licenses.mit;
mainProgram = "vyxal";
maintainers = with lib.maintainers; [ tomasajt ];
platforms = lib.platforms.all;
};
})

View File

@ -11,13 +11,13 @@
buildGoModule rec {
pname = "werf";
version = "2.10.7";
version = "2.10.9";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
hash = "sha256-pIgBYB0EEelpNgNPAxUu2jqFoT4myru5wAu3Oobmqn8=";
hash = "sha256-qnSuUn4Kk252kgqWUlnMl3+0MX2k+3sVvTpxgeBnVeE=";
};
vendorHash = "sha256-MSxqRU9TUYDoUoYubXPrxABwLL5gou52ia0dX7lzQ5Q=";

View File

@ -4,6 +4,7 @@
, meson
, ninja
, pkg-config
, pkgsCross
, appstream-glib
, desktop-file-utils
, gobject-introspection
@ -62,8 +63,14 @@ python3.pkgs.buildPythonApplication rec {
dontWrapGApps = true;
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
patchShebangs --update $out/share/wike/wike-sp
'';
passthru = {
tests.cross = pkgsCross.aarch64-multiplatform.wike;
};
meta = with lib; {
description = "Wikipedia Reader for the GNOME Desktop";
homepage = "https://github.com/hugolabe/Wike";

View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "sudo-font";
version = "1.4";
version = "2.0.0";
src = fetchzip {
url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
hash = "sha256-d0KOxINOw5G7V8c/hhgktHnSqeGNrE3Nd3ngSKSlBhc=";
hash = "sha256-WjhNWwAeb6f7tlvXMr6Q7mtNnaWbHSnBtXK6Ba3YOW4=";
};
installPhase = ''

View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-circle";
version = "24.07.19";
version = "24.10.01";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "sha256-tCqsFcKGUV4sLkoyc3beHmnJxVwRxEGo+G5PJfBuHbI=";
sha256 = "sha256-6+JzTVhhQBbEjQ85ZIBh04KZUFcHwDo8tdA0ruUEqT8=";
};
nativeBuildInputs = [ gtk3 ];

View File

@ -76,12 +76,12 @@ in {
nim-unwrapped-2 = stdenv.mkDerivation (finalAttrs: {
pname = "nim-unwrapped";
version = "2.0.8";
version = "2.2.0";
strictDeps = true;
src = fetchurl {
url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz";
hash = "sha256-VwLahEcA0xKdtzFwtcYGrb37h+grgWwNkRB+ogpl3xY=";
hash = "sha256-zphChJyXYOSH7N0c2t98DyhEyvrmBUAcfHKuJXZEiTw=";
};
buildInputs = [ boehmgc openssl pcre readline sqlite ]
@ -94,7 +94,7 @@ in {
./nixbuild.patch
# Load libraries at runtime by absolute path
./extra-mangling.patch
./extra-mangling-2.patch
# Mangle store paths of modules to prevent runtime dependence.
./openssl.patch
@ -151,12 +151,16 @@ in {
runHook postInstall
'';
passthru = {
updateScript.command = [ ./update.sh ];
};
meta = with lib; {
description = "Statically typed, imperative programming language";
homepage = "https://nim-lang.org/";
license = licenses.mit;
mainProgram = "nim";
maintainers = with maintainers; [ ehmry ];
maintainers = with maintainers; [ ehmry eveeifyeve ];
};
});

View File

@ -0,0 +1,48 @@
diff --git a/compiler/modulepaths.nim b/compiler/modulepaths.nim
index c9e6060e5..acb289498 100644
--- a/compiler/modulepaths.nim
+++ b/compiler/modulepaths.nim
@@ -79,6 +79,13 @@ proc checkModuleName*(conf: ConfigRef; n: PNode; doLocalError=true): FileIndex =
else:
result = fileInfoIdx(conf, fullPath)
+proc rot13(result: var string) =
+ for i, c in result:
+ case c
+ of 'a'..'m', 'A'..'M': result[i] = char(c.uint8 + 13)
+ of 'n'..'z', 'N'..'Z': result[i] = char(c.uint8 - 13)
+ else: discard
+
proc mangleModuleName*(conf: ConfigRef; path: AbsoluteFile): string =
## Mangle a relative module path to avoid path and symbol collisions.
##
@@ -87,9 +94,11 @@ proc mangleModuleName*(conf: ConfigRef; path: AbsoluteFile): string =
##
## Example:
## `foo-#head/../bar` becomes `@foo-@hhead@s..@sbar`
- "@m" & relativeTo(path, conf.projectPath).string.multiReplace(
+ result = "@m" & relativeTo(path, conf.projectPath).string.multiReplace(
{$os.DirSep: "@s", $os.AltSep: "@s", "#": "@h", "@": "@@", ":": "@c"})
+ rot13(result)
proc demangleModuleName*(path: string): string =
## Demangle a relative module path.
result = path.multiReplace({"@@": "@", "@h": "#", "@s": "/", "@m": "", "@c": ":"})
+ rot13(result)
diff --git a/compiler/modulegraphs.nim b/compiler/modulegraphs.nim
index 77762d23a..59dd8903a 100644
--- a/compiler/modulegraphs.nim
+++ b/compiler/modulegraphs.nim
@@ -503,7 +503,11 @@ proc uniqueModuleName*(conf: ConfigRef; m: PSym): string =
for i in 0..<trunc:
let c = rel[i]
case c
- of 'a'..'z', '0'..'9':
+ of 'a'..'m':
+ result.add char(c.uint8 + 13)
+ of 'n'..'z':
+ result.add char(c.uint8 - 13)
+ of '0'..'9':
result.add c
of {os.DirSep, os.AltSep}:
result.add 'Z' # because it looks a bit like '/'

View File

@ -0,0 +1,25 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p bash nix-update curl coreutils jq
set -ex
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
curl_github() {
curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "$@"
}
case "$UPDATE_NIX_ATTR_PATH" in
nim)
latestTag=$(curl_github https://api.github.com/repos/nim-lang/Nim/releases/latest | jq -r ".tag_name")
latestVersion="$(expr "$latestTag" : 'v\(.*\)')"
echo "Updating Nim"
nix-update --version "$latestVersion" \
--override-filename "$SCRIPT_DIR/default.nix" \
nim
*)
echo "Unknown attr path $UPDATE_NIX_ATTR_PATH"
;;
esac

View File

@ -13,17 +13,17 @@
stdenv.mkDerivation (finalAttrs: {
pname = "unison-code-manager";
version = "0.5.26";
version = "0.5.27";
src = if stdenv.hostPlatform.isDarwin then
fetchurl {
url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz";
hash = "sha256-RF2Q5sCxT9F3IGM/8UP6bEe9sOjtpMVYHREuAPOzh8g=";
hash = "sha256-bmEmox+CfkGZP9GCfwDyspTult0WV+6jfQzehT33p8U=";
}
else
fetchurl {
url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz";
hash = "sha256-t0rc1f4PfjHRu/tzoW8sJ/6R0KBbYQPiWHqsIaqc+SY=";
hash = "sha256-js7MgzJQShy6z1QNsIRwjtZfrNOGwUA001SWlKWgMoA=";
};
# The tarball is just the prebuilt binary, in the archive root.

View File

@ -497,11 +497,10 @@ dependencies = [
[[package]]
name = "crossbeam-channel"
version = "0.5.6"
version = "0.5.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
dependencies = [
"cfg-if",
"crossbeam-utils",
]
@ -1055,6 +1054,16 @@ dependencies = [
"wasm-bindgen",
]
[[package]]
name = "junction"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca39ef0d69b18e6a2fd14c2f0a1d593200f4a4ed949b240b5917ab51fac754cb"
dependencies = [
"scopeguard",
"winapi",
]
[[package]]
name = "keccak"
version = "0.1.3"
@ -1139,9 +1148,9 @@ dependencies = [
[[package]]
name = "libsqlite3-sys"
version = "0.25.2"
version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa"
checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f"
dependencies = [
"cc",
"pkg-config",
@ -1155,7 +1164,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf"
dependencies = [
"cc",
"libc",
"pkg-config",
"vcpkg",
]
@ -1493,9 +1501,9 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
[[package]]
name = "openssl"
version = "0.10.62"
version = "0.10.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671"
checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
dependencies = [
"bitflags 2.5.0",
"cfg-if",
@ -1534,9 +1542,9 @@ dependencies = [
[[package]]
name = "openssl-sys"
version = "0.9.98"
version = "0.9.103"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7"
checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
dependencies = [
"cc",
"libc",
@ -1965,9 +1973,9 @@ dependencies = [
[[package]]
name = "rustix"
version = "0.38.28"
version = "0.38.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
dependencies = [
"bitflags 2.5.0",
"errno",
@ -1978,7 +1986,7 @@ dependencies = [
[[package]]
name = "rustpython"
version = "0.3.1"
version = "0.4.0"
dependencies = [
"atty",
"cfg-if",
@ -2001,8 +2009,9 @@ dependencies = [
[[package]]
name = "rustpython-ast"
version = "0.3.1"
source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4cdaf8ee5c1473b993b398c174641d3aa9da847af36e8d5eb8291930b72f31a5"
dependencies = [
"is-macro",
"malachite-bigint",
@ -2013,7 +2022,7 @@ dependencies = [
[[package]]
name = "rustpython-codegen"
version = "0.3.1"
version = "0.4.0"
dependencies = [
"ahash",
"bitflags 2.5.0",
@ -2031,7 +2040,7 @@ dependencies = [
[[package]]
name = "rustpython-common"
version = "0.3.1"
version = "0.4.0"
dependencies = [
"ascii",
"bitflags 2.5.0",
@ -2053,11 +2062,12 @@ dependencies = [
"siphasher",
"volatile",
"widestring",
"windows-sys 0.52.0",
]
[[package]]
name = "rustpython-compiler"
version = "0.3.1"
version = "0.4.0"
dependencies = [
"rustpython-codegen",
"rustpython-compiler-core",
@ -2066,7 +2076,7 @@ dependencies = [
[[package]]
name = "rustpython-compiler-core"
version = "0.3.1"
version = "0.4.0"
dependencies = [
"bitflags 2.5.0",
"itertools 0.11.0",
@ -2079,7 +2089,7 @@ dependencies = [
[[package]]
name = "rustpython-derive"
version = "0.3.1"
version = "0.4.0"
dependencies = [
"rustpython-compiler",
"rustpython-derive-impl",
@ -2088,7 +2098,7 @@ dependencies = [
[[package]]
name = "rustpython-derive-impl"
version = "0.3.1"
version = "0.4.0"
dependencies = [
"itertools 0.11.0",
"maplit",
@ -2113,8 +2123,9 @@ dependencies = [
[[package]]
name = "rustpython-format"
version = "0.3.1"
source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0389039b132ad8e350552d771270ccd03186985696764bcee2239694e7839942"
dependencies = [
"bitflags 2.5.0",
"itertools 0.11.0",
@ -2125,7 +2136,7 @@ dependencies = [
[[package]]
name = "rustpython-jit"
version = "0.3.1"
version = "0.4.0"
dependencies = [
"approx",
"cranelift",
@ -2140,8 +2151,9 @@ dependencies = [
[[package]]
name = "rustpython-literal"
version = "0.3.1"
source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8304be3cae00232a1721a911033e55877ca3810215f66798e964a2d8d22281d"
dependencies = [
"hexf-parse",
"is-macro",
@ -2152,8 +2164,9 @@ dependencies = [
[[package]]
name = "rustpython-parser"
version = "0.3.1"
source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "868f724daac0caf9bd36d38caf45819905193a901e8f1c983345a68e18fb2abb"
dependencies = [
"anyhow",
"is-macro",
@ -2175,8 +2188,9 @@ dependencies = [
[[package]]
name = "rustpython-parser-core"
version = "0.3.1"
source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4b6c12fa273825edc7bccd9a734f0ad5ba4b8a2f4da5ff7efe946f066d0f4ad"
dependencies = [
"is-macro",
"memchr",
@ -2185,8 +2199,9 @@ dependencies = [
[[package]]
name = "rustpython-parser-vendored"
version = "0.3.1"
source = "git+https://github.com/RustPython/Parser.git?rev=a95045bc627b2fbf84caf4f010e521846be7b37f#a95045bc627b2fbf84caf4f010e521846be7b37f"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04fcea49a4630a3a5d940f4d514dc4f575ed63c14c3e3ed07146634aed7f67a6"
dependencies = [
"memchr",
"once_cell",
@ -2194,7 +2209,7 @@ dependencies = [
[[package]]
name = "rustpython-pylib"
version = "0.3.1"
version = "0.4.0"
dependencies = [
"glob",
"rustpython-compiler-core",
@ -2203,7 +2218,7 @@ dependencies = [
[[package]]
name = "rustpython-sre_engine"
version = "0.3.1"
version = "0.4.0"
dependencies = [
"bitflags 2.5.0",
"num_enum",
@ -2212,7 +2227,7 @@ dependencies = [
[[package]]
name = "rustpython-stdlib"
version = "0.3.1"
version = "0.4.0"
dependencies = [
"adler32",
"ahash",
@ -2231,7 +2246,9 @@ dependencies = [
"foreign-types-shared",
"gethostname",
"hex",
"indexmap 2.2.6",
"itertools 0.11.0",
"junction",
"libc",
"libsqlite3-sys",
"libz-sys",
@ -2266,6 +2283,7 @@ dependencies = [
"socket2",
"system-configuration",
"termios",
"thread_local",
"ucd",
"unic-char-property",
"unic-normal",
@ -2284,7 +2302,7 @@ dependencies = [
[[package]]
name = "rustpython-vm"
version = "0.3.1"
version = "0.4.0"
dependencies = [
"ahash",
"ascii",
@ -2305,6 +2323,7 @@ dependencies = [
"indexmap 2.2.6",
"is-macro",
"itertools 0.11.0",
"junction",
"libc",
"log",
"malachite-bigint",
@ -2360,7 +2379,7 @@ dependencies = [
[[package]]
name = "rustpython_wasm"
version = "0.3.1"
version = "0.4.0"
dependencies = [
"console_error_panic_hook",
"js-sys",
@ -2557,12 +2576,12 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
[[package]]
name = "socket2"
version = "0.5.5"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
dependencies = [
"libc",
"windows-sys 0.48.0",
"windows-sys 0.52.0",
]
[[package]]
@ -2734,22 +2753,6 @@ dependencies = [
"once_cell",
]
[[package]]
name = "time"
version = "0.3.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
dependencies = [
"serde",
"time-core",
]
[[package]]
name = "time-core"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
[[package]]
name = "timsort"
version = "0.1.2"
@ -2989,9 +2992,9 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
[[package]]
name = "unicode_names2"
version = "1.1.0"
version = "1.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38b2c0942619ae1797f999a0ce7efc6c09592ad30e68e16cdbfdcd48a98c3579"
checksum = "addeebf294df7922a1164f729fb27ebbbcea99cc32b3bf08afab62757f707677"
dependencies = [
"phf",
"unicode_names2_generator",
@ -2999,15 +3002,14 @@ dependencies = [
[[package]]
name = "unicode_names2_generator"
version = "1.1.0"
version = "1.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d0d66ab60be9799a70f8eb227ea43da7dcc47561dd9102cbadacfe0930113f7"
checksum = "f444b8bba042fe3c1251ffaca35c603f2dc2ccc08d595c65a8c4f76f3e8426c0"
dependencies = [
"getopts",
"log",
"phf_codegen",
"rand",
"time",
]
[[package]]
@ -3088,9 +3090,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
version = "0.2.84"
version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@ -3098,16 +3100,16 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.84"
version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
"syn 1.0.109",
"syn 2.0.32",
"wasm-bindgen-shared",
]
@ -3125,9 +3127,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.84"
version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@ -3135,22 +3137,22 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.84"
version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
"syn 2.0.32",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.84"
version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
[[package]]
name = "web-sys"

View File

@ -8,19 +8,18 @@
rustPlatform.buildRustPackage rec {
pname = "rustpython";
version = "0.3.1";
version = "0.4.0";
src = fetchFromGitHub {
owner = "RustPython";
repo = "RustPython";
rev = "refs/tags/${version}";
hash = "sha256-AtIaWwE1pEIP1SJN9dYgHRP1GX4LTmetIPztHbsBXto=";
hash = "sha256-BYYqvPJu/eFJ9lt07A0p7pd8pGFccUe/okFqGEObhY4=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"rustpython-ast-0.3.1" = "sha256-dT0x4E8k/FcSP/q0uwwBWniT1n9HGmFF/HV6hAE6bGU=";
"rustpython-doc-0.3.0" = "sha256-34ERuLFKzUD9Xmf1zlafe42GLWZfUlw17ejf/NN6yH4=";
};
};

View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "wazero";
version = "1.8.0";
version = "1.8.1";
src = fetchFromGitHub {
owner = "tetratelabs";
repo = "wazero";
rev = "v${version}";
hash = "sha256-m8dv8r1iJGM6RSPDhJk6KM7sHy3YorvsXUACsSb9bCU=";
hash = "sha256-swTGkSwkTtogdzuebeD+0C/wSaS/340TAyVc6gavoLw=";
};
vendorHash = null;

View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "faudio";
version = "24.09";
version = "24.10";
src = fetchFromGitHub {
owner = "FNA-XNA";
repo = "FAudio";
rev = version;
sha256 = "sha256-qojDXGFSn865dbHwhyGiHyyGKHIMI82ai4NyXgjAxD0=";
sha256 = "sha256-BUR/zFYOaEoa4pUUgzIcrWrpDX4AP9cySIelralb/t0=";
};
nativeBuildInputs = [cmake];

View File

@ -5,13 +5,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "liblxi";
version = "1.20";
version = "1.21";
src = fetchFromGitHub {
owner = "lxi-tools";
repo = "liblxi";
rev = "v${finalAttrs.version}";
hash = "sha256-jS0huNkbyKrsJ3NkenrYtjkzLakOsTJpwlgSo98ribE=";
hash = "sha256-ZRUYwMy+vvNClHxctoTMDlbnCSp2A0L9roo5KXWCMpI=";
};
postPatch = ''

View File

@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "sexpp";
version = "0.8.8";
version = "0.9.0";
src = fetchFromGitHub {
owner = "rnpgp";
repo = "sexpp";
rev = "v${finalAttrs.version}";
hash = "sha256-6PCqzHAb5is8bArQWD5N+GykoWjM8H8mV0IabtNTlYg=";
hash = "sha256-mNt6J8nhzT5sF28ktl3jOkQMKn6x9iE04MMrwwVxyZs=";
};
buildInputs = [ zlib bzip2 ];

View File

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "bracex";
version = "2.5";
version = "2.5.post1";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-ByXaUEXo036pWSqzYU2LVh4iw8X945ZGmb5nLgcqthE=";
hash = "sha256-EsUJUkFb+nc9LZzLjnllG4zbHzGkL2CRuAT2uitKZrY=";
};
nativeBuildInputs = [ hatchling ];

View File

@ -83,11 +83,13 @@ buildPythonPackage rec {
pythonImportsCheck = [ "circus" ];
meta = with lib; {
__darwinAllowLocalNetworking = true;
meta = {
description = "Process and socket manager";
homepage = "https://github.com/circus-tent/circus";
changelog = "https://github.com/circus-tent/circus/releases/tag/${version}";
license = licenses.asl20;
maintainers = [ ];
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ GaetanLepage ];
};
}

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "cpe";
version = "1.3.0";
version = "1.3.1";
pyproject = true;
disabled = pythonOlder "3.10";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "nilp0inter";
repo = "cpe";
rev = "refs/tags/v${version}";
hash = "sha256-nHFgsFNoDf1VJI7XOe62NOuL67AZCP/LFsymt7Q8L2U=";
hash = "sha256-QI5XHy2TDSUqK6BZBoFWViBcOKfo+zg0ulzEzF4eg4w=";
};
build-system = [ setuptools ];

View File

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "grpcio-channelz";
version = "1.65.4";
version = "1.66.2";
pyproject = true;
src = fetchPypi {
pname = "grpcio_channelz";
inherit version;
hash = "sha256-Ia92P8FT3+bv18k402znrt3QTDovPBCgCJ/Eqm8WDic=";
hash = "sha256-SQTHg3UjQ2YkiV2QYmlPKQt/Mzg7KWoex8SXtuTH7Rk=";
};
build-system = [ setuptools ];

View File

@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "grpcio-health-checking";
version = "1.65.4";
version = "1.66.2";
format = "setuptools";
src = fetchPypi {
pname = "grpcio_health_checking";
inherit version;
hash = "sha256-HoQfbbBaAFGmLMSNQN0tzJ5xdYS7GQSa1R+2cygbnEo=";
hash = "sha256-yQ35YiRWBC7DSV03qzC190ckqsW11VMU8HPu9eJHChM=";
};
propagatedBuildInputs = [

View File

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "grpcio-reflection";
version = "1.65.4";
version = "1.66.2";
pyproject = true;
src = fetchPypi {
pname = "grpcio_reflection";
inherit version;
hash = "sha256-jGuWDD9DBoHoivWfafq1pXW3eyn1xqHXFuqsXPHBpJ0=";
hash = "sha256-rdgn4t61bpaAPIKs4dTnf6DI7DdH1jmOmVH3OdcQZ9Q=";
};
build-system = [ setuptools ];

View File

@ -4,17 +4,21 @@
buildPythonPackage,
substituteAll,
addDriverRunpath,
setuptools,
cudaPackages,
nvidia-ml-py,
}:
buildPythonPackage rec {
pname = "nvidia-ml-py";
version = "12.555.43";
format = "setuptools";
version = "12.560.30";
pyproject = true;
src = fetchPypi {
inherit pname version;
extension = "tar.gz";
hash = "sha256-6efxLvHsI0uw3CLSvcdi/6+rOUvcRyoHpDd8lbv5Ov4=";
hash = "sha256-8CVNx0AGR2gKBy7gJQm/1GECtgvf7KMhV21NSBfn/pc=";
};
patches = [
@ -24,16 +28,28 @@ buildPythonPackage rec {
})
];
build-system = [
setuptools
];
# no tests
doCheck = false;
pythonImportsCheck = [ "pynvml" ];
passthru.tests.tester-nvmlInit =
cudaPackages.writeGpuTestPython { libraries = [ nvidia-ml-py ]; }
''
import pynvml
from pynvml.smi import nvidia_smi # noqa: F401
print(f"{pynvml.nvmlInit()=}")
'';
meta = {
description = "Python Bindings for the NVIDIA Management Library";
homepage = "https://pypi.org/project/nvidia-ml-py";
license = lib.licenses.bsd3;
platforms = [ "x86_64-linux" ];
maintainers = with lib.maintainers; [ GaetanLepage ];
};
}

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "oci";
version = "2.135.0";
version = "2.135.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "oracle";
repo = "oci-python-sdk";
rev = "refs/tags/v${version}";
hash = "sha256-wm0IwcDXdRU/7YCJe9nlmXClzxGRxF9HfAKjGRYO6NE=";
hash = "sha256-PAEHJ92aspRYMqFR9upFmILcqAWCVnR9yiOoLys0GWA=";
};
pythonRelaxDeps = [

View File

@ -41,7 +41,7 @@ buildPythonPackage rec {
fido2 = [ asyncssh ] ++ asyncssh.optional-dependencies.fido2;
gssapi = [ asyncssh ] ++ asyncssh.optional-dependencies.gssapi;
libnacl = [ asyncssh ] ++ asyncssh.optional-dependencies.libnacl;
pkcs11 = [ asyncssh ] ++ asyncssh.optional-dependencies.python-pkcs11;
pkcs11 = [ asyncssh ] ++ asyncssh.optional-dependencies.pkcs11;
pyopenssl = [ asyncssh ] ++ asyncssh.optional-dependencies.pyopenssl;
};

View File

@ -1,12 +1,12 @@
{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre }:
stdenvNoCC.mkDerivation rec {
version = "10.18.1";
version = "10.18.2";
pname = "checkstyle";
src = fetchurl {
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
sha256 = "sha256-2nOh+jvi6CksU69cidNTVjOOIZTRQttpCOuf+KrILoM=";
sha256 = "sha256-VRbCJ+XYJLBrD90tMkJmevOu07t7K8LvcZ96NSjflb4=";
};
nativeBuildInputs = [ makeBinaryWrapper ];

View File

@ -9,16 +9,16 @@
buildGoModule rec {
pname = "supabase-cli";
version = "1.192.5";
version = "1.202.3";
src = fetchFromGitHub {
owner = "supabase";
repo = "cli";
rev = "v${version}";
hash = "sha256-heGW7SS4OOZrKCdVHoGlYS4NAu29jncwE1cMwHDYB4c=";
hash = "sha256-ikwOG2hbip44fStcIXVuZ4Y2hrt9of2jKavp35OJs1I=";
};
vendorHash = "sha256-RiSZaNbMwOmKGzgFpeLmAjsiNg1ADMNAtMH7wHj/vlw=";
vendorHash = "sha256-1g+J7IEkslASyLlfk0zxaFVpNtYDmfZPjkHcAiUzQDM=";
ldflags = [
"-s"

View File

@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
hash = "sha256-X6mBbj7BkW66aYeSCiI3JKBJv10etLQxaTRfRgwsFmM=";
revert = true;
})
./unsurprising-ext-password.patch
];
# TODO: Patch epoll so that the dbus actually responds

View File

@ -0,0 +1,66 @@
From e5ac0dd1af48e085bb824082ef3b64afba673ded Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Wed, 18 Sep 2024 13:43:44 +0200
Subject: [PATCH] ext_password_file: do not use wpa_config_get_line
To: hostap@lists.infradead.org
The file-based backed of the ext_password framework uses
`wpa_config_get_line` to read the passwords line-by-line from a file.
This function is meant to parse a single line from the
wpa_supplicant.conf file, so it handles whitespace, quotes and other
characters specially.
Its behavior, however, it's not compatible with the rest of the
ext_password framework implementation. For example, if a passphrase
contains a `#` character it must be quoted to prevent parsing the
remaining characters as an inline comment, but the code handling the
external password in `wpa_supplicant_get_psk` does not handle quotes.
The result is that either it will hash the enclosing quotes, producing a
wrong PSK, or if the passphrase is long enough, fail the length check.
As a consequence, some passphrases are impossible to input correctly.
To solve this and other issues, this patch changes the behaviour of the
`ext_password_file_get` function (which was not documented in details,
at least w.r.t. special characters) to simply treat all characters
literally: including trailing whitespaces (except CR and LF), `#` for
inline comments, etc. Empty lines and full-line comments are still
supported.
Signed-off-by: Michele Guerini Rocco <rnhmjoj@inventati.org>
---
src/utils/ext_password_file.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/utils/ext_password_file.c b/src/utils/ext_password_file.c
index 4bb0095f3..f631ff15c 100644
--- a/src/utils/ext_password_file.c
+++ b/src/utils/ext_password_file.c
@@ -9,7 +9,6 @@
#include "includes.h"
#include "utils/common.h"
-#include "utils/config.h"
#include "ext_password_i.h"
@@ -97,7 +96,16 @@ static struct wpabuf * ext_password_file_get(void *ctx, const char *name)
wpa_printf(MSG_DEBUG, "EXT PW FILE: get(%s)", name);
- while (wpa_config_get_line(buf, sizeof(buf), f, &line, &pos)) {
+ while ((pos = fgets(buf, sizeof(buf), f))) {
+ line++;
+
+ /* Strip newline characters */
+ pos[strcspn(pos, "\r\n")] = 0;
+
+ /* Skip comments and empty lines */
+ if (*pos == '#' || *pos == '\0')
+ continue;
+
char *sep = os_strchr(pos, '=');
if (!sep) {
--
2.44.1

View File

@ -9,13 +9,13 @@
buildHomeAssistantComponent rec {
owner = "ollo69";
domain = "smartthinq_sensors";
version = "0.39.2";
version = "0.40.0";
src = fetchFromGitHub {
inherit owner;
repo = "ha-smartthinq-sensors";
rev = "v${version}";
hash = "sha256-tLq4sqeKmjEDDaowA8ouH/mI7jQfq49kkt/a8+40rhQ=";
hash = "sha256-2uahTfRmhEqcazz6SzG2abR0e15POsIe/gKs62AITB8=";
};
propagatedBuildInputs = [

View File

@ -33,13 +33,13 @@ assert withHyperscan -> stdenv.hostPlatform.isx86_64;
stdenv.mkDerivation rec {
pname = "rspamd";
version = "3.9.1";
version = "3.10.0";
src = fetchFromGitHub {
owner = "rspamd";
repo = "rspamd";
rev = version;
hash = "sha256-qT94DqX5Dt9pLgqed/j+dtiykwRFY3Fsbvcub7IzAZE=";
hash = "sha256-fsxeTgciZb0HqvRWoUjwe/mrRZPW23hOwx7PJBSlBSo=";
};
hardeningEnable = [ "pie" ];

View File

@ -4,16 +4,16 @@
buildGoModule rec {
pname = "mycorrhiza";
version = "1.15.0";
version = "1.15.1";
src = fetchFromGitHub {
owner = "bouncepaw";
repo = "mycorrhiza";
rev = "v${version}";
sha256 = "sha256-ovlLOacVhf8phL9LNrMf55oo5KgaCKYeS/of/abE8Bo=";
sha256 = "sha256-Cgf2YtAatfKWxhe4xAqNRB4ktsGs3ONi5XqbjcZwzTw=";
};
vendorHash = "sha256-0O831ILIwv2uyTU23x+tnLbUbkrp9ew316uPmqjhxWM=";
vendorHash = "sha256-UQT6BvJT26NViZDyh6yokgW18ptMiGCSf7CgMqtD9Oc=";
subPackages = [ "." ];

View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "shiori";
version = "1.7.0";
version = "1.7.1";
vendorHash = "sha256-fakRqgoEcdzw9WZuubaxfGfvVrMvb8gV/IwPikMnfRQ=";
@ -12,7 +12,7 @@ buildGoModule rec {
owner = "go-shiori";
repo = pname;
rev = "v${version}";
sha256 = "sha256-5+hTtvBnj3Nh5HitReVkLift9LTiMYVuuYx5EirN0SA=";
sha256 = "sha256-gMIpDiA5ncZ50WZ2Y57mScTEXzeObgZxP+nkWe+a8Eo=";
};
nativeBuildInputs = [ installShellFiles ];

View File

@ -70,13 +70,13 @@ let
'';
in buildPythonApplication rec {
pname = "xpra";
version = "6.1.2";
version = "6.1.3";
src = fetchFromGitHub {
owner = "Xpra-org";
repo = "xpra";
rev = "v${version}";
hash = "sha256-SmX0zwScyosiidBdW18vP3tV7BJfYfOmXwuRUbb+gX8=";
hash = "sha256-b21kSHaveRzJhFvdNaFdoQpC9B3Hu0X79EOIjkbvxWk=";
};
patches = [

View File

@ -25,13 +25,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "whisper-cpp";
version = "1.6.2";
version = "1.7.0";
src = fetchFromGitHub {
owner = "ggerganov";
repo = "whisper.cpp";
rev = "refs/tags/v${finalAttrs.version}" ;
hash = "sha256-hIEIu7feOZWqxRskf6Ej7l653/9KW8B3cnpPLoCRBAc=";
hash = "sha256-obAXqqQEs7lkv6v1vl3aN+Vh6wPSYSXXbI6mlee6/QM=";
};
# The upstream download script tries to download the models to the

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "interactsh";
version = "1.2.1";
version = "1.2.2";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-0AyFmT0vYYJ5/gTQI2F+fPsM0oBs4CigNCXS3+ECoRo=";
hash = "sha256-aPjeP9Js2lpJBiWYTpJjKo445wSkNcatszBZMutIIR0=";
};
vendorHash = "sha256-SYs04LgWy6Fd9SUAxs4tB+VK2CK3gqb7fDYkp16i67Q=";

View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "mmv";
version = "2.7";
version = "2.8";
src = fetchFromGitHub {
owner = "rrthomas";
repo = "mmv";
rev = "v${version}";
hash = "sha256-uiRKdkBLr3ZSovIqso/F85cfoSrymZpyzGa63wp5XnY=";
hash = "sha256-2RxVGSanuSSNzKX5Hgo7QelfGmaG9wF0fvklqrrGszg=";
fetchSubmodules = true;
};

View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "grpc_cli";
version = "1.66.1";
version = "1.66.2";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
hash = "sha256-CmQUUbIYPWRS7q7OX+TmkTvoqtJAUEwhL/lev8JdB8U=";
hash = "sha256-nka7ZzyZIeEAPaz7v/8RAeo9XmkgrOrHpor3siAx7Ec=";
fetchSubmodules = true;
};
nativeBuildInputs = [ automake cmake autoconf ];

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